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: fixing AIRAVATA-1776, AIRAVATA-1774
Date Wed, 15 Jul 2015 21:34:38 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/0.15-release-branch 0535c0378 -> 81bff876c


fixing AIRAVATA-1776, AIRAVATA-1774


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

Branch: refs/heads/0.15-release-branch
Commit: 81bff876c38214ac132e61b844032a03b86ac82d
Parents: 0535c03
Author: Supun Nakandala <scnakandala@apache.org>
Authored: Thu Jul 16 03:04:12 2015 +0530
Committer: Supun Nakandala <scnakandala@apache.org>
Committed: Thu Jul 16 03:04:12 2015 +0530

----------------------------------------------------------------------
 app/controllers/AdminController.php          | 12 +++--
 app/controllers/ApplicationController.php    |  4 +-
 app/controllers/ComputeResource.php          |  7 ++-
 app/libraries/CommonUtilities.php            | 30 +++++------
 app/views/application/deployment.blade.php   | 12 +++--
 app/views/application/interface.blade.php    | 12 +++--
 app/views/application/module.blade.php       | 11 +++-
 app/views/partials/dashboard-block.blade.php | 57 +++++++++++++++-----
 app/views/resource/browse.blade.php          | 66 +++++++++++++++++++++--
 app/views/resource/create-step3.blade.php    | 33 ------------
 app/views/resource/create.blade.php          | 12 ++++-
 app/views/resource/edit.blade.php            | 12 ++++-
 app/views/resource/view.blade.php            | 12 +++--
 13 files changed, 195 insertions(+), 85 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 641f3a5..d40b7a4 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -24,9 +24,10 @@ class AdminController extends BaseController {
 														"crData" => $crData);
 		if( Session::has("scigap_admin"))
 			$view = "scigap-admin/manage-gateway";
-		else
+		else{
 			$view = "admin/manage-gateway";
-
+            Session::put("admin-nav", "gateway-prefs");
+        }
 			return View::make( $view, $gatewayData);
 	}
 
@@ -49,7 +50,7 @@ class AdminController extends BaseController {
 	    	$users =  WSIS::listUsers();
 	    
 	    $roles = WSIS::getAllRoles();
-
+        Session::put("admin-nav", "manage-users");
 	    return View::make("admin/manage-users", array("users" => $users, "roles" => $roles));
 
 	}
