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 2015/06/05 00:15:46 UTC

[06/10] airavata-php-gateway git commit: Cleaning and restructuring PGA

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/account/forgot-password.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/forgot-password.blade.php b/app/views/account/forgot-password.blade.php
index b9c8274..4806b6f 100644
--- a/app/views/account/forgot-password.blade.php
+++ b/app/views/account/forgot-password.blade.php
@@ -1,18 +1,19 @@
 @extends('layout.basic')
 
 @section('page-header')
-    @parent
+@parent
 @stop
 
 @section('content')
 
 <div class="col-md-offset-3 col-md-6">
 
-<h3> Did you forget the password to your account? </h3>
-<h4> Please enter your email id, you registered with.</h4>
-<div class="form-group form-horizontal">
-	<div class="col-md-8"><input type="email" value="" class="form-control" placeholder="email"/></div>
-	<div class="col-md-2"><input type="submit" class="form-control btn btn-primary"value="Submit"/></div>
-</div>
+    <h3> Did you forget the password to your account? </h3>
+    <h4> Please enter your email id, you registered with.</h4>
 
-@stop
\ No newline at end of file
+    <div class="form-group form-horizontal">
+        <div class="col-md-8"><input type="email" value="" class="form-control" placeholder="email"/></div>
+        <div class="col-md-2"><input type="submit" class="form-control btn btn-primary" value="Submit"/></div>
+    </div>
+
+    @stop
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/account/login.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/login.blade.php b/app/views/account/login.blade.php
index 0e13cd0..2d6d58e 100755
--- a/app/views/account/login.blade.php
+++ b/app/views/account/login.blade.php
@@ -1,44 +1,43 @@
 @extends('layout.basic')
 
 @section('page-header')
-    @parent
+@parent
 @stop
 
 @section('content')
 
-    <div class="col-md-offset-4 col-md-4">
-
-        <h3>
-            Login
-            <small>
-                <small> (Not registered? <a href="create">Create account</a>)</small>
-            </small>
-        </h3>
-
-        
-
-        <form action="login" method="post" role="form">
-            @if( Session::has("invalid-credentials") )
-                {{ Utilities::print_error_message('Invalid username or password. Please try again.') }}
-            @endif
-            <?php
-            Session::forget( "invalid-credentials");
-            ?>
-
-            <div class="form-group">
-                <label class="sr-only" for="username">Username</label>
-                <input type="text" class="form-control" name="username" placeholder="Username" autofocus required>
-            </div>
-            <div class="form-group">
-                <label class="sr-only" for="password">Password</label>
-                <input type="password" class="form-control" name="password" placeholder="Password" required>
-            </div>
-            <input name="Submit" type="submit" class="btn btn-primary btn-block" value="Sign in">
-        </form>
-
-            <small>
-                <small> (Forgot Password? Click <a href="{{URL::to('/') }}/forgot-password">here</a>)</small>
-            </small>
-    </div>
+<div class="col-md-offset-4 col-md-4">
+
+    <h3>
+        Login
+        <small>
+            <small> (Not registered? <a href="create">Create account</a>)</small>
+        </small>
+    </h3>
+
+
+    <form action="login" method="post" role="form">
+        @if( Session::has("invalid-credentials") )
+        {{ Utilities::print_error_message('Invalid username or password. Please try again.') }}
+        @endif
+        <?php
+        Session::forget("invalid-credentials");
+        ?>
+
+        <div class="form-group">
+            <label class="sr-only" for="username">Username</label>
+            <input type="text" class="form-control" name="username" placeholder="Username" autofocus required>
+        </div>
+        <div class="form-group">
+            <label class="sr-only" for="password">Password</label>
+            <input type="password" class="form-control" name="password" placeholder="Password" required>
+        </div>
+        <input name="Submit" type="submit" class="btn btn-primary btn-block" value="Sign in">
+    </form>
+
+    <small>
+        <small> (Forgot Password? Click <a href="{{URL::to('/') }}/forgot-password">here</a>)</small>
+    </small>
+</div>
 
 @stop
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/admin/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/dashboard.blade.php b/app/views/admin/dashboard.blade.php
index 0fd2ffc..77b57e0 100644
--- a/app/views/admin/dashboard.blade.php
+++ b/app/views/admin/dashboard.blade.php
@@ -1,20 +1,21 @@
 @extends('layout.basic')
 
 @section('page-header')
