Author: bpoussin Date: 2011-04-22 18:27:49 +0200 (Fri, 22 Apr 2011) New Revision: 261 Url: http://chorem.org/repositories/revision/bow/261 Log: diminution des textes de recherches Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 16:27:49 UTC (rev 261) @@ -108,12 +108,12 @@ bow.rightMenu.chromiumExtension=Chromium extension bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Find -bow.rightMenu.fullTextSearch=Full text search +bow.rightMenu.fullTextSearch=Full text bow.rightMenu.help=Help bow.rightMenu.import.submit=Import bow.rightMenu.importBookmarks=Import bookmarks bow.rightMenu.logout=Logout -bow.rightMenu.search=Search +bow.rightMenu.search.tags=by tags bow.rightMenu.token.permanent=Permanent token id bow.rightMenu.token.temporary=Session token id bow.search.ascclick=Asc. clicks nb Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 16:27:49 UTC (rev 261) @@ -108,12 +108,12 @@ bow.rightMenu.chromiumExtension=Extension pour chromium bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Rechercher -bow.rightMenu.fullTextSearch=Recherche full text +bow.rightMenu.fullTextSearch=Full text bow.rightMenu.help=Aide bow.rightMenu.import.submit=Importer bow.rightMenu.importBookmarks=Importer des marque-pages bow.rightMenu.logout=D\u00E9connexion -bow.rightMenu.search=Recherche +bow.rightMenu.search.tags=Par tags bow.rightMenu.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session bow.search.ascclick=Nb clics asc. Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 16:27:49 UTC (rev 261) @@ -475,12 +475,14 @@ .input label{ color:#804561; +/* font-size:20px; font-weight:normal; font-style:normal; float:left; margin-bottom:20px; width:100%; +*/ } #bookmarkForm label{ Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 16:27:49 UTC (rev 261) @@ -58,11 +58,11 @@ padding-top:20px; padding-right:15%; } - +/* #header .input{ width:250px; } - +*/ .button{ margin-top:20px; background:url('../img/fdboutonV.jpg') repeat-x; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 16:27:49 UTC (rev 261) @@ -39,6 +39,20 @@ </div> <s:if test="%{#session.BowSession.user != null}"> <div class="recherche right"> + <h5>Recherche</h5> + <s:form action="search"> + <div class="input"> + <s:textfield key="bow.rightMenu.search.tags" name="searchLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> + <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 class="right"> <s:form action="search"> <div class="input"> @@ -55,6 +69,7 @@ </div> </s:form> </div> +--%> </div> </s:if> <div id="msg">