Index: admin_templates/incs/cms.css =================================================================== --- admin_templates/incs/cms.css (revision 15165) +++ admin_templates/incs/cms.css (working copy) @@ -16,21 +16,25 @@ padding: 5px; } -div.cms-section-properties-btn, div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn { +.cms-edit-btn { padding: 2px 5px; font-family: Arial, Verdana; font-size: 13px; font-weight: normal; - width: auto; - position: absolute; color: black; cursor: pointer; + border-radius: 10px; -moz-border-radius: 10px; -webkit-border-radius: 10px; +} + +.cms-section-properties-btn, .cms-edit-btn, .cms-edit-block-btn, .cms-edit-design-btn { + width: auto; + position: absolute; z-index: 99; } -div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn { +.cms-edit-btn, .cms-edit-block-btn, .cms-edit-design-btn { margin-top: -10px; } @@ -41,25 +45,23 @@ display: none; } -div.cms-edit-design-btn-container div.cms-edit-block-btn, div.cms-edit-design-btn-container div.cms-edit-design-btn { +div.cms-edit-design-btn-container .cms-edit-block-btn, div.cms-edit-design-btn-container .cms-edit-design-btn { float: left; display: block; position: relative; margin: 0px; } -div.cms-edit-design-btn-container div.cms-edit-design-btn { +div.cms-edit-design-btn-container .cms-edit-design-btn { margin-left: 4px; } /* === Styles for "Section Properties" button === */ -div.cms-section-properties-btn { +.cms-section-properties-btn { float: right; position: relative; - border: 2px solid #A1D0A1; + border-color: #A1D0A1; background-color: #CCFF00; - opacity: 0.5; - filter: alpha(opacity=50); } div.cms-section-properties-btn-container { @@ -68,32 +70,60 @@ } /* === Styles for "Edit" button === */ +.cms-btn-new { + cursor: pointer; + background: url(@templates_base@/img/top_frame/icons/content_mode.png) #CCFF00 3px center no-repeat; + padding: 2px 2px 2px 17px; + + border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border: 2px solid #A1D0A1; + opacity: 0.5; + filter: alpha(opacity=50); + + color: black; + font-family: Arial, Verdana; + font-size: 13px; + font-weight: normal; +} + +.cms-btn-new:hover { + opacity: 1; + filter: alpha(opacity=100); +} + div.cms-edit-btn-container { border: 1px dashed #FF6E00; } div.cms-edit-btn { - margin-left: -10px; border: 2px solid #FF6E00; - background-color: #FFCC00; - opacity: 0.5; - filter: alpha(opacity=50); } -div.cms-edit-block-btn { +.cms-edit-btn { margin-left: -10px; - border: 2px solid #FF6E00; + border-color: #FF6E00; background-color: #FFCC00; +} + +.cms-edit-block-btn { + border-color: #FF6E00; + background-color: #FFCC00; display: none; } -div.cms-edit-design-btn { - margin-left: -10px; - border: 2px solid #A1D0A1; +.cms-edit-design-btn { + border-color: #A1D0A1; background-color: #CCFF00; display: none; } +.admin-edit-btn { + border-color: #A1D0A1; + background-color: #CCFF00; +} + /* === Styles for "Save" and "Cancel" buttons (for layout) === */ div.cms-layout-btn-container { position: absolute; @@ -101,34 +131,24 @@ z-index: 99; } -div.cms-save-layout-btn, div.cms-cancel-layout-btn { +.cms-save-layout-btn, .cms-cancel-layout-btn { float: left; - padding: 2px 5px; - font-family: Arial, Verdana; - font-size: 13px; - font-weight: normal; width: auto; - color: black; - cursor: pointer; - /*opacity: 0.5; - filter: alpha(opacity=50);*/ - -moz-border-radius: 10px; - -webkit-border-radius: 10px; } -div.cms-save-layout-btn { +.cms-save-layout-btn { color: white; - border: 2px solid #1C960C; + border-color: #1C960C; background-color: #24B30D; } -div.cms-cancel-layout-btn { +.cms-cancel-layout-btn { color: white; - border: 2px solid #C81900; + border-color: #C81900; background-color: #DE2A00; } -div.cms-cancel-layout-btn { +.cms-cancel-layout-btn { margin-left: 4px; } @@ -137,6 +157,11 @@ border: 1px dashed transparent; } +div.block-edit-block-btn-container .cms-btn-new, div.block-edit-design-btn-container .cms-btn-new { + opacity: 1; + filter: alpha(opacity = 100); +} + div.block-edit-block-btn-container-over, div.block-edit-design-btn-container-over { border-color: #FF6E00; } @@ -171,7 +196,7 @@ font-size: 9px; } -span[name='cms-translate-phrase'] .cms-edit-btn { +span[name='cms-translate-phrase'] .cms-edit-btn, span[name='cms-translate-phrase'] .admin-edit-btn { display: none; opacity: 1; filter: alpha(opacity=100); Index: admin_templates/incs/cms_ie.css =================================================================== --- admin_templates/incs/cms_ie.css (revision 0) +++ admin_templates/incs/cms_ie.css (revision 0) @@ -0,0 +1,3 @@ +.cms-btn-new { + padding-left: 20px; +} \ No newline at end of file Property changes on: admin_templates\incs\cms_ie.css ___________________________________________________________________ Added: svn:eol-style + LF Index: admin_templates/js/template_manager.js =================================================================== --- admin_templates/js/template_manager.js (revision 15165) +++ admin_templates/js/template_manager.js (working copy) @@ -47,12 +47,13 @@ if ($template_manager.editingMode > 1) { // all modes except for "Browse Mode" - $hover_effect.push('div.cms-section-properties-btn:first'); +// $hover_effect.push('div.cms-section-properties-btn:first'); } if ($template_manager.editingMode == 2) { // Content Mode - $hover_effect.push('div.cms-edit-btn'); +// $hover_effect.push('div.cms-edit-btn'); +// $hover_effect.push('div.admin-edit-btn'); // make all spans with phrases clickable $template_manager.setupEditTranslationButtons(document); @@ -104,17 +105,19 @@ } // make requested elements fully visible on mouseover - $($hover_effect.join(', ')) - .mouseover( - function(e) { - $(this).css('opacity', 1); - } - ) - .mouseout( - function(e) { - $(this).css('opacity', 0.5); - } - ); + if ( $hover_effect.length ) { + $($hover_effect.join(', ')) + .mouseover( + function(e) { + $(this).css('opacity', 1); + } + ) + .mouseout( + function(e) { + $(this).css('opacity', 0.5); + } + ); + } // related to content revision control toolbar $('#cms-toggle-revision-toolbar').click( @@ -456,12 +459,12 @@ $button_group.show(); } else { - $('div.cms-edit-design-btn:first', $element).show(); + $('.cms-edit-design-btn:first', $element).show(); } } else { $($element).addClass('block-edit-block-btn-container-over'); - $('div.cms-edit-block-btn:first', $element).show(); + $('.cms-edit-block-btn:first', $element).show(); } $e.stopPropagation(); @@ -482,12 +485,12 @@ $button_group.hide(); } else { - $('div.cms-edit-design-btn:first', $element).hide(); + $('.cms-edit-design-btn:first', $element).hide(); } } else { $($element).removeClass('block-edit-block-btn-container-over'); - $('div.cms-edit-block-btn:first', $element).hide(); + $('.cms-edit-block-btn:first', $element).hide(); } $e.stopPropagation(); @@ -505,8 +508,8 @@ $block_containers = $block_containers.not($block_container); // place "Edit Block" button near "Edit Design" button - var $edit_design_btn = $('div.cms-edit-design-btn:first', this); - var $edit_block_btn = $('div.cms-edit-block-btn:first', $block_container); + var $edit_design_btn = $('.cms-edit-design-btn:first', this); + var $edit_block_btn = $('.cms-edit-block-btn:first', $block_container); $edit_design_btn .wrap('
') Index: install/english.lang =================================================================== --- install/english.lang (revision 15255) +++ install/english.lang (working copy) @@ -20,6 +20,7 @@