Repository: airavata-php-gateway Updated Branches: refs/heads/master 71890a7fa -> 2fbd92892
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/resource/edit.blade.php ---------------------------------------------------------------------- diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php index 5cd33cc..b41e766 100644 --- a/app/views/resource/edit.blade.php +++ b/app/views/resource/edit.blade.php @@ -1,592 +1,654 @@ @extends('layout.basic') @section('page-header') - @parent - {{ HTML::style('css/style.css') }} +@parent +{{ HTML::style('css/style.css') }} @stop @section('content') <div class="container"> - <div class="col-md-offset-2 col-md-8"> - - <input type="hidden" class="base-url" value="{{URL::to('/')}}"/> - - <div class="well"> - <h4>Compute Resource : {{ $computeResource->hostName }}</h4> - </div> - @if( Session::has("message")) - <span class="alert alert-success col-md-12">{{Session::get("message")}}</span> - {{Session::forget("message") }} - @endif - - <div class="col-md-12"> - <ul class="nav nav-tabs nav-justified" id="tabs" role="tablist"> - <li class="active"><a href="#tab-desc" data-toggle="tab">Description</a></li> - <li><a href="#tab-queues" data-toggle="tab">Queues</a></a></li> - <li><a href="#tab-filesystem" data-toggle="tab">FileSystem</a></li> - <li><a href="#tab-jobSubmission" data-toggle="tab">Job Submission Interfaces</a></li> - <li><a href="#tab-dataMovement" data-toggle="tab">Data Movement Interfaces</a></li> - </ul> - </div> - - <div class="tab-content"> - - <div class="tab-pane active" id="tab-desc"> - - <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit"> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="cr-edit" value="resDesc"/> - <div class="form-group required"> - <label class="control-label">Host Name</label> - <input class="form-control hostName" value="{{ $computeResource->hostName }}" maxlength="100" name="hostname" required="required"/> - </div> - <div class="form-group"> - <label class="control-label">Host Aliases</label> - @if( count( $computeResource->hostAliases) ) - @foreach( $computeResource->hostAliases as $hostAlias ) - <input class="form-control" value="{{$hostAlias}}" maxlength="30" name="hostaliases[]"/> - @endforeach - @else - <input class="form-control" value="" maxlength="30" name="hostaliases[]"/> - @endif - <button type="button" class="btn btn-sm btn-default add-alias">Add Aliases</button> - </div> - <div class="form-group"> - <label class="control-label">IP Addresses</label> - @if( count( $computeResource->ipAddresses)) - @foreach( $computeResource->ipAddresses as $ip ) - <input class="form-control" value="{{ $ip }}" maxlength="30" name="ips[]"/> - @endforeach - @else - <input class="form-control" value="" maxlength="30" name="ips[]"/> - @endif - <button type="button" class="btn btn-sm btn-default add-ip">Add IP Addresses</button> - </div> - <div class="form-group"> - <label class="control-label">Resource Description</label> - <textarea class="form-control" maxlength="255" name="description">{{ $computeResource->resourceDescription }}</textarea> - </div> - <div class="form-group"> - <label class="control-label">Maximum Memory Per Node ( In MB )</label> - <input type="number" min="0" class="form-control" value="{{ $computeResource->maxMemoryPerNode }}" maxlength="30" name="maxMemoryPerNode"/> - </div> - <div class="form-group"> - <input type="submit" class="btn btn-primary" name="step1" value="Save changes"/> - </div> - - </form> - - </div> - - <div class="tab-pane" id="tab-queues"> - - @if( is_array( $computeResource->batchQueues) ) - <h3>Existing Queues :</h3> - <div class="panel-group" id="accordion"> - @foreach( $computeResource->batchQueues as $index => $queue) - <div class="panel panel-default"> - <div class="panel-heading"> - <h4 class="panel-title"> - <a class="accordion-toggle collapsed existing-queue-name" data-toggle="collapse" data-parent="#accordion" href="#collapse-{{$index}}">{{ $queue->queueName }}</a> - <div class="pull-right col-md-1"> - <span class="glyphicon glyphicon-trash delete-queue" style="cursor:pointer;" data-toggle="modal" data-target="#delete-queue" data-queue-name="{{ $queue->queueName }}"></span> - </div> - </h4> - </div> - <div id="collapse-{{$index}}" class="panel-collapse collapse"> - <div class="panel-body"> - <form role="form" method="POST" action="{{ URL::to('/')}}/cr/edit"> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <div class="queue"> - <input type="hidden" name="cr-edit" value="queue"/> - <div class="form-group required"> - <label class="control-label">Queue Name <small> ( cannot be changed.) </small></label> - <input class="form-control" value="{{ $queue->queueName }}" maxlength="30" name="qname" placeholder="Queue Name" readonly /> - </div> - @include('partials/queue-block', array('queueData'=>$queue)) - <div class="form-group"> - <input type="submit" min="0" class="btn" name="step1" value="Update"/> - </div> - </div> - </form> - </div> - </div> - </div> - @endforeach - </div> - @endif - <div class="queue-block hide"> - <form role="form" method="POST" action="{{ URL::to('/')}}/cr/edit"> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <div class="queue"> - <div class="queue"> - <input type="hidden" name="cr-edit" value="queue"/> - <div class="form-group required"> - <label class="control-label">Queue Name<small> ( A queue name is unique and cannot be changed later.)</small></label> - <input class="form-control create-queue-name" maxlength="30" name="qname" placeholder="Queue Name" required="required"/> - </div> - @include('partials/queue-block') - - </div> - <div class="form-group"> - <input type="button" class="btn create-queue-form btn-primary" name="step1" value="Create"/> - <input type="reset" class="btn btn-success" value="Reset"/> - </div> - </div> - </form> - </div> - <div class="form-group well add-queue-block"> - <button type="button" class="btn btn-sm btn-default add-queue">Add a Queue</button> - </div> - - </div> - - <div class="tab-pane" id="tab-filesystem"> - - <form role="form" method="POST" action="{{URL::to('/')}}/cr/edit"> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="cr-edit" value="fileSystems"/> - <div class="form-group"> - <h3>FileSystem</h3> - @foreach( $fileSystems as $index => $fileSystem) - <label class="control-label">{{ $fileSystem }}</label> - <input class="form-control" name="fileSystems[{{ $index }}]" placeholder="{{ $fileSystem }}" value="@if( isset( $computeResource->fileSystems[ $index]) ){{ $computeResource->fileSystems[ $index] }} @endif"/> - @endforeach - </select> - </div> - <div class="form-group"> - <button class="btn btn-prim">Update</button> - </div> - </form> - - </div> - - <div class="tab-pane" id="tab-jobSubmission"> - - <div class="form-group"> - <div class="job-submission-info row hide"></div> - <button type="button" class="btn btn-sm btn-default add-job-submission">Add a new Job Submission Interface</button> - @if( count( $jobSubmissionInterfaces ) > 1) - <button type="button" class="btn btn-sm btn-default update-priority" data-type="jsi" data-toggle="modal" data-target="#update-jsi-priority">Update Priority</button> - @endif - </div> - - @if( count( $jobSubmissionInterfaces ) ) - <div class="job-edit-info"> - @foreach( $jobSubmissionInterfaces as $index => $JSI ) - - <div class="job-protocol-block"> - <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit"> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="cr-edit" value="edit-jsp"/> - <input type="hidden" name="jsiId" value="{{ $JSI->jobSubmissionInterfaceId }}"/> - <?php $selectedJspIndex = $computeResource->jobSubmissionInterfaces[ $index]->jobSubmissionProtocol; ?> - - <h4>Job Submission Protocol : {{ $jobSubmissionProtocols[ $selectedJspIndex] }} - <button type='button' class='close delete-jsi' data-toggle="modal" data-target="#confirm-delete-jsi" data-jsi-id="{{ $JSI->jobSubmissionInterfaceId }}"> - <span class="glyphicon glyphicon-trash delete-jsi" data-toggle="modal" data-target="#confirm-delete-jsi" data-jsi-id="{{ $JSI->jobSubmissionInterfaceId }}"></span> - </button> - </h4> - <input type="hidden" name="jobSubmissionProtocol" value="{{ $selectedJspIndex }}"/> - @if( $selectedJspIndex == $jobSubmissionProtocolsObject::LOCAL) - <div class="select-resource-manager-type"> - <div class="form-group required"> - <label class="control-label">Select resource manager type</label> - <select name="resourceJobManagerType" class="form-control selected-resource-manager" required="required"> - @foreach( $resourceJobManagerTypes as $index => $rJmT) - <option value="{{ $index }}" @if( $JSI->resourceJobManager->resourceJobManagerType == $index ) selected @endif >{{ $rJmT }}</option> - @endforeach - </select> - </div> - <div class="form-group"> - <label class="control-label">Push Monitoring End Point</label> - <input type="text" class="form-control" name="pushMonitoringEndpoint" value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/> - </div> - <div class="form-group"> - <label class="control-label">Job Manager Bin Path</label> - <input type="text" class="form-control" name="jobManagerBinPath" value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/> - </div> - <div class="form-group"> - <h3>Job Manager Commands</h3> - @foreach( $jobManagerCommands as $index => $jmc) - <label class="control-label">{{ $jmc }}</label> - <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}" value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index] ) ) {{ $JSI->resourceJobManager->jobManagerCommands[$index] }} @endif"/> - @endforeach - </select> - </div> - </div> - @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::SSH) - <div class="form-group required"> - <label class="control-label">Select Security Protocol</label> - <select name="securityProtocol" required="required"> - @foreach( $securityProtocols as $index => $sp) - <option value="{{ $index }}" @if( $JSI->securityProtocol == $index ) selected @endif>{{ $sp }}</option> - @endforeach - </select> - </div> - - <div class="form-group"> - <label class="control-label">Alternate SSH Host Name</label> - <input class='form-control' name='alternativeSSHHostName' value="{{ $JSI->alternativeSSHHostName}}"/> - </div> - <div class="form-group"> - <label class="control-label">SSH Port</label> - <input class='form-control' name='sshPort' value="{{ $JSI->sshPort }}"/> - </div> - - <div class="form-group required"> - <label class="control-label">Select Monitoring Mode</label> - <select name="monitorMode" required> - @foreach( $monitorModes as $index => $mode) - <option value="{{ $index }}" @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</option> - @endforeach - </select> - </div> - - <div class="form-group"> - <div class="select-resource-manager-type"> - <div class="form-group required"> - <label class="control-label">Select resource manager type</label> - <select name="resourceJobManagerType" class="form-control selected-resource-manager" required="required"> - @foreach( $resourceJobManagerTypes as $index => $rJmT) - <option value="{{ $index }}" @if( $JSI->resourceJobManager->resourceJobManagerType == $index ) selected @endif >{{ $rJmT }}</option> - @endforeach - </select> - </div> - <div class="form-group"> - <label class="control-label">Push Monitoring End Point</label> - <input type="text" class="form-control" name="pushMonitoringEndpoint" value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/> - </div> - <div class="form-group"> - <label class="control-label">Job Manager Bin Path</label> - <input type="text" class="form-control" name="jobManagerBinPath" value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/> - </div> - <div class="form-group"> - <h3>Job Manager Commands</h3> - @foreach( $jobManagerCommands as $index => $jmc) - <label class="control-label">{{ $jmc }}</label> - <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}" value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index] ) ) {{ $JSI->resourceJobManager->jobManagerCommands[$index] }} @endif"/> - @endforeach - </div> - </div> - </div> - - @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::UNICORE) - <div class="form-group required"> - <label class="control-label">Select Security Protocol</label> - <select name="securityProtocol" required="required"> - @foreach( $securityProtocols as $index => $sp) - <option value="{{ $index }}" @if( $JSI->securityProtocol == $index ) selected @endif>{{ $sp }}</option> - @endforeach - </select> - </div> - <div class="form-group"> - <label class="form-label">Unicore End Point URL</label> - <input class='form-control' name='unicoreEndPointURL' value="{{ $JSI->unicoreEndPointURL }}"/> - </div> - @endif - <div class="form-group"> - <button type="submit" class="btn">Update</button> - </div> - </form> - - </div> - @endforeach - </div> - @endif - - <div class="select-job-protocol hide"> - <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit"> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="cr-edit" value="jsp"/> - - <div class="form-group"> - <label class="control-label">Job Submission Protocol:</label> - <select name="jobSubmissionProtocol" class="form-control selected-job-protocol" required="required"> - <option></option> - @foreach( $jobSubmissionProtocols as $index => $jobSubmissionProtocol) - @if( ! in_array( $index, $addedJSP)) - <option value="{{ $index }}">{{ $jobSubmissionProtocol }}</option> - @endif - @endforeach - </select> - </div> - - <div class="form-group"> - <button type="submit" class="btn btn-primary jspSubmit hide">Add Job Submission Protocol</button> - </div> - </form> - </div> - - </div> - - <div class="tab-pane" id="tab-dataMovement"> - - <div class="form-group"> - <div class="data-movement-info row hide"></div> - <button type="button" class="btn btn-sm btn-default add-data-movement">Add a new Data Movement Interface</button> - @if( count( $dataMovementInterfaces ) > 1) - <button type="button" class="btn btn-sm btn-default update-priority" data-type="dmi" data-toggle="modal" data-target="#update-dmi-priority">Update Priority</button> - @endif - </div> - - @if( count( $dataMovementInterfaces ) ) - <div class="job-edit-info"> - @foreach( $dataMovementInterfaces as $index => $DMI ) - <div class="data-movement-block"> - <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit"> - <input type="hidden" name="crId" class="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="cr-edit" value="edit-dmi"/> - <input type="hidden" name="dmiId" value="{{ $DMI->dataMovementInterfaceId }}"/> - - <?php $selectedDMIIndex = $computeResource->dataMovementInterfaces[ $index]->dataMovementProtocol; ?> - - <h4>Data Movement Protocol : {{ $dataMovementProtocols[ $selectedDMIIndex] }} - <button type='button' class='close delete-dmi' data-toggle="modal" data-target="#confirm-delete-dmi" data-dmi-id="{{ $DMI->dataMovementInterfaceId }}"> - <span class="glyphicon glyphicon-trash delete-dmi" data-toggle="modal" data-target="#confirm-delete-dmi" data-dmi-id="{{ $DMI->dataMovementInterfaceId }}"></span> - </button> - </h4> - <input type="hidden" name="dataMovementProtocol" value="{{ $selectedDMIIndex }}"/> - @if( $selectedDMIIndex == $dataMovementProtocolsObject::LOCAL) - <!-- Nothing here on local UI --> - @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::SCP) - <div class="form-group"> - <label class="control-label">Select Security Protocol</label> - <select name="securityProtocol"> - @foreach( $securityProtocols as $index => $sp) - <option value="{{ $index }}" @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option> - @endforeach - </select> - </div> - - <div class="form-group"> - <label class="control-label">Alternate SSH Host Name</label> - <input class='form-control' name='alternativeSSHHostName' value="{{ $DMI->alternativeSCPHostName }}"/> - </div> - <div class="form-group"> - <label class="control-label">SSH Port</label> - <input class='form-control' name='sshPort' value="{{ $DMI->sshPort }}"/> - </div> - <div class="form-group"> - <button type="submit" class="btn">Update</button> - </div> - @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::GridFTP) - <div class="form-group"> - <label class="control-label">Select Security Protocol</label> - <select name="securityProtocol"> - @foreach( $securityProtocols as $index => $sp) - <option value="{{ $index }}" @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option> - @endforeach - </select> - <div> - <div class="form-group required"> - <label class="control-label">Grid FTP End Points</label> - @foreach( $DMI->gridFTPEndPoints as $endPoint) - <input class="form-control" maxlength="30" name="gridFTPEndPoints[]" required="required" value="{{$endPoint}}"/> - @endforeach - <button type="button" class="btn btn-sm btn-default add-gridFTPEndPoint">Add More Grid FTP End Points</button> - </div> - </div> - <div class="form-group"> - <button type="submit" class="btn">Update</button> - </div> - </div> - @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::UNICORE_STORAGE_SERVICE) - <div class="form-group"> - <label class="control-label">Select Security Protocol</label> - <select name="securityProtocol"> - @foreach( $securityProtocols as $index => $sp) - <option value="{{ $index }}" @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option> - @endforeach - </select> - <div> - <div class="form-group required"> - <label class="control-label">Unicore End Point URL</label> - <input class="form-control" maxlength="30" name="unicoreEndPointURL" required="required" value="{{ $DMI->unicoreEndPointURL }}"/> - </div> - </div> - <div class="form-group"> - <button type="submit" class="btn">Update</button> - </div> - </div> - @endif - </form> - </div> - @endforeach - </div> - @endif - <div class="select-data-movement hide"> - - <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit"> - <input type="hidden" name="crId" class="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="cr-edit" value="dmp"/> - <h4> - Select the Data Movement Protocol - </h4> - - <select name="dataMovementProtocol" class="form-control selected-data-movement-protocol"> - <option></option> - @foreach( $dataMovementProtocols as $index => $dmp) - @if( ! in_array( $index, $addedDMI)) - <option value="{{ $index }}">{{ $dmp }}</option> - @endif - @endforeach - </select> - - <div class="form-group"> - <button type="submit" class="btn btn-primary dmpSubmit hide">Add Data Movement Protocol</button> - </div> - - </form> - - </div> - - </div> - - - </div> - - - <div class="resource-manager-block hide"> - <div class="select-resource-manager-type"> - <div class="form-group required"> - <label class="control-label">Select resource manager type</label> - <select name="resourceJobManagerType" class="form-control selected-resource-manager" required="required"> - @foreach( $resourceJobManagerTypes as $index => $rJmT) - <option value="{{ $index }}">{{ $rJmT }}</option> - @endforeach - </select> - </div> - </div> - <div class="form-group"> - <label class="control-label">Push Monitoring End Point</label> - <input type="text" class="form-control" name="pushMonitoringEndpoint"/> - </div> - <div class="form-group"> - <label class="control-label">Job Manager Bin Path</label> - <input type="text" class="form-control" name="jobManagerBinPath"/> - </div> - <div class="form-group"> - <h3>Job Manager Commands</h3> - @foreach( $jobManagerCommands as $index => $jmc) - <label class="control-label">{{ $jmc }}</label> - <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}"/> - @endforeach - </select> - </div> - </div> - - <div class="ssh-block hide"> - <div class="form-group required"> - <label class="control-label">Select Security Protocol </label> - <select name="securityProtocol" required> - @foreach( $securityProtocols as $index => $sp) - <option value="{{ $index }}">{{ $sp }}</option> - @endforeach - </select> - </div> - - <div class="form-group required"> - <label class="control-label">Select Monitoring Mode </label> - <select name="monitorMode" required> - @foreach( $monitorModes as $index => $mode) - <option value="{{ $index }}">{{ $mode}}</option> - @endforeach - </select> - </div> - - <div class="form-group addedScpValue hide"> - <label class="control-label">Alternate SSH Host Name</label> - <input class='form-control' name='alternativeSSHHostName'/> +<div class="col-md-offset-2 col-md-8"> + +<input type="hidden" class="base-url" value="{{URL::to('/')}}"/> + +<div class="well"> + <h4>Compute Resource : {{ $computeResource->hostName }}</h4> +</div> +@if( Session::has("message")) +<span class="alert alert-success col-md-12">{{Session::get("message")}}</span> +{{Session::forget("message") }} +@endif + +<div class="col-md-12"> + <ul class="nav nav-tabs nav-justified" id="tabs" role="tablist"> + <li class="active"><a href="#tab-desc" data-toggle="tab">Description</a></li> + <li><a href="#tab-queues" data-toggle="tab">Queues</a></a></li> + <li><a href="#tab-filesystem" data-toggle="tab">FileSystem</a></li> + <li><a href="#tab-jobSubmission" data-toggle="tab">Job Submission Interfaces</a></li> + <li><a href="#tab-dataMovement" data-toggle="tab">Data Movement Interfaces</a></li> + </ul> +</div> + +<div class="tab-content"> + +<div class="tab-pane active" id="tab-desc"> + + <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit"> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="cr-edit" value="resDesc"/> + + <div class="form-group required"> + <label class="control-label">Host Name</label> + <input class="form-control hostName" value="{{ $computeResource->hostName }}" maxlength="100" + name="hostname" required="required"/> + </div> + <div class="form-group"> + <label class="control-label">Host Aliases</label> + @if( count( $computeResource->hostAliases) ) + @foreach( $computeResource->hostAliases as $hostAlias ) + <input class="form-control" value="{{$hostAlias}}" maxlength="30" name="hostaliases[]"/> + @endforeach + @else + <input class="form-control" value="" maxlength="30" name="hostaliases[]"/> + @endif + <button type="button" class="btn btn-sm btn-default add-alias">Add Aliases</button> + </div> + <div class="form-group"> + <label class="control-label">IP Addresses</label> + @if( count( $computeResource->ipAddresses)) + @foreach( $computeResource->ipAddresses as $ip ) + <input class="form-control" value="{{ $ip }}" maxlength="30" name="ips[]"/> + @endforeach + @else + <input class="form-control" value="" maxlength="30" name="ips[]"/> + @endif + <button type="button" class="btn btn-sm btn-default add-ip">Add IP Addresses</button> + </div> + <div class="form-group"> + <label class="control-label">Resource Description</label> + <textarea class="form-control" maxlength="255" name="description">{{ $computeResource->resourceDescription + }}</textarea> + </div> + <div class="form-group"> + <label class="control-label">Maximum Memory Per Node ( In MB )</label> + <input type="number" min="0" class="form-control" value="{{ $computeResource->maxMemoryPerNode }}" + maxlength="30" name="maxMemoryPerNode"/> + </div> + <div class="form-group"> + <input type="submit" class="btn btn-primary" name="step1" value="Save changes"/> + </div> + + </form> + +</div> + +<div class="tab-pane" id="tab-queues"> + + @if( is_array( $computeResource->batchQueues) ) + <h3>Existing Queues :</h3> + + <div class="panel-group" id="accordion"> + @foreach( $computeResource->batchQueues as $index => $queue) + <div class="panel panel-default"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a class="accordion-toggle collapsed existing-queue-name" data-toggle="collapse" + data-parent="#accordion" href="#collapse-{{$index}}">{{ $queue->queueName }}</a> + + <div class="pull-right col-md-1"> + <span class="glyphicon glyphicon-trash delete-queue" style="cursor:pointer;" data-toggle="modal" + data-target="#delete-queue" data-queue-name="{{ $queue->queueName }}"></span> + </div> + </h4> </div> - <div class="form-group addedScpValue hide"> - <label class="control-label">SSH Port</label> - <input class='form-control' name='sshPort'/> + <div id="collapse-{{$index}}" class="panel-collapse collapse"> + <div class="panel-body"> + <form role="form" method="POST" action="{{ URL::to('/')}}/cr/edit"> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + + <div class="queue"> + <input type="hidden" name="cr-edit" value="queue"/> + + <div class="form-group required"> + <label class="control-label">Queue Name + <small> ( cannot be changed.)</small> + </label> + <input class="form-control" value="{{ $queue->queueName }}" maxlength="30" name="qname" + placeholder="Queue Name" readonly/> + </div> + @include('partials/queue-block', array('queueData'=>$queue)) + <div class="form-group"> + <input type="submit" min="0" class="btn" name="step1" value="Update"/> + </div> + </div> + </form> + </div> </div> - </div> - - <div class="cloud-block hide"> - <div class="form-group"> - <label class="control-label">Node Id</label> - <input class="form-control" name="nodeId" placeholder="nodId"/> - </div> - <div class="form-group"> - <label class="control-label">Node Id</label> - <input class="form-control" name="nodeId" placeholder="nodId"/> - </div> - <div class="form-group"> - <label class="control-label">Executable Type</label> - <input class="form-control" name="nodeId" placeholder="executableType"/> - </div> - <div class="form-group"> - <label class="control-label">Select Provider Name</label> - <select class="form-control"> - <option name="EC2">EC2</option> - <option name="AWSEC2">AWEC2</option> - <option name="RACKSPACE">RACKSPACE</option> - </select> - </div> - </div> - - <div class="dm-gridftp hide"> - <div class="form-group required"> - <label class="control-label">Grid FTP End Points</label> - <input class="form-control" maxlength="30" name="gridFTPEndPoints[]" required/> - <button type="button" class="btn btn-sm btn-default add-gridFTPEndPoint">Add More Grid FTP End Points</button> - </div> - </div> - - <!-- - <div class="form-group"> - <input type="submit" class="btn btn-primary" name="step2" value="Continue"/> - <input type="reset" class="btn btn-success" value="Reset"/> - </div> - - --> - </div> + </div> + @endforeach + </div> + @endif + <div class="queue-block hide"> + <form role="form" method="POST" action="{{ URL::to('/')}}/cr/edit"> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + + <div class="queue"> + <div class="queue"> + <input type="hidden" name="cr-edit" value="queue"/> + + <div class="form-group required"> + <label class="control-label">Queue Name + <small> ( A queue name is unique and cannot be changed later.)</small> + </label> + <input class="form-control create-queue-name" maxlength="30" name="qname" + placeholder="Queue Name" required="required"/> + </div> + @include('partials/queue-block') + + </div> + <div class="form-group"> + <input type="button" class="btn create-queue-form btn-primary" name="step1" value="Create"/> + <input type="reset" class="btn btn-success" value="Reset"/> + </div> + </div> + </form> + </div> + <div class="form-group well add-queue-block"> + <button type="button" class="btn btn-sm btn-default add-queue">Add a Queue</button> + </div> + </div> -<!-- modals --> +<div class="tab-pane" id="tab-filesystem"> -<div class="modal fade" id="confirm-delete-jsi" tabindex="-1" role="dialog" aria-labelledby="delete-modal" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <form action="{{ URL::to('cr/delete-jsi') }}" method="POST"> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="jsiId" value="" class="delete-jsi-confirm"/> - <div class="modal-header"> - Confirmation + <form role="form" method="POST" action="{{URL::to('/')}}/cr/edit"> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="cr-edit" value="fileSystems"/> + + <div class="form-group"> + <h3>FileSystem</h3> + @foreach( $fileSystems as $index => $fileSystem) + <label class="control-label">{{ $fileSystem }}</label> + <input class="form-control" name="fileSystems[{{ $index }}]" placeholder="{{ $fileSystem }}" + value="@if( isset( $computeResource->fileSystems[ $index]) ){{ $computeResource->fileSystems[ $index] }} @endif"/> + @endforeach + </select> + </div> + <div class="form-group"> + <button class="btn btn-prim">Update</button> + </div> + </form> + +</div> + +<div class="tab-pane" id="tab-jobSubmission"> + + <div class="form-group"> + <div class="job-submission-info row hide"></div> + <button type="button" class="btn btn-sm btn-default add-job-submission">Add a new Job Submission Interface + </button> + @if( count( $jobSubmissionInterfaces ) > 1) + <button type="button" class="btn btn-sm btn-default update-priority" data-type="jsi" data-toggle="modal" + data-target="#update-jsi-priority">Update Priority + </button> + @endif + </div> + + @if( count( $jobSubmissionInterfaces ) ) + <div class="job-edit-info"> + @foreach( $jobSubmissionInterfaces as $index => $JSI ) + + <div class="job-protocol-block"> + <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit"> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="cr-edit" value="edit-jsp"/> + <input type="hidden" name="jsiId" value="{{ $JSI->jobSubmissionInterfaceId }}"/> + <?php $selectedJspIndex = $computeResource->jobSubmissionInterfaces[$index]->jobSubmissionProtocol; ?> + + <h4>Job Submission Protocol : {{ $jobSubmissionProtocols[ $selectedJspIndex] }} + <button type='button' class='close delete-jsi' data-toggle="modal" data-target="#confirm-delete-jsi" + data-jsi-id="{{ $JSI->jobSubmissionInterfaceId }}"> + <span class="glyphicon glyphicon-trash delete-jsi" data-toggle="modal" + data-target="#confirm-delete-jsi" + data-jsi-id="{{ $JSI->jobSubmissionInterfaceId }}"></span> + </button> + </h4> + <input type="hidden" name="jobSubmissionProtocol" value="{{ $selectedJspIndex }}"/> + @if( $selectedJspIndex == $jobSubmissionProtocolsObject::LOCAL) + <div class="select-resource-manager-type"> + <div class="form-group required"> + <label class="control-label">Select resource manager type</label> + <select name="resourceJobManagerType" class="form-control selected-resource-manager" + required="required"> + @foreach( $resourceJobManagerTypes as $index => $rJmT) + <option value="{{ $index }}" + @if( $JSI->resourceJobManager->resourceJobManagerType == $index ) selected @endif >{{ $rJmT + }}</option> + @endforeach + </select> + </div> + <div class="form-group"> + <label class="control-label">Push Monitoring End Point</label> + <input type="text" class="form-control" name="pushMonitoringEndpoint" + value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/> + </div> + <div class="form-group"> + <label class="control-label">Job Manager Bin Path</label> + <input type="text" class="form-control" name="jobManagerBinPath" + value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/> + </div> + <div class="form-group"> + <h3>Job Manager Commands</h3> + @foreach( $jobManagerCommands as $index => $jmc) + <label class="control-label">{{ $jmc }}</label> + <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}" + value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index] ) ) {{ $JSI->resourceJobManager->jobManagerCommands[$index] }} @endif"/> + @endforeach + </select> + </div> + </div> + @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::SSH) + <div class="form-group required"> + <label class="control-label">Select Security Protocol</label> + <select name="securityProtocol" required="required"> + @foreach( $securityProtocols as $index => $sp) + <option value="{{ $index }}" + @if( $JSI->securityProtocol == $index ) selected @endif>{{ $sp }}</option> + @endforeach + </select> + </div> + + <div class="form-group"> + <label class="control-label">Alternate SSH Host Name</label> + <input class='form-control' name='alternativeSSHHostName' + value="{{ $JSI->alternativeSSHHostName}}"/> + </div> + <div class="form-group"> + <label class="control-label">SSH Port</label> + <input class='form-control' name='sshPort' value="{{ $JSI->sshPort }}"/> + </div> + + <div class="form-group required"> + <label class="control-label">Select Monitoring Mode</label> + <select name="monitorMode" required> + @foreach( $monitorModes as $index => $mode) + <option value="{{ $index }}" + @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</option> + @endforeach + </select> + </div> + + <div class="form-group"> + <div class="select-resource-manager-type"> + <div class="form-group required"> + <label class="control-label">Select resource manager type</label> + <select name="resourceJobManagerType" class="form-control selected-resource-manager" + required="required"> + @foreach( $resourceJobManagerTypes as $index => $rJmT) + <option value="{{ $index }}" + @if( $JSI->resourceJobManager->resourceJobManagerType == $index ) selected @endif >{{ + $rJmT }}</option> + @endforeach + </select> + </div> + <div class="form-group"> + <label class="control-label">Push Monitoring End Point</label> + <input type="text" class="form-control" name="pushMonitoringEndpoint" + value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/> + </div> + <div class="form-group"> + <label class="control-label">Job Manager Bin Path</label> + <input type="text" class="form-control" name="jobManagerBinPath" + value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/> + </div> + <div class="form-group"> + <h3>Job Manager Commands</h3> + @foreach( $jobManagerCommands as $index => $jmc) + <label class="control-label">{{ $jmc }}</label> + <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}" + value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index] ) ) {{ $JSI->resourceJobManager->jobManagerCommands[$index] }} @endif"/> + @endforeach + </div> + </div> + </div> + + @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::UNICORE) + <div class="form-group required"> + <label class="control-label">Select Security Protocol</label> + <select name="securityProtocol" required="required"> + @foreach( $securityProtocols as $index => $sp) + <option value="{{ $index }}" + @if( $JSI->securityProtocol == $index ) selected @endif>{{ $sp }}</option> + @endforeach + </select> + </div> + <div class="form-group"> + <label class="form-label">Unicore End Point URL</label> + <input class='form-control' name='unicoreEndPointURL' value="{{ $JSI->unicoreEndPointURL }}"/> + </div> + @endif + <div class="form-group"> + <button type="submit" class="btn">Update</button> + </div> + </form> + + </div> + @endforeach + </div> + @endif + + <div class="select-job-protocol hide"> + <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit"> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="cr-edit" value="jsp"/> + + <div class="form-group"> + <label class="control-label">Job Submission Protocol:</label> + <select name="jobSubmissionProtocol" class="form-control selected-job-protocol" required="required"> + <option></option> + @foreach( $jobSubmissionProtocols as $index => $jobSubmissionProtocol) + @if( ! in_array( $index, $addedJSP)) + <option value="{{ $index }}">{{ $jobSubmissionProtocol }}</option> + @endif + @endforeach + </select> </div> - <div class="modal-body"> - Do you really want to delete this Job Submission Interface ? + + <div class="form-group"> + <button type="submit" class="btn btn-primary jspSubmit hide">Add Job Submission Protocol</button> </div> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> - <button type="submit" class="btn btn-danger danger">Delete</button> + </form> + </div> + +</div> + +<div class="tab-pane" id="tab-dataMovement"> + + <div class="form-group"> + <div class="data-movement-info row hide"></div> + <button type="button" class="btn btn-sm btn-default add-data-movement">Add a new Data Movement Interface + </button> + @if( count( $dataMovementInterfaces ) > 1) + <button type="button" class="btn btn-sm btn-default update-priority" data-type="dmi" data-toggle="modal" + data-target="#update-dmi-priority">Update Priority + </button> + @endif + </div> + + @if( count( $dataMovementInterfaces ) ) + <div class="job-edit-info"> + @foreach( $dataMovementInterfaces as $index => $DMI ) + <div class="data-movement-block"> + <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit"> + <input type="hidden" name="crId" class="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="cr-edit" value="edit-dmi"/> + <input type="hidden" name="dmiId" value="{{ $DMI->dataMovementInterfaceId }}"/> + + <?php $selectedDMIIndex = $computeResource->dataMovementInterfaces[$index]->dataMovementProtocol; ?> + + <h4>Data Movement Protocol : {{ $dataMovementProtocols[ $selectedDMIIndex] }} + <button type='button' class='close delete-dmi' data-toggle="modal" data-target="#confirm-delete-dmi" + data-dmi-id="{{ $DMI->dataMovementInterfaceId }}"> + <span class="glyphicon glyphicon-trash delete-dmi" data-toggle="modal" + data-target="#confirm-delete-dmi" + data-dmi-id="{{ $DMI->dataMovementInterfaceId }}"></span> + </button> + </h4> + <input type="hidden" name="dataMovementProtocol" value="{{ $selectedDMIIndex }}"/> + @if( $selectedDMIIndex == $dataMovementProtocolsObject::LOCAL) + <!-- Nothing here on local UI --> + @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::SCP) + <div class="form-group"> + <label class="control-label">Select Security Protocol</label> + <select name="securityProtocol"> + @foreach( $securityProtocols as $index => $sp) + <option value="{{ $index }}" + @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option> + @endforeach + </select> + </div> + + <div class="form-group"> + <label class="control-label">Alternate SSH Host Name</label> + <input class='form-control' name='alternativeSSHHostName' + value="{{ $DMI->alternativeSCPHostName }}"/> + </div> + <div class="form-group"> + <label class="control-label">SSH Port</label> + <input class='form-control' name='sshPort' value="{{ $DMI->sshPort }}"/> + </div> + <div class="form-group"> + <button type="submit" class="btn">Update</button> + </div> + @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::GridFTP) + <div class="form-group"> + <label class="control-label">Select Security Protocol</label> + <select name="securityProtocol"> + @foreach( $securityProtocols as $index => $sp) + <option value="{{ $index }}" + @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option> + @endforeach + </select> + + <div> + <div class="form-group required"> + <label class="control-label">Grid FTP End Points</label> + @foreach( $DMI->gridFTPEndPoints as $endPoint) + <input class="form-control" maxlength="30" name="gridFTPEndPoints[]" required="required" + value="{{$endPoint}}"/> + @endforeach + <button type="button" class="btn btn-sm btn-default add-gridFTPEndPoint">Add More Grid FTP + End Points + </button> + </div> + </div> + <div class="form-group"> + <button type="submit" class="btn">Update</button> + </div> + </div> + @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::UNICORE_STORAGE_SERVICE) + <div class="form-group"> + <label class="control-label">Select Security Protocol</label> + <select name="securityProtocol"> + @foreach( $securityProtocols as $index => $sp) + <option value="{{ $index }}" + @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option> + @endforeach + </select> + + <div> + <div class="form-group required"> + <label class="control-label">Unicore End Point URL</label> + <input class="form-control" maxlength="30" name="unicoreEndPointURL" required="required" + value="{{ $DMI->unicoreEndPointURL }}"/> + </div> + </div> + <div class="form-group"> + <button type="submit" class="btn">Update</button> + </div> + </div> + @endif + </form> + </div> + @endforeach + </div> + @endif + <div class="select-data-movement hide"> + + <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit"> + <input type="hidden" name="crId" class="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="cr-edit" value="dmp"/> + <h4> + Select the Data Movement Protocol + </h4> + + <select name="dataMovementProtocol" class="form-control selected-data-movement-protocol"> + <option></option> + @foreach( $dataMovementProtocols as $index => $dmp) + @if( ! in_array( $index, $addedDMI)) + <option value="{{ $index }}">{{ $dmp }}</option> + @endif + @endforeach + </select> + + <div class="form-group"> + <button type="submit" class="btn btn-primary dmpSubmit hide">Add Data Movement Protocol</button> </div> + </form> + </div> + +</div> + + +</div> + + +<div class="resource-manager-block hide"> + <div class="select-resource-manager-type"> + <div class="form-group required"> + <label class="control-label">Select resource manager type</label> + <select name="resourceJobManagerType" class="form-control selected-resource-manager" required="required"> + @foreach( $resourceJobManagerTypes as $index => $rJmT) + <option value="{{ $index }}">{{ $rJmT }}</option> + @endforeach + </select> </div> </div> + <div class="form-group"> + <label class="control-label">Push Monitoring End Point</label> + <input type="text" class="form-control" name="pushMonitoringEndpoint"/> + </div> + <div class="form-group"> + <label class="control-label">Job Manager Bin Path</label> + <input type="text" class="form-control" name="jobManagerBinPath"/> + </div> + <div class="form-group"> + <h3>Job Manager Commands</h3> + @foreach( $jobManagerCommands as $index => $jmc) + <label class="control-label">{{ $jmc }}</label> + <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}"/> + @endforeach + </select> + </div> +</div> + +<div class="ssh-block hide"> + <div class="form-group required"> + <label class="control-label">Select Security Protocol </label> + <select name="securityProtocol" required> + @foreach( $securityProtocols as $index => $sp) + <option value="{{ $index }}">{{ $sp }}</option> + @endforeach + </select> + </div> + + <div class="form-group required"> + <label class="control-label">Select Monitoring Mode </label> + <select name="monitorMode" required> + @foreach( $monitorModes as $index => $mode) + <option value="{{ $index }}">{{ $mode}}</option> + @endforeach + </select> + </div> + + <div class="form-group addedScpValue hide"> + <label class="control-label">Alternate SSH Host Name</label> + <input class='form-control' name='alternativeSSHHostName'/> + </div> + <div class="form-group addedScpValue hide"> + <label class="control-label">SSH Port</label> + <input class='form-control' name='sshPort'/> + </div> +</div> + +<div class="cloud-block hide"> + <div class="form-group"> + <label class="control-label">Node Id</label> + <input class="form-control" name="nodeId" placeholder="nodId"/> + </div> + <div class="form-group"> + <label class="control-label">Node Id</label> + <input class="form-control" name="nodeId" placeholder="nodId"/> + </div> + <div class="form-group"> + <label class="control-label">Executable Type</label> + <input class="form-control" name="nodeId" placeholder="executableType"/> + </div> + <div class="form-group"> + <label class="control-label">Select Provider Name</label> + <select class="form-control"> + <option name="EC2">EC2</option> + <option name="AWSEC2">AWEC2</option> + <option name="RACKSPACE">RACKSPACE</option> + </select> + </div> +</div> + +<div class="dm-gridftp hide"> + <div class="form-group required"> + <label class="control-label">Grid FTP End Points</label> + <input class="form-control" maxlength="30" name="gridFTPEndPoints[]" required/> + <button type="button" class="btn btn-sm btn-default add-gridFTPEndPoint">Add More Grid FTP End Points</button> + </div> +</div> + +<!-- +<div class="form-group"> + <input type="submit" class="btn btn-primary" name="step2" value="Continue"/> + <input type="reset" class="btn btn-success" value="Reset"/> </div> -<div class="modal fade" id="confirm-delete-dmi" tabindex="-1" role="dialog" aria-labelledby="delete-modal" aria-hidden="true"> +--> +</div> +</div> + +<!-- modals --> + +<div class="modal fade" id="confirm-delete-jsi" tabindex="-1" role="dialog" aria-labelledby="delete-modal" + aria-hidden="true"> <div class="modal-dialog"> <div class="modal-content"> - <form action="{{ URL::to('cr/delete-jsi') }}" method="POST"> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="dmiId" value="" class="delete-dmi-confirm"/> - <div class="modal-header"> - Confirmation - </div> - <div class="modal-body"> - Do you really want to delete this Data Movement Interface ? - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> - <button type="submit" class="btn btn-danger danger">Delete</button> - </div> + <form action="{{ URL::to('cr/delete-jsi') }}" method="POST"> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="jsiId" value="" class="delete-jsi-confirm"/> + + <div class="modal-header"> + Confirmation + </div> + <div class="modal-body"> + Do you really want to delete this Job Submission Interface ? + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> + <button type="submit" class="btn btn-danger danger">Delete</button> + </div> + </form> + + </div> + </div> +</div> + +<div class="modal fade" id="confirm-delete-dmi" tabindex="-1" role="dialog" aria-labelledby="delete-modal" + aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <form action="{{ URL::to('cr/delete-jsi') }}" method="POST"> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="dmiId" value="" class="delete-dmi-confirm"/> + + <div class="modal-header"> + Confirmation + </div> + <div class="modal-body"> + Do you really want to delete this Data Movement Interface ? + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> + <button type="submit" class="btn btn-danger danger">Delete</button> + </div> </div> </div> </div> @@ -599,44 +661,49 @@ Add a Job Submission Interface </div> <div class="modal-body add-jsi-body row"> - + </div> </div> </div> </div> @if( count( $jobSubmissionInterfaces ) > 1) -<div class="modal fade" id="update-jsi-priority" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true"> +<div class="modal fade" id="update-jsi-priority" tabindex="-1" role="dialog" aria-labelledby="add-modal" + aria-hidden="true"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - Update the Priority Order + Update the Priority Order </div> <div class="modal-body"> - <!-- dirty hack to avoid some code that removes the form tag below this. Needs better fix. --> - <form></form> - - <form action="{{URL::to('/')}}/cr/edit" method="POST" id="jsi-priority-form"> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="cr-edit" value="jsi-priority"/> - @foreach( $computeResource->jobSubmissionInterfaces as $index => $JSI ) - <div class="row"> - <div class="col-md-offset-2 col-md-2"> - <label> - {{ $jobSubmissionProtocols[ $JSI->jobSubmissionProtocol] }} - </label> - </div> - <input type="hidden" name="jsi-id[]" maxlength="2" value="{{ $JSI->jobSubmissionInterfaceId }}"/> - <div class="col-md-4"> - <input type="number" name="jsi-priority[]" min="0" max="{{ count( $jobSubmissionInterfaces) }}" value="{{ $JSI->priorityOrder }}" required/> - </div> - </div> - @endforeach - <button type="submit" class="btn btn-update">Update</button> - <div class='priority-updated alert alert-success hide'> - The Job Submission Interface Priority has been updated. - </div> - </form> + <!-- dirty hack to avoid some code that removes the form tag below this. Needs better fix. --> + <form></form> + + <form action="{{URL::to('/')}}/cr/edit" method="POST" id="jsi-priority-form"> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="cr-edit" value="jsi-priority"/> + @foreach( $computeResource->jobSubmissionInterfaces as $index => $JSI ) + <div class="row"> + <div class="col-md-offset-2 col-md-2"> + <label> + {{ $jobSubmissionProtocols[ $JSI->jobSubmissionProtocol] }} + </label> + </div> + <input type="hidden" name="jsi-id[]" maxlength="2" + value="{{ $JSI->jobSubmissionInterfaceId }}"/> + + <div class="col-md-4"> + <input type="number" name="jsi-priority[]" min="0" + max="{{ count( $jobSubmissionInterfaces) }}" value="{{ $JSI->priorityOrder }}" + required/> + </div> + </div> + @endforeach + <button type="submit" class="btn btn-update">Update</button> + <div class='priority-updated alert alert-success hide'> + The Job Submission Interface Priority has been updated. + </div> + </form> </div> </div> </div> @@ -650,41 +717,44 @@ Add a Data Model Interface </div> <div class="modal-body add-dmi-body row"> - + </div> </div> </div> </div> @if( count( $dataMovementInterfaces ) > 1) -<div class="modal fade" id="update-dmi-priority" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true"> +<div class="modal fade" id="update-dmi-priority" tabindex="-1" role="dialog" aria-labelledby="add-modal" + aria-hidden="true"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - Update the Priority Order + Update the Priority Order </div> <div class="modal-body"> - <form action="{{URL::to('/')}}/cr/edit" method="POST" id="dmi-priority-form"> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="cr-edit" value="dmi-priority"/> - @foreach( $computeResource->dataMovementInterfaces as $index => $DMI ) - <div class="row"> - <div class="col-md-offset-2 col-md-2"> - <label> - {{ $dataMovementProtocols[ $DMI->dataMovementProtocol] }} - </label> - </div> - <input type="hidden" name="dmi-id[]" maxlength="2" value="{{ $DMI->dataMovementInterfaceId }}"/> - <div class="col-md-4"> - <input type="number" min="0" name="dmi-priority[]" value="{{ $DMI->priorityOrder }}" required/> - </div> - </div> - @endforeach - <button type="submit" class="btn btn-update">Update</button> - <div class='priority-updated alert alert-success hide'> - The Data Movement Interface Priority has been updated. - </div> - </form> + <form action="{{URL::to('/')}}/cr/edit" method="POST" id="dmi-priority-form"> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="cr-edit" value="dmi-priority"/> + @foreach( $computeResource->dataMovementInterfaces as $index => $DMI ) + <div class="row"> + <div class="col-md-offset-2 col-md-2"> + <label> + {{ $dataMovementProtocols[ $DMI->dataMovementProtocol] }} + </label> + </div> + <input type="hidden" name="dmi-id[]" maxlength="2" value="{{ $DMI->dataMovementInterfaceId }}"/> + + <div class="col-md-4"> + <input type="number" min="0" name="dmi-priority[]" value="{{ $DMI->priorityOrder }}" + required/> + </div> + </div> + @endforeach + <button type="submit" class="btn btn-update">Update</button> + <div class='priority-updated alert alert-success hide'> + The Data Movement Interface Priority has been updated. + </div> + </form> </div> </div> </div> @@ -695,36 +765,37 @@ <div class="modal fade" id="delete-queue" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true"> <div class="modal-dialog"> <div class="modal-content"> - <!-- dirty hack to neutralise form problem in code by just adding an empty form tag before the actual form. Needs fix.--> - <form></form> - <form action="{{URL::to('/')}}/cr/edit" method="POST"/> - <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> - <input type="hidden" name="cr-edit" value="delete-queue"/> - <input type="hidden" name="queueName" class="delete-queueName" value=""/> - <div class="modal-header"> - Confirmation to Delete Queue - </div> - <div class="modal-body"> - Do you really want to delete the Batch Queue - <span class="delete-queueName"></span>? - </div> - <div class="modal-footer"> - <button type="submit" class="btn btn-danger">Delete</button> - <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> - </div> - </form> + <!-- dirty hack to neutralise form problem in code by just adding an empty form tag before the actual form. Needs fix.--> + <form></form> + <form action="{{URL::to('/')}}/cr/edit" method="POST"/> + <input type="hidden" name="crId" value="{{Input::get('crId') }}"/> + <input type="hidden" name="cr-edit" value="delete-queue"/> + <input type="hidden" name="queueName" class="delete-queueName" value=""/> + + <div class="modal-header"> + Confirmation to Delete Queue + </div> + <div class="modal-body"> + Do you really want to delete the Batch Queue - <span class="delete-queueName"></span>? + </div> + <div class="modal-footer"> + <button type="submit" class="btn btn-danger">Delete</button> + <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> + </div> + </form> </div> </div> </div> @stop @section('scripts') - @parent - {{ HTML::script('js/script.js') }} - - <script type="text/javascript"> - $(".delete-queue").click( function(){ - $(".delete-queueName").val( $(this).data("queue-name") ); - $(".delete-queueName").html( $(this).data("queue-name") ); - }) - </script> +@parent +{{ HTML::script('js/script.js') }} + +<script type="text/javascript"> + $(".delete-queue").click(function () { + $(".delete-queueName").val($(this).data("queue-name")); + $(".delete-queueName").html($(this).data("queue-name")); + }) +</script> @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/resource/view.blade.php ---------------------------------------------------------------------- diff --git a/app/views/resource/view.blade.php b/app/views/resource/view.blade.php deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/scigap-admin/manage-gateway.blade.php ---------------------------------------------------------------------- diff --git a/app/views/scigap-admin/manage-gateway.blade.php b/app/views/scigap-admin/manage-gateway.blade.php index 288e122..a07c329 100644 --- a/app/views/scigap-admin/manage-gateway.blade.php +++ b/app/views/scigap-admin/manage-gateway.blade.php @@ -1,116 +1,124 @@ @extends('layout.basic') @section('page-header') - @parent - {{ HTML::style('css/admin.css')}} +@parent +{{ HTML::style('css/admin.css')}} @stop @section('content') - <div id="wrapper"> - <!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens --> - @include( 'partials/dashboard-block') - <div id="page-wrapper"> - <div class="col-md-12"> +<div id="wrapper"> + <!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens --> + @include( 'partials/dashboard-block') + <div id="page-wrapper"> + <div class="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 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> - {{ Session::forget("message") }} - @endif </div> - <div class="container-fluid"> + {{ Session::forget("message") }} + @endif + </div> + <div class="container-fluid"> - <div class="row"> + <div class="row"> - <div class="col-md-6"> - <h3>Existing Gateways :</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 class="col-md-6"> + <h3>Existing Gateways :</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> + <table class="table table-bordered"> + <tr> + <th>No.</th> + <th>Gateway</th> + <th>Admin ( Not implemented yet.)</th> + <th>Actions</th> + </tr> + @foreach( $gateways as $indexGP => $gp) + <tr> + <td>{{ $indexGP }}</td> + <td>{{ $gp->gatewayName }}</td> + <td>--</td> + <td> + <div class="gateway-options"> + <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 }}"></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> + </td> + </tr> + @endforeach + </table> + <form id="add-tenant-form"> + <div class="col-md-12"> + <button type="button" class="btn btn-default toggle-add-tenant"><span + class="glyphicon glyphicon-plus"></span>Add a new gateway + </button> + </div> + <div class="add-tenant col-md-6"> + <div class="form-group required"> + <label class="control-label">Enter Domain Name</label> + <input type="text" name="domain" class="form-control" required="required"/> </div> - <table class="table table-bordered"> - <tr> - <th>No.</th> - <th>Gateway</th> - <th>Admin ( Not implemented yet.)</th> - <th>Actions</th> - </tr> - @foreach( $gateways as $indexGP => $gp) - <tr> - <td>{{ $indexGP }}</td> - <td>{{ $gp->gatewayName }}</td> - <td>--</td> - <td> - <div class="gateway-options"> - <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 }}"></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> - </td> - </tr> - @endforeach - </table> - <form id="add-tenant-form"> - <div class="col-md-12"> - <button type="button" class="btn btn-default toggle-add-tenant"><span class="glyphicon glyphicon-plus"></span>Add a new gateway</button> + <div class="form-group required"> + <label class="control-label">Enter Desired Gateway Name</label> + <input type="text" name="gatewayName" class="form-control" required="required"/> </div> - <div class="add-tenant col-md-6"> - <div class="form-group required"> - <label class="control-label">Enter Domain Name</label> - <input type="text" name="domain" class="form-control" required="required"/> - </div> - <div class="form-group required"> - <label class="control-label">Enter Desired Gateway Name</label> - <input type="text" name="gatewayName" class="form-control" required="required"/> - </div> - <div class="form-group required"> - <label class="control-label">Enter Admin Email Address</label> - <input type="text" name="admin-email" class="form-control" required="required"/> - </div> - <div class="form-group required"> - <label class="control-label">Enter Admin First Name</label> - <input type="text" name="admin-firstname" class="form-control" required="required"/> - </div> - <div class="form-group required"> - <label class="control-label">Enter Admin Last Name</label> - <input type="text" name="admin-lastname" class="form-control" required="required"/> - </div> - <div class="form-group required"> - <label class="control-label">Enter Admin Username</label> - <input type="text" name="admin-username" class="form-control" required="required"/> - </div> - <div class="form-group required"> - <label class="control-label">Enter Admin Password</label> - <input type="password" name="admin-password" class="form-control" required="required"/> - </div> - <div class="form-group required"> - <label class="control-label">Re-enter Admin Password</label> - <input type="password" name="admin-password-confirm" class="form-control" required="required"/> - </div> - <div class="form-group required"> - <input type="submit" class="col-md-2 form-control btn btn-primary" value="Register" /> - </div> + <div class="form-group required"> + <label class="control-label">Enter Admin Email Address</label> + <input type="text" name="admin-email" class="form-control" required="required"/> </div> - <div class="col-md-6 alert alert-danger gateway-error hide"> + <div class="form-group required"> + <label class="control-label">Enter Admin First Name</label> + <input type="text" name="admin-firstname" class="form-control" required="required"/> </div> - </form> - </div> - <!-- /.container-fluid --> - + <div class="form-group required"> + <label class="control-label">Enter Admin Last Name</label> + <input type="text" name="admin-lastname" class="form-control" required="required"/> + </div> + <div class="form-group required"> + <label class="control-label">Enter Admin Username</label> + <input type="text" name="admin-username" class="form-control" required="required"/> + </div> + <div class="form-group required"> + <label class="control-label">Enter Admin Password</label> + <input type="password" name="admin-password" class="form-control" required="required"/> + </div> + <div class="form-group required"> + <label class="control-label">Re-enter Admin Password</label> + <input type="password" name="admin-password-confirm" class="form-control" required="required"/> + </div> + <div class="form-group required"> + <input type="submit" class="col-md-2 form-control btn btn-primary" value="Register"/> + </div> + </div> + <div class="col-md-6 alert alert-danger gateway-error hide"> + </div> + </form> </div> - <!-- /#page-wrapper --> + <!-- /.container-fluid --> </div> + <!-- /#page-wrapper --> + +</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> @@ -121,14 +129,15 @@ <span class="input-group-addon remove-cr" style="cursor:pointer;">x</span> </div> <div class="pref-space form-horizontal"></div> - </form> + </form> </div> </div> <!-- Remove a Compute Resource from a Gateway --> -<div class="modal fade" id="add-gateway-loading" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true" data-backdrop="static"> - <div class="modal-dialog"> +<div class="modal fade" id="add-gateway-loading" tabindex="-1" role="dialog" aria-labelledby="add-modal" + aria-hidden="true" data-backdrop="static"> +<div class="modal-dialog"> <form action="{{URL::to('/')}}/gp/remove-cr" method="POST"> <div class="modal-content"> @@ -149,34 +158,34 @@ @section('scripts') - @parent - {{ HTML::script('js/gateway.js') }} - <script> - - $(".add-tenant").slideUp(); - - $(".toggle-add-tenant").click( function(){ - $('html, body').animate({ - scrollTop: $(".toggle-add-tenant").offset().top - }, 500); - $(".add-tenant").slideDown(); - }); - - $("#add-tenant-form").submit( function( event){ - event.preventDefault(); - event.stopPropagation(); - var formData = $("#add-tenant-form").serialize(); - $("#add-gateway-loading").modal("show"); - $.ajax({ - type: "POST", - data: formData, - url: '{{ URL::to('/') }}/admin/add-gateway', - success:function( data){ - $(".gateway-error").html(data).removeClass("hide"); - } - }).complete( function(){ - $("#add-gateway-loading").modal("hide"); - }); +@parent +{{ HTML::script('js/gateway.js') }} +<script> + + $(".add-tenant").slideUp(); + + $(".toggle-add-tenant").click(function () { + $('html, body').animate({ + scrollTop: $(".toggle-add-tenant").offset().top + }, 500); + $(".add-tenant").slideDown(); + }); + + $("#add-tenant-form").submit(function (event) { + event.preventDefault(); + event.stopPropagation(); + var formData = $("#add-tenant-form").serialize(); + $("#add-gateway-loading").modal("show"); + $.ajax({ + type: "POST", + data: formData, + url: '{{ URL::to(' / ') }}/admin/add-gateway', + success: function (data) { + $(".gateway-error").html(data).removeClass("hide"); + } + }).complete(function () { + $("#add-gateway-loading").modal("hide"); }); - </script> + }); +</script> @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/server-down.blade.php ---------------------------------------------------------------------- diff --git a/app/views/server-down.blade.php b/app/views/server-down.blade.php index 6e901f7..284f1d0 100644 --- a/app/views/server-down.blade.php +++ b/app/views/server-down.blade.php @@ -1,16 +1,17 @@ @extends('layout.basic') @section('page-header') - @parent +@parent @stop @section('content') - <div class="container"> - <div class="alert alert-danger"> - <p class="text-center">Our servers are down at the moment. Please try after some time. Thank you for your patience.</p> - </div> +<div class="container"> + <div class="alert alert-danger"> + <p class="text-center">Our servers are down at the moment. Please try after some time. Thank you for your + patience.</p> </div> +</div> @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/composer.json ---------------------------------------------------------------------- diff --git a/composer.json b/composer.json index 9758a4c..88a580b 100755 --- a/composer.json +++ b/composer.json @@ -1,36 +1,35 @@ { - "name": "laravel/laravel", - "description": "The Laravel Framework.", - "keywords": ["framework", "laravel"], - "license": "MIT", - "require": { - "laravel/framework": "4.2.*", - "apache/thrift": "1.0.*@dev" - }, - "autoload": { - "classmap": [ - "app/controllers", - "app/models", - "app/database/seeds", - "app/tests/TestCase.php", - "app/libraries" - ] - }, - "scripts": { - "post-install-cmd": [ - "php artisan clear-compiled", - "php artisan optimize" - ], - "post-update-cmd": [ - "php artisan clear-compiled", - "php artisan optimize" - ], - "post-create-project-cmd": [ - "php artisan key:generate" - ] - }, - "config": { - "preferred-install": "dist" - }, - "minimum-stability": "stable" + "name": "laravel/laravel", + "description": "The Laravel Framework.", + "keywords": ["framework", "laravel"], + "license": "MIT", + "require": { + "laravel/framework": "4.2.*", + "apache/thrift": "1.0.*@dev" + }, + "autoload": { + "classmap": [ + "app/controllers", + "app/database/seeds", + "app/tests/TestCase.php", + "app/libraries" + ] + }, + "scripts": { + "post-install-cmd": [ + "php artisan clear-compiled", + "php artisan optimize" + ], + "post-update-cmd": [ + "php artisan clear-compiled", + "php artisan optimize" + ], + "post-create-project-cmd": [ + "php artisan key:generate" + ] + }, + "config": { + "preferred-install": "dist" + }, + "minimum-stability": "stable" }
