diff --git a/src/main/java/com/commafeed/backend/model/UserSettings.java b/src/main/java/com/commafeed/backend/model/UserSettings.java index d95715a8..8ff52e86 100644 --- a/src/main/java/com/commafeed/backend/model/UserSettings.java +++ b/src/main/java/com/commafeed/backend/model/UserSettings.java @@ -34,6 +34,8 @@ public class UserSettings extends AbstractModel { @Column(nullable = false) private ReadingOrder readingOrder; + private boolean showRead; + @Lob @Column(length = Integer.MAX_VALUE) private String customCss; @@ -70,4 +72,12 @@ public class UserSettings extends AbstractModel { this.readingOrder = readingOrder; } + public boolean isShowRead() { + return showRead; + } + + public void setShowRead(boolean showRead) { + this.showRead = showRead; + } + } diff --git a/src/main/java/com/commafeed/frontend/model/Settings.java b/src/main/java/com/commafeed/frontend/model/Settings.java index 2d072a21..be13e91e 100644 --- a/src/main/java/com/commafeed/frontend/model/Settings.java +++ b/src/main/java/com/commafeed/frontend/model/Settings.java @@ -7,6 +7,7 @@ public class Settings implements Serializable { private String readingMode; private String readingOrder; + private boolean showRead; private String customCss; public String getReadingMode() { @@ -33,4 +34,12 @@ public class Settings implements Serializable { this.readingOrder = readingOrder; } + public boolean isShowRead() { + return showRead; + } + + public void setShowRead(boolean showRead) { + this.showRead = showRead; + } + } diff --git a/src/main/java/com/commafeed/frontend/rest/resources/SettingsREST.java b/src/main/java/com/commafeed/frontend/rest/resources/SettingsREST.java index 6ddaaa6a..aa2a7931 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/SettingsREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/SettingsREST.java @@ -23,10 +23,12 @@ public class SettingsREST extends AbstractREST { if (settings != null) { s.setReadingMode(settings.getReadingMode().name()); s.setReadingOrder(settings.getReadingOrder().name()); + s.setShowRead(settings.isShowRead()); s.setCustomCss(settings.getCustomCss()); } else { s.setReadingMode(ReadingMode.unread.name()); s.setReadingOrder(ReadingOrder.desc.name()); + s.setShowRead(true); } return s; } @@ -43,6 +45,7 @@ public class SettingsREST extends AbstractREST { } s.setReadingMode(ReadingMode.valueOf(settings.getReadingMode())); s.setReadingOrder(ReadingOrder.valueOf(settings.getReadingOrder())); + s.setShowRead(settings.isShowRead()); s.setCustomCss(settings.getCustomCss()); userSettingsDAO.saveOrUpdate(s); return Response.ok(Status.OK).build(); diff --git a/src/main/webapp/directives/category.html b/src/main/webapp/directives/category.html index 656ab6ea..d42c044f 100644 --- a/src/main/webapp/directives/category.html +++ b/src/main/webapp/directives/category.html @@ -1,8 +1,8 @@
  • -
    +
    - +
    • @@ -22,7 +22,7 @@