-    @parent
+@parent
 @stop
 
 @section('content')
 <div class="container">
     <div class="col-md-12">
         @if( Session::has("message"))
-            <div class="row">
-                <div class="alert alert-success alert-dismissible" role="alert">
-                    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                    {{ Session::get("message") }}
-                </div>
+        <div class="row">
+            <div class="alert alert-success alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span></button>
+                {{ Session::get("message") }}
             </div>
-            {{ Session::forget("message") }}
+        </div>
+        {{ Session::forget("message") }}
         @endif
 
         <div class="row text-center">
@@ -22,56 +23,56 @@
         </div>
         <div class="row text-center admin-options">
 
-        <div class="row">
-            <a href="{{URL::to('/')}}/manage/users">
-                <div class="col-md-3 well">
-                    <div class="col-md-12">
-                        <span class="glyphicon glyphicon-user"></span>
-                    </div>
-                    <div class="col-md-12">
-                        Users
+            <div class="row">
+                <a href="{{URL::to('/')}}/manage/users">
+                    <div class="col-md-3 well">
+                        <div class="col-md-12">
+                            <span class="glyphicon glyphicon-user"></span>
+                        </div>
+                        <div class="col-md-12">
+                            Users
+                        </div>
                     </div>
-                </div>
-            </a>
+                </a>
 
-            <a href="{{URL::to('/')}}/admin/dashboard">
-                <div class=" col-md-offset-1 col-md-3 well">
-                    <div class="col-md-12">
-                        <span class="glyphicon glyphicon-eye-open"></span>
+                <a href="{{URL::to('/')}}/admin/dashboard">
+                    <div class=" col-md-offset-1 col-md-3 well">
+                        <div class="col-md-12">
+                            <span class="glyphicon glyphicon-eye-open"></span>
+                        </div>
+                        <div class="col-md-12">
+                            Admins
+                        </div>
                     </div>
-                    <div class="col-md-12">
-                        Admins
+                </a>
+
+                <a href="{{URL::to('/')}}/cr/browse">
+                    <div class=" col-md-offset-1 col-md-3 well">
+                        <div class="col-md-12">
+                            <span class="glyphicon glyphicon-briefcase"></span>
+                        </div>
+                        <div class="col-md-12">
+                            Resources
+                        </div>
                     </div>
-                </div>
-            </a>
+                </a>
+            </div>
 
-            <a href="{{URL::to('/')}}/cr/browse">
-                <div class=" col-md-offset-1 col-md-3 well">
+            <div class="row">
+                <div class="col-md-3 well">
                     <div class="col-md-12">
-                        <span class="glyphicon glyphicon-briefcase"></span>
+                        <span class="glyphicon glyphicon-tasks"></span>
                     </div>
                     <div class="col-md-12">
-                        Resources
+                        Application Catalog
                     </div>
+                    <select onchange="location = this.options[this.selectedIndex].value;">
+                        <option>-- Select --</option>
+                        <option value="{{URL::to('/')}}/app/interface">Interface</option>
+                        <option value="{{URL::to('/')}}/app/module">Module</option>
+                        <option value="{{URL::to('/')}}/app/deployment">Deployment</option>
+                    </select>
                 </div>
-            </a>
-        </div>
-
-        <div class="row">
-            <div class="col-md-3 well">
-                <div class="col-md-12">
-                    <span class="glyphicon glyphicon-tasks"></span>
-                </div>
-                <div class="col-md-12">
-                    Application Catalog
-                </div>
-                <select  onchange="location = this.options[this.selectedIndex].value;">
-                    <option>-- Select --</option>
-                    <option value="{{URL::to('/')}}/app/interface">Interface</option>
-                    <option value="{{URL::to('/')}}/app/module">Module</option>
-                    <option value="{{URL::to('/')}}/app/deployment">Deployment</option>
-                </select>
-            </div>
 
                 <div class=" col-md-offset-1 col-md-3 well">
                     <div class="col-md-12">
