/g,'\n');
- o = o.replace(/<\/P>/g,'\r');
- o = o.replace(/<.*?>/g,'');
- o = o.replace(/ /g,'');
- o = '
/g,'>');
- if(content.indexOf('$0')<0) content += cc;
- else content = content.replace(/\$0/,cc);
- content = content.replace(/\n/g,'');
- var pattern = new RegExp(trigger+cc,"gi");
- this.syntaxHighlight('snippets',pattern,content);
- }
- }
- },
-
- readOnly : function() {
- editor.contentEditable = (arguments[0]) ? 'false' : 'true';
- },
-
- complete : function(trigger) {
- var complete = Language.complete;
- for (var i=0; i/g,'\n');
- code = code.replace(/<\/p>/gi,'\r');
- code = code.replace(//i,''); // IE first line fix
- code = code.replace(/
/gi,'\n');
- code = code.replace(/ /gi,'');
- code = code.replace(/\u2009/g,'');
- code = code.replace(/<.*?>/g,'');
- code = code.replace(/</g,'<');
- code = code.replace(/>/g,'>');
- code = code.replace(/&/gi,'&');
- return code;
- },
-
- // put code inside editor
- setCode : function() {
- var code = arguments[0];
- code = code.replace(/\u2009/gi,'');
- code = code.replace(/&/gi,'&');
- code = code.replace(//g,'>');
- editor.innerHTML = '
'+code+'
';
- },
-
-
- // undo and redo methods
- actions : {
- pos : -1, // actual history position
- history : [], // history vector
-
- undo : function() {
- if(editor.innerHTML.indexOf(cc)==-1){
- document.selection.createRange().text = cc;
- this.history[this.pos] = editor.innerHTML;
- }
- this.pos--;
- if(typeof(this.history[this.pos])=='undefined') this.pos++;
- editor.innerHTML = this.history[this.pos];
- CodePress.findString();
- },
-
- redo : function() {
- this.pos++;
- if(typeof(this.history[this.pos])=='undefined') this.pos--;
- editor.innerHTML = this.history[this.pos];
- CodePress.findString();
- },
-
- next : function() { // get next vector position and clean old ones
- if(this.pos>20) this.history[this.pos-21] = undefined;
- return ++this.pos;
- }
- }
-}
-
-Language={};
-window.attachEvent('onload', function() { CodePress.initialize('new');});
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/template_manager/inc/codepress/images/line-numbers.png
===================================================================
diff -u -N -r11427 -r11661
Binary files differ
Index: branches/RC/themes/default2009/platform/template_manager/inc/codepress/languages/html.css
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/template_manager/inc/codepress/languages/html.css (revision 11427)
+++ branches/RC/themes/default2009/platform/template_manager/inc/codepress/languages/html.css (revision 0)
@@ -1,18 +0,0 @@
-/*
- * CodePress color styles for HTML syntax highlighting
- */
-
-b {color:#000080;} /* tags */
-ins, ins b, ins s, ins em {color:gray;} /* comments */
-s, s b {color:#7777e4;} /* attribute values */
-a {color:green;} /* links */
-u {color:#E67300;} /* forms */
-big {color:#db0000;} /* images */
-em, em b {color:#800080;} /* style */
-strong {color:#800000;} /* script */
-tt i {color:darkblue;font-weight:bold;} /* script reserved words */
-
-b.inp-tag {
- color: #CF3E33;
- font-style: italic;
-}
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/template_manager/inc/template_manager.js
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/template_manager/inc/template_manager.js (revision 11610)
+++ branches/RC/themes/default2009/platform/template_manager/inc/template_manager.js (revision 0)
@@ -1,139 +0,0 @@
-function TemplateManager ($edit_url) {
- this._editUrl = $edit_url;
-
- this._blocks = {};
-
- this._blockOrder = Array ();
-
- $(document).ready(
- function() {
- aTemplateManager.searchBlocks();
- }
- );
-}
-
-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#', '');
-
- this.setFullscreen();
-
- TB.show(
- {
- url: $url,
- onDataReceived: TemplateManager.prototype.onDataReceived,
- onAfterShow: function() {
- TemplateManager.prototype.initEditor.call(this);
- }
- }
- );
-
- $e.stopPropagation();
-}
-
-TemplateManager.prototype.setFullscreen = function ($restore) {
- getFrame('head').$FrameResizer.fullScreen($restore);
-}
-
-TemplateManager.prototype.saveBlock = function () {
- var $url = this._editUrl.replace('#BLOCK#', $('#block').val() ).replace('#EVENT#', 'OnSaveBlock');
-
- function_body.toggleEditor(); // disable editor (global variable from edit_template.tpl via ajax)
-
- TB.show(
- {
- url: $url,
- onDataReceived: TemplateManager.prototype.onDataReceived,
- onAfterShow: function() {
- TemplateManager.prototype.initEditor.call(this);
- },
- postParams: $('#template_editor_form').serializeArray()
- }
- );
-
-}
-
-TemplateManager.prototype.cancelEditing = function () {
- TB.remove();
- this.setFullscreen(true);
-}
-
-
-TemplateManager.prototype.onMouseOver = function ($e, $element) {
- $($element).addClass('block-edit-btn-container-over');
- $e.stopPropagation();
-}
-
-TemplateManager.prototype.onMouseOut = function ($e, $element) {
- $($element).removeClass('block-edit-btn-container-over');
- $e.stopPropagation();
-}
-
-TemplateManager.prototype.searchBlocks = function () {
- $('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) {
- var $params = $element.getAttribute('params').split(':');
-
- this._blocks[$element.id] = {
- block_name: $params[0],
- function_name: $params[1]
- };
-
- var $btn = document.getElementById($element.id + '_btn');
-
- $($btn).bind(
- 'click',
- function(ev) {
- TemplateManager.prototype.onBtnClick.call(aTemplateManager, ev, this);
- }
- );
-
- $($element).bind(
- 'mouseover',
- function(ev) {
- TemplateManager.prototype.onMouseOver.call(aTemplateManager, ev, this);
- }
- );
-
- $($element).bind(
- 'mouseout',
- function(ev) {
- TemplateManager.prototype.onMouseOut.call(aTemplateManager, ev, this);
- }
- );
-
- this._blockOrder.push($element.id);
-}
-
-TemplateManager.prototype.onDataReceived = function ($data) {
- if ($data == '0') {
- TB.remove();
- return false;
- }
-
- return true;
-}
-
-TemplateManager.prototype.initEditor = function () {
- var $id = 'function_body';
-
- var $textarea = document.getElementById($id);
- $textarea.id += '_cp';
-
- window[$id] = new CodePress($textarea);
- $( window[$id] ).insertBefore($textarea);
-}
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/template_manager/inc/codepress/engines/khtml.js
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/template_manager/inc/codepress/engines/khtml.js (revision 11427)
+++ branches/RC/themes/default2009/platform/template_manager/inc/codepress/engines/khtml.js (revision 0)
@@ -1 +0,0 @@
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/template_manager/inc/codepress/codepress.js
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/template_manager/inc/codepress/codepress.js (revision 11427)
+++ branches/RC/themes/default2009/platform/template_manager/inc/codepress/codepress.js (revision 0)
@@ -1,138 +0,0 @@
-/*
- * CodePress - Real Time Syntax Highlighting Editor written in JavaScript - http://codepress.org/
- *
- * Copyright (C) 2006 Fernando M.A.d.S.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation.
- *
- * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
- */
-
-CodePress = function(obj) {
- var self = document.createElement('iframe');
- self.textarea = obj;
- self.textarea.disabled = true;
- self.textarea.style.overflow = 'hidden';
- self.style.height = self.textarea.clientHeight +'px';
- self.style.width = self.textarea.clientWidth +'px';
- self.textarea.style.overflow = 'auto';
- self.style.border = '1px solid gray';
- self.frameBorder = 0; // remove IE internal iframe border
- self.style.visibility = 'hidden';
- self.style.position = 'absolute';
- self.options = self.textarea.className;
-
- self.initialize = function() {
- self.editor = self.contentWindow.CodePress;
- self.editor.body = self.contentWindow.document.getElementsByTagName('body')[0];
- self.editor.setCode(self.textarea.value);
- self.setOptions();
- self.editor.syntaxHighlight('init');
- self.textarea.style.display = 'none';
- self.style.position = 'static';
- self.style.visibility = 'visible';
- self.style.display = 'inline';
- }
-
- // obj can by a textarea id or a string (code)
- self.edit = function(obj,language) {
- if(obj) self.textarea.value = document.getElementById(obj) ? document.getElementById(obj).value : obj;
- if(!self.textarea.disabled) return;
- self.language = language ? language : self.getLanguage();
- self.src = CodePress.path+'codepress.html?language='+self.language+'&ts='+(new Date).getTime();
- if(self.attachEvent) self.attachEvent('onload',self.initialize);
- else self.addEventListener('load',self.initialize,false);
- }
-
- self.getLanguage = function() {
- for (language in CodePress.languages)
- if(self.options.match('\\b'+language+'\\b'))
- return CodePress.languages[language] ? language : 'generic';
- }
-
- self.setOptions = function() {
- if(self.options.match('autocomplete-off')) self.toggleAutoComplete();
- if(self.options.match('readonly-on')) self.toggleReadOnly();
- if(self.options.match('linenumbers-off')) self.toggleLineNumbers();
- }
-
- self.getCode = function() {
- return self.textarea.disabled ? self.editor.getCode() : self.textarea.value;
- }
-
- self.setCode = function(code) {
- self.textarea.disabled ? self.editor.setCode(code) : self.textarea.value = code;
- }
-
- self.toggleAutoComplete = function() {
- self.editor.autocomplete = (self.editor.autocomplete) ? false : true;
- }
-
- self.toggleReadOnly = function() {
- self.textarea.readOnly = (self.textarea.readOnly) ? false : true;
- if(self.style.display != 'none') // prevent exception on FF + iframe with display:none
- self.editor.readOnly(self.textarea.readOnly ? true : false);
- }
-
- self.toggleLineNumbers = function() {
- var cn = self.editor.body.className;
- self.editor.body.className = (cn==''||cn=='show-line-numbers') ? 'hide-line-numbers' : 'show-line-numbers';
- }
-
- self.toggleEditor = function() {
- if(self.textarea.disabled) {
- self.textarea.value = self.getCode();
- self.textarea.disabled = false;
- self.style.display = 'none';
- self.textarea.style.display = 'inline';
- }
- else {
- self.textarea.disabled = true;
- self.setCode(self.textarea.value);
- self.editor.syntaxHighlight('init');
- self.style.display = 'inline';
- self.textarea.style.display = 'none';
- }
- }
-
- self.edit();
- return self;
-}
-
-CodePress.languages = {
- csharp : 'C#',
- css : 'CSS',
- generic : 'Generic',
- html : 'HTML',
- java : 'Java',
- javascript : 'JavaScript',
- perl : 'Perl',
- ruby : 'Ruby',
- php : 'PHP',
- text : 'Text',
- sql : 'SQL',
- vbscript : 'VBScript'
-}
-
-
-CodePress.run = function() {
- s = document.getElementsByTagName('script');
- for(var i=0,n=s.length;i
+ *
+ * Contributors :
+ *
+ * Michael Hurni
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU Lesser General Public License as published by the Free Software Foundation.
+ *
+ * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
+ */
+
+
+CodePress = {
+ scrolling : false,
+ autocomplete : true,
+
+ // set initial vars and start sh
+ initialize : function() {
+ if(typeof(editor)=='undefined' && !arguments[0]) return;
+ chars = '|32|46|62|'; // charcodes that trigger syntax highlighting
+ cc = '\u2009'; // control char
+ editor = document.getElementsByTagName('body')[0];
+ document.designMode = 'on';
+ document.addEventListener('keyup', this.keyHandler, true);
+ window.addEventListener('scroll', function() { if(!CodePress.scrolling) CodePress.syntaxHighlight('scroll') }, false);
+ completeChars = this.getCompleteChars();
+// CodePress.syntaxHighlight('init');
+ },
+
+ // treat key bindings
+ keyHandler : function(evt) {
+ keyCode = evt.keyCode;
+ charCode = evt.charCode;
+
+ if((evt.ctrlKey || evt.metaKey) && evt.shiftKey && charCode!=90) { // shortcuts = ctrl||appleKey+shift+key!=z(undo)
+ CodePress.shortcuts(charCode?charCode:keyCode);
+ }
+ else if(completeChars.indexOf('|'+String.fromCharCode(charCode)+'|')!=-1 && CodePress.autocomplete) { // auto complete
+ CodePress.complete(String.fromCharCode(charCode));
+ }
+ else if(chars.indexOf('|'+charCode+'|')!=-1||keyCode==13) { // syntax highlighting
+ CodePress.syntaxHighlight('generic');
+ }
+ else if(keyCode==9 || evt.tabKey) { // snippets activation (tab)
+ CodePress.snippets(evt);
+ }
+ else if(keyCode==46||keyCode==8) { // save to history when delete or backspace pressed
+ CodePress.actions.history[CodePress.actions.next()] = editor.innerHTML;
+ }
+ else if((charCode==122||charCode==121||charCode==90) && evt.ctrlKey) { // undo and redo
+ (charCode==121||evt.shiftKey) ? CodePress.actions.redo() : CodePress.actions.undo();
+ evt.preventDefault();
+ }
+ else if(keyCode==86 && evt.ctrlKey) { // paste
+ // TODO: pasted text should be parsed and highlighted
+ }
+ },
+
+ // put cursor back to its original position after every parsing
+ findString : function() {
+ var sel = window.getSelection();
+ var range = window.document.createRange();
+ var span = window.document.getElementsByTagName('span')[0];
+
+ range.selectNode(span);
+ sel.removeAllRanges();
+ sel.addRange(range);
+ span.parentNode.removeChild(span);
+ //if(self.find(cc))
+ //window.getSelection().getRangeAt(0).deleteContents();
+ },
+
+ // split big files, highlighting parts of it
+ split : function(code,flag) {
+ if(flag=='scroll') {
+ this.scrolling = true;
+ return code;
+ }
+ else {
+ this.scrolling = false;
+ mid = code.indexOf('');
+ if(mid-2000<0) {ini=0;end=4000;}
+ else if(mid+2000>code.length) {ini=code.length-4000;end=code.length;}
+ else {ini=mid-2000;end=mid+2000;}
+ code = code.substring(ini,end);
+ return code;
+ }
+ },
+
+ // syntax highlighting parser
+ syntaxHighlight : function(flag) {
+ //if(document.designMode=='off') document.designMode='on'
+ if(flag!='init') {
+ var span = document.createElement('span');
+ window.getSelection().getRangeAt(0).insertNode(span);
+ }
+
+ o = editor.innerHTML;
+// o = o.replace(/
/g,'\r\n');
+// o = o.replace(/<(b|i|s|u|a|em|tt|ins|big|cite|strong)?>/g,'');
+ //alert(o)
+ o = o.replace(/<(?!span|\/span|br).*?>/gi,'');
+// alert(o)
+// x = o;
+ x = z = this.split(o,flag);
+ //alert(z)
+// x = x.replace(/\r\n/g,'
');
+ x = x.replace(/\t/g, ' ');
+
+
+ if(arguments[1]&&arguments[2]) x = x.replace(arguments[1],arguments[2]);
+
+ for(i=0;i/g,'>');
+ if(content.indexOf('$0')<0) content += cc;
+ else content = content.replace(/\$0/,cc);
+ content = content.replace(/\n/g,'
');
+ var pattern = new RegExp(trigger+cc,'gi');
+ evt.preventDefault(); // prevent the tab key from being added
+ this.syntaxHighlight('snippets',pattern,content);
+ }
+ }
+ },
+
+ readOnly : function() {
+ document.designMode = (arguments[0]) ? 'off' : 'on';
+ },
+
+ complete : function(trigger) {
+ window.getSelection().getRangeAt(0).deleteContents();
+ var complete = Language.complete;
+ for (var i=0; i/g,'\n');
+ code = code.replace(/\u2009/g,'');
+ code = code.replace(/<.*?>/g,'');
+ code = code.replace(/</g,'<');
+ code = code.replace(/>/g,'>');
+ code = code.replace(/&/gi,'&');
+ return code;
+ },
+
+ // put code inside editor
+ setCode : function() {
+ var code = arguments[0];
+ code = code.replace(/\u2009/gi,'');
+ code = code.replace(/&/gi,'&');
+ code = code.replace(//g,'>');
+ editor.innerHTML = code;
+ },
+
+ // undo and redo methods
+ actions : {
+ pos : -1, // actual history position
+ history : [], // history vector
+
+ undo : function() {
+ if(editor.innerHTML.indexOf(cc)==-1){
+ window.getSelection().getRangeAt(0).insertNode(document.createTextNode(cc));
+ this.history[this.pos] = editor.innerHTML;
+ }
+ this.pos--;
+ if(typeof(this.history[this.pos])=='undefined') this.pos++;
+ editor.innerHTML = this.history[this.pos];
+ CodePress.findString();
+ },
+
+ redo : function() {
+ this.pos++;
+ if(typeof(this.history[this.pos])=='undefined') this.pos--;
+ editor.innerHTML = this.history[this.pos];
+ CodePress.findString();
+ },
+
+ next : function() { // get next vector position and clean old ones
+ if(this.pos>20) this.history[this.pos-21] = undefined;
+ return ++this.pos;
+ }
+ }
+}
+
+Language={};
+window.addEventListener('load', function() { CodePress.initialize('new'); }, true);
Index: branches/RC/core/admin_templates/themes/codepress/codepress.html
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/themes/codepress/codepress.html (revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/codepress.html (revision 11661)
@@ -0,0 +1,35 @@
+
+
+
+ CodePress - Real Time Syntax Highlighting Editor written in JavaScript
+
+
+
+
+
+
+
+
+
Index: branches/RC/core/units/general/helpers/themes_helper.php
===================================================================
diff -u -N -r11646 -r11661
--- branches/RC/core/units/general/helpers/themes_helper.php (.../themes_helper.php) (revision 11646)
+++ branches/RC/core/units/general/helpers/themes_helper.php (.../themes_helper.php) (revision 11661)
@@ -193,14 +193,20 @@
*/
function _getTemplateMetaInfo($template, $theme_id)
{
- if (!defined('DBG_NPARSER_FORCE_COMPILE')) {
- $this->Application->InitParser();
- define('DBG_NPARSER_FORCE_COMPILE', 1);
+ static $init_made = false;
+ if (!$init_made) {
+ $this->Application->InitParser(true);
+ $init_made = true;
}
$template = 'theme:' . $this->_themeNames[$theme_id] . '/' . $template;
$template_file = $this->Application->TemplatesCache->GetRealFilename($template); // ".tpl" was added before
+ return $this->parseTemplateMetaInfo($template_file);
+ }
+
+ function parseTemplateMetaInfo($template_file)
+ {
if (!file_exists($template_file)) {
// when template without info it's placed in top category
return Array ();
Index: branches/RC/core/kernel/nparser/compiler.php
===================================================================
diff -u -N -r11610 -r11661
--- branches/RC/core/kernel/nparser/compiler.php (.../compiler.php) (revision 11610)
+++ branches/RC/core/kernel/nparser/compiler.php (.../compiler.php) (revision 11661)
@@ -30,7 +30,7 @@
safeDefine('DBG_IGNORE_FATAL_ERRORS', 1);
$i = $current;
- $this->Application->InitParser();
+ $this->Application->InitParser(true);
while ($i < $total && $i < ($current + 20)) {
$a_template = $templates[$i];
Index: branches/RC/core/admin_templates/js/template_manager.js
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/js/template_manager.js (revision 0)
+++ branches/RC/core/admin_templates/js/template_manager.js (revision 11661)
@@ -0,0 +1,82 @@
+function TemplateManager ($edit_url) {
+ this._editUrl = $edit_url;
+
+ this._blocks = {};
+
+ this._blockOrder = Array ();
+
+ $(document).ready(
+ function() {
+ aTemplateManager.searchBlocks();
+ }
+ );
+}
+
+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');
+
+ openSelector('theme-file', $url);
+
+ $e.stopPropagation();
+}
+
+TemplateManager.prototype.onMouseOver = function ($e, $element) {
+ $($element).addClass('block-edit-btn-container-over');
+ $e.stopPropagation();
+}
+
+TemplateManager.prototype.onMouseOut = function ($e, $element) {
+ $($element).removeClass('block-edit-btn-container-over');
+ $e.stopPropagation();
+}
+
+TemplateManager.prototype.searchBlocks = function () {
+ $('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) {
+ var $params = $element.getAttribute('params').split(':');
+
+ this._blocks[$element.id] = {
+ block_name: $params[0],
+ function_name: $params[1]
+ };
+
+ var $btn = document.getElementById($element.id + '_btn');
+
+ $($btn).bind(
+ 'click',
+ function(ev) {
+ TemplateManager.prototype.onBtnClick.call(aTemplateManager, ev, this);
+ }
+ );
+
+ $($element).bind(
+ 'mouseover',
+ function(ev) {
+ TemplateManager.prototype.onMouseOver.call(aTemplateManager, ev, this);
+ }
+ );
+
+ $($element).bind(
+ 'mouseout',
+ function(ev) {
+ TemplateManager.prototype.onMouseOut.call(aTemplateManager, ev, this);
+ }
+ );
+
+ this._blockOrder.push($element.id);
+}
\ No newline at end of file
Index: branches/RC/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r11649 -r11661
--- branches/RC/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 11649)
+++ branches/RC/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 11661)
@@ -20,8 +20,6 @@
'OnRecalculatePriorities' => Array ('self' => 'add|edit'), // category ordering
'OnItemBuild' => Array ('self' => true), // always allow to view individual categories (regardless of CATEGORY.VIEW right)
'OnUpdatePreviewBlock' => Array ('self' => true), // for FCKEditor integration
-
- 'OnSaveBlock' => Array ('self' => true), // saves RenderElements from Front-End
);
$this->permMapping = array_merge($this->permMapping, $permissions);
@@ -763,9 +761,11 @@
*/
function _templateFound($template, $theme_id = null)
{
- if (!defined('DBG_NPARSER_FORCE_COMPILE')) {
- $this->Application->InitParser();
- define('DBG_NPARSER_FORCE_COMPILE', 1);
+ static $init_made = false;
+
+ if (!$init_made) {
+ $this->Application->InitParser(true);
+ $init_made = true;
}
if (!isset($theme_id)) {
@@ -1283,7 +1283,7 @@
if ($object->GetDBField('IsSystem') == 1) {
if (!$this->_templateFound($object->GetDBField('Template'), $object->GetDBField('ThemeId'))) {
- $object->SetError('Template', 'template_file_missing', 'la_err_TemplateFileMissing');
+ $object->SetError('Template', 'template_file_missing', 'la_error_TemplateFileMissing');
}
}
@@ -1847,25 +1847,6 @@
$this->Application->StoreVar('_editor_preview_content_', $string);
}
-
- /**
- * Saves changed template block
- *
- * @param kEvent $event
- */
- function OnSaveBlock(&$event)
- {
- if (!EDITING_MODE) {
- $event->status = erSTOP;
- echo '0';
- return ;
- }
-
- $template_helper =& $this->Application->recallObject('TemplateHelper');
- /* @var $template_helper TemplateHelper */
-
- $event->status = $template_helper->saveBlock($event) ? erSTOP : erFAIL;
- }
}
?>
\ No newline at end of file
Index: branches/RC/core/units/structure/structure_config.php
===================================================================
diff -u -N -r11635 -r11661
--- branches/RC/core/units/structure/structure_config.php (.../structure_config.php) (revision 11635)
+++ branches/RC/core/units/structure/structure_config.php (.../structure_config.php) (revision 11661)
@@ -181,6 +181,20 @@
),
),
+ 'Radio' => Array(
+ 'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
+ 'Selector' => 'radio',
+ 'Fields' => Array(
+ 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
+ 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'),
+ 'Modified_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => 'Modified', 'filter_block' => 'grid_date_range_filter' ),
+ 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ),
+ 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
+ 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
+ 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'use_phrases'=>1 ),
+ ),
+ ),
+
'AllPages' => Array(
'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
'Fields' => Array(
Index: branches/RC/core/kernel/session/session.php
===================================================================
diff -u -N -r11648 -r11661
--- branches/RC/core/kernel/session/session.php (.../session.php) (revision 11648)
+++ branches/RC/core/kernel/session/session.php (.../session.php) (revision 11661)
@@ -921,7 +921,7 @@
}
}
- function SaveData($params)
+ function SaveData($params = Array ())
{
if (!$this->SetSession()) { // call it here - it may be not set before, because there was no need; if there is a need, it will be set here
return;