diff options
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/default/css/shaarli.css | 2 | ||||
-rw-r--r-- | tpl/default/js/shaarli.js | 9 | ||||
-rw-r--r-- | tpl/default/loginform.html | 3 | ||||
-rw-r--r-- | tpl/vintage/loginform.html | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index e1868c59..ba589723 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css | |||
@@ -539,7 +539,7 @@ body, .pure-g [class*="pure-u"] { | |||
539 | } | 539 | } |
540 | 540 | ||
541 | .linklist-item-title a:visited .linklist-link { | 541 | .linklist-item-title a:visited .linklist-link { |
542 | color: #555555; | 542 | color: #2a4c41; |
543 | } | 543 | } |
544 | 544 | ||
545 | .linklist-item-title a:hover, .linklist-item-title .linklist-link:hover{ | 545 | .linklist-item-title a:hover, .linklist-item-title .linklist-link:hover{ |
diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index 4f49affa..1c66ebbd 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js | |||
@@ -401,14 +401,14 @@ window.onload = function () { | |||
401 | 401 | ||
402 | var message = 'Are you sure you want to delete '+ links.length +' links?\n'; | 402 | var message = 'Are you sure you want to delete '+ links.length +' links?\n'; |
403 | message += 'This action is IRREVERSIBLE!\n\nTitles:\n'; | 403 | message += 'This action is IRREVERSIBLE!\n\nTitles:\n'; |
404 | var ids = ''; | 404 | var ids = []; |
405 | links.forEach(function(item) { | 405 | links.forEach(function(item) { |
406 | message += ' - '+ item['title'] +'\n'; | 406 | message += ' - '+ item['title'] +'\n'; |
407 | ids += item['id'] +'+'; | 407 | ids.push(item['id']); |
408 | }); | 408 | }); |
409 | 409 | ||
410 | if (window.confirm(message)) { | 410 | if (window.confirm(message)) { |
411 | window.location = '?delete_link&lf_linkdate='+ ids +'&token='+ token.value; | 411 | window.location = '?delete_link&lf_linkdate='+ ids.join('+') +'&token='+ token.value; |
412 | } | 412 | } |
413 | }); | 413 | }); |
414 | } | 414 | } |
@@ -607,10 +607,11 @@ function htmlEntities(str) | |||
607 | function activateFirefoxSocial(node) { | 607 | function activateFirefoxSocial(node) { |
608 | var loc = location.href; | 608 | var loc = location.href; |
609 | var baseURL = loc.substring(0, loc.lastIndexOf("/") + 1); | 609 | var baseURL = loc.substring(0, loc.lastIndexOf("/") + 1); |
610 | var title = document.title; | ||
610 | 611 | ||
611 | // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable. | 612 | // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable. |
612 | var data = { | 613 | var data = { |
613 | name: "{$shaarlititle}", | 614 | name: title, |
614 | description: "The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community.", | 615 | description: "The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community.", |
615 | author: "Shaarli", | 616 | author: "Shaarli", |
616 | version: "1.0.0", | 617 | version: "1.0.0", |
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index eb6d8378..5777a218 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html | |||
@@ -30,7 +30,8 @@ | |||
30 | </div> | 30 | </div> |
31 | <div class="remember-me"> | 31 | <div class="remember-me"> |
32 | <input type="checkbox" name="longlastingsession" id="longlastingsessionform" | 32 | <input type="checkbox" name="longlastingsession" id="longlastingsessionform" |
33 | checked="checked" tabindex="22"> | 33 | {if="$remember_user_default"}checked="checked"{/if} |
34 | tabindex="22"> | ||
34 | <label for="longlastingsessionform">{'Remember me'|t}</label> | 35 | <label for="longlastingsessionform">{'Remember me'|t}</label> |
35 | </div> | 36 | </div> |
36 | <div> | 37 | <div> |
diff --git a/tpl/vintage/loginform.html b/tpl/vintage/loginform.html index 84176385..1becd44f 100644 --- a/tpl/vintage/loginform.html +++ b/tpl/vintage/loginform.html | |||
@@ -24,7 +24,9 @@ | |||
24 | </label> | 24 | </label> |
25 | <input type="submit" value="Login" class="bigbutton" tabindex="4"> | 25 | <input type="submit" value="Login" class="bigbutton" tabindex="4"> |
26 | <label for="longlastingsession"> | 26 | <label for="longlastingsession"> |
27 | <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"> | 27 | <input type="checkbox" name="longlastingsession" |
28 | id="longlastingsession" tabindex="3" | ||
29 | {if="$remember_user_default"}checked="checked"{/if}> | ||
28 | Stay signed in (Do not check on public computers)</label> | 30 | Stay signed in (Do not check on public computers)</label> |
29 | <input type="hidden" name="token" value="{$token}"> | 31 | <input type="hidden" name="token" value="{$token}"> |
30 | {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if} | 32 | {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if} |