From b08235b4e45882753eb5b4a49e2c050ce5ebfcca Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 16 Nov 2010 05:53:32 +0100 Subject: [PATCH] =?utf8?q?Don=E2=80=99t=20show=20=E2=80=9Cweb=20of=20trust?= =?utf8?q?=20is=20missing=E2=80=9D=20notification=20the=20old=20way.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main/java/net/pterodactylus/sone/web/WebInterface.java | 2 -- src/main/resources/i18n/sone.en.properties | 4 ---- src/main/resources/templates/include/head.html | 6 ------ src/main/resources/templates/wotPluginMissing.html | 9 --------- 4 files changed, 21 deletions(-) delete mode 100644 src/main/resources/templates/wotPluginMissing.html diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java index 5e0a168..a74c125 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -272,7 +272,6 @@ public class WebInterface implements CoreListener { Template unfollowSoneTemplate = templateFactory.createTemplate(createReader("/templates/unfollowSone.html")); Template deleteSoneTemplate = templateFactory.createTemplate(createReader("/templates/deleteSone.html")); Template noPermissionTemplate = templateFactory.createTemplate(createReader("/templates/noPermission.html")); - Template wotPluginMissingTemplate = templateFactory.createTemplate(createReader("/templates/wotPluginMissing.html")); Template dismissNotificationTemplate = templateFactory.createTemplate(createReader("/templates/dismissNotification.html")); Template logoutTemplate = templateFactory.createTemplate(createReader("/templates/logout.html")); Template optionsTemplate = templateFactory.createTemplate(createReader("/templates/options.html")); @@ -300,7 +299,6 @@ public class WebInterface implements CoreListener { pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options")); pageToadlets.add(pageToadletFactory.createPageToadlet(new AboutPage(aboutTemplate, this, SonePlugin.VERSION), "About")); pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", this))); - pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("wotPluginMissing.html", wotPluginMissingTemplate, "Page.WotPluginMissing.Title", this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationPage(dismissNotificationTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("css/", "/static/css/", "text/css"))); pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("javascript/", "/static/javascript/", "text/javascript"))); diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties index b4353b1..546e774 100644 --- a/src/main/resources/i18n/sone.en.properties +++ b/src/main/resources/i18n/sone.en.properties @@ -144,8 +144,6 @@ Page.NoPermission.Text.NoPermission=You tried to do something that you do not ha Page.DismissNotification.Title=Dismiss Notification - Sone -Page.WotPluginMissing.Title=Web of Trust Plugin Missing - Sone -Page.WotPluginMissing.Page.Title=Web of Trust Plugin Missing Page.WotPluginMissing.Text.WotRequired=Because the Web of Trust is an integral part of Sone, the Web of Trust plugin has to be loaded in order to run Sone. Page.WotPluginMissing.Text.LoadPlugin=Please load the Web of Trust plugin in the {link}plugin manager{/link}. @@ -202,8 +200,6 @@ WebInterface.ClickToShow.Replies=Click here to show hidden replies. WebInterface.Notification.NewPostCount=You have new posts: WebInterface.Notification.NewReplyCount=You have new replies: -Warning.PluginNotConnected.Text=The Web of Trust plugin could not be found! This can happen if the Web of Trust plugin is not loaded or if your node is currently still starting up. In the first case, load the Web of Trust plugin using the {link}plugin manager{/link}, in the second case wait until the Web of Trust plugin has been loaded, because in either case Sone will not be working unless the Web of Trust plugin is loaded! - Notification.Startup.Text=Sone is currently starting up. It may take a while to retrieve all identities and Sones from the web of trust. If you are missing some elements, please be patient, they will probably reappear very soon. Notification.Button.Dismiss=Dismiss Notification.NewSone.Text=New Sones have been discovered: diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html index 41c7971..7b6cc28 100644 --- a/src/main/resources/templates/include/head.html +++ b/src/main/resources/templates/include/head.html @@ -189,12 +189,6 @@
- <%if !webInterface.core.identityManager.connected> -
- <%= Warning.PluginNotConnected.Text|l10n|html|replace needle="{link}" replacement=""|replace needle="{/link}" replacement=""> -
- <%/if> -