From bpoussin@users.chorem.org Tue Apr 19 19:51:16 2011
From: bpoussin@users.chorem.org
To: bow-commits@list.chorem.org
Subject: [Bow-commits] r245 - in trunk/bow-ui/src/main/webapp: css jsp	jsp/inc
Date: Tue, 19 Apr 2011 19:51:16 +0200
Message-ID: <20110419175116.C9E8016C6B@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3677977745406999834=="

--===============3677977745406999834==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/bow-ui/src/main/webapp/css/bookmark.css	2011-04-19 17:34:39 UTC (re=
v 244)
+++ trunk/bow-ui/src/main/webapp/css/bookmark.css	2011-04-19 17:51:16 UTC (re=
v 245)
@@ -370,12 +370,12 @@
=20
 .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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp	2011-04-19 17:34:39 UT=
C (rev 244)
+++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp	2011-04-19 17:51:16 UT=
C (rev 245)
@@ -34,9 +34,9 @@
 <div id=3D"logoutDiv" xmlns:s=3D"http://java.sun.com/xml/ns/j2ee/web-jsptagl=
ibrary_2_0.xsd"
       xmlns:jsp=3D"http://java.sun.com/JSP/Page">
     <s:form action=3D"logout">
-    	<div class=3D"input">
- 	    	<s:submit key=3D"bow.rightMenu.logout" name=3D"submit" />
- 	    </div>
+        <div class=3D"input">
+            <s:submit key=3D"bow.rightMenu.logout" name=3D"submit" />
+        </div>
     </s:form>
     <a href=3D"http://maven-site.chorem.org/bow/" class=3D"help" onclick=3D"=
window.open(this.href); return false;"><s:text name=3D"bow.rightMenu.help" />=
</a>
 </div>
@@ -47,27 +47,30 @@
     <div id=3D"colonneD">
         <ul class=3D"droite">
             <s:if test=3D"#session.BowSession.isAdmin()">
-        		<li><s:a action=3D"admin"><s:text name=3D"bow.rightMenu.admin" /><=
/s:a></li>
-        	</s:if>
+                <li><s:a action=3D"admin"><s:text name=3D"bow.rightMenu.admi=
n" /></s:a></li>
+            </s:if>
             <li><s:a action=3D"preferences"><s:text name=3D"bow.preferences.=
title" /></s:a></li>
-            <s:set var=3D"permanentToken" value=3D"#session.BowSession.getPe=
rmanentToken()" />
-            <s:set var=3D"temporaryToken" value=3D"#session.BowSession.getTe=
mporaryToken()" />
-            <li><a title=3D"%{getText('bow.rightMenu.bookmark.temporaryLinkD=
escription')}" href=3D"javascript:var%20url=3Dlocation.href;var%20nameAndTags=
=3Dprompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sou=
s%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameA=
ndTags!=3D(document.title+'|')){var%20link=3D'<%=3DbowUrl%>addUrl.action?toke=
n=3D${temporaryToken}&amp;url=3D'+encodeURIComponent(url)+'&amp;nameAndTags=
=3D'+encodeURIComponent(nameAndTags);var%20script=3Ddocument.createElement('s=
cript');script.src=3Dlink;script.type=3D'text/javascript';document.body.appen=
dChild(script);}void(0);"><s:text name=3D"bow.rightMenu.bookmark.temporaryLin=
k" /></a></li>
-            <li><a title=3D"%{getText('bow.rightMenu.bookmark.permanentLinkD=
escription')}" href=3D"javascript:var%20url=3Dlocation.href;var%20nameAndTags=
=3Dprompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sou=
s%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameA=
ndTags!=3D(document.title+'|')){var%20link=3D'<%=3DbowUrl%>addUrl.action?toke=
n=3D${permanentToken}&amp;url=3D'+encodeURIComponent(url)+'&amp;nameAndTags=
=3D'+encodeURIComponent(nameAndTags);var%20script=3Ddocument.createElement('s=
cript');script.src=3Dlink;script.type=3D'text/javascript';document.body.appen=
dChild(script);}void(0);"><s:text name=3D"bow.rightMenu.bookmark.permanentLin=
k" /></a></li>
         </ul>
