Changeset 26442 for extensions/SmartAlbums/admin

Timestamp:

Jan 4, 2014, 4:13:08 PM (10 years ago)

Author:

mistic100

Message:

update for Piwigo 2.6

Location:

extensions/SmartAlbums/admin

Files:

• album.php (modified) (14 diffs)
• cat_list.php (modified) (9 diffs)
• config.php (modified) (2 diffs)
• template/album.tpl (modified) (21 diffs)
• template/cat_list.tpl (modified) (4 diffs)
• template/config.tpl (modified) (3 diffs)
• template/sprintf.js (deleted)
• template/style.css (modified) (1 diff)

extensions/SmartAlbums/admin/album.php

@@ -1 +1 @@
 <?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!");
+defined('SMART_PATH') or die('Hacking attempt!');
 
 // +-----------------------------------------------------------------------+
@@ -33 +11 @@
 
 check_input_parameter('cat_id', $_GET, false, PATTERN_ID);
-
-$admin_album_base_url = get_root_url().'admin.php?page=album-'.$_GET['cat_id'];
-$self_url = SMART_ADMIN.'-album&amp;cat_id='.$_GET['cat_id'];
+$cat_id = $_GET['cat_id'];
+
+$admin_album_base_url = get_root_url().'admin.php?page=album-'.$cat_id;
+$self_url = SMART_ADMIN.'-album&amp;cat_id='.$cat_id;
 
 $query = '
 SELECT *
   FROM '.CATEGORIES_TABLE.'
-  WHERE id = '.$_GET['cat_id'].'
+  WHERE id = '.$cat_id.'
 ;';
 $category = pwg_db_fetch_assoc(pwg_query($query));
@@ -48 +27 @@
   die("unknown album");
 }
+
+// category must be virtual
+if ($category['dir'] != NULL)
+{
+  die("physical album");
+}
+
 
 // +-----------------------------------------------------------------------+
@@ -60 +46 @@
 
 
-$cat_id = $_GET['cat_id'];
-
-// category must be virtual
-if ($category['dir'] != NULL)
-{
-  die("physical album");
-}
-
 // +-----------------------------------------------------------------------+
 // | Save Filters                                                          |
@@ -78 +56 @@
     var_dump($_POST['filters']);
   }
-  
+
   // test if it was a Smart Album
   $query = '
-SELECT DISTINCT category_id 
-  FROM '.CATEGORY_FILTERS_TABLE.' 
+SELECT DISTINCT category_id
+  FROM '.CATEGORY_FILTERS_TABLE.'
   WHERE category_id = '.$cat_id.'
 ;';
   $was_smart = pwg_db_num_rows(pwg_query($query));
-  
+
   /* this album is no longer a SmartAlbum */
-  if ( $was_smart AND !isset($_POST['is_smart']) )
+  if ($was_smart and !isset($_POST['is_smart']))
   {
     pwg_query('DELETE FROM '.IMAGE_CATEGORY_TABLE.' WHERE category_id = '.$cat_id.' AND smart = true;');
     pwg_query('DELETE FROM '.CATEGORY_FILTERS_TABLE.' WHERE category_id = '.$cat_id.';');
+
     set_random_representant(array($cat_id));
+
+    define('SMART_NOT_UPDATE', 1);
     invalidate_user_cache();
   }
   /* no filter selected */
-  else if ( isset($_POST['is_smart']) AND empty($_POST['filters']) )
-  {
-    array_push($page['errors'], l10n('No filter selected'));
+  else if (isset($_POST['is_smart']) and empty($_POST['filters']))
+  {
+    $page['errors'][] = l10n('No filter selected');
   }
   /* everything is fine */
-  else if ( isset($_POST['is_smart']) )
+  else if (isset($_POST['is_smart']))
   {
     pwg_query('DELETE FROM '.CATEGORY_FILTERS_TABLE.' WHERE category_id = '.$cat_id.';');
-    
+
     $inserts = array();
     foreach ($_POST['filters'] as $filter)
@@ -114 +95 @@
       }
     }
-    
+
     mass_inserts(
-      CATEGORY_FILTERS_TABLE, 
-      array('category_id', 'type', 'cond', 'value'), 
+      CATEGORY_FILTERS_TABLE,
+      array('category_id', 'type', 'cond', 'value'),
       $inserts,
       array('ignore'=>true)
       );
-    
+
     $associated_images = smart_make_associations($cat_id);
     $template->assign('IMAGE_COUNT', l10n_dec('%d photo', '%d photos', count($associated_images)));
-    
-    array_push($page['infos'], sprintf(l10n('%d photos associated to album %s'), count($associated_images), ''));
-    
+
+    $page['infos'][] = l10n('%d photos associated to album %s', count($associated_images), '');
+
     define('SMART_NOT_UPDATE', 1);
     invalidate_user_cache();
@@ -225 +206 @@
 /* get filters for this album */
 $query = '
-SELECT * 
-  FROM '.CATEGORY_FILTERS_TABLE.' 
+SELECT *
+  FROM '.CATEGORY_FILTERS_TABLE.'
   WHERE category_id = '.$cat_id.'
-  ORDER BY 
-    type ASC, 
+  ORDER BY
+    type ASC,
     cond ASC
 ;';
@@ -250 +231 @@
   WHERE id IN('.$filter['value'].')
 ;';
-    $filter['value'] = get_taglist($query); 
-  }
-  
+    $filter['value'] = get_taglist($query);
+  }
+
   $template->append('filters', $filter);
 }
