' . $edit_btn . '
';
}
@@ -1548,6 +1647,29 @@
}
if ($display_mode != 'end') {
+ if ( EDITING_MODE == EDITING_MODE_CONTENT ) {
+ $url_params = Array(
+ 'pass' => 'm',
+ 'm_opener' => 'd',
+ 'm_cat_id' => $page->GetID(),
+ '__URLENCODE__' => 1,
+ '__NO_REWRITE__'=> 1,
+ 'front' => 1,
+ 'index_file' => 'index.php',
+ );
+
+ $revision = $this->Application->GetVar('revision');
+
+ if ( $revision ) {
+ $url_params['revision'] = $revision;
+ }
+
+ $page_admin_url = $this->Application->HREF('', ADMIN_DIRECTORY, $url_params);
+ $edit_code .= '
';
+ }
+
$edit_code .= '
';
// when "EditingScripts" tag is not used, make sure, that scripts are also included
@@ -1557,6 +1679,13 @@
return $edit_code;
}
+ function toolbarButton($name, $title, $tabs)
+ {
+ $phrase = $this->Application->Phrase($title, false, true);
+
+ return $tabs . 'a_toolbar.AddButton( new ToolBarButton("' . $name . '", "' . htmlspecialchars($phrase) . '") );';
+ }
+
function _getThemeFileId()
{
$template = $this->Application->GetVar('t');
Index: branches/5.2.x/core/admin_templates/img/top_frame/revision_control/history_item_background_hover.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/5.2.x/core/admin_templates/js/script.js
===================================================================
diff -u -N -r14705 -r14856
--- branches/5.2.x/core/admin_templates/js/script.js (.../script.js) (revision 14705)
+++ branches/5.2.x/core/admin_templates/js/script.js (.../script.js) (revision 14856)
@@ -130,6 +130,29 @@
set_hidden_field('remove_specials[' + prefix_special + ']', null);
}
+function submit_event_ajax(prefix_special, event, t, $callback) {
+ if ( !Application.processHooks(prefix_special + ':' + event) ) {
+ return false;
+ }
+
+ if (event) {
+ set_hidden_field('events[' + prefix_special + ']', event);
+ }
+
+ if (t) {
+ set_hidden_field('t', t);
+ }
+
+ var $form = $('#kernel_form'),
+ $from_params = $form.serialize();
+
+ $.post($form.attr('action'), $from_params, $callback);
+
+ // reset remove special mark (otherwise all future events will have special removed too)
+ set_hidden_field('events[' + prefix_special + ']', '');
+ set_hidden_field('remove_specials[' + prefix_special + ']', null);
+}
+
function submit_action($url, $action)
{
$form = document.getElementById($form_name);
Index: branches/5.2.x/core/admin_templates/img/top_frame/revision_control/history_item_background.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/5.2.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r14855 -r14856
--- branches/5.2.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 14855)
+++ branches/5.2.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 14856)
@@ -1,6 +1,6 @@
reset();
- $object->linkToParent( $this->getMainSpecial($event) );
+ if ( $event->getEventParam('skip_parent_filter') === false ) {
+ $object->linkToParent( $this->getMainSpecial($event) );
+ }
$this->AddFilters($event);
$this->SetCustomQuery($event); // new!, use this for dynamic queries based on specials for ex.
Index: branches/5.2.x/core/admin_templates/js/template_manager.js
===================================================================
diff -u -N -r14244 -r14856
--- branches/5.2.x/core/admin_templates/js/template_manager.js (.../template_manager.js) (revision 14244)
+++ branches/5.2.x/core/admin_templates/js/template_manager.js (.../template_manager.js) (revision 14856)
@@ -1,13 +1,18 @@
-function TemplateManager ($edit_url, $browse_url, $save_layout_url, $edting_mode) {
- this._editUrl = $edit_url;
- this.browseUrl = $browse_url;
- this._saveLayoutUrl = $save_layout_url;
- this.editingMode = $edting_mode; // from {1 - browse, 2 - content, 3 - design}
+function TemplateManager ( $settings ) {
+ this.pageId = 0;
+ this.editUrl = '';
+ this.browseUrl = '';
+ this.saveLayoutUrl = '';
+ this.editingMode = 0; // from {1 - browse, 2 - content, 3 - design}
+ this.pageInfo = {editors: [], revisions: {}}; // information about page in "Content Mode"
+
this._blocks = {};
this._blockOrder = Array ();
this.inDrag = false; // don't process mouse over/out events while in drag mode
+ $.extend(this, $settings);
+
var $template_manager = this;
$(document).ready(
@@ -51,6 +56,20 @@
// make all spans with phrases clickable
$template_manager.setupEditTranslationButtons(document);
+
+ // hide "Revision History" div on every body click (bubbled), but not a "toolbar button", that opens it
+ $('body').click(
+ function ($e) {
+ var $target = $($e.target),
+ $id = $target.attr('id');
+
+ if ( $id && ($id == 'tool_history' || $id == 'div_history') ) {
+ return ;
+ }
+
+ $('#cms-revision-dropdown:visible').hide();
+ }
+ );
}
if ($template_manager.editingMode == 3) {
@@ -96,10 +115,196 @@
$(this).css('opacity', 0.5);
}
);
+
+ // related to content revision control toolbar
+ $('#cms-toggle-revision-toolbar').click(
+ function ($e) {
+ var $me = $(this);
+
+ if ( $me.hasClass('opened') ) {
+ var $height = $('#cms-revision-toolbar').height();
+
+ $('#cms-revision-toolbar-layer').animate({top: (-1) * $height}, 'fast');
+ $('#cms-editing-notice, #cms-revision-dropdown').hide();
+ setCookie('toolbar_hidden', 1);
+ }
+ else {
+ $('#cms-revision-toolbar-layer').animate({top: 0}, 'fast');
+ setCookie('toolbar_hidden', 0);
+ }
+
+ $me.toggleClass('opened');
+
+ return false;
+ }
+ );
+
+ $('#cms-close-toolbar').click(
+ function () {
+ var $height = $('#cms-revision-toolbar').height();
+
+ $('#cms-toggle-revision-toolbar').removeClass('opened');
+ $('#cms-revision-toolbar-layer').css('top', (-1) * $height);
+
+ $('#cms-editing-notice, #cms-revision-dropdown').hide();
+ setCookie('toolbar_hidden', 1);
+
+ return false;
+ }
+ );
+
+ $('#cms-close-editing-notice').click(
+ function () {
+ $('#cms-editing-notice').hide();
+
+ return false;
+ }
+ );
+
+ $('.toolbar-button', '#cms-revision-toolbar').click(
+ function ($e) {
+ var $button_name = $(this).attr('id').replace(/^(tool|div)_/, '');
+
+ $template_manager.revisionToolbarClick($button_name);
+ }
+ );
+
+ setInterval(
+ function () {
+ $.getJSON(
+ $('#kf_revisions_' + $template_manager.pageId).attr('action') + '&events[page-revision]=OnGetInfo',
+ function ($data) {
+ $template_manager.pageInfo = $data;
+ $template_manager.processPageInfo();
+ }
+ );
+ }, 20 * 1000 // 20 seconds
+ );
+
+ if ( !$.isEmptyObject($template_manager.pageInfo) ) {
+ $template_manager.processPageInfo();
+ }
}
);
}
+TemplateManager.prototype.processPageInfo = function () {
+ var $class_mapping = {
+ 1: 'cms-revision-published',
+ 2: 'cms-revision-pending',
+ 0: 'cms-revision-declined'
+ };
+
+ var $title = $('.revision-title', '#cms-current-revision-info');
+
+ $title.html( this.pageInfo.current_revision.title );
+ $('.draft-saved', '#cms-current-revision-info').html( this.pageInfo.current_revision.saved );
+
+ for (var $status in $class_mapping) {
+ $title.toggleClass( $class_mapping[$status], $status === this.pageInfo.current_revision.status );
+ }
+
+ if ( $('#cms-toggle-revision-toolbar').hasClass('opened') ) {
+ var $notice = $('#cms-editing-notice');
+
+ if ( this.pageInfo.editors.length ) {
+ if ( $('span:first', $notice).attr('prev_editors') != this.pageInfo.editors.join(',') ) {
+ // show notice, only when editors change occurs
+ $('span:first', $notice).html(this.pageInfo.editors_warning).attr('prev_editors', this.pageInfo.editors.join(','));
+
+ if ( $notice.is(':hidden') ) {
+ $notice.fadeIn();
+ }
+ }
+ }
+ else if ( $notice.is(':visible') ) {
+ $notice.fadeOut();
+ }
+ }
+
+ var $revision_container = $('.top', '#cms-revision-dropdown'),
+ $revision_mask = '
\
+
{TITLE} ({STATUS_LABEL})\
+
{DATETIME}
\
+
{AUTHOR}
\
+
\
+
';
+
+ $revision_container.empty();
+
+ if ( $.isArray(this.pageInfo.revisions) ) {
+ // no revisions yet
+ }
+ 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] );
+ }
+
+ $html = $html.replace(/{CLASS}/g, $class_mapping[$revision_info.status] );
+
+ if ( $revision_info['draft'] ) {
+ $html = $html.replace(/{LINK}/g, this.browseUrl.replace('#EDITING_MODE#', 2) );
+ }
+ else {
+ $html = $html.replace(/{LINK}/g, this.browseUrl.replace('#EDITING_MODE#', 2) + '&revision=' + $revision.substr(1) );
+ }
+
+ $revision_container.append($html);
+ }
+
+ $('.item', '#cms-revision-dropdown .top').each(
+ function () {
+ var $row = $(this);
+
+ $('a:first', $row).click(
+ function ($e) {
+ $e.stopPropagation();
+ }
+ );
+
+ $row.click(
+ function ($e) {
+ window.location.href = $('a:first', this).attr('href');
+ }
+ );
+ }
+ );
+ }
+}
+
+TemplateManager.prototype.revisionToolbarClick = function ($button_name) {
+// console.log('button ', $button_name, ' clicked');
+
+ var $button_event_map = {
+ 'select': 'OnSave',
+ 'delete': 'OnDiscard',
+ 'approve': 'OnPublish',
+ 'decline': 'OnDecline'
+ };
+
+ if ( $button_event_map[$button_name] !== undefined ) {
+ $form_name = 'kf_revisions_' + this.pageId;
+ submit_event('page-revision', $button_event_map[$button_name]);
+
+ 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' );
+ break;
+
+ case 'history':
+ $('#cms-revision-dropdown').toggle();
+ break;
+ }
+}
+
TemplateManager.prototype.setupEditTranslationButtons = function ($container) {
$("span[name='cms-translate-phrase']", $container).each(
function() {
@@ -198,7 +403,7 @@
var $me = this;
var $settings = {
- url: this._saveLayoutUrl + '&' + $sort_order + '&width=200&height=70&modal=true',
+ url: this.saveLayoutUrl + '&' + $sort_order + '&width=200&height=70&modal=true',
caption: 'Layout Saving Result',
onDataReceived: function ($data) {
var $message = '';
@@ -229,7 +434,7 @@
TemplateManager.prototype.onBtnClick = function ($e, $element) {
var $id = $element.id.replace(/_btn$/, '');
var $block_info = this._blocks[$id];
- var $url = this._editUrl.replace('#BLOCK#', $block_info.block_name + ':' + $block_info.function_name).replace('#EVENT#', 'OnLoadBlock');
+ var $url = this.editUrl.replace('#BLOCK#', $block_info.block_name + ':' + $block_info.function_name).replace('#EVENT#', 'OnLoadBlock');
direct_edit('theme-file', $url);
Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_history_f2.gif
===================================================================
diff -u -N
Binary files differ
