Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B1F7B18CDB for ; Wed, 15 Jul 2015 21:34:38 +0000 (UTC) Received: (qmail 618 invoked by uid 500); 15 Jul 2015 21:34:38 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 578 invoked by uid 500); 15 Jul 2015 21:34:38 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 569 invoked by uid 99); 15 Jul 2015 21:34: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; Wed, 15 Jul 2015 21:34:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7F5EBE0501; Wed, 15 Jul 2015 21:34:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Message-Id: <4446f9f9ffc942e998bed018a7414fc8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata-php-gateway git commit: fixing AIRAVATA-1776, AIRAVATA-1774 Date: Wed, 15 Jul 2015 21:34:38 +0000 (UTC) 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 Authored: Thu Jul 16 03:04:12 2015 +0530 Committer: Supun Nakandala 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 '
  • Admin Dashboard
    • '; + echo '
  • Admin Dashboard
    • '; // else // echo '
  • Profile
    • '; - echo '
  • + echo '
  • ' . Session::get("username") . ' '; echo '