From 567967fdf94b2b8ba2b2fc9c8836e89ac23c8c71 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 15 Jul 2015 11:47:12 +0200 Subject: Template upgrade to handle plugin zones Add a bunch of plugin placeholders in templates --- tpl/configure.html | 1 + tpl/daily.html | 57 +++++++++++++++++++++++++----- tpl/editlink.html | 5 +++ tpl/includes.html | 3 ++ tpl/linklist.html | 90 +++++++++++++----------------------------------- tpl/linklist.paging.html | 5 +++ tpl/page.footer.html | 7 ++++ tpl/page.header.html | 5 ++- tpl/picwall.html | 19 ++++++++++ tpl/tagcloud.html | 18 +++++++++- tpl/tools.html | 3 ++ 11 files changed, 136 insertions(+), 77 deletions(-) (limited to 'tpl') 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 @@ + 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 @@ {include="includes"} - +
+
+ {loop="$plugin_start_zone"} + {$value} + {/loop} +
+
- All links of one day
in a single page.
- {if="$previousday"} <Previous day{else}<Previous day{/if} - - - {if="$nextday"}Next day>{else}Next day>{/if} -

- rss_feedDaily RSS Feed + All links of one day
in a single page.
+ {if="$previousday"} <Previous day{else}<Previous day{/if} + - + {if="$nextday"}Next day>{else}Next day>{/if} +
+ + {loop="$daily_about_plugin"} + {$value} + {/loop} + +
+ rss_feedDaily RSS Feed
-
floral_left The Daily Shaarli floral_right
-
——————————— {function="strftime('%A %d, %B %Y', $day)"} ———————————
+ +
+ floral_left + The Daily Shaarli + floral_right +
+ +
+ ——————————— + {function="strftime('%A %d, %B %Y', $day)"} + ——————————— +
+
{if="$linksToDisplay"} @@ -47,6 +72,12 @@
{$link.thumbnail}
{/if}
{$link.formatedDescription}
+ +
+ {loop="$link.link_plugin"} + {$value} + {/loop} +
{/loop} @@ -55,6 +86,14 @@ {else}
No articles on this day.
{/if} + +
+ +
+ {loop="$plugin_end_zone"} + {$value} + {/loop} +
-
{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 @@

+ + {loop="$edit_link_plugin"} + {$value} + {/loop} + {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}  
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 @@ {if="is_file('inc/user.css')"}{/if} +{loop="$plugins_includes.css_files"} + +{/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 @@ + {loop="$plugins_header.fields_toolbar"} + {$value} + {/loop} @@ -24,6 +27,12 @@ {include="linklist.paging"} + + {if="count($links)==0"}
Nothing found.
{else} @@ -40,7 +49,7 @@ + + {include="linklist.paging"} {include="page.footer"} - 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 @@ Click to see only private links {/if} + + {/if} + {loop="$action_plugin"} + {$value} + {/loop}
Links per page: 20 50 100
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 @@ {if="$newversion"}
● Shaarli {$newversion} is available.
@@ -7,3 +10,7 @@ {if="isLoggedIn()"} {/if} + +{loop="$plugins_footer.js_files"} + +{/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 @@ {$shaarlititle} - + {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 @@
  • Tag cloud
  • Picture wall
  • Daily
    • + {loop="$plugins_header.buttons_toolbar"} + {$value} + {/loop} {/if}
    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 @@ + +
    + {loop="$plugin_start_zone"} + {$value} + {/loop} +
    +
    {loop="linksToDisplay"}
    {$value.thumbnail}{$value.title} + {loop="$value.picwall_plugin"} + {$value} + {/loop}
    {/loop}
    + +
    + +
    + {loop="$plugin_end_zone"} + {$value} + {/loop} +
    + {include="page.footer"}