]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Continued:
authorRoland Haeder <roland@mxchange.org>
Fri, 9 Oct 2015 17:43:35 +0000 (19:43 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 9 Oct 2015 17:43:35 +0000 (19:43 +0200)
- added new page login_add_addressbook.xhtml (dummy a bit)
- added its language strings, too
- updated juser-lib.jar

lib/juser-lib.jar
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/faces-config.xml
web/WEB-INF/templates.dist/login_page.xhtml
web/login/login_add_addressbook.xhtml [new file with mode: 0644]

index fa16d4cb5257e3e9d9311b7480d883b55e029821..8659283ed70d5d08201719c4fcc2bf6472419651 100644 (file)
Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ
index d868ea67664610ce6cb80001d27761f41ccd635b..1f23fbd87b63063faa29a1b38d44ab3829609eea 100644 (file)
@@ -162,3 +162,5 @@ LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK=Weiteres Adressbuch hinzuf\u00fcgen
 LINK_LOGIN_ADD_FIRST_ADDRESSBOOK=Erstes Adressbuch anlegen
 LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK_TITLE=Legen Sie ein weiteres Adressbuch an. So organisieren Sie Ihre Kontakte besser.
 LINK_LOGIN_ADD_FIRST_ADDRESSBOOK_TITLE=Legen Sie Ihr erstes Adressbuch an. Dies ist f\u00fcr das Verwalten von Kontakten erforderlich.
+PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK=Neues Adressbuch anlegen
+CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK=Legen Sie ein neues Addressbuch an:
index 5cc5517f01b9db7154c32b909f87e359f88e46b1..dff016b07aebfdc4ac4d09cbcd541508777123dd 100644 (file)
@@ -162,3 +162,5 @@ LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK=Add additional address book
 LINK_LOGIN_ADD_FIRST_ADDRESSBOOK=Create first address book
 LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK_TITLE=You can create an additional address book here. This way you can organize your contacts.
 LINK_LOGIN_ADD_FIRST_ADDRESSBOOK_TITLE=Create your first address book. This is required to manage your contacts.
+PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK=Create new address book
+CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK=Create a new address book:
index 9a78bf5c06df3cb373220771889490e941ebf15a..6f9a43754be0c72372ff772554d47f24c3e03974 100644 (file)
                        <supported-locale>en_US</supported-locale>
                </locale-config>
        </application>
+    <navigation-rule>
+        <from-view-id>/login/login_own_addressbooks.xhtml</from-view-id>
+        <navigation-case>
+            <from-outcome>login_add_addressbook</from-outcome>
+            <to-view-id>/login/login_add_addressbook.xhtml</to-view-id>
+        </navigation-case>
+    </navigation-rule>
 </faces-config>
index 9378e32c1f09e05e5654217a1dac682160dcfb24..b93f606edd421fddab1ef456c316a0125818acd2 100644 (file)
@@ -9,10 +9,6 @@
        <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
                <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
                        #{msg.CONTENT_TITLE_LOGIN_FOO}
                </ui:define>
@@ -20,9 +16,5 @@
                <ui:define name="content">
                        Here goes your content.
                </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
-               </ui:define>
        </ui:composition>
 </html>
diff --git a/web/login/login_add_addressbook.xhtml b/web/login/login_add_addressbook.xhtml
new file mode 100644 (file)
index 0000000..219d874
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:form id="add_addressbook" acceptcharset="utf-8">
+                               
+                       </h:form>
+               </ui:define>
+       </ui:composition>
+</html>