Index: branches/RC/core/install/install_schema.sql
===================================================================
diff -u -r11356 -r11396
--- branches/RC/core/install/install_schema.sql (.../install_schema.sql) (revision 11356)
+++ branches/RC/core/install/install_schema.sql (.../install_schema.sql) (revision 11396)
@@ -500,14 +500,15 @@
);
CREATE TABLE Skins (
- `SkinId` int(11) NOT NULL auto_increment,
+ SkinId int(11) NOT NULL auto_increment,
`Name` varchar(255) default NULL,
- `CSS` text,
- `Logo` varchar(255) default NULL,
- `Options` text,
- `LastCompiled` int(11) NOT NULL default '0',
- `IsPrimary` int(1) NOT NULL default '0',
- PRIMARY KEY (`SkinId`),
+ CSS text,
+ Logo varchar(255) default NULL,
+ LogoBottom varchar(255) NOT NULL,
+ Options text,
+ LastCompiled int(11) NOT NULL default '0',
+ IsPrimary int(1) NOT NULL default '0',
+ PRIMARY KEY (SkinId),
KEY IsPrimary (IsPrimary),
KEY LastCompiled (LastCompiled)
);
Index: branches/RC/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r11368 -r11396
--- branches/RC/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 11368)
+++ branches/RC/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 11396)
@@ -771,10 +771,15 @@
$css_path = (defined('WRITEABLE') ? WRITEABLE : FULL_PATH.'/kernel') . '/user_files';
$css_url = $this->Application->BaseURL(defined('WRITEBALE_BASE') ? WRITEBALE_BASE : '/kernel') . 'user_files/';
- if (isset($params['type']) && $params['type'] == 'logo') {
- return $style['Logo'] ? $css_url.$style['Logo'] : '';
+ $type = array_key_exists('type', $params) ? $params['type'] : false;
+ if ($type == 'logo') {
+ $type = 'Logo';
}
+ if ($type == 'Logo' || $type == 'LogoBottom') {
+ return $style[$type] ? $css_url.$style[$type] : '';
+ }
+
$last_compiled = $style['LastCompiled'];
$style_name = mb_strtolower( $style['Name'] );
Index: branches/RC/core/admin_templates/img/top_frame/icons/show_structure.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/catalog/catalog_elements.tpl
===================================================================
diff -u -r11395 -r11396
--- branches/RC/core/admin_templates/catalog/catalog_elements.tpl (.../catalog_elements.tpl) (revision 11395)
+++ branches/RC/core/admin_templates/catalog/catalog_elements.tpl (.../catalog_elements.tpl) (revision 11396)
@@ -2,11 +2,29 @@
checked/>
-
+
-
+ |
+
+ |
+
+ 
+ |
+
+
+ |
-
+
+
+ |
+
+
+ |
+
+
+ |
@@ -83,7 +101,10 @@
-
-
-
+
\ No newline at end of file
Index: branches/RC/core/admin_templates/js/frame_resizer.js
===================================================================
diff -u -r9983 -r11396
--- branches/RC/core/admin_templates/js/frame_resizer.js (.../frame_resizer.js) (revision 9983)
+++ branches/RC/core/admin_templates/js/frame_resizer.js (.../frame_resizer.js) (revision 11396)
@@ -2,6 +2,7 @@
this.StatusIcon = {0: 'img/list_arrow_desc.gif', 1 : 'img/list_arrow_no.gif'};
this.StatusText = {0: $hide_title, 1 : $show_title};
this.StatusImage = document.getElementById('menu_toggle_img');
+ this.StatusTextContainer = document.getElementById('menu_toggle_text');
this.StatusLink = document.getElementById('menu_toggle_link');
this.Frameset = $frameset;
this.SaveURL = $save_url;
@@ -19,17 +20,19 @@
}
FrameResizer.prototype.MenuVisible = function () {
- return new RegExp('(.*)' + this.StatusIcon[0] + '$').exec(this.StatusImage.src);
+ return new RegExp('(.*)' + this.StatusIcon[0] + '$').exec(this.StatusImage.src) ? true : false;
}
-FrameResizer.prototype.SetStatus = function ($status) {
+FrameResizer.prototype.SetStatus = function ($status, $ajax_save) {
this.StatusImage.src = this.StatusIcon[$status];
- this.StatusImage.alt = this.StatusLink.title = this.StatusText[$status];
+ this.StatusImage.alt = this.StatusLink.title = this.StatusTextContainer.innerHTML = this.StatusText[$status];
document.getElementById('site_logo').style.display = $status ? 'none' : 'block';
- // save via ajax
- var $url = this.SaveURL.replace('#NAME#', 'ShowAdminMenu').replace('#VALUE#', $status);
- Request.makeRequest($url, false, '', this.successCallback, this.errorCallback, '', this);
+ if ($ajax_save) {
+ // save via ajax
+ var $url = this.SaveURL.replace('#NAME#', 'ShowAdminMenu').replace('#VALUE#', $status);
+ Request.makeRequest($url, false, '', this.successCallback, this.errorCallback, '', this);
+ }
}
FrameResizer.prototype.successCallback = function($request, $params, $object) {
@@ -49,13 +52,22 @@
FrameResizer.prototype.FrameToggle = function () {
if (this.MenuVisible()) {
+ this.setFullscreenMode(true, true);
+ }
+ else {
+ this.setFullscreenMode(false, true);
+ }
+}
+
+FrameResizer.prototype.setFullscreenMode = function ($full_screen, $ajax_save) {
+ if ($full_screen) {
this.TopFrameset.setAttribute('rows', '25,*');
this.SubFrameset.setAttribute('cols', '0,*');
- this.SetStatus(1);
+ this.SetStatus(1, $ajax_save);
}
else {
this.TopFrameset.setAttribute('rows', this.Frameset.$top_height + ',*');
this.SubFrameset.setAttribute('cols', this.OpenWidth+',*');
- this.SetStatus(0);
+ this.SetStatus(0, $ajax_save);
}
}
\ No newline at end of file
Index: branches/RC/core/admin_templates/img/top_frame/toolbar_button_background.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/img/top_frame/help_icon.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -r8929 -r11396
--- branches/RC/core/admin_templates/skins/skin_edit.tpl (.../skin_edit.tpl) (revision 8929)
+++ branches/RC/core/admin_templates/skins/skin_edit.tpl (.../skin_edit.tpl) (revision 11396)
@@ -87,6 +87,7 @@
+