Merge pull request #5407 from IQSS/5400-revert-f-view

5400 revert f view
IQSS · Dec 18, 2018 · a6bd81c · a6bd81c
2 parents 162f619 + cbc7dd6
commit a6bd81c
Show file tree

Hide file tree

Showing 34 changed files with 2 additions and 69 deletions.
diff --git a/src/main/webapp/403.xhtml b/src/main/webapp/403.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:o="http://omnifaces.org/ui"      
       xmlns:p="http://primefaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -34,5 +33,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/404.xhtml b/src/main/webapp/404.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:o="http://omnifaces.org/ui"      
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -44,5 +43,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/500.xhtml b/src/main/webapp/500.xhtml
@@ -4,7 +4,6 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -21,5 +20,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/ThemeAndWidgets.xhtml b/src/main/webapp/ThemeAndWidgets.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -28,5 +27,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/confirmemail.xhtml b/src/main/webapp/confirmemail.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>  
 
@@ -29,5 +28,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml
@@ -6,7 +6,6 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -115,5 +114,4 @@
         </ui:composition>
 
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/dashboard.xhtml b/src/main/webapp/dashboard.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -136,5 +135,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -183,5 +182,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -10,7 +10,6 @@
       xmlns:cc="http://java.sun.com/jsf/composite"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
     <h:body>
@@ -1608,5 +1607,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
@@ -7,7 +7,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -824,5 +823,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
@@ -10,6 +10,7 @@
       xmlns:c="http://java.sun.com/jsp/jstl/core"
       lang="#{dataverseLocaleBean.localeCode}"
       xml:lang="#{dataverseLocaleBean.localeCode}">
+    <f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
 	<o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
         <f:facet name="first">
@@ -115,4 +116,5 @@
         <ui:include src="google-analytics-snippet.xhtml"></ui:include>
         <ui:include src="piwik-analytics-snippet.xhtml"></ui:include>
     </h:body>
+    </f:view>
 </html>
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:o="http://omnifaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -658,5 +657,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml
@@ -10,7 +10,6 @@
       xmlns:cc="http://java.sun.com/jsf/composite"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -96,5 +95,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -10,7 +10,6 @@
       xmlns:cc="http://java.sun.com/jsf/composite"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -659,5 +658,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/guestbook-responses.xhtml b/src/main/webapp/guestbook-responses.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -92,6 +91,5 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
 
diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -199,6 +198,5 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
 
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
@@ -6,7 +6,6 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -563,5 +562,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
@@ -6,7 +6,6 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -334,5 +333,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/iframe.xhtml b/src/main/webapp/iframe.xhtml
@@ -7,7 +7,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       lang="en">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
         <title><h:outputText value="#{pageTitle}"/></title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@@ -83,5 +82,4 @@
         <ui:include src="google-analytics-snippet.xhtml"></ui:include>
         <ui:include src="piwik-analytics-snippet.xhtml"></ui:include>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
@@ -7,7 +7,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:fn="http://java.sun.com/jsp/jstl/functions"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -228,5 +227,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
     <h:body>
@@ -183,5 +182,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:o="http://omnifaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
     <h:body>
@@ -227,5 +226,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
     <h:body>
@@ -193,5 +192,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/oauth2/callback.xhtml b/src/main/webapp/oauth2/callback.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -54,5 +53,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/oauth2/convert.xhtml b/src/main/webapp/oauth2/convert.xhtml
@@ -5,9 +5,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
-
     </h:head>
 
     <h:body>
@@ -85,5 +83,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml
@@ -5,9 +5,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
-
     </h:head>
 
     <h:body>
@@ -145,5 +143,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -149,5 +148,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>