@@ -80,7 +81,7 @@
                     <div class="col-md-12">
                         Gateways
                     </div>
-                    <select  onchange="location = this.options[this.selectedIndex].value;">
+                    <select onchange="location = this.options[this.selectedIndex].value;">
                         <option>-- Select --</option>
                         <option value="{{URL::to('/')}}/gp/create">Create</option>
                         <option value="{{URL::to('/')}}/gp/browse">Browse</option>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/admin/manage-admin.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-admin.blade.php b/app/views/admin/manage-admin.blade.php
index 05e317a..8477391 100644
--- a/app/views/admin/manage-admin.blade.php
+++ b/app/views/admin/manage-admin.blade.php
@@ -1,171 +1,196 @@
 @extends('layout.basic')
 
 @section('page-header')
-    @parent
+@parent
 @stop
 
 @section('content')
 <div class="container">
     <div class="col-md-12">
         @if( Session::has("message"))
-            <div class="row">
-                <div class="alert alert-success alert-dismissible" role="alert">
-                    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                    {{ Session::get("message") }}
-                </div>
+        <div class="row">
+            <div class="alert alert-success alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span></button>
+                {{ Session::get("message") }}
             </div>
-            {{ Session::forget("message") }}
+        </div>
+        {{ Session::forget("message") }}
         @endif
         <div class="panel-group" id="accordion">
 
-        <!-- Super Admin Users have access to Scigap Administration -->
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
-                  Scigap Administration
-                </a>
-              </h4>
-            </div>
-            <div id="collapseOne" class="panel-collapse collapse in">
-                <div class="panel-body">
-                    <h1>Add a User to Admin</h1>
-                    <form action="{{URL::to('/')}}/admin/adduser" method="POST" role="form" enctype="multipart/form-data">
-
-                        <div class="form-group required">
-                            <label for="experiment-name" class="control-label">Enter Username</label>
-                            <input type="text" class="form-control" name="username" id="experiment-name" placeholder="username" autofocus required="required">
-                        </div>
-                        <div class="btn-toolbar">
-                            <input name="add" type="submit" class="btn btn-primary" value="Add User">
-                        </div>   
-                    </form>
+            <!-- Super Admin Users have access to Scigap Administration -->
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4 class="panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                            Scigap Administration
+                        </a>
+                    </h4>
                 </div>
-            </div>
-          </div>
-        <!-- Scigap Administration Ends -->
-
-        <!-- Gateway Administration can be accessed by Super Admins and Gateway Admins can access their particular gateway -->
-        <div class="panel panel-default">
-            <div class="panel-heading">
-              <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
-                    Gateways Administration
-                </a>
-              </h4>
-            </div>
-            <div id="collapseThree" class="panel-collapse collapse">
-                <div class="panel-body">
-                    <div class="row">
+                <div id="collapseOne" class="panel-collapse collapse in">
+                    <div class="panel-body">
+                        <h1>Add a User to Admin</h1>
 
-                        <div class="col-md-6">
-                            <h3>Existing Gateway Resource Profiles :</h3>
-                        </div>
-                        <div class="col-md-6" style="margin-top:3.5%">
-                            <input type="text" class="col-md-12 filterinput" placeholder="Search by Gateway Name" />
-                        </div>
+                        <form action="{{URL::to('/')}}/admin/adduser" method="POST" role="form"
+                              enctype="multipart/form-data">
+
+                            <div class="form-group required">
+                                <label for="experiment-name" class="control-label">Enter Username</label>
+                                <input type="text" class="form-control" name="username" id="experiment-name"
+                                       placeholder="username" autofocus required="required">
+                            </div>
+                            <div class="btn-toolbar">
+                                <input name="add" type="submit" class="btn btn-primary" value="Add User">
+                            </div>
+                        </form>
                     </div>
