http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/2d375c56/app/views/registration/registrationForm.scala.html ---------------------------------------------------------------------- diff --git a/app/views/registration/registrationForm.scala.html b/app/views/registration/registrationForm.scala.html deleted file mode 100644 index e0187c6..0000000 --- a/app/views/registration/registrationForm.scala.html +++ /dev/null @@ -1,48 +0,0 @@ -@(userForm: Form[NasaRegistration]) -@import helper._ -@import helper.twitterBootstrap._ -@main("Nasa User Registration Form"){ - - - - <div class="clearfix " id="name_field"> - - - <legend>Registration Form</legend> - @helper.form(action = routes.NasaRegistrationController.submit()){ - <fieldset> - @helper.inputText(userForm("userNameField"),'_label -> "User Name*") - @helper.inputPassword(userForm("passwordField"), '_label -> "Password*") - @helper.inputText(userForm("fNameField"), '_label -> "First Name*") - @helper.inputText(userForm("mNameField"), '_label -> "Middle Name") - @helper.inputText(userForm("lNameField"), '_label -> "Last Name") - - @textarea( - userForm("affliationField"), - '_label -> "Affliation", 'cols -> 50, 'rows -> 5 - ) - @helper.inputText(userForm("emailField"), '_label -> "Email") - @helper.inputText(userForm("rAreaField"), '_label -> "Research Area") - @textarea( - userForm("goalField"), - '_label -> "Goal", 'cols -> 50, 'rows -> 5 - ) - @helper.inputText(userForm("algoField"), '_label -> "Algo") - @textarea( - userForm("bConcernsField"), - '_label -> "Budget Concerns", 'cols -> 50, 'rows -> 5 - ) - - @select( - userForm("awsFamiliarityField"), - options = options(NasaAWSFamiliarity.list), - '_default -> "--- AWS Familiarity ---", - '_label -> "AWS Familarity", - '_error -> userForm("profile.country").error.map(_.withMessage("Please select your country")) - ) - <input type="submit" class="btn btn-primary" value="Register"> - <fieldset> - </div> -} -} -
http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/2d375c56/app/views/registration/submit.scala.html ---------------------------------------------------------------------- diff --git a/app/views/registration/submit.scala.html b/app/views/registration/submit.scala.html deleted file mode 100644 index 22f009b..0000000 --- a/app/views/registration/submit.scala.html +++ /dev/null @@ -1,5 +0,0 @@ -@(created: NasaRegistration) -@main("Example"){ - @created.firstName - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/2d375c56/app/views/registration/updateForm.scala.html ---------------------------------------------------------------------- diff --git a/app/views/registration/updateForm.scala.html b/app/views/registration/updateForm.scala.html deleted file mode 100644 index 1138428..0000000 --- a/app/views/registration/updateForm.scala.html +++ /dev/null @@ -1,48 +0,0 @@ -@(userForm: Form[NasaRegistration]) -@import helper._ -@import helper.twitterBootstrap._ -@main("Nasa Update Form"){ - - - - <div class="clearfix " id="name_field"> - - - <legend>User Update Form</legend> - @helper.form(action = routes.NasaRegistrationController.update()){ - <fieldset> - @helper.inputText(userForm("userNameField"),'_label -> "User Name*") - @helper.inputPassword(userForm("passwordField"), '_label -> "Password*") - @helper.inputText(userForm("fNameField"), '_label -> "First Name*") - @helper.inputText(userForm("mNameField"), '_label -> "Middle Name") - @helper.inputText(userForm("lNameField"), '_label -> "Last Name") - - @textarea( - userForm("affliationField"), - '_label -> "Affliation", 'cols -> 50, 'rows -> 5 - ) - @helper.inputText(userForm("emailField"), '_label -> "Email") - @helper.inputText(userForm("rAreaField"), '_label -> "Research Area") - @textarea( - userForm("goalField"), - '_label -> "Goal", 'cols -> 50, 'rows -> 5 - ) - @helper.inputText(userForm("algoField"), '_label -> "Algo") - @textarea( - userForm("bConcernsField"), - '_label -> "Budget Concerns", 'cols -> 50, 'rows -> 5 - ) - - @select( - userForm("awsFamiliarityField"), - options = options(NasaAWSFamiliarity.list), - '_default -> "--- AWS Familiarity ---", - '_label -> "AWS Familarity", - '_error -> userForm("profile.country").error.map(_.withMessage("Please select your country")) - ) - <input type="submit" class="btn btn-primary" value="Update"> - <fieldset> - </div> -} -} - http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/2d375c56/conf/routes ---------------------------------------------------------------------- diff --git a/conf/routes b/conf/routes index 5761ab6..027434f 100644 --- a/conf/routes +++ b/conf/routes @@ -39,33 +39,9 @@ GET /assets/*file controllers.Ass GET /aboutus controllers.AboutusController.aboutus() GET /aboutProject controllers.AboutusController.aboutProject() - -# Estimator recommendation -GET /estimator controllers.EstimateController.estimate(email ?= null, vfile ?= null, dataset ?= null) -GET /estimator/tutorial controllers.EstimateController.tutorial() -GET /estimator/login controllers.EstimateController.login() -POST /estimator/login controllers.EstimateController.authenticate() -GET /estimator/logout controllers.EstimateController.logout() -GET /estimator/accountSummary controllers.EstimateController.accountSummary(userName ?= null) - -# Estimator Registration -GET /scientist/register controllers.NasaRegistrationController.registrationForm() -POST /scientist/register/publish controllers.NasaRegistrationController.submit() -GET /scientist/updateUser controllers.NasaRegistrationController.updateForm() -POST /estimator/updateUser/update controllers.NasaRegistrationController.update() -GET /scientist/deleteUser controllers.NasaRegistrationController.deleteForm() -POST /scientist/deleteUser/delete controllers.NasaRegistrationController.delete() -GET /estimator/adminPage controllers.NasaRegistrationController.adminPage() -GET /scientist/allUsers controllers.NasaRegistrationController.getAllUsers() -GET /scientist/addUser controllers.NasaRegistrationController.addUser() -GET /scientist/addUserForm controllers.NasaRegistrationController.addUserForm() - # Climate Model GET /climate controllers.ClimateServiceController.home(email ?= null, vfile ?= null, dataset ?= null) GET /climate/tutorial controllers.ClimateServiceController.tutorial() -GET /climate/login controllers.ClimateServiceController.login() -POST /climate/login controllers.ClimateServiceController.authenticate() -GET /climate/logout controllers.ClimateServiceController.logout() GET /climate/accountSummary controllers.ClimateServiceController.accountSummary(userName ?= null) GET /climate/climateServices controllers.ClimateServiceController.climateServices() GET /climate/mostRecentlyAddedClimateServices controllers.ClimateServiceController.mostRecentlyAddedClimateServices()
