diff --git a/src/main/java/com/commafeed/backend/model/ApplicationSettings.java b/src/main/java/com/commafeed/backend/model/ApplicationSettings.java index a04b33df..01f45dff 100644 --- a/src/main/java/com/commafeed/backend/model/ApplicationSettings.java +++ b/src/main/java/com/commafeed/backend/model/ApplicationSettings.java @@ -33,6 +33,8 @@ public class ApplicationSettings extends AbstractModel { private String smtpUserName; private String smtpPassword; + private boolean feedbackButton = true; + @Column(length = 255) private String announcement; @@ -133,4 +135,12 @@ public class ApplicationSettings extends AbstractModel { this.announcement = announcement; } + public boolean isFeedbackButton() { + return feedbackButton; + } + + public void setFeedbackButton(boolean feedbackButton) { + this.feedbackButton = feedbackButton; + } + } diff --git a/src/main/java/com/commafeed/frontend/pages/BasePage.html b/src/main/java/com/commafeed/frontend/pages/BasePage.html index 7529eebb..4a6aa1a9 100644 --- a/src/main/java/com/commafeed/frontend/pages/BasePage.html +++ b/src/main/java/com/commafeed/frontend/pages/BasePage.html @@ -8,5 +8,24 @@ + + + + diff --git a/src/main/java/com/commafeed/frontend/pages/BasePage.java b/src/main/java/com/commafeed/frontend/pages/BasePage.java index c005b12b..3c75208e 100644 --- a/src/main/java/com/commafeed/frontend/pages/BasePage.java +++ b/src/main/java/com/commafeed/frontend/pages/BasePage.java @@ -10,6 +10,7 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.filter.HeaderResponseContainer; +import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import com.commafeed.backend.dao.FeedCategoryDAO; @@ -55,8 +56,18 @@ public abstract class BasePage extends WebPage { @Inject ApplicationSettingsService applicationSettingsService; + private ApplicationSettings settings; + public BasePage() { + settings = applicationSettingsService.get(); add(new HeaderResponseContainer("footer-container", "footer-container")); + add(new WebMarkupContainer("uservoice") { + @Override + protected void onConfigure() { + super.onConfigure(); + setVisibilityAllowed(settings.isFeedbackButton()); + } + }); } @Override @@ -78,11 +89,11 @@ public abstract class BasePage extends WebPage { response.render(CssHeaderItem.forUrl("css/app.css")); } - final ApplicationSettings settings = applicationSettingsService.get(); if (StringUtils.isNotBlank(settings.getGoogleAnalyticsTrackingCode())) { Map vars = Maps.newHashMap(); vars.put("trackingCode", settings.getGoogleAnalyticsTrackingCode()); WicketUtils.loadJS(response, BasePage.class, "analytics", vars); } + } } diff --git a/src/main/webapp/templates/admin.settings.html b/src/main/webapp/templates/admin.settings.html index ceb6a689..de3bef69 100644 --- a/src/main/webapp/templates/admin.settings.html +++ b/src/main/webapp/templates/admin.settings.html @@ -25,6 +25,13 @@ name="allowRegistrations" ng-model="settings.allowRegistrations" /> +
+ +
+ +
+