-                    <div class="panel-group" id="accordion2">
-                    @foreach( $gatewayProfiles as $indexGP => $gp )
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <h4 class="panel-title">
-                                    <a class="accordion-toggle collapsed gateway-name" data-toggle="collapse" data-parent="#accordion2" href="#collapse-gateway-{{$indexGP}}">
-                                    {{ $gp->gatewayName }}
-                                    </a>
-                                    <div class="pull-right col-md-2 gateway-options fade">
-                                        <span class="glyphicon glyphicon-pencil edit-gateway" style="cursor:pointer;" data-toggle="modal" data-target="#edit-gateway-block" data-gp-id="{{ $gp->gatewayID }}" data-gp-name="{{ $gp->gatewayName }}" data-gp-desc="{{ $gp->gatewayDescription }}"></span>
-                                        <span class="glyphicon glyphicon-trash delete-gateway" style="cursor:pointer;" data-toggle="modal" data-target="#delete-gateway-block" data-gp-name="{{$gp->gatewayName}}" data-gp-id="{{ $gp->gatewayID }}"></span>
-                                    </div>
-                                </h4>
+                </div>
+            </div>
+            <!-- Scigap Administration Ends -->
+
+            <!-- Gateway Administration can be accessed by Super Admins and Gateway Admins can access their particular gateway -->
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4 class="panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
+                            Gateways Administration
+                        </a>
+                    </h4>
+                </div>
+                <div id="collapseThree" class="panel-collapse collapse">
+                    <div class="panel-body">
+                        <div class="row">
+
+                            <div class="col-md-6">
+                                <h3>Existing Gateway Resource Profiles :</h3>
                             </div>
-                            <div id="collapse-gateway-{{$indexGP}}" class="panel-collapse collapse">
-                                <div class="panel-body">
-                                    <div class="app-interface-block">
-                                        <h5>{{ $gp->gatewayDescription}}</h5>
-                                        <hr/>
-                                        <div class="row">
-                                            <div class="col-md-10">
-                                                <h4><span class="glyphicon glyphicon-plus"></span> Add a user as Admin to this Gateway</h4>
-                                                <form action="{{URL::to('/')}}/admin/addgatewayadmin" method="POST" role="form" enctype="multipart/form-data">
-                                                    <div class="form-group required">
-                                                        <label for="experiment-name" class="control-label">Enter Username</label>
-                                                        <input type="text" class="form-control" name="username" id="experiment-name" placeholder="username" autofocus required="required">
-                                                        <input type="hidden" name="gateway_name" value="{{ $gp->gatewayName }}"/>
-                                                    </div>
-                                                    <div class="btn-toolbar">
-                                                        <input name="add" type="submit" class="btn btn-primary" value="Add Admin"/>
-                                                    </div>   
-                                                </form>
+                            <div class="col-md-6" style="margin-top:3.5%">
+                                <input type="text" class="col-md-12 filterinput" placeholder="Search by Gateway Name"/>
+                            </div>
+                        </div>
+                        <div class="panel-group" id="accordion2">
+                            @foreach( $gatewayProfiles as $indexGP => $gp )
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <h4 class="panel-title">
+                                        <a class="accordion-toggle collapsed gateway-name" data-toggle="collapse"
+                                           data-parent="#accordion2" href="#collapse-gateway-{{$indexGP}}">
+                                            {{ $gp->gatewayName }}
+                                        </a>
+
+                                        <div class="pull-right col-md-2 gateway-options fade">
+                                            <span class="glyphicon glyphicon-pencil edit-gateway"
+                                                  style="cursor:pointer;" data-toggle="modal"
+                                                  data-target="#edit-gateway-block" data-gp-id="{{ $gp->gatewayID }}"
+                                                  data-gp-name="{{ $gp->gatewayName }}"
+                                                  data-gp-desc="{{ $gp->gatewayDescription }}"></span>
+                                            <span class="glyphicon glyphicon-trash delete-gateway"
+                                                  style="cursor:pointer;" data-toggle="modal"
+                                                  data-target="#delete-gateway-block"
+                                                  data-gp-name="{{$gp->gatewayName}}"
+                                                  data-gp-id="{{ $gp->gatewayID }}"></span>
+                                        </div>
+                                    </h4>
+                                </div>
+                                <div id="collapse-gateway-{{$indexGP}}" class="panel-collapse collapse">
+                                    <div class="panel-body">
+                                        <div class="app-interface-block">
+                                            <h5>{{ $gp->gatewayDescription}}</h5>
+                                            <hr/>
+                                            <div class="row">
+                                                <div class="col-md-10">
+                                                    <h4><span class="glyphicon glyphicon-plus"></span> Add a user as
+                                                        Admin to this Gateway</h4>
+
+                                                    <form action="{{URL::to('/')}}/admin/addgatewayadmin" method="POST"
+                                                          role="form" enctype="multipart/form-data">
+                                                        <div class="form-group required">
+                                                            <label for="experiment-name" class="control-label">Enter
+                                                                Username</label>
+                                                            <input type="text" class="form-control" name="username"
+                                                                   id="experiment-name" placeholder="username" autofocus
+                                                                   required="required">
+                                                            <input type="hidden" name="gateway_name"
+                                                                   value="{{ $gp->gatewayName }}"/>
+                                                        </div>
+                                                        <div class="btn-toolbar">
+                                                            <input name="add" type="submit" class="btn btn-primary"
+                                                                   value="Add Admin"/>
+                                                        </div>
+                                                    </form>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
+                            @endforeach
                         </div>
