airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata-php-gateway git commit: Nipurn's changes
Date Fri, 09 Sep 2016 19:52:24 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop ea8cc3011 -> 7b69b1459


Nipurn's changes


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/7b69b145
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7b69b145
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7b69b145

Branch: refs/heads/develop
Commit: 7b69b14596ce0a0f1991535299aeea1476157f0c
Parents: ea8cc30
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Fri Sep 9 15:52:19 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Fri Sep 9 15:52:19 2016 -0400

----------------------------------------------------------------------
 app/views/account/dashboard.blade.php    | 11 ++++++++---
 app/views/admin/manage-gateway.blade.php |  7 ++++---
 2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7b69b145/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
index 65b3bff..8200219 100644
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@ -120,11 +120,11 @@
                         </div>
                         <div class="form-group required">
                             <label class="control-label">Project Details</label>
-                            <textarea type="text" name="project-details" id="project-details"
class="form-control" required="required"  data-container="body" data-toggle="popover" data-placement="left"
data-content="This information will help us to understand and identify your gateway requirements,
such as local or remote resources, user management, field of science and communities supported,
applications and interfaces, license handling, allocation management, data management, etc...
It will help us in serving you and providing you with the best option for you and your research
community.">{{Input::old('project-details') }}</textarea>
+                            <textarea type="text" name="project-details" maxlength="250"
id="project-details" class="form-control" required="required"  data-container="body" data-toggle="popover"
data-placement="left" data-content="This information will help us to understand and identify
your gateway requirements, such as local or remote resources, user management, field of science
and communities supported, applications and interfaces, license handling, allocation management,
data management, etc... It will help us in serving you and providing you with the best option
for you and your research community.">{{Input::old('project-details') }}</textarea>
                         </div>
                         <div class="form-group required">
                             <label class="control-label">Public Project Description</label>
-                            <textarea type="text" name="public-project-description" id="public-project-description"
class="form-control" required="required"  data-container="body" data-toggle="popover" data-placement="left"
data-content="This description will be used to describe the gateway in the Science Gateways
List. It help a user decide whether or not this gateway will be useful to them.">{{Input::old('public-project-description')
}}</textarea>
+                            <textarea type="text" name="public-project-description" maxlength="250"
id="public-project-description" class="form-control" required="required"  data-container="body"
data-toggle="popover" data-placement="left" data-content="This description will be used to
describe the gateway in the Science Gateways List. It help a user decide whether or not this
gateway will be useful to them.">{{Input::old('public-project-description') }}</textarea>
                         </div>
                         <input type="submit" value="Send Request" class="btn btn-primary"/>
                         <input type="reset" value="Reset" class="btn">
@@ -151,10 +151,14 @@
                     </thead>
                     <tbody>
                         <tr>
-                            <td>Gateway Id</td>
+                            <td>Gateway Name</td>
                             <td class="gateway-id"></td>
                         </tr>
                         <tr>
+                            <td>Gateway URL</td>
+                            <td class="gateway-url"></td>
+                        </tr>
+                        <tr>
                             <td>Admin Username</td>
                             <td class="admin-username"></td>
                         </tr>
@@ -468,6 +472,7 @@
         $(".admin-username").html( gatewayObject["identityServerUserName"]);
         $(".admin-password").html( gatewayObject["identityServerPasswordToken"]);
         $(".gateway-id").html( gatewayObject["gatewayId"]);
+        $(".gateway-url").html( gatewayObject["gatewayURL"]);
         $(".oauth-client-key").html( gatewayObject["oauthClientId"]);
         $(".oauth-client-secret").html( gatewayObject["oauthClientSecret"]);
         $("#viewCredentials").modal("show");

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7b69b145/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 7801a43..dde9497 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -209,7 +209,7 @@
             <form action="{{URL::to('/')}}/admin/update-gateway-request" id="update-gateway-request"
method="GET">
             
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                    <button type="button" class="close update-gateway-request-close-modal"
data-dismiss="modal" aria-label="Close"><span
                                 aria-hidden="true">&times;</span></button>
                     <h3>Approve Gateway Request</h3>
                 </div>
@@ -584,7 +584,7 @@
         $(".declinedReason").html( gatewayObject.declinedReason);
         $(".gatewayApprovalStatus").val(gatewayApprovalStatuses[ gatewayObject.gatewayApprovalStatus]);
         $(".onTenantComplete").addClass("hide");
-        editableInputs( $("#approve-gateway"), true);
+        editableInputs( $("#update-gateway-request"), true);
 
         if( gatewayApprovalStatuses[ gatewayObject.gatewayApprovalStatus] == "REQUESTED"){
             $(".createdGateway").addClass("hide");
@@ -594,7 +594,8 @@
             gatewayApprovalStatuses[ gatewayObject.gatewayApprovalStatus] == "DENIED" ||
             gatewayApprovalStatuses[ gatewayObject.gatewayApprovalStatus] == "DEACTIVATED"){
             
-            editableInputs( $("#approve-gateway"), false);
+            editableInputs( $("#update-gateway-request"), false);
+            $(".update-gateway-request-close-modal").removeAttr("disabled");
         }
         else
         {


Mime
View raw message