aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-07-25 11:45:08 +0000
committerplegall <plg@piwigo.org>2012-07-25 11:45:08 +0000
commit6c2fad0dd335898d8c56f982e369ed6f29d872b0 (patch)
treec4de8bbdaba7f174b51e487b87c2c08fa535b022 /admin/themes
parentab924a14bd64f4fd2ede3febd76007ea43b9d91a (diff)
merge r17008 from branch 2.4 to trunk
feature 2693 added: automatically show link to caddie if caddie not empty git-svn-id: http://piwigo.org/svn/trunk@17009 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/themes/default/template/admin.tpl3
-rw-r--r--admin/themes/default/theme.css13
2 files changed, 15 insertions, 1 deletions
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 293e4be6e..8bb28b2f4 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -41,6 +41,9 @@ Raphael("menubarUsers", 20, 16).path("").scale(0.6, 0.6, 0, 0).attr({fill: "#464
<li><a href="{$U_TAGS}">{'Tags'|@translate}</a></li>
<li><a href="{$U_RECENT_SET}">{'Recent photos'|@translate}</a></li>
<li><a href="{$U_BATCH}">{'Batch Manager'|@translate}</a></li>
+{if $NB_PHOTOS_IN_CADDIE > 0}
+ <li><a href="{$U_CADDIE}">{'Caddie'|@translate}<span class="adminMenubarCounter">{$NB_PHOTOS_IN_CADDIE}</span></a></li>
+{/if}
</ul>
</dd>
</dl>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 2e7c25643..688c07997 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1113,4 +1113,15 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;}
.dErrorDesc {background-color:red; color:white; padding:0 5px;border-radius:10px; font-weight:bold;cursor:help;}
#wImg {max-height:100px;border:2px solid #ccc;margin-top:5px;}
-#addWatermark {display:none;} \ No newline at end of file
+#addWatermark {display:none;}
+
+.adminMenubarCounter {
+ background-color:#666;
+ color:white;
+ padding:1px 5px;
+ border-radius:10px;
+ -moz-border-radius:10px;
+ -webkit-border-radius:10px;
+ -border-radius:10px;
+ margin-left:5px;
+} \ No newline at end of file