Index: branches/5.0.x/core/admin_templates/js/tab_scroller.js =================================================================== diff -u -r12117 -r12230 --- branches/5.0.x/core/admin_templates/js/tab_scroller.js (.../tab_scroller.js) (revision 12117) +++ branches/5.0.x/core/admin_templates/js/tab_scroller.js (.../tab_scroller.js) (revision 12230) @@ -113,9 +113,11 @@ if ($start + this.viewPortWidth >= this.totalWidth) { $next.addClass('disabled'); + $next.parents('td:first').addClass('disabled'); } else { $next.removeClass('disabled'); + $next.parents('td:first').removeClass('disabled'); } } Index: branches/5.0.x/core/admin_templates/browser/browser_header.tpl =================================================================== diff -u -r12117 -r12230 --- branches/5.0.x/core/admin_templates/browser/browser_header.tpl (.../browser_header.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/browser/browser_header.tpl (.../browser_header.tpl) (revision 12230) @@ -1,15 +1,15 @@ - + <inp2:m_GetConfig var="Site_Name"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/> - - - - - - + + + + + + @@ -19,17 +19,13 @@ - + - - - - - - - @@ -54,4 +52,3 @@ > - Index: branches/5.0.x/core/admin_templates/js/catalog.js =================================================================== diff -u -r12117 -r12230 --- branches/5.0.x/core/admin_templates/js/catalog.js (.../catalog.js) (revision 12117) +++ branches/5.0.x/core/admin_templates/js/catalog.js (.../catalog.js) (revision 12230) @@ -30,6 +30,12 @@ // ActivePrefix not set or has non-existing prefix value this.ActivePrefix = this.TabRegistry[0]['prefix']; } + + if (this.TabRegistry.length == 1) { + // only one tab -> hide all tab bar + $('div.tab-viewport').parents('table:first').hide(); + } + this.SetAlternativeTabs(); this.AfterInit(); } Index: branches/5.0.x/core/admin_templates/skins/skin_edit.tpl =================================================================== diff -u -r12117 -r12230 --- branches/5.0.x/core/admin_templates/skins/skin_edit.tpl (.../skin_edit.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/skins/skin_edit.tpl (.../skin_edit.tpl) (revision 12230) @@ -241,10 +241,12 @@ - + + + + + - - + +
Tree Color (TreeColor)Tree Item Color (TreeColor)Tree Item Hover Color (TreeHoverColor)Tree Highlighted Item Color (TreeHighColor)Tree Highlighted Item Hover Color (TreeHighHoverColor)Tree Highlighted Item Background Color (TreeHighBgColor) Tree Background Color (TreeBgColor)Tree Highlighted Color (TreeHighColor)Tree Highlighted Background Color (TreeHighBgColor)
@@ -254,8 +256,8 @@ [TreeBgColor][Value]" - value=""> + name="[TreeHoverColor][Value]" + value=""> [TreeHighHoverColor][Value]" + value=""> + + [TreeHighBgColor][Value]" value=""> + [TreeBgColor][Value]" + value=""> +
Index: branches/5.0.x/core/admin_templates/incs/style_template.css =================================================================== diff -u -r12164 -r12230 --- branches/5.0.x/core/admin_templates/incs/style_template.css (.../style_template.css) (revision 12164) +++ branches/5.0.x/core/admin_templates/incs/style_template.css (.../style_template.css) (revision 12230) @@ -193,6 +193,15 @@ background-position: 0 -18px; } +td.scroll-right-container { + width: 20px; +} + +td.scroll-right-container.disabled, td.scroll-right-container.disabled * { + width: 0px; + margin: 0px; +} + /* Toolbar */ .toolbar { @@ -635,15 +644,15 @@ padding: 2px; } +.tree tr td a:hover { + color: @@TreeHoverColor@@; +} + .tree tr.highlighted td a { - background-color: @@TreeHighBgColor@@; color: @@TreeHighColor@@; + background-color: @@TreeHighBgColor@@; } .tree tr.highlighted td a:hover { - color: #fff; -} - -.tree tr td a:hover { - color: #000000; + color: @@TreeHighHoverColor@@; } \ No newline at end of file Index: branches/5.0.x/core/units/fck/fck_tp.php =================================================================== diff -u -r12202 -r12230 --- branches/5.0.x/core/units/fck/fck_tp.php (.../fck_tp.php) (revision 12202) +++ branches/5.0.x/core/units/fck/fck_tp.php (.../fck_tp.php) (revision 12230) @@ -1,6 +1,6 @@ ReadFolders($user_files_dir); $fck_helper =& $this->Application->recallObject('FCKHelper'); /* @var fck_helper fckFCKHelper*/ - foreach ($FCKDefaultFolders as $k=>$v) - { - if (!in_array($v,$aFolders)) { - if ($fck_helper->CreateFolder($v)) { - $aFolders[] = $v; - } + $default_folders = defined('FCK_DEFAULT_FOLDERS') ? FCK_DEFAULT_FOLDERS : Array ('Files', 'Images', 'Flash', 'Documents'); + + foreach ($default_folders as $index => $folder) { + if (!$fck_helper->CreateFolder($folder)) { + unset($default_folders[$index]); } } - if (count($aFolders) > 0) { - natcasesort($aFolders); - foreach($aFolders AS $k=>$v) { - $selected = ($this->Application->GetVar('type') == $v) ? 'selected' : ''; - $ret.= '