aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2019-05-08 11:00:33 +0200
committerGitHub <noreply@github.com>2019-05-08 11:00:33 +0200
commit160d9a7741c2db94ba03de0bfda14601c6afdff9 (patch)
tree6669a53e3365e38e290637eec6aee03d42df9465
parent786f35f2700d83687ef494b98e3dace37d268e1c (diff)
parentd3defcac1c6785ea074070ba6290e68efe16b1a8 (diff)
downloadShaarli-160d9a7741c2db94ba03de0bfda14601c6afdff9.tar.gz
Shaarli-160d9a7741c2db94ba03de0bfda14601c6afdff9.tar.zst
Shaarli-160d9a7741c2db94ba03de0bfda14601c6afdff9.zip
Merge pull request #1296 from ArthurHoaro/feature/sticky-label
Display sticky label in linklist
-rw-r--r--assets/default/scss/shaarli.scss12
-rw-r--r--tpl/default/linklist.html15
2 files changed, 18 insertions, 9 deletions
diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss
index 691b2b37..518fecdf 100644
--- a/assets/default/scss/shaarli.scss
+++ b/assets/default/scss/shaarli.scss
@@ -716,11 +716,19 @@ body,
716 } 716 }
717 } 717 }
718 718
719 .label {
720 font-family: Arial, sans-serif;
721 font-size: .65em;
722 }
723
719 .label-private { 724 .label-private {
720 border: solid 1px $orange; 725 border: solid 1px $orange;
721 color: $orange; 726 color: $orange;
722 font-family: Arial, sans-serif; 727 }
723 font-size: .65em; 728
729 .label-sticky {
730 border: solid 1px $blue;
731 color: $blue;
724 } 732 }
725} 733}
726 734
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index 1cf00783..a2aaac82 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -146,13 +146,14 @@
146 </div> 146 </div>
147 {/if} 147 {/if}
148 148
149 {if="$is_logged_in"} 149 <div class="linklist-item-editbuttons">
150 <div class="linklist-item-editbuttons"> 150 {if="$value.sticky"}
151 {if="$value.private"} 151 <span class="label label-sticky">{$strSticky}</span>
152 <span class="label label-private">{$strPrivate}</span> 152 {/if}
153 {/if} 153 {if="$value.private"}
154 </div> 154 <span class="label label-private">{$strPrivate}</span>
155 {/if} 155 {/if}
156 </div>
156 157
157 <h2> 158 <h2>
158 <a href="{$value.real_url}"> 159 <a href="{$value.real_url}">