]> git.mxchange.org Git - addressbook-war.git/commitdiff
projects / addressbook-war.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0331c8c)
Renamed admin_index.xhtml to index.xhtml to have a nice index page.
authorRoland Haeder <roland@mxchange.org>
Sat, 9 Apr 2016 11:38:25 +0000 (13:38 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 9 Apr 2016 11:38:25 +0000 (13:38 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
nbproject/faces-config.NavData patch | blob | history
web/WEB-INF/faces-config.xml patch | blob | history
web/admin/admin_index.xhtml [deleted file] patch | blob | history
web/admin/index.xhtml [new file with mode: 0644] patch | blob

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index d693e4d96e75a6c4dc0050b1e1903e37f0b45902..fc3ecfb9cff69b3ca8da45d3bc6b8ed319ff35f2 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -38,7 +38,7 @@
         <Node id="user/login_error.xhtml" x="1150" y="450" zoom="true"/>
         <Node id="login/login_other_addressbooks.xhtml" x="650" y="600" zoom="true"/>
         <Node id="user/show_addressbook_entries.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="admin/admin_index.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="300" zoom="true"/>
         <Node id="login/login_change_email_address.xhtml" x="150" y="1050" zoom="true"/>
         <Node id="user/lost_passwd.xhtml" x="400" y="300" zoom="true"/>
         <Node id="login/login_list_sharing_addressbooks.xhtml" x="1400" y="150" zoom="true"/>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 27312254d5980384040b443dc8539d51a846bdb2..d9d1dfb2dcfe2efad23ac8bb5e73e7c0f75576b3 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -77,7 +77,7 @@
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_index</from-outcome>
-                       <to-view-id>/admin/admin_index.xhtml</to-view-id>
+                       <to-view-id>/admin/index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>login_index</from-outcome>
diff --git a/web/admin/admin_index.xhtml b/web/admin/admin_index.xhtml
deleted file mode 100644 (file)
index 66ce3ac..0000000
--- a/web/admin/admin_index.xhtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_WELCOME}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_WELCOME}
-               </ui:define>
-
-               <ui:define name="content">
-                       <!--
-                       TODO: Replace this dummy
-                       //-->
-                       Einiges kann hier eingestellt werden.
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml
new file mode 100644 (file)
index 0000000..66ce3ac
--- /dev/null
+++ b/web/admin/index.xhtml
@@ -0,0 +1,23 @@
+<?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/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_WELCOME}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_WELCOME}
+               </ui:define>
+
+               <ui:define name="content">
+                       <!--
+                       TODO: Replace this dummy
+                       //-->
+                       Einiges kann hier eingestellt werden.
+               </ui:define>
+       </ui:composition>
+</html>
Unnamed repository; edit this file 'description' to name the repository.