Refactor code structure for improved readability and maintainability

master
guilherme 2025-06-26 14:26:36 -03:00
parent 6af2b83622
commit f24aa85fbd
14 changed files with 90 additions and 510 deletions

View File

@ -5,13 +5,18 @@
xmlns:h="http://java.sun.com/jsf/html" xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui" xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:ui="http://java.sun.com/jsf/facelets"
> >
<p:submenu icon="pi pi-chevron-down" label="agtemplate"> <p:submenu label="agtemplate">
<p:menuitem <p:menuitem
value="tb_template" value="tb_template"
onclick="location.href='${request.contextPath}/agtemplate/Tb_template.xhtml'" onclick="location.href = '${request.contextPath}/agtemplate/Tb_template.xhtml'"
immediate="true" immediate="true"
styleClass="menuItem_styleClass" />
/>
<p:menuitem
value="tb_template"
onclick="location.href = '${request.contextPath}/agtemplate/Tb_template.xhtml'"
immediate="true"
/>
</p:submenu> </p:submenu>
</ui:composition> </ui:composition>

View File

@ -3817,7 +3817,7 @@ p:last-child {
.menu-wrapper .layout-menu-container { .menu-wrapper .layout-menu-container {
overflow: auto; overflow: auto;
height: 100%; height: 100%;
padding: 12px 32px; padding: 12px 24px;
} }
.menu-wrapper .layout-menu-container .layout-menu { .menu-wrapper .layout-menu-container .layout-menu {
list-style-type: none; list-style-type: none;
@ -4172,7 +4172,7 @@ p:last-child {
} }
@media (min-width: 993px) { @media (min-width: 993px) {
.layout-wrapper.layout-horizontal .menu-wrapper { .layout-wrapper.layout-horizontal .menu-wrapper {
top: 56px; top: 64px;
width: 100%; width: 100%;
height: 44px; height: 44px;
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

View File

@ -7,15 +7,4 @@
xmlns:ui="jakarta.faces.facelets" xmlns:ui="jakarta.faces.facelets"
xmlns:po="http://primefaces.org/poseidon"> xmlns:po="http://primefaces.org/poseidon">
<div class="menu-wrapper">
<div class="layout-menu-container">
<h:form id="menuform">
<po:menu widgetVar="PoseidonMenuWidget">
<ui:include src="./menu.xhtml" />
</po:menu>
</h:form>
</div>
</div>
</ui:composition> </ui:composition>

View File

@ -1,240 +1,36 @@
<ui:composition <ui:composition
xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core" xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html" xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://primefaces.org/ui" xmlns:p="http://primefaces.org/ui"
xmlns:po="http://primefaces.org/poseidon"> xmlns:po="http://primefaces.org/poseidon"
>
<div style="background: #285B1C; display: flex; flex-direction: column;">
<div class="layout-topbar"> <div style="padding: 20px 24px;">
<div class="layout-topbar-wrapper"> <div style="display: flex; align-items: center; gap: 20px">
<div class="layout-topbar-left"> <h:form prependId="false">
<h:form prependId="false"> <h:link id="logolink">
<h:link id="logolink" styleClass="layout-topbar-logo"> <p:graphicImage
<p:graphicImage name="images/#{ guestPreferences.topbarTheme == 'light' ? 'logo-poseidon.png' : 'logo-poseidon-dark.png'}" library="poseidon-layout" /> name="images/#{ guestPreferences.topbarTheme == 'light' ? 'logo-agape.png' : 'logo-agape-dark.png'}"
</h:link> library="poseidon-layout"
</h:form> style="height: 38px"
</div> />
<div class="layout-topbar-right"> </h:link>
<a href="#" class="menu-button"> </h:form>
<i class="pi pi-bars"></i>
</a>
<ul class="layout-topbar-actions">
<li class="search-item topbar-item">
<a href="#">
<span class="topbar-icon">
<i class="pi pi-search"></i>
</span>
</a>
<h:form onsubmit="return false;">
<h:panelGroup styleClass="md-inputfield search-input-wrapper">
<p:inputText placeholder="Search..." />
<i class="fa fa-search"></i>
</h:panelGroup>
</h:form>
<ul>
<h:form onsubmit="return false;">
<h:panelGroup styleClass="md-inputfield search-input-wrapper">
<p:inputText placeholder="Search..." />
<i class="fa fa-search"></i>
</h:panelGroup>
</h:form>
</ul>
</li>
<li class="topbar-item notifications">
<a href="#">
<span class="ui-overlay-badge topbar-icon">
<i class="pi pi-bell"></i>
<span class="ui-badge">2</span>
</span>
</a>
<ul >
<li class="layout-submenu-header">
<h6 class="header-text">Notifications</h6>
<span class="ui-badge">3</span>
</li>
<li>
<a tabindex="0">
<i class="pi pi-shopping-cart"></i>
<div class="notifications-item">
<h6>Order <span>#2254</span> is placed</h6>
<span>Total Amount of <span>$34.50</span></span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-clock"></i>
<div class="notifications-item">
<h6>Meeting with <span>AF04</span> Team</h6>
<span>Google Meets</span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-th-large"></i>
<div class="notifications-item">
<h6>Task <span>#41</span> is complete</h6>
<span>9 Remaining Tasks</span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-shopping-cart"></i>
<div class="notifications-item">
<h6>Order <span>#2255</span> is placed</h6>
<span>Total Amount of <span>$40.45</span></span>
</div>
</a>
</li>
</ul>
</li>
<li class="topbar-item messages">
<a href="#">
<span class="ui-overlay-badge topbar-icon">
<i class="pi pi-comments"></i>
<span class="ui-badge">6</span>
</span>
</a>
<ul >
<li class="layout-submenu-header">
<h6 class="header-text">Messages</h6>
<span class="ui-badge">5</span>
</li>
<li>
<a tabindex="0">
<p:graphicImage name="images/dashboard/leader-1.png" library="demo" />
<div class="messages-item">
<h6>Hey! I sent the sales report</h6>
<span>Dusana Semenov</span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<p:graphicImage name="images/dashboard/leader-2.png" library="demo" />
<div class="messages-item">
<h6>OK. Lets meet at 15 pm...</h6>
<span>Edward Lindgren</span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<p:graphicImage name="images/dashboard/leader-3.png" library="demo" />
<div class="messages-item">
<h6>Presentation is ready</h6>
<span>Noell Blue</span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<p:graphicImage name="images/dashboard/leader-4.png" library="demo" />
<div class="messages-item">
<h6>Faulty delivery on #959</h6>
<span>Gvozden Boskovsky</span>
</div>
</a>
</li>
</ul>
</li>
<li class="topbar-item settings">
<a href="#">
<span class="topbar-icon">
<i class="pi pi-cog"></i>
</span>
</a>
<ul >
<li class="layout-submenu-header">
<h6 class="header-text">Settings</h6>
</li>
<li>
<a tabindex="0">
<i class="pi pi-user"></i>
<div class="settings-item">
<h6>Account Info</h6>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-users"></i>
<div class="settings-item">
<h6>Global Accounts</h6>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-bell"></i>
<div class="settings-item">
<h6>Notification Preferences</h6>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-lock"></i>
<div class="settings-item">
<h6>Login Settings</h6>
</div>
</a>
</li>
</ul>
</li>
<li class="topbar-item user-profile">
<a href="#">
<p:graphicImage name="images/avatar-profile.png" library="poseidon-layout" />
<div class="profile-info">
<h6>Peter Taylor</h6>
<span>Webmaster</span>
</div>
</a>
<ul>
<li class="layout-submenu-header">
<p:graphicImage name="images/avatar-profile.png" library="poseidon-layout" />
<div class="profile-info">
<h6>Peter Taylor</h6>
<span>Webmaster</span>
</div>
</li>
<li>
<a href="#">
<i class="pi pi-cog"></i>
<h6>Setting</h6>
</a>
</li>
<li>
<a href="#">
<i class="pi pi-file-o"></i>
<h6>Terms of Usage</h6>
</a>
</li>
<li>
<a href="#">
<i class="pi pi-compass"></i>
<h6>Support</h6>
</a>
</li>
<li>
<a href="#">
<i class="pi pi-power-off"></i>
<h6>Logout</h6>
</a>
</li>
</ul>
</li>
</ul>
<a href="#" class="layout-rightpanel-button">
<i class="pi pi-arrow-left"></i>
</a>
</div>
</div>
<p style="color: #eeeeee; font-weight: 300; line-height: 16px">Prefeitura Municipal de <br/> Malhada dos Bois</p>
</div>
</div> </div>
<div class="menu-wrapper" style="background: #285B1C;">
<div class="layout-menu-container">
<h:form id="menuform">
<po:menu widgetVar="PoseidonMenuWidget">
<ui:include src="./menu.xhtml" />
</po:menu>
</h:form>
</div>
</div>
</div>
</ui:composition> </ui:composition>

View File

@ -5,13 +5,18 @@
xmlns:h="http://java.sun.com/jsf/html" xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui" xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:ui="http://java.sun.com/jsf/facelets"
> >
<p:submenu icon="pi pi-chevron-down" label="agtemplate"> <p:submenu label="agtemplate">
<p:menuitem <p:menuitem
value="tb_template" value="tb_template"
onclick="location.href='${request.contextPath}/agtemplate/Tb_template.xhtml'" onclick="location.href = '${request.contextPath}/agtemplate/Tb_template.xhtml'"
immediate="true" immediate="true"
styleClass="menuItem_styleClass" />
/>
<p:menuitem
value="tb_template"
onclick="location.href = '${request.contextPath}/agtemplate/Tb_template.xhtml'"
immediate="true"
/>
</p:submenu> </p:submenu>
</ui:composition> </ui:composition>

View File

@ -3817,7 +3817,7 @@ p:last-child {
.menu-wrapper .layout-menu-container { .menu-wrapper .layout-menu-container {
overflow: auto; overflow: auto;
height: 100%; height: 100%;
padding: 12px 32px; padding: 12px 24px;
} }
.menu-wrapper .layout-menu-container .layout-menu { .menu-wrapper .layout-menu-container .layout-menu {
list-style-type: none; list-style-type: none;
@ -4172,7 +4172,7 @@ p:last-child {
} }
@media (min-width: 993px) { @media (min-width: 993px) {
.layout-wrapper.layout-horizontal .menu-wrapper { .layout-wrapper.layout-horizontal .menu-wrapper {
top: 56px; top: 64px;
width: 100%; width: 100%;
height: 44px; height: 44px;
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -7,15 +7,4 @@
xmlns:ui="jakarta.faces.facelets" xmlns:ui="jakarta.faces.facelets"
xmlns:po="http://primefaces.org/poseidon"> xmlns:po="http://primefaces.org/poseidon">
<div class="menu-wrapper">
<div class="layout-menu-container">
<h:form id="menuform">
<po:menu widgetVar="PoseidonMenuWidget">
<ui:include src="./menu.xhtml" />
</po:menu>
</h:form>
</div>
</div>
</ui:composition> </ui:composition>

View File

@ -1,240 +1,36 @@
<ui:composition <ui:composition
xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core" xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html" xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://primefaces.org/ui" xmlns:p="http://primefaces.org/ui"
xmlns:po="http://primefaces.org/poseidon"> xmlns:po="http://primefaces.org/poseidon"
>
<div style="background: #285B1C; display: flex; flex-direction: column;">
<div class="layout-topbar"> <div style="padding: 20px 24px;">
<div class="layout-topbar-wrapper"> <div style="display: flex; align-items: center; gap: 20px">
<div class="layout-topbar-left"> <h:form prependId="false">
<h:form prependId="false"> <h:link id="logolink">
<h:link id="logolink" styleClass="layout-topbar-logo"> <p:graphicImage
<p:graphicImage name="images/#{ guestPreferences.topbarTheme == 'light' ? 'logo-poseidon.png' : 'logo-poseidon-dark.png'}" library="poseidon-layout" /> name="images/#{ guestPreferences.topbarTheme == 'light' ? 'logo-agape.png' : 'logo-agape-dark.png'}"
</h:link> library="poseidon-layout"
</h:form> style="height: 38px"
</div> />
<div class="layout-topbar-right"> </h:link>
<a href="#" class="menu-button"> </h:form>
<i class="pi pi-bars"></i>
</a>
<ul class="layout-topbar-actions">
<li class="search-item topbar-item">
<a href="#">
<span class="topbar-icon">
<i class="pi pi-search"></i>
</span>
</a>
<h:form onsubmit="return false;">
<h:panelGroup styleClass="md-inputfield search-input-wrapper">
<p:inputText placeholder="Search..." />
<i class="fa fa-search"></i>
</h:panelGroup>
</h:form>
<ul>
<h:form onsubmit="return false;">
<h:panelGroup styleClass="md-inputfield search-input-wrapper">
<p:inputText placeholder="Search..." />
<i class="fa fa-search"></i>
</h:panelGroup>
</h:form>
</ul>
</li>
<li class="topbar-item notifications">
<a href="#">
<span class="ui-overlay-badge topbar-icon">
<i class="pi pi-bell"></i>
<span class="ui-badge">2</span>
</span>
</a>
<ul >
<li class="layout-submenu-header">
<h6 class="header-text">Notifications</h6>
<span class="ui-badge">3</span>
</li>
<li>
<a tabindex="0">
<i class="pi pi-shopping-cart"></i>
<div class="notifications-item">
<h6>Order <span>#2254</span> is placed</h6>
<span>Total Amount of <span>$34.50</span></span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-clock"></i>
<div class="notifications-item">
<h6>Meeting with <span>AF04</span> Team</h6>
<span>Google Meets</span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-th-large"></i>
<div class="notifications-item">
<h6>Task <span>#41</span> is complete</h6>
<span>9 Remaining Tasks</span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-shopping-cart"></i>
<div class="notifications-item">
<h6>Order <span>#2255</span> is placed</h6>
<span>Total Amount of <span>$40.45</span></span>
</div>
</a>
</li>
</ul>
</li>
<li class="topbar-item messages">
<a href="#">
<span class="ui-overlay-badge topbar-icon">
<i class="pi pi-comments"></i>
<span class="ui-badge">6</span>
</span>
</a>
<ul >
<li class="layout-submenu-header">
<h6 class="header-text">Messages</h6>
<span class="ui-badge">5</span>
</li>
<li>
<a tabindex="0">
<p:graphicImage name="images/dashboard/leader-1.png" library="demo" />
<div class="messages-item">
<h6>Hey! I sent the sales report</h6>
<span>Dusana Semenov</span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<p:graphicImage name="images/dashboard/leader-2.png" library="demo" />
<div class="messages-item">
<h6>OK. Lets meet at 15 pm...</h6>
<span>Edward Lindgren</span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<p:graphicImage name="images/dashboard/leader-3.png" library="demo" />
<div class="messages-item">
<h6>Presentation is ready</h6>
<span>Noell Blue</span>
</div>
</a>
</li>
<li>
<a tabindex="0">
<p:graphicImage name="images/dashboard/leader-4.png" library="demo" />
<div class="messages-item">
<h6>Faulty delivery on #959</h6>
<span>Gvozden Boskovsky</span>
</div>
</a>
</li>
</ul>
</li>
<li class="topbar-item settings">
<a href="#">
<span class="topbar-icon">
<i class="pi pi-cog"></i>
</span>
</a>
<ul >
<li class="layout-submenu-header">
<h6 class="header-text">Settings</h6>
</li>
<li>
<a tabindex="0">
<i class="pi pi-user"></i>
<div class="settings-item">
<h6>Account Info</h6>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-users"></i>
<div class="settings-item">
<h6>Global Accounts</h6>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-bell"></i>
<div class="settings-item">
<h6>Notification Preferences</h6>
</div>
</a>
</li>
<li>
<a tabindex="0">
<i class="pi pi-lock"></i>
<div class="settings-item">
<h6>Login Settings</h6>
</div>
</a>
</li>
</ul>
</li>
<li class="topbar-item user-profile">
<a href="#">
<p:graphicImage name="images/avatar-profile.png" library="poseidon-layout" />
<div class="profile-info">
<h6>Peter Taylor</h6>
<span>Webmaster</span>
</div>
</a>
<ul>
<li class="layout-submenu-header">
<p:graphicImage name="images/avatar-profile.png" library="poseidon-layout" />
<div class="profile-info">
<h6>Peter Taylor</h6>
<span>Webmaster</span>
</div>
</li>
<li>
<a href="#">
<i class="pi pi-cog"></i>
<h6>Setting</h6>
</a>
</li>
<li>
<a href="#">
<i class="pi pi-file-o"></i>
<h6>Terms of Usage</h6>
</a>
</li>
<li>
<a href="#">
<i class="pi pi-compass"></i>
<h6>Support</h6>
</a>
</li>
<li>
<a href="#">
<i class="pi pi-power-off"></i>
<h6>Logout</h6>
</a>
</li>
</ul>
</li>
</ul>
<a href="#" class="layout-rightpanel-button">
<i class="pi pi-arrow-left"></i>
</a>
</div>
</div>
<p style="color: #eeeeee; font-weight: 300; line-height: 16px">Prefeitura Municipal de <br/> Malhada dos Bois</p>
</div>
</div> </div>
<div class="menu-wrapper" style="background: #285B1C;">
<div class="layout-menu-container">
<h:form id="menuform">
<po:menu widgetVar="PoseidonMenuWidget">
<ui:include src="./menu.xhtml" />
</po:menu>
</h:form>
</div>
</div>
</div>
</ui:composition> </ui:composition>