Changeset 13242 for trunk

Timestamp:

Feb 18, 2012, 10:18:34 PM (12 years ago)

Author:

patdenice

Message:

feature:2577
Automaticaly install smartpocket during install or upgrade.
hide mobile theme from themes list on user side.

Location:

trunk

Files:

• admin/include/functions_install.inc.php (modified) (1 diff)
• admin/themes/default/template/themes_installed.tpl (modified) (2 diffs)
• include/functions.inc.php (modified) (2 diffs)
• install/config.sql (modified) (1 diff)
• install/db/118-database.php (added)
• plugins/LocalFilesEditor/include/css.inc.php (modified) (1 diff)

trunk/admin/include/functions_install.inc.php

@@ -135 +135 @@
   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);

trunk/admin/themes/default/template/themes_installed.tpl

@@ -18 +18 @@
 {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">
@@ -48 +48 @@
 {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">

trunk/include/functions.inc.php

@@ -758 +758 @@
  * returns available themes
  */
-function get_pwg_themes()
+function get_pwg_themes($show_mobile=false)
 {
   global $conf;
@@ -774 +774 @@
   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']))
     {

trunk/install/config.sql

@@ -74 +74 @@
 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);

trunk/plugins/LocalFilesEditor/include/css.inc.php

@@ -11 +11 @@
   $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';