diff --git a/src/main/java/com/commafeed/frontend/CommaFeedApplication.java b/src/main/java/com/commafeed/frontend/CommaFeedApplication.java index 0221dde6..f9760ffb 100644 --- a/src/main/java/com/commafeed/frontend/CommaFeedApplication.java +++ b/src/main/java/com/commafeed/frontend/CommaFeedApplication.java @@ -75,9 +75,9 @@ public class CommaFeedApplication extends AuthenticatedWebApplication { mountPage("logout", LogoutPage.class); mountPage("error", DisplayExceptionPage.class); - mountPage("google/import/redirect", GoogleImportRedirectPage.class); - mountPage(GoogleImportCallbackPage.PAGE_PATH, - GoogleImportCallbackPage.class); +// mountPage("google/import/redirect", GoogleImportRedirectPage.class); +// mountPage(GoogleImportCallbackPage.PAGE_PATH, +// GoogleImportCallbackPage.class); mountPage("next", NextUnreadRedirectPage.class); diff --git a/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java b/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java index 3562ae4b..494501ec 100644 --- a/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java +++ b/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java @@ -22,9 +22,6 @@ public class RegistrationRequest implements Serializable { @ApiProperty(value = "email address for password recovery", required = true) private String email; - @ApiProperty(value = "not used through the api", required = false) - private boolean googleImport = true; - public String getName() { return name; } @@ -48,13 +45,4 @@ public class RegistrationRequest implements Serializable { public void setEmail(String email) { this.email = email; } - - public boolean isGoogleImport() { - return googleImport; - } - - public void setGoogleImport(boolean googleImport) { - this.googleImport = googleImport; - } - } diff --git a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html index f15433fd..de60c3d6 100644 --- a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html +++ b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html @@ -22,13 +22,6 @@ -

- - You'll be able to import later. -

diff --git a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java index ff0195f5..d0e414e9 100644 --- a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java +++ b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java @@ -7,7 +7,6 @@ import javax.inject.Inject; import org.apache.wicket.authentication.IAuthenticationStrategy; import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator; import org.apache.wicket.feedback.ContainerFeedbackMessageFilter; -import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.html.form.RequiredTextField; @@ -27,7 +26,6 @@ import com.commafeed.backend.services.ApplicationSettingsService; import com.commafeed.backend.services.UserService; import com.commafeed.frontend.CommaFeedSession; import com.commafeed.frontend.model.request.RegistrationRequest; -import com.commafeed.frontend.pages.GoogleImportRedirectPage; import com.commafeed.frontend.utils.ModelFactory.MF; @SuppressWarnings("serial") @@ -61,15 +59,8 @@ public class RegisterPanel extends Panel { strategy.save(req.getName(), req.getPassword()); CommaFeedSession.get().signIn(req.getName(), req.getPassword()); - - if (req.isGoogleImport()) { - setResponsePage(GoogleImportRedirectPage.class); - } else { - setResponsePage(getApplication().getHomePage()); - } - } else { - setResponsePage(getApplication().getHomePage()); } + setResponsePage(getApplication().getHomePage()); } }; add(form); @@ -111,7 +102,5 @@ public class RegisterPanel extends Panel { } } })); - form.add(new CheckBox("import", MF.m(model, p.isGoogleImport()))); - } } diff --git a/src/main/resources/i18n/en.properties b/src/main/resources/i18n/en.properties index 78d95960..64e03e50 100644 --- a/src/main/resources/i18n/en.properties +++ b/src/main/resources/i18n/en.properties @@ -21,7 +21,7 @@ import.google_reader_prefix=Let me import your feeds from your import.google_reader_suffix= account. import.google_download=Alternatively, upload your subscriptions.xml file. import.google_download_link=Download it from here. -import.xml_file=XML File +import.xml_file=OPML File new_category.name=Name new_category.parent=Parent diff --git a/src/main/webapp/templates/_subscribe.html b/src/main/webapp/templates/_subscribe.html index b4674501..20491288 100644 --- a/src/main/webapp/templates/_subscribe.html +++ b/src/main/webapp/templates/_subscribe.html @@ -63,15 +63,6 @@