diff options
-rw-r--r-- | tpl/default/404.html | 2 | ||||
-rw-r--r-- | tpl/default/addlink.html | 6 | ||||
-rw-r--r-- | tpl/default/editlink.html | 16 | ||||
-rw-r--r-- | tpl/default/linklist.html | 23 | ||||
-rw-r--r-- | tpl/default/linklist.paging.html | 6 | ||||
-rw-r--r-- | tpl/default/loginform.html | 14 | ||||
-rw-r--r-- | tpl/default/page.header.html | 60 | ||||
-rw-r--r-- | tpl/default/tools.html | 62 |
8 files changed, 88 insertions, 101 deletions
diff --git a/tpl/default/404.html b/tpl/default/404.html index a9738160..edc5ac4b 100644 --- a/tpl/default/404.html +++ b/tpl/default/404.html | |||
@@ -8,7 +8,7 @@ | |||
8 | {include="page.header"} | 8 | {include="page.header"} |
9 | </div> | 9 | </div> |
10 | <div class="center" id="page404"> | 10 | <div class="center" id="page404"> |
11 | <h2>Sorry, nothing to see here.</h2> | 11 | <h2>{'Sorry, nothing to see here.'|t}</h2> |
12 | <img src="img/sad_star.png"> | 12 | <img src="img/sad_star.png"> |
13 | <p>{$error_message}</p> | 13 | <p>{$error_message}</p> |
14 | </div> | 14 | </div> |
diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html index 13adeb49..8e64064f 100644 --- a/tpl/default/addlink.html +++ b/tpl/default/addlink.html | |||
@@ -8,13 +8,13 @@ | |||
8 | <div class="pure-g"> | 8 | <div class="pure-g"> |
9 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 9 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> |
10 | <div id="addlink-form" class="page-form pure-u-lg-1-3 pure-u-3-4"> | 10 | <div id="addlink-form" class="page-form pure-u-lg-1-3 pure-u-3-4"> |
11 | <h2>Shaare a new link</h2> | 11 | <h2>{"Shaare a new link"|t}</h2> |
12 | <form method="GET" action="" name="addform" class="addform"> | 12 | <form method="GET" action="" name="addform" class="addform"> |
13 | <div> | 13 | <div> |
14 | <input type="text" name="post"> | 14 | <input type="text" name="post" placeholder="{'URL or leave empty to post a note'|t}"> |
15 | </div> | 15 | </div> |
16 | <div> | 16 | <div> |
17 | <input type="submit" value="Add link"> | 17 | <input type="submit" value="{'Add link'|t}"> |
18 | </div> | 18 | </div> |
19 | </form> | 19 | </form> |
20 | </div> | 20 | </div> |
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index 0630b4f1..a0ea91b2 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html | |||
@@ -10,28 +10,28 @@ | |||
10 | <div id="editlinkform" class="pure-g"> | 10 | <div id="editlinkform" class="pure-g"> |
11 | <div class="pure-u-lg-1-5 pure-u-1-8"></div> | 11 | <div class="pure-u-lg-1-5 pure-u-1-8"></div> |
12 | <form method="post" name="linkform" class="page-form pure-u-lg-3-5 pure-u-3-4" > | 12 | <form method="post" name="linkform" class="page-form pure-u-lg-3-5 pure-u-3-4" > |
13 | <h2>Shaare</h2> | 13 | <h2>{'Shaare'|t}</h2> |
14 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> | 14 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> |
15 | <div> | 15 | <div> |
16 | <label for="lf_url">URL</label> | 16 | <label for="lf_url">{'URL'|t}</label> |
17 | </div> | 17 | </div> |
18 | <div> | 18 | <div> |
19 | <input type="text" name="lf_url" id="lf_url" value="{$link.url}" class="lf_input"> | 19 | <input type="text" name="lf_url" id="lf_url" value="{$link.url}" class="lf_input"> |
20 | </div> | 20 | </div> |
21 | <div> | 21 | <div> |
22 | <label for="lf_title">Title</label> | 22 | <label for="lf_title">{'Title'|t}</label> |
23 | </div> | 23 | </div> |
24 | <div> | 24 | <div> |
25 | <input type="text" name="lf_title" id="lf_title" value="{$link.title}" class="lf_input"> | 25 | <input type="text" name="lf_title" id="lf_title" value="{$link.title}" class="lf_input"> |
26 | </div> | 26 | </div> |
27 | <div> | 27 | <div> |
28 | <label for="lf_description">Description</label> | 28 | <label for="lf_description">{'Description'|t}</label> |
29 | </div> | 29 | </div> |
30 | <div> | 30 | <div> |
31 | <textarea name="lf_description" id="lf_description">{$link.description}</textarea> | 31 | <textarea name="lf_description" id="lf_description">{$link.description}</textarea> |
32 | </div> | 32 | </div> |
33 | <div> | 33 | <div> |
34 | <label for="lf_tags">Tags</label> | 34 | <label for="lf_tags">{'Tags'|t}</label> |
35 | </div> | 35 | </div> |
36 | <div> | 36 | <div> |
37 | <input type="text" name="lf_tags" id="lf_tags" value="{$link.tags}" class="lf_input" | 37 | <input type="text" name="lf_tags" id="lf_tags" value="{$link.tags}" class="lf_input" |
@@ -43,7 +43,7 @@ | |||
43 | {if="($link_is_new && $default_private_links) || $link.private == true"} | 43 | {if="($link_is_new && $default_private_links) || $link.private == true"} |
44 | checked="checked" | 44 | checked="checked" |
45 | {/if}> | 45 | {/if}> |
46 | <label for="lf_private">Private</label> | 46 | <label for="lf_private">{'Private'|t}</label> |
47 | </div> | 47 | </div> |
48 | 48 | ||
49 | <div id="editlink-plugins"> | 49 | <div id="editlink-plugins"> |
@@ -53,9 +53,9 @@ | |||
53 | </div> | 53 | </div> |
54 | 54 | ||
55 | <div> | 55 | <div> |
56 | <input type="submit" value="Save" name="save_edit"> | 56 | <input type="submit" value="{'Save'|t}" name="save_edit"> |
57 | {if="!$link_is_new"} | 57 | {if="!$link_is_new"} |
58 | <input type="submit" value="Delete" name="delete_link" class="delete-link"> | 58 | <input type="submit" value="{'Delete'|t}" name="delete_link" class="delete-link"> |
59 | {/if} | 59 | {/if} |
60 | </div> | 60 | </div> |
61 | 61 | ||
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 19a0c3c7..0a46c876 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html | |||
@@ -24,22 +24,22 @@ | |||
24 | <div class="pure-g pure-alert pure-alert-error search-result"> | 24 | <div class="pure-g pure-alert pure-alert-error search-result"> |
25 | <div class="pure-u-2-24"></div> | 25 | <div class="pure-u-2-24"></div> |
26 | <div class="pure-u-20-24"> | 26 | <div class="pure-u-20-24"> |
27 | <div id="searchcriteria">Nothing found.</div> | 27 | <div id="searchcriteria">{'Nothing found.'|t}</div> |
28 | </div> | 28 | </div> |
29 | </div> | 29 | </div> |
30 | {elseif="!empty($search_term) or !empty($search_tags)"} | 30 | {elseif="!empty($search_term) or !empty($search_tags)"} |
31 | <div class="pure-g pure-alert pure-alert-success search-result"> | 31 | <div class="pure-g pure-alert pure-alert-success search-result"> |
32 | <div class="pure-u-2-24"></div> | 32 | <div class="pure-u-2-24"></div> |
33 | <div class="pure-u-20-24"> | 33 | <div class="pure-u-20-24"> |
34 | {$result_count} results | 34 | {function="t('%s result', '%s results', $result_count)"} |
35 | {if="!empty($search_term)"} | 35 | {if="!empty($search_term)"} |
36 | for <em><strong>{$search_term}</strong></em> | 36 | {'for'|t} <em><strong>{$search_term}</strong></em> |
37 | {/if} | 37 | {/if} |
38 | {if="!empty($search_tags)"} | 38 | {if="!empty($search_tags)"} |
39 | {$exploded_tags=explode(' ', $search_tags)} | 39 | {$exploded_tags=explode(' ', $search_tags)} |
40 | tagged | 40 | {'tagged'|t} |
41 | {loop="$exploded_tags"} | 41 | {loop="$exploded_tags"} |
42 | <span class="label label-tag" title="Remove tag"> | 42 | <span class="label label-tag" title="{'Remove tag'|t}"> |
43 | <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times"></i></span></a> | 43 | <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times"></i></span></a> |
44 | </span> | 44 | </span> |
45 | {/loop} | 45 | {/loop} |
@@ -57,9 +57,10 @@ | |||
57 | <div class="linklist-item-title"> | 57 | <div class="linklist-item-title"> |
58 | {if="isLoggedIn()"} | 58 | {if="isLoggedIn()"} |
59 | <div class="linklist-item-editbuttons"> | 59 | <div class="linklist-item-editbuttons"> |
60 | <a href="#" title="Fold" class="fold-button"><i class="fa fa-chevron-up"></i></a> | 60 | <!-- FIXME! JS translation --> |
61 | <a href="?edit_link={$value.linkdate}" title="Edit"><i class="fa fa-pencil-square-o"></i></a> | 61 | <a href="#" title="{'Fold'|t}" class="fold-button"><i class="fa fa-chevron-up"></i></a> |
62 | <a href="?delete_link={$value.linkdate}&token={$token}" title="Delete" class="delete-link"> | 62 | <a href="?edit_link={$value.linkdate}" title="{'Edit'|t}"><i class="fa fa-pencil-square-o"></i></a> |
63 | <a href="?delete_link={$value.linkdate}&token={$token}" title="{'Delete'|t}" class="delete-link"> | ||
63 | <i class="fa fa-trash"></i> | 64 | <i class="fa fa-trash"></i> |
64 | </a> | 65 | </a> |
65 | </div> | 66 | </div> |
@@ -74,7 +75,7 @@ | |||
74 | {/if} | 75 | {/if} |
75 | 76 | ||
76 | {if="$value.private"} | 77 | {if="$value.private"} |
77 | <span class="label label-private">Private</span> | 78 | <span class="label label-private">{'Private'|t}</span> |
78 | {/if} | 79 | {/if} |
79 | 80 | ||
80 | {$value.title} | 81 | {$value.title} |
@@ -107,14 +108,14 @@ | |||
107 | 108 | ||
108 | <div class="pure-g"> | 109 | <div class="pure-g"> |
109 | <div class="linklist-item-infos-dateblock pure-u-lg-3-8 pure-u-1"> | 110 | <div class="linklist-item-infos-dateblock pure-u-lg-3-8 pure-u-1"> |
110 | <a href="?{$value.shorturl}" title="Permalink"> | 111 | <a href="?{$value.shorturl}" title="{'Permalink'|t}"> |
111 | {if="!$hide_timestamps || isLoggedIn()"} | 112 | {if="!$hide_timestamps || isLoggedIn()"} |
112 | <span class="linkdate"> | 113 | <span class="linkdate"> |
113 | <i class="fa fa-clock-o"></i> | 114 | <i class="fa fa-clock-o"></i> |
114 | {function="strftime('%d %B %Y %H:%M', $value.timestamp)"} · | 115 | {function="strftime('%d %B %Y %H:%M', $value.timestamp)"} · |
115 | </span> | 116 | </span> |
116 | {/if} | 117 | {/if} |
117 | permalink · | 118 | {'permalink'|t} · |
118 | </a> | 119 | </a> |
119 | 120 | ||
120 | {$link_plugin_counter=count($value.link_plugin)} | 121 | {$link_plugin_counter=count($value.link_plugin)} |
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index 9a3fd7a8..3e5a5868 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html | |||
@@ -6,10 +6,10 @@ | |||
6 | <div class="linklist-filters pure-u-1-3"> | 6 | <div class="linklist-filters pure-u-1-3"> |
7 | {if="isLoggedIn() or !empty($action_plugin)"} | 7 | {if="isLoggedIn() or !empty($action_plugin)"} |
8 | <span class="linklist-filters-text"> | 8 | <span class="linklist-filters-text"> |
9 | Filters | 9 | {'Filters'|t} |
10 | </span> | 10 | </span> |
11 | {if="isLoggedIn()"} | 11 | {if="isLoggedIn()"} |
12 | <a href="?privateonly" title="Click to see all links" | 12 | <a href="?privateonly" title="{'Filter private links'|t}" |
13 | class={if="$privateonly"}"filter-on"{else}"filter-off"{/if} | 13 | class={if="$privateonly"}"filter-on"{else}"filter-off"{/if} |
14 | ><i class="fa fa-key"></i></a> | 14 | ><i class="fa fa-key"></i></a> |
15 | {/if} | 15 | {/if} |
@@ -43,7 +43,7 @@ | |||
43 | </div> | 43 | </div> |
44 | 44 | ||
45 | <div class="linksperpage pure-u-1-3"> | 45 | <div class="linksperpage pure-u-1-3"> |
46 | <div class="pure-u-0 pure-u-lg-visible">Links per page</div> | 46 | <div class="pure-u-0 pure-u-lg-visible">{'Links per page'|t}</div> |
47 | <a href="?linksperpage=20">20</a> | 47 | <a href="?linksperpage=20">20</a> |
48 | <a href="?linksperpage=50">50</a> | 48 | <a href="?linksperpage=50">50</a> |
49 | <a href="?linksperpage=100">100</a> | 49 | <a href="?linksperpage=100">100</a> |
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index e6d7dea5..f28e6a47 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html | |||
@@ -9,7 +9,7 @@ | |||
9 | <div class="pure-g pure-alert pure-alert-error pure-alert-closable center"> | 9 | <div class="pure-g pure-alert pure-alert-error pure-alert-closable center"> |
10 | <div class="pure-u-2-24"></div> | 10 | <div class="pure-u-2-24"></div> |
11 | <div class="pure-u-20-24"> | 11 | <div class="pure-u-20-24"> |
12 | You have been banned after too many failed login attempts. Try again later. | 12 | {'You have been banned after too many failed login attempts. Try again later.'|t} |
13 | </div> | 13 | </div> |
14 | <div class="pure-u-2-24"> | 14 | <div class="pure-u-2-24"> |
15 | <i class="fa fa-times pure-alert-close"></i> | 15 | <i class="fa fa-times pure-alert-close"></i> |
@@ -20,19 +20,19 @@ | |||
20 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 20 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> |
21 | <div id="login-form" class="page-form pure-u-lg-1-3 pure-u-3-4"> | 21 | <div id="login-form" class="page-form pure-u-lg-1-3 pure-u-3-4"> |
22 | <form method="post" name="loginform"> | 22 | <form method="post" name="loginform"> |
23 | <h2>Login</h2> | 23 | <h2>{'Login'|t}</h2> |
24 | <div> | 24 | <div> |
25 | <input type="text" name="login" placeholder="Username" tabindex="3"> | 25 | <input type="text" name="login" placeholder="{'Username'|t}" tabindex="20"> |
26 | </div> | 26 | </div> |
27 | <div> | 27 | <div> |
28 | <input type="password" name="password" placeholder="Password" tabindex="4"> | 28 | <input type="password" name="password" placeholder="{'Password'|t}" tabindex="21"> |
29 | </div> | 29 | </div> |
30 | <div class="remember-me"> | 30 | <div class="remember-me"> |
31 | <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="5"> | 31 | <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="22"> |
32 | <label for="longlastingsession">Remember me</label> | 32 | <label for="longlastingsession">{'Remember me'|t}</label> |
33 | </div> | 33 | </div> |
34 | <div> | 34 | <div> |
35 | <input type="submit" value="Login" class="bigbutton" tabindex="6"> | 35 | <input type="submit" value="{'Login'|t}" class="bigbutton" tabindex="23"> |
36 | </div> | 36 | </div> |
37 | <input type="hidden" name="token" value="{$token}"> | 37 | <input type="hidden" name="token" value="{$token}"> |
38 | {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if} | 38 | {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if} |
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index bf5a65e8..335ef686 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -16,33 +16,25 @@ | |||
16 | <i class="fa fa-home"></i> | 16 | <i class="fa fa-home"></i> |
17 | </a> | 17 | </a> |
18 | </li> | 18 | </li> |
19 | {if="isLoggedIn()"} | 19 | {if="isLoggedIn() || $openshaarli"} |
20 | <li class="pure-menu-item"> | ||
21 | <a href="?do=addlink" class="pure-menu-link">Shaare</a> | ||
22 | </li> | ||
23 | <li class="pure-menu-item"> | ||
24 | <a href="?do=tools" class="pure-menu-link">Tools</a> | ||
25 | </li> | ||
26 | |||
27 | {elseif="$openshaarli"} | ||
28 | <li class="pure-menu-item"> | 20 | <li class="pure-menu-item"> |
29 | <a href="?do=addlink" class="pure-menu-link">Shaare</a> | 21 | <a href="?do=addlink" class="pure-menu-link">{'Shaare'|t}</a> |
30 | </li> | 22 | </li> |
31 | <li class="pure-menu-item"> | 23 | <li class="pure-menu-item"> |
32 | <a href="?do=tools" class="pure-menu-link">Tools</a> | 24 | <a href="?do=tools" class="pure-menu-link">{'Tools'|t}</a> |
33 | </li> | 25 | </li> |
34 | {/if} | 26 | {/if} |
35 | <li class="pure-menu-item pure-u-lg-0"> | 27 | <li class="pure-menu-item pure-u-lg-0"> |
36 | <a href="?do=atom{$searchcrits}" class="pure-menu-link">RSS Feed</a> | 28 | <a href="?do=atom{$searchcrits}" class="pure-menu-link">{'RSS Feed'|t}</a> |
37 | </li> | 29 | </li> |
38 | <li class="pure-menu-item"> | 30 | <li class="pure-menu-item"> |
39 | <a href="?do=tagcloud" class="pure-menu-link">Tag cloud</a> | 31 | <a href="?do=tagcloud" class="pure-menu-link">{'Tag cloud'|t}</a> |
40 | </li> | 32 | </li> |
41 | <li class="pure-menu-item"> | 33 | <li class="pure-menu-item"> |
42 | <a href="?do=picwall{$searchcrits}" class="pure-menu-link">Picture wall</a> | 34 | <a href="?do=picwall{$searchcrits}" class="pure-menu-link">{'Picture wall'|t}</a> |
43 | </li> | 35 | </li> |
44 | <li class="pure-menu-item"> | 36 | <li class="pure-menu-item"> |
45 | <a href="?do=daily" class="pure-menu-link">Daily</a> | 37 | <a href="?do=daily" class="pure-menu-link">{'Daily'|t}</a> |
46 | </li> | 38 | </li> |
47 | <!-- FIXME! update plugin system to handle this --> | 39 | <!-- FIXME! update plugin system to handle this --> |
48 | {loop="$plugins_header.buttons_toolbar"} | 40 | {loop="$plugins_header.buttons_toolbar"} |
@@ -52,11 +44,11 @@ | |||
52 | {/loop} | 44 | {/loop} |
53 | {if="isLoggedIn()"} | 45 | {if="isLoggedIn()"} |
54 | <li class="pure-menu-item"> | 46 | <li class="pure-menu-item"> |
55 | <a href="?do=logout" class="pure-menu-link">Logout</a> | 47 | <a href="?do=logout" class="pure-menu-link">{'Logout'|t}</a> |
56 | </li> | 48 | </li> |
57 | {else} | 49 | {else} |
58 | <li class="pure-menu-item"> | 50 | <li class="pure-menu-item"> |
59 | <a href="?do=login" class="pure-menu-link">Login</a> | 51 | <a href="?do=login" class="pure-menu-link">{'Login'|t}</a> |
60 | </li> | 52 | </li> |
61 | {/if} | 53 | {/if} |
62 | </ul> | 54 | </ul> |
@@ -64,19 +56,19 @@ | |||
64 | <ul class="pure-menu-list"> | 56 | <ul class="pure-menu-list"> |
65 | {if="!isLoggedIn()"} | 57 | {if="!isLoggedIn()"} |
66 | <li class="pure-menu-item"> | 58 | <li class="pure-menu-item"> |
67 | <a href="?do=login" class="pure-menu-link" id="login-button" title="Login"> | 59 | <a href="?do=login" class="pure-menu-link" id="login-button" title="{'Login'|t}"> |
68 | <i class="fa fa-user"></i> | 60 | <i class="fa fa-user"></i> |
69 | </a> | 61 | </a> |
70 | </li> | 62 | </li> |
71 | {else} | 63 | {else} |
72 | <li class="pure-menu-item"> | 64 | <li class="pure-menu-item"> |
73 | <a href="?do=logout" class="pure-menu-link" title="Logout"> | 65 | <a href="?do=logout" class="pure-menu-link" title="{'Logout'|t}"> |
74 | <i class="fa fa-sign-out"></i> | 66 | <i class="fa fa-sign-out"></i> |
75 | </a> | 67 | </a> |
76 | </li> | 68 | </li> |
77 | {/if} | 69 | {/if} |
78 | <li class="pure-menu-item"> | 70 | <li class="pure-menu-item"> |
79 | <a href="?do=atom{$searchcrits}" class="pure-menu-link" title="ATOM Feed"> | 71 | <a href="?do=atom{$searchcrits}" class="pure-menu-link" title="{'RSS Feed'|t}"> |
80 | <i class="fa fa-rss"></i> | 72 | <i class="fa fa-rss"></i> |
81 | </a> | 73 | </a> |
82 | </li> | 74 | </li> |
@@ -94,16 +86,16 @@ | |||
94 | </h1> | 86 | </h1> |
95 | <div id="linkcount"> | 87 | <div id="linkcount"> |
96 | {if="!empty($linkcount)"} | 88 | {if="!empty($linkcount)"} |
97 | <span class="strong">{$linkcount}</span> shaares | 89 | <span class="strong">{$linkcount}</span> {function="t('shaare', 'shaares', $linkcount)"} |
98 | {if="$privateLinkcount>0"} | 90 | {if="$privateLinkcount>0"} |
99 | - <span class="strong">{$privateLinkcount}</span> private links | 91 | - <span class="strong">{$privateLinkcount}</span> {function="t('private link', 'private links', $privateLinkcount)"} |
100 | {/if} | 92 | {/if} |
101 | {/if} | 93 | {/if} |
102 | </div> | 94 | </div> |
103 | 95 | ||
104 | <div id="search"> | 96 | <div id="search"> |
105 | <form method="GET" class="searchform" name="searchform"> | 97 | <form method="GET" class="searchform" name="searchform"> |
106 | <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text" | 98 | <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="{'Search text'|t}" |
107 | {if="!empty($search_term)"} | 99 | {if="!empty($search_term)"} |
108 | value="{$search_term}" | 100 | value="{$search_term}" |
109 | {/if} | 101 | {/if} |
@@ -112,7 +104,7 @@ | |||
112 | <button type="submit" class="search-button"><i class="fa fa-search"></i></button> | 104 | <button type="submit" class="search-button"><i class="fa fa-search"></i></button> |
113 | </form> | 105 | </form> |
114 | <form method="GET" class="tagfilter" name="tagfilter"> | 106 | <form method="GET" class="tagfilter" name="tagfilter"> |
115 | <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag" | 107 | <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="{'Filter by tag'|t}" |
116 | {if="!empty($search_tags)"} | 108 | {if="!empty($search_tags)"} |
117 | value="{$search_tags}" | 109 | value="{$search_tags}" |
118 | {/if} | 110 | {/if} |
@@ -128,11 +120,11 @@ | |||
128 | <div id="content"> | 120 | <div id="content"> |
129 | <form method="post" name="loginform"> | 121 | <form method="post" name="loginform"> |
130 | <div id="header-login-form"> | 122 | <div id="header-login-form"> |
131 | <input type="text" name="login" placeholder="Username" tabindex="3"> | 123 | <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3"> |
132 | <input type="password" name="password" placeholder="Password" tabindex="5"> | 124 | <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5"> |
133 | <div class="remember-me"> | 125 | <div class="remember-me"> |
134 | <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="6"> | 126 | <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="6"> |
135 | <label for="longlastingsession">Remember me</label> | 127 | <label for="longlastingsession">{'Remember me'|t}</label> |
136 | </div> | 128 | </div> |
137 | <input type="hidden" name="token" value="{$token}"> | 129 | <input type="hidden" name="token" value="{$token}"> |
138 | <input type="hidden" name="returnurl"> | 130 | <input type="hidden" name="returnurl"> |
@@ -145,13 +137,13 @@ | |||
145 | <div class="pure-u-2-24"></div> | 137 | <div class="pure-u-2-24"></div> |
146 | {if="$newVersion"} | 138 | {if="$newVersion"} |
147 | <div class="pure-u-20-24"> | 139 | <div class="pure-u-20-24"> |
148 | Shaarli {$newVersion} is | 140 | Shaarli {$newVersion} |
149 | <a href="https://github.com/shaarli/Shaarli/releases">available</a>. | 141 | <a href="https://github.com/shaarli/Shaarli/releases">{'is available'|t}</a>. |
150 | </div> | 142 | </div> |
151 | {/if} | 143 | {/if} |
152 | {if="$versionError"} | 144 | {if="$versionError"} |
153 | <div class="pure-u-20-24"> | 145 | <div class="pure-u-20-24"> |
154 | Error: {$versionError} | 146 | {'Error'|t}: {$versionError} |
155 | </div> | 147 | </div> |
156 | {/if} | 148 | {/if} |
157 | <div class="pure-u-2-24"> | 149 | <div class="pure-u-2-24"> |
@@ -160,14 +152,6 @@ | |||
160 | </div> | 152 | </div> |
161 | {/if} | 153 | {/if} |
162 | 154 | ||
163 | |||
164 | {if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"} | ||
165 | {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore} | ||
166 | {else} | ||
167 | |||
168 | {/if} | ||
169 | |||
170 | |||
171 | {if="!empty($plugin_errors) && isLoggedIn()"} | 155 | {if="!empty($plugin_errors) && isLoggedIn()"} |
172 | <ul class="errors"> | 156 | <ul class="errors"> |
173 | {loop="plugin_errors"} | 157 | {loop="plugin_errors"} |
diff --git a/tpl/default/tools.html b/tpl/default/tools.html index f5e8321b..a2132bd5 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html | |||
@@ -11,35 +11,37 @@ | |||
11 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form"> | 11 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form"> |
12 | <h2>Settings</h2> | 12 | <h2>Settings</h2> |
13 | <div class="tools-item"> | 13 | <div class="tools-item"> |
14 | <a href="?do=configure" title="Change Shaarli settings: title, timezone, etc."> | 14 | <a href="?do=configure" title="{'Change Shaarli settings: title, timezone, etc.'|t}"> |
15 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Configure your Shaarli</span> | 15 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">{'Configure your Shaarli'|t}</span> |
16 | </a> | 16 | </a> |
17 | </div> | 17 | </div> |
18 | <div class="tools-item"> | 18 | <div class="tools-item"> |
19 | <a href="?do=pluginadmin" title="Enable, disable and configure plugins"> | 19 | <a href="?do=pluginadmin" title="{'Enable, disable and configure plugins'|t}"> |
20 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Plugin administration</span> | 20 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">{'Plugin administration'|t}</span> |
21 | </a> | 21 | </a> |
22 | </div> | 22 | </div> |
23 | {if="!$openshaarli"} | 23 | {if="!$openshaarli"} |
24 | <div class="tools-item"> | 24 | <div class="tools-item"> |
25 | <a href="?do=changepasswd" title="Change your password"> | 25 | <a href="?do=changepasswd" title="{'Change your password'|t}"> |
26 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Change password</span> | 26 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">{'Change password'|t}</span> |
27 | </a> | 27 | </a> |
28 | </div> | 28 | </div> |
29 | {/if} | 29 | {/if} |
30 | <div class="tools-item"> | 30 | <div class="tools-item"> |
31 | <a href="?do=changetag" title="Rename or delete a tag in all links"> | 31 | <a href="?do=changetag" title="{'Rename or delete a tag in all links'|t}"> |
32 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Manage tags</span> | 32 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">{'Manage tags'|t}</span> |
33 | </a> | 33 | </a> |
34 | </div> | 34 | </div> |
35 | <div class="tools-item"> | 35 | <div class="tools-item"> |
36 | <a href="?do=import" title="Import Netscape HTML bookmarks (as exported from Firefox, Chrome, Opera, delicious...)"> | 36 | <a href="?do=import" |
37 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Import links</span> | 37 | title="{'Import Netscape HTML bookmarks (as exported from Firefox, Chrome, Opera, delicious...)'|t}"> |
38 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">{'Import links'|t}</span> | ||
38 | </a> | 39 | </a> |
39 | </div> | 40 | </div> |
40 | <div class="tools-item"> | 41 | <div class="tools-item"> |
41 | <a href="?do=export" title="<!--Export Netscape HTML bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)-->"> | 42 | <a href="?do=export" |
42 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Export database</span> | 43 | title="{'Export Netscape HTML bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)'|t}"> |
44 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">{'Export database'|t}</span> | ||
43 | </a> | 45 | </a> |
44 | </div> | 46 | </div> |
45 | 47 | ||
@@ -59,12 +61,12 @@ | |||
59 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form"> | 61 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form"> |
60 | <h2>Bookmarklets</h2> | 62 | <h2>Bookmarklets</h2> |
61 | <p> | 63 | <p> |
62 | Drag one of these button to your bookmarks toolbar or right-click it and "Bookmark This Link", | 64 | {'Drag one of these button to your bookmarks toolbar or right-click it and "Bookmark This Link"'|t}, |
63 | then click on the bookmarklet in any page you want to share. | 65 | {'then click on the bookmarklet in any page you want to share.'|t} |
64 | </p> | 66 | </p> |
65 | <div class="tools-item"> | 67 | <div class="tools-item"> |
66 | <a title="Drag this link to your bookmarks toolbar or right-click it and Bookmark This Link, | 68 | <a title="{'Drag this link to your bookmarks toolbar or right-click it and Bookmark This Link'|t}, |
67 | then click ✚Shaare link button in any page you want to share" | 69 | {'then click ✚Shaare link button in any page you want to share'|t}" |
68 | onclick="return alertBookmarklet();" | 70 | onclick="return alertBookmarklet();" |
69 | href="javascript:( | 71 | href="javascript:( |
70 | function(){ | 72 | function(){ |
@@ -78,15 +80,15 @@ | |||
78 | ); | 80 | ); |
79 | } | 81 | } |
80 | )();"> | 82 | )();"> |
81 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ Shaare link</span> | 83 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ {'Shaare link'|t}</span> |
82 | </a> | 84 | </a> |
83 | </div> | 85 | </div> |
84 | <div class="tools-item"> | 86 | <div class="tools-item"> |
85 | <a title="Drag this link to your bookmarks toolbar or right-click it and Bookmark This Link, | 87 | <a title="{'Drag this link to your bookmarks toolbar or right-click it and Bookmark This Link'|t}, |
86 | Then click ✚Add Note button anytime to start composing a private Note (text post) to your Shaarli" | 88 | {'Then click ✚Add Note button anytime to start composing a private Note (text post) to your Shaarli'|t}" |
87 | onclick="return alertBookmarklet();" | 89 | onclick="return alertBookmarklet();" |
88 | href="?private=1&post="> | 90 | href="?private=1&post="> |
89 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ Add Note</span> | 91 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ {'Add Note'|t}</span> |
90 | </a> | 92 | </a> |
91 | </div> | 93 | </div> |
92 | </div> | 94 | </div> |
@@ -97,12 +99,12 @@ | |||
97 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 99 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> |
98 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form"> | 100 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form"> |
99 | <h2>Firefox Social API</h2> | 101 | <h2>Firefox Social API</h2> |
100 | <p>You need to browse your Shaarli over <strong>HTTPS</strong> to use this functionality.</p> | 102 | <p>{'You need to browse your Shaarli over <strong>HTTPS</strong> to use this functionality.'|t}</p> |
101 | 103 | ||
102 | <div class="tools-item"> | 104 | <div class="tools-item"> |
103 | <a title="Click on this button to add Shaarli to the 'Share this page' button in Firefox" | 105 | <a title="{'Click on this button to add Shaarli to the 'Share this page' button in Firefox" |
104 | onclick="activateFirefoxSocial(this)"> | 106 | onclick="activateFirefoxSocial(this)"> |
105 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ Add to Firefox social</span> | 107 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ {'Add to'|t} Firefox Social</span> |
106 | </a> | 108 | </a> |
107 | </div> | 109 | </div> |
108 | </div> | 110 | </div> |
@@ -112,16 +114,16 @@ | |||
112 | <div class="pure-g"> | 114 | <div class="pure-g"> |
113 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | 115 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> |
114 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form"> | 116 | <div class="pure-u-lg-1-3 pure-u-3-4 page-form"> |
115 | <h2>3rd party</h2> | 117 | <h2>{'3rd party'|t}</h2> |
116 | <div class="tools-item"> | 118 | <div class="tools-item"> |
117 | <a href="https://addons.mozilla.org/fr/firefox/addon/shaarli/" title="Firefox Plugin"> | 119 | <a href="https://addons.mozilla.org/fr/firefox/addon/shaarli/" title="Firefox {'Plugin'|t}"> |
118 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Firefox plugin</span> | 120 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Firefox {'plugin'|t}</span> |
119 | </a> | 121 | </a> |
120 | </div> | 122 | </div> |
121 | <div class="tools-item"> | 123 | <div class="tools-item"> |
122 | <a href="https://chrome.google.com/webstore/detail/shiny-shaarli/hajdfkmbdmadjmmpkkbbcnllepomekin" | 124 | <a href="https://chrome.google.com/webstore/detail/shiny-shaarli/hajdfkmbdmadjmmpkkbbcnllepomekin" |
123 | title="Chrome Plugin"> | 125 | title="Chrome {'Plugin'|t}"> |
124 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Chrome plugin</span> | 126 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Chrome {'plugin'|t}</span> |
125 | </a> | 127 | </a> |
126 | </div> | 128 | </div> |
127 | </div> | 129 | </div> |
@@ -136,7 +138,7 @@ | |||
136 | // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable. | 138 | // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable. |
137 | var data = { | 139 | var data = { |
138 | name: "{$shaarlititle}", | 140 | name: "{$shaarlititle}", |
139 | description: "The personal, minimalist, super-fast, no-database delicious clone.", | 141 | description: "The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community.", |
140 | author: "Shaarli", | 142 | author: "Shaarli", |
141 | version: "1.0.0", | 143 | version: "1.0.0", |
142 | 144 | ||
@@ -154,7 +156,7 @@ | |||
154 | } | 156 | } |
155 | 157 | ||
156 | function alertBookmarklet() { | 158 | function alertBookmarklet() { |
157 | alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...'); | 159 | alert({"'Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link'"|t}); |
158 | return false; | 160 | return false; |
159 | } | 161 | } |
160 | </script> | 162 | </script> |