@@ -260 +241 @@
 $template->assign('format_options', array(
   'portrait' => l10n('Portrait'),
-  'square'   => l10n('Square'),
+  'square'   => l10n('square'),
   'lanscape' => l10n('Landscape'),
   'panorama' => l10n('Panorama'),
@@ -274 +255 @@
 /* all albums */
 $query = '
-SELECT 
-    id, 
-    name, 
-    uppercats, 
+SELECT
+    id,
+    name,
+    uppercats,
     global_rank
   FROM '.CATEGORIES_TABLE.'
@@ -303 +284 @@
 while ($row = pwg_db_fetch_assoc($result))
 {
-  $widths[] = $row['width'];
-  $heights[] = $row['height'];
-  $ratios[] = floor($row['width'] * 100 / $row['height']) / 100;
+  if ($row['width']>0 && $row['height']>0)
+  {
+    $widths[] = $row['width'];
+    $heights[] = $row['height'];
+    $ratios[] = floor($row['width'] / $row['height'] * 100) / 100;
+  }
 }
 
@@ -354 +338 @@
 }
 
-foreach (array_keys($ratio_categories) as $ratio_category)
-{
-  if (count($ratio_categories[$ratio_category]) > 0)
-  {
-    $dimensions['ratio_'.$ratio_category] = array(
-      'min' => $ratio_categories[$ratio_category][0],
-      'max' => $ratio_categories[$ratio_category][count($ratio_categories[$ratio_category]) - 1]
+foreach ($ratio_categories as $ratio_name => $ratio_values)
+{
+  if (count($ratio_values) > 0)
+  {
+    $dimensions['ratio_'.$ratio_name] = array(
+      'min' => $ratio_values[0],
+      'max' => array_pop($ratio_values),
       );
   }
@@ -371 +355 @@
 {
   $query = '
-SELECT count(1) 
-  FROM '.IMAGE_CATEGORY_TABLE.' 
-  WHERE 
-    category_id = '.$cat_id.' 
+SELECT count(1)
+  FROM '.IMAGE_CATEGORY_TABLE.'
+  WHERE
+    category_id = '.$cat_id.'
     AND smart = true
 ';
@@ -396 +380 @@
 ));
 
-$template->set_filename('SmartAlbums_content', dirname(__FILE__).'/template/album.tpl');
-
-?>
+$template->set_filename('SmartAlbums_content', realpath(SMART_PATH . 'admin/template/album.tpl'));

extensions/SmartAlbums/admin/cat_list.php

@@ -1 +1 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+defined('SMART_PATH') or die('Hacking attempt!');
 
 if (isset($_GET['hide_messages']))
@@ -16 +16 @@
 $categories = array();
 $query = '
-SELECT 
+SELECT
     id,
     name,
@@ -51 +51 @@
   if (isset($output_create['error']))
   {
-    array_push($page['errors'], $output_create['error']);
+    $page['errors'][] = $output_create['error'];
   }
   else
@@ -69 +69 @@
     {
       $associated_images = smart_make_associations($category['id']);
-      array_push($page['infos'], 
-        sprintf(l10n('%d photos associated to album %s'), 
-          count($associated_images), 
-          '&laquo;'.trigger_event('render_category_name', $category['name'], 'admin_cat_list').'&raquo;'
-          )
+
+      $page['infos'][] = l10n(
+        '%d photos associated to album %s',
+        count($associated_images),
+        '&laquo;'.trigger_event('render_category_name', $category['name'], 'admin_cat_list').'&raquo;'
         );
     }
@@ -80 +80 @@
   else
   {
-    $associated_images = smart_make_associations($_GET['smart_generate']);    
-    array_push($page['infos'], 
-      sprintf(l10n('%d photos associated to album %s'), 
-        count($associated_images), 
-        '&laquo;'.trigger_event('render_category_name', $categories[ $_GET['smart_generate'] ]['name'], 'admin_cat_list').'&raquo;'
-        )
+    $associated_images = smart_make_associations($_GET['smart_generate']);
+
+    $page['infos'][] = l10n(
+      '%d photos associated to album %s',
+      count($associated_images),
+      '&laquo;'.trigger_event('render_category_name', $categories[ $_GET['smart_generate'] ]['name'], 'admin_cat_list').'&raquo;'
       );
   }
-  
+
   define('SMART_NOT_UPDATE', 1);
   invalidate_user_cache();
@@ -100 +100 @@
   'PWG_TOKEN' => get_pwg_token(),
  ));
- 
+
 // retrieve all existing categories for album creation
 $query = '
@@ -108 +108 @@
 
 display_select_cat_wrapper(
-  $query,
-  null,
+  $query, null,
   'category_options'
   );
-  
+
 if ($conf['SmartAlbums']['show_list_messages'])
 {
-  array_push($page['warnings'], l10n('Only SmartAlbums are displayed on this page'));
-  array_push($page['warnings'], sprintf(l10n('To order albums please go the main albums <a href="%s">management page</a>'), $base_url.'cat_list'));
-  array_push($page['warnings'], '<a href="'.$self_url.'&hide_messages">['.l10n('Don\'t show this message again').']</a>');
+  $page['warnings'][] = l10n('Only SmartAlbums are displayed on this page');
+  $page['warnings'][] = sprintf(l10n('To order albums please go the main albums <a href="%s">management page</a>'), $base_url.'cat_list');
+  $page['warnings'][] = '<a href="'.$self_url.'&hide_messages">['.l10n('Don\'t show this message again').']</a>';
 }
 
@@ -125 +124 @@
 
 $categories_count_images = array();
-if ( count($categories) )
+if (count($categories))
 {
   $query = '
-SELECT 
-    category_id, 
+SELECT
+    category_id,
     COUNT(image_id) AS total_images
   FROM '.IMAGE_CATEGORY_TABLE.'
@@ -154 +153 @@
       'U_SMART'     => $self_url.'&amp;smart_generate='.$category['id'],
     );
-  
+
   $template->append('categories', $tpl_cat);
 }
 
-$template->set_filename('SmartAlbums_content', dirname(__FILE__).'/template/cat_list.tpl');
-
-?>
+$template->set_filename('SmartAlbums_content', realpath(SMART_PATH . 'admin/template/cat_list.tpl'));

extensions/SmartAlbums/admin/config.php

@@ -1 +1 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+defined('SMART_PATH') or die('Hacking attempt!');
 
-// Enregistrement de la configuration
 if (isset($_POST['submit']))
 {
-  if ( $_POST['update_timeout'] == 0 or !preg_match('#^[0-9.]+$#', $_POST['update_timeout']) )
+  if ($_POST['update_timeout'] == 0 or !preg_match('#^[0-9.]+$#', $_POST['update_timeout']))
   {
-    array_push($page['errors'], l10n('Invalid number of days'));
+    $page['errors'][] = l10n('Invalid number of days');
     $_POST['update_timeout'] = $conf['SmartAlbums']['update_timeout'];
   }
-    
+
   $conf['SmartAlbums'] = array(
     'show_list_messages' => $conf['SmartAlbums']['show_list_messages'],
@@ -19 +18 @@
     'smart_is_forbidden' => isset($_POST['smart_is_forbidden']),
     );
-  
+
   conf_update_param('SmartAlbums', serialize($conf['SmartAlbums']));
-  array_push($page['infos'], l10n('Information data registered in database'));
+  $page['infos'][] = l10n('Information data registered in database');
 }
 
 $template->assign($conf['SmartAlbums']);
 
-$template->set_filename('SmartAlbums_content', dirname(__FILE__).'/template/config.tpl');
-
-?>
+$template->set_filename('SmartAlbums_content', realpath(SMART_PATH . 'admin/template/config.tpl'));

extensions/SmartAlbums/admin/template/album.tpl

@@ -1 @@
-{combine_css path=$SMART_PATH|@cat:"admin/template/style.css"}
-{combine_script id='sprintf' load='footer' path=$SMART_PATH|@cat:"admin/template/sprintf.js"}
+{combine_css path=$SMART_PATH|cat:'admin/template/style.css'}
 {include file='include/datepicker.inc.tpl'}
+{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'}
+
+{combine_css path='themes/default/js/plugins/jquery.tokeninput.css'}
 {combine_script id='jquery.tokeninput' load='footer' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
-{combine_css path="themes/default/js/plugins/chosen.css"}
+
+{combine_css path='themes/default/js/plugins/chosen.css'}
 {combine_script id='jquery.chosen' load='footer' path='themes/default/js/plugins/chosen.jquery.min.js'}
-{combine_css path="themes/default/js/ui/theme/jquery.ui.slider.css"}
+
+{combine_css path='themes/default/js/ui/theme/jquery.ui.slider.css'}
 {combine_script id='jquery.ui.slider' require='jquery.ui' load='footer' path='themes/default/js/ui/minified/jquery.ui.slider.min.js'}
 
-{footer_script}{literal}
-var count=0;
-var limit_count=0;
-var level_count=0;
-
-// MAIN EVENT HANDLERS
-$('#addFilter').change(function() {
-  add_filter($(this).attr('value'));
-  $(this).attr('value', '-1');
-});
-  
-$('#removeFilters').click(function() {
-  $('#filtersList li').each(function() {
-    $(this).remove();
+{*combine_script id='smartalbums.filters' require='common,datepicker.js,jquery.tokeninput,jquery.chosen,jquery.ui.slider'
+  path=$SMART_PATH|cat:'admin/template/filters.js' load='footer' template=true*}
+
+{footer_script require='jquery'}
+var addFilter = (function($){
+  var count=0,
+      limit_count=0,
+      level_count=0;
+
+  // MAIN EVENT HANDLERS
+  $('#addFilter').change(function() {
+    if ($(this).val() != -1) {
+      add_filter($(this).val());
+      $(this).val(-1);
+    }
   });
-  
-  limit_level=0;
-  level_count=0;
-  return false;
-});
-
-$('input[name="is_smart"]').change(function() {
-  $('#SmartAlbum_options').toggle();
-  $('input[name="countImages"]').toggle();
-  $('.count_images_wrapper').toggle();
-});
-
-$('input[name="countImages"]').click(function() {
-  countImages($("#smart"));
-  return false;
-});
-
-
-// ADD FILTER FUNCTIONS
-function add_filter(type, cond, value) {
-  count++;
-  
-  content = $("#filtersRepo #filter_"+type).html().replace(/iiii/g, count);
-  $block = $(content);
-  $("#filtersList").append($block);
-  
-  if (cond) {
-    select_cond($block, type, cond);
-  }
-  
-  if (value) {
-    if (type == "tags") {
-      $block.find(".filter-value .tagSelect").html(value);
-    }
-    else if (type == "album") {
-      select_options($block, value);
-    }
-    else if (type == "level") {
-      select_options($block, value);
-    }
-    else if (type != "dimensions") {
-      $block.find(".filter-value input").val(value);
-    }
-  }
-  
-  init_jquery_handlers($block);
-  
-  if (type == "dimensions") {
-    select_dimensions($block, cond, value);
-  }
-  
-  if (type == 'limit') {
-    limit_count=1;
-    $("#addFilter option[value='limit']").attr('disabled','disabled');
-  }
-  else if (type == 'level') {
-    level_count=1;
-    $("#addFilter option[value='level']").attr('disabled','disabled');
-  }
-}
-
-function select_cond($block, type, cond) {
-  $block.find(".filter-cond option").removeAttr('selected');
-  $block.find(".filter-cond option[value='"+cond+"']").attr('selected', 'selected');
-}
-
-function select_dimensions($block, cond, value) {
-  if (!cond) cond = 'width';
-  
-  $block.find(".filter-value span:not(.filter_dimension_info)").hide();
-  $block.find(".filter-value .dimension_"+cond).show();
-  
-  if (value) {
-    values = value.split(',');
-  }
-  else {
-    values = $block.find(".filter_dimension_"+cond+"_slider").slider("values");
-  }
-  $block.find(".filter_dimension_"+cond+"_slider").slider("values", values);
-}
-
-function select_options($block, value) {  
-  values = value.split(',');
-  for (j in values) {
-    $block.find(".filter-value option[value='"+ values[j] +"']").attr('selected', 'selected');
-  }
-}
-
-
-// DECLARE JQUERY PLUGINS AND VERSATILE HANDLERS
-function init_jquery_handlers($block) {
-  // remove filter
-  $block.find(".removeFilter").click(function() {
-    type = $(this).next("input").val();
+
+  $('#removeFilters').click(function() {
+    $('#filtersList li').each(function() {
+      $(this).remove();
+    });
+
+    limit_level=0;
+    level_count=0;
+    return false;
+  });
+
+  $('input[name="is_smart"]').change(function() {
+    $('#SmartAlbum_options').toggle();
+    $('input[name="countImages"]').toggle();
+    $('.count_images_wrapper').toggle();
+  });
+
+  $('input[name="countImages"]').click(function() {
+    countImages($("#smart"));
+    return false;
+  });
+
+
+  // ADD FILTER FUNCTIONS
+  function add_filter(type, cond, value) {
+    count++;
+
+    var content = $("#filtersRepo #filter_"+type).html().replace(/iiii/g, count);
+    $block = $($.parseHTML(content)).appendTo("#filtersList");
+
+    if (cond) {
+      select_cond($block, type, cond);
+    }
+
+    if (value) {
+      if (type == "tags") {
+        $block.find(".filter-value .tagSelect").html(value);
+      }
+      else if (type == "album") {
+        select_options($block, value);
+      }
+      else if (type == "level") {
+        select_options($block, value);
+      }
+      else if (type != "dimensions") {
+        $block.find(".filter-value input").val(value);
+      }
+    }
+
+    init_jquery_handlers($block);
+
+    if (type == "dimensions") {
+      select_dimensions($block, cond, value);
+    }
+
     if (type == 'limit') {
       limit_count=1;
-      $("#addFilter option[value='limit']").removeAttr('disabled');
+      $("#addFilter option[value='limit']").attr('disabled','disabled');
     }
     else if (type == 'level') {
       level_count=1;
-      $("#addFilter option[value='level']").removeAttr('disabled');
-    }
-    
-    $(this).parents('li').remove();
-    return false;
-  });
-
-  // date filter
-  if ($block.hasClass('filter_date')) {
-    $block.find("input[type='text']").each(function() {
-      $(this).datepicker({dateFormat:'yy-mm-dd', firstDay:1});
+      $("#addFilter option[value='level']").attr('disabled','disabled');
+    }
+  }
+
+  function select_cond($block, type, cond) {
+    $block.find(".filter-cond option").removeAttr('selected');
+    $block.find(".filter-cond option[value='"+cond+"']").attr('selected', 'selected');
+  }
+
+  function select_dimensions($block, cond, value) {
+    console.log($block, cond, value);
+    cond = cond || 'width';
+
+    $block.find(">.filter-value>span").hide();
+    $block.find(".dimension_"+cond).show();
+
+    if (value) {
+      values = value.split(',');
+    }
+    else {
+      values = $block.find(".filter_dimension_"+cond+"_slider").slider("values");
+    }
+    $block.find(".filter_dimension_"+cond+"_slider").slider("values", values);
+  }
+
+  function select_options($block, value) {
+    values = value.split(',');
+    for (j in values) {
+      $block.find(".filter-value option[value='"+ values[j] +"']").attr('selected', 'selected');
+    }
+  }
+
+
+  // DECLARE JQUERY PLUGINS AND VERSATILE HANDLERS
+  function init_jquery_handlers($block) {
+    // remove filter
+    $block.find(".removeFilter").click(function() {
+      type = $(this).next("input").val();
+      if (type == 'limit') {
+        limit_count=1;
+        $("#addFilter option[value='limit']").removeAttr('disabled');
+      }
+      else if (type == 'level') {
+        level_count=1;
+        $("#addFilter option[value='level']").removeAttr('disabled');
+      }
+
+      $(this).parents('li').remove();
+      return false;
     });
-  }
-
-  // tags filter
-  if ($block.hasClass('filter_tags')) {
-    $block.find(".tagSelect").tokenInput(
-    {/literal}
-      [{foreach from=$all_tags item=tag name=tags}{ldelim}"name":"{$tag.name|@escape:'javascript'}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}],
-      {ldelim}
-        hintText: '{'Type in a search term'|@translate}',
-        noResultsText: '{'No results'|@translate}',
-        searchingText: '{'Searching...'|@translate}',
-        animateDropdown: false,
-        preventDuplicates: true,
-        allowCreation: false
-    {literal}
-    });
-  }
-  
-  // album filter
-  if ($block.hasClass('filter_album')) {
-    $block.find(".albumSelect").chosen();
-  }
-  
-  // dimension filter
-  if ($block.hasClass('filter_dimensions')) {
-    $block.find(".filter-cond select").change(function() {
-      select_dimensions($block, $(this).attr("value"));
-    });
-    {/literal}
-    
-    $block.find(".filter_dimension_width_slider").slider({ldelim}
-      range: true,
-      min: {$dimensions.bounds.min_width},
-      max: {$dimensions.bounds.max_width},
-      values: [{$dimensions.bounds.min_width}, {$dimensions.bounds.max_width}],
-      slide: function(event, ui) {ldelim}
-        change_dimension_info($block, ui.values, "{'between %d and %d pixels'|@translate}");
-      },
-      change: function(event, ui) {ldelim}
-        change_dimension_info($block, ui.values, "{'between %d and %d pixels'|@translate}");
-      }
-    });
-    
-    $block.find(".filter_dimension_height_slider").slider({ldelim}
-      range: true,
-      min: {$dimensions.bounds.min_height},
-      max: {$dimensions.bounds.max_height},
-      values: [{$dimensions.bounds.min_height}, {$dimensions.bounds.max_height}],
-      slide: function(event, ui) {ldelim}
-        change_dimension_info($block, ui.values, "{'between %d and %d pixels'|@translate}");
-      },
-      change: function(event, ui) {ldelim}
-        change_dimension_info($block, ui.values, "{'between %d and %d pixels'|@translate}");
-      }
-    });
-    
-    $block.find(".filter_dimension_ratio_slider").slider({ldelim}
-      range: true,
-      step: 0.01,
-      min: {$dimensions.bounds.min_ratio},
-      max: {$dimensions.bounds.max_ratio},
-      values: [{$dimensions.bounds.min_ratio}, {$dimensions.bounds.max_ratio}],
-      slide: function(event, ui) {ldelim}
-        change_dimension_info($block, ui.values, "{'between %.2f and %.2f'|@translate}");
-      },
-      change: function(event, ui) {ldelim}
-        change_dimension_info($block, ui.values, "{'between %.2f and %.2f'|@translate}");
-      }
-    });
-    {literal}
-    
-    $block.find("a.dimensions-choice").click(function() {
-      $block.find(".filter_dimension_"+ $(this).data("type") +"_slider").slider("values", 
-        [$(this).data("min"), $(this).data("max")]
+
+    // date filter
+    if ($block.hasClass('filter_date')) {
+      $block.find("input[type='text']").each(function() {
+        $(this).datepicker({
+          dateFormat:'yy-mm-dd',
+          firstDay:1
+        });
+      });
+    }
+
+    // tags filter
+    if ($block.hasClass('filter_tags')) {
+      $block.find(".tagSelect").tokenInput(
+        [{foreach from=$all_tags item=tag name=tags}{ name:"{$tag.name|escape:javascript}", id:"{$tag.id}" }{if !$smarty.foreach.tags.last},{/if}{/foreach}],
+        {
+          hintText: '{'Type in a search term'|translate}',
+          noResultsText: '{'No results'|translate}',
+          searchingText: '{'Searching...'|translate}',
+          animateDropdown: false,
+          preventDuplicates: true,
+          allowFreeTagging: false
+        }
       );
-    });
-  }
-}
-
-
-// GENERAL FUNCTIONS
-function change_dimension_info($block, values, text) {
-  $block.find("input[name$='[value][min]']").val(values[0]);
-  $block.find("input[name$='[value][max]']").val(values[1]);
-  $block.find(".filter_dimension_info").html(sprintf(text, values[0], values[1]));
-}
-
-function countImages(form) {
-{/literal}
-  jQuery.post("{$COUNT_SCRIPT_URL}", 'cat_id={$CAT_ID}&'+form.serialize(),
-{literal}
-    function success(data) {
-      jQuery('.count_images_wrapper').html(data);
-    }
-  );
-}
-
-function doBlink(obj,start,finish) { 
-  jQuery(obj).fadeOut(400).fadeIn(400); 
-  if(start!=finish) { 
-    doBlink(obj,start+1,finish);
-  } else {
-    jQuery(obj).fadeOut(400);
-  }
-}
-{/literal}
-
-{if isset($new_smart)}doBlink('.new_smart', 0, 3);{/if}
+    }
+
+    // album filter
+    if ($block.hasClass('filter_album')) {
+      $block.find(".albumSelect").chosen();
+    }
+
+    // dimension filter
+    if ($block.hasClass('filter_dimensions')) {
+      $block.find(".filter-cond select").change(function() {
+        select_dimensions($block, $(this).val());
+      });
+
+      $block.find(".filter_dimension_width_slider").slider({
+        range: true,
+        min: {$dimensions.bounds.min_width},
+        max: {$dimensions.bounds.max_width},
+        values: [{$dimensions.bounds.min_width}, {$dimensions.bounds.max_width}],
+        slide: function(event, ui) {
+          change_dimension_info($block, ui.values, "{'between %d and %d pixels'|translate}");
+        },
+        change: function(event, ui) {
+          change_dimension_info($block, ui.values, "{'between %d and %d pixels'|translate}");
+        }
+      });
+
+      $block.find(".filter_dimension_height_slider").slider({
+        range: true,
+        min: {$dimensions.bounds.min_height},
+        max: {$dimensions.bounds.max_height},
+        values: [{$dimensions.bounds.min_height}, {$dimensions.bounds.max_height}],
+        slide: function(event, ui) {
+          change_dimension_info($block, ui.values, "{'between %d and %d pixels'|translate}");
+        },
+        change: function(event, ui) {
+          change_dimension_info($block, ui.values, "{'between %d and %d pixels'|translate}");
+        }
+      });
+
+      $block.find(".filter_dimension_ratio_slider").slider({
+        range: true,
+        step: 0.01,
+        min: {$dimensions.bounds.min_ratio},
+        max: {$dimensions.bounds.max_ratio},
+        values: [{$dimensions.bounds.min_ratio}, {$dimensions.bounds.max_ratio}],
+        slide: function(event, ui) {
+          change_dimension_info($block, ui.values, "{'between %.2f and %.2f'|translate}");
+        },
+        change: function(event, ui) {
+          change_dimension_info($block, ui.values, "{'between %.2f and %.2f'|translate}");
+        }
+      });
+
+      $block.find("a.dimensions-choice").click(function() {
+        $block.find(".filter_dimension_"+ $(this).data("type") +"_slider").slider("values",
+          [$(this).data("min"), $(this).data("max")]
+        );
+      });
+    }
+  }
+
+
+  // GENERAL FUNCTIONS
+  function change_dimension_info($block, values, text) {
+    $block.find("input[name$='[value][min]']").val(values[0]);
+    $block.find("input[name$='[value][max]']").val(values[1]);
+    $block.find(".filter_dimension_info").html(sprintf(text, values[0], values[1]));
+  }
+
+  function countImages(form) {
+    jQuery.post("{$COUNT_SCRIPT_URL}", 'cat_id={$CAT_ID}&'+form.serialize(),
+      function success(data) {
+        jQuery('.count_images_wrapper').html(data);
+      }
+    );
+  }
+
+
+  {if isset($new_smart)}
+  function doBlink(obj,start,finish) {
+    jQuery(obj).fadeOut(400).fadeIn(400);
+    if(start!=finish) {
+      doBlink(obj,start+1,finish);
+    }
+    else {
+      jQuery(obj).fadeOut(400);
+    }
+  }
+
+  doBlink('.new_smart', 0, 3);
+  {/if}
+
+  return add_filter; // expose add_filter method
+}(jQuery));
 {/footer_script}
 
 
 <div class="titrePage">
