nb-configuration.xml

@@ -15,9 +15,5 @@ Any value defined here will override the pom.xml file value but is only applicab
 -->
         <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>Tomcat</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
         <netbeans.hint.jdkPlatform>JDK_21</netbeans.hint.jdkPlatform>
-        <org-netbeans-modules-css-prep.sass_2e_configured>true</org-netbeans-modules-css-prep.sass_2e_configured>
-        <org-netbeans-modules-css-prep.sass_2e_enabled>true</org-netbeans-modules-css-prep.sass_2e_enabled>
-        <org-netbeans-modules-css-prep.sass_2e_mappings>/scss:/css</org-netbeans-modules-css-prep.sass_2e_mappings>
-        <netbeans.compile.on.save>all</netbeans.compile.on.save>
     </properties>
 </project-shared-configuration>

src/main/webapp/WEB-INF/web.xml

@@ -55,10 +55,6 @@
     <welcome-file-list>
         <welcome-file>index.xhtml</welcome-file>
     </welcome-file-list>
-     <mime-mapping>
-        <extension>otf</extension>
-        <mime-type>application/font-otf</mime-type>
-    </mime-mapping>
     <mime-mapping>
         <extension>ttf</extension>
         <mime-type>application/font-sfnt</mime-type>
@@ -79,10 +75,6 @@
         <extension>eot?#iefix</extension>
         <mime-type>application/vnd.ms-fontobject</mime-type>
     </mime-mapping>
-    <context-param> 
-        <param-name>facelets.REFRESH_PERIOD</param-name> 
-        <param-value>0</param-value> 
-    </context-param>
     <mime-mapping>
         <extension>svg</extension>
         <mime-type>image/svg+xml</mime-type>

src/main/webapp/resources/demo/css/demo-light.css

@@ -1,5 +1,5 @@
 :root {
-  --content-alt-bg-color:#ffffff;
+  --content-alt-bg-color:#E8F1F8;
 }
 
 .order-badge {

src/main/webapp/resources/demo/images/dashboard/asset-deals.svg

@@ -3,7 +3,7 @@
         <circle cx="46.4" cy="142.78" r="14.22" fill="#FFF"/>
         <path stroke="#FFF" stroke-dasharray="6.32 9.48" stroke-width="1.264" d="M99.33 169.64c38.831 0 70.31-31.479 70.31-70.31s-31.479-70.31-70.31-70.31-70.31 31.479-70.31 70.31 31.479 70.31 70.31 70.31z" opacity=".2"/>
         <path stroke="#FFF" stroke-dasharray="285.98 1579998.463" stroke-linecap="round" stroke-width="6.32" d="M45.47 144.524c24.96 29.747 69.308 33.627 99.054 8.667 29.747-24.96 33.627-69.309 8.667-99.055-24.96-29.747-69.309-33.627-99.055-8.667-29.747 24.96-33.627 69.309-8.667 99.055z"/>
-        <text fill="#FFF" font-family="OpenSans, DIN Next" font-size="37.92">
+        <text fill="#FFF" font-family="OpenSans, Open Sans" font-size="37.92">
             <tspan x="62.2" y="114.26">72%</tspan>
         </text>
     </g>

src/main/webapp/resources/sass/_fonts.scss

@@ -1,113 +1,52 @@
-
+/* open-sans-300 - latin */
-/* din-next-ultra-light - latin */
 @font-face {
-  font-family: 'DIN Next';
+  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 200;
-  src: url("#{resource['poseidon-layout:fonts/din-next-ultra-light.otf']}")
-    format('opentype');
-}
-/* din-next-ultra-light-italic - latin */
-@font-face {
-  font-family: 'DIN Next';
-  font-style: italic;
-  font-weight: 200;
-  src: url("#{resource['poseidon-layout:fonts/din-next-ultra-light-italic.otf']}")
-    format('opentype');
-}
-/* din-next-light - latin */
-@font-face {
-  font-family: 'DIN Next';
   font-style: normal;
   font-weight: 300;
-  src: url("#{resource['poseidon-layout:fonts/din-next-light.otf']}")
+  src: url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-300.eot']}"); /* IE9 Compat Modes */
-    format('opentype');
+  src: local('Open Sans Light'), local('OpenSans-Light'),
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-300.eot']}?#iefix") format('embedded-opentype'), /* IE6-IE8 */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-300.woff2']}") format('woff2'), /* Super Modern Browsers */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-300.woff']}") format('woff'), /* Modern Browsers */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-300.ttf']}") format('truetype'), /* Safari, Android, iOS */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-300.svg']}#OpenSans") format('svg'); /* Legacy iOS */
 }
