aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2006-12-12 06:17:53 +0000
committerrub <rub@piwigo.org>2006-12-12 06:17:53 +0000
commit5e9a4b02be26994e7d49a7d1ece7595a50b28c4b (patch)
tree40e4225aa935fb47d9ba00b290afc6b610735523
parentd54d1a52349c30f81529095ce21befda4079180e (diff)
Feature Issue ID 0000601: Filter all public pages with only recent elements
Change stop icon. Add icon to menu. It's still a draft. Try this! Go to http://forum.phpwebgallery.net/viewtopic.php?id=9490 git-svn-id: http://piwigo.org/svn/trunk@1650 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rwxr-xr-xinclude/menubar.inc.php36
-rw-r--r--template/yoga/icon/stop_filter_mode.pngbin1127 -> 1083 bytes
-rw-r--r--template/yoga/menubar.css10
-rw-r--r--template/yoga/menubar.tpl6
4 files changed, 32 insertions, 20 deletions
diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index 79643ba26..c360b2600 100755
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -168,26 +168,22 @@ $template->assign_block_vars(
'NAME' => $lang['random_cat']
));
-// Not recent menu when filter is activated
-if (!$page['filter_mode'])
-{
- // recent pics
- $template->assign_block_vars(
- 'special_cat',
- array(
- 'URL' => make_index_url(array('section' => 'recent_pics')),
- 'TITLE' => $lang['recent_pics_cat_hint'],
- 'NAME' => $lang['recent_pics_cat']
- ));
- // recent cats
- $template->assign_block_vars(
- 'special_cat',
- array(
- 'URL' => make_index_url(array('section' => 'recent_cats')),
- 'TITLE' => $lang['recent_cats_cat_hint'],
- 'NAME' => $lang['recent_cats_cat']
- ));
-}
+// recent pics
+$template->assign_block_vars(
+ 'special_cat',
+ array(
+ 'URL' => make_index_url(array('section' => 'recent_pics')),
+ 'TITLE' => $lang['recent_pics_cat_hint'],
+ 'NAME' => $lang['recent_pics_cat']
+ ));
+// recent cats
+$template->assign_block_vars(
+ 'special_cat',
+ array(
+ 'URL' => make_index_url(array('section' => 'recent_cats')),
+ 'TITLE' => $lang['recent_cats_cat_hint'],
+ 'NAME' => $lang['recent_cats_cat']
+ ));
// calendar
$template->assign_block_vars(
diff --git a/template/yoga/icon/stop_filter_mode.png b/template/yoga/icon/stop_filter_mode.png
index 1ac3aa0e7..1ff012e96 100644
--- a/template/yoga/icon/stop_filter_mode.png
+++ b/template/yoga/icon/stop_filter_mode.png
Binary files differ
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index cfa1a2205..814f19a73 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -12,6 +12,16 @@
margin: 0; padding: 0; display: block;
}
+#menubar .buttonmenu {
+ margin: 0 2px;
+ width: auto;
+ padding: 0;
+ text-indent: 0;
+ list-style: none;
+ text-align: center;
+ float: right;
+}
+
/* H2 properties copied here */
#menubar DT {
font-weight: bold; /* default for h2 */
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index 6066d18d2..eecf72aac 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -13,6 +13,12 @@
</dl>
<!-- END links -->
<dl id="mbCategories">
+ <!-- BEGIN start_filter_mode -->
+ <a href="{start_filter_mode.URL}" title="{lang:start_filter_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/start_filter_mode.png" class="buttonmenu" alt="{lang:start_filter_mode_hint}"></a>
+ <!-- END start_filter_mode -->
+ <!-- BEGIN stop_filter_mode -->
+ <a href="{stop_filter_mode.URL}" title="{lang:stop_filter_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter_mode.png" class="buttonmenu" alt="{lang:stop_filter_mode_hint}"></a>
+ <!-- END stop_filter_mode -->
<dt><a href="{U_HOME}">{lang:Categories}</a></dt>
<dd>
{MENU_CATEGORIES_CONTENT}