Merge branch 'master' into 'master'

Master

See merge request DM/dm!4

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/StorageController.java

@@ -63,7 +63,7 @@ public class StorageController extends DmEntityController<Storage, StorageDbFaca
         if (existingStorage != null) {
             throw new ObjectAlreadyExists("Storage " + storage.getName() + " already exists.");
         }
-        logger.debug("Inserting new experiment type " + storage.getName());
+        logger.debug("Inserting new storage " + storage.getName());
     }
 
     @Override
@@ -71,7 +71,7 @@ public class StorageController extends DmEntityController<Storage, StorageDbFaca
         if ((storage.getName() == null) || (storage.getName().length() == 0)) {
             throw new InvalidRequest("Storage name is missing.");
         }
-        logger.debug("Updating experiment type " + storage.getName());
+        logger.debug("Updating storage " + storage.getName());
     }
 
     @Override

src/java/DmWebPortal/web/views/storage/edit.xhtml

@@ -17,18 +17,18 @@
                         <h1>Edit Storage</h1>
                     </div>
 
-                    <ui:include src="private/StorageEditPanelGrid.xhtml"/>
+                    <ui:include src="private/storageEditPanelGrid.xhtml"/>
                     <p/>
                     <div class="actionButton">
-                        <p:commandButton action="#{StorageController.update()}" value="Save" alt="Save" icon="ui-icon-check"/>
-                        <p:commandButton action="#{StorageController.prepareList()}" immediate="true" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
+                        <p:commandButton action="#{storageController.update()}" value="Save" alt="Save" icon="ui-icon-check"/>
+                        <p:commandButton action="#{storageController.prepareList()}" immediate="true" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
                     </div>
                 </div>
 
             </h:form>
             <h:outputScript library="js" name="common/forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
             <h:outputScript library="js" name="common/forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
-            <h:outputScript library="js" name="common/forwardHome.js" rendered="#{!StorageController.entitySelected}"/>    
+            <h:outputScript library="js" name="common/forwardHome.js" rendered="#{!storageController.entitySelected}"/>    
 
         </ui:define>
     </ui:composition>