maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

manually merged re-design changes to 80% of the files

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2011-02-08 12:53:24 +01:00
parent 7b6b145229
commit 43770d37e1
22 changed files with 572 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -1443,3 +1443,26 @@ if(isFroxlorVersion('0.9.17'))
updateToVersion('0.9.18-svn1');
}
if(isFroxlorVersion('0.9.18-svn1'))
{
showUpdateStep("Updating from 0.9.18-svn1 to 0.9.18-svn2", false);
$update_default_theme = isset($_POST['update_default_theme']) ? $_POST['update_default_theme'] : 'Froxlor';
showUpdateStep("Adding new settings for themes");
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'default_theme', '".$db->escape($update_default_theme)."');");
lastStepStatus(0);
showUpdateStep("Delete old setting for header-graphic");
$db->query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup`='admin' AND `varname` = 'froxlor_graphic';");
lastStepStatus(0);
showUpdateStep("Updating table layouts");
$db->query("ALTER TABLE `".TABLE_PANEL_ADMINS."` ADD `theme` varchar(255) NOT NULL default 'Froxlor' AFTER `email_autoresponder_used`;");
$db->query("ALTER TABLE `".TABLE_PANEL_CUSTOMERS."` ADD `theme` varchar(255) NOT NULL default 'Froxlor' AFTER `email_autoresponder_used`;");
$db->query("ALTER TABLE `".TABLE_PANEL_SESSIONS."` ADD `theme` varchar(255) NOT NULL default '' AFTER `adminsession`;");
lastStepStatus(0);
updateToVersion('0.9.18-svn2');
}

14
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -415,4 +415,18 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
$question.= '<input type="text" class="text" name="update_system_report_trafficmax" value="90" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if(versionInUpdate($current_version, '0.9.18-svn2'))
{
$has_preconfig = true;
$description = 'As you can (obviously) see, Froxlor now comes with a new theme. You also have the possibility to switch back to "Classic" if you want to.';
$question = '<strong>Select default panel theme:</strong>&nbsp;';
$question.= '<select name="update_default_theme">';
$themes = getThemes();
foreach($themes as $theme) {
$question.= makeoption($theme, $theme, 'Froxlor');
}
$question.= '</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}