You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/01/14 16:43:00 UTC
[04/50] [abbrv] airavata-php-gateway git commit: Warning Message to
enter correct email added for user creating account
Warning Message to enter correct email added for user creating account
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/3df20e8f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3df20e8f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3df20e8f
Branch: refs/heads/develop
Commit: 3df20e8fca7386709dad65f0657e6bfaeae19912
Parents: 8f85afc
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Dec 11 14:56:08 2015 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Dec 11 14:56:08 2015 -0500
----------------------------------------------------------------------
app/controllers/AdminController.php | 5 ++++-
app/views/account/create.blade.php | 6 +++++-
app/views/admin/manage-credentials.blade.php | 4 +---
3 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3df20e8f/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index dd08220..a674307 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -223,7 +223,10 @@ class AdminController extends BaseController {
public function removeSSH(){
$removeToken = Input::get("token");
- return AdminUtilities::remove_ssh_token( $removeToken);
+ if( AdminUtilities::remove_ssh_token( $removeToken) )
+ return 1;
+ else
+ return 0;
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3df20e8f/app/views/account/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/create.blade.php b/app/views/account/create.blade.php
index 6b03173..fe8def1 100644
--- a/app/views/account/create.blade.php
+++ b/app/views/account/create.blade.php
@@ -51,7 +51,8 @@
<div class="form-group required"><label class="control-label">E-mail</label>
<div><input class="form-control" id="email" name="email" placeholder="email@example.com"
- required="required" title="" type="email" value="{{Input::old('email') }}"/></div>
+ required="required" title="" type="email" value="{{Input::old('email') }}"
+ data-toggle="popover" data-placement="left" data-content="Please make sure that you enter a correct email address as a verification mail will be sent to this addresss."/></div>
</div>
<div class="form-group required"><label class="control-label">First Name</label>
@@ -129,5 +130,8 @@
$("#password").popover({
'trigger':'focus'
});
+ $("#email").popover({
+ 'trigger':'focus'
+ });
</script>
@stop
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3df20e8f/app/views/admin/manage-credentials.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-credentials.blade.php b/app/views/admin/manage-credentials.blade.php
index 6b0b476..14708c4 100644
--- a/app/views/admin/manage-credentials.blade.php
+++ b/app/views/admin/manage-credentials.blade.php
@@ -220,9 +220,7 @@
}).success( function( data){
if( data.responseText == 1)
tr.addClass("alert").addClass("alert-danger");
- setTimeout( function(){
- tr.slideUp(1000);
- }, 2000);
+ tr.fadeOut(1000);
}).fail( function( data){
tr.after("<tr class='alert alert-danger'><td></td><td>Error occurred : " + $.parseJSON( data.responseText).error.message + "</td><td></td></tr>");
}).complete( function(){