Author: bpoussin Date: 2011-04-19 19:51:16 +0200 (Tue, 19 Apr 2011) New Revision: 245 Url: http://chorem.org/repositories/revision/bow/245 Log: reorganisation du menu de droite en deplacant des choses dans preferences (un peu de style a refaire) Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp trunk/bow-ui/src/main/webapp/jsp/preferences.jsp Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-19 17:34:39 UTC (rev 244) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-19 17:51:16 UTC (rev 245) @@ -370,12 +370,12 @@ .formFrame{ min-width:400px; - min-height: 315px; +/* min-height: 315px; */ position:relative; margin-top:20px; margin-bottom:20px; margin-right:100px; - margin-left:100px; + margin-left:40px; padding-top:10px; padding-bottom:10px; padding-left:40px; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-19 17:34:39 UTC (rev 244) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-19 17:51:16 UTC (rev 245) @@ -34,9 +34,9 @@ <div id="logoutDiv" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> <s:form action="logout"> - <div class="input"> - <s:submit key="bow.rightMenu.logout" name="submit" /> - </div> + <div class="input"> + <s:submit key="bow.rightMenu.logout" name="submit" /> + </div> </s:form> <a href="http://maven-site.chorem.org/bow/" class="help" onclick="window.open(this.href); return false;"><s:text name="bow.rightMenu.help" /></a> </div> @@ -47,27 +47,30 @@ <div id="colonneD"> <ul class="droite"> <s:if test="#session.BowSession.isAdmin()"> - <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> - </s:if> + <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> + </s:if> <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> - <s:set var="permanentToken" value="#session.BowSession.getPermanentToken()" /> - <s:set var="temporaryToken" value="#session.BowSession.getTemporaryToken()" /> - <li><a title="%{getText('bow.rightMenu.bookmark.temporaryLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=${temporaryToken}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.temporaryLink" /></a></li> - <li><a title="%{getText('bow.rightMenu.bookmark.permanentLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=${permanentToken}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.permanentLink" /></a></li> </ul> - <div id="extensions"> - <h2><s:text name="bow.rightMenu.extensions" /></h2> - <ul class="droite"> - <li><a href="extensions/bow4chromium.crx"><img src="img/chromium.png" alt="Chromium" class="extensionIcon" /> - <s:text name="bow.rightMenu.chromiumExtension" /></a></li> - <li><strong><s:text name="bow.rightMenu.token.permanent" /> :</strong><br /><s:property value="%{#session.BowSession.getPermanentToken()}" /></li> - <li><strong><s:text name="bow.rightMenu.token.temporary" /> :</strong><br /><s:property value="%{#session.BowSession.getTemporaryToken()}" /></li> - </ul> + <div class="recherche"> + <s:form action="search"> + <div class="input"> + <s:textfield key="bow.rightMenu.search" name="searchLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> </div> + <div class="recherche"> + <s:form action="fullText"> + <div class="input"> + <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> + </div> <div id="add" class="clearfix"> <h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2> <s:form id="bookmarkForm" action="%{#request.formAction}"> - <p> + <p> <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" labelSeparator="" /><br /> <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /><br /> <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" labelSeparator="" /><br /> @@ -88,24 +91,8 @@ <jsp:include page="tagsCloud.jsp" flush="true" /> </s:else> <!--/div--> - <div class="recherche"> - <s:form action="search"> - <div class="input"> - <s:textfield key="bow.rightMenu.search" name="searchLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" name="submit" /> - </div> - </s:form> - </div> - <div class="recherche"> - <s:form action="fullText"> - <div class="input"> - <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" name="submit" /> - </div> - </s:form> - </div> <div class="colonnebas"> - <img src="img/piedmenu.jpg" width="401" height="77" alt="Pied de menu" /> + <img src="img/piedmenu.jpg" width="401" height="77" alt="Pied de menu" /> </div> </div> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-04-19 17:34:39 UTC (rev 244) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-04-19 17:51:16 UTC (rev 245) @@ -1,3 +1,4 @@ +<%@page import="org.chorem.bow.BowConfig"%> <%@page import="org.nuiton.wikitty.search.FacetTopic"%> <%@page import="org.chorem.bow.action.PreferencesAction"%> <!-- @@ -28,6 +29,7 @@ <% PreferencesAction action = PreferencesAction.getAction(); +String bowUrl = BowConfig.getInstance().getBowUrl(); %> <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -44,6 +46,45 @@ <h2><s:text name="bow.preferences.title"/></h2> </div> <s:actionerror/> + + <div class="formFrame fond"> + <s:set var="permanentToken" value="#session.BowSession.getPermanentToken()" /> + <s:set var="temporaryToken" value="#session.BowSession.getTemporaryToken()" /> + <ul> + <li> + <a title="%{getText('bow.rightMenu.bookmark.temporaryLinkDescription')}" + href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=${temporaryToken}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"> + <s:text name="bow.rightMenu.bookmark.temporaryLink" /> + </a> + </li> + <li> + <a title="%{getText('bow.rightMenu.bookmark.permanentLinkDescription')}" + href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=${permanentToken}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"> + <s:text name="bow.rightMenu.bookmark.permanentLink" /> + </a> + </li> + <li> + <a href="extensions/bow4chromium.crx"> + <img src="img/chromium.png" alt="Chromium" class="extensionIcon" /> + <s:text name="bow.rightMenu.chromiumExtension" /> + </a> + </li> + <li> + <strong><s:text name="bow.rightMenu.token.permanent"/> :</strong> + <s:property value="%{#permanentToken}"/> + </li> + <li> + <strong><s:text name="bow.rightMenu.token.temporary"/> :</strong> + <s:property value="%{#temporaryToken}"/> + </li> + </ul> + + <s:url var="regenPermToken" action="regenPermToken"/> + <s:a href="%{regenPermToken}" id="regenPermToken"> + <s:text name="bow.preferences.regenPermToken"/> + </s:a> + </div> + <s:form action="preferences"> <div class="formFrame fond"> <h3><s:text name="bow.preferences.userInfo"/></h3> @@ -59,26 +100,6 @@ name="confirmNewPassword" labelposition="top"/><br/> <s:submit key="bow.preferences.submit" name="submit"/><br/> </p> - - <br/> - <br/> - <br/> - <br/> - <ul> - <li> - <strong><s:text name="bow.rightMenu.token.permanent"/> :</strong> - <s:property value="%{#session.BowSession.getPermanentToken()}"/> - </li> - <li> - <strong><s:text name="bow.rightMenu.token.temporary"/> :</strong> - <s:property value="%{#session.BowSession.getTemporaryToken()}"/> - </li> - </ul> - - <s:url var="regenPermToken" action="regenPermToken"/> - <s:a href="%{regenPermToken}" id="regenPermToken"> - <s:text name="bow.preferences.regenPermToken"/> - </s:a> </div> <div class="formFrame fond"> <h3><s:text name="bow.preferences.siteLook"/></h3>
participants (1)
-
bpoussin@users.chorem.org