]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Don't cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 1 Oct 2017 16:18:29 +0000 (18:18 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 1 Oct 2017 16:18:29 +0000 (18:18 +0200)
- renamed foo_title -> document_foo_title

Signed-off-by: Roland Häder <roland@mxchange.org>
web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
web/admin/financials/receipts/admin_receipt_list.xhtml
web/user/financials/login_financials_add_income.xhtml
web/user/financials/login_financials_add_receipt.xhtml
web/user/financials/login_financials_overview.xhtml

index abcb5de314a7663b5f2054d7d1d81dd87d3f538a..2e003413079dc430e77904fcd09209f4893c4e1e 100644 (file)
@@ -7,10 +7,10 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
+       <!--
+       @TODO: title="#{project.ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND_TITLE}"
+       -->
        <p:fieldset legend="#{project.ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND}">
-               <!--
-               @TODO: title="#{project.ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND_TITLE}"
-               -->
                <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="branchOffice" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE}" />
                        <p:selectOneMenu
index 952a319132e8a9f6a1bb6697e140b94c6cdc485e..2f0cdd50a0a5acc04699d178551531cc669c6c67 100644 (file)
@@ -9,7 +9,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST}" />
        </ui:define>
 
index e4a347488f1ed219a41f2db6971d7ac78c5a2922..793699db8b8ab3242dfa6d5347d4b590f515eb00 100644 (file)
@@ -6,11 +6,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{project.PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{project.CONTENT_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
        </ui:define>
 
index ec59537b5a7ccaf9a667da1e8dcbd27fb9a71dd0..e08d73854aa8258b6170da2a14c081704e5a12d5 100644 (file)
@@ -6,11 +6,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{project.PAGE_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{project.CONTENT_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT}" />
        </ui:define>
 
index ac4bde5d4f7ee8416383f218cfb90c6beb466837..d7efce4cd092406b84486a5e0fafabda983c35a0 100644 (file)
@@ -6,11 +6,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{project.PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{project.CONTENT_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
        </ui:define>