From: Roland Haeder <roland@mxchange.org>
Date: Fri, 9 Oct 2015 17:43:35 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5da83cfb4294b95063d4a780725f0d4b29b9be01;p=jfinancials-war.git
Continued:
- added new page login_add_addressbook.xhtml (dummy a bit)
- added its language strings, too
- updated juser-lib.jar
---
diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar
index fa16d4cb..8659283e 100644
Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ
diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index d868ea67..1f23fbd8 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -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:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 5cc5517f..dff016b0 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -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:
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 9a78bf5c..6f9a4375 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -109,4 +109,11 @@
<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>
diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index 9378e32c..b93f606e 100644
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -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
index 00000000..219d8749
--- /dev/null
+++ b/web/login/login_add_addressbook.xhtml
@@ -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>