tried to resolve the 'Home' confusion by renaming the logged-in start…

…page to be 'My Overview' and removing 'Home' from the navigation when not being logged in. This supports the landing-page character, I think.
kkalass · Dec 18, 2011 · a770063 · a770063
1 parent 13e6167
commit a770063
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/src/main/webapp/WEB-INF/views/about.jsp b/src/main/webapp/WEB-INF/views/about.jsp
@@ -4,7 +4,7 @@
         <div class="container">
           <a class="brand" href="/"></a>
           <ul class="nav">
-            <li><a href="/">Home</a></li>
+            <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/">My Overview</a></li></sec:authorize>
             <li class="active"><a href="/about.html">About</a></li>
             <li><a href="/contact.html">Contact</a></li>
             <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/j_spring_security_logout">Logout</a></sec:authorize>

diff --git a/src/main/webapp/WEB-INF/views/campaign.jsp b/src/main/webapp/WEB-INF/views/campaign.jsp
@@ -14,7 +14,7 @@
         <div class="container">
           <a class="brand" href="/"></a>
           <ul class="nav">
-            <li><a href="/">Home</a></li>
+            <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/">My Overview</a></li></sec:authorize>
             <li><a href="/about.html">About</a></li>
             <li><a href="/contact.html">Contact</a></li>
             <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/j_spring_security_logout">Logout</a></sec:authorize>
@@ -29,7 +29,7 @@
 
       <div class="content">
         <ul class="breadcrumb">
-			  <li><a href="/">My Campaigns</a> <span class="divider">/</span></li>
+			  <li><a href="/">My Overview</a> <span class="divider">/</span></li>
 			  <li class="active">${campaign.title}</li>
 			</ul>
         <div class="row">

diff --git a/src/main/webapp/WEB-INF/views/contact.jsp b/src/main/webapp/WEB-INF/views/contact.jsp
@@ -4,7 +4,7 @@
         <div class="container">
           <a class="brand" href="/"></a>
           <ul class="nav">
-            <li><a href="/">Home</a></li>
+            <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/">My Overview</a></li></sec:authorize><li><a href="/"><sec:authorize access="hasRole('ROLE_ANONYMOUS')">Home</sec:authorize><sec:authorize access="hasRole('USER_ROLE')">My Campaigns</sec:authorize></a></li>
             <li><a href="/about.html">About</a></li>
             <li class="active"><a href="/contact.html">Contact</a></li>
             <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/j_spring_security_logout">Logout</a></sec:authorize>

diff --git a/src/main/webapp/WEB-INF/views/createCampaign.jsp b/src/main/webapp/WEB-INF/views/createCampaign.jsp
@@ -4,8 +4,7 @@
         <div class="container">
           <a class="brand" href="/"></a>
           <ul class="nav">
-            <li><a href="/">Home</a></li>
-            <li class="active"><a href="#">Campaign</a></li>
+            <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/">My Overview</a></li></sec:authorize>
             <li><a href="/about.html">About</a></li>
             <li><a href="/contact.html">Contact</a></li>
             <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/j_spring_security_logout">Logout</a></sec:authorize>

diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
@@ -4,7 +4,7 @@
         <div class="container">
           <a class="brand" href="/"></a>
           <ul class="nav">
-            <li class="active" ><a href="/">Home</a></li>
+            <sec:authorize access="hasRole('USER_ROLE')"><li  class="active"><a href="/">My Overview</a></li></sec:authorize>
             <li><a href="/about.html">About</a></li>
             <li><a href="/contact.html">Contact</a></li>
             <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/j_spring_security_logout">Logout</a></sec:authorize>
@@ -36,10 +36,9 @@
 
           <sec:authorize access="hasRole('USER_ROLE')">
             <div>
-            <!--h2>A Real-World "Like" for Campaigning and Advocacy</h2>
-            <br-->
+
+            <h2>My Campaigns</h2>
             <c:if test="${not empty campaigns}">
-	            <h2>My Campaigns</h2>
 	            <p>
 	            <table border=0 class="zebra-striped bordered-table">
 	                <tr><th>Title</th><th>External Link</th></tr>
@@ -50,8 +49,7 @@
 	            </p>
 	         </c:if>
             <c:if test="${empty campaigns}">
-	            <h2>Welcome!</h2>
-	           <p>How it works: </p>
+	           <p>Here you will get an overview of your campaigns, and this is how it works: </p>
 	           <ul>
 	             <li>First you create a new campaign</li>
 	             <li>Entering a title, description and the amount of QR codes you need</li>

diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
@@ -4,7 +4,7 @@
         <div class="container">
           <a class="brand" href="/"></a>
           <ul class="nav">
-            <li><a href="/">Home</a></li>
+            <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/">My Overview</a></li></sec:authorize>
             <li><a href="/about.html">About</a></li>
             <li><a href="/contact.html">Contact</a></li>
             <sec:authorize access="hasRole('USER_ROLE')"><li><a href="/j_spring_security_logout">Logout</a></sec:authorize>