-  <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|@translate} [SmartAlbum]</h2>
+  <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|translate} [SmartAlbum]</h2>
 </div>
 
 <noscript>
-<div class="errors"><ul><li>JavaScript required!</li></ul></div>
+  <div class="errors"><ul><li>JavaScript required!</li></ul></div>
 </noscript>
 
 <div id="batchManagerGlobal">
 <form action="{$F_ACTION}" method="POST" id="smart">
-  <p style="text-align:left;"><label><input type="checkbox" name="is_smart" {if isset($filters) OR isset($new_smart)}checked="checked"{/if}/> {'This album is a SmartAlbum'|@translate}</label></p>
+  <p style="text-align:left;"><label><input type="checkbox" name="is_smart" {if isset($filters) OR isset($new_smart)}checked="checked"{/if}/> {'This album is a SmartAlbum'|translate}</label></p>
 
   <fieldset id="SmartAlbum_options" style="margin-top:1em;{if !isset($filters) AND !isset($new_smart)}display:none;{/if}">
-    <legend>{'Filters'|@translate}</legend>
-      
+    <legend>{'Filters'|translate}</legend>
+
     <ul id="filtersList">
     {foreach from=$filters item=filter}{strip}
@@ -268 +282 @@
         {assign var='value' value=$filter.value}
       {/if}