-/* din-next-light-italic - latin */
+/* open-sans-regular - latin */
 @font-face {
-  font-family: 'DIN Next';
+  font-family: 'Open Sans';
-  font-style: italic;
-  font-weight: 300;
-  src: url("#{resource['poseidon-layout:fonts/din-next-light-italic.otf']}")
-    format('opentype');
-}
-/* din-next-regular - latin */
-@font-face {
-  font-family: 'DIN Next';
   font-style: normal;
   font-weight: 400;
-  src: url("#{resource['poseidon-layout:fonts/din-next-regular.otf']}")
+  src: url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-regular.eot']}"); /* IE9 Compat Modes */
-    format('opentype');
+  src: local('Open Sans'), local('OpenSans'),
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-regular.eot']}?#iefix") format('embedded-opentype'), /* IE6-IE8 */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-regular.woff2']}") format('woff2'), /* Super Modern Browsers */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-regular.woff']}") format('woff'), /* Modern Browsers */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-regular.ttf']}") format('truetype'), /* Safari, Android, iOS */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-regular.svg']}#OpenSans") format('svg'); /* Legacy iOS */
 }
-/* din-next-italic - latin */
+/* open-sans-600 - latin */
 @font-face {
-  font-family: 'DIN Next';
+  font-family: 'Open Sans';
-  font-style: italic;
-  font-weight: 400;
-  src: url("#{resource['poseidon-layout:fonts/din-next-italic.otf']}")
-    format('opentype');
-}
-/* din-next-medium - latin */
-@font-face {
-  font-family: 'DIN Next';
   font-style: normal;
-  font-weight: 500;
+  font-weight: 600;
-  src: url("#{resource['poseidon-layout:fonts/din-next-medium.otf']}")
+  src: url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-600.eot']}"); /* IE9 Compat Modes */
-    format('opentype');
+  src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'),
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-600.eot']}?#iefix") format('embedded-opentype'), /* IE6-IE8 */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-600.woff2']}") format('woff2'), /* Super Modern Browsers */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-600.woff']}") format('woff'), /* Modern Browsers */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-600.ttf']}") format('truetype'), /* Safari, Android, iOS */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-600.svg']}#OpenSans") format('svg'); /* Legacy iOS */
 }
-/* din-next-medium-italic - latin */
+/* open-sans-700 - latin */
 @font-face {
-  font-family: 'DIN Next';
+  font-family: 'Open Sans';
-  font-style: italic;
-  font-weight: 500;
-  src: url("#{resource['poseidon-layout:fonts/din-next-medium-italic.otf']}")
-    format('opentype');
-}
-/* din-next-bold - latin */
-@font-face {
-  font-family: 'DIN Next';
   font-style: normal;
   font-weight: 700;
-  src: url("#{resource['poseidon-layout:fonts/din-next-bold.otf']}")
+  src: url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-700.eot']}"); /* IE9 Compat Modes */
-    format('opentype');
+  src: local('Open Sans Bold'), local('OpenSans-Bold'),
-}
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-700.eot']}?#iefix") format('embedded-opentype'), /* IE6-IE8 */
-/* din-next-bold-italic - latin */
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-700.woff2']}") format('woff2'), /* Super Modern Browsers */
-@font-face {
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-700.woff']}") format('woff'), /* Modern Browsers */
-  font-family: 'DIN Next';
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-700.ttf']}") format('truetype'), /* Safari, Android, iOS */
-  font-style: italic;
+       url("\#{resource['poseidon-layout:fonts/open-sans-v18-latin-ext_latin-700.svg']}#OpenSans") format('svg'); /* Legacy iOS */
-  font-weight: 700;
-  src: url("#{resource['poseidon-layout:fonts/din-next-bold-italic.otf']}")
-    format('opentype');
-}
-/* din-next-heavy - latin */
-@font-face {
-  font-family: 'DIN Next';
-  font-style: normal;
-  font-weight: 800;
-  src: url("#{resource['poseidon-layout:fonts/din-next-heavy.otf']}")
-    format('opentype');
-}
-/* din-next-heavy-italic - latin */
-@font-face {
-  font-family: 'DIN Next';
-  font-style: italic;
-  font-weight: 800;
-  src: url("#{resource['poseidon-layout:fonts/din-next-heavy-italic.otf']}")
-    format('opentype');
-}
-/* din-next-black - latin */
-@font-face {
-  font-family: 'DIN Next';
-  font-style: normal;
-  font-weight: 900;
-  src: url("#{resource['poseidon-layout:fonts/din-next-black.otf']}")
-    format('opentype');
-}
-/* din-next-black-italic - latin */
-@font-face {
-  font-family: 'DIN Next';
-  font-style: italic;
-  font-weight: 900;
-  src: url("#{resource['poseidon-layout:fonts/din-next-black-italic.otf']}")
-    format('opentype');
 }

