From c133612f32849b76785635efe19d4afedcfd0248 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Tue, 2 Dec 2014 21:00:52 +0100 Subject: CSS: remove hardcoded style from templates Fixes shaarli/Shaarli#29 Style elements refactored as follows: - use existing ids and classes if possible, - else, define new ones and stick with the existing naming convention, - remove hardcoded style attributes from RainTPL templates. Exception: In tpl/tagcloud.html, the display size of each tag is computed at page generation. Signed-off-by: VirtualTam --- tpl/addlink.html | 4 ++-- tpl/changetag.html | 5 +++-- tpl/daily.html | 17 ++++++++--------- tpl/editlink.html | 14 +++++++------- tpl/export.html | 5 +++-- tpl/install.html | 11 +++++------ tpl/linklist.html | 14 +++++++------- tpl/linklist.paging.html | 4 ++-- tpl/loginform.html | 4 ++-- tpl/page.footer.html | 2 +- tpl/page.header.html | 4 ++-- tpl/tagcloud.html | 4 ++-- tpl/tools.html | 4 ++-- 13 files changed, 46 insertions(+), 46 deletions(-) (limited to 'tpl') diff --git a/tpl/addlink.html b/tpl/addlink.html index 853715dc..da50f45e 100644 --- a/tpl/addlink.html +++ b/tpl/addlink.html @@ -6,11 +6,11 @@ {include="page.header"}
- +
{include="page.footer"} - \ No newline at end of file + diff --git a/tpl/changetag.html b/tpl/changetag.html index b22bddea..79fea9a9 100644 --- a/tpl/changetag.html +++ b/tpl/changetag.html @@ -9,7 +9,8 @@
Tag: - + +   or 
(Case sensitive)
@@ -23,4 +24,4 @@ $(document).ready(function() {/if} - \ No newline at end of file + diff --git a/tpl/daily.html b/tpl/daily.html index 4bc8568b..c15a7062 100644 --- a/tpl/daily.html +++ b/tpl/daily.html @@ -10,17 +10,17 @@ - {if="$nextday"}Next day>{else}Next day>{/if}

- Daily RSS Feed + Daily RSS Feed
The Daily Shaarli
——————————— {$day} ———————————
-
+
{if="$linksToDisplay"}
{loop="col1"}
-
permalink
+ {if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if} {if="$value.thumbnail"}
{$value.thumbnail}
{/if} @@ -32,7 +32,7 @@
{loop="col2"}
-
permalink
+ {if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if} {if="$value.thumbnail"}
{$value.thumbnail}
{/if} @@ -44,7 +44,7 @@
{loop="col3"}
-
permalink
+ {if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if} {if="$value.thumbnail"}
{$value.thumbnail}
{/if} @@ -53,11 +53,10 @@ {/loop}
{else} -
No articles on this day.
+
No articles on this day.
{/if} -
-
-
+
-
{include="page.footer"} - \ No newline at end of file + diff --git a/tpl/editlink.html b/tpl/editlink.html index 48945a30..454dfff4 100644 --- a/tpl/editlink.html +++ b/tpl/editlink.html @@ -12,10 +12,10 @@
- URL

- Title

- Description

- Tags

+ URL

+ Title

+ Description

+ Tags

{if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}  
@@ -23,9 +23,9 @@  
{/if} - - - {if="!$link_is_new"}{/if} + + + {if="!$link_is_new"}{/if} {if="$http_referer"}{/if}
diff --git a/tpl/export.html b/tpl/export.html index 938cbe64..911b02c1 100644 --- a/tpl/export.html +++ b/tpl/export.html @@ -7,9 +7,10 @@
{include="page.footer"} - \ No newline at end of file + diff --git a/tpl/install.html b/tpl/install.html index 4034ef1b..32b8811b 100644 --- a/tpl/install.html +++ b/tpl/install.html @@ -2,20 +2,19 @@ {include="includes"}{$timezone_js} -
+

Shaarli

It looks like it's the first time you run Shaarli. Please configure it:
-
-
- + +
{$timezone_html} - +
Login:
Password:
Page title:
{include="page.footer"} - \ No newline at end of file + diff --git a/tpl/linklist.html b/tpl/linklist.html index d33fc3c3..eadbc4cd 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -4,9 +4,9 @@ diff --git a/tpl/loginform.html b/tpl/loginform.html index 805a0148..954f6f1f 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html @@ -13,7 +13,7 @@ Login:     Password :
- + {if="$returnurl"}{/if} @@ -23,4 +23,4 @@ {include="page.footer"} - \ No newline at end of file + diff --git a/tpl/page.footer.html b/tpl/page.footer.html index 8e5869c5..b494bf7d 100644 --- a/tpl/page.footer.html +++ b/tpl/page.footer.html @@ -2,7 +2,7 @@ Shaarli {$version|htmlspecialchars} - The personal, minimalist, super-fast, no-database delicious clone. By sebsauvage.net. Theme by idleman.fr.
{if="$newversion"} -
Shaarli {$newversion|htmlspecialchars} is available.
+
Shaarli {$newversion|htmlspecialchars} is available.
{/if} {if="isLoggedIn()"} diff --git a/tpl/page.header.html b/tpl/page.header.html index 654a551d..17c0c75c 100644 --- a/tpl/page.header.html +++ b/tpl/page.header.html @@ -1,6 +1,6 @@ -
Shaare your links...
+
Shaare your links...
{if="!empty($linkcount)"}{$linkcount} links{/if}
{$shaarlititle|htmlspecialchars} @@ -17,7 +17,7 @@ {/if} RSS Feed {if="$GLOBALS['config']['SHOW_ATOM']"} - ATOM Feed + ATOM Feed {/if} Tag cloud Picture wall diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html index 0dd2c0d3..9418e248 100644 --- a/tpl/tagcloud.html +++ b/tpl/tagcloud.html @@ -6,10 +6,10 @@
{loop="tags"} - {$value.count}{$key|htmlspecialchars} + {$value.count}{$key|htmlspecialchars} {/loop}
{include="page.footer"} - \ No newline at end of file + diff --git a/tpl/tools.html b/tpl/tools.html index ba1c1e8e..ae31902b 100644 --- a/tpl/tools.html +++ b/tpl/tools.html @@ -10,10 +10,10 @@ Rename/delete tags : Rename or delete a tag in all links

Import : Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)

Export : Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)

- Shaare link ⇐ Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).
    Then click "Shaare link" button in any page you want to share.


+ Shaare link ⇐ Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).
    Then click "Shaare link" button in any page you want to share.


{include="page.footer"} - \ No newline at end of file + -- cgit v1.2.3