Author: sletellier Date: 2011-06-29 16:09:29 +0200 (Wed, 29 Jun 2011) New Revision: 104 Url: http://chorem.org/repositories/revision/vradi/104 Log: Add navigation links Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formView.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-06-29 14:02:20 UTC (rev 103) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-06-29 14:09:29 UTC (rev 104) @@ -23,6 +23,7 @@ vradi.register.mailHi=Hello vradi.register.mailPwd=Your password vradi.register.mailSubject=[Vradi] Your user informations +vradi.search.link=Return to search page vradi.register.submit=Login vradi.register.title=Login vradi.search.submit=Search Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-06-29 14:02:20 UTC (rev 103) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-06-29 14:09:29 UTC (rev 104) @@ -19,6 +19,7 @@ vradi.form.creationDate=Date de création vradi.form.editAction=Editer vradi.form.object=Objet +vradi.formView.title=Visualisation d'un formulaire vradi.login.email=Email vradi.login.password=Mot de passe vradi.login.repeatPassword=Confiramtion @@ -41,6 +42,7 @@ vradi.register.title=S'enregistrer vradi.search.activateQuery=Activer vradi.search.formNoteEdit=Edition des notes +vradi.search.link=Retour à la page de recherche vradi.search.queryName=Nom de la requête vradi.search.saveQuery=Sauvegarder la requête vradi.search.submit=Rechercher Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formView.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formView.jsp 2011-06-29 14:02:20 UTC (rev 103) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formView.jsp 2011-06-29 14:09:29 UTC (rev 104) @@ -2,6 +2,7 @@ <%@ page import="org.nuiton.wikitty.entities.Wikitty" %> <%@ page import="org.nuiton.wikitty.entities.WikittyExtension" %> <%@ page import="org.chorem.vradi.VradiSession" %> +<%@ page import="org.chorem.vradi.VradiWebHelper" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> @@ -21,10 +22,10 @@ Wikitty wikitty = VradiSession.getVradiSession(session).getProxy().getWikitty(form); WikittyExtension extension = wikitty.getExtension(extName); for (String fieldName : extension.getFieldNames()) { - %> + Object field = form.getField(extName, fieldName);%> <tr> <th><%=fieldName%></th> - <td><%=form.getField(extName, fieldName)%></td> + <td><%=field == null ? "" : VradiWebHelper.escapeSciptBalises(field.toString())%></td> </tr> <% } Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp 2011-06-29 14:02:20 UTC (rev 103) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp 2011-06-29 14:09:29 UTC (rev 104) @@ -10,25 +10,37 @@ VradiSession vradiSession = VradiSession.getVradiSession(session); VradiUser user = vradiSession.getUser(); ActionContext.getContext().put("logged", user != null); + + String requestURI = request.getRequestURI(); + boolean isSearchView = requestURI.contains("searchView"); + ActionContext.getContext().put("isNotSearchViewPage", !isSearchView); + + boolean isOption = requestURI.contains("option"); + ActionContext.getContext().put("isNotOptionPage", !isOption); %> <div id="titlePanel"> <h1><s:text name="vradi.title" /></h1> </div> <s:if test="logged"> - <div id="logoutPanel"> + <div id="linkPanel"> + <s:if test="isNotOptionPage"> + <s:a id="options" + action="options"> + <s:text name="vradi.options"/> + </s:a> + </s:if> + <s:if test="isNotSearchViewPage"> + <s:a id="searchLink" + action="searchView"> + <s:text name="vradi.search.link"/> + </s:a> + </s:if> <s:a id="logout" action="logout"> <s:text name="vradi.logout.submit" /> </s:a> </div> - <div id="optionsPanel"> - <s:a id="options" - action="options"> - - <s:text name="vradi.options"/> - </s:a> - </div> </s:if> <div id="msg"> <span id="actionmessageHeader">