2 files changed, 39 insertions, 46 deletions
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 69e2fcd7..116265a5 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -34,7 +34,7 @@
        </li>
        {if="$thumbnails_enabled"}
          <li class="pure-menu-item" id="shaarli-menu-picwall">
-            <a href="./?do=picwall{$searchcrits}" class="pure-menu-link">{'Picture wall'|t}</a>
+            <a href="./picture-wall?{function="ltrim($searchcrits, '&')"}" class="pure-menu-link">{'Picture wall'|t}</a>
          </li>
        {/if}
        <li class="pure-menu-item" id="shaarli-menu-daily">
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html
index da5101db..5343abd6 100644
--- a/tpl/default/picwall.html
+++ b/tpl/default/picwall.html
@@ -5,58 +5,51 @@
 </head>
 <body>
 {include="page.header"}
-{if="!$thumbnails_enabled"}
-<div class="pure-g pure-alert pure-alert-warning page-single-alert">
+{if="count($linksToDisplay)===0 && $is_logged_in"}
-  <div class="pure-u-1 center">
+  <div class="pure-g pure-alert pure-alert-warning page-single-alert">
-    {'Picture wall unavailable (thumbnails are disabled).'|t}
+    <div class="pure-u-1 center">
-  </div>
+      {'There is no cached thumbnail. Try to <a href="./?do=thumbs_update">synchronize them</a>.'|t}
-</div>
-{else}
-  {if="count($linksToDisplay)===0 && $is_logged_in"}
-    <div class="pure-g pure-alert pure-alert-warning page-single-alert">
-      <div class="pure-u-1 center">
-        {'There is no cached thumbnail. Try to <a href="./?do=thumbs_update">synchronize them</a>.'|t}
-      </div>
    </div>
