itracker-commits Mailing List for itracker (Page 4)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2253
          http://itracker.svn.sourceforge.net/itracker/?rev=2253&view=rev
Author:   ranks
Date:     2011-10-22 12:40:58 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
language chooser moved to anonymous header

Modified Paths:
--------------
    itracker/trunk/src/main/java/org/itracker/web/actions/user/SelfRegisterAction.java
    itracker/trunk/src/main/java/org/itracker/web/actions/user/SelfRegisterFormAction.java
    itracker/trunk/src/main/java/org/itracker/web/filters/ExecuteAlwaysFilter.java
    itracker/trunk/src/main/webapp/self_register.jsp
    itracker/trunk/src/main/webapp/themes/defaulttheme/includes/header.jsp
    itracker/trunk/src/main/webapp/themes/defaulttheme/includes/styles.css

Modified: itracker/trunk/src/main/java/org/itracker/web/actions/user/SelfRegisterAction.java
===================================================================

--- itracker/trunk/src/main/java/org/itracker/web/actions/user/SelfRegisterAction.java	2011-10-16 15:46:51 UTC (rev 2252)
+++ itracker/trunk/src/main/java/org/itracker/web/actions/user/SelfRegisterAction.java	2011-10-22 12:40:58 UTC (rev 2253)
@@ -144,7 +144,6 @@
 
 		if (!errors.isEmpty()) {
 			saveErrors(request, errors);
-            SelfRegisterAction.setupRequestParams(request, getITrackerServices());
 			saveToken(request);
 			return mapping.getInputForward();
 		}
@@ -152,12 +151,4 @@
 		return mapping.findForward("login");
 	}
 
-    public static void setupRequestParams(HttpServletRequest request, ITrackerServices service) {
-
-        ConfigurationService configurationService = service.getConfigurationService();
-        //request.setAttribute("configurationService", configurationService);
-        request.setAttribute("locales", configurationService.getAvailableLanguages());
-
-
-    }
 }

Modified: itracker/trunk/src/main/java/org/itracker/web/actions/user/SelfRegisterFormAction.java
===================================================================
--- itracker/trunk/src/main/java/org/itracker/web/actions/user/SelfRegisterFormAction.java	2011-10-16 15:46:51 UTC (rev 2252)
+++ itracker/trunk/src/main/java/org/itracker/web/actions/user/SelfRegisterFormAction.java	2011-10-22 12:40:58 UTC (rev 2253)
@@ -37,8 +37,6 @@
 		saveToken(request);
 //		itracker.web.selfreg.title
 
-        SelfRegisterAction.setupRequestParams(request, getITrackerServices());
-
 //		String pageTitleKey = "itracker.web.selfreg.title";
 //		String pageTitleArg = "";
 //		request.setAttribute("pageTitleKey", pageTitleKey);

Modified: itracker/trunk/src/main/java/org/itracker/web/filters/ExecuteAlwaysFilter.java
===================================================================
--- itracker/trunk/src/main/java/org/itracker/web/filters/ExecuteAlwaysFilter.java	2011-10-16 15:46:51 UTC (rev 2252)
+++ itracker/trunk/src/main/java/org/itracker/web/filters/ExecuteAlwaysFilter.java	2011-10-22 12:40:58 UTC (rev 2253)
@@ -328,7 +328,11 @@
 		// set a default page-title key
 		request.setAttribute("pageTitleKey", "itracker.web.generic.itracker");
 		request.setAttribute("pageTitleArg", "");
-		
+
+
+        request.setAttribute("locales", configurationService.getAvailableLanguages());
+
+
 		request.setAttribute(Constants.LOCALE_KEY, locale);
 		
 		

Modified: itracker/trunk/src/main/webapp/self_register.jsp
===================================================================
--- itracker/trunk/src/main/webapp/self_register.jsp	2011-10-16 15:46:51 UTC (rev 2252)
+++ itracker/trunk/src/main/webapp/self_register.jsp	2011-10-22 12:40:58 UTC (rev 2253)
@@ -8,13 +8,8 @@
 <%-- <nitrox:var name="allowSelfRegister" type="java.lang.Boolean"/> --%>
 
 
-<div id="locales"><c:forEach items="${locales}" var="locMap">
-   <span><a href="?loc=${locMap.key}" class="${locMap.key}_loc">${locMap.key}</a><c:forEach items="${locMap.value}" var="loc"> <a href="?loc=${loc}" class="${loc}_loc">${loc}</a></c:forEach> </span>
 
 
-</c:forEach>
-</div>
-
 <c:choose>
 	<c:when test="${! allowSelfRegister}">
 	   <center><span style="color: red;"><it:message key="itracker.web.error.notenabled"/></span></center>

