Changeset 25629 for extensions/AdminTools

Timestamp:

Nov 21, 2013, 9:13:41 PM (10 years ago)

Author:

mistic100

Message:

• add "Add photos" link for albums
• fix empty username if viewing as "guest"

Location:

extensions/AdminTools

Files:

• include/events.inc.php (modified) (3 diffs)
• template/public_controller.tpl (modified) (4 diffs)

extensions/AdminTools/include/events.inc.php

@@ -11 +11 @@
   }
 
-  global $template, $page;
+  global $template, $page, $user;
 
   $url_root = get_root_url();
@@ -20 +20 @@
     'U_SELF' => $MultiView->get_clean_url(true),
     'USER' => $MultiView->get_user(),
+    'CURRENT_USERNAME' => $user['id']==$conf['guest_id'] ? l10n('guest') : $user['username'],
     );
 
@@ -37 +38 @@
       ));
 
+    $query = 'SELECT element_id FROM ' . CADDIE_TABLE . '
+      WHERE element_id = ' . $page['image_id'] .';';
+    $tpl_vars['IS_IN_CADDIE'] = pwg_db_num_rows(pwg_query($query)) > 0;
+
     if (isset($page['category']))
     {
+      $tpl_vars['CATEGORY_ID'] = $page['category']['id'];
+
       $tpl_vars['U_SET_REPRESENTATIVE'] = add_url_params(
         $url_self,
         array('action'=>'set_as_representative')
         );
-      $tpl_vars['CATEGORY_ID'] = $page['category']['id'];
+
+      $query = 'SELECT id FROM ' . CATEGORIES_TABLE.'
+        WHERE id = ' . $page['category']['id'] .'
+        AND representative_picture_id = ' . $page['image_id'] .';';
+      $tpl_vars['IS_REPRESENTATIVE'] = pwg_db_num_rows(pwg_query($query)) > 0;
     }
 

extensions/AdminTools/template/public_controller.tpl

@@ -2 +2 @@
 {combine_css path='admin/themes/default/fontello/css/fontello.css'}
 {combine_css path=$ADMINTOOLS_PATH|cat:'template/fontello/css/fontello-ato.css'}
-
-{capture assign=users_options} {html_options options=$ato.USERS  selected=$ato.MULTIVIEW.view_as}{/capture}
-{capture assign=themes_options}{html_options options=$ato.THEMES selected=$ato.MULTIVIEW.theme}{/capture}
-{capture assign=langs_options} {html_options options=$ato.LANGS  selected=$ato.MULTIVIEW.lang}{/capture}
 
 <div id="ato_header_closed"><a href="#" class="icon-tools"></a></div>
@@ -14 +10 @@
     <li class="parent"><a href="#" class="icon-menu">{'Admin panel'|translate}</a>
       <ul>
-        <li><a class="icon-picture" href="{$ato.U_SITE_ADMIN}photos_add">{'Photos'|translate}</a></li>
+        <li><a class="icon-picture" href="{$ato.U_SITE_ADMIN}batch_manager">{'Photos'|translate}</a></li>
         <li><a class="icon-sitemap" href="{$ato.U_SITE_ADMIN}cat_list">{'Albums'|translate}</a></li>
         <li><a class="icon-users" href="{$ato.U_SITE_ADMIN}user_list">{'Users'|translate}</a></li>
@@ -31 +27 @@
   {/if}
   {if isset($ato.U_SET_REPRESENTATIVE)}
-    <li><a class="icon-ato-trophy set-representative" href="{$ato.U_SET_REPRESENTATIVE}">{'representative'|translate|ucfirst}</a></li>
+    <li {if $ato.IS_REPRESENTATIVE}class="disabled"{/if}><a class="icon-ato-trophy set-representative" href="{$ato.U_SET_REPRESENTATIVE}">{'representative'|translate|ucfirst}</a></li>
   {/if}
   {if isset($ato.U_CADDIE)}
-    <li><a class="icon-ato-flag add-caddie" href="{$ato.U_CADDIE}">{'Add to caddie'|translate}</a></li>
+    <li {if $ato.IS_IN_CADDIE}class="disabled"{/if}><a class="icon-ato-flag add-caddie" href="{$ato.U_CADDIE}">{'Add to caddie'|translate}</a></li>
   {/if}
+  {if isset($ato.IS_CATEGORY)}
+    <li><a class="icon-plus-circled" href="{$ato.U_SITE_ADMIN}photos_add&amp;album={$ato.CATEGORY_ID}">{'Add Photos'|translate}</a></li>
+  {/if}
+
     <li class="parent right"><a class="icon-cog-alt" href="#">{'Tools'|translate}</a>
       <ul>
         <li><label>View as</label>
           <select class="switcher" data-type="view_as">
-            {$users_options}
+            {html_options options=$ato.USERS selected=$ato.MULTIVIEW.view_as}
           </select>
         </li>
         <li><label>Theme</label>
           <select class="switcher" data-type="theme">
-            {$themes_options}
+            {html_options options=$ato.THEMES selected=$ato.MULTIVIEW.theme}
           </select>
         </li>
         <li><label>Language</label>
           <select class="switcher" data-type="lang">
-            {$langs_options}
+            {html_options options=$ato.LANGS selected=$ato.MULTIVIEW.lang}
           </select>
         </li>
@@ -61 +61 @@
       </ul>
     </li>
-  {if $ato.USER.username != $USERNAME}
+  {if $ato.USER.id != $ato.MULTIVIEW.view_as}
     <li class="right">
-      &nbsp;&nbsp;{'Logged as <b>%s</b>, viewing as <b>%s</b>.'|translate:$ato.USER.username:$USERNAME}
-      <a href="{$ato.U_SELF}view_as={$ato.USER.id}">{'Go back'|translate}</a>
+      &nbsp;&nbsp;{'Logged as <b>%s</b>, viewing as <b>%s</b>.'|translate:$ato.USER.username:$ato.CURRENT_USERNAME}
+      <a href="{$ato.U_SELF}view_as={$ato.USER.id}">{'Revert'|translate}</a>
     </li>
   {/if}