Author: sletellier Date: 2011-04-22 14:58:14 +0200 (Fri, 22 Apr 2011) New Revision: 256 Url: http://chorem.org/repositories/revision/bow/256 Log: Move search panel to header Modified: 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 trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 12:58:14 UTC (rev 256) @@ -129,7 +129,7 @@ font-size:14px; line-height:32px; padding-left:40px; - background:url('../img/ptit_livre.jpg') no-repeat; + background:url('../img/ptit-livre.jpg') no-repeat; height:32px; display:block; text-decoration:none; @@ -289,9 +289,7 @@ padding: 4px 0 0 30px; } - #colonneD #nuage, -#colonneD .recherche, #colonneD #import, #colonneD #add{ padding:4% 10%; @@ -476,7 +474,7 @@ } .input label{ - color:#9edcf8; + color:#804561; font-size:20px; font-weight:normal; font-style:normal; Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 12:58:14 UTC (rev 256) @@ -46,6 +46,23 @@ clear:both; } +.left{ + float:left; +} + +.right{ + float:right; +} + +.recherche{ + 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 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 12:58:14 UTC (rev 256) @@ -37,6 +37,26 @@ <s:a cssClass="logo" action="home">bow</s:a> </s:else> </div> + <s:if test="%{#session.BowSession.user != null}"> + <div class="recherche right"> + <div class="right"> + <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="left"> + <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> + </s:if> <div id="msg"> <span id="actionmessageHeader"> <s:actionmessage /> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-22 12:58:14 UTC (rev 256) @@ -58,22 +58,6 @@ </s:a> </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="nuage"--> <s:if test="%{searchLine != null}"> <jsp:include page="tagsCloud.jsp" flush="true">