-      
+
       {if $filter.type == 'limit'}
         {footer_script}
@@ -280 +294 @@
         {/footer_script}
       {/if}
-      
-      {footer_script}add_filter('{$filter.type}', '{$filter.cond}', '{$value|escape:javascript}');{/footer_script}
+
+      {footer_script}addFilter('{$filter.type}', '{$filter.cond}', '{$value|escape:javascript}');{/footer_script}
     {/strip}{/foreach}
     </ul>
-    
+
     <div>
-      <b>{'Mode'|@translate} :</b>
+      <b>{'Mode'|translate} :</b>
       <label><input type="radio" name="filters[0][value]" value="and" {if $filter_mode=='and'}checked="checked"{/if}> AND</label>
       <label><input type="radio" name="filters[0][value]" value="or" {if $filter_mode=='or'}checked="checked"{/if}> OR</label>
@@ -292 +306 @@
       <input type="hidden" name="filters[0][cond]" value="mode">
     </div>
-    
+
     <p class="actionButtons">
       <select id="addFilter">
-        <option value="-1">{'Add a filter'|@translate}</option>
+        <option value="-1">{'Add a filter'|translate}</option>
         <option disabled="disabled">------------------</option>
-        <option value="tags">{'Tags'|@translate}</option>
-        <option value="date">{'Date'|@translate}</option>
-        <option value="name">{'Photo name'|@translate}</option>
-        <option value="album">{'Album'|@translate}</option>
-        <option value="dimensions">{'Dimensions'|@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>
-      {if isset($new_smart)}<span class="new_smart">{'Add filters here'|@translate}</span>{/if}
+        <option value="tags">{'Tags'|translate}</option>
+        <option value="date">{'Date'|translate}</option>
+        <option value="name">{'Photo name'|translate}</option>
+        <option value="album">{'Album'|translate}</option>
+        <option value="dimensions">{'Dimensions'|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>
+      {if isset($new_smart)}<span class="new_smart">{'Add filters here'|translate}</span>{/if}
     </p>
   </fieldset>
-  
+
   <p class="actionButtons" id="applyFilterBlock">
-    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitFilters"/>
-    <input class="submit" type="submit" value="{'Count'|@translate}" name="countImages" {if !isset($filters) AND !isset($new_smart)}style="display:none;"{/if}/>
+    <input class="submit" type="submit" value="{'Submit'|translate}" name="submitFilters"/>
+    <input class="submit" type="submit" value="{'Count'|translate}" name="countImages" {if !isset($filters) AND !isset($new_smart)}style="display:none;"{/if}/>
     <span class="count_images_wrapper" {if !isset($filters) AND !isset($new_smart)}style="display:none;"{/if}><span class="count_image">{$IMAGE_COUNT}</span></span>
   </p>
@@ -327 +341 @@
   <li id="filter_iiii" class="filter_tags">
     <span class="filter-title">
-      <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+      <a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
       <input type="hidden" name="filters[iiii][type]" value="tags"/>
       {$options.tags.name}
     </span>
-    
+
     <span class="filter-cond">
       <select name="filters[iiii][cond]">
@@ -337 +351 @@
       </select>
     </span>
-    
+
     <span class="filter-value">
       <select name="filters[iiii][value]" class="tagSelect">
@@ -344 +358 @@
   </li>
   </div>
-  
+
   <!-- date -->
   <div id="filter_date">
   <li id="filter_iiii" class="filter_date">
     <span class="filter-title">
-      <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+      <a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
       <input type="hidden" name="filters[iiii][type]" value="date"/>
       {$options.date.name}
     </span>
-    
+
     <span class="filter-cond">
       <select name="filters[iiii][cond]">
@@ -359 +373 @@
       </select>
     </span>
-    
+
     <span class="filter-value">
       <input type="text" name="filters[iiii][value]" size="30"/>
@@ -365 +379 @@
   </li>
   </div>
-  
+
   <!-- name -->
   <div id="filter_name">
   <li id="filter_iiii" class="filter_name">
     <span class="filter-title">
-      <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+      <a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
       <input type="hidden" name="filters[iiii][type]" value="name"/>
       {$options.name.name}
     </span>
-    
+
     <span class="filter-cond">
       <select name="filters[iiii][cond]">
@@ -380 +394 @@
       </select>
     </span>
-    
+
     <span class="filter-value">
       <input type="text" name="filters[iiii][value]" size="30"/>
@@ -386 +400 @@
   </li>
   </div>
-  
+
   <!-- album -->
   <div id="filter_album">
   <li id="filter_iiii" class="filter_album">
     <span class="filter-title">
-      <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+      <a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
       <input type="hidden" name="filters[iiii][type]" value="album"/>
       {$options.album.name}
     </span>
-    
+
     <span class="filter-cond">
       <select name="filters[iiii][cond]">
@@ -401 +415 @@
       </select>
     </span>
-    
-    <span class="filter-value">
-      <select name="filters[iiii][value][]" class="albumSelect" multiple="multiple" data-placeholder="{'Select albums...'|@translate}">
+
+    <span class="filter-value">
+      <select name="filters[iiii][value][]" class="albumSelect" multiple="multiple" data-placeholder="{'Select albums...'|translate}">
         {html_options options=$all_albums}
       </select>
@@ -409 +423 @@
   </li>
   </div>
-  
+
   <!-- dimensions -->
   <div id="filter_dimensions">
   <li id="filter_iiii" class="filter_dimensions">
     <span class="filter-title">
-      <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+      <a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
       <input type="hidden" name="filters[iiii][type]" value="dimensions"/>
       {$options.dimensions.name}
@@ -427 +441 @@
     <span class="filter-value">
       <span class="dimension_width">
-      <span class="filter_dimension_info"></span>
-        | <a class="dimensions-choice" data-type="width" data-min="{$dimensions.bounds.min_width}" data-max="{$dimensions.bounds.max_width}">{'Reset'|@translate}</a>
-        <div class="filter_dimension_width_slider"></div>
+        <span class="filter_dimension_info"></span>
+          | <a class="dimensions-choice" data-type="width" data-min="{$dimensions.bounds.min_width}" data-max="{$dimensions.bounds.max_width}">{'Reset'|translate}</a>
+          <div class="filter_dimension_width_slider"></div>
       </span>
 
-      <span class="filter-value dimension_height">
-      <span class="filter_dimension_info"></span>
-        | <a class="dimensions-choice" data-type="height" data-min="{$dimensions.bounds.min_height}" data-max="{$dimensions.bounds.max_height}">{'Reset'|@translate}</a>
-        <div class="filter_dimension_height_slider"></div>
+      <span class="dimension_height">
+        <span class="filter_dimension_info"></span>
+          | <a class="dimensions-choice" data-type="height" data-min="{$dimensions.bounds.min_height}" data-max="{$dimensions.bounds.max_height}">{'Reset'|translate}</a>
+          <div class="filter_dimension_height_slider"></div>
       </span>
 
-      <span class="filter-value dimension_ratio">
-      <span class="filter_dimension_info"></span>
-{if isset($dimensions.ratio_portrait)}
-        | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_portrait.min}" data-max="{$dimensions.ratio_portrait.max}">{'Portrait'|@translate}</a>
-{/if}
-{if isset($dimensions.ratio_square)}
-        | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_square.min}" data-max="{$dimensions.ratio_square.max}">{'square'|@translate}</a>
-{/if}
-{if isset($dimensions.ratio_landscape)}
-        | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_landscape.min}" data-max="{$dimensions.ratio_landscape.max}">{'Landscape'|@translate}</a>
-{/if}
-{if isset($dimensions.ratio_panorama)}
-        | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_panorama.min}" data-max="{$dimensions.ratio_panorama.max}">{'Panorama'|@translate}</a>
-{/if}
-        | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.bounds.min_ratio}" data-max="{$dimensions.bounds.max_ratio}">{'Reset'|@translate}</a>
-        <div class="filter_dimension_ratio_slider"></div>
+      <span class="dimension_ratio">
+        <span class="filter_dimension_info"></span>
+        {if isset($dimensions.ratio_portrait)}
+          | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_portrait.min}" data-max="{$dimensions.ratio_portrait.max}">{'Portrait'|translate}</a>
+        {/if}
+        {if isset($dimensions.ratio_square)}
+          | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_square.min}" data-max="{$dimensions.ratio_square.max}">{'square'|translate}</a>
+        {/if}
+        {if isset($dimensions.ratio_landscape)}
+          | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_landscape.min}" data-max="{$dimensions.ratio_landscape.max}">{'Landscape'|translate}</a>
+        {/if}
+        {if isset($dimensions.ratio_panorama)}
+          | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_panorama.min}" data-max="{$dimensions.ratio_panorama.max}">{'Panorama'|translate}</a>
+        {/if}
+          | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.bounds.min_ratio}" data-max="{$dimensions.bounds.max_ratio}">{'Reset'|translate}</a>
+          <div class="filter_dimension_ratio_slider"></div>
       </span>
     </span>
