Index: branches/5.0.x/themes/simple/designs/default_design.des.tpl
===================================================================
diff -u -r12579 -r12589
--- branches/5.0.x/themes/simple/designs/default_design.des.tpl (.../default_design.des.tpl) (revision 12579)
+++ branches/5.0.x/themes/simple/designs/default_design.des.tpl (.../default_design.des.tpl) (revision 12589)
@@ -10,8 +10,9 @@
<inp2:st_PageInfo type="title"/> (<inp2:m_GetConfig name="Site_Name"/>)
+
+
-
Index: branches/5.0.x/themes/simple/elements/navigation_menu.elm.tpl
===================================================================
diff -u -r12579 -r12589
--- branches/5.0.x/themes/simple/elements/navigation_menu.elm.tpl (.../navigation_menu.elm.tpl) (revision 12579)
+++ branches/5.0.x/themes/simple/elements/navigation_menu.elm.tpl (.../navigation_menu.elm.tpl) (revision 12589)
@@ -18,7 +18,7 @@
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/side_boxes.elm.tpl
===================================================================
diff -u -r12579 -r12589
--- branches/5.0.x/themes/simple/elements/side_boxes.elm.tpl (.../side_boxes.elm.tpl) (revision 12579)
+++ branches/5.0.x/themes/simple/elements/side_boxes.elm.tpl (.../side_boxes.elm.tpl) (revision 12589)
@@ -1,6 +1,6 @@
-
+
Index: branches/5.0.x/core/admin_templates/js/template_manager.js
===================================================================
diff -u -r12382 -r12589
--- branches/5.0.x/core/admin_templates/js/template_manager.js (.../template_manager.js) (revision 12382)
+++ branches/5.0.x/core/admin_templates/js/template_manager.js (.../template_manager.js) (revision 12589)
@@ -125,6 +125,9 @@
var $clone = $me.clone();
$clone.empty().attr('title', '');
+ // in case if "a" tag is "display: block", then make "span" the same
+ $clone.css('display', $parent_link.css('display'));
+
$parent_link.html( $me.html() ).wrap($clone);
$parent_link.before('
');
$parent_link.prev('div.cms-edit-btn:first').click(TemplateManager.prototype.translatePhrase);
Index: branches/5.0.x/core/kernel/utility/debugger/debugger.css
===================================================================
diff -u -r12117 -r12589
--- branches/5.0.x/core/kernel/utility/debugger/debugger.css (.../debugger.css) (revision 12117)
+++ branches/5.0.x/core/kernel/utility/debugger/debugger.css (.../debugger.css) (revision 12589)
@@ -86,13 +86,15 @@
border: 1px solid #000000;
background-color: #D4D0C8;
border-collapse: separate;
+ border-spacing: 2px;
width: auto;
}
.dbg-toolbar td {
font-size: 13px;
font-family: Tahoma;
padding: 1px 5px 1px 5px;
+ vertical-align: middle;
margin: 3px;
}
Index: branches/5.0.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -r12533 -r12589
--- branches/5.0.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 12533)
+++ branches/5.0.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 12589)
@@ -1,6 +1,6 @@
Application->ConfigValue('Root_Name');
- return $this->Application->Phrase($root_phrase);
+ $phrase_name = $this->Application->ConfigValue('Root_Name');
+ $no_editing = array_key_exists('no_editing', $params) && $params['no_editing'];
+
+ return $this->Application->Phrase($phrase_name, !$no_editing);
}
/**