Author: johnnyoffline
Date: 2010-01-15 19:28:50 +0100 (Fri, 15 Jan 2010)
New Revision: 26687
Modified:
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_breadcrumb.php
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_createPage.php
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_renamePage.php
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_search.php
plugins/pkContextCMSPlugin/trunk/web/css/pkContextCMS.css
Log:
some more breadcrumb renaming tweaks
Modified:
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_breadcrumb.php
===================================================================
---
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_breadcrumb.php
2010-01-15 18:07:17 UTC (rev 26686)
+++
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_breadcrumb.php
2010-01-15 18:28:50 UTC (rev 26687)
@@ -27,14 +27,14 @@
<?php include_partial('pkContextCMS/renamePage',
array('page' => $page, 'edit' => $page->userHasPrivilege('edit'))) ?>
</li>
<?php else: ?>
- <li class="pk-breadcrumb-title" id="pk-breadcrumb-title">
+ <li class="pk-breadcrumb-title" id="pk-breadcrumb-title-<?php
echo $pinfo['id'] ?>">
<?php echo link_to($title,
pkContextCMSTools::urlForPage($pinfo['slug'])) ?>
</li>
<?php endif ?>
<?php if ($page->id === $pinfo['id']): ?>
<?php if ($page->userHasPrivilege('edit')): ?>
- <li class="pk-breadcrumb-page-settings">
+ <li class="pk-breadcrumb-page-settings"
id="pk-breadcrumb-page-settings">
<?php $id = $page->id ?>
<?php // Sets up open and close buttons, ajax loading of form ?>
<?php echo pk_remote_dialog_toggle(
@@ -54,7 +54,7 @@
<?php include_slot('pk_add_page') ?>
<?php else: ?>
<li class="pk-breadcrumb-slash">/</li>
- <li class="pk-breadcrumb-create-childpage">
+ <li id="pk-breadcrumb-create-childpage"
class="pk-breadcrumb-create-childpage">
<?php include_partial('pkContextCMS/createPage',
array('page' => $page, 'edit' => $page->userHasPrivilege('edit'))); ?>
</li>
<?php endif ?>
Modified:
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_createPage.php
===================================================================
---
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_createPage.php
2010-01-15 18:07:17 UTC (rev 26686)
+++
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_createPage.php
2010-01-15 18:28:50 UTC (rev 26687)
@@ -11,8 +11,8 @@
<form method="POST" action="<?php echo url_for('pkContextCMS/create') ?>"
id="pk-breadcrumb-create-childpage-form" class="pk-breadcrumb-form add">
<?php $form = new pkContextCMSCreateForm($page) ?>
- <?php echo $form['parent'] ?>
- <?php echo $form['title'] ?>
+ <?php echo $form['parent']->render(array('id' =>
'pk-breadcrumb-create-parent', )) ?>
+ <?php echo $form['title']->render(array('id' =>
'pk-breadcrumb-create-title', )) ?>
<ul class="pk-form-controls pk-breadcrumb-create-childpage-controls">
<li>
@@ -29,4 +29,8 @@
</li>
</ul>
+ <script type="text/javascript" charset="utf-8">
+ pkInputSelfLabel('#pk-breadcrumb-create-title', 'Page Title');
+ </script>
+
</form>
\ No newline at end of file
Modified:
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_renamePage.php
===================================================================
---
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_renamePage.php
2010-01-15 18:07:17 UTC (rev 26686)
+++
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_renamePage.php
2010-01-15 18:28:50 UTC (rev 26687)
@@ -8,7 +8,7 @@
<?php $form = new pkContextCMSRenameForm($page) ?>
<?php echo $form['id']->render(array('id' => 'pk-breadcrumb-rename-id',
)) ?>
- <?php echo $form['title']->render(array('id' =>
'pk-breadcrumb-rename-title', )) ?>
+ <?php echo $form['title']->render(array('id' =>
'pk-breadcrumb-rename-title')) ?>
<ul id="pk-breadcrumb-rename-controls" class="pk-form-controls
pk-breadcrumb-controls rename" style="display:none;">
<li>
@@ -24,22 +24,21 @@
<script type="text/javascript" charset="utf-8">
$(document).ready(function() {
- var renameForm = $('.pk-breadcrumb-form.rename')
- renameForm.prepend('<b
class="pk-breadcrumb-rename-title-spacer"
style="display:none;float:left;white-space:nowrap;"><?php echo
$page->getTitle() ?></b>')
+ var renameForm = $('#pk-breadcrumb-rename-form');
+ renameForm.prepend('<b
id="pk-breadcrumb-rename-title-spacer"
style="display:none;float:left;white-space:nowrap;"><?php echo str_replace('
','-',$page->getTitle()) ?></b>');
var renameControls =
$('#pk-breadcrumb-rename-controls');
- var renameSpacer =
$('.pk-breadcrumb-rename-title-spacer');
+ var renameSpacer =
$('#pk-breadcrumb-rename-title-spacer');
var renameInput = $('#pk-breadcrumb-rename-title');
var renameInputWidth =
checkInputWidth(renameSpacer.width());
renameInput.css('width', renameInputWidth);
- var currentTitle = "<?php echo $page->getTitle() ?>";
+ var currentTitle = "<?php echo $page->getTitle() ?>"
renameInput[0].value = currentTitle;
var liveTitle = renameInput[0].value;
-
-
+
renameInput.bind('cancel', function(e){
- renameSpacer.text(currentTitle)
+ renameSpacer.text(cleanTitle(currentTitle))
renameInput[0].value = currentTitle;
renameInputWidth =
checkInputWidth(renameSpacer.width());
renameInput.css('width', renameInputWidth);
@@ -58,7 +57,9 @@
renameInput.keydown(function(e){
liveTitle = renameInput[0].value;
- renameSpacer.text(liveTitle);
+ renameSpacer.text(cleanTitle(liveTitle));
+ renameInputWidth =
checkInputWidth(renameSpacer.width());
+ renameInput.css('width', renameInputWidth);
});
renameInput.keyup(function(e){
@@ -68,15 +69,15 @@
}
renameInputWidth =
checkInputWidth(renameSpacer.width());
renameInput.css('width', renameInputWidth);
- });
+ })
- renameControls.find('.pk-cancel').click(function(){
+ renameControls.find('a.pk-cancel').click(function(){
renameInput.trigger('cancel');
});
function checkInputWidth(w)
{
- var minWidth = 50;
+ var minWidth = 20;
var maxWidth = 250;
if (w < minWidth)
{
@@ -86,13 +87,18 @@
{
// we are not enforcing maxWidth at the
moment;
// return maxWidth;
- return w;
+ return w+1;
}
else
{
- return w;
+ return w+1;
}
}
+
+ function cleanTitle(t)
+ {
+ return t.replace(/ /g,'-');
+ }
});
Modified:
plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_search.php
===================================================================
--- plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_search.php
2010-01-15 18:07:17 UTC (rev 26686)
+++ plugins/pkContextCMSPlugin/trunk/modules/pkContextCMS/templates/_search.php
2010-01-15 18:28:50 UTC (rev 26687)
@@ -5,6 +5,6 @@
</form>
</div>
-<script>
-pkInputSelfLabel('#pk-search-cms-field', 'Search');
+<script type="text/javascript" charset="utf-8">
+ pkInputSelfLabel('#pk-search-cms-field', 'Search');
</script>
\ No newline at end of file
Modified: plugins/pkContextCMSPlugin/trunk/web/css/pkContextCMS.css
===================================================================
--- plugins/pkContextCMSPlugin/trunk/web/css/pkContextCMS.css 2010-01-15
18:07:17 UTC (rev 26686)
+++ plugins/pkContextCMSPlugin/trunk/web/css/pkContextCMS.css 2010-01-15
18:28:50 UTC (rev 26687)
@@ -23,9 +23,9 @@
.pk-history-browser
{/*This positions history vertically inside the browser */
- position: absolute;
+position: absolute;
top: 0px; /* This changes with history button offset*/
- left: 50%;
+left: 50%;
margin-left: -480px;
float: left;
width: 960px;
@@ -34,7 +34,6 @@
overflow: hidden;
display: none;
border: 1px solid #ac3;
-/*border-bottom: 40px solid transparent;*/
}
.pk-history-browser h3
@@ -646,25 +645,48 @@
top: -1px;
background: #fff;
color: #333;
-font: 18px/22px Arial, Sans-serif;
+font-family: Arial, Sans-serif;
+font-size: 17px;
letter-spacing: -.0125em;
float: left;
padding: 0 2px;
margin: 0;
width: 100%;
-height: 20px;
border: 1px solid #fff;
clear: right;
}
-#pk-breadcrumb input.pk-breadcrumb-input:focus
+#pk-breadcrumb-title-rename,
+#pk-breadcrumb-page-settings,
+#pk-breadcrumb-create-childpage
{
+ top: 1px;
+}
+
+#pk-breadcrumb-rename-title-spacer
+{
+ font-family: Arial, Sans-serif;
+ font-size: 17px;
+ letter-spacing: -.0125em;
+ padding: 0 2px;
+ margin: 0;
+ border: 1px solid #fff;
+ text-transform: none;
+}
+
+#pk-breadcrumb input.pk-breadcrumb-input:focus,
+#pk-breadcrumb input#pk-breadcrumb-create-title
+{
color: #000;
background: #e6e6e6;
- border: 1px solid #777;
- border-style: inset;
+ border: 1px inset #777;
}
+#pk-breadcrumb input#pk-breadcrumb-create-title.pk-default-value
+{
+ color: #999;
+}
+
#pk-breadcrumb input.pk-breadcrumb-create-childpage-title
{
width: 180px;
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