@@ -461 +475 @@
   </li>
   </div>
-  
+
   <!-- author -->
   <div id="filter_author">
   <li id="filter_iiii" class="filter_author">
     <span class="filter-title">
-      <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+      <a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
       <input type="hidden" name="filters[iiii][type]" value="author"/>
       {$options.author.name}
     </span>
-    
+
     <span class="filter-cond">
       <select name="filters[iiii][cond]">
@@ -476 +490 @@
       </select>
     </span>
-    
+
     <span class="filter-value">
       <input type="text" name="filters[iiii][value]" size="30"/>
-      <i>{'For "Is (not) in", separate each author by a comma'|@translate}</i>
-    </span>
-  </li>
-  </div>
-  
+      <i>{'For "Is (not) in", separate each author by a comma'|translate}</i>
+    </span>
+  </li>
+  </div>
+
   <!-- hit -->
   <div id="filter_hit">
   <li id="filter_iiii" class="filter_hit">
     <span class="filter-title">
-      <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+      <a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
       <input type="hidden" name="filters[iiii][type]" value="hit"/>
       {$options.hit.name}
     </span>
-    
+
     <span class="filter-cond">
       <select name="filters[iiii][cond]">
@@ -498 +512 @@
       </select>
     </span>
-    
+
     <span class="filter-value">
       <input type="text" name="filters[iiii][value]" size="5"/>
