Index: branches/unlabeled/unlabeled-1.29.2/core/units/admin/admin_tag_processor.php =================================================================== diff -u -N -r7647 -r7821 --- branches/unlabeled/unlabeled-1.29.2/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 7647) +++ branches/unlabeled/unlabeled-1.29.2/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 7821) @@ -183,7 +183,15 @@ $info = $params['info']; switch ($info) { case 'module_path': - $module = $section_data['icon_module']; + if (isset($params['module']) && $params['module']) { + $module = $params['module']; + } + elseif (isset($section_data['icon_module'])) { + $module = $section_data['icon_module']; + } + else { + $module = '#session#'; + } $res = $this->ModulePath(array('module' => $module)); break; default: @@ -424,9 +432,9 @@ $oFCKeditor->ToolbarSet = 'Advanced' ; $oFCKeditor->Value = '' ; $oFCKeditor->Config = Array( - //'UserFilesPath' => $pathtoroot.'kernel/user_files', +// 'UserFilesPath' => FULL_PATH.'/kernel/user_files', 'ProjectPath' => BASE_PATH.'/', - 'CustomConfigurationsPath' => $this->Application->BaseURL().$editor_path.'fckconfig.js', + 'CustomConfigurationsPath' => $this->Application->isModuleEnabled('In-Portal') ? $this->Application->BaseURL().'kernel/admin_templates/incs/inp_fckconfig.js' : $this->Application->BaseURL().$editor_path.'fckconfig.js', // 'EditorAreaCSS' => $this->Application->BaseURL().'/themes/inportal_site/inc/inportal.css', //GetThemeCSS(), //'StylesXmlPath' => '../../inp_styles.xml', // 'Debug' => 1, Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/custom_fields/custom_fields_list.tpl =================================================================== diff -u -N -r7698 -r7821 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/custom_fields/custom_fields_list.tpl (.../custom_fields_list.tpl) (revision 7698) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/custom_fields/custom_fields_list.tpl (.../custom_fields_list.tpl) (revision 7821) @@ -2,7 +2,7 @@ - + Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/modules/modules_list.tpl =================================================================== diff -u -N -r7698 -r7821 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/modules/modules_list.tpl (.../modules_list.tpl) (revision 7698) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/modules/modules_list.tpl (.../modules_list.tpl) (revision 7821) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/js/script.js =================================================================== diff -u -N -r7796 -r7821 --- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/js/script.js (.../script.js) (revision 7796) +++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/js/script.js (.../script.js) (revision 7821) @@ -1294,6 +1294,7 @@ NumberFormatter.Parse = function(num) { + if (num == '') return 0; return parseFloat( num.toString().replace(this.ThousandsSep, '').replace(this.DecimalSep, '.') ); } Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/grid_blocks.tpl =================================================================== diff -u -N -r7648 -r7821 --- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 7648) +++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 7821) @@ -71,6 +71,7 @@ Toolbars['_search'] = new ToolBar('icon16_'); + Toolbars['_search'].IconSize = {w:22,h:22}; Toolbars['_search'].UseLabels = false; Toolbars['_search'].AddButton( new ToolBarButton( Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_email.tpl =================================================================== diff -u -N -r7698 -r7821 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_email.tpl (.../config_email.tpl) (revision 7698) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_email.tpl (.../config_email.tpl) (revision 7821) @@ -1,6 +1,6 @@ - + Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/sections_list.tpl =================================================================== diff -u -N -r7648 -r7821 --- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 7648) +++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 7821) @@ -6,8 +6,8 @@ - img/logo_bg.gif) no-repeat top right;"> - img/logo_bg.gif) no-repeat top right; height: 55px;"> +

img/icons/.gif" align="absmiddle" title=""> Index: branches/unlabeled/unlabeled-1.71.2/core/kernel/db/db_tag_processor.php =================================================================== diff -u -N -r7792 -r7821 --- branches/unlabeled/unlabeled-1.71.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7792) +++ branches/unlabeled/unlabeled-1.71.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7821) @@ -1676,7 +1676,7 @@ $force_module = getArrayValue($params, 'module'); if ($force_module) { if ($force_module == '#session#') { - $force_module = $this->Application->RecallVar('module'); + $force_module = preg_replace('/([^:]*):.*/', '\1', $this->Application->RecallVar('module')); if (!$force_module) $force_module = 'core'; } else { Index: branches/unlabeled/unlabeled-1.6.2/admin/editor/inp_fckconfig.js =================================================================== diff -u -N -r5561 -r7821 --- branches/unlabeled/unlabeled-1.6.2/admin/editor/inp_fckconfig.js (.../inp_fckconfig.js) (revision 5561) +++ branches/unlabeled/unlabeled-1.6.2/admin/editor/inp_fckconfig.js (.../inp_fckconfig.js) (revision 7821) @@ -20,44 +20,49 @@ * Frederico Caldeira Knabben (fredck@fckeditor.net) */ -//FCKConfig.CustomConfigurationsPath = '' ; +FCKConfig.CustomConfigurationsPath = '' ; -//FCKConfig.EditorAreaCSS = FCKConfig.ProjectPath + 'themes/inportal_site/inc/inportal.css' ; +FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ; FCKConfig.BaseHref = '' ; FCKConfig.FullPage = false ; -FCKConfig.Debug = false ; +FCKConfig.Debug = false; FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ; FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ; // FCKConfig.Plugins.Add( 'placeholder', 'en,it' ) ; -FCKConfig.AutoDetectLanguage = true ; +FCKConfig.AutoDetectLanguage = false ; FCKConfig.DefaultLanguage = 'en' ; FCKConfig.ContentLangDirection = 'ltr' ; -FCKConfig.EnableXHTML = true ; -FCKConfig.EnableSourceXHTML = true ; +FCKConfig.EnableXHTML = false ; +FCKConfig.EnableSourceXHTML = false ; + FCKConfig.FillEmptyBlocks = true ; + FCKConfig.FormatSource = true ; FCKConfig.FormatOutput = true ; FCKConfig.FormatIndentator = ' ' ; -FCKConfig.GeckoUseSPAN = true ; -FCKConfig.StartupFocus = false ; + +FCKConfig.GeckoUseSPAN = true; +FCKConfig.StartupFocus = false; FCKConfig.ForcePasteAsPlainText = true ; FCKConfig.ForceSimpleAmpersand = false ; FCKConfig.TabSpaces = 0; + FCKConfig.ShowBorders = true; FCKConfig.ShowTableBorders = true; + FCKConfig.UseBROnCarriageReturn = false ; FCKConfig.ToolbarStartExpanded = true ; FCKConfig.ToolbarCanCollapse = true ; //FCKConfig.ProjectPath = FCKConfig.BasePath.replace(/\/cmseditor\/editor\/$/,''); -FCKConfig.IconImagesUrl = FCKConfig.ProjectPath+'kernel/user_files/icons'; +FCKConfig.IconImagesUrl = FCKConfig.ProjectPath+'/kernel/user_files/icons'; FCKConfig.ToolbarSets["Default"] = [ @@ -68,47 +73,83 @@ '/', ['Style','RemoveFormat'] ] ; + FCKConfig.ToolbarSets["Advanced"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + +FCKConfig.ToolbarSets["Advanced2"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + + + +FCKConfig.ToolbarSets["FAQ"] = [ ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], '/', ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], '/', ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] ] ; +FCKConfig.ToolbarSets["Esse"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%'] +] ; + FCKConfig.ToolbarSets["Basic"] = [ ['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About'] ] ; + FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Select','Document','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ; + FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ; -FCKConfig.FontNames = 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ; + +FCKConfig.FontNames = 'Arial Narrow;Arial;Sans-Serif;Serif;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ; FCKConfig.FontSizes = '1/xx-small;2/x-small;3/small;4/medium;5/large;6/x-large;7/xx-large' ; FCKConfig.FontFormats = 'p;div;pre;address;h1;h2;h3;h4;h5;h6' ; -FCKConfig.StylesXmlPath = '../../inp_styles.xml' ; + +FCKConfig.StylesXmlPath = '../fckstyles.xml' ; + FCKConfig.SpellChecker = 'ieSpell' ; // 'ieSpell' | 'SpellerPages' FCKConfig.IeSpellDownloadUrl = 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ; + FCKConfig.LinkBrowser = true ; -FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files' ; +FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; FCKConfig.LinkBrowserWindowWidth = screen.width * 0.7 ; // 70% FCKConfig.LinkBrowserWindowHeight = screen.height * 0.7 ; // 70% + FCKConfig.ImageBrowser = true ; -FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Images&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files' ; +FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Images&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ; + FCKConfig.DocumentBrowser = true ; -FCKConfig.DocumentBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Documents&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files' ; +FCKConfig.DocumentBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Documents&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ; -FCKConfig.DocumentsServerPath = FCKConfig.ProjectPath+'kernel/user_files/Documents' +FCKConfig.DocumentsServerPath = FCKConfig.ProjectPath+'/kernel/user_files/Documents' + FCKConfig.StructureBrowser = true ; FCKConfig.StructureBrowserURL = FCKConfig.ProjectPath+'/admin/index.php?t=structure/tree' ; FCKConfig.StructureBrowserWindowWidth = screen.width * 0.5 ; // 50% FCKConfig.StructureBrowserWindowHeight = screen.height * 0.7 ; // 70% -FCKConfig.FilesBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Files&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files/' ; + +FCKConfig.FilesBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Files&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; + FCKConfig.SmileyPath = FCKConfig.BasePath + 'images/smiley/msn/' ; FCKConfig.SmileyImages = ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'] ; FCKConfig.SmileyColumns = 8 ; FCKConfig.SmileyWindowWidth = 320 ; -FCKConfig.SmileyWindowHeight = 240 ; - -FCKConfig.K4Mode = 1; \ No newline at end of file +FCKConfig.SmileyWindowHeight = 240 ; \ No newline at end of file Index: branches/unlabeled/unlabeled-1.8.2/core/units/modules/modules_config.php =================================================================== diff -u -N -r7664 -r7821 --- branches/unlabeled/unlabeled-1.8.2/core/units/modules/modules_config.php (.../modules_config.php) (revision 7664) +++ branches/unlabeled/unlabeled-1.8.2/core/units/modules/modules_config.php (.../modules_config.php) (revision 7821) @@ -36,6 +36,7 @@ 'permissions' => Array('view'), 'priority' => 5, 'type' => stTREE, + 'icon_module' => 'in-portal', ), 'in-portal:mod_status' => Array( Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/regional/languages_list.tpl =================================================================== diff -u -N -r7648 -r7821 --- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 7648) +++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 7821) @@ -1,6 +1,6 @@ - + Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_search_edit.tpl =================================================================== diff -u -N -r7698 -r7821 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_search_edit.tpl (.../config_search_edit.tpl) (revision 7698) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_search_edit.tpl (.../config_search_edit.tpl) (revision 7821) @@ -2,7 +2,7 @@ - + @@ -21,9 +21,9 @@ submit_event('confs','OnGoBack'); } ) ); - + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); - + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { go_to_id('confs', ''); } @@ -32,14 +32,14 @@ go_to_id('confs', ''); } ) ); - + a_toolbar.Render(); - + a_toolbar.HideButton('prev'); a_toolbar.HideButton('next'); a_toolbar.HideButton('sep1'); - + a_toolbar.DisableButton('next'); @@ -55,8 +55,8 @@ - - + + @@ -69,7 +69,6 @@ -

- \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/incs/inp_fckconfig.js =================================================================== diff -u -N --- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/incs/inp_fckconfig.js (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/incs/inp_fckconfig.js (revision 7821) @@ -0,0 +1,155 @@ +/* + * Edited by Kostja + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2004 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * File Name: fckconfig.js + * Editor configuration settings. + * See the documentation for more info. + * + * Version: 2.0 RC3 + * Modified: 2005-02-27 21:31:48 + * + * File Authors: + * Frederico Caldeira Knabben (fredck@fckeditor.net) +*/ + +FCKConfig.CustomConfigurationsPath = '' ; + +FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ; + +FCKConfig.BaseHref = '' ; + +FCKConfig.FullPage = false ; + +FCKConfig.Debug = false; + +FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ; + +FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ; + +// FCKConfig.Plugins.Add( 'placeholder', 'en,it' ) ; + +FCKConfig.AutoDetectLanguage = false ; +FCKConfig.DefaultLanguage = 'en' ; +FCKConfig.ContentLangDirection = 'ltr' ; + +FCKConfig.EnableXHTML = false ; +FCKConfig.EnableSourceXHTML = false ; + +FCKConfig.FillEmptyBlocks = true ; + +FCKConfig.FormatSource = true ; +FCKConfig.FormatOutput = true ; +FCKConfig.FormatIndentator = ' ' ; + +FCKConfig.GeckoUseSPAN = true; +FCKConfig.StartupFocus = false; +FCKConfig.ForcePasteAsPlainText = true ; +FCKConfig.ForceSimpleAmpersand = false ; +FCKConfig.TabSpaces = 0; + +FCKConfig.ShowBorders = true; +FCKConfig.ShowTableBorders = true; + +FCKConfig.UseBROnCarriageReturn = false ; +FCKConfig.ToolbarStartExpanded = true ; +FCKConfig.ToolbarCanCollapse = true ; +//FCKConfig.ProjectPath = FCKConfig.BasePath.replace(/\/cmseditor\/editor\/$/,''); +FCKConfig.IconImagesUrl = FCKConfig.ProjectPath+'/kernel/user_files/icons'; + + +FCKConfig.ToolbarSets["Default"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','NewPage','SelectAll','-','Link','Unlink','Anchor','-','Image','SpecialChar','-','Find','Replace','-','Rule'], + ['Source'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent'], + '/', + ['Style','RemoveFormat'] +] ; + +FCKConfig.ToolbarSets["Advanced"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + +FCKConfig.ToolbarSets["Advanced2"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + + + +FCKConfig.ToolbarSets["FAQ"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + +FCKConfig.ToolbarSets["Esse"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%'] +] ; + +FCKConfig.ToolbarSets["Basic"] = [ + ['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About'] +] ; + +FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Select','Document','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ; + +FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ; + +FCKConfig.FontNames = 'Arial Narrow;Arial;Sans-Serif;Serif;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ; +FCKConfig.FontSizes = '1/xx-small;2/x-small;3/small;4/medium;5/large;6/x-large;7/xx-large' ; +FCKConfig.FontFormats = 'p;div;pre;address;h1;h2;h3;h4;h5;h6' ; + +FCKConfig.StylesXmlPath = '../fckstyles.xml' ; + +FCKConfig.SpellChecker = 'ieSpell' ; // 'ieSpell' | 'SpellerPages' +FCKConfig.IeSpellDownloadUrl = 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ; + +FCKConfig.LinkBrowser = true ; +FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; +FCKConfig.LinkBrowserWindowWidth = screen.width * 0.7 ; // 70% +FCKConfig.LinkBrowserWindowHeight = screen.height * 0.7 ; // 70% + +FCKConfig.ImageBrowser = true ; +FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Images&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; +FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ; +FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ; + +FCKConfig.DocumentBrowser = true ; +FCKConfig.DocumentBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Documents&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; +FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ; +FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ; +FCKConfig.DocumentsServerPath = FCKConfig.ProjectPath+'/kernel/user_files/Documents' + +FCKConfig.StructureBrowser = true ; +FCKConfig.StructureBrowserURL = FCKConfig.ProjectPath+'/admin/index.php?t=structure/tree' ; +FCKConfig.StructureBrowserWindowWidth = screen.width * 0.5 ; // 50% +FCKConfig.StructureBrowserWindowHeight = screen.height * 0.7 ; // 70% + +FCKConfig.FilesBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Files&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; + +FCKConfig.SmileyPath = FCKConfig.BasePath + 'images/smiley/msn/' ; +FCKConfig.SmileyImages = ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'] ; +FCKConfig.SmileyColumns = 8 ; +FCKConfig.SmileyWindowWidth = 320 ; +FCKConfig.SmileyWindowHeight = 240 ; \ No newline at end of file Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -N -r7796 -r7821 --- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 7796) +++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 7821) @@ -1,11 +1,11 @@ - + - img/logo_bg.gif) no-repeat top right; height: 55px;"> + img/logo_bg.gif) no-repeat top right; height: 55px;">

img/icons/icon46_.gif" align="absmiddle" title=""> +

img/icons/icon46_.gif" align="absmiddle" title="">

@@ -59,8 +59,8 @@ - img/logo_bg.gif) no-repeat top right; height: 65px;"> - img/logo_bg.gif) no-repeat top right; height: 55px;"> + Index: branches/unlabeled/unlabeled-1.112.2/admin/install.php =================================================================== diff -u -N -r7639 -r7821 --- branches/unlabeled/unlabeled-1.112.2/admin/install.php (.../install.php) (revision 7639) +++ branches/unlabeled/unlabeled-1.112.2/admin/install.php (.../install.php) (revision 7821) @@ -1213,11 +1213,11 @@ $installed = TableExists($ado,"ConfigurationAdmin,Category,Permissions"); if(!$installed) { - // run core install script + // run core install script K4_RunSQL('/core/install/install_schema.sql'); K4_RunSQL('/core/install/install_data.sql'); K4_SetModuleVersion('Core'); - + // run in-portal install script $filename = $pathtoroot.$admin."/install/inportal_schema.sql"; RunSchemaFile($ado,$filename); @@ -2025,7 +2025,7 @@ Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php =================================================================== diff -u -N -r7635 -r7821 --- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php (.../commands.php) (revision 7635) +++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php (.../commands.php) (revision 7821) @@ -32,24 +32,26 @@ $aFolders[] = $sFile; //echo '' ; } - + if (count($aFolders) > 0) { natcasesort($aFolders); foreach($aFolders AS $k=>$v) { echo '' ; - } + } } - - + + closedir( $oCurrentFolder ) ; // Close the "Folders" node. echo "" ; } function ValidateSID() { - if (isset($Config['K4Mode'])) + global $Config; + if (isset($Config['K4Mode'])) { return true; + } else { $conn = GetADODbConnection(); $session_time = GetConfigValue('ses_timeout')+0; @@ -62,13 +64,13 @@ AND sd.sid = '".$sid."' AND s.expire + '".$session_time."' > unix_timestamp()"; if ($conn->GetOne($sql) > 0) { - return true; + return true; } else { echo "SESSION Validation FALSE"; } } return false; -} +} function GetCmsTree() { @@ -211,7 +213,7 @@ $prefix .= '--'; if ($level > 0) $prefix=$prefix.'- '; -/* +/* $page = ereg_replace("&","&",$rs->fields['page_title']); $page = ereg_replace("\"",""",$page); $page = ereg_replace("'","'",$page); @@ -252,12 +254,13 @@ function GetFoldersAndFiles( $resourceType, $currentFolder, $aParams = array('name','asc')) { + global $Config; // Map the virtual path to the local server path. if (isset($Config['K4Mode'])) $date_format = "m/d/Y h:i A"; - else + else $date_format = GetConfigValue('date_format').' '.GetConfigValue('time_format'); - + $sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ; // Initialize the output buffers for "Folders" and "Files". $aFolders = array(); @@ -280,7 +283,7 @@ { $size = round( $iFileSize / 1024 ); $aFileSizes[] = ($size < 1)? 1:$size;// round( $iFileSize / 1024 ) ; - } else + } else $aFileSizes[] = $iFileSize; $aFiles[] = $sFile; $aFileDate[] = filectime($sServerDir.$sFile); @@ -298,11 +301,11 @@ } foreach($aFolders AS $k=>$v) { $sFolders .= '' ; - } + } } if (count($aFiles) > 0) { - if ($aParams[0] == 'name') - { + if ($aParams[0] == 'name') + { natcasesort($aFiles); if ($aParams[1] == 'desc') { @@ -330,7 +333,7 @@ $sFiles .= '' ; } } - } + } /* while ( $sFile = readdir( $oCurrentFolder ) ) { if ( $sFile != '.' && $sFile != '..' && $sFile != 'CVS') @@ -348,8 +351,8 @@ $sFiles .= '' ; } } -*/ - +*/ + if ($aParams[1] == "desc") { echo $sFiles ; @@ -418,7 +421,7 @@ $sql = "UPDATE live_blocks SET ".$lang_prefix."_content = replace(".$lang_prefix."_content,'".$original_str."','".$new_str."')"; $conn->Execute($sql); } - + } function RenameFile( $resourceType, $currentFolder , $aFilenames = array()) @@ -441,7 +444,7 @@ } else UpdateCmsBlocksK3($resourceType,$currentFolder,$aFilenames[0],$aFilenames[1]); $sErrorNumber = "0"; - } else + } else $sErrorNumber = '205' ; } else $sErrorNumber = '203' ; @@ -522,19 +525,19 @@ return; $conn = GetADODbConnection(); $aLangs = array(); - $multilang = GetConfigValue('multilingual_mode'); + $multilang = GetConfigValue('multilingual_mode'); $def_lang_prefix = GetConfigValue('default_lang_prefix'); - if ($multilang) + if ($multilang) { $query="SELECT lang_prefix FROM lang ORDER BY lang_id"; $rs = $conn->Execute($query); while ($rs && !$rs->EOF) { $aLangs[] = $rs->fields['lang_prefix']; $rs->MoveNext(); - } - } else + } + } else $aLangs[] = $def_lang_prefix; - $sErrorNumber = 230; + $sErrorNumber = 230; if ($confirm == 1) { DeleteConfirmedFiles($resourceType, $currentFolder, $aFiles); echo '' ; @@ -546,9 +549,9 @@ continue; $deleted_file = $Config['UserFilesPathNoBase'].$resourceType.$currentFolder.addslashes($v); for($i=0; $i 0) { + $add_sql.= " lb1.".$aLangs[$i]."_content LIKE '%".$deleted_file."%' OR"; + + if (strlen($add_sql) > 0) { $add_sql = rtrim($add_sql," OR"); $sql = "SELECT lb1.template_id, lb2.".$def_lang_prefix."_content FROM live_blocks AS lb1 LEFT JOIN live_blocks AS lb2 ON lb2.template_id = lb1.template_id AND lb2.block_num = 20 @@ -560,7 +563,7 @@ $page = @html_entity_decode($page,ENT_NOQUOTES,'UTF-8'); $page = @htmlspecialchars($page); $ret_xml.= '' ; - $rs->MoveNext(); + $rs->MoveNext(); } } } @@ -579,7 +582,7 @@ $conn = GetADODbConnection(); $sql = "SELECT value FROM session_data WHERE name = 'old_translation_language' AND sid = $sid"; $translation_language = $conn->GetOne($sql); - return $translation_language; + return $translation_language; } ?> Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_general.tpl =================================================================== diff -u -N -r7698 -r7821 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_general.tpl (.../config_general.tpl) (revision 7698) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_general.tpl (.../config_general.tpl) (revision 7821) @@ -3,7 +3,7 @@ - + @@ -29,7 +29,7 @@ return false; } } - + function ValidatePassFields(){ var el=false; var validated=true; @@ -43,29 +43,29 @@ } return validated; } - + function toggle_section($label) { var $table = document.getElementById('config_table'); var $row = null; var $is_visible = false; - + for (var $i = 0; $i < $table.rows.length; $i++) { $row = $table.rows[$i]; if ($row.getAttribute('header_label') != $label) { continue; } - + if (!$row.style.display) { $row.style.display = document.all ? 'block' : 'table-row'; } - + $is_visible = !($row.style.display == 'none'); $row.style.display = $is_visible ? 'none' : (document.all ? 'block' : 'table-row'); - + document.getElementById('toggle_mark['+$label+']').innerHTML = '[' + ($is_visible ? '+' : '-') + ']'; } } - + var a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('select', '', function() { if (ValidatePassFields()){ @@ -98,7 +98,7 @@ [-] - + " header_label="la_Text_RootCategory"> - + - +

+
img/icons/.gif" align="absmiddle" title="">
- Powered by In-portal © 1997-2006, Intechnic Corporation. All rights reserved. + Powered by In-portal © 1997-2007, Intechnic Corporation. All rights reserved.
@@ -115,10 +115,10 @@ ', 'ModuleRootCategory', '950x600');">

Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_universal.tpl =================================================================== diff -u -N -r7648 -r7821 --- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_universal.tpl (.../config_universal.tpl) (revision 7648) +++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_universal.tpl (.../config_universal.tpl) (revision 7821) @@ -3,7 +3,7 @@ - + Index: branches/unlabeled/unlabeled-1.21.2/core/units/admin/admin_config.php =================================================================== diff -u -N -r7644 -r7821 --- branches/unlabeled/unlabeled-1.21.2/core/units/admin/admin_config.php (.../admin_config.php) (revision 7644) +++ branches/unlabeled/unlabeled-1.21.2/core/units/admin/admin_config.php (.../admin_config.php) (revision 7821) @@ -36,6 +36,7 @@ 'permissions' => Array('advanced:admin_login', 'advanced:front_login'), 'priority' => 0, 'type' => stTREE, + 'icon_module' => 'in-portal', ), 'in-portal:service' => Array( Index: branches/unlabeled/unlabeled-1.5.2/core/admin_templates/js/toolbar.js =================================================================== diff -u -N -r7755 -r7821 --- branches/unlabeled/unlabeled-1.5.2/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 7755) +++ branches/unlabeled/unlabeled-1.5.2/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 7821) @@ -63,7 +63,7 @@ ToolBarButton.prototype.GetHTML = function() { var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : ''; var o = '' return o; @@ -279,6 +279,7 @@ { this.Module = $module ? $module : 'core'; this.IconPrefix = icon_prefix ? icon_prefix : 'tool_'; + this.IconSize = {w:32,h:32}; this.Buttons = new Array(); this.UseLabels = typeof($use_toolbarlabels) != 'undefined' ? $use_toolbarlabels : false; } Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_search.tpl =================================================================== diff -u -N -r7698 -r7821 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_search.tpl (.../config_search.tpl) (revision 7698) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/config/config_search.tpl (.../config_search.tpl) (revision 7821) @@ -2,7 +2,7 @@ - + @@ -18,10 +18,10 @@ std_new_item('confs', 'config/config_search_edit'); } ) ); - + a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - + a_toolbar.AddButton( new ToolBarButton('select', '', function() { submit_event('confs',''); } @@ -40,12 +40,12 @@ @@ -66,7 +66,7 @@ - + "> - + - + "> - + "> - + - + ">

- + "> - + " id="_cb_" onclick="update_checkbox(this, document.getElementById(''))" > " name="" value="">
@@ -80,36 +80,36 @@

][VariableValue]" VALUE="">%
- + ][VariableValue]" value="">% ][VariableValue]" value="">% - ][VariableValue]" value="">% + ][VariableValue]" value="">%