Return-Path: <commits-return-14127-archive-asf-public=cust-asf.ponee.io@airavata.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 27005200B62
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri, 29 Jul 2016 06:57:40 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 2591B160A94; Fri, 29 Jul 2016 04:57:40 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 4363B160A85
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 29 Jul 2016 06:57:39 +0200 (CEST)
Received: (qmail 28590 invoked by uid 500); 29 Jul 2016 04:57:38 -0000
Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@airavata.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@airavata.apache.org>
List-Post: <mailto:commits@airavata.apache.org>
List-Id: <commits.airavata.apache.org>
Reply-To: dev@airavata.apache.org
Delivered-To: mailing list commits@airavata.apache.org
Received: (qmail 28580 invoked by uid 99); 29 Jul 2016 04:57:38 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jul 2016 04:57:38 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 3F3E8E0100; Fri, 29 Jul 2016 04:57:38 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ndoshi@apache.org
To: commits@airavata.apache.org
Message-Id: <824cf164ec29419e9227d68707c3e498@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: airavata-php-gateway git commit: Super Admin UI Changes for Gateways
 UI
Date: Fri, 29 Jul 2016 04:57:38 +0000 (UTC)
archived-at: Fri, 29 Jul 2016 04:57:40 -0000

Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop 349ccc6bb -> a0327d644


Super Admin UI Changes for Gateways UI


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

Branch: refs/heads/develop
Commit: a0327d644e42cbbaf8b0d0752a853ed883f4d980
Parents: 349ccc6
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Thu Jul 28 21:57:03 2016 -0700
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Thu Jul 28 21:57:03 2016 -0700

----------------------------------------------------------------------
 app/views/admin/manage-gateway.blade.php | 160 ++++++++++++++++----------
 1 file changed, 97 insertions(+), 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a0327d64/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 348c9e6..9216d13 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -35,78 +35,112 @@
             {{ Session::forget("message") }}
             @endif
         </div>
+
+        <div class="col-md-12">
+            <ul class="nav nav-tabs nav-justified" id="tabs" role="tablist">
+                <li class="active"><a href="#tab-currentGateway" data-toggle="tab">Gateway - {{ Session::get("gateway_id") }}</a></li>
+                @if( Session::has('super-admin'))
+                    <li><a href="#tab-allGateways" data-toggle="tab">Approved Gateways</a></li>
+                    <li><a href="#tab-requestedGateways" data-toggle="tab">Gateway Requests</a></li>
+                @endif
+            </ul>
+        </div>
         <div class="container-fluid">
-            <div class="panel-group" id="accordion2">
-                <h3>Edit your Gateway Profile</h3>
-                @foreach( $gateways as $indexGP => $gp )
-                    @if( $gp->gatewayId == Session::get("gateway_id"))
-                        @include('partials/gateway-preferences-block', array("gp" => $gp, "accName" => "accordion2") )
-                    @endif
-                @endforeach
-            </div>
 
-            @if( Session::has('super-admin'))
-            <div class="row">
-                <div class="col-md-6">
-                    <h3>Check all Gateway Profiles</h3>
+            <div class="tab-content col-md-12">
+
+                <div class="tab-pane active" id="tab-currentGateway">
+
+                    <div class="panel-group" id="accordion2">
+                        <h3>Edit your Gateway Profile</h3>
+                        @foreach( $gateways as $indexGP => $gp )
+                            @if( $gp->gatewayId == Session::get("gateway_id"))
+                                @include('partials/gateway-preferences-block', array("gp" => $gp, "accName" => "accordion2") )
+                            @endif
+                        @endforeach
+                    </div>
                 </div>