@@ -70,10 +71,12 @@ class AdminController extends BaseController {
 	public function rolesView(){
 
 		$roles = WSIS::getAllRoles();
-		return View::make("admin/manage-roles", array("roles" => $roles));
+        Session::put("admin-nav", "manage-roles");
+        return View::make("admin/manage-roles", array("roles" => $roles));
 	}
 
 	public function experimentsView(){
+        Session::put("admin-nav", "exp-statistics");
 		return View::make("admin/manage-experiments" );
 	}
 
@@ -127,6 +130,7 @@ class AdminController extends BaseController {
 	}
 
 	public function credentialStoreView(){
+        Session::put("admin-nav", "credential-store");
 		return View::make("admin/manage-credentials", array("tokens" => array()) );
 	}
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/controllers/ApplicationController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ApplicationController.php b/app/controllers/ApplicationController.php
index 82a1317..756a8a0 100644
--- a/app/controllers/ApplicationController.php
+++ b/app/controllers/ApplicationController.php
@@ -12,6 +12,7 @@ class ApplicationController extends BaseController {
 	{
 		$data = array();
 		$data["modules"] = AppUtilities::getAllModules();
+        Session::put("admin-nav", "app-module");
 		return View::make('application/module', $data);
 	}
 
@@ -51,6 +52,7 @@ class ApplicationController extends BaseController {
 		$data = array();
 		$data = AppUtilities::getAppInterfaceData();
 		//var_dump( $data["appInterfaces"][14] ); exit;
+        Session::put("admin-nav", "app-interface");
 		return View::make("application/interface", $data);
 	}
 
@@ -97,7 +99,7 @@ class ApplicationController extends BaseController {
 		$data = array();
 		$data = AppUtilities::getAppDeploymentData();
 		//var_dump( $data); exit;
-
+        Session::put("admin-nav", "app-deployment");
 		return View::make("application/deployment", $data);
 	}
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/controllers/ComputeResource.php
----------------------------------------------------------------------
diff --git a/app/controllers/ComputeResource.php b/app/controllers/ComputeResource.php
index c21bddb..5a246ce 100755
--- a/app/controllers/ComputeResource.php
+++ b/app/controllers/ComputeResource.php
@@ -16,6 +16,7 @@ class ComputeResource extends BaseController
 
     public function createView()
     {
+        Session::put("admin-nav", "cr-create");
         return View::make("resource/create");
     }
 
@@ -235,18 +236,20 @@ class ComputeResource extends BaseController
 
     public function browseView()
     {
-        $data = CRUtilities::getBrowseCRData(true);
+        $data = CRUtilities::getBrowseCRData(false);
         $allCRs = $data["crObjects"];
         $appDeployments = $data["appDeployments"];
 
         $connectedDeployments = array();
-        foreach ((array)$allCRs as $crId => $crName) {
+        foreach ((array)$allCRs as $resource) {
+            $crId = $resource->computeResourceId;
             $connectedDeployments[$crId] = 0;
             foreach ((array)$appDeployments as $deploymentObject) {
                 if ($crId == $deploymentObject->computeHostId)
                     $connectedDeployments[$crId]++;
             }
         }
+        Session::put("admin-nav", "cr-browse");
         return View::make("resource/browse", array(
             "allCRs" => $allCRs,
             "connectedDeployments" => $connectedDeployments

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index b66b1b4..c67d2b4 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -114,19 +114,19 @@ class CommonUtilities
                 )
             );
 
-            if (Session::has("admin")) {
-                $menus['Compute Resource'] = array
-                (
-                    array('label' => 'Register', 'url' => URL::to('/') . '/cr/create',
"nav-active" => "compute-resource"),
-                    array('label' => 'Browse', 'url' => URL::to('/') . '/cr/browse',
"nav-active" => "compute-resource")
-                );
-                $menus['App Catalog'] = array
-                (
-                    array('label' => 'Module', 'url' => URL::to('/') . '/app/module',
"nav-active" => "app-catalog"),
-                    array('label' => 'Interface', 'url' => URL::to('/') . '/app/interface',
"nav-active" => "app-catalog"),
-                    array('label' => 'Deployment', 'url' => URL::to('/') . '/app/deployment',
"nav-active" => "app-catalog")
-                );
-            }
+//            if (Session::has("admin")) {
+//                $menus['Compute Resource'] = array
+//                (
+//                    array('label' => 'Register', 'url' => URL::to('/') . '/cr/create',
"nav-active" => "compute-resource"),
+//                    array('label' => 'Browse', 'url' => URL::to('/') . '/cr/browse',
"nav-active" => "compute-resource")
+//                );
+//                $menus['App Catalog'] = array
+//                (
+//                    array('label' => 'Module', 'url' => URL::to('/') . '/app/module',
"nav-active" => "app-catalog"),
+//                    array('label' => 'Interface', 'url' => URL::to('/') . '/app/interface',
"nav-active" => "app-catalog"),
+//                    array('label' => 'Deployment', 'url' => URL::to('/') . '/app/deployment',
"nav-active" => "app-catalog")
+//                );
+//            }
 
             $menus['Help'] = array
             (
@@ -191,11 +191,11 @@ class CommonUtilities
                     $active = " active ";
             }
             if (Session::has("admin"))
-                echo '<li><a href="' . URL::to("/") . '/admin/dashboard"><span
class="glyphicon glyphicon-user"></span>Admin Dashboard</a></li>';
+                echo '<li class="' . $active . '"><a href="' . URL::to("/") . '/admin/dashboard"><span
class="glyphicon glyphicon-user"></span>Admin Dashboard</a></li>';
 //            else
 //                echo '<li><a href="' . URL::to("/") . '/user/profile"><span
class="glyphicon glyphicon-user"></span> Profile</a></li>';
 
-            echo '<li class="dropdown ' . $active . '">
+            echo '<li class="dropdown">
 
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">' . Session::get("username")
. ' <span class="caret"></span></a>';
             echo '<ul class="dropdown-menu" role="menu">';

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/views/application/deployment.blade.php
----------------------------------------------------------------------
diff --git a/app/views/application/deployment.blade.php b/app/views/application/deployment.blade.php
index d33ff9f..6bf237c 100644
--- a/app/views/application/deployment.blade.php
+++ b/app/views/application/deployment.blade.php
@@ -2,12 +2,17 @@
 
 @section('page-header')
 @parent
-{{ HTML::style('css/style.css') }}
+{{ HTML::style('css/admin.css')}}
+{{ HTML::style('css/datetimepicker.css')}}
 @stop
 
 @section('content')
 
