diff --git a/src/main/java/com/commafeed/backend/model/UserSettings.java b/src/main/java/com/commafeed/backend/model/UserSettings.java index ef7c711d..7f66d049 100644 --- a/src/main/java/com/commafeed/backend/model/UserSettings.java +++ b/src/main/java/com/commafeed/backend/model/UserSettings.java @@ -59,7 +59,6 @@ public class UserSettings extends AbstractModel { private boolean showRead; private boolean scrollMarks; - private boolean socialButtons; @Column(length = 32) private String theme; @@ -70,5 +69,16 @@ public class UserSettings extends AbstractModel { @Column(name = "scroll_speed") private int scrollSpeed; + + private boolean email; + private boolean gmail; + private boolean facebook; + private boolean twitter; + private boolean googleplus; + private boolean tumblr; + private boolean pocket; + private boolean instapaper; + private boolean buffer; + private boolean readability; } diff --git a/src/main/java/com/commafeed/frontend/model/Settings.java b/src/main/java/com/commafeed/frontend/model/Settings.java index 4ed6d5a7..615333d5 100644 --- a/src/main/java/com/commafeed/frontend/model/Settings.java +++ b/src/main/java/com/commafeed/frontend/model/Settings.java @@ -27,9 +27,6 @@ public class Settings implements Serializable { @ApiProperty(value = "user wants category and feeds with no unread entries shown", required = true) private boolean showRead; - @ApiProperty(value = "user wants social buttons (facebook, twitter, ...) shown", required = true) - private boolean socialButtons; - @ApiProperty(value = "In expanded view, scroll through entries mark them as read", required = true) private boolean scrollMarks; @@ -41,5 +38,16 @@ public class Settings implements Serializable { @ApiProperty(value = "user's preferred scroll speed when navigating between entries") private int scrollSpeed; + + private boolean email; + private boolean gmail; + private boolean facebook; + private boolean twitter; + private boolean googleplus; + private boolean tumblr; + private boolean pocket; + private boolean instapaper; + private boolean buffer; + private boolean readability; } diff --git a/src/main/java/com/commafeed/frontend/rest/resources/UserREST.java b/src/main/java/com/commafeed/frontend/rest/resources/UserREST.java index 05ebdb17..d790be9e 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/UserREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/UserREST.java @@ -74,7 +74,18 @@ public class UserREST extends AbstractREST { s.setReadingOrder(settings.getReadingOrder().name()); s.setViewMode(settings.getViewMode().name()); s.setShowRead(settings.isShowRead()); - s.setSocialButtons(settings.isSocialButtons()); + + s.setEmail(settings.isEmail()); + s.setGmail(settings.isGmail()); + s.setFacebook(settings.isFacebook()); + s.setTwitter(settings.isTwitter()); + s.setGoogleplus(settings.isGoogleplus()); + s.setTumblr(settings.isTumblr()); + s.setPocket(settings.isPocket()); + s.setInstapaper(settings.isInstapaper()); + s.setBuffer(settings.isBuffer()); + s.setReadability(settings.isReadability()); + s.setScrollMarks(settings.isScrollMarks()); s.setTheme(settings.getTheme()); s.setCustomCss(settings.getCustomCss()); @@ -86,7 +97,18 @@ public class UserREST extends AbstractREST { s.setViewMode(ViewMode.title.name()); s.setShowRead(true); s.setTheme("default"); - s.setSocialButtons(true); + + s.setEmail(true); + s.setGmail(true); + s.setFacebook(true); + s.setTwitter(true); + s.setGoogleplus(true); + s.setTumblr(true); + s.setPocket(true); + s.setInstapaper(true); + s.setBuffer(true); + s.setReadability(true); + s.setScrollMarks(true); s.setLanguage("en"); s.setScrollSpeed(400); @@ -116,9 +138,20 @@ public class UserREST extends AbstractREST { s.setScrollMarks(settings.isScrollMarks()); s.setTheme(settings.getTheme()); s.setCustomCss(settings.getCustomCss()); - s.setSocialButtons(settings.isSocialButtons()); s.setLanguage(settings.getLanguage()); s.setScrollSpeed(settings.getScrollSpeed()); + + s.setEmail(settings.isEmail()); + s.setGmail(settings.isGmail()); + s.setFacebook(settings.isFacebook()); + s.setTwitter(settings.isTwitter()); + s.setGoogleplus(settings.isGoogleplus()); + s.setTumblr(settings.isTumblr()); + s.setPocket(settings.isPocket()); + s.setInstapaper(settings.isInstapaper()); + s.setBuffer(settings.isBuffer()); + s.setReadability(settings.isReadability()); + userSettingsDAO.saveOrUpdate(s); return Response.ok().build(); diff --git a/src/main/resources/changelogs/db.changelog-1.5.xml b/src/main/resources/changelogs/db.changelog-1.5.xml new file mode 100644 index 00000000..acd23ce5 --- /dev/null +++ b/src/main/resources/changelogs/db.changelog-1.5.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/changelogs/db.changelog-master.xml b/src/main/resources/changelogs/db.changelog-master.xml index 79395852..ffa87ed6 100644 --- a/src/main/resources/changelogs/db.changelog-master.xml +++ b/src/main/resources/changelogs/db.changelog-master.xml @@ -8,5 +8,6 @@ + \ No newline at end of file diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html index 88654a2b..f13ebc7c 100644 --- a/src/main/webapp/templates/feeds.view.html +++ b/src/main/webapp/templates/feeds.view.html @@ -81,33 +81,36 @@ - diff --git a/src/main/webapp/templates/settings.html b/src/main/webapp/templates/settings.html index 9d087b45..14e47fac 100644 --- a/src/main/webapp/templates/settings.html +++ b/src/main/webapp/templates/settings.html @@ -34,18 +34,85 @@ ${settings.general.show_unread} -
- -
+
+

${settings.general.social_buttons}

+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+