Merge remote-tracking branch 'origin/niehs-master' into niehs-develop…

…ment
DICE-UNC · Dec 13, 2017 · 9a7a4a3 · 9a7a4a3
2 parents 4858642 + d2ef0dc
commit 9a7a4a3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 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,18 +504,18 @@ <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">
 										<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">
@@ -529,7 +529,7 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
 										</div>
 									</th:block>
 									</div>
-								
+
  								<div class="row form-group">
 									<div class="col-md-6">
 										<input type="checkbox" id="inputOverwriteDuplicateFiles"
@@ -544,16 +544,16 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
 									</div>
 									</th:block>
  								</div>
-									
+
 							</div>
-						
+
 						</form>
 
 					</div>
 					<div class="modal-footer">
 						<button type="button" class="btn btn-default" data-dismiss="modal"
 							th:text="#{forms.cancel.action.button}"></button>
-						<a type="button" class="btn btn-primary" id="uploadButton" target="_blank" href="?uploadNewTab=true">
+						<a type="button" class="btn btn-primary" id="uploadButton">
 							<i class="fa fa-upload"></i> <span th:text="#{upload.label}"></span>
 						</a>
 					</div>

diff --git a/src/emc-metalnx-web/src/main/webapp/WEB-INF/applicationContext.xml b/src/emc-metalnx-web/src/main/webapp/WEB-INF/applicationContext.xml
@@ -31,9 +31,9 @@
         <property name="locations">
             <list>
 
-                <value>file:/etc/irods-ext/metalnx.properties</value>
-
-                <!--<value>file:///C:/opt/etc/irods-ext/metalnx.properties</value> -->
+       <!-- <value>file:/etc/irods-ext/metalnx.properties</value> --> 
+			<value>file:///C:/opt/etc/irods-ext/metalnx.properties</value> 
+
             </list>
         </property>
         <property name="ignoreUnresolvablePlaceholders" value="true"/>
@@ -42,8 +42,8 @@
  <!-- this resource must be in the /etc/irods-ext directory, see the CONFIGURATION.md doc at the top of the repo,
 It allows theming and custom messages -->
 
-	<import resource="file:/etc/irods-ext/metalnxConfig.xml" />
-
+<!-- <import resource="file:/etc/irods-ext/metalnxConfig.xml" /> -->
+	<import resource="file:///C:/opt/etc/irods-ext/metalnxConfig.xml" />
 	<!-- **************************************************************** -->
 	<!-- SPRING SECURITY-SPECIFIC ARTIFACTS -->
 	<!-- AuthenticationProvider -->