You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2015/11/13 00:54:16 UTC
[1/3] airavata-php-gateway git commit: Changes :
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop e1c697ad9 -> 81cceebfd
Changes :
1) Dashboard is a space now available to all users based on their roles
2) Navigational improvements
3) Icons added to each functionality
4) UI for Data Storage View added.
5)
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/64ac1746
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/64ac1746
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/64ac1746
Branch: refs/heads/develop
Commit: 64ac1746cd9ccd1e7b0ef865d0692bf9c3a5e676
Parents: c143b23
Author: Nipurn Doshi <Nipurn Doshi>
Authored: Thu Nov 12 16:33:41 2015 -0500
Committer: Nipurn Doshi <Nipurn Doshi>
Committed: Thu Nov 12 16:33:41 2015 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 4 +-
app/controllers/AdminController.php | 6 +-
app/routes.php | 2 -
app/views/account/dashboard.blade.php | 209 ++++++++++++++++++++++
app/views/admin/dashboard.blade.php | 131 --------------
app/views/layout/basic.blade.php | 2 +-
app/views/partials/dashboard-block.blade.php | 20 +++
public/css/admin.css | 2 +-
8 files changed, 234 insertions(+), 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/64ac1746/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 59b5133..f90de51 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -132,7 +132,7 @@ class AccountController extends BaseController
if(Session::get("admin") || Session::get("admin-read-only") || Session::get("authorized-user")){
return $this->initializeWithAiravata($username);
}
- return Redirect::to("home");
+ return View::make("account/dashboard");
}
}
@@ -203,7 +203,7 @@ class AccountController extends BaseController
return View::make('home');
}
- return Redirect::to("admin/console");
+ return View::make("account/dashboard");
}
public function forgotPassword()
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/64ac1746/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 05a0529..b2ae930 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -8,10 +8,6 @@ class AdminController extends BaseController {
Session::put("nav-active", "user-console");
}
- public function console(){
- return View::make("admin/dashboard");
- }
-
public function dashboard(){
//only for super admin
//Session::put("scigap_admin", true);
@@ -33,7 +29,7 @@ class AdminController extends BaseController {
return View::make( $view, $gatewayData);
}
else{
- return View::make("admin/dashboard");
+ return View::make("account/dashboard");
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/64ac1746/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index d402c9b..31980a2 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -165,8 +165,6 @@ Route::post("gp/credential-store-token-change", "GatewayprofileController@cstCha
//Management Dashboard
-Route::get("admin/console", "AdminController@console");
-
Route::get("admin/dashboard", "AdminController@dashboard");
Route::get("admin/dashboard/gateway", "AdminController@gatewayView");
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/64ac1746/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
new file mode 100644
index 0000000..b28bc5b
--- /dev/null
+++ b/app/views/account/dashboard.blade.php
@@ -0,0 +1,209 @@
+@extends('layout.basic')
+
+@section('page-header')
+@parent
+{{ HTML::style('css/admin.css')}}
+@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">×</span><span
+ class="sr-only">Close</span></button>
+ {{ Session::get("message") }}
+ </div>
+ </div>
+ {{ Session::forget("message") }}
+ @endif
+
+ @if( Session::has('admin') )
+ <div class="row text-center breathing-space">
+ <h1>Let's get started!</h1>
+ </div>
+ <div class="row text-center admin-options">
+
+ <div class="row well">
+
+ <h3>See what's happening in your projects</h3>
+
+ <a href="{{URL::to('/')}}/project/browse">
+ <div class="@if( Session::has('admin')) col-md-4 @else col-md-6 @endif well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-off console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Browse Projects</h4>
+ </div>
+ </div>
+ </a>
+
+ <a href="{{URL::to('/')}}/admin/dashboard/experiments">
+ <div class="@if( Session::has('admin')) col-md-4 @else col-md-6 @endif well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-tasks console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Browse Experiments</h4>
+ </div>
+ </div>
+ </a>
+
+ @if( Session::has('admin'))
+ <a href="{{URL::to('/')}}/admin/dashboard/experiments">
+ <div class="col-md-4 well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-stats console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Experiment Statistics</h4>
+ </div>
+ </div>
+ </a>
+ @endif
+ </div>
+
+ @if( Session::has('admin'))
+ <div class="row well">
+
+ <h3>Manage Users Access</h3>
+ <a href="{{URL::to('/')}}/admin/dashboard/users">
+ <div class="col-md-6 well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-user console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Browse Users</h4>
+ </div>
+ </div>
+ </a>
+
+ <a href="{{URL::to('/')}}/admin/dashboard/roles">
+ <div class=" col-md-6 well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-eye-open console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Browse User Roles</h4>
+ </div>
+ </div>
+ </a>
+ </div>
+
+ <div class="row well">
+
+ <h3>Manage Computing and Data Storage Services and Preferences for your Gateway</h3>
+
+ <a href="{{URL::to('/')}}/cr/browse">
+ <div class=" col-md-4 well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-briefcase console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Browse Compute Resources</h4>
+ </div>
+ </div>
+ </a>
+
+ <a href="{{URL::to('/')}}/admin/dashboard/gateway">
+ <div class=" col-md-4 well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-sort console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Gateway Prefereces</h4>
+ </div>
+ </div>
+ </a>
+
+ <a href="{{URL::to('/')}}/ds/browse">
+ <div class=" col-md-4 well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-folder-open console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Browse Data Storage Resources</h4>
+ </div>
+ </div>
+ </a>
+
+ </div>
+
+ <div class="row well">
+
+ <h3>Manage Application Modules, Interfaces and Deployments</h3>
+ <a href="{{URL::to('/')}}/app/module">
+ <div class="col-md-4 well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-th-large console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Browse Application Modules</h4>
+ </div>
+ </div>
+ </a>
+
+ <a href="{{URL::to('/')}}/app/interface">
+ <div class="col-md-4 well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-phone console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Browse Application Interfaces</h4>
+ </div>
+ </div>
+ </a>
+
+ <a href="{{URL::to('/')}}/app/deployment">
+ <div class="col-md-4 well">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-random console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ <h4>Browse Application Deployments</h4>
+ </div>
+ </div>
+ </a>
+ @endif
+
+
+ <!--
+ <div class=" col-md-4">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-list-alt console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ Reports
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-md-4">
+ <div class="col-md-12">
+ <span class="glyphicon glyphicon-question-sign console-icon"></span>
+ </div>
+ <div class="col-md-12">
+ Support
+ </div>
+ </div>
+ </div>
+ -->
+
+ </div>
+ </div>
+ @else
+ <div>
+ <div class="row text-center breathing-space">
+ <h1>Hi! You look new here.</h1>
+ </div>
+ <div class="row well">
+ <h4>Please contact the gateway administrator to request access to run experiments and more.</h4>
+ </div>
+ </div>
+ @endif
+</div>
+
+@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/64ac1746/app/views/admin/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/dashboard.blade.php b/app/views/admin/dashboard.blade.php
deleted file mode 100644
index 4c7b931..0000000
--- a/app/views/admin/dashboard.blade.php
+++ /dev/null
@@ -1,131 +0,0 @@
-@extends('layout.basic')
-
-@section('page-header')
-@parent
-{{ HTML::style('css/admin.css')}}
-@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">×</span><span
- class="sr-only">Close</span></button>
- {{ Session::get("message") }}
- </div>
- </div>
- {{ Session::forget("message") }}
- @endif
-
- <div class="row text-center">
- <h1>Let's get started!</h1>
- </div>
- <div class="row text-center admin-options">
-
- <div class="row">
- <a href="{{URL::to('/')}}/admin/dashboard/experiments">
- <div class="col-md-3 well">
- <div class="col-md-12">
- <span class="glyphicon glyphicon-off console-icon"></span>
- </div>
- <div class="col-md-12">
- Experiments
- </div>
- </div>
- </a>
-
- <a href="{{URL::to('/')}}/admin/dashboard/users">
- <div class=" col-md-offset-1 col-md-3 well">
- <div class="col-md-12">
- <span class="glyphicon glyphicon-user console-icon"></span>
- </div>
- <div class="col-md-12">
- Users
- </div>
- </div>
- </a>
-
- <a href="{{URL::to('/')}}/admin/dashboard/roles">
- <div class=" col-md-offset-1 col-md-3 well">
- <div class="col-md-12">
- <span class="glyphicon glyphicon-eye-open console-icon"></span>
- </div>
- <div class="col-md-12">
- Roles
- </div>
- </div>
- </a>
-
- </div>
-
- <div class="row">
-
- <a href="{{URL::to('/')}}/cr/browse">
- <div class="col-md-3 well">
- <div class="col-md-12">
- <span class="glyphicon glyphicon-briefcase console-icon"></span>
- </div>
- <div class="col-md-12">
- Resources
- </div>
- </div>
- </a>
-
- <div class="col-md-offset-1 col-md-3 well">
- <div class="col-md-12">
- <span class="glyphicon glyphicon-tasks console-icon"></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">
- <span class="glyphicon glyphicon-sort console-icon"></span>
- </div>
- <div class="col-md-12">
- Gateways
- </div>
- <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>
- </select>
- </div>
- <!--
- <div class=" col-md-offset-1 col-md-3 well">
- <div class="col-md-12">
- <span class="glyphicon glyphicon-list-alt console-icon"></span>
- </div>
- <div class="col-md-12">
- Reports
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-3 well">
- <div class="col-md-12">
- <span class="glyphicon glyphicon-question-sign console-icon"></span>
- </div>
- <div class="col-md-12">
- Support
- </div>
- </div>
- </div>
- -->
-
- </div>
- </div>
-</div>
-
-@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/64ac1746/app/views/layout/basic.blade.php
----------------------------------------------------------------------
diff --git a/app/views/layout/basic.blade.php b/app/views/layout/basic.blade.php
index ea4c1da..ce52659 100755
--- a/app/views/layout/basic.blade.php
+++ b/app/views/layout/basic.blade.php
@@ -83,7 +83,7 @@ var fullName = "{{Session::get("user-profile")["firstname"] . " " . Session::get
/* keeping a check that footer stays atleast at the bottom of the window.*/
var bh = $("html").height();
if( bh < $(window).height()){
-// $(".theme-footer").css("position", "relative").css("top", $(window).height()/4);
+ $(".theme-footer").css("position", "relative").css("top", $(window).height()/4);
}
var bw = $("body").width();
if( bw > 767){
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/64ac1746/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 563e6a7..f0c04cb 100644
--- a/app/views/partials/dashboard-block.blade.php
+++ b/app/views/partials/dashboard-block.blade.php
@@ -41,6 +41,26 @@
</ul>
</li>
+
+ <li>
+ <a><span class="glyphicon glyphicon-folder-open"></span> Data Storages</a>
+ <ul>
+ @if(Session::has("admin"))
+ <li
+ @if( Session::has("admin-nav") && Session::get("admin-nav") == "cr-create") class="active" @endif>
+ <a class="dashboard-link" href="{{ URL::to('/')}}/ds/create"><i class="fa fa-fw fa-table"></i>Register</a>
+ </li>
+ @endif
+ @if(Session::has("admin") || Session::has("admin-read-only"))
+ <li
+ @if( Session::has("admin-nav") && Session::get("admin-nav") == "cr-browse") class="active" @endif>
+ <a class="dashboard-link" href="{{ URL::to('/')}}/ds/browse"><i class="fa fa-fw fa-table"></i>Browse</a>
+ </li>
+ @endif
+ </ul>
+
+ </li>
+
<li>
<a><span class="glyphicon glyphicon-tasks"></span> App Catalog</a>
<ul>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/64ac1746/public/css/admin.css
----------------------------------------------------------------------
diff --git a/public/css/admin.css b/public/css/admin.css
index 9259ec9..1713a58 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -18,7 +18,7 @@ body {
}
.console-icon{
- font-size: 3em;
+ font-size: 2.5em;
}
#wrapper {
[3/3] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by nd...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/81cceebf
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/81cceebf
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/81cceebf
Branch: refs/heads/develop
Commit: 81cceebfd5d4d8a87158fdbcf8153b0b0e668c20
Parents: ad1a3b1 e1c697a
Author: Nipurn Doshi <Nipurn Doshi>
Authored: Thu Nov 12 18:53:24 2015 -0500
Committer: Nipurn Doshi <Nipurn Doshi>
Committed: Thu Nov 12 18:53:24 2015 -0500
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 5169 ++++++++++++++++++--------
1 file changed, 3519 insertions(+), 1650 deletions(-)
----------------------------------------------------------------------
[2/3] airavata-php-gateway git commit: Bug Fix
Posted by nd...@apache.org.
Bug Fix
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/ad1a3b1e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ad1a3b1e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ad1a3b1e
Branch: refs/heads/develop
Commit: ad1a3b1eb20096d5b903cc121b711265bb0890c4
Parents: 64ac174
Author: Nipurn Doshi <Nipurn Doshi>
Authored: Thu Nov 12 18:52:24 2015 -0500
Committer: Nipurn Doshi <Nipurn Doshi>
Committed: Thu Nov 12 18:52:24 2015 -0500
----------------------------------------------------------------------
app/views/account/dashboard.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ad1a3b1e/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
index b28bc5b..e3cf0a7 100644
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@ -19,7 +19,7 @@
{{ Session::forget("message") }}
@endif
- @if( Session::has('admin') )
+ @if( Session::has('authorized-user') || Session::has('admin') )
<div class="row text-center breathing-space">
<h1>Let's get started!</h1>
</div>