Merge branch 'issue32' into 'niehs-development'

issue32 See merge request conwaymc/metalnx-web!9
DICE-UNC · Dec 1, 2017 · bc16436 · bc16436
2 parents e724ce2 + 4003661
commit bc16436
Showing 1 changed file with 27 additions and 19 deletions.
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html
@@ -504,41 +504,49 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
 								<div id="filesList">
 								</div>
 							</div>
-
+							
 							<div id="uploadControlOptions">
 								<input type="hidden" id="uploadDestinationPath" th:value="${currentPath}" />
-								<div class="row form-group">
-									<div class="col-md-6">Resource</div>
-									<div class="col-md-6">
-											<input type="checkbox" id="inputReplica" name="replica"
-												value="1" /> &nbsp;&nbsp;<span>Replica</span>
+
+									<div class="row form-group">
+										<th:block th:if="${dataGridUser.isAdvancedView()}">
+										<div class="col-md-6">Resource</div>
+										<div class="col-md-6">
+												<input type="checkbox" id="inputReplica" name="replica"
+													value="1" /> &nbsp;&nbsp;<span>Replica</span>
+										</div>
+
+										<div class="col-md-6">
+											<select class="form-control" name="resourceToUpload"
+												id="selectResourceToUpload">
+											</select>
+										</div>
+
+										<div class="col-md-6">
+											<select class="form-control" name="resources" disabled="disabled"
+												id="selectResource">
+											</select>
+										</div>
+									</th:block>
 									</div>
-									<div class="col-md-6">
-										<select class="form-control" name="resourceToUpload"
-											id="selectResourceToUpload">
-										</select>
-									</div>
-									<div class="col-md-6">
-										<select class="form-control" name="resources" disabled="disabled"
-											id="selectResource">
-										</select>
-									</div>
-								</div>
-
+
  								<div class="row form-group">
 									<div class="col-md-6">
 										<input type="checkbox" id="inputOverwriteDuplicateFiles"
 											name="inputOverwriteDuplicateFiles"
 											th:checked="${overwriteFileOption}" /> &nbsp;&nbsp;<span>Overwrite
 											duplicate files</span>
 									</div>
+									<th:block th:if="${dataGridUser.isAdvancedView()}">
 									<div class="col-md-6">
 										<input type="checkbox" id="inputChecksum" name="checksum"
 										value="1" /> &nbsp;&nbsp;<span>Checksum</span>
 									</div>
+									</th:block>
  								</div>
-
+									
 							</div>
+
 						</form>
 
 					</div>