diff options
| -rw-r--r-- | admin/include/functions_install.inc.php | 2 | ||||
| -rw-r--r-- | admin/themes/default/template/themes_installed.tpl | 4 | ||||
| -rw-r--r-- | include/functions.inc.php | 10 | ||||
| -rw-r--r-- | install/config.sql | 1 | ||||
| -rw-r--r-- | install/db/118-database.php | 38 | ||||
| -rw-r--r-- | plugins/LocalFilesEditor/include/css.inc.php | 2 |
6 files changed, 52 insertions, 5 deletions
diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php index e564311b2..5eb251da7 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'))) + if (in_array($theme_id, array('Sylvia', 'clear', 'dark', 'smartpocket'))) { $themes->perform_action('activate', $theme_id); } diff --git a/admin/themes/default/template/themes_installed.tpl b/admin/themes/default/template/themes_installed.tpl index 57df78a79..82d57a439 100644 --- a/admin/themes/default/template/themes_installed.tpl +++ b/admin/themes/default/template/themes_installed.tpl @@ -17,7 +17,7 @@ jQuery(document).ready(function() { <div class="themeBoxes"> {foreach from=$active_themes item=theme} <div class="themeBox{if $theme.is_default} themeDefault{/if}"> - <div class="themeName">{$theme.name}{if $theme.is_default} <em>({'default'|@translate})</em>{/if} {if $theme.mobile} <em>({'mobile'|@translate})</em>{/if}</div> + <div class="themeName">{$theme.name}{if $theme.is_default} <em>({'default'|@translate})</em>{/if} {if $theme.mobile} <em>({'Mobile'|@translate})</em>{/if}</div> <div class="themeShot"><a href="{$theme.screenshot}" class="preview-box" title="{$theme.name}"><img src="{$theme.screenshot}" alt=""></a></div> <div class="themeActions"> <div> @@ -47,7 +47,7 @@ jQuery(document).ready(function() { <div class="themeBoxes"> {foreach from=$inactive_themes item=theme} <div class="themeBox"> - <div class="themeName">{$theme.name}{if $theme.mobile} <em>({'mobile'|@translate})</em>{/if}</div> + <div class="themeName">{$theme.name}{if $theme.mobile} <em>({'Mobile'|@translate})</em>{/if}</div> <div class="themeShot"><a href="{$theme.screenshot}" class="preview-box" title="{$theme.name}"><img src="{$theme.screenshot}" alt=""></a></div> <div class="themeActions"> <div> diff --git a/include/functions.inc.php b/include/functions.inc.php index e1f74baf8..5b05452c0 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -757,7 +757,7 @@ function url_is_remote($url) /** * returns available themes */ -function get_pwg_themes() +function get_pwg_themes($show_mobile=false) { global $conf; @@ -773,6 +773,14 @@ SELECT $result = pwg_query($query); while ($row = pwg_db_fetch_assoc($result)) { + if ($row['id'] == $conf['mobile_theme']) + { + if (!$show_mobile) + { + continue; + } + $row['name'] .= ' ('.l10n('Mobile').')'; + } if (check_theme_installed($row['id'])) { $themes[ $row['id'] ] = $row['name']; diff --git a/install/config.sql b/install/config.sql index 10be8a188..f4e7ce7eb 100644 --- a/install/config.sql +++ b/install/config.sql @@ -73,3 +73,4 @@ INSERT INTO piwigo_config (param,value) VALUES ('original_resize','false'); INSERT INTO piwigo_config (param,value) VALUES ('original_resize_maxwidth','2016'); INSERT INTO piwigo_config (param,value) VALUES ('original_resize_maxheight','2016'); INSERT INTO piwigo_config (param,value) VALUES ('original_resize_quality','95'); +INSERT INTO piwigo_config (param,value) VALUES ('mobile_theme',null); diff --git a/install/db/118-database.php b/install/db/118-database.php new file mode 100644 index 000000000..7cd9bc504 --- /dev/null +++ b/install/db/118-database.php @@ -0,0 +1,38 @@ +<?php +// +-----------------------------------------------------------------------+ +// | Piwigo - a PHP based photo gallery | +// +-----------------------------------------------------------------------+ +// | Copyright(C) 2008-2012 Piwigo Team http://piwigo.org | +// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | +// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | +// +-----------------------------------------------------------------------+ +// | This program is free software; you can redistribute it and/or modify | +// | it under the terms of the GNU General Public License as published by | +// | the Free Software Foundation | +// | | +// | This program is distributed in the hope that it will be useful, but | +// | WITHOUT ANY WARRANTY; without even the implied warranty of | +// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | +// | General Public License for more details. | +// | | +// | You should have received a copy of the GNU General Public License | +// | along with this program; if not, write to the Free Software | +// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | +// | USA. | +// +-----------------------------------------------------------------------+ + +if (!defined('PHPWG_ROOT_PATH')) +{ + die('Hacking attempt!'); +} + +$upgrade_description = 'Automatically activate mobile theme.'; + +conf_update_param('mobile_theme', 'smartpocket'); + +echo +"\n" +. $upgrade_description +."\n" +; +?>
\ No newline at end of file diff --git a/plugins/LocalFilesEditor/include/css.inc.php b/plugins/LocalFilesEditor/include/css.inc.php index 7fa129049..15e434582 100644 --- a/plugins/LocalFilesEditor/include/css.inc.php +++ b/plugins/LocalFilesEditor/include/css.inc.php @@ -10,7 +10,7 @@ elseif (isset($_POST['edited_file'])) { $edited_file = $_POST['edited_file']; } -elseif (isset($_GET['theme']) and in_array($_GET['theme'], array_keys(get_pwg_themes()))) +elseif (isset($_GET['theme']) and in_array($_GET['theme'], array_keys(get_pwg_themes(true)))) { $edited_file = PHPWG_ROOT_PATH.PWG_LOCAL_DIR . 'css/'.$_GET['theme'].'-rules.css'; } |