Changeset 13894 for extensions/stripped_black_bloc/admin

Timestamp:

Apr 4, 2012, 5:47:23 PM (12 years ago)

Author:

flop25

Message:

updated for 2.4 :
-deleted timthumb
-deleted config for auto-generation

features added :
-representative thumbs can be big : always, as the "Every x thumb" config or never

bug corrected :
-big thumbs didn't have rounded corners

Translations uk_UA needed for new keys

Location:

extensions/stripped_black_bloc/admin

Files:

• admin.inc.php (modified) (2 diffs)
• admin.tpl (modified) (3 diffs)
• upgrade.inc.php (modified) (2 diffs)

extensions/stripped_black_bloc/admin/admin.inc.php

@@ -5 +5 @@
 global $conf;
 
-if (!isset($conf['stripped_black_bloc']))
-  include(PHPWG_THEMES_PATH.'stripped_black_bloc/admin/upgrade.inc.php');
+include(PHPWG_THEMES_PATH.'stripped_black_bloc/admin/upgrade.inc.php');
 
 load_language('theme.lang', PHPWG_THEMES_PATH.'stripped_black_bloc/');
@@ -33 +32 @@
         $config_send['every_x']=(isset($_POST['f_every_x'])) ? $_POST['f_every_x'] : 20;
         $config_send['starting_to']=(isset($_POST['f_starting_to'])) ? $_POST['f_starting_to'] : 1;
-        $config_send['thumbnail']=(isset($_POST['f_thumbnail'])) ? $_POST['f_thumbnail'] : 'piwigo';
+        $config_send['catthumb']=(isset($_POST['f_catthumb'])) ? $_POST['f_catthumb'] : 'none';
         conf_update_param('stripped_black_bloc', pwg_db_real_escape_string(serialize($config_send)));
 

extensions/stripped_black_bloc/admin/admin.tpl

@@ +1 @@
+{html_style}{literal}
+FORM.properties SPAN.property {
+    float: left;
+    font-weight: bold;
+    margin: 0;
+    padding: 0 0.5em 0 0;
+    text-align: right;
+    width: auto;
+}
+{/literal}{/html_style}
+
 <div class="titrePage">
   <h2>{'Stripped & Columns Theme Configuration'|@translate}</h2>
@@ -15 +26 @@
       <label for="column_width"><span class="property">{'Width of columns'|@translate}</span>&nbsp;</label>
       <input type="text" id="column_width" name="f_column_width" size="4" maxlength="4" value="{$options.column_width}" style="text-align:center;">
-      &nbsp;px
+      &nbsp;{'pixels'|@translate}
     </li>
     <li>
       <label for="column_width"><span class="property">{'Width of thumbnails'|@translate}</span>&nbsp;</label>
       <input type="text" id="column_width" name="f_thumbnail_width" size="4" maxlength="4" value="{$options.thumbnail_width}" style="text-align:center;">
-      &nbsp;px&nbsp;{'it need to be inferior than the width of columns'|@translate}
+      &nbsp;{'pixels'|@translate}&nbsp;{'(it need to be inferior than the width of columns)'|@translate}
     </li>
     <li>
@@ -33 +44 @@
     </li>
     <li>
-      <label for="thumbnail">{'The thumbnails can be generated by the theme'|@translate}</label>
-      </p>
+      <br><br>
+        <label for="thumbnail">{'About big thumbnails, for the albums :'|@translate}</label>
+      <br><br>
       <label>
-        <input type="radio" name="f_thumbnail" id="thumbnail" value="generated"  {if $options.thumbnail=="generated"}checked{/if}>
-        &nbsp;{'option thumbnail generated'|@translate}</label>
+        <input type="radio" name="f_catthumb" id="catthumb" value="none"  {if $options.catthumb=="none"}checked{/if}>
+        &nbsp;{'don\'t generate big thumbnails'|@translate}</label>
       <br>
       <label>
-        <input type="radio" name="f_thumbnail" id="thumbnail" value="auto" {if $options.thumbnail=="auto"}checked{/if}>
-        &nbsp;{'option thumbnail auto'|@translate}</label>
+        <input type="radio" name="f_catthumb" id="catthumb" value="same" {if $options.catthumb=="same"}checked{/if}>
+        &nbsp;{'use the same config as above'|@translate}</label>
       <br>
       <label>
-        <input type="radio" name="f_thumbnail" id="thumbnail" value="piwigo" {if $options.thumbnail=="piwigo"}checked{/if}>
-        &nbsp;{'option thumbnail piwigo'|@translate}</label>
+        <input type="radio" name="f_catthumb" id="catthumb" value="all" {if $options.catthumb=="all"}checked{/if}>
+        &nbsp;{'always generate big thumbnails'|@translate}</label>
       <br>
     </li>

extensions/stripped_black_bloc/admin/upgrade.inc.php

@@ -13 +13 @@
   'every_x'           => 20,
   'starting_to'           => 1,
-  'thumbnail'         => 'piwigo' //generated - auto - piwigo
-      );
-     $query = "
+  'catthumb'         => 'none' //none - same - all
+  );
+  $query = "
 INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
 VALUES ('stripped_black_bloc' , '".pwg_db_real_escape_string(serialize($config))."' , 'color_main#column_width#thumbnail_width#thumbnail(generated - auto - piwigo)');";
-     
-
-    pwg_query($query);
-    load_conf_from_db();
+  pwg_query($query);
+  load_conf_from_db();
 }
 elseif (count(unserialize( $conf['stripped_black_bloc'] ))!=6)
@@ -31 +29 @@
   'every_x'           => 20,
   'starting_to'           => 1,
-  'thumbnail'         => 'piwigo' //generated - auto - piwigo
-      );
-      
-
+  'catthumb'         => 'none' //none - same - all
+  );
   conf_update_param('stripped_black_bloc', pwg_db_real_escape_string(serialize($config)));
-    load_conf_from_db();
+  load_conf_from_db();
+}
+elseif ($conff=unserialize($conf['stripped_black_bloc']) and ( !isset($conff['catthumb']) or empty($conff['catthumb'])) )
+{
+  $config = array(
+  'color_main'            => $conff['color_main'],
+  'column_width'            => $conff['column_width'],
+  'thumbnail_width'           => $conff['thumbnail_width'],
+  'every_x'           => $conff['every_x'],
+  'starting_to'           => $conff['starting_to'],
+  'catthumb'         => 'none' //none - same - all
+  );
+  conf_update_param('stripped_black_bloc', pwg_db_real_escape_string(serialize($config)));
+  load_conf_from_db();
 }
 ?>