airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndo...@apache.org
Subject [1/2] airavata-php-gateway git commit: Storage Resources implementation on PGA completed.
Date Fri, 20 Nov 2015 19:16:11 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop cce422518 -> a3a066fad


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a3a066fa/app/views/storage-resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/storage-resource/edit.blade.php b/app/views/storage-resource/edit.blade.php
index 80dde1c..9c0879b 100644
--- a/app/views/storage-resource/edit.blade.php
+++ b/app/views/storage-resource/edit.blade.php
@@ -18,9 +18,10 @@
 
 <input type="hidden" class="base-url" value="{{URL::to('/')}}"/>
 
-<div class="well">
-    <h4>Storage Resource : {{ $storageResource->hostName }}</h4>
-</div>
+<ol class="breadcrumb">
+    <li><a href="{{URL::to('/')}}/sr/browse">Storage Resources</a></li>
+    <li class="active">{{ $storageResource->hostName }}</li>
+</ol>
 @if( Session::has("message"))
 <span class="alert alert-success col-md-12">{{Session::get("message")}}</span>
 {{Session::forget("message") }}
@@ -40,481 +41,206 @@
 
 <div class="tab-content">
 
-<div class="tab-pane active" id="tab-desc">
-
-    <form role="form" method="POST" action="{{ URL::to('/') }}/sr/edit">
-        <input type="hidden" name="srId" value="{{Input::get('srId') }}"/>
-        <input type="hidden" name="sr-edit" value="resDesc"/>
+    <div class="tab-pane active" id="tab-desc">
 
-        <div class="form-group required">
-            <label class="control-label">Host Name</label>
-            <input class="form-control hostName" value="{{ $storageResource->hostName
}}" maxlength="100"
-                   name="hostname" required="required"/>
-        </div>
-        <div class="form-group">
-            <label class="control-label">Resource Description</label>
-            <textarea class="form-control" maxlength="255" name="description">{{ $storageResource->resourceDescription
-                }}</textarea>
-        </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( $storageResource->batchQueues) )
-    <h3>Existing Queues :</h3>
-
-    <div class="panel-group" id="accordion">
-        @foreach( $storageResource->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>
+        <form role="form" method="POST" action="{{ URL::to('/') }}/sr/edit">
+            <input type="hidden" name="srId" value="{{Input::get('srId') }}"/>
+            <input type="hidden" name="sr-edit" value="resDesc"/>
 
-                    <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 class="form-group required">
+                <label class="control-label">Host Name</label>
+                <input class="form-control hostName" value="{{ $storageResource->hostName
}}" maxlength="100"
+                       name="hostname" required="required"/>
             </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 class="form-group">
+                <label class="control-label">Resource Description</label>
+                <textarea class="form-control" maxlength="255" name="description">{{
$storageResource->storageResourceDescription
+                    }}</textarea>
             </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 class="form-group">
+                <input type="submit" class="btn btn-primary" name="step1" value="Save
changes"/>
             </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>
+        </form>
 
-<div class="tab-pane" id="tab-filesystem">
+    </div>
 
-    <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="tab-pane" id="tab-dataMovement">
 
         <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( $storageResource->fileSystems[ $index]) ){{ $storageResource->fileSystems[
$index] }} @endif"/>
-            @endforeach
-            </select>
+            <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>
-        <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 = $storageResource->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)
+        @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('/') }}/sr/edit">
+                    <input type="hidden" name="srId" class="srId" value="{{Input::get('srId')
}}"/>
+                    <input type="hidden" name="sr-edit" value="edit-dmi"/>
+                    <input type="hidden" name="dmiId" value="{{ $DMI->dataMovementInterfaceId
}}"/>
+
+                    <?php $selectedDMIIndex = $storageResource->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( $JSI->resourceJobManager->resourceJobManagerType ==
$index ) selected @endif >{{ $rJmT
-                            }}</option>
+                            @if( $DMI->securityProtocol == $index ) selected @endif>{{
$sp }}</option>
                             @endforeach
                         </select>
                     </div>
+    <!--                <div class="form-group">
+                        <label class="control-label">Select Monitoring Mode</label>
+                        <select name="monitorMode">
+                            @foreach( $monitorModes as $index => $mode)
+                            <option value="{{ $index }}"
+                            @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</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
}}"/>
+                        <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">Job Manager Bin Path</label>
-                        <input type="text" class="form-control" name="jobManagerBinPath"
-                               value="{{ $JSI->resourceJobManager->jobManagerBinPath
}}"/>
+                        <label class="control-label">SSH Port</label>
+                        <input class='form-control' name='sshPort' value="{{ $DMI->sshPort
}}"/>
                     </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
+                        <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>
-                @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::SSH || $jobSubmissionProtocolsObject::SSH_FORK)
-                <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">
+                        <label class="control-label">Select Monitoring Mode</label>
+                        <select name="monitorMode">
+                            @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>
                         <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"/>