src/main/webapp/resources/sass/layout/_main.scss

@@ -4,7 +4,7 @@ html {
 }
  
 body {
-    font-family: 'DIN Next';
+    font-family: 'Open Sans';
     font-size: $fontSize;
     color: $textColor;
     -webkit-font-smoothing: antialiased;

src/main/webapp/resources/sass/layout/_typography.scss

@@ -38,7 +38,7 @@ mark {
     background: #FFF8E1;
     padding: .25rem .4rem;
     border-radius: $borderRadius;
-    font-family: 'DIN Next';
+    font-family: 'Open Sans';
 }
 
 blockquote {

src/main/webapp/resources/sass/variables/layout/_layout_common.scss

@@ -1,6 +1,6 @@
 //general
 $fontSize:14px !default;
-$fontFamily: 'DIN Next' !default;
+$fontFamily: 'Open Sans' !default;
 $mobileBreakpoint:991px !default;
 $borderRadius:5px !default;
 $animationDuration:.2s !default;

src/main/webapp/resources/sass/variables/layout/_layout_light.scss

@@ -3,7 +3,7 @@ $textColor:#515C66 !default;
 $textSecondaryColor:#657380 !default;
 
 $contentBgColor:#FDFEFF !default;
-$contentAltBgColor:#ffffff !default;
+$contentAltBgColor:#E8F1F8 !default;
 $dividerColor: #E8F1F8 !default;
 
 $menuTooltipBgColor:#1c202c !default;

src/main/webapp/resources/sass/variables/theme/_theme_dark.scss

@@ -29,7 +29,7 @@ $hoverBg:rgba(#4E565F,.7) !default;
 
 //global 
 $fontSize:1rem !default;
-$fontFamily:'DIN Next' !default;
+$fontFamily:'Open Sans' !default;
 $textColor:$shade000 !default;
 $transitionDuration:.2s !default;
 $transition:background-color $transitionDuration, color $transitionDuration, border-color $transitionDuration, box-shadow $transitionDuration !default;

src/main/webapp/resources/sass/variables/theme/_theme_dim.scss

@@ -29,7 +29,7 @@ $hoverBg: rgba(#495771,.7) !default;
 
 //global 
 $fontSize:1rem !default;
-$fontFamily:'DIN Next' !default;
+$fontFamily:'Open Sans' !default;
 $textColor:$shade000 !default;
 $transitionDuration:.2s !default;
 $transition:background-color $transitionDuration, color $transitionDuration, border-color $transitionDuration, box-shadow $transitionDuration !default;

src/main/webapp/resources/sass/variables/theme/_theme_light.scss

@@ -27,7 +27,7 @@ $shade900:#252F44 !default;    //unused
 
 //global 
 $fontSize:1rem !default;
-$fontFamily:'DIN Next' !default;
+$fontFamily:'Open Sans' !default;
 $textColor:$shade700 !default;
 $transitionDuration:.2s !default;
 $transition:background-color $transitionDuration, color $transitionDuration, border-color $transitionDuration, box-shadow $transitionDuration !default;

src/main/webapp/template/config.xhtml

@@ -1,149 +1,71 @@
-<ui:composition
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-  xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets"
-  xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:p="http://primefaces.org/ui">
-  xmlns:h="http://java.sun.com/jsf/html"
+
-  xmlns:ui="http://java.sun.com/jsf/facelets"
-  xmlns:p="http://primefaces.org/ui"
->
     <div id="layout-config" class="layout-config">
         <div class="layout-config-content">
             <a href="#" id="layout-config-button" class="layout-config-button">
-        <i class="pi pi-cog" />
+                <i class="pi pi-cog"/>
             </a>
             <h:form id="config-form" styleClass="layout-config-form">
                 <div class="layout-config-header">
                     <h5>Theme Customization</h5>
-          <span
+                    <span>Poseidon offers different themes for layout, topbar, menu etc.</span>
-            >Poseidon offers different themes for layout, topbar, menu
-            etc.</span
-          >
                 </div>
 
-        <p:outputPanel
+                <p:outputPanel id="lightdark-panel" styleClass="layout-config-section options">
-          id="lightdark-panel"
-          styleClass="layout-config-section options"
-        >
                     <span class="section-name">Layout Mode</span>
                     <div class="grid layout-config-options">
-            <p:selectOneRadio
+                        <p:selectOneRadio layout="responsive" columns="3" value="#{guestPreferences.darkMode}" onchange="PrimeFaces.PoseidonConfigurator.changeLayout('#{guestPreferences.componentTheme}', event.target.value)"   >
-              layout="responsive"
-              columns="3"
-              value="#{guestPreferences.darkMode}"
-              onchange="PrimeFaces.PoseidonConfigurator.changeLayout('#{guestPreferences.componentTheme}', event.target.value)"
-            >
                             <f:selectItem itemLabel="Light" itemValue="light" />
                             <f:selectItem itemLabel="Dark" itemValue="dark" />
                             <f:selectItem itemLabel="Dim" itemValue="dim" />
-              <p:ajax
+                            <p:ajax onstart="PrimeFaces.PoseidonConfigurator.beforeResourceChange()" update="config-form logolink footerlogolink"/>
-                onstart="PrimeFaces.PoseidonConfigurator.beforeResourceChange()"
-                update="config-form logolink"
-              />
                         </p:selectOneRadio>
                     </div>
                 </p:outputPanel>
 
-        <p:outputPanel
+                <p:outputPanel id="menumodes-panel" styleClass="layout-config-section options">
-          id="menumodes-panel"
-          styleClass="layout-config-section options"
-        >
                     <span class="section-name">Menu Mode</span>
                     <div class="grid layout-config-options">
-            <p:selectOneRadio
+                        <p:selectOneRadio layout="responsive" columns="2" value="#{guestPreferences.menuMode}" onchange="PrimeFaces.PoseidonConfigurator.changeMenuMode(event.target.value)" >
-              layout="responsive"
+                            <f:selectItem itemLabel="Static" itemValue="layout-static layout-static-active" />
-              columns="2"
-              value="#{guestPreferences.menuMode}"
-              onchange="PrimeFaces.PoseidonConfigurator.changeMenuMode(event.target.value)"
-            >
-              <f:selectItem
-                itemLabel="Static"
-                itemValue="layout-static layout-static-active"
-              />
                             <f:selectItem itemLabel="Overlay" itemValue="layout-overlay" />
-              <f:selectItem
+                            <f:selectItem itemLabel="Horizontal" itemValue="layout-horizontal" />
-                itemLabel="Horizontal"
-                itemValue="layout-horizontal"
-              />
                             <p:ajax update="menumodes-panel" />
                         </p:selectOneRadio>
                     </div>
                 </p:outputPanel>
 
-        <p:outputPanel
+                <p:outputPanel id="menuthemes-panel" styleClass="layout-config-section options">
-          id="menuthemes-panel"
-          styleClass="layout-config-section options"
-        >
                     <span class="section-name">Menu Theme</span>
                     <div class="grid layout-config-options">
-            <p:selectOneRadio
+                        <p:selectOneRadio layout="responsive" columns="3" value="#{guestPreferences.menuTheme}" onchange="PrimeFaces.PoseidonConfigurator.changeSectionTheme(event.target.value , 'layout-menu')"   >
-              layout="responsive"
+                            <f:selectItem itemLabel="Light" itemValue="light" itemDisabled="#{guestPreferences.darkMode != 'light'}"  />
-              columns="3"
+                            <f:selectItem itemLabel="Dark" itemValue="dark" itemDisabled="#{guestPreferences.darkMode != 'light'}"  />
-              value="#{guestPreferences.menuTheme}"
+                            <f:selectItem itemLabel="Dim" itemValue="dim" itemDisabled="#{guestPreferences.darkMode != 'light'}" />
-              onchange="PrimeFaces.PoseidonConfigurator.changeSectionTheme(event.target.value , 'layout-menu')"
+                            <p:ajax update="logolink menuthemes-panel"/>
-            >
-              <f:selectItem
-                itemLabel="Light"
-                itemValue="light"
-                itemDisabled="#{guestPreferences.darkMode != 'light'}"
-              />
-              <f:selectItem
-                itemLabel="Dark"
-                itemValue="dark"
-                itemDisabled="#{guestPreferences.darkMode != 'light'}"
-              />
-              <f:selectItem
-                itemLabel="Dim"
-                itemValue="dim"
-                itemDisabled="#{guestPreferences.darkMode != 'light'}"
-              />
-              <p:ajax update="logolink menuthemes-panel" />
                         </p:selectOneRadio>
                     </div>
                 </p:outputPanel>
 
-        <p:outputPanel
+                <p:outputPanel id="topbarthemes-panel" styleClass="layout-config-section options">
-          id="topbarthemes-panel"
-          styleClass="layout-config-section options"
-        >
                     <span class="section-name">Topbar Mode</span>
                     <div class="grid layout-config-options">
-            <p:selectOneRadio
+                        <p:selectOneRadio layout="responsive" columns="3" value="#{guestPreferences.topbarTheme}" onchange="PrimeFaces.PoseidonConfigurator.changeSectionTheme(event.target.value , 'layout-topbar')"   >
-              layout="responsive"
+                            <f:selectItem itemLabel="Light" itemValue="light" itemDisabled="#{guestPreferences.darkMode != 'light'}"  />
-              columns="3"
+                            <f:selectItem itemLabel="Dark" itemValue="dark" itemDisabled="#{guestPreferences.darkMode != 'light'}" />
-              value="#{guestPreferences.topbarTheme}"
+                            <f:selectItem itemLabel="Dim" itemValue="dim" itemDisabled="#{guestPreferences.darkMode != 'light'}" />
-              onchange="PrimeFaces.PoseidonConfigurator.changeSectionTheme(event.target.value , 'layout-topbar')"
+                            <p:ajax update="logolink config-form"/>
-            >
-              <f:selectItem
-                itemLabel="Light"
-                itemValue="light"
-                itemDisabled="#{guestPreferences.darkMode != 'light'}"
-              />
-              <f:selectItem
-                itemLabel="Dark"
-                itemValue="dark"
-                itemDisabled="#{guestPreferences.darkMode != 'light'}"
-              />
-              <f:selectItem
-                itemLabel="Dim"
-                itemValue="dim"
-                itemDisabled="#{guestPreferences.darkMode != 'light'}"
-              />
-              <p:ajax update="logolink config-form" />
                         </p:selectOneRadio>
                     </div>
                 </p:outputPanel>
 
-        <p:outputPanel
+                <p:outputPanel id="outlined-panel" styleClass="layout-config-section options">
-          id="outlined-panel"
-          styleClass="layout-config-section options"
-        >
                     <span class="section-name">Form Type</span>
                     <div class="grid layout-config-options">
-            <p:selectOneRadio
+                        <p:selectOneRadio layout="responsive" columns="2" value="#{guestPreferences.inputStyle}"
-              layout="responsive"
+                                          onchange="PrimeFaces.PoseidonConfigurator.updateInputStyle(event.target.value)">
-              columns="2"
-              value="#{guestPreferences.inputStyle}"
-              onchange="PrimeFaces.PoseidonConfigurator.updateInputStyle(event.target.value)"
-            >
                             <f:selectItem itemLabel="Outlined" itemValue="outlined" />
                             <f:selectItem itemLabel="Filled" itemValue="filled" />
                             <p:ajax />
@@ -151,50 +73,26 @@
                     </div>
                 </p:outputPanel>
 
-        <p:outputPanel
+                <p:outputPanel id="orientation-panel" styleClass="layout-config-section dark">
-          id="orientation-panel"
-          styleClass="layout-config-section dark"
-        >
                     <span class="section-name">RTL Mode</span>
-          <p:inputSwitch
+                    <p:inputSwitch id="layout-switch-2" value="#{guestPreferences.orientationRTL}" onchange="PrimeFaces.PoseidonConfigurator.changeMenuToRTL()">
-            id="layout-switch-2"
+                        <p:ajax onstart="PrimeFaces.PoseidonConfigurator.beforeResourceChange()" update="config-form" />
-            value="#{guestPreferences.orientationRTL}"
-            onchange="PrimeFaces.PoseidonConfigurator.changeMenuToRTL()"
-          >
-            <p:ajax
-              onstart="PrimeFaces.PoseidonConfigurator.beforeResourceChange()"
-              update="config-form"
-            />
                     </p:inputSwitch>
                 </p:outputPanel>
 
-        <p:outputPanel
+                <p:outputPanel id="componentthemes-panel" styleClass="layout-config-section colors">
-          id="componentthemes-panel"
-          styleClass="layout-config-section colors"
-        >
                     <span class="section-name">Component Colors</span>
                     <div class="grid layout-config-colors">
-            <ui:repeat
+                        <ui:repeat value="#{guestPreferences.componentThemes}" var="componentTheme">
-              value="#{guestPreferences.componentThemes}"
-              var="componentTheme"
-            >
                             <div class="col col-fixed">
-                <p:commandLink
+                                <p:commandLink styleClass="layout-config-option" 
-                  styleClass="layout-config-option"
+                                    actionListener="#{guestPreferences.setComponentTheme(componentTheme.file)}" process="@this"
-                  actionListener="#{guestPreferences.setComponentTheme(componentTheme.file)}"
-                  process="@this"
                                     update=":config-form"
                                     onstart="PrimeFaces.PoseidonConfigurator.beforeResourceChange()"
-                  oncomplete="PrimeFaces.PoseidonConfigurator.changeComponentsTheme('#{componentTheme.file}', '#{guestPreferences.darkMode}')"
+                                    oncomplete="PrimeFaces.PoseidonConfigurator.changeComponentsTheme('#{componentTheme.file}', '#{guestPreferences.darkMode}')">
-                >
+                                    <span class="layout-config-option-color"
-                  <span
+                                        style="background-color: #{componentTheme.color};" title="#{componentTheme.name}"></span>
-                    class="layout-config-option-color"
+                                    <ui:fragment rendered="#{componentTheme.file eq guestPreferences.componentTheme}">
-                    style="background-color: #{componentTheme.color}"
-                    title="#{componentTheme.name}"
-                  ></span>
-                  <ui:fragment
-                    rendered="#{componentTheme.file eq guestPreferences.componentTheme}"
-                  >
                                         <span class="layout-config-option-check-mask">
                                             <i class="pi pi-check"></i>
                                         </span>
@@ -204,6 +102,7 @@
                         </ui:repeat>
                     </div>
                 </p:outputPanel>
+
             </h:form>
         </div>
     </div>

src/main/webapp/template/footer.xhtml

@@ -0,0 +1,20 @@
+<ui:composition 
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:p="http://primefaces.org/ui">
+
+    <h:form prependId="false">
+        <div class="layout-footer">
+            <h:link id="footerlogolink" >
+                <p:graphicImage name="images/#{ guestPreferences.darkMode == 'light' ? 'logo-poseidon.png' : 'logo-poseidon-dark.png'}" library="poseidon-layout" />
+            </h:link>
+            <div class="social-icons">
+                <a><i class="pi pi-github"/></a>
+                <a><i class="pi pi-facebook"/></a>
+                <a><i class="pi pi-twitter"/></a>
+            </div>
+        </div>
+    </h:form>
+</ui:composition>

src/main/webapp/template/template.xhtml

@@ -1,66 +1,26 @@
 <!DOCTYPE html>
-<html
+<html xmlns="http://www.w3.org/1999/xhtml"
-  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:p="http://primefaces.org/ui">
->
+
     <h:head>
         <f:facet name="first">
             <meta http-equiv="X-UA-Compatible" content="IE=edge" />
             <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <meta
+            <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
-        name="viewport"
-        content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
-      />
             <meta name="apple-mobile-web-app-capable" content="yes" />
         </f:facet>
-    <title>
+        <title><ui:insert name="HEAD_TITULO_PAGINA">PrimeFaces Poseidon</ui:insert></title>
-      <ui:insert name="HEAD_TITULO_PAGINA">PrimeFaces Poseidon</ui:insert>
-    </title>
         <h:outputScript name="js/layout.js" library="poseidon-layout" />
         <h:outputScript name="js/prism.js" library="poseidon-layout" />
-    <ui:insert name="head" />
+        <ui:insert name="head"/>
 		<script>
 			PrimeFaces.locales['pt_BR'] = {
-        monthNames: [
+    monthNames: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
-          'Janeiro',
+    monthNamesShort: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'],
-          'Fevereiro',
+    dayNames: ['Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado'],
-          'Março',
-          'Abril',
-          'Maio',
-          'Junho',
-          'Julho',
-          'Agosto',
-          'Setembro',
-          'Outubro',
-          'Novembro',
-          'Dezembro',
-        ],
-        monthNamesShort: [
-          'Jan',
-          'Fev',
-          'Mar',
-          'Abr',
-          'Mai',
-          'Jun',
-          'Jul',
-          'Ago',
-          'Set',
-          'Out',
-          'Nov',
-          'Dez',
-        ],
-        dayNames: [
-          'Domingo',
-          'Segunda-feira',
-          'Terça-feira',
-          'Quarta-feira',
-          'Quinta-feira',
-          'Sexta-feira',
-          'Sábado',
-        ],
     dayNamesShort: ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'],
     dayNamesMin: ['D', 'S', 'T', 'Q', 'Q', 'S', 'S'],
     weekHeader: 'Semana',
@@ -86,15 +46,15 @@
        close: 'Fechar',
        previous: 'Anterior',
        next: 'Próximo',
-        },
+   }
-      };
+};
+
 		</script>
     </h:head>
 
     <h:body styleClass="main-body #{guestPreferences.inputStyleClass}">
-    <div
+
-      class="layout-wrapper layout-topbar-#{guestPreferences.topbarTheme} layout-static-active layout-menu-#{guestPreferences.menuTheme} #{guestPreferences.menuMode} #{guestPreferences.orientationRTL ? 'layout-rtl' : null}"
+        <div class="layout-wrapper layout-topbar-#{guestPreferences.topbarTheme} layout-static-active layout-menu-#{guestPreferences.menuTheme}  #{guestPreferences.menuMode} #{guestPreferences.orientationRTL ? 'layout-rtl' : null}">
-    >
             <ui:include src="./topbar.xhtml" />
             <ui:include src="./menutemplate.xhtml" />
 
@@ -104,6 +64,8 @@
             <div class="layout-main">
                 <ui:include src="./breadcrumb.xhtml" /> 
                 <div class="layout-content">
+
+
                     <h:form prependId="false">
                         <div class="grid crud-demo">
                             <div class="col-12">
@@ -112,78 +74,55 @@
 
                                     <p:toolbar styleClass="mb-4">
                                         <p:toolbarGroup>
-                      <ui:insert name="MENU_BOTOES"> </ui:insert>
+                                            <ui:insert name="MENU_BOTOES">
+
+                                            </ui:insert>
+
                                         </p:toolbarGroup>
                                         <p:toolbarGroup>
-                      <ui:insert name="MENU_FILTRO"> </ui:insert>
+                                            <ui:insert name="MENU_FILTRO">
+
+                                            </ui:insert>
                                         </p:toolbarGroup>
                                     </p:toolbar>
 
+
                                     <!-- TABELA -->
                                     <h:panelGroup layout="block" id="form_formulario">
-                    <p:messages
+                                        <p:messages id="messages" showSummary="true" closable="true" />
-                      id="messages"
-                      showSummary="true"
-                      closable="true"
-                    />
                                         <h:panelGroup layout="block" id="panel_formulario">
-                      <ui:insert name="FORMULARIO"></ui:insert>
+                                            <ui:insert name="FORMULARIO" ></ui:insert>
                                         </h:panelGroup>
                                     </h:panelGroup>
                                     <ui:insert name="LIVRE"></ui:insert>
 
-                  <p:confirmDialog
+                                    <p:confirmDialog widgetVar="deleteDialog" showEffect="fade" width="300" message="Deseja excluir?" header="Confirmar" severity="warn">
-                    widgetVar="deleteDialog"
+                                        <p:commandButton value="Sim" icon="pi pi-check" process="@this" oncomplete="PF('deleteDialog').hide()"/>
-                    showEffect="fade"
+                                        <p:commandButton value="Não" type="button" styleClass="ui-button-secondary" icon="pi pi-times" onclick="PF('deleteDialog').hide()" />
-                    width="300"
-                    message="Deseja excluir?"
-                    header="Confirmar"
-                    severity="warn"
-                  >
-                    <p:commandButton
-                      value="Sim"
-                      icon="pi pi-check"
-                      process="@this"
-                      oncomplete="PF('deleteDialog').hide()"
-                    />
-                    <p:commandButton
-                      value="Não"
-                      type="button"
-                      styleClass="ui-button-secondary"
-                      icon="pi pi-times"
-                      onclick="PF('deleteDialog').hide()"
-                    />
                                     </p:confirmDialog>
 
                                     <p:confirmDialog global="true" showEffect="fade" width="300">
-                    <p:commandButton
+                                        <p:commandButton value="Sim" type="button" styleClass="ui-confirmdialog-yes" icon="pi pi-check" />
-                      value="Sim"
+                                        <p:commandButton value="Não" type="button" styleClass="ui-confirmdialog-no ui-button-secondary" icon="pi pi-times" />
-                      type="button"
-                      styleClass="ui-confirmdialog-yes"
-                      icon="pi pi-check"
-                    />
-                    <p:commandButton
-                      value="Não"
-                      type="button"
-                      styleClass="ui-confirmdialog-no ui-button-secondary"
-                      icon="pi pi-times"
-                    />
                                     </p:confirmDialog>
                                 </div>
                             </div>
                         </div>
                     </h:form>
+
+
+
                 </div>
+
+                <ui:include src="./footer.xhtml" />
             </div>
             <div class="layout-mask modal-in"></div>
         </div>
 
+
         <p:ajaxStatus styleClass="layout-ajax-loader">
             <f:facet name="start">
-        <i
+                <i class="pi pi-spin pi-spinner layout-ajax-loader-icon" aria-hidden="true"/>
-          class="pi pi-spin pi-spinner layout-ajax-loader-icon"
-          aria-hidden="true"
-        />
             </f:facet>
 
             <f:facet name="complete">
@@ -191,20 +130,12 @@
             </f:facet>
         </p:ajaxStatus>
 
-    <h:outputStylesheet
+        <h:outputStylesheet name="css/primeflex.min.css" library="poseidon-layout" />
-      name="css/primeflex.min.css"
-      library="poseidon-layout"
-    />
         <h:outputStylesheet name="css/primeicons.css" library="poseidon-layout" />
-    <h:outputStylesheet
+        <h:outputStylesheet name="css/demo-#{guestPreferences.darkMode}.css" library="demo" />
-      name="css/demo-#{guestPreferences.darkMode}.css"
+        <h:outputStylesheet name="css/layout-#{guestPreferences.darkMode}.css" library="poseidon-layout" />
-      library="demo"
-    />
-    <h:outputStylesheet
-      name="css/layout-#{guestPreferences.darkMode}.css"
-      library="poseidon-layout"
-    />
 		<h:outputStylesheet name="css/framework.css" library="framework" />
-    <p:log id="log" rendered="false" />
+        <p:log id="log" rendered="false"/>
     </h:body>
+
 </html>

target/agtemplate-1.0.0/WEB-INF/web.xml

@@ -55,10 +55,6 @@
     <welcome-file-list>
         <welcome-file>index.xhtml</welcome-file>
     </welcome-file-list>
-     <mime-mapping>
-        <extension>otf</extension>
-        <mime-type>application/font-otf</mime-type>
-    </mime-mapping>
     <mime-mapping>
         <extension>ttf</extension>
         <mime-type>application/font-sfnt</mime-type>
@@ -79,10 +75,6 @@
         <extension>eot?#iefix</extension>
         <mime-type>application/vnd.ms-fontobject</mime-type>
     </mime-mapping>
-    <context-param> 
-        <param-name>facelets.REFRESH_PERIOD</param-name> 
-        <param-value>0</param-value> 
-    </context-param>
     <mime-mapping>
         <extension>svg</extension>
         <mime-type>image/svg+xml</mime-type>

target/agtemplate-1.0.0/resources/demo/css/demo-light.css

@@ -1,5 +1,5 @@
 :root {
-  --content-alt-bg-color:#ffffff;
+  --content-alt-bg-color:#E8F1F8;
 }
 
 .order-badge {

target/agtemplate-1.0.0/resources/demo/images/dashboard/asset-deals.svg

@@ -3,7 +3,7 @@
         <circle cx="46.4" cy="142.78" r="14.22" fill="#FFF"/>
         <path stroke="#FFF" stroke-dasharray="6.32 9.48" stroke-width="1.264" d="M99.33 169.64c38.831 0 70.31-31.479 70.31-70.31s-31.479-70.31-70.31-70.31-70.31 31.479-70.31 70.31 31.479 70.31 70.31 70.31z" opacity=".2"/>
         <path stroke="#FFF" stroke-dasharray="285.98 1579998.463" stroke-linecap="round" stroke-width="6.32" d="M45.47 144.524c24.96 29.747 69.308 33.627 99.054 8.667 29.747-24.96 33.627-69.309 8.667-99.055-24.96-29.747-69.309-33.627-99.055-8.667-29.747 24.96-33.627 69.309-8.667 99.055z"/>
-        <text fill="#FFF" font-family="OpenSans, DIN Next" font-size="37.92">
+        <text fill="#FFF" font-family="OpenSans, Open Sans" font-size="37.92">
             <tspan x="62.2" y="114.26">72%</tspan>
         </text>
     </g>