diff options
| author | plegall <plg@piwigo.org> | 2012-03-02 22:14:38 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2012-03-02 22:14:38 +0000 |
| commit | 1a538bc6be1ea6f6c999f9d9a322f36c6e72b212 (patch) | |
| tree | 8468fad62d2c3b7622dd7fb65157ce62845a6674 | |
| parent | bea22eb6787a0a1b25b49407d5e011d422274dc7 (diff) | |
feature 2587: set theme "elegant" as default theme
git-svn-id: http://piwigo.org/svn/trunk@13467 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/include/functions_install.inc.php | 2 | ||||
| -rw-r--r-- | admin/include/functions_upgrade.php | 3 | ||||
| -rw-r--r-- | admin/include/updates.class.php | 2 | ||||
| -rw-r--r-- | include/constants.php | 2 | ||||
| -rw-r--r-- | install/piwigo_structure-mysql.sql | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php index 5eb251da7..aa2c8cbd9 100644 --- a/admin/include/functions_install.inc.php +++ b/admin/include/functions_install.inc.php @@ -134,7 +134,7 @@ function activate_core_themes() $themes = new themes(); foreach ($themes->fs_themes as $theme_id => $fs_theme) { - if (in_array($theme_id, array('Sylvia', 'clear', 'dark', 'smartpocket'))) + if (in_array($theme_id, array('elegant', 'Sylvia', 'clear', 'dark', 'smartpocket'))) { $themes->perform_action('activate', $theme_id); } diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php index 42acedff4..07861ff94 100644 --- a/admin/include/functions_upgrade.php +++ b/admin/include/functions_upgrade.php @@ -119,6 +119,7 @@ function deactivate_non_standard_themes() 'clear', 'Sylvia', 'dark', + 'elegant', ); $query = ' @@ -162,7 +163,7 @@ SELECT theme { $query = ' UPDATE '.PREFIX_TABLE.'user_infos - SET theme = \'Sylvia\' + SET theme = \'elegant\' WHERE user_id = '.$conf['default_user_id'].' ;'; pwg_query($query); diff --git a/admin/include/updates.class.php b/admin/include/updates.class.php index 0e3831d52..524b627a7 100644 --- a/admin/include/updates.class.php +++ b/admin/include/updates.class.php @@ -23,7 +23,7 @@ class updates {
$this->types = array($page);
}
- $this->default_themes = array('clear', 'dark', 'Sylvia');
+ $this->default_themes = array('clear', 'dark', 'Sylvia', 'elegant');
$this->default_plugins = array('admin_multi_view', 'c13y_upgrade', 'language_switch', 'LocalFilesEditor');
foreach ($this->types as $type)
diff --git a/include/constants.php b/include/constants.php index c5eb96446..34a4d47d6 100644 --- a/include/constants.php +++ b/include/constants.php @@ -24,7 +24,7 @@ // Default settings define('PHPWG_VERSION', '2.4.0RC1'); define('PHPWG_DEFAULT_LANGUAGE', 'en_UK'); -define('PHPWG_DEFAULT_TEMPLATE', 'Sylvia'); +define('PHPWG_DEFAULT_TEMPLATE', 'elegant'); define('PHPWG_THEMES_PATH', $conf['themes_dir'].'/'); defined('PWG_COMBINED_DIR') or define('PWG_COMBINED_DIR', $conf['data_location'].'combined/'); diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql index 59d3e6f74..914c58f6e 100644 --- a/install/piwigo_structure-mysql.sql +++ b/install/piwigo_structure-mysql.sql @@ -414,7 +414,7 @@ CREATE TABLE `piwigo_user_infos` ( `show_nb_comments` enum('true','false') NOT NULL default 'false', `show_nb_hits` enum('true','false') NOT NULL default 'false', `recent_period` tinyint(3) unsigned NOT NULL default '7', - `theme` varchar(255) NOT NULL default 'Sylvia', + `theme` varchar(255) NOT NULL default 'elegant', `registration_date` datetime NOT NULL default '0000-00-00 00:00:00', `enabled_high` enum('true','false') NOT NULL default 'true', `level` tinyint unsigned NOT NULL default '0', |