aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-01-15 14:01:47 +0100
committerGitHub <noreply@github.com>2017-01-15 14:01:47 +0100
commit5fbab3edb300ad770d88f40ba1cc50d5b93a5bb8 (patch)
treed15e7bdb1baf69009fe6e90f653ef8b06bc86173
parent63ef549749fac9d0e302842f06e7794d1daabc13 (diff)
parent066333c03ca6f484b8e1505e7626d2d01f252bf5 (diff)
downloadShaarli-5fbab3edb300ad770d88f40ba1cc50d5b93a5bb8.tar.gz
Shaarli-5fbab3edb300ad770d88f40ba1cc50d5b93a5bb8.tar.zst
Shaarli-5fbab3edb300ad770d88f40ba1cc50d5b93a5bb8.zip
Merge pull request #746 from ArthurHoaro/hotfix/delete-button
Fix delete button in editlink
-rw-r--r--tpl/default/css/shaarli.css12
-rw-r--r--tpl/default/editlink.html8
2 files changed, 16 insertions, 4 deletions
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index 10709b6a..6d73af3e 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -42,7 +42,7 @@ strong {
42} 42}
43 43
44/* Buttons */ 44/* Buttons */
45.bigbutton { 45.bigbutton, #pageheader a.bigbutton {
46 background-color: #c0c0c0; 46 background-color: #c0c0c0;
47 background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent; 47 background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent;
48 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff)); 48 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff));
@@ -54,11 +54,17 @@ strong {
54 box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5); 54 box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
55 cursor: pointer; 55 cursor: pointer;
56 height: 24px; 56 height: 24px;
57 margin-left: 5px;
58 padding: 0 5px; 57 padding: 0 5px;
58 margin: 5px 5px 0 0;
59 color: #606060; 59 color: #606060;
60 border-style: outset; 60 border-style: outset;
61 border-width: 1px; 61 border-width: 1px;
62 display: inline-block;
63}
64
65a.bigbutton, #pageheader a.bigbutton {
66 height: 22px;
67 line-height: 22px;
62} 68}
63 69
64.smallbutton { 70.smallbutton {
@@ -1009,7 +1015,7 @@ div.dailyNoEntry {
1009 display: inline !important; 1015 display: inline !important;
1010 } 1016 }
1011 1017
1012 .tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton { 1018 .tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton, a.bigbutton {
1013 width: 30%; 1019 width: 30%;
1014 font-size: smaller; 1020 font-size: smaller;
1015 } 1021 }
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html
index d3f99fe6..a2d9b78f 100644
--- a/tpl/default/editlink.html
+++ b/tpl/default/editlink.html
@@ -39,7 +39,13 @@
39 {/if} 39 {/if}
40 <input type="submit" value="Save" name="save_edit" class="bigbutton"> 40 <input type="submit" value="Save" name="save_edit" class="bigbutton">
41 <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton"> 41 <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton">
42 {if="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton delete" onClick="return confirmDeleteLink();">{/if} 42 {if="!$link_is_new && isset($link.id)"}
43 <a href="?delete_link&amp;lf_linkdate={$link.id}&amp;token={$token}"
44 name="delete_link" class="bigbutton"
45 onClick="return confirmDeleteLink();">
46 {'Delete'|t}
47 </a>
48 {/if}
43 <input type="hidden" name="token" value="{$token}"> 49 <input type="hidden" name="token" value="{$token}">
44 {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer}">{/if} 50 {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer}">{/if}
45 </form> 51 </form>