3 files changed, 25 insertions, 3 deletions

diff --git a/tpl/linklist.html b/tpl/linklist.html
index de9586c6..0f1a5e8c 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -28,7 +28,17 @@
             <input type="submit" value="Search" class="bigbutton">
         </form>
         {loop="$plugins_header.fields_toolbar"}
-            {$value}
+            <form
+                {loop="$value.attr"}
+                    {$key}="{$value}"
+                {/loop}>
+                {loop="$value.inputs"}
+                    <input
+                    {loop="$value"}
+                        {$key}="{$value}"
+                    {/loop}>
+                {/loop}
+            </form>
         {/loop}
     </div>
 </div>
diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html
index e91c8f86..86019c01 100644
--- a/tpl/linklist.paging.html
+++ b/tpl/linklist.paging.html
@@ -13,7 +13,14 @@
     </div>
 {/if}
     {loop="$action_plugin"}
-        {$value}
+      <div class="paging_privatelinks">
+        <a
+          {loop="$value.attr"}
+            {$key}="{$value}"
+          {/loop}>
+          {$value.html}
+        </a>
+      </div>
     {/loop}
     <div class="paging_linksperpage">
         Links per page: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a>
diff --git a/tpl/page.header.html b/tpl/page.header.html
index eac2ed4a..cce61ec4 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -35,7 +35,12 @@
     <li><a href="?do=picwall{$searchcrits}">Picture wall</a></li>
     <li><a href="?do=daily">Daily</a></li>
     {loop="$plugins_header.buttons_toolbar"}
-        {$value}
+        <li><a
+            {loop="$value.attr"}
+                {$key}="{$value}"
+            {/loop}>
+            {$value.html}
+        </a></li>
     {/loop}
 {/if}
   </ul>