@@ -504 +518 @@
   </li>
   </div>
-  
+
   <!-- rating_score -->
   <div id="filter_rating_score">
   <li id="filter_iiii" class="filter_rating_score">
     <span class="filter-title">
-      <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+      <a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
       <input type="hidden" name="filters[iiii][type]" value="rating_score"/>
       {$options.rating_score.name}
     </span>
-    
+
     <span class="filter-cond">
       <select name="filters[iiii][cond]">
@@ -519 +533 @@
       </select>
     </span>
-    
+
     <span class="filter-value">
       <input type="text" name="filters[iiii][value]" size="5"/>
@@ -525 +539 @@
   </li>
   </div>
-  
+
   <!-- level -->
   <div id="filter_level">
   <li id="filter_iiii" class="filter_level">
     <span class="filter-title">
-      <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+      <a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
       <input type="hidden" name="filters[iiii][type]" value="level"/>
       {$options.level.name}
     </span>
-    
+
     <input type="hidden" name="filters[iiii][cond]" value="level"/>
-    
+
     <span class="filter-value">
       <select name="filters[iiii][value]">
@@ -544 +558 @@
   </li>
   </div>
-  
+
   <!-- limit -->
   <div id="filter_limit">
   <li id="filter_iiii" class="filter_limit">
     <span class="filter-title">
