From 5e9a4b02be26994e7d49a7d1ece7595a50b28c4b Mon Sep 17 00:00:00 2001 From: rub Date: Tue, 12 Dec 2006 06:17:53 +0000 Subject: [PATCH] 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 --- include/menubar.inc.php | 36 +++++++++++------------- template/yoga/icon/stop_filter_mode.png | Bin 1127 -> 1083 bytes template/yoga/menubar.css | 10 +++++++ template/yoga/menubar.tpl | 6 ++++ 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 1ac3aa0e7dc3600f78f7de0dca640ed132f65028..1ff012e9633a78e9d30b6244b3fee779a9543b41 100644 GIT binary patch delta 1062 zcmV+>1ljxN2)hW7B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FcU01FcV0GgZ_00007 zbV*G`2i6P=6e%SRFMpB%00YWNL_t(|+O3s;Ow@H4$6w#?_wEn`@&|XE9DO1YC zjxrl7ll2E%L@Q(<6JZfQj7BI4>xvSC%Hah5ur1tlMbnmBYk!S?tU39kFYSs= zoub876OTK--|y$sA9qK0k$6A`@3%V ztO5>ToIB)xj(?<-eD={e&y;=6kpVAK%6RLb0ZPQ~9gUktkdbpYXsUgT>yxt>`gFV? zTD0AN1PBJ8!*h-Njds@LI(TrCowvGwMM}AtNQe}9u5h}pBg|Pm2QIS8l|)`{G8@)A zS!s7*7=r%38+3K&A*ICSa>W>$o}OM9!0YwWcjyYg-G4H%*(_{v-@}pw6;;y+%uM0l z#UCirw28`Q}G1Ub@EC!qrSq-KMd5Gpn5`eD~EScv_pe zoz_K5X@3zL3+x~TC|Y~~imLHSn~U$yEMqp{=jRJEJpFhAS1wO*`s5{c*FDSlRgGhZ z8_0S1Or=s!9^!GD%2-rwIq>dIv58=ogT%f!=KMgBwQ z$j(heQIxxPkjWuGOe2U@n2d~`#%I5uvhufSZ>*&K%|V_l4y9|`w(Sg`9KyMJ z1*T~(3=l(#ilSP1@wt0>YHL~O;TtB!B?qbA(Z>ga%h*+0!u6ZKP+C^Xi4(`j%yh*M zpnoU|s%F7mXvgalAOyN@!=K}1Z*mIt^-TngZeHKNhr}ePs3>P>XlM};L_jPyG)qEg zz*q&SR@UX;NAIC`XlQD{KjWdLWe*aC>gwv~SrjvvG@!GlrUuhAky0XrKuU?#YQ^vO zhh$QssRC71Nq5@G%yQAu>A~ShqyD8jG=I&)+0jvetH60+3NRy4EMjA+^JKj}-SXz7 zSMJ-}7LhdoNzp0F0`dSmV2xw#YQRz;9VmRQt^EmrS6i9^IQVYQ5nvbyL>5C5upCHS z#KN}$sbS|zfERjuy4hJ(iNl!zkONFazi3Mo+v4Qp@RBbAjz*LxPd`N+bgEML$^UBWidg z#9%bhZ$=a2BS9pQq(%~yM2P8PuoNn_ElnTW7HUa>?Y_=E=lEgUWm^ht&`C~C&dJ>Q z&&>JXf0;4JiZQ*&JKv7zyj|xTR{Vcb3M2smXxEIl(P;EK&2TtOEEX&1UP?(M5*Y(3 zfD3>#1CSHPab|ragg^+9&6#1$(wnP0eJ%qQ024F!=8f{LwPJMOM~<~U$K~-OXkAbi ztvs8?48T0bHBx49u!7gHUK4X}t`?FmFhZ>r$ko;HSf1QtrP< zf8&~aDOyki`V#0#4671f@fudI+C(Ve;lQ^a5ufNrD^+-kw30MNHgMvPb_U1WX>43i zAW({f3$JA7vT0S##^+GM7)yTzyIONrD4u?^wHOs zp=ra1yuAH$w!OHC)Z|D(5#&;|Wa(0b5NIWlGEF*JPS0N{dd~GD#B#p>?hBSJf13Ln zAK|q(KW67kTlnhW5f+74VwmQwSrm)Ka!k-lBAqlcQ^MEZ9LD4Ev3YYVEjzZ*fAZdE zJpAZJ#xGvxK-*FF>}j5B^LOTyWeaek(dab*tx-}?9$d)q;CVo!9l=m<7kfW=pLh3t zO4DPHQx;mvg=d5K{KYszkW8jY2u)Jkq_m6pl{l{X!ZHj4({y2b{Mf!y&>F22RVy2K z_4Rky@ya&#?$0`7+FpwHokYbaf646Hh$|zheftNjg=HLnX7&64Syq{tE;p9#1)c35 zhGDW|RRg>C?PuHeod9Gq0%u|rySkn`S`UGe*x_2H`Z|%0xW*zWWo|i+gOrj)B7ss0 zr8QD%uw1x{{M@;^o|e|P07zvV#&$hLX5cJ#)bGk`{rgy8rlI#I~X@4R}{U^WSt*T?{{22iJHFq;L z)Wgx|AIwFN1jeR2QK1dr0!T>Hj=I9PG{;QRZF$0@u9C3K;W*cK`qY07*qoM6N<$f|=$M7ytkO 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 @@
+ + {lang:start_filter_mode_hint} + + + {lang:stop_filter_mode_hint} +
{lang:Categories}
{MENU_CATEGORIES_CONTENT}