aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-01-17 09:54:25 +0100
committerGitHub <noreply@github.com>2017-01-17 09:54:25 +0100
commit679b6b40db1b654347e0b4785131796f7e3b8865 (patch)
tree418036ec908cd5a5756da54ff40e95c272a5cb02
parent078fcb56ad6bcec203ff91d956e03cf1605a93af (diff)
parentb87442f216e6745b8472b85ae8fe5d85ede29094 (diff)
downloadShaarli-679b6b40db1b654347e0b4785131796f7e3b8865.tar.gz
Shaarli-679b6b40db1b654347e0b4785131796f7e3b8865.tar.zst
Shaarli-679b6b40db1b654347e0b4785131796f7e3b8865.zip
Merge pull request #767 from ArthurHoaro/feature/delete-tag-redirect
Stay on the changetag page after tag deletion
-rw-r--r--index.php2
-rw-r--r--tpl/default/css/shaarli.css2
-rw-r--r--tpl/default/editlink.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/index.php b/index.php
index 677c196a..190d7f6b 100644
--- a/index.php
+++ b/index.php
@@ -1208,7 +1208,7 @@ function renderPage($conf, $pluginManager, $LINKSDB)
1208 $LINKSDB[$key]=$value; 1208 $LINKSDB[$key]=$value;
1209 } 1209 }
1210 $LINKSDB->save($conf->get('resource.page_cache')); 1210 $LINKSDB->save($conf->get('resource.page_cache'));
1211 echo '<script>alert("Tag was removed from '.count($linksToAlter).' links.");document.location=\'?\';</script>'; 1211 echo '<script>alert("Tag was removed from '.count($linksToAlter).' links.");document.location=\'?do=changetag\';</script>';
1212 exit; 1212 exit;
1213 } 1213 }
1214 1214
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index 6d73af3e..7ca567e7 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -55,7 +55,7 @@ strong {
55 cursor: pointer; 55 cursor: pointer;
56 height: 24px; 56 height: 24px;
57 padding: 0 5px; 57 padding: 0 5px;
58 margin: 5px 5px 0 0; 58 margin: 0 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;
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html
index a2d9b78f..f855dfb1 100644
--- a/tpl/default/editlink.html
+++ b/tpl/default/editlink.html
@@ -35,7 +35,7 @@
35 &nbsp;<label for="lf_private"><i>Private</i></label><br> 35 &nbsp;<label for="lf_private"><i>Private</i></label><br>
36 {else} 36 {else}
37 <input type="checkbox" name="lf_private" id="lf_private"> 37 <input type="checkbox" name="lf_private" id="lf_private">
38 &nbsp;<label for="lf_private"><i>Private</i></label><br> 38 &nbsp;<label for="lf_private"><i>Private</i></label><br><br>
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">