From ec5fe20d0229696793047c8e01745dad9d08264e Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Mon, 18 Oct 2010 22:22:49 +0200 Subject: [PATCH] =?utf8?q?Add=20links=20to=20follow=20and=20unfollow=20Son?= =?utf8?q?es=20from=20the=20=E2=80=9CKnown=20Sones=E2=80=9D=20page.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main/resources/i18n/sone.en.properties | 2 ++ src/main/resources/static/css/sone.css | 4 ++-- src/main/resources/templates/knownSones.html | 13 +++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties index b87b686..76d0a06 100644 --- a/src/main/resources/i18n/sone.en.properties +++ b/src/main/resources/i18n/sone.en.properties @@ -132,6 +132,8 @@ Page.Logout.Title=Logout - Sone View.Head.ProfileLink.Text=Your Profile View.Sone.Label.LastUpdate=last update: +View.Sone.Button.UnfollowSone=unfollow +View.Sone.Button.FollowSone=follow View.Sone.Button.UnblockSone=unblock View.Sone.Button.BlockSone=block diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css index f198127..0014dd9 100644 --- a/src/main/resources/static/css/sone.css +++ b/src/main/resources/static/css/sone.css @@ -157,7 +157,7 @@ display: inline; } -#sone #known-sones form.block button, #sone #known-sones form.unblock button { +#sone #known-sones form.block button, #sone #known-sones form.unblock button, #sone #known-sones form.follow button, #sone #known-sones form.unfollow button { display: inline; color: rgb(28, 131, 191); background: none; @@ -166,7 +166,7 @@ padding: 0px; } -#sone #known-sones form.block button:hover, #sone #known-sones form.unblock button:hover { +#sone #known-sones form.block button:hover, #sone #known-sones form.unblock button:hover, #sone #known-sones form.follow button:hover, #sone #known-sones form.unfollow button:hover { display: inline; color: rgb(255, 172, 0); } diff --git a/src/main/resources/templates/knownSones.html b/src/main/resources/templates/knownSones.html index 84b6a94..096bc19 100644 --- a/src/main/resources/templates/knownSones.html +++ b/src/main/resources/templates/knownSones.html @@ -8,6 +8,19 @@
(<%= View.Sone.Label.LastUpdate|l10n|html> <% sone.time|date format="MMM d, yyyy, HH:mm:ss">)
<%ifnull ! currentSone> + <%if sone.isFriend> +
+ + + +
+ <%else> +
+ + + +
+ <%/if> <%if sone.isBlocked>
-- 2.7.4