Changeset 16104 for extensions/SmartAlbums/admin

Timestamp:

Jun 27, 2012, 9:19:07 PM (12 years ago)

Author:

mistic100

Message:

updated for Piwigo 2.4
new filters : name, author, level, hits

Location:

extensions/SmartAlbums/admin

Files:

• album.php (added)
• cat_list.php (moved) (moved from extensions/SmartAlbums/admin/albums.inc.php) (9 diffs)
• config.php (moved) (moved from extensions/SmartAlbums/admin/config.inc.php) (1 diff)
• index.php (modified) (1 diff)
• template/album.tpl (added)
• template/cat_list.tpl (moved) (moved from extensions/SmartAlbums/admin/template/albums.tpl) (2 diffs)
• template/config.tpl (modified) (1 diff)
• template/index.php (modified) (1 diff)
• template/lightning.png (added)
• template/style.css (added)

extensions/SmartAlbums/admin/cat_list.php

@@ -11 +11 @@
 // |                            initialization                             |
 // +-----------------------------------------------------------------------+
-$base_url = get_root_url().'admin.php?page=';
-$self_url = SMART_ADMIN.'-albums';
+$base_url = get_root_url() . 'admin.php?page=';
+$self_url = SMART_ADMIN . '-cat_list';
 
 $categories = array();
 $query = '
-SELECT id, name, permalink, dir, rank, status
+SELECT 
+    id,
+    name,
+    permalink,
+    dir,
+    rank,
+    status
   FROM '.CATEGORIES_TABLE.' AS cat
   INNER JOIN '.CATEGORY_FILTERS_TABLE.' AS cf
@@ -50 +56 @@
   {
     $_SESSION['page_infos'] = array(l10n('SmartAlbum added'));
-    $redirect_url = $base_url.'cat_modify&cat_id='.$output_create['id'].'&new_smart';
+    $redirect_url = SMART_ADMIN . '-album&cat_id='.$output_create['id'].'&new_smart';
     redirect($redirect_url);
   }
@@ -57 +63 @@
 else if (isset($_GET['smart_generate']))
 {
-  /* regenerate photo list | all (sub) categories */
+  /* regenerate photo list | all categories */
   if ($_GET['smart_generate'] == 'all')
   {
@@ -63 +69 @@
     {
       $associated_images = smart_make_associations($category['id']);
-      array_push(
-        $page['infos'], 
-        sprintf(
-          l10n('%d photos associated to album %s'), 
+      array_push($page['infos'], 
+        sprintf(l10n('%d photos associated to album %s'), 
           count($associated_images), 
-          '«'.trigger_event(
-            'render_category_name',
-            $category['name'],
-            'admin_cat_list'
-            ).'»'
+          '«'.trigger_event('render_category_name', $category['name'], 'admin_cat_list').'»'
           )
         );
@@ -81 +81 @@
   {
     $associated_images = smart_make_associations($_GET['smart_generate']);    
-    array_push(
-      $page['infos'], 
-      sprintf(
-        l10n('%d photos associated to album %s'), 
+    array_push($page['infos'], 
+      sprintf(l10n('%d photos associated to album %s'), 
         count($associated_images), 
-        '«'.trigger_event(
-          'render_category_name',
-          $categories[$_GET['smart_generate']]['name'],
-          'admin_cat_list'
-          ).'»'
+        '«'.trigger_event('render_category_name', $categories[ $_GET['smart_generate'] ]['name'], 'admin_cat_list').'»'
         )
       );
@@ -122 +116 @@
 {
   array_push($page['warnings'], l10n('Only SmartAlbums are displayed on this page'));
-  array_push($page['warnings'], l10n('To order albums please go the main albums management 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>');
 }
@@ -147 +141 @@
   $tpl_cat =
     array(
-      'NAME'       => get_cat_display_name_from_id($category['id'], $base_url.'cat_modify&amp;cat_id='),
+      'NAME'       => get_cat_display_name_from_id($category['id'], $base_url.'album-'),
       'ID'         => $category['id'],
       'RANK'       => $category['rank']*10,
@@ -157 +151 @@
         ),
 
-      'U_EDIT'     => $base_url.'cat_modify&amp;cat_id='.$category['id'],
+      'U_EDIT'     => $base_url.'album-'.$category['id'],
       'U_DELETE'   => $self_url.'&amp;delete='.$category['id'].'&amp;pwg_token='.get_pwg_token(),
       'U_SMART'    => $self_url.'&amp;smart_generate='.$category['id'],
@@ -167 +161 @@
       $base_url.'batch_manager&amp;cat='.$category['id'];
   }
-
-  if ('private' == $category['status'])
-  {
-    $tpl_cat['U_MANAGE_PERMISSIONS'] =
-      $base_url.'cat_perm&amp;cat='.$category['id'];
-  }
   
   $template->append('categories', $tpl_cat);
 }
 
+$template->set_filename('SmartAlbums_content', dirname(__FILE__).'/template/cat_list.tpl');
+
 ?>

extensions/SmartAlbums/admin/config.php

@@ -15 +15 @@
 ));
 
+$template->set_filename('SmartAlbums_content', dirname(__FILE__).'/template/config.tpl');
+
 ?>

extensions/SmartAlbums/admin/index.php

@@ -1 +1 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 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.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// Recursive call
 $url = '../';
 header( 'Request-URI: '.$url );

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();
+  });
+
+  jQuery("#addAlbumClose").click(function(){
+    jQuery("#createAlbum").hide();
+  });
+});
+{/literal}{/footer_script}
+
+{* è *}
+
 <div class="titrePage">
         <h2>SmartAlbums</h2>
 </div>
 
-<h3>
-  <a href="{$F_ACTION}">{'All SmartAlbums'|@translate}</a>
-  {if count($categories)>9 }
-  <a href="#EoP" class="button" style="border:0;">
-  <img src="{$themeconf.admin_icon_dir}/page_end.png" title="{'Page end'|@translate}" class="button" alt="page_end" style="margin-bottom:-0.6em;"></a>
-  {/if}
-</h3>
+<form id="categoryOrdering" action="{$F_ACTION}" method="post">
+<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
-<form id="addVirtual" action="{$F_ACTION}" method="post">
-  <fieldset>
-    <legend>{'Add a SmartAlbum'|@translate}</legend>
-  
-    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-    {'Album name'|@translate} : <input type="text" name="virtual_name">
-    {'Parent album'|@translate} :
+<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>
+  </span>
+</p>
+
+<fieldset id="createAlbum" style="display:none;">
+  <legend>{'create a new SmartAlbum'|@translate}</legend>
+  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
+
+  <p>
+    <strong>{'Album name'|@translate}</strong> :
+    <input type="text" name="virtual_name">
+  </p>
+  <p>
+    <strong>{'Parent album'|@translate}</strong>  :
     <select class="categoryDropDown" name="parent_id">
       <option value="0">------------</option>
       {html_options options=$category_options}
     </select>
-    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd">
-  
-  </fieldset>
-</form>
+  </p>
+  <p class="actionButtons">
+    <input class="submit" type="submit" value="{'Create'|@translate}" name="submitAdd">
+    <a href="#" id="addAlbumClose">{'Cancel'|@translate}</a>
+  </p>
+</fieldset>
 
 {if count($categories) }
-<form id="categoryOrdering" action="{$F_ACTION}" method="post">
-  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
   <ul class="categoryUl">
@@ -36 +57 @@
     <li class="categoryLi virtual_cat" id="cat_{$category.ID}">
       <!-- category {$category.ID} -->
-      <ul class="categoryActions">
-        {if cat_admin_access($category.ID)}
-        <li><a href="{$category.U_JUMPTO}" title="{'jump to album'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to album'|@translate}"></a></li>
-        {/if}
-        <li><a href="{$category.U_EDIT}" title="{'edit album'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
-        {if isset($category.U_MANAGE_ELEMENTS) }
-        <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage album photos'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'Photos'|@translate}"></a></li>
-        {/if}
-        {if isset($category.U_MANAGE_PERMISSIONS) }
-        <li><a href="{$category.U_MANAGE_PERMISSIONS}" title="{'edit album permissions'|@translate}" ><img src="{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li>
-        {/if}
-        <li><a href="{$category.U_SMART}" title="{'Regenerate photos list of this SmartAlbum'|@translate}"><img src="{$themeconf.admin_icon_dir}/synchronize.png" class="button" alt="{'Regenerate photos list of this SmartAlbum'|@translate}"></a></li>
-        {if isset($category.U_DELETE) }
-        <li><a href="{$category.U_DELETE}" title="{'delete album'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete album'|@translate}"></a></li>
-        {/if}
-      </ul>
-
-      <p>
-        <strong>{$category.NAME}</strong>
+      <p class="albumTitle">
+        <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-albums'|@translate}">{$category.NAME}</a></strong>
+        <img src="{$SMART_PATH}admin/template/lightning.png">
       </p>
 
+      <p class="albumActions">
+        <a href="{$category.U_EDIT}">{'Edit'|@translate}</a>
+        | <a href="{$category.U_SMART}">{'Regenerate photos list of this SmartAlbum'|@translate}</a>
+        {if isset($category.U_MANAGE_ELEMENTS) }
+        | <a href="{$category.U_MANAGE_ELEMENTS}">{'manage album photos'|@translate}</a>
+        {/if}
+        {if isset($category.U_DELETE) }
+        | <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>
+        {/if}
+      </p>
     </li>
     {/foreach}
   </ul>
+{/if}
 </form>
-{/if}
-
-<form method="post" action="{$F_ACTION}&amp;smart_generate=all">
-  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-  <p><input class="submit" type="submit" value="{'Regenerate photos list of all SmartAlbums'|@translate}"></p>
-</form>
-
-<a name="EoP"></a>

extensions/SmartAlbums/admin/template/config.tpl

@@ -11 +11 @@
           <span class="property">{'Update albums on file upload'|@translate}</span>
           <input type="checkbox" name="update_on_upload" value="true" {if $update_on_upload}checked="checked"{/if}/>
-          {'(can cause slowdowns on admin pages)'|@translate}
+          {'(can cause slowdowns)'|@translate}
         </label>
                         </li>

extensions/SmartAlbums/admin/template/index.php

@@ -1 +1 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 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.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// Recursive call
 $url = '../';
 header( 'Request-URI: '.$url );