Modified: itracker/trunk/src/main/webapp/themes/defaulttheme/includes/header.jsp
===================================================================
--- itracker/trunk/src/main/webapp/themes/defaulttheme/includes/header.jsp	2011-10-16 15:46:51 UTC (rev 2252)
+++ itracker/trunk/src/main/webapp/themes/defaulttheme/includes/header.jsp	2011-10-22 12:40:58 UTC (rev 2253)
@@ -7,6 +7,7 @@
 <%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <html>
 <head>
@@ -130,6 +131,23 @@
 				<it:message key="itracker.web.header.menu.logout" />
 			</html:link>
 		</c:if> <c:if test="${currUser == null}">
+
+            <c:if test="${fn:length(locales) gt 1}">
+                <div class="locales"><c:forEach items="${locales}" var="locMap">
+                    <span> | <a href="?loc=${locMap.key}" class="${locMap.key}_loc">${locMap.key}</a></span>
+                    <c:forEach items="${locMap.value}" var="loc"> <span> | <a href="?loc=${loc}" class="${loc}_loc">${loc}</a></span></c:forEach>
+                </c:forEach></div>
+            </c:if>
+            <%--<c:if test="${locales and (fn:length(locales) gt 1)}">
+            <div id="locales"><c:forEach items="${locales}" var="locMap">
+               <span><a href="?loc=${locMap.key}" class="${locMap.key}_loc">${locMap.key}</a><c:forEach items="${locMap.value}" var="loc"> <a href="?loc=${loc}" class="${loc}_loc">${loc}</a></c:forEach> </span>
+
+
+            </c:forEach>
+            </div>
+            </c:if--%>
+
+
             <%-- TODO: localization separated from page title? --%>
             <html:link linkName="index" forward="index"
                 styleClass="headerLinks"
@@ -137,7 +155,7 @@
                 <it:message key="itracker.web.login.title" />
             </html:link>
 			<c:if test="${allowForgotPassword}">
-				<html:link linkName="forgotpassword" forward="forgotpassword"
+				       | <html:link linkName="forgotpassword" forward="forgotpassword"
 					styleClass="headerLinks"
 					titleKey="itracker.web.header.menu.forgotpass.alt">
 					<it:message key="itracker.web.header.menu.forgotpass" />

Modified: itracker/trunk/src/main/webapp/themes/defaulttheme/includes/styles.css
===================================================================
--- itracker/trunk/src/main/webapp/themes/defaulttheme/includes/styles.css	2011-10-16 15:46:51 UTC (rev 2252)
+++ itracker/trunk/src/main/webapp/themes/defaulttheme/includes/styles.css	2011-10-22 12:40:58 UTC (rev 2253)
@@ -2,7 +2,7 @@
 	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
 	background: #fff;
 }
-smallbody {
+.smallbody {
 	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
 	font-size: 10px;
 	background: #fff;
@@ -69,6 +69,10 @@
   background-color: white;
 	text-decoration: none;
 }
+.locales {
+    float: left;
+    text-align: left;
+}
 
 
 .headerText,
@@ -126,6 +130,7 @@
 }
 
 .footer {
+    display: none;
 	clear:both;
 	font-weight: normal;
 	text-align: left;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (217)	Nov (180)	Dec (71)
2006	Jan (58)	Feb (370)	Mar (105)	Apr (165)	May (93)	Jun (37)	Jul	Aug (21)	Sep (131)	Oct (40)	Nov (113)	Dec (401)
2007	Jan (180)	Feb (4)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (3)
2008	Jan (163)	Feb (78)	Mar	Apr (4)	May (28)	Jun (2)	Jul	Aug	Sep (96)	Oct (189)	Nov (413)	Dec (121)
2009	Jan (34)	Feb (18)	Mar (24)	Apr (16)	May (3)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec (13)
2010	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep (3)	Oct (16)	Nov	Dec
2012	Jan	Feb	Mar	Apr (5)	May (35)	Jun	Jul (17)	Aug (7)	Sep	Oct (9)	Nov	Dec

itracker-commits Mailing List for itracker (Page 4)

open source issue tracking system

itracker-commits — itracker CVS commits are distributed through this mailinglist. Join to develop.