Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

google reader is no more :(

Browse Source
This commit is contained in:
Athou
2013-07-09 12:57:48 +02:00
parent 544eb2ee10
commit 308eaf8b8d
6 changed files with 5 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html
View File

@@ -22,13 +22,6 @@
<input type="email" wicket:id="email" class="input-block-level"></input>
</div>
</div>
<p class="help-block">
<label class="checkbox">
<input wicket:id="import" type="checkbox" />
Google Reader import
</label>
You'll be able to import later.
</p>
<div>
<input type="submit" class="btn btn-primary" value="Register" />
</div>

13
src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java
View File

@@ -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())));
}
}