Commit 51d72ebe authored by Kostis Trantzas's avatar Kostis Trantzas Committed by Kostis Trantzas
Browse files

fix for #4 (develop branch) 


(cherry picked from commit 3eac76d8)
parent 669a2f8b

src/ExperimentAdd.html

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
					<div class="form-group">

						<label for="role" class="col-sm-2 control-label">Packaging format</label>

						<div class="col-sm-10">

							<select class="form-control" ng-options="opt for opt in ['OSMvTEN','OSMvNINE','OSMvEIGHT', 'GenericSOL005']" ng-model="exprm.packagingFormat" required><option></option></select>

							<select class="form-control" ng-options="opt for opt in ['OSMvTHIRTEEN','OSMvELEVEN','OSMvTEN','OSMvNINE','OSMvEIGHT', 'GenericSOL005']" ng-model="exprm.packagingFormat" required><option></option></select>

						</div>

					</div>

src/ExperimentUpload.html

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
					<div class="form-group">

						<label for="role" class="col-sm-2 control-label">Packaging format</label>

						<div class="col-sm-10">

							<select class="form-control" ng-options="opt for opt in ['OSMvTEN', 'OSMvNINE','OSMvEIGHT','GenericSOL005']" ng-model="exprm.packagingFormat" required><option></option></select>						

							<select class="form-control" ng-options="opt for opt in ['OSMvTHIRTEEN','OSMvELEVEN', 'OSMvTEN', 'OSMvNINE','OSMvEIGHT','GenericSOL005']" ng-model="exprm.packagingFormat" required><option></option></select>						

						</div>

					</div>

src/Experiments.html

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
								<p>Last update: <strong>{{gridItem.dateUpdated | date:'medium' }}</strong></p>

								<p>Date created: <strong>{{gridItem.dateCreated| date:'medium'}}</strong></p>

								 -->

								<a class="btn btn-warning" ng-click="softDeleteApp(gridItem, gridItem.id)"><i class="fa fa-trash-o "></i></a>

								<a class="btn btn-danger" ng-click="deleteApp(gridItem, gridItem.id)"><i class="fa fa-trash-o "></i></a>

								<a class="btn btn-primary" ng-href="#!/experiment_edit/{{gridDisplayItem.id}}"><i class="fa fa-pencil-square-o "></i></a>									

								<a class="btn btn-info" ng-href="#!/experiment_view/{{gridDisplayItem.id}}"><i class="fa fa-info-circle "></i></a>

src/InfrastructureAdd.html

+11 −2
Original line number Diff line number Diff line
@@ -12,10 +12,19 @@ 
							<input type="text" class="form-control"  ng-model="portalinfrastructure.name" value="" placeholder="name..." />

						</div>

					</div>

					<div class="form-group">

						<label for="manoProviderSelect" class="col-sm-2 control-label">Select a MANO Provider:</label>

						<div class="col-sm-10">

						  <select class="form-control" id="manoProviderSelect" ng-model="portalinfrastructure.mp" ng-options="(manoprovider.id + ' - ' + manoprovider.name) for manoprovider in manoproviders" ng-change="updateDatacentername()">

						  </select>

						</div>

					  </div>

					  <div class="form-group">

						<label for="portalinfrastructure.datacentername" class="col-sm-2 control-label">Datacenter VIM Name</label>

						<div class="col-sm-10">

							<input type="text" class="form-control"  ng-model="portalinfrastructure.datacentername" value="" placeholder="datacenter VIM name..." />

						  <input type="text" class="form-control" ng-model="portalinfrastructure.datacentername"

								 ng-disabled="true"

								 placeholder="Datacenter VIM name..." />

						</div>

					  </div>					

					<div class="form-group">

src/InfrastructureEdit.html

+11 −2
Original line number Diff line number Diff line
@@ -16,10 +16,19 @@ 
						</div>

					</div>

					

					<div class="form-group">

						<label for="manoProviderSelect" class="col-sm-2 control-label">Select a MANO Provider:</label>

						<div class="col-sm-10">

						  <select class="form-control" id="manoProviderSelect" ng-model="portalinfrastructure.mp" ng-options="(manoprovider.id + ' - ' + manoprovider.name) for manoprovider in manoproviders" ng-change="editDatacentername()">

						  </select>

						</div>

					  </div>

					  <div class="form-group">

						<label for="portalinfrastructure.datacentername" class="col-sm-2 control-label">Datacenter VIM Name</label>

						<div class="col-sm-10">

							<input type="text" class="form-control"  ng-model="portalinfrastructure.datacentername" value="" placeholder="datacenter VIM name..." />

						  <input type="text" class="form-control" ng-model="portalinfrastructure.datacentername"

								 ng-disabled="true"

								 placeholder="Datacenter VIM name..." />

						</div>

					  </div>