-                    @endforeach
                     </div>
                 </div>
             </div>
-          </div>
-
-        <!-- Super Admin Users have access to Role Administration -->
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
-                  Role Adminstration
-                </a>
-              </h4>
-            </div>
-            <div id="collapseTwo" class="panel-collapse collapse">
-                <div class="panel-body">
-                    <h1>Existing Roles</h1>
-                    <table class="table table-condensed">
-                    @foreach( $roles as $role)
-                        <tr>
-                            <td>{{ $role }}</td>
-                            @if( $role != "admin")
+
+            <!-- Super Admin Users have access to Role Administration -->
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4 class="panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
+                            Role Adminstration
+                        </a>
+                    </h4>
+                </div>
+                <div id="collapseTwo" class="panel-collapse collapse">
+                    <div class="panel-body">
+                        <h1>Existing Roles</h1>
+                        <table class="table table-condensed">
+                            @foreach( $roles as $role)
+                            <tr>
+                                <td>{{ $role }}</td>
+                                @if( $role != "admin")
                                 <td><a href=""><span class="glyphicon glyphicon-pencil"></span></a></td>
                                 <td><span class="glyphicon glyphicon-remove"></span></td>
-                            @endif
-                        </tr>
-                    @endforeach
-                    </table>
-                    <h1>Add a new Role</h1>
-                    <form id="role-form" action="{{URL::to('/')}}/admin/addrole" method="POST" role="form" enctype="multipart/form-data">
-                        <div class="form-group form-horizontal required col-md-2">
-                            <label for="experiment-name" class="control-label">Enter Role</label>
-                        </div>
-                        <div class="form-group form-horizontal required col-md-4">
-                            <input type="text" class="form-control input-small role-name" name="role" placeholder="username" autofocus required="required">
-                        </div>
-                        <div class="form-group form-horizontal col-md-4">
-                            <input name="add" type="submit" class="btn btn-primary add-role" value="Add">
-                        </div>   
-                    </form>
-                    <input type="hidden" id="roles" value="{{ htmlentities( json_encode( $roles) ) }}"/>
+                                @endif
+                            </tr>
+                            @endforeach
+                        </table>
+                        <h1>Add a new Role</h1>
+
+                        <form id="role-form" action="{{URL::to('/')}}/admin/addrole" method="POST" role="form"
+                              enctype="multipart/form-data">
+                            <div class="form-group form-horizontal required col-md-2">
+                                <label for="experiment-name" class="control-label">Enter Role</label>
+                            </div>
+                            <div class="form-group form-horizontal required col-md-4">
+                                <input type="text" class="form-control input-small role-name" name="role"
+                                       placeholder="username" autofocus required="required">
+                            </div>
+                            <div class="form-group form-horizontal col-md-4">
+                                <input name="add" type="submit" class="btn btn-primary add-role" value="Add">
+                            </div>
+                        </form>
+                        <input type="hidden" id="roles" value="{{ htmlentities( json_encode( $roles) ) }}"/>
+                    </div>
                 </div>
             </div>
