diff options
author | Mark Schmitz <kramred@gmail.com> | 2018-06-07 14:23:53 +0100 |
---|---|---|
committer | Mark Schmitz <kramred@gmail.com> | 2018-06-07 14:23:53 +0100 |
commit | 0deaedeeaef088040fb015f5be3e270e3bae508e (patch) | |
tree | bbdab87adf45592a6a881f808e667ba5c21312a9 /tpl | |
parent | f6b3295d28352cbeb46dff04799cf8f4d39087bb (diff) | |
parent | 17e45b2e9c33c736751e059276fadb480f98e621 (diff) | |
download | Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.tar.gz Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.tar.zst Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/default/404.html | 2 | ||||
-rw-r--r-- | tpl/default/editlink.html | 5 | ||||
-rw-r--r-- | tpl/default/import.html | 2 | ||||
-rw-r--r-- | tpl/default/linklist.html | 10 | ||||
-rw-r--r-- | tpl/default/linklist.paging.html | 4 | ||||
-rw-r--r-- | tpl/default/loginform.html | 2 | ||||
-rw-r--r-- | tpl/default/page.footer.html | 4 | ||||
-rw-r--r-- | tpl/default/page.header.html | 16 | ||||
-rw-r--r-- | tpl/default/picwall.html | 4 | ||||
-rw-r--r-- | tpl/default/pluginsadmin.html | 2 | ||||
-rw-r--r-- | tpl/default/tag.cloud.html | 2 | ||||
-rw-r--r-- | tpl/default/tag.list.html | 10 | ||||
-rw-r--r-- | tpl/default/tools.html | 10 | ||||
-rw-r--r-- | tpl/vintage/daily.html | 2 | ||||
-rw-r--r-- | tpl/vintage/linklist.html | 4 | ||||
-rw-r--r-- | tpl/vintage/linklist.paging.html | 2 | ||||
-rw-r--r-- | tpl/vintage/page.footer.html | 2 | ||||
-rw-r--r-- | tpl/vintage/page.header.html | 4 |
18 files changed, 46 insertions, 41 deletions
diff --git a/tpl/default/404.html b/tpl/default/404.html index 2de6b6da..fd337cad 100644 --- a/tpl/default/404.html +++ b/tpl/default/404.html | |||
@@ -6,7 +6,7 @@ | |||
6 | <body> | 6 | <body> |
7 | <div id="pageheader"> | 7 | <div id="pageheader"> |
8 | {include="page.header"} | 8 | {include="page.header"} |
9 | <div class="center" id="page404"> | 9 | <div class="center" id="page404" class="page404-container"> |
10 | <h2>{'Sorry, nothing to see here.'|t}</h2> | 10 | <h2>{'Sorry, nothing to see here.'|t}</h2> |
11 | <img src="img/sad_star.png"> | 11 | <img src="img/sad_star.png"> |
12 | <p>{$error_message}</p> | 12 | <p>{$error_message}</p> |
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index d03fd72f..d8c57155 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html | |||
@@ -5,12 +5,11 @@ | |||
5 | </head> | 5 | </head> |
6 | <body> | 6 | <body> |
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | <div id="editlinkform" class="pure-g"> | 8 | <div id="editlinkform" class="edit-link-container" class="pure-g"> |
9 | <div class="pure-u-lg-1-5 pure-u-1-24"></div> | 9 | <div class="pure-u-lg-1-5 pure-u-1-24"></div> |
10 | <form method="post" name="linkform" class="page-form pure-u-lg-3-5 pure-u-22-24 page-form page-form-light"> | 10 | <form method="post" name="linkform" class="page-form pure-u-lg-3-5 pure-u-22-24 page-form page-form-light"> |
11 | <h2 class="window-title"> | 11 | <h2 class="window-title"> |
12 | {if="!$link_is_new"}{'Edit'|t}{/if} | 12 | {if="!$link_is_new"}{'Edit Shaare'|t}{else}{'New Shaare'|t}{/if} |
13 | {'Shaare'|t} | ||
14 | </h2> | 13 | </h2> |
15 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> | 14 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> |
16 | {if="isset($link.id)"} | 15 | {if="isset($link.id)"} |
diff --git a/tpl/default/import.html b/tpl/default/import.html index 000a50ac..bdc9086e 100644 --- a/tpl/default/import.html +++ b/tpl/default/import.html | |||
@@ -15,7 +15,7 @@ | |||
15 | </div> | 15 | </div> |
16 | 16 | ||
17 | <input type="hidden" name="token" value="{$token}"> | 17 | <input type="hidden" name="token" value="{$token}"> |
18 | <div class="center" id="import-field"> | 18 | <div class="center import-field-container" id="import-field"> |
19 | <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}"> | 19 | <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}"> |
20 | <input type="file" name="filetoupload"> | 20 | <input type="file" name="filetoupload"> |
21 | <p><br>{'Maximum size allowed:'|t} <strong>{$maxfilesizeHuman}</strong></p> | 21 | <p><br>{'Maximum size allowed:'|t} <strong>{$maxfilesizeHuman}</strong></p> |
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 933c1ef2..322cddd5 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html | |||
@@ -16,7 +16,7 @@ | |||
16 | </div> | 16 | </div> |
17 | 17 | ||
18 | <input type="hidden" name="token" value="{$token}"> | 18 | <input type="hidden" name="token" value="{$token}"> |
19 | <div id="search-linklist"> | 19 | <div id="search-linklist" class="searchform-block search-linklist"> |
20 | 20 | ||
21 | <form method="GET" class="pure-form searchform" name="searchform"> | 21 | <form method="GET" class="pure-form searchform" name="searchform"> |
22 | <input type="text" tabindex="1" name="searchterm" class="searchterm" placeholder="{'Search text'|t}" | 22 | <input type="text" tabindex="1" name="searchterm" class="searchterm" placeholder="{'Search text'|t}" |
@@ -136,7 +136,7 @@ | |||
136 | <div class="linklist-item-thumbnail">{$thumb}</div> | 136 | <div class="linklist-item-thumbnail">{$thumb}</div> |
137 | {/if} | 137 | {/if} |
138 | 138 | ||
139 | {if="isLoggedIn()"} | 139 | {if="$is_logged_in"} |
140 | <div class="linklist-item-editbuttons"> | 140 | <div class="linklist-item-editbuttons"> |
141 | {if="$value.private"} | 141 | {if="$value.private"} |
142 | <span class="label label-private">{$strPrivate}</span> | 142 | <span class="label label-private">{$strPrivate}</span> |
@@ -179,7 +179,7 @@ | |||
179 | 179 | ||
180 | <div class="linklist-item-infos-date-url-block pure-g"> | 180 | <div class="linklist-item-infos-date-url-block pure-g"> |
181 | <div class="linklist-item-infos-dateblock pure-u-lg-7-12 pure-u-1"> | 181 | <div class="linklist-item-infos-dateblock pure-u-lg-7-12 pure-u-1"> |
182 | {if="isLoggedIn()"} | 182 | {if="$is_logged_in"} |
183 | <div class="linklist-item-infos-controls-group pure-u-0 pure-u-lg-visible"> | 183 | <div class="linklist-item-infos-controls-group pure-u-0 pure-u-lg-visible"> |
184 | <span class="linklist-item-infos-controls-item ctrl-checkbox"> | 184 | <span class="linklist-item-infos-controls-item ctrl-checkbox"> |
185 | <input type="checkbox" class="delete-checkbox" value="{$value.id}"> | 185 | <input type="checkbox" class="delete-checkbox" value="{$value.id}"> |
@@ -196,7 +196,7 @@ | |||
196 | </div> | 196 | </div> |
197 | {/if} | 197 | {/if} |
198 | <a href="?{$value.shorturl}" title="{$strPermalink}"> | 198 | <a href="?{$value.shorturl}" title="{$strPermalink}"> |
199 | {if="!$hide_timestamps || isLoggedIn()"} | 199 | {if="!$hide_timestamps || $is_logged_in"} |
200 | {$updated=$value.updated_timestamp ? $strEdited. format_date($value.updated) : $strPermalink} | 200 | {$updated=$value.updated_timestamp ? $strEdited. format_date($value.updated) : $strPermalink} |
201 | <span class="linkdate" title="{$updated}"> | 201 | <span class="linkdate" title="{$updated}"> |
202 | <i class="fa fa-clock-o"></i> | 202 | <i class="fa fa-clock-o"></i> |
@@ -236,7 +236,7 @@ | |||
236 | {if="$link_plugin_counter - 1 != $counter"}·{/if} | 236 | {if="$link_plugin_counter - 1 != $counter"}·{/if} |
237 | {/loop} | 237 | {/loop} |
238 | {/if} | 238 | {/if} |
239 | {if="isLoggedIn()"} | 239 | {if="$is_logged_in"} |
240 | · | 240 | · |
241 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" | 241 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" |
242 | title="{$strDelete}" class="delete-link confirm-delete"> | 242 | title="{$strDelete}" class="delete-link confirm-delete"> |
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index 72bdd931..5309e348 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html | |||
@@ -1,11 +1,11 @@ | |||
1 | <div class="linklist-paging"> | 1 | <div class="linklist-paging"> |
2 | <div class="paging pure-g"> | 2 | <div class="paging pure-g"> |
3 | <div class="linklist-filters pure-u-1-3"> | 3 | <div class="linklist-filters pure-u-1-3"> |
4 | {if="isLoggedIn() or !empty($action_plugin)"} | 4 | {if="$is_logged_in or !empty($action_plugin)"} |
5 | <span class="linklist-filters-text pure-u-0 pure-u-lg-visible"> | 5 | <span class="linklist-filters-text pure-u-0 pure-u-lg-visible"> |
6 | {'Filters'|t} | 6 | {'Filters'|t} |
7 | </span> | 7 | </span> |
8 | {if="isLoggedIn()"} | 8 | {if="$is_logged_in"} |
9 | <a href="?visibility=private" title="{'Only display private links'|t}" | 9 | <a href="?visibility=private" title="{'Only display private links'|t}" |
10 | class="{if="$visibility==='private'"}filter-on{else}filter-off{/if}" | 10 | class="{if="$visibility==='private'"}filter-on{else}filter-off{/if}" |
11 | ><i class="fa fa-user-secret"></i></a> | 11 | ><i class="fa fa-user-secret"></i></a> |
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index d481f452..3cdab65a 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html | |||
@@ -18,7 +18,7 @@ | |||
18 | {else} | 18 | {else} |
19 | <div class="pure-g"> | 19 | <div class="pure-g"> |
20 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> | 20 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
21 | <div id="login-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24"> | 21 | <div id="login-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24 login-form-container"> |
22 | <form method="post" name="loginform"> | 22 | <form method="post" name="loginform"> |
23 | <h2 class="window-title">{'Login'|t}</h2> | 23 | <h2 class="window-title">{'Login'|t}</h2> |
24 | <div> | 24 | <div> |
diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html index f4f09e92..5af39be7 100644 --- a/tpl/default/page.footer.html +++ b/tpl/default/page.footer.html | |||
@@ -2,9 +2,9 @@ | |||
2 | 2 | ||
3 | <div class="pure-g"> | 3 | <div class="pure-g"> |
4 | <div class="pure-u-2-24"></div> | 4 | <div class="pure-u-2-24"></div> |
5 | <div id="footer" class="pure-u-20-24"> | 5 | <div id="footer" class="pure-u-20-24 footer-container"> |
6 | <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong> | 6 | <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong> |
7 | {if="isLoggedIn()===true"} | 7 | {if="$is_logged_in===true"} |
8 | {$version} | 8 | {$version} |
9 | {/if} | 9 | {/if} |
10 | · | 10 | · |
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 6f15c1c5..82568d63 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -17,7 +17,7 @@ | |||
17 | {$shaarlititle} | 17 | {$shaarlititle} |
18 | </a> | 18 | </a> |
19 | </li> | 19 | </li> |
20 | {if="isLoggedIn() || $openshaarli"} | 20 | {if="$is_logged_in || $openshaarli"} |
21 | <li class="pure-menu-item"> | 21 | <li class="pure-menu-item"> |
22 | <a href="?do=addlink" class="pure-menu-link" id="shaarli-menu-shaare"> | 22 | <a href="?do=addlink" class="pure-menu-link" id="shaarli-menu-shaare"> |
23 | <i class="fa fa-plus" ></i> {'Shaare'|t} | 23 | <i class="fa fa-plus" ></i> {'Shaare'|t} |
@@ -50,7 +50,7 @@ | |||
50 | <li class="pure-menu-item pure-u-lg-0 shaarli-menu-mobile" id="shaarli-menu-mobile-rss"> | 50 | <li class="pure-menu-item pure-u-lg-0 shaarli-menu-mobile" id="shaarli-menu-mobile-rss"> |
51 | <a href="?do={$feed_type}{$searchcrits}" class="pure-menu-link">{'RSS Feed'|t}</a> | 51 | <a href="?do={$feed_type}{$searchcrits}" class="pure-menu-link">{'RSS Feed'|t}</a> |
52 | </li> | 52 | </li> |
53 | {if="isLoggedIn()"} | 53 | {if="$is_logged_in"} |
54 | <li class="pure-menu-item pure-u-lg-0 shaarli-menu-mobile" id="shaarli-menu-mobile-logout"> | 54 | <li class="pure-menu-item pure-u-lg-0 shaarli-menu-mobile" id="shaarli-menu-mobile-logout"> |
55 | <a href="?do=logout" class="pure-menu-link">{'Logout'|t}</a> | 55 | <a href="?do=logout" class="pure-menu-link">{'Logout'|t}</a> |
56 | </li> | 56 | </li> |
@@ -74,7 +74,7 @@ | |||
74 | <i class="fa fa-rss"></i> | 74 | <i class="fa fa-rss"></i> |
75 | </a> | 75 | </a> |
76 | </li> | 76 | </li> |
77 | {if="!isLoggedIn()"} | 77 | {if="!$is_logged_in"} |
78 | <li class="pure-menu-item" id="shaarli-menu-desktop-login"> | 78 | <li class="pure-menu-item" id="shaarli-menu-desktop-login"> |
79 | <a href="?do=login" class="pure-menu-link" | 79 | <a href="?do=login" class="pure-menu-link" |
80 | data-open-id="header-login-form" | 80 | data-open-id="header-login-form" |
@@ -95,8 +95,8 @@ | |||
95 | </div> | 95 | </div> |
96 | </div> | 96 | </div> |
97 | 97 | ||
98 | <div id="content"> | 98 | <div id="content" class="container"> |
99 | <div id="search" class="subheader-form"> | 99 | <div id="search" class="subheader-form searchform-block header-search"> |
100 | <form method="GET" class="pure-form searchform" name="searchform"> | 100 | <form method="GET" class="pure-form searchform" name="searchform"> |
101 | <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="{'Search text'|t}" | 101 | <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="{'Search text'|t}" |
102 | {if="!empty($search_term)"} | 102 | {if="!empty($search_term)"} |
@@ -120,9 +120,9 @@ | |||
120 | </div> | 120 | </div> |
121 | </div> | 121 | </div> |
122 | </div> | 122 | </div> |
123 | {if="!isLoggedIn()"} | 123 | {if="!$is_logged_in"} |
124 | <form method="post" name="loginform"> | 124 | <form method="post" name="loginform"> |
125 | <div class="subheader-form" id="header-login-form"> | 125 | <div class="subheader-form header-login-form" id="header-login-form"> |
126 | <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3"> | 126 | <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3"> |
127 | <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5"> | 127 | <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5"> |
128 | <div class="remember-me"> | 128 | <div class="remember-me"> |
@@ -155,7 +155,7 @@ | |||
155 | </div> | 155 | </div> |
156 | {/if} | 156 | {/if} |
157 | 157 | ||
158 | {if="!empty($plugin_errors) && isLoggedIn()"} | 158 | {if="!empty($plugin_errors) && $is_logged_in"} |
159 | <div class="pure-g new-version-message pure-alert pure-alert-error pure-alert-closable" id="shaarli-errors-alert"> | 159 | <div class="pure-g new-version-message pure-alert pure-alert-error pure-alert-closable" id="shaarli-errors-alert"> |
160 | <div class="pure-u-2-24"></div> | 160 | <div class="pure-u-2-24"></div> |
161 | <div class="pure-u-20-24"> | 161 | <div class="pure-u-20-24"> |
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 23796ac9..2f7e03dc 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html | |||
@@ -18,9 +18,9 @@ | |||
18 | {/loop} | 18 | {/loop} |
19 | </div> | 19 | </div> |
20 | 20 | ||
21 | <div id="picwall_container"> | 21 | <div id="picwall_container" class="picwall-container"> |
22 | {loop="$linksToDisplay"} | 22 | {loop="$linksToDisplay"} |
23 | <div class="picwall_pictureframe"> | 23 | <div class="picwall-pictureframe"> |
24 | {$value.thumbnail}<a href="{$value.real_url}"><span class="info">{$value.title}</span></a> | 24 | {$value.thumbnail}<a href="{$value.real_url}"><span class="info">{$value.title}</span></a> |
25 | {loop="$value.picwall_plugin"} | 25 | {loop="$value.picwall_plugin"} |
26 | {$value} | 26 | {$value} |
diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html index fa26c859..8f2597df 100644 --- a/tpl/default/pluginsadmin.html +++ b/tpl/default/pluginsadmin.html | |||
@@ -16,7 +16,7 @@ | |||
16 | <div class="clear"></div> | 16 | <div class="clear"></div> |
17 | </noscript> | 17 | </noscript> |
18 | 18 | ||
19 | <form method="POST" action="?do=save_pluginadmin" name="pluginform" id="pluginform"> | 19 | <form method="POST" action="?do=save_pluginadmin" name="pluginform" id="pluginform" class="pluginform-container"> |
20 | <div class="pure-g"> | 20 | <div class="pure-g"> |
21 | <div class="pure-u-lg-1-8 pure-u-1-24"></div> | 21 | <div class="pure-u-lg-1-8 pure-u-1-24"></div> |
22 | <div class="pure-u-lg-3-4 pure-u-22-24 page-form page-form-complete"> | 22 | <div class="pure-u-lg-3-4 pure-u-22-24 page-form page-form-complete"> |
diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html index 12701465..9e52158d 100644 --- a/tpl/default/tag.cloud.html +++ b/tpl/default/tag.cloud.html | |||
@@ -45,7 +45,7 @@ | |||
45 | {/loop} | 45 | {/loop} |
46 | </div> | 46 | </div> |
47 | 47 | ||
48 | <div id="cloudtag"> | 48 | <div id="cloudtag" class="cloudtag-container"> |
49 | {loop="tags"} | 49 | {loop="tags"} |
50 | <a href="?searchtags={$key|urlencode} {$search_tags|urlencode}" style="font-size:{$value.size}em;">{$key}</a | 50 | <a href="?searchtags={$key|urlencode} {$search_tags|urlencode}" style="font-size:{$value.size}em;">{$key}</a |
51 | ><a href="?addtag={$key|urlencode}" title="{'Filter by tag'|t}" class="count">{$value.count}</a> | 51 | ><a href="?addtag={$key|urlencode}" title="{'Filter by tag'|t}" class="count">{$value.count}</a> |
diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html index 7140c67a..bcddcd56 100644 --- a/tpl/default/tag.list.html +++ b/tpl/default/tag.list.html | |||
@@ -21,7 +21,7 @@ | |||
21 | </p> | 21 | </p> |
22 | {/if} | 22 | {/if} |
23 | 23 | ||
24 | <div id="search-tagcloud" class="pure-g"> | 24 | <div id="search-tagcloud" class="pure-g searchform-block search-tagcloud"> |
25 | <div class="pure-u-lg-1-4"></div> | 25 | <div class="pure-u-lg-1-4"></div> |
26 | <div class="pure-u-1 pure-u-lg-1-2"> | 26 | <div class="pure-u-1 pure-u-lg-1-2"> |
27 | <form method="GET"> | 27 | <form method="GET"> |
@@ -45,11 +45,11 @@ | |||
45 | {/loop} | 45 | {/loop} |
46 | </div> | 46 | </div> |
47 | 47 | ||
48 | <div id="taglist"> | 48 | <div id="taglist" class="taglist-container"> |
49 | {loop="tags"} | 49 | {loop="tags"} |
50 | <div class="tag-list-item pure-g" data-tag="{$key}"> | 50 | <div class="tag-list-item pure-g" data-tag="{$key}"> |
51 | <div class="pure-u-1"> | 51 | <div class="pure-u-1"> |
52 | {if="isLoggedIn()===true"} | 52 | {if="$is_logged_in===true"} |
53 | <a href="#" class="delete-tag"><i class="fa fa-trash"></i></a> | 53 | <a href="#" class="delete-tag"><i class="fa fa-trash"></i></a> |
54 | <a href="?do=changetag&fromtag={$key|urlencode}" class="rename-tag"> | 54 | <a href="?do=changetag&fromtag={$key|urlencode}" class="rename-tag"> |
55 | <i class="fa fa-pencil-square-o {$key}"></i> | 55 | <i class="fa fa-pencil-square-o {$key}"></i> |
@@ -63,7 +63,7 @@ | |||
63 | {$value} | 63 | {$value} |
64 | {/loop} | 64 | {/loop} |
65 | </div> | 65 | </div> |
66 | {if="isLoggedIn()===true"} | 66 | {if="$is_logged_in===true"} |
67 | <div class="rename-tag-form pure-u-1"> | 67 | <div class="rename-tag-form pure-u-1"> |
68 | <input type="text" name="{$key}" value="{$key}" class="rename-tag-input" /> | 68 | <input type="text" name="{$key}" value="{$key}" class="rename-tag-input" /> |
69 | <a href="#" class="validate-rename-tag"><i class="fa fa-check"></i></a> | 69 | <a href="#" class="validate-rename-tag"><i class="fa fa-check"></i></a> |
@@ -81,7 +81,7 @@ | |||
81 | </div> | 81 | </div> |
82 | </div> | 82 | </div> |
83 | 83 | ||
84 | {if="isLoggedIn()===true"} | 84 | {if="$is_logged_in===true"} |
85 | <input type="hidden" name="taglist" value="{loop="$tags"}{$key} {/loop}" | 85 | <input type="hidden" name="taglist" value="{loop="$tags"}{$key} {/loop}" |
86 | {/if} | 86 | {/if} |
87 | 87 | ||
diff --git a/tpl/default/tools.html b/tpl/default/tools.html index 72fd58af..ece66884 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html | |||
@@ -146,8 +146,14 @@ | |||
146 | </div> | 146 | </div> |
147 | <div class="tools-item"> | 147 | <div class="tools-item"> |
148 | <a href="https://play.google.com/store/apps/details?id=com.dimtion.shaarlier&hl=fr" | 148 | <a href="https://play.google.com/store/apps/details?id=com.dimtion.shaarlier&hl=fr" |
149 | title="Android"> | 149 | title="Android Shaarlier"> |
150 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android</span> | 150 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Shaarlier</span> |
151 | </a> | ||
152 | </div> | ||
153 | <div class="tools-item"> | ||
154 | <a href="https://stakali.toneiv.eu/" | ||
155 | title="Android Stakali"> | ||
156 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Stakali</span> | ||
151 | </a> | 157 | </a> |
152 | </div> | 158 | </div> |
153 | <div class="tools-item"> | 159 | <div class="tools-item"> |
diff --git a/tpl/vintage/daily.html b/tpl/vintage/daily.html index 42db16a7..ede35910 100644 --- a/tpl/vintage/daily.html +++ b/tpl/vintage/daily.html | |||
@@ -53,7 +53,7 @@ | |||
53 | <img src="img/squiggle.png" width="25" height="26" title="permalink" alt="permalink"> | 53 | <img src="img/squiggle.png" width="25" height="26" title="permalink" alt="permalink"> |
54 | </a> | 54 | </a> |
55 | </div> | 55 | </div> |
56 | {if="!$hide_timestamps || isLoggedIn()"} | 56 | {if="!$hide_timestamps || $is_logged_in"} |
57 | <div class="dailyEntryLinkdate"> | 57 | <div class="dailyEntryLinkdate"> |
58 | <a href="?{$value.shorturl}">{function="strftime('%c', $link.timestamp)"}</a> | 58 | <a href="?{$value.shorturl}">{function="strftime('%c', $link.timestamp)"}</a> |
59 | </div> | 59 | </div> |
diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html index e7137246..1ca51be3 100644 --- a/tpl/vintage/linklist.html +++ b/tpl/vintage/linklist.html | |||
@@ -82,7 +82,7 @@ | |||
82 | <a id="{$value.shorturl}"></a> | 82 | <a id="{$value.shorturl}"></a> |
83 | <div class="thumbnail">{$value.url|thumbnail}</div> | 83 | <div class="thumbnail">{$value.url|thumbnail}</div> |
84 | <div class="linkcontainer"> | 84 | <div class="linkcontainer"> |
85 | {if="isLoggedIn()"} | 85 | {if="$is_logged_in"} |
86 | <div class="linkeditbuttons"> | 86 | <div class="linkeditbuttons"> |
87 | <form method="GET" class="buttoneditform"> | 87 | <form method="GET" class="buttoneditform"> |
88 | <input type="hidden" name="edit_link" value="{$value.id}"> | 88 | <input type="hidden" name="edit_link" value="{$value.id}"> |
@@ -102,7 +102,7 @@ | |||
102 | </span> | 102 | </span> |
103 | <br> | 103 | <br> |
104 | {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if} | 104 | {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if} |
105 | {if="!$hide_timestamps || isLoggedIn()"} | 105 | {if="!$hide_timestamps || $is_logged_in"} |
106 | {$updated=$value.updated_timestamp ? 'Edited: '. format_date($value.updated) : 'Permalink'} | 106 | {$updated=$value.updated_timestamp ? 'Edited: '. format_date($value.updated) : 'Permalink'} |
107 | <span class="linkdate" title="Permalink"> | 107 | <span class="linkdate" title="Permalink"> |
108 | <a href="?{$value.shorturl}"> | 108 | <a href="?{$value.shorturl}"> |
diff --git a/tpl/vintage/linklist.paging.html b/tpl/vintage/linklist.paging.html index e3b88ee6..35149a6b 100644 --- a/tpl/vintage/linklist.paging.html +++ b/tpl/vintage/linklist.paging.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <div class="paging"> | 1 | <div class="paging"> |
2 | {if="isLoggedIn()"} | 2 | {if="$is_logged_in"} |
3 | <div class="paging_privatelinks"> | 3 | <div class="paging_privatelinks"> |
4 | <a href="?visibility=private"> | 4 | <a href="?visibility=private"> |
5 | {if="$visibility=='private'"} | 5 | {if="$visibility=='private'"} |
diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html index 1485e1ce..f409721e 100644 --- a/tpl/vintage/page.footer.html +++ b/tpl/vintage/page.footer.html | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | <script src="js/shaarli.min.js"></script> | 26 | <script src="js/shaarli.min.js"></script> |
27 | 27 | ||
28 | {if="isLoggedIn()"} | 28 | {if="$is_logged_in"} |
29 | <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script> | 29 | <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script> |
30 | {/if} | 30 | {/if} |
31 | 31 | ||
diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html index 8a58844e..40c53e5b 100644 --- a/tpl/vintage/page.header.html +++ b/tpl/vintage/page.header.html | |||
@@ -17,7 +17,7 @@ | |||
17 | {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore} | 17 | {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore} |
18 | {else} | 18 | {else} |
19 | <li><a href="{$titleLink}" class="nomobile">Home</a></li> | 19 | <li><a href="{$titleLink}" class="nomobile">Home</a></li> |
20 | {if="isLoggedIn()"} | 20 | {if="$is_logged_in"} |
21 | <li><a href="?do=logout">Logout</a></li> | 21 | <li><a href="?do=logout">Logout</a></li> |
22 | <li><a href="?do=tools">Tools</a></li> | 22 | <li><a href="?do=tools">Tools</a></li> |
23 | <li><a href="?do=addlink">Add link</a></li> | 23 | <li><a href="?do=addlink">Add link</a></li> |
@@ -46,7 +46,7 @@ | |||
46 | </ul> | 46 | </ul> |
47 | </div> | 47 | </div> |
48 | 48 | ||
49 | {if="!empty($plugin_errors) && isLoggedIn()"} | 49 | {if="!empty($plugin_errors) && $is_logged_in"} |
50 | <ul class="errors"> | 50 | <ul class="errors"> |
51 | {loop="$plugin_errors"} | 51 | {loop="$plugin_errors"} |
52 | <li>{$value}</li> | 52 | <li>{$value}</li> |