You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2022/04/11 03:57:42 UTC

[directory-fortress-commander] branch wicket9 updated: slightly mods to labels on some pages

This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch wicket9
in repository https://gitbox.apache.org/repos/asf/directory-fortress-commander.git


The following commit(s) were added to refs/heads/wicket9 by this push:
     new 47a445c  slightly mods to labels on some pages
47a445c is described below

commit 47a445cf0b5e0b80accaf3410d7c8541250c008e
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Sun Apr 10 22:57:36 2022 -0500

    slightly mods to labels on some pages
---
 src/main/java/org/apache/directory/fortress/web/ErrorPage.java   | 1 -
 .../resources/org/apache/directory/fortress/web/ErrorPage.html   | 4 ++--
 .../resources/org/apache/directory/fortress/web/LaunchPage.html  | 9 ++-------
 .../resources/org/apache/directory/fortress/web/LoginPage.html   | 4 ++--
 .../resources/org/apache/directory/fortress/web/LogoutPage.html  | 4 ++--
 src/main/webapp/login/login.html                                 | 2 +-
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/apache/directory/fortress/web/ErrorPage.java b/src/main/java/org/apache/directory/fortress/web/ErrorPage.java
index 2261e98..ae9a3b8 100644
--- a/src/main/java/org/apache/directory/fortress/web/ErrorPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/ErrorPage.java
@@ -38,7 +38,6 @@ public class ErrorPage extends FortressWebBasePage
     {
         add( new Label( "title", new Model<>( "Runtime Exception Occurred" ) ) );
         add( new Label( "message", new Model<>( "Operation Failed" ) ) );
-        /*add( new Label( "message", new Model<>( e.getLocalizedMessage() ) ) );*/
         add( new BookmarkablePageLink( "homePage", getApplication().getHomePage() ) );
     }
 
diff --git a/src/main/resources/org/apache/directory/fortress/web/ErrorPage.html b/src/main/resources/org/apache/directory/fortress/web/ErrorPage.html
index 1c82665..9b3037d 100644
--- a/src/main/resources/org/apache/directory/fortress/web/ErrorPage.html
+++ b/src/main/resources/org/apache/directory/fortress/web/ErrorPage.html
@@ -20,7 +20,7 @@
 <head></head>
 <body>
 <wicket:extend>
-    <h3>Fortress Web Error Page</h3>
+    <h3>Apache Fortress Web Error Page</h3>
 
     <div class="ui-widget">
         <div style="padding: 0pt 0.7em;" class="ui-state-error ui-corner-all">
@@ -38,4 +38,4 @@
     </div>
 </wicket:extend>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/org/apache/directory/fortress/web/LaunchPage.html b/src/main/resources/org/apache/directory/fortress/web/LaunchPage.html
index 42e97de..546e1bc 100644
--- a/src/main/resources/org/apache/directory/fortress/web/LaunchPage.html
+++ b/src/main/resources/org/apache/directory/fortress/web/LaunchPage.html
@@ -20,13 +20,8 @@
 <head></head>
 <body>
 <wicket:extend>
-    <h3>Fortress Web Launch Page</h3>
+    <h3>Apache Fortress Web Launch Page</h3>
     <strong><span wicket:id="label1"></span></strong>
-<!--
-    <BR/>
-    <tr><td align="right"><wicket:link><a href = "ContextMenuPage.html">[Context Menu Page]</a></wicket:link></td></tr>
-    <BR/>
--->
 </wicket:extend>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/org/apache/directory/fortress/web/LoginPage.html b/src/main/resources/org/apache/directory/fortress/web/LoginPage.html
index f5339c7..82d7305 100644
--- a/src/main/resources/org/apache/directory/fortress/web/LoginPage.html
+++ b/src/main/resources/org/apache/directory/fortress/web/LoginPage.html
@@ -22,7 +22,7 @@
 </head>
 <body>
 <wicket:extend>
-    <h3>Fortress Web Login Page</h3>
+    <h3>Apache Fortress Web Login Page</h3>
 
     <form wicket:id="loginFields">
         <fieldset>
@@ -57,4 +57,4 @@
     </form>
 </wicket:extend>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/org/apache/directory/fortress/web/LogoutPage.html b/src/main/resources/org/apache/directory/fortress/web/LogoutPage.html
index 6d9f46d..641c6dc 100644
--- a/src/main/resources/org/apache/directory/fortress/web/LogoutPage.html
+++ b/src/main/resources/org/apache/directory/fortress/web/LogoutPage.html
@@ -20,8 +20,8 @@
 <head></head>
 <body>
 <wicket:extend>
-    <h3>Fortress Web Logout Page</h3>
+    <h3>Apache Fortress Web Logout Page</h3>
     <strong><span wicket:id="label1"></span></strong>
 </wicket:extend>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/webapp/login/login.html b/src/main/webapp/login/login.html
index 572712d..641d4c3 100644
--- a/src/main/webapp/login/login.html
+++ b/src/main/webapp/login/login.html
@@ -22,7 +22,7 @@
     <meta HTTP-EQUIV="Pragma" CONTENT="no-cache"/>
     <link rel="stylesheet" type="text/css" href="/fortress-web/css/camo-style.css" media="all"/>
     <title>Fortress Web Login Page</title>
-    <h3>Login to Fortress Web</h3>
+    <h3>Login to Apache Fortress Web</h3>
 </head>
 <body>
 <form METHOD=POST ACTION="j_security_check">