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/07/16 17:10:41 UTC
[1/3] airavata-php-gateway git commit: fixing credential store ui
issues
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master 62e2abd17 -> 1646a3aa6
fixing credential store ui issues
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/923e5be2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/923e5be2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/923e5be2
Branch: refs/heads/master
Commit: 923e5be25a58ad45974c6557c898dd7630a4e432
Parents: 9c1af93
Author: scnakandala <su...@gmail.com>
Authored: Sat Jul 16 13:07:43 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Sat Jul 16 13:07:43 2016 -0400
----------------------------------------------------------------------
app/views/admin/manage-credentials.blade.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/923e5be2/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 8b686bf..daa6149 100644
--- a/app/views/admin/manage-credentials.blade.php
+++ b/app/views/admin/manage-credentials.blade.php
@@ -48,7 +48,7 @@
<th>Delete</th>
@endif
</tr>
- <tbody class="token-values">
+ <tbody class="token-values-ssh">
@foreach( $tokens as $token => $publicKey)
<tr>
<td class="">
@@ -59,7 +59,7 @@
</td>
@if( Session::has("admin"))
<td>
- <span data-token="{{$token}}" class="glyphicon glyphicon-trash remove=ssh-token"></span>
+ <span data-token="{{$token}}" class="glyphicon glyphicon-trash remove-ssh-token"></span>
</td>
@endif
</tr>
@@ -109,7 +109,7 @@
</td>
</tr>
</table>
- <div class="loading-img text-center hide">
+ <div class="loading-img-pwd text-center hide">
<img src="../../assets/ajax-loader.gif"/>
</div>
@endif
@@ -230,7 +230,7 @@
//$(".token-values").html("");
$(".generate-ssh").after("<div class='alert alert-success new-token-msg'>New Token has been generated.</div>");
- $(".token-values").prepend("<tr class='alert alert-success'><td>" + tokenJson.token + "</td><td class='public-key'>" + tokenJson.pubkey + "</td>" + "<td><a href=''><span data-token='"+tokenJson.token+"' class='glyphicon glyphicon-trash remove-token'></span></a></td></<tr>");
+ $(".token-values-ssh").prepend("<tr class='alert alert-success'><td>" + tokenJson.token + "</td><td class='public-key'>" + tokenJson.pubkey + "</td>" + "<td><a href=''><span data-token='"+tokenJson.token+"' class='glyphicon glyphicon-trash remove-token'></span></a></td></<tr>");
$(".loading-img").addClass("hide");
setInterval( function(){
@@ -292,7 +292,7 @@
tr.find( ".remove-token-confirmation").click( function(){
- $(".loading-img").removeClass("hide");
+ $(".loading-img-pwd").removeClass("hide");
$.ajax({
type: "POST",
data:{ "token" : tokenToRemove},
@@ -304,7 +304,7 @@
}).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(){
- $(".loading-img").addClass("hide");
+ $(".loading-img-pwd").addClass("hide");
});
});
[2/3] airavata-php-gateway git commit: fixing credentials issue
Posted by sc...@apache.org.
fixing credentials issue
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/b647db04
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b647db04
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b647db04
Branch: refs/heads/master
Commit: b647db04cc53a1f9e3dcf70a274829e5480b8f62
Parents: f9b2a58 923e5be
Author: scnakandala <su...@gmail.com>
Authored: Sat Jul 16 13:09:53 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Sat Jul 16 13:09:53 2016 -0400
----------------------------------------------------------------------
app/views/admin/manage-credentials.blade.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[3/3] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by sc...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
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/1646a3aa
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1646a3aa
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1646a3aa
Branch: refs/heads/master
Commit: 1646a3aa6dcc7e55fbc828468644749e293f55da
Parents: b647db0 62e2abd
Author: scnakandala <su...@gmail.com>
Authored: Sat Jul 16 13:10:32 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Sat Jul 16 13:10:32 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------