-                <div class="col-md-6" style="margin-top:2%">
-                    <input type="text" class="col-md-12 filterinput" placeholder="Search by Gateway Name"/>
+
+                @if( Session::has('super-admin'))
+
+                <div class="tab-pane" id="tab-requestedGateways">
+
+                    <div class="row">
+                        <form id="add-tenant-form" action="{{ URL::to("/") }}/admin/add-gateway">
+                            <div class="col-md-12">
+                                <button type="button" class="btn btn-default toggle-add-tenant"><span
+                                        class="glyphicon glyphicon-plus"></span>Add a new gateway
+                                </button>
+                            </div>
+                            @include('partials/add-gateway-block')
+                        </form>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <h3>Gateway Requests</h3>
+                            <table class="table table-striped table-bordered">
+                                <thead>
+                                    <tr>
+                                        <th>Gateway Name</th>
+                                        <th>Admin Name</th>
+                                        <th>Gateway URL</th>
+                                        <th>Project Details</th>
+                                        <th>Project Abstract</th>
+                                        <th>Actions</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                @foreach( $gateways as $indexGP => $gp )
+                                    <tr>
+                                        <td>{{$gp->gatewayName }}</td>
+                                        <td>{{ $gp->gatewayAdminFirstName }} {{ $gp->gatewayAdminLastName }} </td>
+                                        <td>{{ $gp->gatewayURL }}</td>
+                                        <td>{{ $gp->reviewProposalDescription}}</td>
+                                        <td>{{ $gp->gatewayPublicAbstract}}</td>
+                                        @if( $gp->gatewayApprovalStatus == 0)
+                                            <td>
+                                                <a href="{{URL::to('/')}}/admin/update-gateway-request?gateway_id={{$gp->gatewayId}}&status=1"><input type="button" class="btn btn-primary" value="Approve"/></a>
+                                                <br/><br/>
+                                                <form action="{{URL::to('/')}}/admin/update-gateway-request?gateway_id={{$gp->gatewayId}}&status=3" method="POST">
+                                                    <textarea style="width:100%; height:80px" width="100%" name="declineReason" placeholder="Reason for Decline"></textarea>
+                                                    <br/>
+                                                    <input type="submit" class="btn btn-danger" value="Deny"/>
+                                                </form>
+                                            </td>
+                                        @elseif( $gp->gatewayApprovalStatus == 1)
+                                            <td>Approved</td>
+                                        @endif
+                                    </tr>
+                                @endforeach
+                                <!-- foreach code ends -->
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
                 </div>
-                <form id="add-tenant-form" action="{{ URL::to("/") }}/admin/add-gateway">
-                    <div class="col-md-12">
-                        <button type="button" class="btn btn-default toggle-add-tenant"><span
-                                class="glyphicon glyphicon-plus"></span>Add a new gateway
-                        </button>
+
+                <div class="tab-pane" id="tab-allGateways">
+
+
+                    <div class="row">
+                        <div class="col-md-6">
+                            <h3>Check all Gateway Profiles</h3>
+                        </div>
+                        <div class="col-md-6" style="margin-top:2%">
+                            <input type="text" class="col-md-12 filterinput" placeholder="Search by Gateway Name"/>
+                        </div>
                     </div>
-                    @include('partials/add-gateway-block')
-                </form>
-            </div>
-            <div class="row">
-                <div class="col-md-12">
-                    <h3>Gateway Requests</h3>
-                    <table class="table table-striped table-bordered">
-                        <thead>
-                            <tr>
-                                <th>Gateway Name</th>
-                                <th>Admin Name</th>
-                                <th>Gateway URL</th>
-                                <th>Project Details</th>
-                                <th>Project Abstract</th>
-                                <th>Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
+
+                    <div class="panel-group super-admin-gateways-view" id="accordion1">
                         @foreach( $gateways as $indexGP => $gp )
-                            <tr>
-                                <td>{{$gp->gatewayName }}</td>
-                                <td>{{ $gp->gatewayAdminFirstName }} {{ $gp->gatewayAdminLastName }} </td>
-                                <td>{{ $gp->gatewayURL }}</td>
-                                <td>{{ $gp->reviewProposalDescription}}</td>
-                                <td>{{ $gp->gatewayPublicAbstract}}</td>
-                                @if( $gp->gatewayApprovalStatus == 0)
-                                    <td>
-                                        <a href="{{URL::to('/')}}/admin/update-gateway-request?gateway_id={{$gp->gatewayId}}&status=1"><input type="button" class="btn btn-primary" value="Approve"/></a>
-                                        <a href="{{URL::to('/')}}/admin/update-gateway-request?gateway_id={{$gp->gatewayId}}&status=3"><input type="button" class="btn btn-danger" value="Deny"/></a>
-                                    </td>
-                                @elseif( $gp->gatewayApprovalStatus == 1)
-                                    <td>Approved</td>
-                                @endif
-                            </tr>
+                            @include('partials/gateway-preferences-block', array("gp" => $gp, "accName" => "accordion1"))
                         @endforeach
-                        <!-- foreach code ends -->
-                        </tbody>
-                    </table>
+                    </div>
                 </div>
-            </div>
 
-            <div class="panel-group super-admin-gateways-view" id="accordion1">
-                <h3>Approved Gateways</h3>
-                @foreach( $gateways as $indexGP => $gp )
-                    @include('partials/gateway-preferences-block', array("gp" => $gp, "accName" => "accordion1"))
-                @endforeach
+                @endif
             </div>
-            @endif
+            <!-- ends tabs -->
 
         </div>
         <!-- /.container-fluid -->
@@ -238,7 +272,7 @@
 <script>
     //make first tab of accordion open by default.
     //temporary fix
-    $("#accordion2 #accordion2-collapse-gateway-0").addClass("in");
+    $("#accordion2 .accordion-toggle").first().addClass("in").removeClass("collapsed");
 
     $(".credential-store-token-change > form").submit( function(e){
         $(this).prepend( "<img id='loading-gif' src='{{URL::to('/')}}/assets/ajax-loader.gif'/>");