-	    <div id=3D"extensions">
-            <h2><s:text name=3D"bow.rightMenu.extensions" /></h2>
-            <ul class=3D"droite">
-                <li><a href=3D"extensions/bow4chromium.crx"><img src=3D"img/=
chromium.png" alt=3D"Chromium" class=3D"extensionIcon" />
-                        <s:text name=3D"bow.rightMenu.chromiumExtension" /><=
/a></li>
-                <li><strong><s:text name=3D"bow.rightMenu.token.permanent" /=
> :</strong><br /><s:property value=3D"%{#session.BowSession.getPermanentToke=
n()}" /></li>
-                <li><strong><s:text name=3D"bow.rightMenu.token.temporary" /=
> :</strong><br /><s:property value=3D"%{#session.BowSession.getTemporaryToke=
n()}" /></li>
-            </ul>
+        <div class=3D"recherche">
+            <s:form action=3D"search">
+                <div class=3D"input">
+                    <s:textfield key=3D"bow.rightMenu.search" name=3D"search=
Line" labelSeparator=3D"" />
+                    <s:submit key=3D"bow.rightMenu.find.submit" name=3D"subm=
it" />
+                </div>
+            </s:form>
         </div>
+        <div class=3D"recherche">
+            <s:form action=3D"fullText">
+                <div class=3D"input">
+                    <s:textfield key=3D"bow.rightMenu.fullTextSearch" name=
=3D"fullTextLine" labelSeparator=3D"" />
+                    <s:submit key=3D"bow.rightMenu.find.submit" name=3D"subm=
it" />
+                </div>
+            </s:form>
+        </div>
         <div id=3D"add" class=3D"clearfix">
             <h2><s:text name=3D"bow.rightMenu.bookmark.addModify" /></h2>
             <s:form id=3D"bookmarkForm" action=3D"%{#request.formAction}">
-            	<p>
+                <p>
                     <s:textfield key=3D"bow.rightMenu.bookmark.link" name=3D=
"link" value=3D"%{#request.link}" labelSeparator=3D"" /><br />
                     <s:textfield key=3D"bow.rightMenu.bookmark.alias" name=
=3D"alias" value=3D"%{#request.alias}" labelSeparator=3D"" /><br />
                     <s:textfield key=3D"bow.rightMenu.bookmark.name" name=3D=
"name" value=3D"%{#request.name}" labelSeparator=3D"" /><br />
@@ -88,24 +91,8 @@
             <jsp:include page=3D"tagsCloud.jsp" flush=3D"true" />
           </s:else>
         <!--/div-->
-        <div class=3D"recherche">
-            <s:form action=3D"search">
-            	<div class=3D"input">
-                	<s:textfield key=3D"bow.rightMenu.search" name=3D"searchLin=
e" labelSeparator=3D"" />
-                	<s:submit key=3D"bow.rightMenu.find.submit" name=3D"submit"=
 />
-                </div>
-            </s:form>
-        </div>
-        <div class=3D"recherche">
-            <s:form action=3D"fullText">
-            	<div class=3D"input">
-            		<s:textfield key=3D"bow.rightMenu.fullTextSearch" name=3D"full=
TextLine" labelSeparator=3D"" />
-            		<s:submit key=3D"bow.rightMenu.find.submit" name=3D"submit" />
-                </div>
-            </s:form>
-        </div>
         <div class=3D"colonnebas">
-        	<img src=3D"img/piedmenu.jpg" width=3D"401" height=3D"77" alt=3D"Pi=
ed de menu" />
+            <img src=3D"img/piedmenu.jpg" width=3D"401" height=3D"77" alt=3D=
"Pied de menu" />
         </div>
     </div>
 </div>

Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"org.chorem.bow.BowConfig"%>
 <%@page import=3D"org.nuiton.wikitty.search.FacetTopic"%>
 <%@page import=3D"org.chorem.bow.action.PreferencesAction"%>
 <!--
@@ -28,6 +29,7 @@
=20
 <%
 PreferencesAction action =3D PreferencesAction.getAction();
+String bowUrl =3D BowConfig.getInstance().getBowUrl();
 %>
=20
 <html xmlns:s=3D"http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
@@ -44,6 +46,45 @@
         <h2><s:text name=3D"bow.preferences.title"/></h2>
     </div>
     <s:actionerror/>