-          </div>
-          <!-- Role Administration complete -->
-
-          <!-- Admins will have access to their settings -->
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
-                    Settings
-                </a>
-              </h4>
-            </div>
-            <div id="collapseThree" class="panel-collapse collapse">
-                <div class="panel-body">
-                    some settngs should come here.
+            <!-- Role Administration complete -->
+
+            <!-- Admins will have access to their settings -->
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4 class="panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
+                            Settings
+                        </a>
+                    </h4>
+                </div>
+                <div id="collapseThree" class="panel-collapse collapse">
+                    <div class="panel-body">
+                        some settngs should come here.
+                    </div>
                 </div>
             </div>
-          </div>
-          <!--Settings complete -->
+            <!--Settings complete -->
 
         </div>
     </div>
@@ -175,22 +200,20 @@
 
 
 @section('scripts')
-    @parent
-    <script>
+@parent
+<script>
     // Checking if role already exists.
-    $(".add-role").click( function( e){
+    $(".add-role").click(function (e) {
         e.preventDefault();
-        var roles = $.parseJSON( $("#roles").val() );
-        if( $.inArray( $.trim( $(".role-name").val() ), roles ) != -1 )
-        {
-            console.log( $(this).parent().find(".alert").length );
-            if( ! $(this).parent().parent().find(".alert").length )
-            {
+        var roles = $.parseJSON($("#roles").val());
+        if ($.inArray($.trim($(".role-name").val()), roles) != -1) {
+            console.log($(this).parent().find(".alert").length);
+            if (!$(this).parent().parent().find(".alert").length) {
                 $(this).parent().after("<div class='col-md-12 alert alert-danger'>This role already exists. Please pick another role.</span>");
             }
         }
         else
             $("#role-form").submit();
     });
-    </script>
+</script>
 @stop
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/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 2183739..cebd634 100644
--- a/app/views/admin/manage-credentials.blade.php
+++ b/app/views/admin/manage-credentials.blade.php
@@ -1,164 +1,170 @@
 @extends('layout.basic')
 
 @section('page-header')
-    @parent
-    {{ HTML::style('css/admin.css')}}
+@parent
+{{ HTML::style('css/admin.css')}}
 @stop
 
 @section('content')
 
-    <div id="wrapper">
-        <!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens -->
-        @include( 'partials/dashboard-block')
-        <div id="page-wrapper">
-
-            <div class="container-fluid">
-                <div class="col-md-12">
-                    @if( Session::has("message"))
-                        <div class="row">
-                            <div class="alert alert-success alert-dismissible" role="alert">
-                                <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                                {{ Session::get("message") }}
-                            </div>
-                        </div>
-                        {{ Session::forget("message") }}
-                    @endif
-
-                    <h1 class="text-center">SSH Keys</h1>
-
-                    <table class="table table-bordered table-condensed">
-                        <tr>
-                            <th class="text-center">
-                                Token</th>
-                            <th class="text-center">Public Key</th>
-                        </tr>
-                        @foreach( $tokens as $token)
-                        <tr>
-                            <td class="role-name">{{ $token }}</td>
-                            <td>
-                                {{ $public-key }}
-                            </td>
-                        </tr>
-                        @endforeach
-                        <tr>
-                            <td>Some token</td>
-                            <td>$ cat ~/.ssh/id_rsa.pub
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAklOUpkDHrfHY17SbrmTIpNLTGK9Tjom/BWDSU
-GPl+nafzlHDTYW7hdI4yZ5ew18JH4JW9jbhUFrviQzM7xlELEVf4h9lFX5QVkbPppSwg0cda3
-Pbv7kOdJ/MTyBlWXFCR+HAo3FXRitBqxiX1nKhXpHAZsMciLq8V6RjsNAQwdsdMFvSlVK/7XA
-t3FaoJoAsncM1Q9x5+3V0Ww68/eIFmb1zuUFljQJKprrX88XypNDvjYNby6vw/Pb0rwert/En
-mZ+AW4OZPnTPI89ZPmVMLuayrD2cE86Z/il8b+gw3r3+1nKatmIkjn2so1d01QraTlMqVSsbx
-NrRFi9wrf+M7Q== schacon@mylaptop.local</td>
-                        </tr>
-                    </table>
-                    <table class="table">
-                        <tr class="text-center table-condensed">
-                            <td><button class="btn btn-default">Generate a new token</button></td>
-                        </tr>
-                    </table>
-
-                    <div class="row">
-                        <h1 class="text-center">My Proxy Credentials</h1>
-
-                        <div class="col-md-offset-3 col-md-6">
-                            <table class="table table-striped table-condensed">
-                                <tr>
-                                    <td>My Proxy Server</td>
-                                    <td><input type="text" class="form-control" placeholder="" value=""/></td>
-                                </tr>
-                                <tr>
-                                    <td>Username</td>
-                                    <td><input type="text" class="form-control" placeholder="" value=""/></td>
-                                </tr>
-                                <tr>
-                                    <td>Passphrase</td>
-                                    <td><input type="text" class="form-control" placeholder="" value=""/></td>
-                                </tr>
-                            </table>
-                            <table class="table">
-                                <tr class="text-center table-condensed">
-                                    <td><button class="btn btn-default">Submit</button></td>
-                                </tr>
-                            </table>
-                        </div>
+<div id="wrapper">
+    <!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens -->
+    @include( 'partials/dashboard-block')
+    <div id="page-wrapper">
+
+        <div class="container-fluid">
+            <div class="col-md-12">
+                @if( Session::has("message"))
+                <div class="row">
+                    <div class="alert alert-success alert-dismissible" role="alert">
+                        <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span
+                                class="sr-only">Close</span></button>
+                        {{ Session::get("message") }}
                     </div>
+                </div>
+                {{ Session::forget("message") }}
+                @endif
+
+                <h1 class="text-center">SSH Keys</h1>
+
+                <table class="table table-bordered table-condensed">
+                    <tr>
+                        <th class="text-center">
+                            Token
+                        </th>
+                        <th class="text-center">Public Key</th>
+                    </tr>
+                    @foreach( $tokens as $token)
+                    <tr>
+                        <td class="role-name">{{ $token }}</td>
+                        <td>
+                            {{ $public-key }}
+                        </td>
+                    </tr>
+                    @endforeach
+                    <tr>
+                        <td>Some token</td>
+                        <td>$ cat ~/.ssh/id_rsa.pub
+                            ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAklOUpkDHrfHY17SbrmTIpNLTGK9Tjom/BWDSU
+                            GPl+nafzlHDTYW7hdI4yZ5ew18JH4JW9jbhUFrviQzM7xlELEVf4h9lFX5QVkbPppSwg0cda3
+                            Pbv7kOdJ/MTyBlWXFCR+HAo3FXRitBqxiX1nKhXpHAZsMciLq8V6RjsNAQwdsdMFvSlVK/7XA
+                            t3FaoJoAsncM1Q9x5+3V0Ww68/eIFmb1zuUFljQJKprrX88XypNDvjYNby6vw/Pb0rwert/En
+                            mZ+AW4OZPnTPI89ZPmVMLuayrD2cE86Z/il8b+gw3r3+1nKatmIkjn2so1d01QraTlMqVSsbx
+                            NrRFi9wrf+M7Q== schacon@mylaptop.local
+                        </td>
+                    </tr>
+                </table>
+                <table class="table">
+                    <tr class="text-center table-condensed">
+                        <td>
+                            <button class="btn btn-default">Generate a new token</button>
+                        </td>
+                    </tr>
+                </table>
+
+                <div class="row">
+                    <h1 class="text-center">My Proxy Credentials</h1>
+
+                    <div class="col-md-offset-3 col-md-6">
+                        <table class="table table-striped table-condensed">
+                            <tr>
+                                <td>My Proxy Server</td>
+                                <td><input type="text" class="form-control" placeholder="" value=""/></td>
+                            </tr>
+                            <tr>
+                                <td>Username</td>
+                                <td><input type="text" class="form-control" placeholder="" value=""/></td>
+                            </tr>
+                            <tr>
+                                <td>Passphrase</td>
+                                <td><input type="text" class="form-control" placeholder="" value=""/></td>
+                            </tr>
+                        </table>
+                        <table class="table">
+                            <tr class="text-center table-condensed">
+                                <td>
+                                    <button class="btn btn-default">Submit</button>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
 
-                    <h1 class="text-center">Amazon Credentials</h1>
+                <h1 class="text-center">Amazon Credentials</h1>
 
-                    <table class="table table-striped table-condensed">
-                        <tr class="text-center">
-                            <td>Under Development</td>
-                        </tr>
-                    </table>
+                <table class="table table-striped table-condensed">
+                    <tr class="text-center">
+                        <td>Under Development</td>
+                    </tr>
+                </table>
 
-                    <h1 class="text-center">OAuth MyProxy</h1>
+                <h1 class="text-center">OAuth MyProxy</h1>
 
-                    <table class="table table-striped table-condensed">
-                        <tr class="text-center">
-                            <td>Under Development</td>
-                        </tr>
-                    </table>
-                </div>
+                <table class="table table-striped table-condensed">
+                    <tr class="text-center">
+                        <td>Under Development</td>
+                    </tr>
+                </table>
             </div>
         </div>
     </div>
+</div>
 
-    <div class="modal fade" id="delete-role-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true">
-        <div class="modal-dialog">
+<div class="modal fade" id="delete-role-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+     aria-hidden="true">
+    <div class="modal-dialog">
 
-            <form action="{{URL::to('/')}}/admin/deleterole" method="POST">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h3 class="text-center">Delete Role Confirmation</h3>
-                    </div>
-                    <div class="modal-body">
-                        <input type="hidden" class="form-control delete-roleName" name="role"/>
-                        Do you really want to delete the role - <span class="delete-role-name"></span>
-                    </div>
-                    <div class="modal-footer">
-                        <div class="form-group">
-                            <input type="submit" class="btn btn-danger" value="Delete"/>
-                            <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/>
-                        </div>
+        <form action="{{URL::to('/')}}/admin/deleterole" method="POST">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h3 class="text-center">Delete Role Confirmation</h3>
+                </div>
+                <div class="modal-body">
+                    <input type="hidden" class="form-control delete-roleName" name="role"/>
+                    Do you really want to delete the role - <span class="delete-role-name"></span>
+                </div>
+                <div class="modal-footer">
+                    <div class="form-group">
+                        <input type="submit" class="btn btn-danger" value="Delete"/>
+                        <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
                     </div>
                 </div>
+            </div>
 
-            </form>
+        </form>
 
 
-        </div>
     </div>
+</div>
 
 
 @stop
 
 @section('scripts')
-    @parent
-    <script>
-        $(".toggle-add-role").click( function(){
-            $(".add-role").slideDown();
-        });
-
-        $(".edit-role-name").click( function(){
-            var roleNameSpace = $(this).parent().parent().find(".role-name");
-            if( roleNameSpace.find(".edit-role-form").length )
-            {
-                roleNameSpace.html( roleNameSpace.find(".original-role-name").val() );
-            }
-            else
-            {
-                var role = roleNameSpace.html();
-                roleNameSpace.html( $(".edit-role").html() );
-                roleNameSpace.find(".original-role-name").val( role );
-                roleNameSpace.find(".new-role-name").val( role );
-            }
-        });
-
-        $(".delete-role").click( function(){
-            $("#delete-role-block").modal("show");
-            var roleName = $(this).parent().parent().find(".role-name").html();
-            $(".delete-role-name").html(roleName);
-            $(".delete-roleName").val(roleName);
-        })
-    </script>
+@parent
+<script>
+    $(".toggle-add-role").click(function () {
+        $(".add-role").slideDown();
+    });
+
+    $(".edit-role-name").click(function () {
+        var roleNameSpace = $(this).parent().parent().find(".role-name");
+        if (roleNameSpace.find(".edit-role-form").length) {
+            roleNameSpace.html(roleNameSpace.find(".original-role-name").val());
+        }
+        else {
+            var role = roleNameSpace.html();
+            roleNameSpace.html($(".edit-role").html());
+            roleNameSpace.find(".original-role-name").val(role);
+            roleNameSpace.find(".new-role-name").val(role);
+        }
+    });
+
+    $(".delete-role").click(function () {
+        $("#delete-role-block").modal("show");
+        var roleName = $(this).parent().parent().find(".role-name").html();
+        $(".delete-role-name").html(roleName);
+        $(".delete-roleName").val(roleName);
+    })
+</script>
 @stop
\ No newline at end of file