Changeset 16924 for extensions/SmartAlbums/admin

Timestamp:

Jul 23, 2012, 11:37:14 AM (12 years ago)

Author:

mistic100

Message:

add rating_score filter

Location:

extensions/SmartAlbums/admin

Files:

• album.php (modified) (6 diffs)
• template/album.tpl (modified) (3 diffs)

extensions/SmartAlbums/admin/album.php

@@ -134 +134 @@
 
 /* select options, for html_options */
-$template->assign(
-  'options', 
-  array(
-    'tags' => array(
+$options = array(
+  'tags' => array(
+    'name' => l10n('Tags'),
+    'options' => array(
       'all'   => l10n('All these tags'),
       'one'   => l10n('One of these tags'),
@@ -143 +143 @@
       'only'  => l10n('Only these tags'),
       ),
-    'date' => array(
+    ),
+  'date' => array(
+    'name' => l10n('Date'),
+    'options' => array(
       'the_post'      => l10n('Added on'),
       'before_post'   => l10n('Added before'),
@@ -151 +154 @@
       'after_taken'   => l10n('Created after'),
       ),
-    
-    'name' => array(
+    ),
+  'name' => array(
+    'name' => l10n('Photo name'),
+    'options' => array(
       'contain'     => l10n('Contains'),
       'begin'       => l10n('Begins with'),
@@ -160 +165 @@
       'not_end'     => l10n('Doesn\'t end with'),
       ),
-    'author' => array(
+    ),
+  'author' => array(
+    'name' => l10n('Author'),
+    'options' => array(
       'is'      => l10n('Is'),
       'in'      => l10n('Is in'),
@@ -166 +174 @@
       'not_in'  => l10n('Is not in'),
       ),
-    'hit' => array(
+    ),
+  'hit' => array(
+    'name' => l10n('Hits'),
+    'options' => array(
       'less' => l10n('Bellow'),
       'more' => l10n('Above'),
       ),
-    'level' => array('level' => 'level'), // second filter not used
-    'limit' => array('limit' => 'limit'), // second filter not used
-    )
+    ),
+  'rating_score' => array(
+    'name' => l10n('Rating score'),
+    'options' => array(
+      'less' => l10n('Bellow'),
+      'more' => l10n('Above'),
+      ),
+    ),
+  'level' => array(
+    'name' => l10n('Privacy level'),
+    'options' => array(),
+    ),
+  'limit' => array(
+    'name' => l10n('Max. number of photos'),
+    'options' => array(),
+    ),
   );
+$template->assign('options', $options);
 
 /* get filters for this album */
@@ -205 +230 @@
     'COND' => $filter['cond'],
     'VALUE' => $filter['value'],
+    'CAPTION' => $options[ $filter['type'] ]['name'],
   ));
 }

extensions/SmartAlbums/admin/template/album.tpl

@@ -8 +8 @@
 
 {foreach from=$options item=details key=mode}
-  lang['{$mode}_filter'] = '{$mode|cat:'_filter'|@translate|escape:javascript}';
-  {capture assign="option_content"}{html_options options=$details}{/capture}
+  lang['{$mode}_filter'] = '{$details.name|escape:javascript}';
+  {capture assign="option_content"}{html_options options=$details.options}{/capture}
   options['{$mode}'] = "{$option_content|escape:javascript}";
 {/foreach}
@@ -144 +144 @@
             <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
             <input type="hidden" name="filters[{$i}][type]" value="{$filter.TYPE}"/>
-            {$filter.TYPE|cat:'_filter'|@translate}
+            {$filter.CAPTION}
           </span>
           
           <span class="filter-cond">
             <select name="filters[{$i}][cond]">
-              {html_options options=$options[$filter.TYPE] selected=$filter.COND}
+              {html_options options=$options[$filter.TYPE].options selected=$filter.COND}
             </select>
           </span>
@@ -182 +182 @@
           <option value="-1">{'Add a filter'|@translate}</option>
           <option disabled="disabled">------------------</option>
-          <option value="tags">{'tags_filter'|@translate}</option>
-          <option value="date">{'date_filter'|@translate}</option>
-          <option value="name">{'name_filter'|@translate}</option>
-          <option value="author">{'author_filter'|@translate}</option>
-          <option value="hit">{'hit_filter'|@translate}</option>
-          <option value="level">{'level_filter'|@translate}</option>
-          <option value="limit">{'limit_filter'|@translate}</option>
+          <option value="tags">{'Tags'|@translate}</option>
+          <option value="date">{'Date'|@translate}</option>
+          <option value="name">{'Photo name'|@translate}</option>
+          <option value="author">{'Author'|@translate}</option>
+          <option value="hit">{'Hits'|@translate}</option>
+          <option value="rating_score">{'Rating score'|@translate}</option>
+          <option value="level">{'Privacy level'|@translate}</option>
+          <option value="limit">{'Max. number of photos'|@translate}</option>
         </select>
         <a id="removeFilters">{'Remove all filters'|@translate}</a>