From 307d47851ab53cc081bc1d996aed2595fb716aa6 Mon Sep 17 00:00:00 2001 From: Paradox Date: Fri, 15 Jul 2011 17:55:06 -0700 Subject: [PATCH] Added unhide to links --- r2/r2/public/static/compact/unhide.png | Bin 0 -> 629 bytes r2/r2/public/static/css/compact.css | 4 +++- r2/r2/public/static/css/compact.scss | 4 ++++ r2/r2/templates/link.compact | 14 ++++++++++++-- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 r2/r2/public/static/compact/unhide.png diff --git a/r2/r2/public/static/compact/unhide.png b/r2/r2/public/static/compact/unhide.png new file mode 100644 index 0000000000000000000000000000000000000000..68eb55c54c5b83a3a3380c6858eba33534c84504 GIT binary patch literal 629 zcmV-*0*d{KP)mN|@7SeX92|;kr5%FM(m@;wMFc}#L}RF8A)4M3l3-JPF=#Iw zZa&UE=jFYdytq|Wb!`f_+nuI#PC!14#bO>@9}b5LN}q&R!h@dI2Mnx$7~!T+D7@Ed zwV^1A->M~W4fntSSFf=*pvWc?38B?$$?BE?E^1Kw$6&c!ngF3#EPhNT6NS!ICqNBq z|ClTm3k`V0QmNFYV|5omLR|9B3%QR3F1t~2Ef=tKiCUiQTH*kT$ zVDQM|LQC&F7l(x{m&;d~Oom_AQ3kr*u4o)L8jX7v7h2FX4f6T?8LMDTr`d9#37!`x z$z<|?^}?;T^r|>3ps5-7{eFHvpZn|ztfF@Ocs%Z-#BB#k(i*PtxU%k$)8AY8o`xC5-gON8; zV-?rdU^E)B28QkLQqM=0dzc0+R;8u`#elSkLC$PvXpi9{~mcx~yOP5>i8s P00000NkvXXu0mjf0?!pI literal 0 HcmV?d00001 diff --git a/r2/r2/public/static/css/compact.css b/r2/r2/public/static/css/compact.css index 1f6bf4db1..8ba4c793e 100644 --- a/r2/r2/public/static/css/compact.css +++ b/r2/r2/public/static/css/compact.css @@ -56,7 +56,7 @@ button.button { padding: 0 5px; } .comment .child .options_link, .message .child .options_link { top: 8px; } .comment .options_expando, .message .options_expando { margin: 10px -50px 10px 0px; } -.options_icons, .email-icon, .report-icon, .save-icon, .unsave-icon, .domain-icon, .edit-icon, .reply-icon, .permalink-icon, .collapse-icon, .context-icon, .parent-icon, .unread-icon, .hide-icon { display: block; width: 24px; height: 24px; margin-left: auto; margin-right: auto; margin-bottom: 5px; } +.options_icons, .email-icon, .report-icon, .save-icon, .unsave-icon, .domain-icon, .edit-icon, .reply-icon, .permalink-icon, .collapse-icon, .context-icon, .parent-icon, .unread-icon, .hide-icon, .unhide-icon { display: block; width: 24px; height: 24px; margin-left: auto; margin-right: auto; margin-bottom: 5px; } .email-icon { background-image: url("/static/compact/email.png"); /*SPRITE*/ } @@ -84,6 +84,8 @@ button.button { padding: 0 5px; } .hide-icon { background-image: url("/static/compact/hide.png"); /*SPRITE*/ } +.unhide-icon { background-image: url("/static/compact/unhide.png"); /*SPRITE*/ } + /*Toolbar*/ #topbar { height: 45px; position: absolute; top: 0; left: 0; right: 0; background-color: #A8C4E0; background-color: #7f7f7f; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #cee3f8), color-stop(100%, #a8c4e0)); background: -webkit-linear-gradient(top, #cee3f8, #a8c4e0); background: -moz-linear-gradient(top, #cee3f8, #a8c4e0); background: -o-linear-gradient(top, #cee3f8, #a8c4e0); background: linear-gradient(top, #cee3f8, #a8c4e0); border-bottom: 1px solid #7599BD; border-top: 1px solid #DCEAF7; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; padding: 0px 10px 10px 0px; } diff --git a/r2/r2/public/static/css/compact.scss b/r2/r2/public/static/css/compact.scss index f6b718334..1597aa40c 100644 --- a/r2/r2/public/static/css/compact.scss +++ b/r2/r2/public/static/css/compact.scss @@ -298,6 +298,10 @@ button.button { @extend .options_icons; @include sprite($static + 'hide.png'); } +.unhide-icon { + @extend .options_icons; + @include sprite($static + 'unhide.png'); +} /*Toolbar*/ #topbar { diff --git a/r2/r2/templates/link.compact b/r2/r2/templates/link.compact index f8a8a1a54..f1b87cee2 100644 --- a/r2/r2/templates/link.compact +++ b/r2/r2/templates/link.compact @@ -115,14 +115,24 @@ there's also a discussion going on here: ${icon_button("Share", "email-icon", "mailto:?subject=${urllib.quote(_force_utf8(subject))}&body=${urllib.quote(_force_utf8(body))}")} ${self.save_button()} - ${icon_button("Hide","hide-icon", onclick="change_state(this, 'hide', hide_thing)")} + ${self.hide_button()} ${icon_button("Report","report-icon",onclick="return change_state(this, 'report', hide_thing)")} - +<%def name="hide_button()"> + %if c.user_is_loggedin: + %if thing.hidden: + ${icon_button("Hide","hide-icon", onclick="change_state(this, 'hide', hide_thing)", outer_class="hide-button", style="display: none;")} + ${icon_button("Unhide","unhide-icon", onclick="change_state(this, 'unhide', hide_thing)", outer_class="unhide-button")} + %else: + ${icon_button("Hide","hide-icon", onclick="change_state(this, 'hide', hide_thing)", outer_class="hide-button", herp="derp")} + ${icon_button("Unhide","unhide-icon", onclick="change_state(this, 'unhide', hide_thing)", outer_class="unhide-button", style="display: none;")} + %endif + %endif + <%def name="save_button()"> %if c.user_is_loggedin: %if thing.saved: