11 files changed, 136 insertions, 77 deletions
diff --git a/tpl/configure.html b/tpl/configure.html
index e4bd0760..9c725a51 100644
--- a/tpl/configure.html
+++ b/tpl/configure.html
@@ -38,6 +38,7 @@
            <input type="checkbox" name="updateCheck" id="updateCheck" {if="!empty($GLOBALS['config']['ENABLE_UPDATECHECK'])"}checked{/if}/>
            <label for="updateCheck">&nbsp;Notify me when a new release is ready</label></td>
        </tr>
          <tr><td></td><td class="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>
        </table>
        </form>
diff --git a/tpl/daily.html b/tpl/daily.html
index 38aa4012..93a3ab45 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -2,18 +2,43 @@
 <html>
 <head>{include="includes"}</head>
 <body>
-<div id="pageheader">{include="page.header"}</div>
+<div id="pageheader">
+    {include="page.header"}
+</div>
 <div class="daily">
+    <div id="plugin_zone_start_picwall" class="plugin_zone">
+        {loop="$plugin_start_zone"}
+            {$value}
+        {/loop}
+    </div>
    <div class="dailyAbout">
-      All links of one day<br>in a single page.<br>
+        All links of one day<br>in a single page.<br>
-          {if="$previousday"} <a href="?do=daily&amp;day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/if}
+        {if="$previousday"} <a href="?do=daily&amp;day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/if}
-          - 
+        -
-          {if="$nextday"}<a href="?do=daily&amp;day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if}
+        {if="$nextday"}<a href="?do=daily&amp;day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if}
-      <br><br>
+        <br>
-          <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#" alt="rss_feed">Daily RSS Feed</a>
+        {loop="$daily_about_plugin"}
+            {$value}
+        {/loop}
+        <br>
+        <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#" alt="rss_feed">Daily RSS Feed</a>
    </div>
-    <div class="dailyTitle"><img src="../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left"> The Daily Shaarli <img src="../images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right"></div>
-    <div class="dailyDate"><span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span> {function="strftime('%A %d, %B %Y', $day)"} <span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span></div>
+    <div class="dailyTitle">
+        <img src="../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left">
+        The Daily Shaarli
+        <img src="../images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right">
+    </div>
+    <div class="dailyDate">
+        <span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span>
+        {function="strftime('%A %d, %B %Y', $day)"}
+        <span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span>
+    </div>
    <div class="clear"></div>
    {if="$linksToDisplay"}
@@ -47,6 +72,12 @@
                            <div class="dailyEntryThumbnail">{$link.thumbnail}</div>
                        {/if}
                        <div class="dailyEntryDescription">{$link.formatedDescription}</div>
+                        <div class="dailyEntryFooter">
+                            {loop="$link.link_plugin"}
+                                {$value}
+                            {/loop}
+                        </div>
                    </div>
                {/loop}
            </div>
@@ -55,6 +86,14 @@
    {else}
         <div class="dailyNoEntry">No articles on this day.</div>
    {/if}
+    <div class="clear"></div>
+    <div id="plugin_zone_end_picwall" class="plugin_zone">
+        {loop="$plugin_end_zone"}
+            {$value}
+        {/loop}
+    </div>
    <div id="closing"><img src="../images/squiggle_closing.png" width="66" height="61" alt="-"></div>
 </div>
 {include="page.footer"}
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 3733ca21..889d913d 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -21,6 +21,11 @@
            <label for="lf_tags"><i>Tags</i></label><br>
            <input type="text" name="lf_tags" id="lf_tags" value="{$link.tags}" class="lf_input"
                data-list="{loop="$tags"}{$key}, {/loop}" data-multiple autocomplete="off" ><br>