-<div class="container">
+<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-offset-2 col-md-8">
 
         <div class="row">
@@ -184,7 +189,8 @@
     </div>
 
 </div>
-
+</div>
+</div>
 @stop
 
 @section('scripts')

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/views/application/interface.blade.php
----------------------------------------------------------------------
diff --git a/app/views/application/interface.blade.php b/app/views/application/interface.blade.php
index 1a2d0c2..cfe61d3 100644
--- a/app/views/application/interface.blade.php
+++ b/app/views/application/interface.blade.php
@@ -2,12 +2,17 @@
 
 @section('page-header')
 @parent
-{{ HTML::style('css/style.css') }}
+{{ HTML::style('css/admin.css')}}
+{{ HTML::style('css/datetimepicker.css')}}
 @stop
 
 @section('content')
 
-<div class="container">
+<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-offset-2 col-md-8">
 
         <div class="row">
@@ -172,7 +177,8 @@
 
     </div>
 </div>
-
+</div>
+</div>
 @stop
 
 @section('scripts')

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/views/application/module.blade.php
----------------------------------------------------------------------
diff --git a/app/views/application/module.blade.php b/app/views/application/module.blade.php
index 0f635cb..2c6bc0f 100644
--- a/app/views/application/module.blade.php
+++ b/app/views/application/module.blade.php
@@ -2,12 +2,17 @@
 
 @section('page-header')
 @parent
-{{ HTML::style('css/style.css') }}
+{{ HTML::style('css/admin.css')}}
+{{ HTML::style('css/datetimepicker.css')}}
 @stop
 
 @section('content')
 
-<div class="container">
+<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-offset-2 col-md-8">
 
         <button class="btn btn-default create-app-module" data-toggle="modal" data-target="#new-app-module-block">Create
@@ -146,6 +151,8 @@
 
             </div>
         </div>
+        </div>
+    </div>
 
         @stop
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/views/partials/dashboard-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/dashboard-block.blade.php b/app/views/partials/dashboard-block.blade.php
index 8ae0895..b8dbdc7 100644
--- a/app/views/partials/dashboard-block.blade.php
+++ b/app/views/partials/dashboard-block.blade.php
@@ -1,26 +1,59 @@
 <div class="collapse navbar-collapse navbar-ex1-collapse">
     <ul class="nav navbar-nav side-nav">
         <li
-        @if( Session::has("manage")) class="active" @endif>
-        <a href="{{ URL::to('/')}}/admin/dashboard/gateway"><i class="fa fa-fw fa-dashboard"></i>@if(
-            Session::has("scigap_admin"))Gateways @else Gateway @endif</a>
+        @if( Session::has("admin-nav") && Session::get("admin-nav") == "gateway-prefs")
class="active" @endif>
+        <a class="dashboard-link" href="{{ URL::to('/')}}/admin/dashboard/gateway"><i
class="fa fa-fw fa-dashboard"></i>@if(
+            Session::has("scigap_admin"))Gateways @else Gateway Preferences @endif</a>
         </li>
-        <li>
-            <a href="{{ URL::to('/')}}/admin/dashboard/users"><i class="fa fa-fw
fa-bar-chart-o"></i> Users</a>
+        <li
+        @if( Session::has("admin-nav") && Session::get("admin-nav") == "manage-users")
class="active" @endif>
+            <a class="dashboard-link" href="{{ URL::to('/')}}/admin/dashboard/users"><i
class="fa fa-fw fa-bar-chart-o"></i> Users</a>
         </li>
-        <li>
-            <a href="{{ URL::to('/')}}/admin/dashboard/roles"><i class="fa fa-fw
fa-table"></i>Roles</a>
+        <li
+         @if( Session::has("admin-nav") && Session::get("admin-nav") == "manage-roles")
class="active" @endif>
+            <a class="dashboard-link" href="{{ URL::to('/')}}/admin/dashboard/roles"><i
class="fa fa-fw fa-table"></i>Roles</a>
         </li>
-        <li>
-            <a href="{{ URL::to('/')}}/admin/dashboard/credential-store"><i class="fa
fa-fw fa-table"></i>Credential
+        <li
+        @if( Session::has("admin-nav") && Session::get("admin-nav") == "credential-store")
class="active" @endif>
+            <a class="dashboard-link" href="{{ URL::to('/')}}/admin/dashboard/credential-store"><i
class="fa fa-fw fa-table"></i>Credential
                 Store</a>
         </li>
         <li>