-      <a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+      <a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
       <input type="hidden" name="filters[iiii][type]" value="limit"/>
       {$options.limit.name}
     </span>
-    
+
     <input type="hidden" name="filters[iiii][cond]" value="limit"/>
-    
+
     <span class="filter-value">
       <input type="text" name="filters[iiii][value]" size="5"/>

extensions/SmartAlbums/admin/template/cat_list.tpl

@@ -1 @@
-{footer_script require='jquery.ui.sortable'}{literal}
-jQuery(document).ready(function(){
-  jQuery("#addAlbumOpen").click(function(){
-    jQuery("#createAlbum").toggle();
-    jQuery("input[name=virtual_name]").focus();
-    jQuery("#autoOrder").hide();
-  });
+{footer_script require='jquery'}
+jQuery("#addAlbumOpen").click(function(){
+  jQuery("#createAlbum").toggle();
+  jQuery("input[name=virtual_name]").focus();
+  jQuery("#autoOrder").hide();
+});
 
-  jQuery("#addAlbumClose").click(function(){
-    jQuery("#createAlbum").hide();
-  });
+jQuery("#addAlbumClose").click(function(){
+  jQuery("#createAlbum").hide();
 });
-{/literal}{/footer_script}
+{/footer_script}
 
-{* è *}
 
 <div class="titrePage">
@@ -24 +21 @@
 <p class="showCreateAlbum">
   <span id="notManualOrder">
-    <a href="#" id="addAlbumOpen">{'create a new SmartAlbum'|@translate}</a>
-    | <a href="{$F_ACTION}&amp;smart_generate=all">{'Regenerate photos list of all SmartAlbums'|@translate}</a>
+    <a href="#" id="addAlbumOpen">{'create a new SmartAlbum'|translate}</a>
+    | <a href="{$F_ACTION}&amp;smart_generate=all">{'Regenerate photos list of all SmartAlbums'|translate}</a>
   </span>
 </p>
 
 <fieldset id="createAlbum" style="display:none;">
-  <legend>{'create a new SmartAlbum'|@translate}</legend>
+  <legend>{'create a new SmartAlbum'|translate}</legend>
   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
   <p>
-    <strong>{'Album name'|@translate}</strong> :
+    <strong>{'Album name'|translate}</strong> :
     <input type="text" name="virtual_name">
   </p>
   <p>
-    <strong>{'Parent album'|@translate}</strong>  :
+    <strong>{'Parent album'|translate}</strong>  :
     <select class="categoryDropDown" name="parent_id">
       <option value="0">------------</option>
@@ -45 +42 @@
   </p>
   <p class="actionButtons">
-    <input class="submit" type="submit" value="{'Create'|@translate}" name="submitAdd">
-    <a href="#" id="addAlbumClose">{'Cancel'|@translate}</a>
+    <input class="submit" type="submit" value="{'Create'|translate}" name="submitAdd">
+    <a href="#" id="addAlbumClose">{'Cancel'|translate}</a>
   </p>
 </fieldset>
@@ -58 +55 @@
       <!-- category {$category.ID} -->
       <p class="albumTitle">
-        <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-albums'|@translate}">{$category.NAME}</a></strong>
+        <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-albums'|translate}">{$category.NAME}</a></strong>
         <img src="{$SMART_PATH}admin/template/lightning.png">
-        {'%d photos'|@translate|sprintf:$category.IMG_COUNT}
+        {'%d photos'|translate:$category.IMG_COUNT}
       </p>
 
       <p class="albumActions">
-        <a href="{$category.U_EDIT}">{'Edit'|@translate}</a>
-        | <a href="{$category.U_SMART}" title="{$category.LAST_UPDATE}">{'Regenerate photos list of this SmartAlbum'|@translate}</a>
+        <a href="{$category.U_EDIT}">{'Edit'|translate}</a>
+        | <a href="{$category.U_SMART}" title="{$category.LAST_UPDATE}">{'Regenerate photos list of this SmartAlbum'|translate}</a>
         {if isset($category.U_DELETE) }
-        | <a href="{$category.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'delete album'|@translate}</a>
+        | <a href="{$category.U_DELETE}" onclick="return confirm('{'Are you sure?'|translate|escape:javascript}');">{'delete album'|translate}</a>
         {/if}
         {if cat_admin_access($category.ID)}
-        | <a href="{$category.U_JUMPTO}">{'jump to album'|@translate} ?</a>
+        | <a href="{$category.U_JUMPTO}">{'jump to album'|translate} ?</a>
         {/if}
       </p>

extensions/SmartAlbums/admin/template/config.tpl

@@ -1 @@
-{html_head}{literal}
-<style type="text/css">
-.showInfo {
-  position:static;
-  display:inline-block;
-  padding:1px 6px !important;
-  width:auto;
-  font-size:0.8em;
-  line-height:1.2em;
-}
-</style>
-{/literal}{/html_head}
+{footer_script require="jquery"}
+jQuery(".showInfo").tipTip({
+  delay: 0,
+  fadeIn: 200,
+  fadeOut: 200,
+  maxWidth: '300px',
+  defaultPosition:"right"
+});
+{/footer_script}
 
-{footer_script require="jquery"}
-jQuery(".showInfo").tipTip({ldelim}
-    delay: 0,
-    fadeIn: 200,
-    fadeOut: 200,
-    maxWidth: '300px',
-    defaultPosition:"right"
-  });
-{/footer_script}
 
 <div class="titrePage">
@@ -26 +14 @@
 </div>
 
-<form method="post" action="" class="properties"> 
+<form method="post" action="" class="properties">
   <fieldset id="commentsConf">
     <ul>
       <li>
         <label>
-          <input type="checkbox" name="update_on_upload" value="true" {if $update_on_upload}checked="checked"{/if}/>
-          <b>{'Update albums on file upload'|@translate}</b>
-          <a class="showInfo" title="{'can cause slowdowns'|@translate}">i</a>
-        </label>
+          <input type="checkbox" name="update_on_date" value="true" {if $update_on_date}checked="checked"{/if}/>
+          {assign var=input value='</label><input type="text" name="update_timeout" size="2" value="'|cat:$update_timeout|cat:'"/>'}
+          <b>{'Update albums every %s days'|translate:$input}</b>
+        <!-- label -->
       </li>
       <li>
         <label>
-          <input type="checkbox" name="update_on_date" value="true" {if $update_on_date}checked="checked"{/if}/>
-          {assign var=input value='<input type="text" name="update_timeout" size="2" value="'|cat:$update_timeout|cat:'"/>'}
-          <b>{'Update albums every %s days'|@translate|sprintf:$input}</b>
+          <input type="checkbox" name="update_on_upload" value="true" {if $update_on_upload}checked="checked"{/if}/>
+          <b>{'Update albums on file upload'|translate}</b>
+          <a class="icon-info-circled-1 showInfo" title="{'can cause slowdowns'|translate}"></a>
         </label>
       </li>
@@ -46 +34 @@
         <label>
           <input type="checkbox" name="smart_is_forbidden" value="true" {if $smart_is_forbidden}checked="checked"{/if}/>
-          <b>{'Exclude SmartAlbums from permissions management'|@translate}</b>
-          <a class="showInfo" title="{'SmartAlbums are considered private for everyone, and a user can see it\'s content only if available in another album he has access to.'|@translate}">i</a>
+          <b>{'Exclude SmartAlbums from permissions management'|translate}</b>
+          <a class="icon-info-circled-1 showInfo" title="{'SmartAlbums are considered private for everyone, and a user can see it\'s content only if available in another album he has access to.'|translate}"></a>
         </label>
       </li>
     </ul>
   </fieldset>
-    
-  <p class="formButtons"><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" /></p>
+
+  <p class="formButtons"><input class="submit" type="submit" value="{'Submit'|translate}" name="submit" /></p>
 </form>

extensions/SmartAlbums/admin/template/style.css

@@ -8 +8 @@
 }
 #batchManagerGlobal #filtersList li.token-input-input-token {
-  margin-bottom:-3px !important; 
+  margin-bottom:-3px !important;
 }
 
 #batchManagerGlobal .filter_dimensions .ui-slider-horizontal {
-    margin: 5px 0 3px 0;
-    width: 500px;
+  margin:5px 0 3px 0;
+  width:400px;
 }