+                            <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>
-
-                @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 class="form-group">
+                        <button type="submit" class="btn">Update</button>
+                    </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">
+                        <label class="control-label">Select Monitoring Mode</label>
+                        <select name="monitorMode">
+                            @foreach( $monitorModes as $index => $mode)
+                            <option value="{{ $index }}"
+                            @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</option>
+                            @endforeach
+                        </select>
+                    </div>-->
 
+                    <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>
+                    @endif
+                </form>
+            </div>
+            @endforeach
         </div>
-        @endforeach
-    </div>
-    @endif
+        @endif
+        <div class="select-data-movement hide">
 
-    <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"/>
+            <form role="form" method="POST" action="{{ URL::to('/') }}/sr/edit">
+                <input type="hidden" name="srId" class="srId" value="{{Input::get('srId')
}}"/>
+                <input type="hidden" name="sr-edit" value="dmp"/>
+                <h4>
+                    Select the Data Movement Protocol
+                </h4>
 
-            <div class="form-group">
-                <label class="control-label">Job Submission Protocol:</label>
-                <select name="jobSubmissionProtocol" class="form-control selected-job-protocol"
required="required">
+                <select name="dataMovementProtocol" class="form-control selected-data-movement-protocol">
                     <option></option>
-                    @foreach( $jobSubmissionProtocols as $index => $jobSubmissionProtocol)
-                    @if( ! in_array( $index, $addedJSP))
-                    <option value="{{ $index }}">{{ $jobSubmissionProtocol }}</option>
+                    @foreach( $dataMovementProtocols as $index => $dmp)
+                    //GridFTP and SFTP not supported in Airavata backend. Therefore commenting
out from UI
+                    @if( ! in_array( $index, $addedDMI) && $dmp!="GridFTP" &&
$dmp!="SFTP")
+                    <option value="{{ $index }}">{{ $dmp }}</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('/') }}/sr/edit">
-                <input type="hidden" name="srId" class="srId" value="{{Input::get('srId')
}}"/>
-                <input type="hidden" name="sr-edit" value="edit-dmi"/>
-                <input type="hidden" name="dmiId" value="{{ $DMI->dataMovementInterfaceId
}}"/>
-
-                <?php $selectedDMIIndex = $storageResource->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">Select Monitoring Mode</label>
-                    <select name="monitorMode">
-                        @foreach( $monitorModes as $index => $mode)
-                        <option value="{{ $index }}"
-                        @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</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">
-                    <label class="control-label">Select Monitoring Mode</label>
-                    <select name="monitorMode">
-                        @foreach( $monitorModes as $index => $mode)
-                        <option value="{{ $index }}"
-                        @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</option>
-                        @endforeach
-                    </select>
-                </div>--}}
-
-                <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>
-                @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">
-                    <label class="control-label">Select Monitoring Mode</label>
-                    <select name="monitorMode">
-                        @foreach( $monitorModes as $index => $mode)
-                        <option value="{{ $index }}"
-                        @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</option>
-                        @endforeach
-                    </select>
-                </div>--}}
-
-                <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>
+                    <button type="submit" class="btn btn-primary dmpSubmit hide">Add
Data Movement Protocol</button>
                 </div>
-                @endif
+
             </form>
-        </div>
-        @endforeach
-    </div>
-    @endif
-    <div class="select-data-movement hide">
 
-        <form role="form" method="POST" action="{{ URL::to('/') }}/sr/edit">
-            <input type="hidden" name="srId" class="srId" value="{{Input::get('srId')
}}"/>
-            <input type="hidden" name="sr-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)
-                //GridFTP and SFTP not supported in Airavata backend. Therefore commenting
out from UI
-                @if( ! in_array( $index, $addedDMI) && $dmp!="GridFTP" &&
$dmp!="SFTP")
-                <option value="{{ $index }}">{{ $dmp }}</option>
-                @endif
-                @endforeach
-            </select>
+        </div>
 
-            <div class="form-group">
-                <button type="submit" class="btn btn-primary dmpSubmit hide">Add Data
Movement Protocol</button>
-            </div>
+    </div>
 
-        </form>
 
-    </div>
+</div>
 
 </div>
+</div>
+</div>
+</div>
+
 
 
-</div>
 
 
 <div class="resource-manager-block hide">
@@ -606,45 +332,7 @@
     </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>
-</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('sr/delete-jsi') }}" method="POST">
-                <input type="hidden" name="srId" value="{{Input::get('srId') }}"/>
-                <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">
@@ -667,63 +355,6 @@
     </div>
 </div>
 
-<!--
-<div class="modal fade" id="add-jsi" tabindex="-1" role="dialog" aria-labelledby="add-modal"
aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                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-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                Update the Priority Order
-            </div>
-            <div class="modal-body">
-                <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( $storageResource->jobSubmissionInterfaces as $index =>
$JSI )
-                    <div class="row">
-                        <div class="col-md-offset-1 col-md-5">
-                            <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>
-</div>
-@endif
--->
-
 <div class="modal fade" id="add-dmi" tabindex="-1" role="dialog" aria-labelledby="add-modal"
aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -775,32 +406,7 @@
 </div>
 @endif
 
-<!--
-<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">
-            <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


Mime
View raw message