You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/10/13 19:20:15 UTC
[1/3] airavata-php-gateway git commit: AIRAVATA-2155 fix.
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 625420405 -> 926d55ac1
AIRAVATA-2155 fix.
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/44df8499
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/44df8499
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/44df8499
Branch: refs/heads/develop
Commit: 44df849993c299d974db1540d14efd29b1a1ba24
Parents: f421e1e
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Thu Oct 13 11:54:07 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Thu Oct 13 11:54:07 2016 -0700
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/44df8499/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 9c5a33d..26b7ef8 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -594,8 +594,12 @@
editableInputs( $("#update-gateway-request"), true);
if( gatewayApprovalStatuses[ gatewayObject.gatewayApprovalStatus] == "REQUESTED"){
- //$(".createdGateway").addClass("hide");
- //$(".notCreatedGateway").removeClass("hide");
+ $(".createdGateway").each( function( i, thisButton){
+ if( $(thisButton).val() == "deactivateGateway"){
+ $(thisButton).addClass("hide");
+ }
+ });
+ $(".notCreatedGateway").removeClass("hide");
}
else if( gatewayApprovalStatuses[ gatewayObject.gatewayApprovalStatus] == "CANCELLED" ||
gatewayApprovalStatuses[ gatewayObject.gatewayApprovalStatus] == "DENIED" ||
[2/3] airavata-php-gateway git commit: Stopping gateway requests
table from stretching too much
Posted by nd...@apache.org.
Stopping gateway requests table from stretching too much
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/f312af83
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f312af83
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f312af83
Branch: refs/heads/develop
Commit: f312af836b668734512a2f42912611219896bb97
Parents: 44df849
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Thu Oct 13 12:18:42 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Thu Oct 13 12:18:42 2016 -0700
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f312af83/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 26b7ef8..1883fa2 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -74,7 +74,7 @@
</form>
</div>
<div class="row">
- <div class="col-md-12">
+ <div class="col-md-12 table-responsive">
<h3>Gateway Requests</h3>
<table class="table table-striped table-bordered">
<thead>
@@ -115,7 +115,7 @@
<td>{{ $creationTime}}</td>
<td>{{ $gp->gatewayAdminFirstName }} {{ $gp->gatewayAdminLastName }} </td>
<td>{{ $gp->gatewayURL }}</td>
- <td>{{ $gp->reviewProposalDescription}}</td>
+ <td style="max-width: 400px; word-wrap: break-word;">{{ $gp->reviewProposalDescription}}</td>
<td>{{ $gp->gatewayPublicAbstract}}</td>
<td>{{$gatewayApprovalStatuses[$gp->gatewayApprovalStatus] }}</td>
<td>
[3/3] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by nd...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
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/926d55ac
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/926d55ac
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/926d55ac
Branch: refs/heads/develop
Commit: 926d55ac1f0a563bc818cd36499bcfc46d6a324e
Parents: f312af8 6254204
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Thu Oct 13 12:19:36 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Thu Oct 13 12:19:36 2016 -0700
----------------------------------------------------------------------
app/controllers/ProjectController.php | 2 +-
app/libraries/Airavata/API/Airavata.php | 287 +++++++++++++++++++++++++++
app/libraries/CRUtilities.php | 1 +
app/routes.php | 2 +-
app/views/admin/manage-roles.blade.php | 10 +-
app/views/project/browse.blade.php | 7 +-
app/views/project/no-summary.blade.php | 119 -----------
app/views/project/summary.blade.php | 119 +++++++++++
8 files changed, 415 insertions(+), 132 deletions(-)
----------------------------------------------------------------------