http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/experiment/search.blade.php ---------------------------------------------------------------------- diff --git a/app/views/experiment/search.blade.php b/app/views/experiment/search.blade.php index b103bbd..926268e 100755 --- a/app/views/experiment/search.blade.php +++ b/app/views/experiment/search.blade.php @@ -1,125 +1,129 @@ @extends('layout.basic') @section('page-header') - @parent - {{ HTML::style('css/datetimepicker.css')}} +@parent +{{ HTML::style('css/datetimepicker.css')}} @stop @section('content') <div class="container" style="max-width: 750px;"> -<h1>Search for Experiments</h1> + <h1>Search for Experiments</h1> -<form action="{{URL::to('/')}}/experiment/search" method="post" class="form-inline" role="form"> - <div class="form-group"> - <label for="search-key">Search by</label> - <select class="form-control" name="search-key" id="search-key"> - <?php + <form action="{{URL::to('/')}}/experiment/search" method="post" class="form-inline" role="form"> + <div class="form-group"> + <label for="search-key">Search by</label> + <select class="form-control" name="search-key" id="search-key"> + <?php - // set up options for select input - $values = array('experiment-name', 'experiment-description', 'application', 'creation-time'); - $labels = array('Experiment Name', 'Experiment Description', 'Application', 'Creation Time'); - $disabled = array('', '', '', ''); + // set up options for select input + $values = array('experiment-name', 'experiment-description', 'application', 'creation-time'); + $labels = array('Experiment Name', 'Experiment Description', 'Application', 'Creation Time'); + $disabled = array('', '', '', ''); - Utilities::create_options($values, $labels, $disabled); + ExperimentUtilities::create_options($values, $labels, $disabled); - ?> - </select> - </div> + ?> + </select> + </div> - <div class="form-group search-text-block"> - <label for="search-value">for</label> - <input type="search" class="form-control" name="search-value" id="search-value" placeholder="value" required - value="<?php if (isset($_POST['search-value'])) echo $_POST['search-value'] ?>"> - </div> + <div class="form-group search-text-block"> + <label for="search-value">for</label> + <input type="search" class="form-control" name="search-value" id="search-value" placeholder="value" required + value="<?php if (isset($_POST['search-value'])) echo $_POST['search-value'] ?>"> + </div> - <select name="status-type" class="form-control select-status"> - <option value="ALL">Status</option> - <?php - foreach( $expStates as $index => $state){ - if(isset($input) && $state == $input["status-type"]){ - echo '<option value="' . $state .'" selected>' . $state . '</option>'; - }else{ - echo '<option value="' . $state .'">' . $state . '</option>'; + <select name="status-type" class="form-control select-status"> + <option value="ALL">Status</option> + <?php + foreach ($expStates as $index => $state) { + if (isset($input) && $state == $input["status-type"]) { + echo '<option value="' . $state . '" selected>' . $state . '</option>'; + } else { + echo '<option value="' . $state . '">' . $state . '</option>'; + } } - } - ?> - </select> + ?> + </select> - <div class="container select-dates hide"> - <div class="col-md-12"> - Select dates between which you want to search for experiments. - </div> - <div class="col-sm-8" style="height:75px;"> - <div class='col-md-6'> - <div class="form-group"> - <div class='input-group date' id='datetimepicker9'> - <input type='text' class="form-control" placeholder="From Date" name="from-date" value="<?php if (isset($_POST['from-date'])) echo $_POST['from-date'] ?>"/> + <div class="container select-dates hide"> + <div class="col-md-12"> + Select dates between which you want to search for experiments. + </div> + <div class="col-sm-8" style="height:75px;"> + <div class='col-md-6'> + <div class="form-group"> + <div class='input-group date' id='datetimepicker9'> + <input type='text' class="form-control" placeholder="From Date" name="from-date" + value="<?php if (isset($_POST['from-date'])) echo $_POST['from-date'] ?>"/> <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span> </span> + </div> </div> </div> - </div> - <div class='col-md-6'> - <div class="form-group"> - <div class='input-group date' id='datetimepicker10'> - <input type='text' class="form-control" placeholder="To Date" name="to-date" value="<?php if (isset($_POST['to-date'])) echo $_POST['to-date'] ?>"/> + <div class='col-md-6'> + <div class="form-group"> + <div class='input-group date' id='datetimepicker10'> + <input type='text' class="form-control" placeholder="To Date" name="to-date" + value="<?php if (isset($_POST['to-date'])) echo $_POST['to-date'] ?>"/> <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span> </span> + </div> </div> </div> </div> </div> - </div> - <button name="search" type="submit" class="btn btn-primary pull-right" value="Search"><span class="glyphicon glyphicon-search"></span> Search</button> - <p class="help-block">You can use * as a wildcard character. Tip: search for * alone to retrieve all of your experiments.</p> + <button name="search" type="submit" class="btn btn-primary pull-right" value="Search"><span + class="glyphicon glyphicon-search"></span> Search + </button> + <p class="help-block">You can use * as a wildcard character. Tip: search for * alone to retrieve all of your + experiments.</p> - <!-- Pagination Handling --> - <?php - if(isset( $expContainer)) - { - ?> - <div class="pull-right btn-toolbar" style="padding-bottom: 5px"> - <?php - if($pageNo!=1){ - echo '<input class="btn btn-primary btn-xs" type="submit" style="cursor: pointer" name="prev" value="Previous"/>'; - } - if(sizeof($expContainer)>0){ - echo '<input class="btn btn-primary btn-xs" type="submit" style="cursor: pointer" name="next" value="Next"/>'; - } + <!-- Pagination Handling --> + <?php + if (isset($expContainer)) { ?> - </div> - <div class="pull-left"> - <?php if (sizeof($expContainer) != 0) echo 'Showing results from ' . strval(($pageNo-1)*$limit + 1) - . ' to ' . strval(min($pageNo*$limit, ($pageNo-1)*$limit + sizeof($expContainer))); ?> + <div class="pull-right btn-toolbar" style="padding-bottom: 5px"> + <?php + if ($pageNo != 1) { + echo '<input class="btn btn-primary btn-xs" type="submit" style="cursor: pointer" name="prev" value="Previous"/>'; + } + if (sizeof($expContainer) > 0) { + echo '<input class="btn btn-primary btn-xs" type="submit" style="cursor: pointer" name="next" value="Next"/>'; + } + ?> </div> - <input type="hidden" name="pageNo" value="<?php echo($pageNo) ?>"/> - <div style="clear: both"></div> - <?php + <div class="pull-left"> + <?php if (sizeof($expContainer) != 0) echo 'Showing results from ' . strval(($pageNo - 1) * $limit + 1) + . ' to ' . strval(min($pageNo * $limit, ($pageNo - 1) * $limit + sizeof($expContainer))); ?> + </div> + <input type="hidden" name="pageNo" value="<?php echo($pageNo) ?>"/> + <div style="clear: both"></div> + <?php } - ?> -</form> + ?> + </form> -<?php + <?php -if (isset( $expContainer)) -{ + if (isset($expContainer)) + { if (sizeof($expContainer) == 0) { - if($pageNo==1){ - Utilities::print_warning_message('No results found. Please try again.'); - }else{ - Utilities::print_warning_message('No more results found.'); + if ($pageNo == 1) { + CommonUtilities::print_warning_message('No results found. Please try again.'); + } else { + CommonUtilities::print_warning_message('No more results found.'); } } else { -?> + ?> <div id="re" class="table-responsive"> <table class="table"> @@ -130,94 +134,86 @@ if (isset( $expContainer)) <!--<th>Resource</th>--> <th>Creation Time</th> <th>Status</th> -<!-- <select class="form-control select-status">--> -<!-- <option value="ALL">Status</option>--> -<!-- @foreach( $expStates as $index => $state)--> -<!-- <option value="{{ $state }}">{{ $state }}</option>--> -<!-- @endforeach--> -<!-- </select>--> -<!-- </th>--> + <!-- <select class="form-control select-status">--> + <!-- <option value="ALL">Status</option>--> + <!-- @foreach( $expStates as $index => $state)--> + <!-- <option value="{{ $state }}">{{ $state }}</option>--> + <!-- @endforeach--> + <!-- </select>--> + <!-- </th>--> </tr> - - -<?php - foreach ($expContainer as $experiment) - { - $description = $experiment['experiment']->description; - if (strlen($description) > 17) // 17 is arbitrary - { - $description = substr($experiment['experiment']->description, 0, 17) . '<span class="text-muted">...</span>'; - } - echo '<tr>'; - $addEditOption=""; - if( $experiment['expValue']['editable']) - $addEditOption = '<a href="'. URL::to('/') . '/experiment/edit?expId=' . $experiment['experiment']->experimentID . '" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>'; - - echo '<td>' . $experiment['experiment']->name . $addEditOption . '</td>'; - - echo '<td>' . $experiment['expValue']['applicationInterface']->applicationName . '</td>'; - - echo '<td>' . $description . '</td>'; - - //echo "<td>$computeResource->hostName</td>"; - echo '<td class="time" unix-time="' . $experiment['experiment']->creationTime/1000 . '"></td>'; - - - switch ($experiment['expValue']['experimentStatusString']) - { - case 'CANCELING': - case 'CANCELED': - case 'UNKNOWN': - $textClass = 'text-warning'; - break; - case 'FAILED': - $textClass = 'text-danger'; - break; - case 'COMPLETED': - $textClass = 'text-success'; - break; - default: - $textClass = 'text-info'; - break; - } - ?> - <td> - <a class="<?php echo $textClass; ?>" href="{{ URL::to('/') }}/experiment/summary?expId=<?php echo $experiment['experiment']->experimentID; ?>"> - <?php echo $experiment['expValue']['experimentStatusString']; ?> - </a> - </td> + <?php + foreach ($expContainer as $experiment) { + $description = $experiment['experiment']->description; + if (strlen($description) > 17) // 17 is arbitrary + { + $description = substr($experiment['experiment']->description, 0, 17) . '<span class="text-muted">...</span>'; + } - </tr> + echo '<tr>'; + $addEditOption = ""; + if ($experiment['expValue']['editable']) + $addEditOption = '<a href="' . URL::to('/') . '/experiment/edit?expId=' . $experiment['experiment']->experimentID . '" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>'; - <?php - } + echo '<td>' . $experiment['experiment']->name . $addEditOption . '</td>'; - echo ' - </table> - </div> - '; - } + echo '<td>' . $experiment['expValue']['applicationInterface']->applicationName . '</td>'; + + echo '<td>' . $description . '</td>'; + + //echo "<td>$computeResource->hostName</td>"; + echo '<td class="time" unix-time="' . $experiment['experiment']->creationTime / 1000 . '"></td>'; -} -?> + switch ($experiment['expValue']['experimentStatusString']) { + case 'CANCELING': + case 'CANCELED': + case 'UNKNOWN': + $textClass = 'text-warning'; + break; + case 'FAILED': + $textClass = 'text-danger'; + break; + case 'COMPLETED': + $textClass = 'text-success'; + break; + default: + $textClass = 'text-info'; + break; + } + + ?> + <td> + <a class="<?php echo $textClass; ?>" + href="{{ URL::to('/') }}/experiment/summary?expId=<?php echo $experiment['experiment']->experimentID; ?>"> + <?php echo $experiment['expValue']['experimentStatusString']; ?> + </a> + </td> + </tr> + <?php + } + } + } + ?> + </table> + </div> </div> @stop @section('scripts') - @parent - {{ HTML::script('js/time-conversion.js')}} - {{ HTML::script('js/moment.js')}} - {{ HTML::script('js/datetimepicker.js')}} +@parent +{{ HTML::script('js/time-conversion.js')}} +{{ HTML::script('js/moment.js')}} +{{ HTML::script('js/datetimepicker.js')}} - <script type="text/javascript"> +<script type="text/javascript"> - $(document).ready( function(){ + $(document).ready(function () { //------------------------Commenting Client Side filtering-------------------------------------- // /* script to make status select work on the UI side itself. */ @@ -249,57 +245,52 @@ if (isset( $expContainer)) // } // }); - /* making datetimepicker work for exp search */ - - $('#datetimepicker9').datetimepicker({ - pick12HourFormat: false - }); - $('#datetimepicker10').datetimepicker({ - pick12HourFormat: false - }); - $("#datetimepicker9").on("dp.change",function (e) { - $('#datetimepicker10').data("DateTimePicker").setMinDate(e.date); - }); - $("#datetimepicker10").on("dp.change",function (e) { - $('#datetimepicker9').data("DateTimePicker").setMaxDate(e.date); - }); - - /* selecting creation time */ - $("#search-key").on("change", function(){ - if( this.value == "creation-time") - { - $(".search-text-block").addClass("hide"); - $(".select-dates").removeClass("hide"); - $("#search-value").removeAttr("required"); + /* making datetimepicker work for exp search */ - } - else - { - $(".search-text-block").removeClass("hide"); - $(".select-dates").addClass("hide"); - $("#search-value").attr("required"); - } - }); + $('#datetimepicker9').datetimepicker({ + pick12HourFormat: false + }); + $('#datetimepicker10').datetimepicker({ + pick12HourFormat: false + }); + $("#datetimepicker9").on("dp.change", function (e) { + $('#datetimepicker10').data("DateTimePicker").setMinDate(e.date); + }); + $("#datetimepicker10").on("dp.change", function (e) { + $('#datetimepicker9').data("DateTimePicker").setMaxDate(e.date); + }); - changeInputVisibility( $("#search-key").val() ); + /* selecting creation time */ + $("#search-key").on("change", function () { + if (this.value == "creation-time") { + $(".search-text-block").addClass("hide"); + $(".select-dates").removeClass("hide"); + $("#search-value").removeAttr("required"); + } + else { + $(".search-text-block").removeClass("hide"); + $(".select-dates").addClass("hide"); + $("#search-value").attr("required"); + } }); - function changeInputVisibility( selectedStatus) - { - if( selectedStatus == "creation-time") - { + changeInputVisibility($("#search-key").val()); + + }); + + function changeInputVisibility(selectedStatus) { + if (selectedStatus == "creation-time") { $(".search-text-block").addClass("hide"); $(".select-dates").removeClass("hide"); $("#search-value").removeAttr("required"); } - else - { + else { $(".search-text-block").removeClass("hide"); $(".select-dates").addClass("hide"); $("#search-value").attr("required"); } } - </script> +</script> @stop \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/experiment/summary.blade.php ---------------------------------------------------------------------- diff --git a/app/views/experiment/summary.blade.php b/app/views/experiment/summary.blade.php index b643e8a..845e9ff 100755 --- a/app/views/experiment/summary.blade.php +++ b/app/views/experiment/summary.blade.php @@ -1,33 +1,32 @@ @extends('layout.basic') @section('page-header') - @parent +@parent @stop @section('content') - @include('partials/experiment-info') +@include('partials/experiment-info') @stop @section('scripts') - @parent - <script> - var $continue = true; - setInterval( function(){ - if( $.trim( $(".exp-status").html() ) != "COMPLETED" && $continue) - { - $.ajax({ - type:"GET", - url: "{{URL::to('/') }}/experiment/summary", - data: {expId: "{{ Input::get('expId') }}" }, - success: function( exp){ - if( $.trim( $("#expObj").val() ) != $.trim( exp) ){ - $continue = false; - $(".refresh-exp").click(); - } +@parent +<script> + var $continue = true; + setInterval(function () { + if ($.trim($(".exp-status").html()) != "COMPLETED" && $continue) { + $.ajax({ + type: "GET", + url: "{{URL::to('/') }}/experiment/summary", + data: {expId: "{{ Input::get('expId') }}" }, + success: function (exp) { + if ($.trim($("#expObj").val()) != $.trim(exp)) { + $continue = false; + $(".refresh-exp").click(); } - }); - } - }, 3000); - </script> + } + }); + } + }, 3000); +</script> @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/gateway/browse.blade.php ---------------------------------------------------------------------- diff --git a/app/views/gateway/browse.blade.php b/app/views/gateway/browse.blade.php index 6d26a06..d7ebf06 100644 --- a/app/views/gateway/browse.blade.php +++ b/app/views/gateway/browse.blade.php @@ -1,218 +1,250 @@ @extends('layout.basic') @section('page-header') - @parent +@parent @stop @section('content') <div class="container"> - <div class="col-md-offset-2 col-md-8"> - <div class="row"> - <a href="{{URL::to('/')}}/gp/create"> - <button class="btn btn-default create-gateway-profile">Create a new Gateway Resource Profile</button> - </a> - </div> - @if( count( $gatewayProfiles) ) - @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"> - - <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> - </div> - <div class="panel-group" id="accordion1"> - @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="#accordion" 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"> - <button class="btn btn-default add-cr" data-gpid="{{$gp->gatewayID}}"><span class="glyphicon glyphicon-plus"></span> Add a Compute Resource</button> - </div> - </div> - @if( count( $gp->computeResourcePreferences) ) - <div class="col-md-12"> - <h3>Existing Compute Resources :</h3> - </div> - <div class="accordion-inner"> - <div class="panel-group" id="accordion-{{$indexGP}}"> - @foreach( (array)$gp->computeResourcePreferences as $indexCRP => $crp ) - <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="#accordion" href="#collapse-crp-{{$indexGP}}-{{$indexCRP}}"> - {{ $crp->crDetails->hostName }} - </a> - <div class="pull-right col-md-2 gateway-options fade"> - <span class="glyphicon glyphicon-remove remove-resource" style="cursor:pointer;" data-toggle="modal" data-target="#remove-resource-block" data-cr-name="{{$crp->crDetails->hostName}}" data-cr-id="{{$crp->computeResourceId}}" data-gp-id="{{ $gp->gatewayID }}"></span> - </div> - </h4> - </div> - <div id="collapse-crp-{{$indexGP}}-{{$indexCRP}}" class="panel-collapse collapse"> - <div class="panel-body"> - <div class="app-compute-resource-preferences-block"> - <form action="{{URL::to('/')}}/gp/update-crp" method="POST"> - <input type="hidden" name="gatewayId" id="gatewayId" value="{{$gp->gatewayID}}"> - <input type="hidden" name="computeResourceId" id="gatewayId" value="{{$crp->computeResourceId}}"> - <div class="form-horizontal"> - @include('partials/gateway-preferences', array('computeResource' => $crp->crDetails, 'crData' => $crData, 'preferences'=>$crp, 'show'=>true)) - </div> - </form> - </div> - </div> - </div> - </div> - @endforeach - </div> - </div> - @endif - </div> - </div> - </div> - </div> - @endforeach - </div> - @endif - </div> + <div class="col-md-offset-2 col-md-8"> + <div class="row"> + <a href="{{URL::to('/')}}/gp/create"> + <button class="btn btn-default create-gateway-profile">Create a new Gateway Resource Profile</button> + </a> + </div> + @if( count( $gatewayProfiles) ) + @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"> + + <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> + </div> + <div class="panel-group" id="accordion1"> + @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="#accordion" 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"> + <button class="btn btn-default add-cr" data-gpid="{{$gp->gatewayID}}"><span + class="glyphicon glyphicon-plus"></span> Add a Compute Resource + </button> + </div> + </div> + @if( count( $gp->computeResourcePreferences) ) + <div class="col-md-12"> + <h3>Existing Compute Resources :</h3> + </div> + <div class="accordion-inner"> + <div class="panel-group" id="accordion-{{$indexGP}}"> + @foreach( (array)$gp->computeResourcePreferences as $indexCRP => $crp ) + <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="#accordion" + href="#collapse-crp-{{$indexGP}}-{{$indexCRP}}"> + {{ $crp->crDetails->hostName }} + </a> + + <div class="pull-right col-md-2 gateway-options fade"> + <span class="glyphicon glyphicon-remove remove-resource" + style="cursor:pointer;" data-toggle="modal" + data-target="#remove-resource-block" + data-cr-name="{{$crp->crDetails->hostName}}" + data-cr-id="{{$crp->computeResourceId}}" + data-gp-id="{{ $gp->gatewayID }}"></span> + </div> + </h4> + </div> + <div id="collapse-crp-{{$indexGP}}-{{$indexCRP}}" + class="panel-collapse collapse"> + <div class="panel-body"> + <div class="app-compute-resource-preferences-block"> + <form action="{{URL::to('/')}}/gp/update-crp" method="POST"> + <input type="hidden" name="gatewayId" id="gatewayId" + value="{{$gp->gatewayID}}"> + <input type="hidden" name="computeResourceId" id="gatewayId" + value="{{$crp->computeResourceId}}"> + + <div class="form-horizontal"> + @include('partials/gateway-preferences', + array('computeResource' => $crp->crDetails, 'crData' => + $crData, 'preferences'=>$crp, 'show'=>true)) + </div> + </form> + </div> + </div> + </div> + </div> + @endforeach + </div> + </div> + @endif + </div> + </div> + </div> + </div> + @endforeach + </div> + @endif + </div> </div> <div class="add-compute-resource-block hide"> - <div class="well"> - <form action="{{URL::to('/')}}/gp/add-crp" method="POST"> - <input type="hidden" name="gatewayId" id="gatewayId" value=""> - <div class="input-group"> - <select name="computeResourceId" class="cr-select form-control"> - <option value="">Select a compute Resource and set its preferences</option> - @foreach( (array)$computeResources as $index => $cr) - <option value="{{ $cr->computeResourceId}}">{{ $cr->hostName }}</option> - @endforeach - </select> - <span class="input-group-addon remove-cr" style="cursor:pointer;">x</span> - </div> - <div class="pref-space form-horizontal"></div> - </form> - </div> + <div class="well"> + <form action="{{URL::to('/')}}/gp/add-crp" method="POST"> + <input type="hidden" name="gatewayId" id="gatewayId" value=""> + + <div class="input-group"> + <select name="computeResourceId" class="cr-select form-control"> + <option value="">Select a compute Resource and set its preferences</option> + @foreach( (array)$computeResources as $index => $cr) + <option value="{{ $cr->computeResourceId}}">{{ $cr->hostName }}</option> + @endforeach + </select> + <span class="input-group-addon remove-cr" style="cursor:pointer;">x</span> + </div> + <div class="pref-space form-horizontal"></div> + </form> + </div> </div> <!-- Edit a Gateway Modal --> -<div class="modal fade" id="edit-gateway-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true"> +<div class="modal fade" id="edit-gateway-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" + aria-hidden="true"> <div class="modal-dialog"> - <form action="{{URL::to('/')}}/gp/edit" method="POST"> - <div class="modal-content"> - <div class="modal-header"> - <h3 class="text-center">Edit Gateway</h3> - </div> - <div class="modal-body"> - <input type="hidden" class="form-control edit-gpId" name="edit-gpId"/> - <div class="form-group required"> - <label class="control-label">Gateway Name</label> - <input class="form-control edit-gp-name" maxlength="100" name="gatewayName" required="required" placeholder="Gateway Name"/> - </div> - <div class="form-group"> - <label class="control-label">Gateway Description</label> - <textarea class="form-control edit-gp-desc" maxlength="255" name="gatewayDescription" placeholder="Gateway Description"></textarea> - </div> - </div> - <div class="modal-footer"> - <div class="form-group"> - <input type="submit" class="btn btn-primary" value="Update"/> - <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/> - </div> - </div> - </div> - - </form> - </div> + <form action="{{URL::to('/')}}/gp/edit" method="POST"> + <div class="modal-content"> + <div class="modal-header"> + <h3 class="text-center">Edit Gateway</h3> + </div> + <div class="modal-body"> + <input type="hidden" class="form-control edit-gpId" name="edit-gpId"/> + + <div class="form-group required"> + <label class="control-label">Gateway Name</label> + <input class="form-control edit-gp-name" maxlength="100" name="gatewayName" required="required" + placeholder="Gateway Name"/> + </div> + <div class="form-group"> + <label class="control-label">Gateway Description</label> + <textarea class="form-control edit-gp-desc" maxlength="255" name="gatewayDescription" + placeholder="Gateway Description"></textarea> + </div> + </div> + <div class="modal-footer"> + <div class="form-group"> + <input type="submit" class="btn btn-primary" value="Update"/> + <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/> + </div> + </div> + </div> + + </form> + </div> </div> <!-- delete a Gateway Modal --> -<div class="modal fade" id="delete-gateway-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true"> +<div class="modal fade" id="delete-gateway-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" + aria-hidden="true"> <div class="modal-dialog"> - <form action="{{URL::to('/')}}/gp/delete-gp" method="POST"> - <div class="modal-content"> - <div class="modal-header"> - <h3 class="text-center">Delete Gateway Profile Confirmation</h3> - </div> - <div class="modal-body"> - <input type="hidden" class="form-control delete-gpId" name="del-gpId"/> - Do you really want to delete the Gateway Profile, <span class="delete-gp-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> - </div> + <form action="{{URL::to('/')}}/gp/delete-gp" method="POST"> + <div class="modal-content"> + <div class="modal-header"> + <h3 class="text-center">Delete Gateway Profile Confirmation</h3> + </div> + <div class="modal-body"> + <input type="hidden" class="form-control delete-gpId" name="del-gpId"/> + Do you really want to delete the Gateway Profile, <span class="delete-gp-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> + </div> </div> <!-- Remove a Compute Resource from a Gateway --> -<div class="modal fade" id="remove-resource-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true"> +<div class="modal fade" id="remove-resource-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" + aria-hidden="true"> <div class="modal-dialog"> - <form action="{{URL::to('/')}}/gp/remove-cr" method="POST"> - <div class="modal-content"> - <div class="modal-header"> - <h3 class="text-center">Remove Compute Resource Confirmation</h3> - </div> - <div class="modal-body"> - <input type="hidden" class="form-control remove-crId" name="rem-crId"/> - <input type="hidden" class="form-control cr-gpId" name="gpId"/> - - Do you really want to remove the Compute Resource, <span class="remove-cr-name"> </span>from the selected Gateway? - </div> - <div class="modal-footer"> - <div class="form-group"> - <input type="submit" class="btn btn-danger" value="Remove"/> - <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/> - </div> - </div> - </div> - - </form> - </div> + <form action="{{URL::to('/')}}/gp/remove-cr" method="POST"> + <div class="modal-content"> + <div class="modal-header"> + <h3 class="text-center">Remove Compute Resource Confirmation</h3> + </div> + <div class="modal-body"> + <input type="hidden" class="form-control remove-crId" name="rem-crId"/> + <input type="hidden" class="form-control cr-gpId" name="gpId"/> + + Do you really want to remove the Compute Resource, <span class="remove-cr-name"> </span>from the + selected Gateway? + </div> + <div class="modal-footer"> + <div class="form-group"> + <input type="submit" class="btn btn-danger" value="Remove"/> + <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/> + </div> + </div> + </div> + + </form> + </div> </div> <!-- contains all compute resource choices that might get selected on adding a new one to a gateway --> @foreach( (array)$computeResources as $index => $cr) - @include('partials/gateway-preferences', array('computeResource' => $cr, 'crData' => $crData)) +@include('partials/gateway-preferences', array('computeResource' => $cr, 'crData' => $crData)) @endforeach @stop @section('scripts') - @parent - {{ HTML::script('js/gateway.js') }} +@parent +{{ HTML::script('js/gateway.js') }} @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/gateway/create.blade.php ---------------------------------------------------------------------- diff --git a/app/views/gateway/create.blade.php b/app/views/gateway/create.blade.php index 24cba9c..477c506 100644 --- a/app/views/gateway/create.blade.php +++ b/app/views/gateway/create.blade.php @@ -1,34 +1,37 @@ @extends('layout.basic') @section('page-header') - @parent +@parent @stop @section('content') <div class="container"> - <div class="col-md-offset-2 col-md-8"> - <h3>Create a Gateway</h3> - <form role="form" method="POST" action="{{ URL::to('/') }}/gp/create"> - <div class="form-group required"> - <label class="control-label">Enter Name</label> - <input class="form-control hostName" maxlength="100" name="gatewayName" required="required" placeholder="Gateway Name"/> - </div> - <div class="form-group"> - <label class="control-label">Enter Description</label> - <textarea class="form-control" maxlength="255" name="gatewayDescription" placeholder="Gateway Description"></textarea> - </div> - <div class="form-group"> - <input type="submit" class="btn btn-lg btn-primary" value="Create"/> - <input type="reset" class="btn btn-lg btn-success" value="Reset"/> - </div> - </form> - </div> + <div class="col-md-offset-2 col-md-8"> + <h3>Create a Gateway</h3> + + <form role="form" method="POST" action="{{ URL::to('/') }}/gp/create"> + <div class="form-group required"> + <label class="control-label">Enter Name</label> + <input class="form-control hostName" maxlength="100" name="gatewayName" required="required" + placeholder="Gateway Name"/> + </div> + <div class="form-group"> + <label class="control-label">Enter Description</label> + <textarea class="form-control" maxlength="255" name="gatewayDescription" + placeholder="Gateway Description"></textarea> + </div> + <div class="form-group"> + <input type="submit" class="btn btn-lg btn-primary" value="Create"/> + <input type="reset" class="btn btn-lg btn-success" value="Reset"/> + </div> + </form> + </div> </div> @stop @section('scripts') - @parent - {{ HTML::script('js/script.js') }} +@parent +{{ HTML::script('js/script.js') }} @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/home.blade.php ---------------------------------------------------------------------- diff --git a/app/views/home.blade.php b/app/views/home.blade.php index a3deeeb..158650c 100755 --- a/app/views/home.blade.php +++ b/app/views/home.blade.php @@ -1,7 +1,7 @@ @extends('layout.basic') @section('page-header') - @parent +@parent @stop @section('content') @@ -11,85 +11,15 @@ <?php - if (Utilities::id_in_session()) - { + if (CommonUtilities::id_in_session()) { $columnClass = 'col-md-4'; - if( Session::has("admin")) + if (Session::has("admin")) $admin = " Admin"; else $admin = ""; - echo '<h4>Welcome'. $admin . ', '. Session::get("username") . '!</h4>'; - - if( Session::get("username") == 'admin1') // temporary hard-coded admin user. will replace with admin role in future - { - try - { - Utilities::open_tokens_file($tokenFilePath); - } - catch (Exception $e) - { - Utilities::print_error_message($e->getMessage()); - } - - - if(isset($_GET['tokenId'])) - { - try - { - Utilities::write_new_token($_GET['tokenId']); - - Utilties::print_success_message('Received new XSEDE token ' . $tokenFile->tokenId . - '! Click <a href="' . $req_url . - '?gatewayName=' . $gatewayName . - '&email=' . $email . - '&portalUserName=' . $_SESSION['username'] . - '">here</a> to fetch a new token.'); - } - catch (Exception $e) - { - print_error_message($e->getMessage()); - } - } - else - { - echo '<p><small>Community token currently set to ' . $tokenFile->tokenId . - '. Click <a href="' . $req_url . - '?gatewayName=' . $gatewayName . - '&email=' . $email . - '&portalUserName=' . $_SESSION['username'] . - '">here</a> to fetch a new token.</small></p>'; - } - } - else // standard user - { - /* temporarily remove to avoid confusion during XSEDE tutorial - if (isset($_SESSION['tokenId'])) - { - echo '<p><small>XSEDE token currently active. - All experiments launched during this session will use your personal allocation.</small></p>'; - } - elseif(!isset($_GET['tokenId']) && !isset($_SESSION['tokenId'])) - { - echo '<p><small>Currently using community allocation. Click <a href="' . - $req_url . - '?gatewayName=' . $gatewayName . - '&email=' . $email . - '&portalUserName=' . $_SESSION['username'] . - '">here</a> to use your personal allocation for this session.</small></p>'; - } - elseif(isset($_GET['tokenId'])) - { - $_SESSION['tokenId'] = $_GET['tokenId']; - - print_success_message('Received XSEDE token!' . - '<br>All experiments launched during this session will use your personal allocation.'); - } - */ - } - } - else - { + echo '<h4>Welcome' . $admin . ', ' . Session::get("username") . '!</h4>'; + } else { $columnClass = 'col-md-6'; echo ' @@ -105,10 +35,7 @@ target="_blank">View the XSEDE 2014 tutorial documentation <span class="glyphicon glyphicon-new-window"></span></a></p> '; } - ?> - - </div> </div> @@ -117,12 +44,10 @@ <div class="row"> <?php - if (Utilities::id_in_session()) - { + if (CommonUtilities::id_in_session()) { echo ' <div class="col-md-4"> <h2>PHP Gateway with Airavata</h2> - <p> PGA is a science gateway built with the Airavata API. You can reference PGA as you integrate Airavata into your own gateway, or you can create your gateway on top of PGA by cloning it at @@ -140,6 +65,7 @@ <div class="<?php echo $columnClass; ?>"> <div class="thumbnail" style="border:none"> <img src="assets/scigap-header-logo.png" alt="SciGaP"> + <div class="caption"> <p> SciGaP is a hosted service with a public API that science gateways can use to manage @@ -147,11 +73,13 @@ developers can thus concentrate their efforts on building their scientific communities and not worry about operations. </p> + <p> Science Gateway Platform as a Service (SciGaP) provides application programmer interfaces (APIs) to hosted generic infrastructure services that can be used by domain science communities to create Science Gateways. </p> + <p><a href="http://scigap.org/"; target="_blank">Learn more <span class="glyphicon glyphicon-new-window"></span></a></p> </div> @@ -160,6 +88,7 @@ <div class="<?php echo $columnClass; ?>"> <div class="thumbnail" style="border:none"> <img src="assets/PoweredbyAiravata_Small.png" alt="Apache Airavata"> + <div class="caption"> <p> Apache Airavata is a software framework which is dominantly used to build Web-based science @@ -168,7 +97,9 @@ grids, academic and commercial clouds. Airavata mainly supports long running applications and workflows on distributed computational resources. </p> - <p><a href="http://airavata.apache.org/"; target="_blank">Learn more <span class="glyphicon glyphicon-new-window"></span></a></p> + + <p><a href="http://airavata.apache.org/"; target="_blank">Learn more <span + class="glyphicon glyphicon-new-window"></span></a></p> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/layout/basic.blade.php ---------------------------------------------------------------------- diff --git a/app/views/layout/basic.blade.php b/app/views/layout/basic.blade.php index 318b507..0915e3b 100755 --- a/app/views/layout/basic.blade.php +++ b/app/views/layout/basic.blade.php @@ -1,14 +1,14 @@ @section ('page-header') <!DOCTYPE html> - <html lang="en"> - <head> - <title>PHP Reference Gateway</title> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <link rel="icon" href="resources/assets/favicon.ico" type="image/x-icon"> - {{ HTML::style('css/bootstrap.min.css')}} - </head> +<html lang="en"> +<head> + <title>PHP Reference Gateway</title> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <link rel="icon" href="resources/assets/favicon.ico" type="image/x-icon"> + {{ HTML::style('css/bootstrap.min.css')}} +</head> <?php @@ -19,21 +19,19 @@ <body> -<?php Utilities::create_nav_bar(); ?> +<?php CommonUtilities::create_nav_bar(); ?> <?php - // Alerts if guests users try to go to the link without signing in. - if( Session::has("login-alert")) - { - Utilities::print_error_message("You need to login to use this service."); - Session::forget("login-alert"); - } - // if signed in user is not an admin. - if( Session::has("admin-alert")) - { - Utilities::print_error_message("You need to be an admin to use this service."); - Session::forget("admin-alert"); - } +// Alerts if guests users try to go to the link without signing in. +if (Session::has("login-alert")) { + CommonUtilities::print_error_message("You need to login to use this service."); + Session::forget("login-alert"); +} +// if signed in user is not an admin. +if (Session::has("admin-alert")) { + CommonUtilities::print_error_message("You need to be an admin to use this service."); + Session::forget("admin-alert"); +} ?> @show @@ -42,72 +40,70 @@ </body> @section('scripts') - <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js";></script> - <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script> +<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js";></script> +<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script> - <!-- Jira Issue Collector - Report Issue --> - <script type="text/javascript" - src="https://gateways.atlassian.net/s/31280375aecc888d5140f63e1dc78a93-T/en_USmlc07/6328/46/1.4.13/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=b1572922";></script> +<!-- Jira Issue Collector - Report Issue --> +<script type="text/javascript" + src="https://gateways.atlassian.net/s/31280375aecc888d5140f63e1dc78a93-T/en_USmlc07/6328/46/1.4.13/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=b1572922";></script> - <!-- Jira Issue Collector - Request Feature --> - <script type="text/javascript" +<!-- Jira Issue Collector - Request Feature --> +<script type="text/javascript" src="https://gateways.atlassian.net/s/31280375aecc888d5140f63e1dc78a93-T/en_USmlc07/6328/46/1.4.13/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-US&collectorId=674243b0";></script> - <script type="text/javascript"> - window.ATL_JQ_PAGE_PROPS = $.extend(window.ATL_JQ_PAGE_PROPS, { - "b1572922": - { - "triggerFunction": function(showCollectorDialog) { - //Requries that jQuery is available! - jQuery("#report-issue").click(function(e) { - e.preventDefault(); - showCollectorDialog(); - }); - } - }, - "674243b0": - { - "triggerFunction": function(showCollectorDialog) { - //Requries that jQuery is available! - jQuery("#request-feature").click(function(e) { - e.preventDefault(); - showCollectorDialog(); - }); - } +<script type="text/javascript"> + window.ATL_JQ_PAGE_PROPS = $.extend(window.ATL_JQ_PAGE_PROPS, { + "b1572922": { + "triggerFunction": function (showCollectorDialog) { + //Requries that jQuery is available! + jQuery("#report-issue").click(function (e) { + e.preventDefault(); + showCollectorDialog(); + }); } - }); - - var highest = null; - $(".nav-tabs a").each(function(){ //find the height of your highest link - var h = $(this).height(); - if(h > highest){ - highest = $(this).height(); - } - }); - - $(".nav-tabs a").height(highest); //set all your links to that height. - + }, + "674243b0": { + "triggerFunction": function (showCollectorDialog) { + //Requries that jQuery is available! + jQuery("#request-feature").click(function (e) { + e.preventDefault(); + showCollectorDialog(); + }); + } + } + }); - // not letting users to add only spaces in text boxes. - $("body").on( "blur", ".form-control", function(){ - $(this).val( $.trim( $(this).val() ) ); - }); - - //find users' current time. - if("{{ Session::get('user_time') }}".length==0){ - var visitortime = new Date(); - var visitortimezone = visitortime.getTimezoneOffset()/60; - $.ajax({ - type:"GET", - url:"{{URL::to('/')}}/setUserTimezone", - data: 'timezone='+ visitortimezone, - success: function(){ - //location.reload(); - } - }); + var highest = null; + $(".nav-tabs a").each(function () { //find the height of your highest link + var h = $(this).height(); + if (h > highest) { + highest = $(this).height(); } - </script> + }); + + $(".nav-tabs a").height(highest); //set all your links to that height. + + + // not letting users to add only spaces in text boxes. + $("body").on("blur", ".form-control", function () { + $(this).val($.trim($(this).val())); + }); + + //find users' current time. + if ("{{ Session::get('user_time') }}".length == 0) { + var visitortime = new Date(); + var visitortimezone = visitortime.getTimezoneOffset() / 60; + $.ajax({ + type: "GET", + url: "{{URL::to('/')}}/setUserTimezone", + data: 'timezone=' + visitortimezone, + success: function () { + //location.reload(); + } + }); + } +</script> @show http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/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 a30530b..70692c3 100644 --- a/app/views/partials/dashboard-block.blade.php +++ b/app/views/partials/dashboard-block.blade.php @@ -1,50 +1,54 @@ <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> - </li> - <li> - <a 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> - <li> - <a 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> - </li> - <li> - <a href="{{ URL::to('/')}}/admin/dashboard/experiments"><i class="fa fa-fw fa-experiments"></i>Experiments</a> - </li> - <li> - <a href="forms.html"><i class="fa fa-fw fa-edit"></i> Settings</a> - </li> - <!-- - <li> - <a href="bootstrap-elements.html"><i class="fa fa-fw fa-desktop"></i> Bootstrap Elements</a> - </li> - <li> - <a href="bootstrap-grid.html"><i class="fa fa-fw fa-wrench"></i> Bootstrap Grid</a> - </li> - <li> - <a href="javascript:;" data-toggle="collapse" data-target="#demo"><i class="fa fa-fw fa-arrows-v"></i> Dropdown <i class="fa fa-fw fa-caret-down"></i></a> - <ul id="demo" class="collapse"> - <li> - <a href="#">Dropdown Item</a> - </li> - <li> - <a href="#">Dropdown Item</a> - </li> - </ul> - </li> - <li> - <a href="blank-page.html"><i class="fa fa-fw fa-file"></i> Blank Page</a> - </li> - <li> - <a href="index-rtl.html"><i class="fa fa-fw fa-dashboard"></i> RTL Dashboard</a> - </li> - --> - </ul> - </div> + <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> + </li> + <li> + <a 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> + <li> + <a 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> + </li> + <li> + <a href="{{ URL::to('/')}}/admin/dashboard/experiments"><i + class="fa fa-fw fa-experiments"></i>Experiments</a> + </li> + <li> + <a href="forms.html"><i class="fa fa-fw fa-edit"></i> Settings</a> + </li> + <!-- + <li> + <a href="bootstrap-elements.html"><i class="fa fa-fw fa-desktop"></i> Bootstrap Elements</a> + </li> + <li> + <a href="bootstrap-grid.html"><i class="fa fa-fw fa-wrench"></i> Bootstrap Grid</a> + </li> + <li> + <a href="javascript:;" data-toggle="collapse" data-target="#demo"><i class="fa fa-fw fa-arrows-v"></i> Dropdown <i class="fa fa-fw fa-caret-down"></i></a> + <ul id="demo" class="collapse"> + <li> + <a href="#">Dropdown Item</a> + </li> + <li> + <a href="#">Dropdown Item</a> + </li> + </ul> + </li> + <li> + <a href="blank-page.html"><i class="fa fa-fw fa-file"></i> Blank Page</a> + </li> + <li> + <a href="index-rtl.html"><i class="fa fa-fw fa-dashboard"></i> RTL Dashboard</a> + </li> + --> + </ul> +</div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/partials/deployment-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/deployment-block.blade.php b/app/views/partials/deployment-block.blade.php index b624c3a..58722a1 100644 --- a/app/views/partials/deployment-block.blade.php +++ b/app/views/partials/deployment-block.blade.php @@ -5,121 +5,140 @@ </div> --> @if( isset( $deploymentObject) ) - <input type="hidden" name="app-deployment-id" value="{{$deploymentObject->appDeploymentId}}"/> +<input type="hidden" name="app-deployment-id" value="{{$deploymentObject->appDeploymentId}}"/> @endif <div class="form-group required"> - <label class="control-label">Application Module</label> - <select name="appModuleId" class="form-control app-module-filter" required readonly> - @foreach( $modules as $index => $module) - <option value="{{ $module->appModuleId }}" @if( isset( $deploymentObject) ) @if( $module->appModuleId == $deploymentObject->appModuleId) selected @endif @endif>{{ $module->appModuleName }}</option> - @endforeach - </select> + <label class="control-label">Application Module</label> + <select name="appModuleId" class="form-control app-module-filter" required readonly> + @foreach( $modules as $index => $module) + <option value="{{ $module->appModuleId }}" + @if( isset( $deploymentObject) ) @if( $module->appModuleId == $deploymentObject->appModuleId) selected @endif + @endif>{{ $module->appModuleName }}</option> + @endforeach + </select> </div> <div class="form-group required"> - <label class="control-label">Application Compute Host</label> - <select name="computeHostId" class="form-control" required readonly> - @foreach( $computeResources as $id => $crName) - <option value="{{ $id }}" @if( isset( $deploymentObject) ) @if( $id == $deploymentObject->computeHostId) selected @endif @endif>{{ $crName }}</option> - @endforeach - </select> + <label class="control-label">Application Compute Host</label> + <select name="computeHostId" class="form-control" required readonly> + @foreach( $computeResources as $id => $crName) + <option value="{{ $id }}" + @if( isset( $deploymentObject) ) @if( $id == $deploymentObject->computeHostId) selected @endif @endif>{{ $crName + }}</option> + @endforeach + </select> </div> <div class="form-group required"> - <label class="control-label">Application Executable Path</label> - <input type="text" class="form-control" name="executablePath" value="@if( isset( $deploymentObject)){{$deploymentObject->executablePath}}@endif" required readonly/> + <label class="control-label">Application Executable Path</label> + <input type="text" class="form-control" name="executablePath" + value="@if( isset( $deploymentObject)){{$deploymentObject->executablePath}}@endif" required readonly/> </div> <div class="form-group required"> - <label class="control-label">Application Parallelism Type</label> - <select name="parallelism" class="form-control" readonly> - @foreach( $applicationParallelismTypes as $index=>$parallelismType) - <option value="{{$index}}" @if( isset( $deploymentObject) ) @if( $index == $deploymentObject->parallelism) selected @endif @endif>{{ $parallelismType }}</option> - @endforeach - </select> + <label class="control-label">Application Parallelism Type</label> + <select name="parallelism" class="form-control" readonly> + @foreach( $applicationParallelismTypes as $index=>$parallelismType) + <option value="{{$index}}" + @if( isset( $deploymentObject) ) @if( $index == $deploymentObject->parallelism) selected @endif @endif>{{ + $parallelismType }}</option> + @endforeach + </select> </div> <div class="form-group"> - <label class="control-label">Application Deployment Description</label> - <textarea class="form-control" name="appDeploymentDescription" readonly>@if( isset( $deploymentObject)){{$deploymentObject->appDeploymentDescription}}@endif</textarea> + <label class="control-label">Application Deployment Description</label> + <textarea class="form-control" name="appDeploymentDescription" readonly>@if( isset( + $deploymentObject)){{$deploymentObject->appDeploymentDescription}}@endif</textarea> </div> <hr/> <div class="form-group"> - <div class="show-load-cmds"> - @if( isset( $deploymentObject)) - @foreach( (array)$deploymentObject->moduleLoadCmds as $index => $cmd) - <input name="moduleLoadCmds[]" type="text" class="form-control" placeholder="Module Load Command" value="{{$cmd}}" readonly /> - @endforeach - @endif - </div> - <button type="button" class="btn btn-default control-label add-load-cmd hide">Add Module Load Commands</label> + <div class="show-load-cmds"> + @if( isset( $deploymentObject)) + @foreach( (array)$deploymentObject->moduleLoadCmds as $index => $cmd) + <input name="moduleLoadCmds[]" type="text" class="form-control" placeholder="Module Load Command" + value="{{$cmd}}" readonly/> + @endforeach + @endif + </div> + <button type="button" class="btn btn-default control-label add-load-cmd hide">Add Module Load Commands</button> </div> <hr/> <div class="form-group"> - <div class="show-lib-prepend-paths"> - <h5>Library Prepend Paths</h5> - @if( isset( $deploymentObject)) - @foreach( (array)$deploymentObject->libPrependPaths as $path) - <div class="col-md-12 well"> - <input name="libraryPrependPathName[]" type="text" class="col-md-4" placeholder="Name" value="{{$path->name}}" readonly/> - <input name="libraryPrependPathValue[]" type="text" class="col-md-8" placeholder="Value" value="{{$path->value}}" readonly/> - </div> - @endforeach - @endif - </div> - <button type="button" class="btn btn-default control-label add-lib-prepend-path hide">Add a Library Prepend Path</label> + <div class="show-lib-prepend-paths"> + <h5>Library Prepend Paths</h5> + @if( isset( $deploymentObject)) + @foreach( (array)$deploymentObject->libPrependPaths as $path) + <div class="col-md-12 well"> + <input name="libraryPrependPathName[]" type="text" class="col-md-4" placeholder="Name" + value="{{$path->name}}" readonly/> + <input name="libraryPrependPathValue[]" type="text" class="col-md-8" placeholder="Value" + value="{{$path->value}}" readonly/> + </div> + @endforeach + @endif + </div> + <button type="button" class="btn btn-default control-label add-lib-prepend-path hide">Add a Library Prepend Path + </button> </div> <hr/> <div class="form-group"> - <div class="show-lib-append-paths"> - <h5>Library Append Paths</h5> - @if( isset( $deploymentObject)) - @foreach( (array)$deploymentObject->libAppendPaths as $path) - <div class="col-md-12 well"> - <input name="libraryAppendPathName[]" type="text" class="col-md-4" placeholder="Name" value="{{$path->name}}" readonly/> - <input name="libraryAppendPathValue[]" type="text" class="col-md-8" placeholder="Value" value="{{$path->value}}" readonly/> - </div> - @endforeach - @endif - </div> - <button type="button" class="btn btn-default control-label add-lib-append-path hide">Add a Library Append Path</label> + <div class="show-lib-append-paths"> + <h5>Library Append Paths</h5> + @if( isset( $deploymentObject)) + @foreach( (array)$deploymentObject->libAppendPaths as $path) + <div class="col-md-12 well"> + <input name="libraryAppendPathName[]" type="text" class="col-md-4" placeholder="Name" + value="{{$path->name}}" readonly/> + <input name="libraryAppendPathValue[]" type="text" class="col-md-8" placeholder="Value" + value="{{$path->value}}" readonly/> + </div> + @endforeach + @endif + </div> + <button type="button" class="btn btn-default control-label add-lib-append-path hide">Add a Library Append Path + </button> </div> <hr/> <div class="form-group"> - <div class="show-environments"> - <h5>Environments</h5> - @if( isset( $deploymentObject)) - @foreach( (array)$deploymentObject->setEnvironment as $path) - <div class="col-md-12 well"> - <input name="environmentName[]" type="text" class="col-md-4" placeholder="Name" value="{{$path->name}}" readonly/> - <input name="environmentValue[]" type="text" class="col-md-8" placeholder="Value" value="{{$path->value}}" readonly/> - </div> - @endforeach - @endif - </div> - <button type="button" class="btn btn-default control-label add-environment hide">Add Environment</label> + <div class="show-environments"> + <h5>Environments</h5> + @if( isset( $deploymentObject)) + @foreach( (array)$deploymentObject->setEnvironment as $path) + <div class="col-md-12 well"> + <input name="environmentName[]" type="text" class="col-md-4" placeholder="Name" value="{{$path->name}}" + readonly/> + <input name="environmentValue[]" type="text" class="col-md-8" placeholder="Value" value="{{$path->value}}" + readonly/> + </div> + @endforeach + @endif + </div> + <button type="button" class="btn btn-default control-label add-environment hide">Add Environment</button> </div> <div class="form-group"> - <div class="show-preJobCommands"> - <h5>Pre Job Commands</h5> - @if( isset( $deploymentObject)) - @foreach( (array)$deploymentObject->preJobCommands as $preJobCommand) - <div class="col-md-12 well"> - <input name="preJobCommand[]" type="text" class="col-md-12" placeholder="Pre Job Command" value="{{$preJobCommand}}" readonly/> - </div> - @endforeach - @endif - </div> - <button type="button" class="btn btn-default control-label add-preJobCommand hide">Add Pre Job Command</label> + <div class="show-preJobCommands"> + <h5>Pre Job Commands</h5> + @if( isset( $deploymentObject)) + @foreach( (array)$deploymentObject->preJobCommands as $preJobCommand) + <div class="col-md-12 well"> + <input name="preJobCommand[]" type="text" class="col-md-12" placeholder="Pre Job Command" + value="{{$preJobCommand}}" readonly/> + </div> + @endforeach + @endif + </div> + <button type="button" class="btn btn-default control-label add-preJobCommand hide">Add Pre Job Command</button> </div> <div class="form-group"> - <div class="show-postJobCommands"> - <h5>Post Job Commands</h5> - @if( isset( $deploymentObject)) - @foreach( (array)$deploymentObject->postJobCommands as $postJobCommand) - <div class="col-md-12 well"> - <input name="postJobCommand[]" type="text" class="col-md-12" placeholder="Post Job Command" value="{{$postJobCommand}}" readonly/> - </div> - @endforeach - @endif - </div> - <button type="button" class="btn btn-default control-label add-postJobCommand hide">Add Post Job Command</label> + <div class="show-postJobCommands"> + <h5>Post Job Commands</h5> + @if( isset( $deploymentObject)) + @foreach( (array)$deploymentObject->postJobCommands as $postJobCommand) + <div class="col-md-12 well"> + <input name="postJobCommand[]" type="text" class="col-md-12" placeholder="Post Job Command" + value="{{$postJobCommand}}" readonly/> + </div> + @endforeach + @endif + </div> + <button type="button" class="btn btn-default control-label add-postJobCommand hide">Add Post Job Command</button> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/partials/experiment-info.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php index a57f922..623eb53 100644 --- a/app/views/partials/experiment-info.blade.php +++ b/app/views/partials/experiment-info.blade.php @@ -1,19 +1,19 @@ - <div class="container" style="max-width: 750px;"> +<div class="container" style="max-width: 750px;"> @if(isset( $invalidExperimentId ) ) - <div class="alert alert-danger"> - The Experiment ID does not exist. Please go to correct experiment. - </div> + <div class="alert alert-danger"> + The Experiment ID does not exist. Please go to correct experiment. + </div> @else <h1> Experiment Summary @if( !isset($dashboard)) <small><a href="{{ URL::to('/') }}/experiment/summary?expId={{ $experiment->experimentID }}" title="Refresh"><span class="glyphicon glyphicon-refresh refresh-exp"></span></a></small> - @endif + @endif </h1> - - + + <table class="table"> <tr> <td><strong>Experiment Id</strong></td> @@ -57,16 +57,16 @@ <td><strong>Working Dir</strong></td> <?php - foreach($jobDetails as $job) echo ' + foreach ($jobDetails as $job) echo ' <td>' . $job->workingDir . '</td> '; ?> </tr> - <tr> + <tr> <td><strong>Job Description</strong></td> <?php - foreach($jobDetails as $job) echo ' + foreach ($jobDetails as $job) echo ' <td>' . $job->jobDescription . '</td> '; ?> @@ -99,23 +99,23 @@ </tr> <tr> <td><strong>Inputs</strong></td> - <td><?php Utilities::list_input_files($experiment); ?></td> + <td><?php ProjectUtilities::get_project($experiment->projectID); ?></td> </tr> <tr> <td><strong>Outputs</strong></td> - <td><?php Utilities::list_output_files($experiment, $expVal["experimentStatusString"]); ?></td> + <td><?php ExperimentUtilities::list_output_files($experiment, $expVal["experimentStatusString"]); ?></td> </tr> @if( $expVal["experimentStatusString"] == "FAILED") <tr> <td><strong>Errors</strong></td> <td> @foreach( (array)$experiment->errors as $error) - {{ $error->actualErrorMessage }} + {{ $error->actualErrorMessage }} @endforeach </td> </tr> @endif - + </table> @if( !isset( $dashboard)) @@ -125,12 +125,13 @@ type="submit" class="btn btn-success" value="Launch" - title="Launch the experiment" <?php if(!$expVal["editable"] ) echo 'disabled' ?>> + title="Launch the experiment" <?php if (!$expVal["editable"]) echo 'disabled' ?>> <a href="{{URL::to('/') }}/experiment/cancel?expId={{ $experiment->experimentID }}" class="btn btn-default" role="button" - title="Edit the experiment's settings" <?php if(!$expVal["cancelable"] ) echo 'disabled' ?>> - <input name="cancel" type="submit" class="btn btn-warning" value="Cancel" <?php if(!$expVal["cancelable"]) echo 'disabled'; ?> > + title="Edit the experiment's settings" <?php if (!$expVal["cancelable"]) echo 'disabled' ?>> + <input name="cancel" type="submit" class="btn btn-warning" + value="Cancel" <?php if (!$expVal["cancelable"]) echo 'disabled'; ?> > </a> <input name="clone" type="submit" @@ -142,7 +143,7 @@ <a href="{{URL::to('/') }}/experiment/edit?expId={{ $experiment->experimentID }}" class="btn btn-default" role="button" - title="Edit the experiment's settings" <?php if(!$expVal["editable"] ) echo 'disabled' ?>> + title="Edit the experiment's settings" <?php if (!$expVal["editable"]) echo 'disabled' ?>> <span class="glyphicon glyphicon-pencil"></span> Edit </a> @@ -157,5 +158,5 @@ @section('scripts') @parent - {{ HTML::script('js/time-conversion.js')}} +{{ HTML::script('js/time-conversion.js')}} @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/partials/experiment-inputs.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/experiment-inputs.blade.php b/app/views/partials/experiment-inputs.blade.php index b66381d..93d2aa5 100644 --- a/app/views/partials/experiment-inputs.blade.php +++ b/app/views/partials/experiment-inputs.blade.php @@ -1,25 +1,29 @@ <div class="form-group required"> <label for="experiment-name" class="control-label">Experiment Name</label> - <input type="text" class="form-control" name="experiment-name" id="experiment-name" placeholder="Enter experiment name" autofocus required="required" {{ $expInputs['disabled'] }} value="{{ $expInputs['experimentName'] }}"> + <input type="text" class="form-control" name="experiment-name" id="experiment-name" + placeholder="Enter experiment name" autofocus required="required" {{ $expInputs['disabled'] }} value="{{ + $expInputs['experimentName'] }}"> </div> <div class="form-group"> <label for="experiment-description">Experiment Description</label> - <textarea class="form-control" name="experiment-description" id="experiment-description" placeholder="Optional: Enter a short description of the experiment" {{ $expInputs['disabled'] }}>{{ $expInputs['experimentDescription'] }}</textarea> + <textarea class="form-control" name="experiment-description" id="experiment-description" + placeholder="Optional: Enter a short description of the experiment" {{ $expInputs['disabled'] }}>{{ + $expInputs['experimentDescription'] }}</textarea> </div> <div class="form-group required"> <label for="project" class="control-label">Project</label> @if( isset( $expInputs['cloning'])) - {{ Utilities::create_project_select($expInputs['experiment']->projectID, $expInputs['expVal']['editable']) }} + {{ ProjectUtilities::create_project_select($expInputs['experiment']->projectID, $expInputs['expVal']['editable']) }} @else - {{ Utilities::create_project_select($expInputs['project'], !$expInputs['disabled']) }} + {{ ProjectUtilities::create_project_select($expInputs['project'], !$expInputs['disabled']) }} @endif </div> - <div class="form-group"> +<div class="form-group"> <label for="application">Application</label> @if( isset( $expInputs['cloning'])) - {{ Utilities::create_application_select($expInputs['application'], false)}} + {{ ExperimentUtilities::create_application_select($expInputs['application'], false)}} @else - {{ Utilities::create_application_select($expInputs['application'], !$expInputs['disabled']) }} + {{ ExperimentUtilities::create_application_select($expInputs['application'], !$expInputs['disabled']) }} @endif </div> @@ -27,63 +31,75 @@ <div class="panel-heading">Application configuration</div> <div class="panel-body"> <label>Application input</label> + <div class="well"> <input type="hidden" id="allowedFileSize" value="{{$expInputs['allowedFileSize']}}"/> @if( isset( $expInputs['cloning'])) - <div class="form-group"> - <p><strong>Current inputs</strong></p> - {{ Utilities::list_input_files($expInputs['experiment']) }} - </div> - {{ Utilities::create_inputs($expInputs['application'], false) }} + <div class="form-group"> + <p><strong>Current inputs</strong></p> + {{ ExperimentUtilities::list_input_files($expInputs['experiment']) }} + </div> + {{ ExperimentUtilities::create_inputs($expInputs['application'], false) }} @else - {{ Utilities::create_inputs($expInputs['application'], true) }} + {{ ExperimentUtilities::create_inputs($expInputs['application'], true) }} @endif </div> <div class="form-group required"> <label class="control-label" for="compute-resource">Compute Resource</label> @if( count( $expInputs['computeResources']) > 0) - <select class="form-control" name="compute-resource" id="compute-resource" required="required"> - <option value="">Select a resource</option> + <select class="form-control" name="compute-resource" id="compute-resource" required="required"> + <option value="">Select a resource</option> @foreach ($expInputs['computeResources'] as $id => $name) - <option value="{{$id}}" {{ ($expInputs['resourceHostId'] == $id)? ' selected' : '' }}>{{$name}}</option> + <option value="{{$id}}" + {{ ($expInputs['resourceHostId'] == $id)? ' selected' : '' }}>{{$name}}</option> @endforeach - </select> + </select> @else - <h4>Application deployed Computational resources are currently available - @endif + <h4>Application deployed Computational resources are currently available + @endif </div> <div class="queue-block"> <div class="loading-img text-center hide"> <img src="../assets/ajax-loader.gif"/> </div> - <input type="hidden" name="selected-queue" value="@if(isset($expInputs['expVal']) ){{ $expInputs['expVal']['scheduling']->queueName }} @endif"/> + <input type="hidden" name="selected-queue" + value="@if(isset($expInputs['expVal']) ){{ $expInputs['expVal']['scheduling']->queueName }} @endif"/> + <div class="queue-view"> @if(isset($expInputs['expVal']) ) - @include( 'partials/experiment-queue-block', array('queues'=> $expInputs['expVal']['computeResource']->batchQueues, 'expVal' => $expInputs['expVal']) ) + @include( 'partials/experiment-queue-block', array('queues'=> + $expInputs['expVal']['computeResource']->batchQueues, 'expVal' => $expInputs['expVal']) ) @endif + </div> </div> </div> -</div> -<h3>Notifications</h3> -<div class="form-group well"> - <label for=""></label> - <input type="checkbox" id="enableEmail" name="enableEmailNotification" value="1"> Do you want to receive email notifications for status changes in the experiment?<br/> - <div class="emailSection hide"> - <h4>Enter Email Address here.</h4> - <div class="emailAddresses"> - <input type="email" id="emailAddresses" class="form-control" name="emailAddresses[]" placeholder="Email"/> - </div> - <button type="button" class="addEmail btn btn-default">Add another Email</button> - </div> -</div> + <h3>Notifications</h3> + + <div class="form-group well"> + <label for=""></label> + <input type="checkbox" id="enableEmail" name="enableEmailNotification" value="1"> Do you want to receive email + notifications for status changes in the experiment?<br/> -@if( $expInputs["advancedOptions"]) -<h3>Advanced Options</h3> -<div class="form-group well"> - <h4>Enter UserDN</h4> - <div class="userdninfo"> - <input type="text" class="form-control" name="userDN" placeholder="user"/> + <div class="emailSection hide"> + <h4>Enter Email Address here.</h4> + + <div class="emailAddresses"> + <input type="email" id="emailAddresses" class="form-control" name="emailAddresses[]" + placeholder="Email"/> + </div> + <button type="button" class="addEmail btn btn-default">Add another Email</button> + </div> </div> -</div> -@endif + + @if( $expInputs["advancedOptions"]) + <h3>Advanced Options</h3> + + <div class="form-group well"> + <h4>Enter UserDN</h4> + + <div class="userdninfo"> + <input type="text" class="form-control" name="userDN" placeholder="user"/> + </div> + </div> + @endif