-  {/if}
+  </div>
+{/if}
-  <div class="pure-g">
+<div class="pure-g">
-    <div class="pure-u-lg-1-6 pure-u-1-24"></div>
+  <div class="pure-u-lg-1-6 pure-u-1-24"></div>
-    <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor">
+  <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor">
-      {$countPics=count($linksToDisplay)}
+    {$countPics=count($linksToDisplay)}
-      <h2 class="window-title">{'Picture Wall'|t} - {$countPics} {'pics'|t}</h2>
+    <h2 class="window-title">{'Picture Wall'|t} - {$countPics} {'pics'|t}</h2>
-      <div id="plugin_zone_start_picwall" class="plugin_zone">
+    <div id="plugin_zone_start_picwall" class="plugin_zone">
-        {loop="$plugin_start_zone"}
+      {loop="$plugin_start_zone"}
-          {$value}
+        {$value}
-        {/loop}
+      {/loop}
-      </div>
+    </div>
-      <div id="picwall-container" class="picwall-container" role="list">
+    <div id="picwall-container" class="picwall-container" role="list">
-        {loop="$linksToDisplay"}
+      {loop="$linksToDisplay"}
-          <div class="picwall-pictureframe" role="listitem">
+        <div class="picwall-pictureframe" role="listitem">
-            {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
+          {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
-            <img data-src="{$value.thumbnail}#" class="b-lazy"
+          <img data-src="{$value.thumbnail}#" class="b-lazy"
-                 src=""
+               src=""
-                 alt="" width="{$thumbnails_width}" height="{$thumbnails_height}" />
+               alt="" width="{$thumbnails_width}" height="{$thumbnails_height}" />
-            <a href="{$value.real_url}"><span class="info">{$value.title}</span></a>
+          <a href="{$value.real_url}"><span class="info">{$value.title}</span></a>
-            {loop="$value.picwall_plugin"}
+          {loop="$value.picwall_plugin"}
-              {$value}
+            {$value}
-            {/loop}
+          {/loop}
-          </div>
+        </div>
-        {/loop}
+      {/loop}
-        <div class="clear"></div>
+      <div class="clear"></div>
-      </div>
+    </div>
-      <div id="plugin_zone_end_picwall" class="plugin_zone">
+    <div id="plugin_zone_end_picwall" class="plugin_zone">
-        {loop="$plugin_end_zone"}
+      {loop="$plugin_end_zone"}
-          {$value}
+        {$value}
-        {/loop}
+      {/loop}
-      </div>
    </div>
-    <div class="pure-u-lg-1-6 pure-u-1-24"></div>
  </div>
-{/if}
+  <div class="pure-u-lg-1-6 pure-u-1-24"></div>
+</div>
 {include="page.footer"}
 <script src="js/thumbnails.min.js?v={$version_hash}"></script>

diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 69e2fcd7..116265a5 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html
@@ -34,7 +34,7 @@
34	</li>	34	</li>
35	{if="$thumbnails_enabled"}	35	{if="$thumbnails_enabled"}
36	<li class="pure-menu-item" id="shaarli-menu-picwall">	36	<li class="pure-menu-item" id="shaarli-menu-picwall">
37	<a href="./?do=picwall{$searchcrits}" class="pure-menu-link">{'Picture wall'\|t}</a>	37	<a href="./picture-wall?{function="ltrim($searchcrits, '&')"}" class="pure-menu-link">{'Picture wall'\|t}</a>
38	</li>	38	</li>
39	{/if}	39	{/if}
40	<li class="pure-menu-item" id="shaarli-menu-daily">	40	<li class="pure-menu-item" id="shaarli-menu-daily">


diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index da5101db..5343abd6 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html
@@ -5,58 +5,51 @@
5	</head>	5	</head>
6	<body>	6	<body>
7	{include="page.header"}	7	{include="page.header"}
8	{if="!$thumbnails_enabled"}	8
9	<div class="pure-g pure-alert pure-alert-warning page-single-alert">	9	{if="count($linksToDisplay)===0 && $is_logged_in"}
10	<div class="pure-u-1 center">	10	<div class="pure-g pure-alert pure-alert-warning page-single-alert">
11	{'Picture wall unavailable (thumbnails are disabled).'\|t}	11	<div class="pure-u-1 center">
12	</div>	12	{'There is no cached thumbnail. Try to <a href="./?do=thumbs_update">synchronize them</a>.'\|t}
13	</div>
14	{else}
15	{if="count($linksToDisplay)===0 && $is_logged_in"}
16	<div class="pure-g pure-alert pure-alert-warning page-single-alert">
17	<div class="pure-u-1 center">
18	{'There is no cached thumbnail. Try to <a href="./?do=thumbs_update">synchronize them</a>.'\|t}
19	</div>
20	</div>	13	</div>
21	{/if}	14	</div>
		15	{/if}
22		16
23	<div class="pure-g">	17	<div class="pure-g">
24	<div class="pure-u-lg-1-6 pure-u-1-24"></div>	18	<div class="pure-u-lg-1-6 pure-u-1-24"></div>
25	<div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor">	19	<div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor">
26	{$countPics=count($linksToDisplay)}	20	{$countPics=count($linksToDisplay)}
27	<h2 class="window-title">{'Picture Wall'\|t} - {$countPics} {'pics'\|t}</h2>	21	<h2 class="window-title">{'Picture Wall'\|t} - {$countPics} {'pics'\|t}</h2>
28		22
29	<div id="plugin_zone_start_picwall" class="plugin_zone">	23	<div id="plugin_zone_start_picwall" class="plugin_zone">
30	{loop="$plugin_start_zone"}	24	{loop="$plugin_start_zone"}
31	{$value}	25	{$value}
32	{/loop}	26	{/loop}
33	</div>	27	</div>
34		28
35	<div id="picwall-container" class="picwall-container" role="list">	29	<div id="picwall-container" class="picwall-container" role="list">
36	{loop="$linksToDisplay"}	30	{loop="$linksToDisplay"}
37	<div class="picwall-pictureframe" role="listitem">	31	<div class="picwall-pictureframe" role="listitem">
38	{ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}	32	{ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
39	<img data-src="{$value.thumbnail}#" class="b-lazy"	33	<img data-src="{$value.thumbnail}#" class="b-lazy"
40	src=""	34	src=""
41	alt="" width="{$thumbnails_width}" height="{$thumbnails_height}" />	35	alt="" width="{$thumbnails_width}" height="{$thumbnails_height}" />
42	<a href="{$value.real_url}"><span class="info">{$value.title}</span></a>	36	<a href="{$value.real_url}"><span class="info">{$value.title}</span></a>
43	{loop="$value.picwall_plugin"}	37	{loop="$value.picwall_plugin"}
44	{$value}	38	{$value}
45	{/loop}	39	{/loop}
46	</div>	40	</div>
47	{/loop}	41	{/loop}
48	<div class="clear"></div>	42	<div class="clear"></div>
49	</div>	43	</div>
50		44
51	<div id="plugin_zone_end_picwall" class="plugin_zone">	45	<div id="plugin_zone_end_picwall" class="plugin_zone">
52	{loop="$plugin_end_zone"}	46	{loop="$plugin_end_zone"}
53	{$value}	47	{$value}
54	{/loop}	48	{/loop}
55	</div>
56	</div>	49	</div>
57	<div class="pure-u-lg-1-6 pure-u-1-24"></div>
58	</div>	50	</div>
59	{/if}	51	<div class="pure-u-lg-1-6 pure-u-1-24"></div>
		52	</div>
60		53
61	{include="page.footer"}	54	{include="page.footer"}
62	<script src="js/thumbnails.min.js?v={$version_hash}"></script>	55	<script src="js/thumbnails.min.js?v={$version_hash}"></script>