Moved custom content resourceInclude for homePage and style. Added ne…

…w dataverse_homepage.xhtml pg. [ref #3639]
IQSS · May 22, 2017 · 970dce3 · 970dce3
1 parent 7c00974
commit 970dce3
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 48 deletions.
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
@@ -43,11 +43,6 @@
                 </f:metadata>
 
                 <h:form id="dataverseForm">
-                    <o:resourceInclude path="/CustomizationFilesServlet?customFileType=homePage" />
-                    <style>
-                        <o:resourceInclude path="/CustomizationFilesServlet?customFileType=style" />
-                    </style>
-
                     <!-- Edit Mode -->
                     <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
                         <p:focus context="dataverseForm"/>

diff --git a/src/main/webapp/dataverse_footer.xhtml b/src/main/webapp/dataverse_footer.xhtml
@@ -10,7 +10,6 @@
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
 
     <div id="footer" class="#{widgetView ? 'widget-view' : ''}">
-        <o:resourceInclude path="/CustomizationFilesServlet?customFileType=footer"/>
         <div class="container">
             <div class="row">
                 <div class="col-sm-8 small" jsf:rendered="#{!widgetView}">
@@ -47,4 +46,6 @@
         </div>
     </div>
 
+    <o:resourceInclude path="/CustomizationFilesServlet?customFileType=footer" rendered="#{!widgetWrapper.widgetView}"/>
+
 </ui:composition>
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
@@ -9,8 +9,9 @@
                 xmlns:o="http://omnifaces.org/ui"
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
 
+    <o:resourceInclude path="/CustomizationFilesServlet?customFileType=header" rendered="#{!widgetWrapper.widgetView}"/>
+
     <div id="dataverse-header-block">
-        <o:resourceInclude path="/CustomizationFilesServlet?customFileType=header" />
         <!-- Navbar Panel -->
         <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" jsf:rendered="#{!widgetWrapper.widgetView}">
             <div class="container">

diff --git a/src/main/webapp/dataverse_homepage.xhtml b/src/main/webapp/dataverse_homepage.xhtml
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:o="http://omnifaces.org/ui"
+      xmlns:jsf="http://xmlns.jcp.org/jsf">
+
+    <h:head>
+    </h:head>
+
+    <h:body>
+        <ui:composition template="/dataverse_template.xhtml">
+            <ui:param name="pageTitle" value="#{empty DataversePage.dataverse.name ? bundle.new : DataversePage.dataverse.name} #{bundle.dataverse}"/>
+            <ui:param name="dataverse" value="#{DataversePage.dataverse}"/>
+            <ui:define name="body">
+                <f:metadata>
+                    <f:viewParam name="showDataverseHeader" value="false"/>
+                    <f:viewAction action="#{DataversePage.init}"/>
+                </f:metadata>
+
+                <o:resourceInclude path="/CustomizationFilesServlet?customFileType=homePage" />
+
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
@@ -5,6 +5,7 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
+      xmlns:o="http://omnifaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:c="http://java.sun.com/jsp/jstl/core"      
       lang="en">
@@ -35,7 +36,15 @@
     </h:head>
     <h:body styleClass="#{widgetWrapper.widgetView ? 'widget-view' : ''}">
         <f:loadBundle basename="Bundle" var="bundle"/>
-        <a href="#content" class="sr-only">#{bundle['body.skip']}</a>       
+        <a href="#content" class="sr-only">#{bundle['body.skip']}</a>
+
+        <ui:fragment>
+            <style>
+                /* Custom CSS */
+                <o:resourceInclude path="/CustomizationFilesServlet?customFileType=style" />
+            </style>
+        </ui:fragment>
+
         <ui:include src="dataverse_header.xhtml">
             <ui:param name="dataverse" value="#{dataverse != null ? dataverse : dataverseServiceBean.findRootDataverse()}"/>
             <ui:param name="showDataverseHeader" value="#{showDataverseHeader != null ? showDataverseHeader : true}"/>
@@ -82,50 +91,52 @@
             <script type="text/javascript" language="javascript" src="#{resource['js/shib/isPassive.js']}"></script>
         </ui:fragment>
         <script>
-                    $(document).ready(function () {
-                        // Navbar Search Toggle
-                        $(document).on('click', '#navbar-search-toggle', function (e) {
-                            $(this).parent("li").hide();
-                            $("form.navbar-form[role='search']").show();
-                        });
-                        $('body').click(function (e) {
-                            if (!$(e.target).closest("form.navbar-form[role='search']").length) {
-                                $("form.navbar-form[role='search']").hide();
-                                $("#navbar-search-toggle").parent("li").show();
-                            }
-                            ;
-                        });
+            //<![CDATA[
+            $(document).ready(function () {
+                // Navbar Search Toggle
+                $(document).on('click', '#navbar-search-toggle', function (e) {
+                    $(this).parent("li").hide();
+                    $("form.navbar-form[role='search']").show();
+                });
+                $('body').click(function (e) {
+                    if (!$(e.target).closest("form.navbar-form[role='search']").length) {
+                        $("form.navbar-form[role='search']").hide();
+                        $("#navbar-search-toggle").parent("li").show();
+                    }
+                    ;
+                });
 
-                        // Rebind bootstrap UI components
-                        bind_bsui_components();
-                    });
+                // Rebind bootstrap UI components
+                bind_bsui_components();
+            });
 
-                    /*
-                     * Custom Popover with HTML code snippet
-                     */
-                    function popoverHTML() {
-                        var popoverTemplateHTML = ['<div class="popover">',
-                            '<div class="arrow"></div>',
-                            '<h3 class="popover-title"></h3>',
-                            '<div class="popover-content">',
-                            '</div>',
-                            '</div>'].join('');
+            /*
+             * Custom Popover with HTML code snippet
+             */
+            function popoverHTML() {
+                var popoverTemplateHTML = ['<div class="popover">',
+                    '<div class="arrow"></div>',
+                    '<h3 class="popover-title"></h3>',
+                    '<div class="popover-content">',
+                    '</div>',
+                    '</div>'].join('');
 
-                        var popoverContentHTML = ['<code>',
-                            '<h:outputText value="#{bundle.htmlAllowedTags}" escape="true"/>',
-                            '</code>'].join('');
+                var popoverContentHTML = ['<code>',
+                    '<h:outputText value="#{bundle.htmlAllowedTags}" escape="true"/>',
+                    '</code>'].join('');
 
-                        $('body').popover({
-                            selector: 'span.popoverHTML',
-                            title: '<h:outputText value="#{bundle.htmlAllowedTitle}"/>',
-                            trigger: 'hover',
-                            content: popoverContentHTML,
-                            template: popoverTemplateHTML,
-                            placement: "bottom",
-                            container: "#content",
-                            html: true
-                        });
-                    }
+                $('body').popover({
+                    selector: 'span.popoverHTML',
+                    title: '<h:outputText value="#{bundle.htmlAllowedTitle}"/>',
+                    trigger: 'hover',
+                    content: popoverContentHTML,
+                    template: popoverTemplateHTML,
+                    placement: "bottom",
+                    container: "#content",
+                    html: true
+                });
+            }
+            //]]>
         </script>
         <ui:include src="google-analytics-snippet.xhtml"></ui:include>
         <ui:include src="piwik-analytics-snippet.xhtml"></ui:include>