diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-01-14 14:15:00 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-01-14 14:15:00 +0100 |
commit | 8ea6dcd3973aef84833ed0846d9db84f981ff8c7 (patch) | |
tree | d5084eaf172d66e279267b2827ee499950deee98 | |
parent | 19ac80e11ab70218adc70d7f3ad64669a90aab70 (diff) | |
download | Shaarli-8ea6dcd3973aef84833ed0846d9db84f981ff8c7.tar.gz Shaarli-8ea6dcd3973aef84833ed0846d9db84f981ff8c7.tar.zst Shaarli-8ea6dcd3973aef84833ed0846d9db84f981ff8c7.zip |
Fix delete buttons issues
-rw-r--r-- | tpl/default/changetag.html | 2 | ||||
-rw-r--r-- | tpl/default/css/shaarli.css | 12 | ||||
-rw-r--r-- | tpl/default/editlink.html | 6 | ||||
-rw-r--r-- | tpl/default/js/shaarli.js | 2 | ||||
-rw-r--r-- | tpl/default/linklist.html | 4 |
5 files changed, 19 insertions, 7 deletions
diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html index 4f98baec..8d263a16 100644 --- a/tpl/default/changetag.html +++ b/tpl/default/changetag.html | |||
@@ -28,7 +28,7 @@ | |||
28 | <input type="hidden" name="token" value="{$token}"> | 28 | <input type="hidden" name="token" value="{$token}"> |
29 | <div> | 29 | <div> |
30 | <input type="submit" value="{'Rename'|t}" name="renametag"> | 30 | <input type="submit" value="{'Rename'|t}" name="renametag"> |
31 | <input type="submit" value="{'Delete'|t}" name="deletetag" class="button-red"> | 31 | <input type="submit" value="{'Delete'|t}" name="deletetag" class="button button-red confirm-delete"> |
32 | </div> | 32 | </div> |
33 | </form> | 33 | </form> |
34 | </div> | 34 | </div> |
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 63cf68ac..ed9a86ca 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css | |||
@@ -760,6 +760,7 @@ pre { | |||
760 | text-decoration: none; | 760 | text-decoration: none; |
761 | vertical-align: center; | 761 | vertical-align: center; |
762 | font-weight: normal; | 762 | font-weight: normal; |
763 | display: inline-block; | ||
763 | } | 764 | } |
764 | 765 | ||
765 | 766 | ||
@@ -767,6 +768,10 @@ pre { | |||
767 | background: #ac2925; | 768 | background: #ac2925; |
768 | } | 769 | } |
769 | 770 | ||
771 | .page-form .submit-buttons { | ||
772 | margin-bottom: 10px; | ||
773 | } | ||
774 | |||
770 | @media screen and (min-width: 64em) { | 775 | @media screen and (min-width: 64em) { |
771 | .page-form .submit-buttons { | 776 | .page-form .submit-buttons { |
772 | position: relative; | 777 | position: relative; |
@@ -778,6 +783,13 @@ pre { | |||
778 | } | 783 | } |
779 | } | 784 | } |
780 | 785 | ||
786 | @media screen and (max-width: 64em) { | ||
787 | .page-form .submit-buttons .button { | ||
788 | display: block; | ||
789 | margin: auto; | ||
790 | } | ||
791 | } | ||
792 | |||
781 | .page-form select { | 793 | .page-form select { |
782 | color: #252525; | 794 | color: #252525; |
783 | } | 795 | } |
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index b17d1038..4f10ffb2 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html | |||
@@ -59,11 +59,11 @@ | |||
59 | </div> | 59 | </div> |
60 | 60 | ||
61 | 61 | ||
62 | <div class="submit-buttons"> | 62 | <div class="submit-buttons center"> |
63 | <input type="submit" value="{'Save'|t}" name="save_edit"> | 63 | <input type="submit" value="{'Save'|t}" name="save_edit" class=""> |
64 | {if="!$link_is_new"} | 64 | {if="!$link_is_new"} |
65 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" | 65 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" |
66 | title="" name="delete_link" class="button button-red"> | 66 | title="" name="delete_link" class="button button-red confirm-delete"> |
67 | {'Delete'|t} | 67 | {'Delete'|t} |
68 | </a> | 68 | </a> |
69 | {/if} | 69 | {/if} |
diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index 925f6ce7..a3d40b0d 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js | |||
@@ -133,7 +133,7 @@ function toggleFold(button, description, thumb) | |||
133 | /** | 133 | /** |
134 | * Confirmation message before deletion. | 134 | * Confirmation message before deletion. |
135 | */ | 135 | */ |
136 | var deleteLinks = document.querySelectorAll('.delete-link'); | 136 | var deleteLinks = document.querySelectorAll('.confirm-delete'); |
137 | [].forEach.call(deleteLinks, function(deleteLink) { | 137 | [].forEach.call(deleteLinks, function(deleteLink) { |
138 | deleteLink.addEventListener('click', function(event) { | 138 | deleteLink.addEventListener('click', function(event) { |
139 | if(! confirm('Are you sure you want to delete this link ?')) { | 139 | if(! confirm('Are you sure you want to delete this link ?')) { |
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 5a601d82..b490fe7c 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html | |||
@@ -199,7 +199,7 @@ | |||
199 | </a> | 199 | </a> |
200 | {if="isLoggedIn()"} | 200 | {if="isLoggedIn()"} |
201 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" | 201 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" |
202 | title="{'Delete'|t}" class="delete-link pure-u-0 pure-u-lg-visible"> | 202 | title="{'Delete'|t}" class="delete-link pure-u-0 pure-u-lg-visible confirm-delete"> |
203 | <i class="fa fa-trash"></i> | 203 | <i class="fa fa-trash"></i> |
204 | </a> | 204 | </a> |
205 | {/if} | 205 | {/if} |
@@ -215,7 +215,7 @@ | |||
215 | {/if} | 215 | {/if} |
216 | {if="isLoggedIn()"} | 216 | {if="isLoggedIn()"} |
217 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" | 217 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" |
218 | title="{'Delete'|t}" class="delete-link"> | 218 | title="{'Delete'|t}" class="delete-link confirm-delete"> |
219 | <i class="fa fa-trash"></i> | 219 | <i class="fa fa-trash"></i> |
220 | </a> | 220 | </a> |
221 | {/if} | 221 | {/if} |