changing ui when compute resources do not exist
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/20cf13c9 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/20cf13c9 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/20cf13c9 Branch: refs/heads/master Commit: 20cf13c90be1022c005c4df9a57110e647445d9e Parents: 667d49a Author: Nipurn Doshi <[email protected]> Authored: Thu Mar 19 13:05:23 2015 -0400 Committer: Suresh Marru <[email protected]> Committed: Thu Apr 9 11:41:12 2015 -0400 ---------------------------------------------------------------------- app/config/app_config.ini | 4 ++-- app/controllers/AdminController.php | 1 - app/views/admin/manage-gateway.blade.php | 10 +++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/20cf13c9/app/config/app_config.ini ---------------------------------------------------------------------- diff --git a/app/config/app_config.ini b/app/config/app_config.ini index 267a280..a990f12 100644 --- a/app/config/app_config.ini +++ b/app/config/app_config.ini @@ -7,12 +7,12 @@ ;Tenant admin's username ;admin-username = "[email protected]" -admin-username = "[email protected]" +admin-username = "[email protected]" ;Super Tenant Admin's username ;admin-username = "scigap_admin" ;Tenant admin's password -admin-password = "[email protected]" +admin-password = "sp@m!d!g2015" ;Super Admin's password ;admin-password = "sci9067@min" http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/20cf13c9/app/controllers/AdminController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php index 6182e05..d0426f8 100644 --- a/app/controllers/AdminController.php +++ b/app/controllers/AdminController.php @@ -34,7 +34,6 @@ class AdminController extends BaseController { $crData = CRUtilities::getEditCRData(); $gateways = CRUtilities::getAllGatewayProfilesData(); - return View::make("admin/manage-gateway", array( "gateways" => $gateways, "computeResources" => CRUtilities::getAllCRObjects(), http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/20cf13c9/app/views/admin/manage-gateway.blade.php ---------------------------------------------------------------------- diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php index d96af00..3dd2661 100644 --- a/app/views/admin/manage-gateway.blade.php +++ b/app/views/admin/manage-gateway.blade.php @@ -48,11 +48,13 @@ <div class="app-interface-block"> <div class="row"> <div class="col-md-10"> - @if( count( $gp->profile->computeResourcePreferences) ) + <button class="btn btn-default add-cr" data-gpid="{{$gp->gatewayId}}"><span class="glyphicon glyphicon-plus"></span> Add a Compute Resource</button> + </div> + <div class="col-md-10"> + @if( isset( $gp->profile->computeResourcePreferences) ) <div class="col-md-12"> <h3>Existing Compute Resources :</h3> </div> - @endif <div class="accordion-inner"> <div class="panel-group" id="accordion-{{$indexGP}}"> @foreach( (array)$gp->profile->computeResourcePreferences as $indexCRP => $crp ) @@ -84,7 +86,9 @@ @endforeach </div> </div> - + @endif + <!-- + Adding a user as admin will shift to roles. Removing from here. <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">
