\
{TITLE} ({STATUS_LABEL})\
{DATETIME}
\
@@ -236,48 +273,69 @@
$revision_container.empty();
if ( $.isArray(this.pageInfo.revisions) ) {
- // no revisions yet
+ return;
}
- else {
- for (var $revision in this.pageInfo.revisions) {
- var $html = $revision_mask,
- $revision_info = this.pageInfo.revisions[$revision];
- for (var $field in $revision_info) {
- $html = $html.replace( new RegExp('{' + $field.toUpperCase() + '}', 'g'), $revision_info[$field] );
- }
+ $.each(this.pageInfo.revisions, function ($revision_number, $revision_info) {
+ var $html = $revision_mask;
- $html = $html.replace(/{CLASS}/g, $class_mapping[$revision_info.status] );
+ $.each($revision_info, function ($field, $value) {
+ $html = $html.replace(new RegExp('{' + $field.toUpperCase() + '}', 'g'), $value);
+ });
+ $html = $html.replace(/{CLASS}/g, $me.revisionStatusMap[$revision_info.status]);
+
- if ( $revision_info['draft'] ) {
+ if ( $revision_info['draft'] ) {
- $html = $html.replace(/{LINK}/g, this.browseUrl.replace('#EDITING_MODE#', 2) );
+ $html = $html.replace(/{LINK}/g, $me.browseUrl.replace('#EDITING_MODE#', '2'));
- }
- else {
+ }
+ else {
- $html = $html.replace(/{LINK}/g, this.browseUrl.replace('#EDITING_MODE#', 2) + '&revision=' + $revision.substr(1) );
+ $html = $html.replace(/{LINK}/g, $me.browseUrl.replace('#EDITING_MODE#', '2') + '&revision=' + $revision_number.substr(1));
- }
+ }
- $revision_container.append($html);
+ $revision_container.append($html);
+ });
+};
+
+TemplateManager.prototype.inlineEditorFocus = function ($editor_event) {
+ var $container = $($editor_event.editor.element.$).parent('.cms-edit-btn-container');
+
+ $container.removeClass('mode-inline-edit');
+};
+
+TemplateManager.prototype.inlineEditorBlur = function ($editor_event) {
+ var $me = this,
+ $element = $($editor_event.editor.element.$),
+ $container = $element.parent('.cms-edit-btn-container'),
+ $url_params = {},
+ $content_id = $container.data('content-id');
+
+ if ( $element.data('no_save_on_blur') === true ) {
+ $element.data('no_save_on_blur', null);
+ return;
- }
+ }
- $('.item', '#cms-revision-dropdown .top').each(
- function () {
- var $row = $(this);
+ $element.css('position', 'static');
+ $container.addClass('mode-inline-saving');
- $('a:first', $row).click(
- function ($e) {
- $e.stopPropagation();
+ $url_params["content[" + $content_id + "][" + this.languagePrefix + "Content]"] = $editor_event.editor.getData();
+
+ $.post(
+ this.saveContentUrl,
+ $url_params,
+ function ($data) {
+ if ( $data != 'OK' ) {
+ return;
- }
+ }
- );
- $row.click(
- function ($e) {
- window.location.href = $('a:first', this).attr('href');
+ if ( $me.revisionToolbarEnabled() ) {
+ $me.requirePageInfoUpdate(true);
- }
+ }
- );
+
+ $element.css('position', 'relative');
+ $container.removeClass('mode-inline-saving').addClass('mode-inline-edit');
- }
- );
+ }
+ );
- }
-}
+};
TemplateManager.prototype.revisionToolbarClick = function ($button_name) {
// console.log('button ', $button_name, ' clicked');
@@ -293,113 +351,105 @@
$form_name = 'kf_revisions_' + this.pageId;
submit_event('page-revision', $button_event_map[$button_name]);
- return ;
+ return;
}
switch ( $button_name ) {
case 'preview':
var $url = this.browseUrl.replace('#EDITING_MODE#', 0).replace(/&(admin|editing_mode)=[\d]/g, '');
- window.open( $url + '&preview=1' );
+ window.open($url + '&preview=1');
break;
case 'history':
$('#cms-revision-dropdown').toggle();
break;
}
-}
+};
TemplateManager.prototype.setupEditTranslationButtons = function ($container) {
- $("span[name='cms-translate-phrase']", $container).each(
- function() {
- var $me = $(this);
- var $parent_link = $me.parents('a:first');
+ $("span[name='cms-translate-phrase']", $container).each(function() {
+ var $me = $(this),
+ $parent_link = $me.parents('a:first');
- if ($parent_link.length == 0) {
+ if ( $parent_link.length == 0 ) {
- // span in not inside "a" tag
+ // span in not inside "a" tag
-
- $me.prepend('
');
- $('div.cms-edit-btn:first', $me).click(TemplateManager.prototype.translatePhrase);
+ $me.prepend('
');
+ $('div.cms-edit-btn:first', $me).click(TemplateManager.prototype.translatePhrase);
- $me.dblclick(
- function ($e) {
+
+ $me.dblclick(function ($e) {
- $('div.cms-edit-btn:first', this).click();
+ $('div.cms-edit-btn:first', this).click();
- return false;
- }
- );
+ $e.preventDefault();
+ });
+
- var $effect_element = $me;
- }
- else {
- // span is inside "a" tag
- var $clone = $me.clone();
- $clone.empty().attr('title', '');
+ var $effect_element = $me;
+ }
+ else {
+ // span is inside "a" tag
+ 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'));
+ // 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.html($me.html()).wrap($clone);
- $parent_link.before('
');
- $parent_link.prev('div.cms-edit-btn:first').click(TemplateManager.prototype.translatePhrase);
+ $parent_link.before('
');
+ $parent_link.prev('div.cms-edit-btn:first').click(TemplateManager.prototype.translatePhrase);
- var $effect_element = $parent_link.parents("span[name='cms-translate-phrase']:first");
- }
+ var $effect_element = $parent_link.parents("span[name='cms-translate-phrase']:first");
+ }
- $effect_element
+ $effect_element
- .mouseover(
- function($e) {
+ .mouseover(function($e) {
- $('div.cms-edit-btn', this).css('display', 'inline');
+ $('div.cms-edit-btn', this).css('display', 'inline');
- }
- )
- .mouseout(
- function($e) {
+ })
+ .mouseout(function($e) {
- $('div.cms-edit-btn', this).hide();
+ $('div.cms-edit-btn', this).hide();
- }
- );
- }
- );
-}
+ });
+ });
+};
TemplateManager.prototype.translatePhrase = function ($e) {
var $translate_url = $(this).parents("span[name='cms-translate-phrase']:first").attr('href');
- if ($translate_url.match(/javascript:(.*)/)) {
+ if ( $translate_url.match(/javascript:(.*)/) ) {
eval(RegExp.$1);
}
else {
window.location.href = $translate_url;
}
- return false;
-}
+ $e.preventDefault();
+};
TemplateManager.prototype.renumberMovableElements = function () {
var $area_index = 0;
+
// 1. dynamically assign IDs to all movable elements
- $('div.movable-area').each(
- function() {
+ $('div.movable-area').each(function () {
- var $element_index = 0;
+ var $element_index = 0;
- $('div.movable-element', this).each(
- function() {
+
+ $('div.movable-element', this).each(function () {
- $(this).attr('id', 'target_order_a' + $area_index + 'e' + $element_index);
- $element_index++;
+ $(this).attr('id', 'target_order_a' + $area_index + 'e' + $element_index);
+ $element_index++;
- }
- );
+ });
- $area_index++;
+ $area_index++;
- }
- );
-}
+ });
+};
TemplateManager.prototype.saveLayout = function () {
// prepare order string
var $sort_order = [];
- $('div.movable-area').each(
- function($area_index) {
+
+ $('div.movable-area').each(function ($area_index) {
- var $order = $(this).sortable('serialize').replace(/target_order\[\]/g, 'target_order[' + $area_index + '][]');
+ var $order = $(this).sortable('serialize').replace(/target_order\[\]/g, 'target_order[' + $area_index + '][]');
+
- if ($order) {
+ if ( $order ) {
- $sort_order.push($order);
- }
+ $sort_order.push($order);
+ }
- }
- );
+ });
+
$sort_order = $sort_order.join('&');
// save order string
@@ -411,7 +461,7 @@
onDataReceived: function ($data) {
var $message = '';
- if ($data == 'OK') {
+ if ( $data == 'OK' ) {
$message = 'New Layout Saved';
$('div.cms-layout-btn-container').hide();
$me.renumberMovableElements();
@@ -426,13 +476,13 @@
}
};
- TB.setWindowTitle( window.top.document.title.replace(main_title + ' :: ', '') );
+ TB.setWindowTitle(window.top.document.title.replace(main_title + ' :: ', ''));
TB.show($settings);
-}
+};
TemplateManager.prototype.cancelLayout = function () {
window.location.href = window.location.href;
-}
+};
TemplateManager.prototype.onBtnClick = function ($e, $element) {
var $id = $element.id.replace(/_btn$/, '');
@@ -442,20 +492,21 @@
direct_edit('theme-file', $url);
$e.stopPropagation();
-}
+};
TemplateManager.prototype.onMouseOver = function ($e, $element) {
- if (this.inDrag) {
+ if ( this.inDrag ) {
- return ;
+ return;
}
$element = $($element);
- if ($element.hasClass('block-edit-design-btn-container')) {
+ if ( $element.hasClass('block-edit-design-btn-container') ) {
$($element).addClass('block-edit-design-btn-container-over');
var $button_group = $('div.cms-edit-design-btn-container:first', $element);
+
- if ($button_group.length) {
+ if ( $button_group.length ) {
$button_group.show();
}
else {
@@ -468,20 +519,21 @@
}
$e.stopPropagation();
-}
+};
TemplateManager.prototype.onMouseOut = function ($e, $element) {
- if (this.inDrag) {
+ if ( this.inDrag ) {
- return ;
+ return;
}
$element = $($element);
- if ($element.hasClass('block-edit-design-btn-container')) {
+ if ( $element.hasClass('block-edit-design-btn-container') ) {
$($element).removeClass('block-edit-design-btn-container-over');
var $button_group = $('div.cms-edit-design-btn-container:first', $element);
+
- if ($button_group.length) {
+ if ( $button_group.length ) {
$button_group.hide();
}
else {
@@ -494,61 +546,55 @@
}
$e.stopPropagation();
-}
+};
TemplateManager.prototype.searchBlocks = function () {
var $design_containers = $('div.block-edit-design-btn-container');
var $block_containers = $('div.block-edit-block-btn-container');
- $design_containers.each(
- function() {
+ $design_containers.each(function () {
- var $block_container = $('div.block-edit-block-btn-container:first', this);
+ var $block_container = $('div.block-edit-block-btn-container:first', this);
- if ($block_container.length) {
+ if ( $block_container.length ) {
- $block_containers = $block_containers.not($block_container);
+ $block_containers = $block_containers.not($block_container);
- // place "Edit Block" button near "Edit Design" button
- var $edit_design_btn = $('.cms-edit-design-btn:first', this);
- var $edit_block_btn = $('.cms-edit-block-btn:first', $block_container);
+ // place "Edit Block" button near "Edit Design" button
+ 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('
')
+ $edit_design_btn
+ .wrap('
')
- .before( $edit_block_btn.clone() );
+ .before($edit_block_btn.clone());
- $edit_block_btn.remove();
+ $edit_block_btn.remove();
- // make "hint" from "Edit Block" button container main
- $(this).attr('title', $block_container.attr('title'));
- $block_container.attr('title', '');
+ // make "hint" from "Edit Block" button container main
+ $(this).attr('title', $block_container.attr('title'));
+ $block_container.attr('title', '');
- TemplateManager.prototype.registerBlock.call(aTemplateManager, $block_container.get(0), ['hover']);
- }
+ TemplateManager.prototype.registerBlock.call(aTemplateManager, $block_container.get(0), ['hover']);
+ }
- TemplateManager.prototype.registerBlock.call(aTemplateManager, this, ['dblclick']);
+ TemplateManager.prototype.registerBlock.call(aTemplateManager, this, ['dblclick']);
- }
- );
+ });
- $block_containers.each(
- function() {
+ $block_containers.each(function() {
- TemplateManager.prototype.registerBlock.call(aTemplateManager, this);
+ TemplateManager.prototype.registerBlock.call(aTemplateManager, this);
- }
- );
+ });
-// $('div').each (
-// function () {
-// /*var $id = $(this).attr('id');
-//
-// if (!$id || $id.match(/parser_block\[.*\].*_btn$/) || !$id.match(/parser_block\[.*\]/)) {
-// // skip other divs
-// return true;
-// }*/
-//
-//
-// TemplateManager.prototype.registerBlock.call(aTemplateManager, this);
-// }
-// );
-}
+ /*$('div').each (function () {
+ *//*var $id = $(this).attr('id');
+ if ( !$id || $id.match(/parser_block\[.*\].*_btn$/) || !$id.match(/parser_block\[.*\]/) ) {
+ // skip other divs
+ return true;
+ }*//*
+
+
+ TemplateManager.prototype.registerBlock.call(aTemplateManager, this);
+ });*/
+};
+
TemplateManager.prototype.registerBlock = function ($element, $skip_events) {
var $params = $element.getAttribute('params').split(':');
@@ -559,38 +605,29 @@
var $btn = document.getElementById($element.id + '_btn');
- $($btn).click(
- function(ev) {
+ $($btn).click(function (ev) {
- TemplateManager.prototype.onBtnClick.call(aTemplateManager, ev, this);
+ TemplateManager.prototype.onBtnClick.call(aTemplateManager, ev, this);
- }
- );
+ });
- if ($skip_events === undefined) {
+ if ( $skip_events === undefined ) {
$skip_events = [];
}
- if (!in_array('dblclick', $skip_events)) {
+ if ( !in_array('dblclick', $skip_events) ) {
- $($element)
- .dblclick(
- function(ev) {
+ $($element).dblclick(function (ev) {
- TemplateManager.prototype.onBtnClick.call(aTemplateManager, ev, this);
+ TemplateManager.prototype.onBtnClick.call(aTemplateManager, ev, this);
+ });
- }
+ }
- )
- }
- if (!in_array('hover', $skip_events)) {
+ if ( !in_array('hover', $skip_events) ) {
$($element)
- .mouseover(
- function(ev) {
+ .mouseover(function (ev) {
- TemplateManager.prototype.onMouseOver.call(aTemplateManager, ev, this);
+ TemplateManager.prototype.onMouseOver.call(aTemplateManager, ev, this);
- }
- )
- .mouseout(
- function(ev) {
+ })
+ .mouseout(function (ev) {
- TemplateManager.prototype.onMouseOut.call(aTemplateManager, ev, this);
+ TemplateManager.prototype.onMouseOut.call(aTemplateManager, ev, this);
+ });
- }
+ }
- );
- }
this._blockOrder.push($element.id);
-}
\ No newline at end of file
+};
\ No newline at end of file
Index: core/admin_templates/incs/cms.css
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/incs/cms.css (revision 15892)
+++ core/admin_templates/incs/cms.css (revision )
@@ -14,6 +14,7 @@
div.cms-btn-content {
padding: 5px;
+ min-height: 15px;
}
.cms-edit-btn {
@@ -94,7 +95,32 @@
}
div.cms-edit-btn-container {
+ position: relative;
border: 1px dashed #FF6E00;
+}
+
+.cms-edit-btn-container[data-content-id] .cms-btn-content { padding: 0; min-height: 25px; }
+.cms-edit-btn-container .inline-edit-layer, .cms-edit-btn-container .inline-saving-layer { display: none; }
+
+.cms-edit-btn-container.mode-inline-edit .inline-edit-layer { display: block; }
+
+.cms-edit-btn-container .inline-edit-layer {
+ position: absolute;
+ background: url(@templates_base@/img/top_frame/icons/content_mode.png) center no-repeat;
+ width: 20px;
+ height: 20px;
+ top: 0px;
+ right: 0px;
+}
+
+.cms-edit-btn-container.mode-inline-saving .inline-saving-layer { display: block; }
+
+.cms-edit-btn-container .inline-saving-layer {
+ position: absolute;
+ background: url(@templates_base@/img/top_frame/icons/saving_indicator.gif) no-repeat 100% 0px rgba(255, 255, 255, .9);
+ width: 100%;
+ top: 0px;
+ bottom: 0px;
}
div.cms-edit-btn {
\ No newline at end of file