Changeset 17009


Ignore:
Timestamp:
Jul 25, 2012, 1:45:08 PM (8 years ago)
Author:
plg
Message:

merge r17008 from branch 2.4 to trunk

feature 2693 added: automatically show link to caddie if caddie not empty

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin.php

    r16928 r17009  
    220220}
    221221
     222// any photo in the caddie?
     223$query = '
     224SELECT COUNT(*)
     225  FROM '.CADDIE_TABLE.'
     226  WHERE user_id = '.$user['id'].'
     227;';
     228list($nb_photos_in_caddie) = pwg_db_fetch_row(pwg_query($query));
     229
     230if ($nb_photos_in_caddie > 0)
     231{
     232  $template->assign(
     233    array(
     234      'NB_PHOTOS_IN_CADDIE' => $nb_photos_in_caddie,
     235      'U_CADDIE' => $link_start.'batch_manager&cat=caddie',
     236      )
     237    );
     238}
     239
    222240// +-----------------------------------------------------------------------+
    223241// | Plugin menu                                                           |
  • trunk/admin/themes/default/template/admin.tpl

    r15230 r17009  
    4242        <li><a href="{$U_RECENT_SET}">{'Recent photos'|@translate}</a></li>
    4343        <li><a href="{$U_BATCH}">{'Batch Manager'|@translate}</a></li>
     44{if $NB_PHOTOS_IN_CADDIE > 0}
     45        <li><a href="{$U_CADDIE}">{'Caddie'|@translate}<span class="adminMenubarCounter">{$NB_PHOTOS_IN_CADDIE}</span></a></li>
     46{/if}
    4447      </ul>
    4548    </dd>
  • trunk/admin/themes/default/theme.css

    r14546 r17009  
    11151115#wImg {max-height:100px;border:2px solid #ccc;margin-top:5px;}
    11161116#addWatermark {display:none;}
     1117
     1118.adminMenubarCounter {
     1119  background-color:#666;
     1120  color:white;
     1121  padding:1px 5px;
     1122  border-radius:10px;
     1123  -moz-border-radius:10px;
     1124  -webkit-border-radius:10px;
     1125  -border-radius:10px;
     1126  margin-left:5px;
     1127}
Note: See TracChangeset for help on using the changeset viewer.