+   =20
+    <div class=3D"formFrame fond">
+        <s:set var=3D"permanentToken" value=3D"#session.BowSession.getPerman=
entToken()" />
+        <s:set var=3D"temporaryToken" value=3D"#session.BowSession.getTempor=
aryToken()" />
+        <ul>
+            <li>
+                <a title=3D"%{getText('bow.rightMenu.bookmark.temporaryLinkD=
escription')}"
+                   href=3D"javascript:var%20url=3Dlocation.href;var%20nameAn=
dTags=3Dprompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%=
20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(=
nameAndTags!=3D(document.title+'|')){var%20link=3D'<%=3DbowUrl%>addUrl.action=
?token=3D${temporaryToken}&amp;url=3D'+encodeURIComponent(url)+'&amp;nameAndT=
ags=3D'+encodeURIComponent(nameAndTags);var%20script=3Ddocument.createElement=
('script');script.src=3Dlink;script.type=3D'text/javascript';document.body.ap=
pendChild(script);}void(0);">
+                    <s:text name=3D"bow.rightMenu.bookmark.temporaryLink" />
+                </a>
+            </li>
+            <li>
+                <a title=3D"%{getText('bow.rightMenu.bookmark.permanentLinkD=
escription')}"
+                   href=3D"javascript:var%20url=3Dlocation.href;var%20nameAn=
dTags=3Dprompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%=
20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(=
nameAndTags!=3D(document.title+'|')){var%20link=3D'<%=3DbowUrl%>addUrl.action=
?token=3D${permanentToken}&amp;url=3D'+encodeURIComponent(url)+'&amp;nameAndT=
ags=3D'+encodeURIComponent(nameAndTags);var%20script=3Ddocument.createElement=
('script');script.src=3Dlink;script.type=3D'text/javascript';document.body.ap=
pendChild(script);}void(0);">
+                    <s:text name=3D"bow.rightMenu.bookmark.permanentLink" />
+                </a>
+            </li>
+            <li>
+                <a href=3D"extensions/bow4chromium.crx">
+                    <img src=3D"img/chromium.png" alt=3D"Chromium" class=3D"=
extensionIcon" />
+                    <s:text name=3D"bow.rightMenu.chromiumExtension" />
+                </a>
+            </li>
+            <li>
+                <strong><s:text name=3D"bow.rightMenu.token.permanent"/> :</=
strong>
+                <s:property value=3D"%{#permanentToken}"/>
+            </li>
+            <li>
+                <strong><s:text name=3D"bow.rightMenu.token.temporary"/> :</=
strong>
+                <s:property value=3D"%{#temporaryToken}"/>
+            </li>
+        </ul>
+           =20
+        <s:url var=3D"regenPermToken" action=3D"regenPermToken"/>
+        <s:a href=3D"%{regenPermToken}" id=3D"regenPermToken">
+            <s:text name=3D"bow.preferences.regenPermToken"/>
+        </s:a>
+    </div>
+   =20
     <s:form action=3D"preferences">
         <div class=3D"formFrame fond">
             <h3><s:text name=3D"bow.preferences.userInfo"/></h3>
@@ -59,26 +100,6 @@
                             name=3D"confirmNewPassword" labelposition=3D"top=
"/><br/>
                 <s:submit key=3D"bow.preferences.submit" name=3D"submit"/><b=
r/>
             </p>
-
-            <br/>
-            <br/>
-            <br/>
-            <br/>
-            <ul>
-                <li>
-                    <strong><s:text name=3D"bow.rightMenu.token.permanent"/>=
 :</strong>
-                    <s:property value=3D"%{#session.BowSession.getPermanentT=
oken()}"/>
-                </li>
-                <li>
-                    <strong><s:text name=3D"bow.rightMenu.token.temporary"/>=
 :</strong>
-                    <s:property value=3D"%{#session.BowSession.getTemporaryT=
oken()}"/>
-                </li>
-            </ul>
-
-            <s:url var=3D"regenPermToken" action=3D"regenPermToken"/>
-            <s:a href=3D"%{regenPermToken}" id=3D"regenPermToken">
-                <s:text name=3D"bow.preferences.regenPermToken"/>
-            </s:a>
         </div>
         <div class=3D"formFrame fond">
             <h3><s:text name=3D"bow.preferences.siteLook"/></h3>


--===============3677977745406999834==--