From: David ‘Bombe’ Roden Date: Wed, 26 Jan 2011 09:22:01 +0000 (+0100) Subject: Merge branch 'release-0.4.3' X-Git-Tag: 0.4.3^0 X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=07ca98b45465f7a442e695fbfb6f59100260f39b;hp=13e00a0611cd80e43f813171d8b6d84870afbcbc Merge branch 'release-0.4.3' --- diff --git a/pom.xml b/pom.xml index 4a5a06e..3546ccc 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 net.pterodactylus sone - 0.4.2 + 0.4.3 net.pterodactylus diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java index dbda28d..99a119b 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -996,7 +996,7 @@ public class Core implements IdentityListener, UpdateListener { } } } - Set storedReplies = sone.getReplies(); + Set storedReplies = storedSone.getReplies(); synchronized (newReplies) { for (Reply reply : sone.getReplies()) { reply.setSone(storedSone); @@ -1771,8 +1771,8 @@ public class Core implements IdentityListener, UpdateListener { * {@inheritDoc} */ @Override - public void updateFound(Version version, long releaseTime) { - coreListenerManager.fireUpdateFound(version, releaseTime); + public void updateFound(Version version, long releaseTime, long latestEdition) { + coreListenerManager.fireUpdateFound(version, releaseTime, latestEdition); } } diff --git a/src/main/java/net/pterodactylus/sone/core/CoreListener.java b/src/main/java/net/pterodactylus/sone/core/CoreListener.java index 5fbb333..fb83c9f 100644 --- a/src/main/java/net/pterodactylus/sone/core/CoreListener.java +++ b/src/main/java/net/pterodactylus/sone/core/CoreListener.java @@ -135,7 +135,9 @@ public interface CoreListener extends EventListener { * The version that was found * @param releaseTime * The release time of the new version + * @param latestEdition + * The latest edition of the Sone homepage */ - public void updateFound(Version version, long releaseTime); + public void updateFound(Version version, long releaseTime, long latestEdition); } diff --git a/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java b/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java index 4fc9532..6dbdc58 100644 --- a/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java +++ b/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java @@ -201,15 +201,17 @@ public class CoreListenerManager extends AbstractListenerManager - * This method is only called by the {@link IdentityManager}. * * @param name * The name of the property diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java index 4be076d..e51f9a1 100644 --- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java +++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java @@ -78,7 +78,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10 } /** The version. */ - public static final Version VERSION = new Version(0, 4, 2); + public static final Version VERSION = new Version(0, 4, 3); /** The logger. */ private static final Logger logger = Logging.getLogger(SonePlugin.class); diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java index fa43945..a7df9c2 100644 --- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java +++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java @@ -193,6 +193,7 @@ public class SoneTemplatePage extends TemplatePage { templateContext.set("request", request); templateContext.set("currentVersion", SonePlugin.VERSION); templateContext.set("hasLatestVersion", webInterface.getCore().getUpdateChecker().hasLatestVersion()); + templateContext.set("latestEdition", webInterface.getCore().getUpdateChecker().getLatestEdition()); templateContext.set("latestVersion", webInterface.getCore().getUpdateChecker().getLatestVersion()); templateContext.set("latestVersionTime", webInterface.getCore().getUpdateChecker().getLatestVersionDate()); } diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java index 0df6d79..9023ccf 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -765,8 +765,9 @@ public class WebInterface implements CoreListener { * {@inheritDoc} */ @Override - public void updateFound(Version version, long releaseTime) { - newVersionNotification.getTemplateContext().set("version", version); + public void updateFound(Version version, long releaseTime, long latestEdition) { + newVersionNotification.getTemplateContext().set("latestVersion", version); + newVersionNotification.getTemplateContext().set("latestEdition", latestEdition); newVersionNotification.getTemplateContext().set("releaseTime", releaseTime); notificationManager.addNotification(newVersionNotification); } diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties index 50dab27..35bc436 100644 --- a/src/main/resources/i18n/sone.en.properties +++ b/src/main/resources/i18n/sone.en.properties @@ -245,4 +245,4 @@ Notification.SoneIsBeingRescued.Text=The following Sones are currently being res Notification.SoneRescued.Text=The following Sones have been rescued: Notification.SoneRescued.Text.RememberToUnlock=Please remember to control the posts and replies you have given and don’t forget to unlock your Sones! Notification.LockedSones.Text=The following Sones have been locked for more than 5 minutes. Please check if you really want to keep these Sones locked: -Notification.NewVersion.Text=A new version of the Sone plugin was found: Version {version}. +Notification.NewVersion.Text=Version {version} of the Sone plugin was found. Download it from USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/{edition}​! diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js index 6ff4ceb..251105a 100644 --- a/src/main/resources/static/javascript/sone.js +++ b/src/main/resources/static/javascript/sone.js @@ -71,7 +71,6 @@ function addCommentLink(postId, element, insertAfterThisElement) { commentElement = (function(postId) { separator = $(" · ").addClass("separator"); var commentElement = $("
Comment
").addClass("show-reply-form").click(function() { - markPostAsKnown(getPostElement(this)); replyElement = $("#sone .post#" + postId + " .create-reply"); replyElement.removeClass("hidden"); replyElement.removeClass("light"); @@ -606,7 +605,6 @@ function ajaxifyPost(postElement) { if (success) { $(inputField).val(""); loadNewReply(replyId, soneId, postId); - markPostAsKnown(getPostElement(inputField)); $("#sone .post#" + postId + " .create-reply").addClass("hidden"); $("#sone .post#" + postId + " .create-reply .sender").hide(); $("#sone .post#" + postId + " .create-reply .select-sender").show(); @@ -630,12 +628,10 @@ function ajaxifyPost(postElement) { /* convert all “like” buttons to javascript functions. */ $(postElement).find(".like-post").submit(function() { likePost(getPostId(this)); - markPostAsKnown(getPostElement(this)); return false; }); $(postElement).find(".unlike-post").submit(function() { unlikePost(getPostId(this)); - markPostAsKnown(getPostElement(this)); return false; }); @@ -698,12 +694,10 @@ function ajaxifyPost(postElement) { function ajaxifyReply(replyElement) { $(replyElement).find(".like-reply").submit(function() { likeReply(getReplyId(this)); - markPostAsKnown(getPostElement(this)); return false; }); $(replyElement).find(".unlike-reply").submit(function() { unlikeReply(getReplyId(this)); - markPostAsKnown(getPostElement(this)); return false; }); (function(replyElement) { @@ -728,11 +722,6 @@ function ajaxifyReply(replyElement) { untrustSone(getReplyAuthor(this)); return false; }); - - /* mark post and all replies as known on click. */ - $(replyElement).click(function() { - markPostAsKnown(getPostElement(this)); - }); } /** @@ -1013,10 +1002,9 @@ function markPostAsKnown(postElements) { postElement = this; if ($(postElement).hasClass("new")) { (function(postElement) { - $.getJSON("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": "post", "id": getPostId(postElement)}, function(data, textStatus) { - $(postElement).removeClass("new"); - $(".click-to-show", postElement).removeClass("new"); - }); + $(postElement).removeClass("new"); + $(".click-to-show", postElement).removeClass("new"); + $.getJSON("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": "post", "id": getPostId(postElement)}); })(postElement); } }); @@ -1028,9 +1016,8 @@ function markReplyAsKnown(replyElements) { replyElement = this; if ($(replyElement).hasClass("new")) { (function(replyElement) { - $.getJSON("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": "reply", "id": getReplyId(replyElement)}, function(data, textStatus) { - $(replyElement).removeClass("new"); - }); + $(replyElement).removeClass("new"); + $.getJSON("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": "reply", "id": getReplyId(replyElement)}); })(replyElement); } }); diff --git a/src/main/resources/templates/notify/newVersionNotification.html b/src/main/resources/templates/notify/newVersionNotification.html index 23a5855..fdb8b2a 100644 --- a/src/main/resources/templates/notify/newVersionNotification.html +++ b/src/main/resources/templates/notify/newVersionNotification.html @@ -1 +1 @@ -
<%= Notification.NewVersion.Text|l10n|html|replace needle="{version}" replacementKey=version>
+
<%= Notification.NewVersion.Text|l10n|replace needle="{version}" replacementKey=latestVersion|replace needle="{edition}" replacementKey=latestEdition|parse sone=currentSone>
diff --git a/src/main/resources/templates/viewSone.html b/src/main/resources/templates/viewSone.html index fac920b..4b2502a 100644 --- a/src/main/resources/templates/viewSone.html +++ b/src/main/resources/templates/viewSone.html @@ -35,16 +35,18 @@ <%/foreach> - <%if ! sone.current> -

<%= Page.ViewSone.WriteAMessage|l10n|html>

- -
- - - - - -
+ <%ifnull ! currentSone> + <%if ! sone.current> +

<%= Page.ViewSone.WriteAMessage|l10n|html>

+ +
+ + + + + +
+ <%/if> <%/if>

<%= Page.ViewSone.PostList.Title|l10n|replace needle="{sone}" replacementKey=sone.niceName|html>