-            <a href="{{ URL::to('/')}}/admin/dashboard/resources"><i class="fa fa-fw
fa-table"></i>Resources</a>
+            <a><i class="fa fa-fw fa-table"></i>Compute Resources</a>
+            <ul>
+                <li
+                @if( Session::has("admin-nav") && Session::get("admin-nav") == "cr-create")
class="active" @endif>
+                    <a class="dashboard-link" href="{{ URL::to('/')}}/cr/create"><i
class="fa fa-fw fa-table"></i>Register</a>
+                </li>
+                <li
+                @if( Session::has("admin-nav") && Session::get("admin-nav") == "cr-browse")
class="active" @endif>
+                    <a class="dashboard-link" href="{{ URL::to('/')}}/cr/browse"><i
class="fa fa-fw fa-table"></i>Browse</a>
+                </li>
+            </ul>
+
         </li>
         <li>
-            <a href="{{ URL::to('/')}}/admin/dashboard/experiments"><i
-                    class="fa fa-fw fa-experiments"></i>Experiments</a>
+            <a><i class="fa fa-fw fa-table"></i>App Catalog</a>
+            <ul>
+                <li
+                @if( Session::has("admin-nav") && Session::get("admin-nav") == "app-module")
class="active" @endif>
+                    <a class="dashboard-link" href="{{ URL::to('/')}}/app/module"><i
class="fa fa-fw fa-table"></i>Module</a>
+                </li>
+                <li
+                @if( Session::has("admin-nav") && Session::get("admin-nav") == "app-interface")
class="active" @endif>
+                    <a class="dashboard-link" href="{{ URL::to('/')}}/app/interface"><i
class="fa fa-fw fa-table"></i>Interface</a>
+                </li>
+                <li
+                @if( Session::has("admin-nav") && Session::get("admin-nav") == "app-deployment")
class="active" @endif>
+                    <a class="dashboard-link" href="{{ URL::to('/')}}/app/deployment"><i
class="fa fa-fw fa-table"></i>Deployment</a>
+                </li>
+            </ul>
+
+        </li>
+        <li
+            @if( Session::has("admin-nav") && Session::get("admin-nav") == "exp-statistics")
class="active" @endif>
+            <a class="dashboard-link"  href="{{ URL::to('/')}}/admin/dashboard/experiments"><i
+                    class="fa fa-fw fa-experiments"></i>Experiment Statistics</a>
         </li>
 <!--        <li>-->
 <!--            <a href="forms.html"><i class="fa fa-fw fa-edit"></i>
Settings</a>-->

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/views/resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php
index e0526e1..b17fd75 100644
--- a/app/views/resource/browse.blade.php
+++ b/app/views/resource/browse.blade.php
@@ -2,11 +2,18 @@
 
 @section('page-header')
 @parent
+{{ HTML::style('css/admin.css')}}
+{{ HTML::style('css/datetimepicker.css')}}
 @stop
 
 @section('content')
 
-<div class="container" style="max-width: 80%;">
+<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">
     @if( Session::has("message"))
     <div class="col-md-12">
         <span class="alert alert-success">{{ Session::get("message") }}</span>
@@ -42,16 +49,32 @@
 
                         <th>Name</th>
                         <th>Id</th>
+                        <th>Enabled</th>
                         <th>Edit</th>
                         <th>View</th>
                         <th>Delete</th>
                     </tr>
 
-                    @foreach ($allCRs as $crId => $crName)
-
+                    @foreach($allCRs as $resource)
+                    <?php
+                        $crId = $resource->computeResourceId;
+                        $crName = $resource->hostName;
+                        $enabled = $resource->enabled;
+                    ?>
                     <tr id="crDetails">
                         <td>{{ $crName }}</td>
                         <td>{{ $crId }}</td>
+                        <td>
+                            @if(!$enabled)
+                            <div class="checkbox">
+                                <input class="resource-status" resourceId="{{$crId}}"
type="checkbox">
+                            </div>
+                            @else
+                            <div class="checkbox">
+                                <input class="resource-status" type="checkbox" resourceId="{{$crId}}"
checked>
+                            </div>
+                            @endif
+                        </td>
                         <td><a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}"
title="Edit">
                                 <span class="glyphicon glyphicon-pencil"></span>
                             </a>
@@ -106,6 +129,8 @@
         </div>
 
     </div>
+</div>
+</div>
 
     @stop
     @section('scripts')