+            {loop="$edit_link_plugin"}
+                {$value}
+            {/loop}
                {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
            <input type="checkbox" checked="checked" name="lf_private" id="lf_private">
            &nbsp;<label for="lf_private"><i>Private</i></label><br>
diff --git a/tpl/includes.html b/tpl/includes.html
index 623e19ed..bdf3a07d 100644
--- a/tpl/includes.html
+++ b/tpl/includes.html
@@ -8,3 +8,6 @@
 <link type="text/css" rel="stylesheet" href="../inc/reset.css" />
 <link type="text/css" rel="stylesheet" href="../inc/shaarli.css" />
 {if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="../inc/user.css" />{/if}
+{loop="$plugins_includes.css_files"}
+<link type="text/css" rel="stylesheet" href="{$value}#"/>
+{/loop}
+\ No newline at end of file
diff --git a/tpl/linklist.html b/tpl/linklist.html
index daf87060..9ed28853 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -17,6 +17,9 @@
            </datalist>
            <input type="submit" value="Search" class="bigbutton">
        </form>
+        {loop="$plugins_header.fields_toolbar"}
+            {$value}
+        {/loop}
    </div>
 </div>
@@ -24,6 +27,12 @@
    {include="linklist.paging"}
+    <div id="plugin_zone_start_linklist" class="plugin_zone">
+        {loop="$plugin_start_zone"}
+            {$value}
+        {/loop}
+    </div>
    {if="count($links)==0"}
        <div id="searchcriteria">Nothing found.</i></div>
    {else}
@@ -40,7 +49,7 @@
    <ul>
        {loop="links"}
        <li{if="$value.class"} class="{$value.class}"{/if}>
-            <a id="{$value.linkdate|smallHash}"></a>
+            <a id="{$value.shorturl}"></a>
            <div class="thumbnail">{$value.url|thumbnail}</div>
            <div class="linkcontainer">
                {if="isLoggedIn()"}
@@ -56,89 +65,38 @@
                {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
                    <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{function="strftime('%c', $value.timestamp)"} - permalink</a> - </span>
                {else}
-                    <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
+                    <span class="linkdate" title="Short link here"><a href="?{$value.shorturl}">permalink</a> - </span>
                {/if}
-                {if="$GLOBALS['config']['ARCHIVE_ORG']"}
-                <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url}">archive</a> - </span>
+                {loop="$value.link_plugin"}
-                {/if}
+                    <span>{$value}</span> -
-                <div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&amp;s=8&amp;d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
+                {/loop}
-                    onclick="return showQrCode(this);" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}">
-                    <img src="images/qrcode.png#" alt="QR-Code" title="{function="strftime('%c', $value.timestamp)"}"></a></div> -
                <a href="{$value.url}"><span class="linkurl" title="Short link">{$value.url}</span></a><br>
                {if="$value.tags"}
                    <div class="linktaglist">
                    {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value}</a></span> {/loop}
                    </div>
                {/if}
            </div>
        </li>
    {/loop}
    </ul>
+    <div id="plugin_zone_end_linklist" class="plugin_zone">
+        {loop="$plugin_end_zone"}
+            {$value}
+        {/loop}
+    </div>
    {include="linklist.paging"}
 </div>
    {include="page.footer"}
-<script>
-// Remove any displayed QR-Code
-function remove_qrcode()
-{
-    var elem = document.getElementById("permalinkQrcode");
-    if (elem) elem.parentNode.removeChild(elem);
-    return false;
-}
-function isCanvasSupported(){
-    var elem = document.createElement('canvas');
-    return !!(elem.getContext && elem.getContext('2d'));
-}
-// Show the QR-Code of a permalink (when the QR-Code icon is clicked).
-function showQrCode(caller,loading)
-{
-    if( !isCanvasSupported() ) return true;
-    // Dynamic javascript lib loading: We only load qr.js if the QR code icon is clicked:
-    if (typeof(qr)=='undefined') // Load qr.js only if not present.
-    {
-        loading = typeof loading !== 'undefined' ? loading : false;
-        if (!loading)  // If javascript lib is still loading, do not append script to body.
-        {
-            var element = document.createElement("script");
-            element.src = "inc/qr-1.1.3.min.js";
-            document.body.appendChild(element);
-        }
-        setTimeout(function() { showQrCode(caller,true);}, 200); // Retry in 200 milliseconds.
-        return false;
-    }
-    // Remove previous qrcode if present.
-    remove_qrcode();
-    // Build the div which contains the QR-Code:
-    var element = document.createElement('div');
-    element.id="permalinkQrcode";
-    // Make QR-Code div commit sepuku when clicked:
-    element.addEventListener('click', remove_qrcode ); // Works on every canvas supported browser
-    // Build the QR-Code:
-    var image = qr.image({size: 8,value: caller.getAttribute('data-permalink')});
-    if (image)
-    {
-        element.appendChild(image);
-        element.innerHTML+= "<br>Click to close";
-        caller.parentNode.appendChild(element);
-    }
-    else
-    {
-        element.innerHTML="Your browser does not seem to be HTML5 compatible.";
-    }
-    return false;
-}
-</script>
 <script src="inc/awesomplete.min.js#"></script>
 </body>
 </html>
diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html
index 848541cd..e91c8f86 100644
--- a/tpl/linklist.paging.html
+++ b/tpl/linklist.paging.html
@@ -8,8 +8,13 @@
                <img src="images/private_16x16.png#" width="16" height="16" title="Click to see only private links" alt="Click to see only private links">
                {/if}
                </a>
    </div>
 {/if}
+    {loop="$action_plugin"}
+        {$value}
+    {/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>
        <form method="GET" class="linksperpage"><input type="text" name="linksperpage" size="2"></form>
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index 8143669d..6c29850f 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -1,5 +1,8 @@
 <div id="footer">
    <b><a href="https://github.com/shaarli/Shaarli">Shaarli</a></b> - The personal, minimalist, super-fast, no-database delicious clone by the <a href="https://github.com/shaarli/Shaarli">Shaarli</a> community - <a href="doc/Home.html">Help/documentation</a>
+    {loop="$plugins_footer.text"}
+        {$value}
+    {/loop}
 </div>
 {if="$newversion"}
    <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion} is <a href="https://github.com/shaarli/Shaarli/releases">available</a>.</div>
@@ -7,3 +10,7 @@
 {if="isLoggedIn()"}
 <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
 {/if}
+{loop="$plugins_footer.js_files"}
+        <script src="{$value}#"></script>
+{/loop}
diff --git a/tpl/page.header.html b/tpl/page.header.html
index 2d186aa2..1d46d80c 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -11,7 +11,7 @@
        <a href="{$titleLink}">{$shaarlititle}</a>
    </span>
    </li>
-  
 {if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}
    {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
 {else}
@@ -33,6 +33,9 @@
    <li><a href="?do=tagcloud">Tag cloud</a></li>
    <li><a href="?do=picwall{$searchcrits}">Picture wall</a></li>
    <li><a href="?do=daily">Daily</a></li>
+    {loop="$plugins_header.buttons_toolbar"}
+        {$value}
+    {/loop}
 {/if}
  </ul>
 </div>
diff --git a/tpl/picwall.html b/tpl/picwall.html
index f59685cf..97d5efdf 100644
--- a/tpl/picwall.html
+++ b/tpl/picwall.html
@@ -5,15 +5,34 @@
 </head>
 <body>
 <div id="pageheader">{include="page.header"}</div>
+<div id="plugin_zone_start_picwall" class="plugin_zone">
+    {loop="$plugin_start_zone"}
+        {$value}
+    {/loop}
+</div>
 <div class="center">
        <div id="picwall_container">
            {loop="linksToDisplay"}
            <div class="picwall_pictureframe">
                    {$value.thumbnail}<a href="{$value.url}"><span class="info">{$value.title}</span></a>
+                {loop="$value.picwall_plugin"}
+                    {$value}
+                {/loop}
            </div>
            {/loop}
        </div>
 </div>
+<div class="clear"></div>
+<div id="plugin_zone_end_picwall" class="plugin_zone">
+    {loop="$plugin_end_zone"}
+        {$value}
+    {/loop}
+</div>
 {include="page.footer"}
 <script>
diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html
index 092f2294..5891cd25 100644
--- a/tpl/tagcloud.html
+++ b/tpl/tagcloud.html
@@ -4,9 +4,25 @@
 <body>
        <div id="pageheader">{include="page.header"}</div>
 <div class="center">
+    <div id="plugin_zone_start_tagcloud" class="plugin_zone">
+        {loop="$plugin_start_zone"}
+            {$value}
+        {/loop}
+    </div>
    <div id="cloudtag">
        {loop="tags"}
-        <span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key}</a>
+            <span class="count">{$value.count}</span>
+            <a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key}</a>
+            {loop="$value.tag_plugin"}
+                {$value}
+            {/loop}
+        {/loop}
+    </div>
+    <div id="plugin_zone_end_tagcloud" class="plugin_zone">
+        {loop="$plugin_end_zone"}
+            {$value}
        {/loop}
    </div>
 </div>
diff --git a/tpl/tools.html b/tpl/tools.html
index a3b469de..c9ada4ac 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -13,6 +13,9 @@
                <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;description='%20+%20encodeURIComponent(document.getSelection())+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1');})();"><b>✚Shaare link</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Shaare link" button in any page you want to share.</span></a><br><br>
                <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="?private=1&post="><b>✚Add Note</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Add Note" button anytime to start composing a (default private)  Note (text post) to your Shaarli.</span></a><br><br>
                <a class="smallbutton" onclick="activateFirefoxSocial(this)"><b>✚Add to Firefox social</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Click on this button to add Shaarli to the "Share this page" button in Firefox.</span></a><br><br>
+        {loop="$tools_plugin"}
+            {$value}
+        {/loop}
                <div class="clear"></div>
                <script>