@@ -141,5 +166,40 @@
             $(".delete-crId").val($(this).data("crid"));
             $(".deploymentCount").html($(this).data("deployment-count"));
         });
+
+        $('.resource-status').click(function() {
+            var $this = $(this);
+            if ($this.is(':checked')) {
+                //enable compute resource
+                $resourceId = $this.attr("resourceId");
+                $.ajax({
+                    type: 'POST',
+                    url: "{{URL::to('/')}}/admin/enable-cr",
+                    data: {
+                        'resourceId': $resourceId
+                    },
+                    async: true,
+                    success: function (data) {
+                        console.log("enabled cr " + $resourceId);
+                        $(".success-message").html("<span class='alert alert-success col-md-12'>Successfully
enabled compute resource</span>");
+                    }
+                });
+            } else {
+                //disabled compute resource
+                $resourceId = $this.attr("resourceId");
+                $.ajax({
+                    type: 'POST',
+                    url: "{{URL::to('/')}}/admin/disable-cr",
+                    data: {
+                        'resourceId': $resourceId
+                    },
+                    async: true,
+                    success: function (data) {
+                        console.log("disabled cr " + $resourceId);
+                        $(".success-message").html("<span class='alert alert-success col-md-12'>Successfully
disabled compute resource</span>");
+                    }
+                });
+            }
+        });
     </script>
     @stop
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/views/resource/create-step3.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/create-step3.blade.php b/app/views/resource/create-step3.blade.php
deleted file mode 100644
index 6fd12b7..0000000
--- a/app/views/resource/create-step3.blade.php
+++ /dev/null
@@ -1,33 +0,0 @@
-@extends('layout.basic')
-
-@section('page-header')
-@parent
-{{ HTML::style('css/style.css') }}
-@stop
-
-@section('content')
-
-<div class="container">
-    <div class="col-md-offset-2 col-md-8">
-        <h3>Add Resource Data</h3>
-
-        <form role="form" method="POST" action="{{ URL::to('/') }}/cr/create">
-
-
-        </form>
-    </div>
-</div>
-
-@stop
-
-@section('scripts')
-@parent
-{{ HTML::script('js/script.js') }}
-
-<script>
-    $(document).ready(function () {
-
-
-    });
-</script>
-@stop
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/views/resource/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/create.blade.php b/app/views/resource/create.blade.php
index 913e7fc..1d44c22 100644
--- a/app/views/resource/create.blade.php
+++ b/app/views/resource/create.blade.php
@@ -2,11 +2,18 @@
 
 @section('page-header')
 @parent
+{{ HTML::style('css/admin.css')}}
+{{ HTML::style('css/datetimepicker.css')}}
 @stop
 
 @section('content')
 
-<div class="container">
+<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-offset-2 col-md-8">
         <h3>Create a Resource</h3>
 
@@ -36,7 +43,8 @@
         </form>
     </div>
 </div>
-
+</div>
+</div>
 @stop
 
 @section('scripts')

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/views/resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php
index 5e45411..6937fef 100644
--- a/app/views/resource/edit.blade.php
+++ b/app/views/resource/edit.blade.php
@@ -2,12 +2,18 @@
 
 @section('page-header')
 @parent
-{{ HTML::style('css/style.css') }}
+{{ HTML::style('css/admin.css')}}
+{{ HTML::style('css/datetimepicker.css')}}
 @stop
 
 @section('content')
 
-<div class="container">
+<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-offset-2 col-md-8">
 
 <input type="hidden" class="base-url" value="{{URL::to('/')}}"/>
@@ -630,6 +636,8 @@
 -->
 </div>
 </div>
+</div>
+</div>
 
 <!-- modals -->
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bff876/app/views/resource/view.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/view.blade.php b/app/views/resource/view.blade.php
index cb1e5f9..9678e17 100644
--- a/app/views/resource/view.blade.php
+++ b/app/views/resource/view.blade.php
@@ -2,12 +2,17 @@
 
 @section('page-header')
 @parent
-{{ HTML::style('css/style.css') }}
+{{ HTML::style('css/admin.css')}}
+{{ HTML::style('css/datetimepicker.css')}}
 @stop
 
 @section('content')
 
-<div class="container">
+<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-offset-2 col-md-8">
 
 <input type="hidden" class="base-url" value="{{URL::to('/')}}"/>
@@ -367,5 +372,6 @@
 
 </div>
 </div>
-
+</div>
+</div>
 @stop
\ No newline at end of file


Mime
View raw message