Author: vbriand Date: 2011-01-21 18:08:05 +0100 (Fri, 21 Jan 2011) New Revision: 176 Url: http://chorem.org/repositories/revision/bow/176 Log: Fixed the design on the home page Modified: trunk/src/main/webapp/css/bookmark.css trunk/src/main/webapp/css/connexion.css trunk/src/main/webapp/jsp/inc/rightMenu.jsp Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2011-01-21 14:54:13 UTC (rev 175) +++ trunk/src/main/webapp/css/bookmark.css 2011-01-21 17:08:05 UTC (rev 176) @@ -197,7 +197,7 @@ padding-left: 5px; } -#logout{ +#logoutDiv{ float:right; position:relative; right:67%; @@ -206,7 +206,7 @@ height:100px; } -#logout a.help{ +#logoutDiv a.help{ background:transparent url('/bow/img/aide.jpg') no-repeat scroll 0 0; display:block; height:34px; @@ -217,7 +217,7 @@ float:left; } -#logout form input{ +#logoutDiv form input{ background:transparent url('/bow/img/fondbouton.jpg') repeat-x scroll 0 0; border:medium none; color:#9C7186; @@ -280,7 +280,9 @@ } #colonneD #extensions .extensionIcon { - float: left; + float:left; + border:0 none; + margin-right:10px; } #colonneD #extensions .extensionName { @@ -472,3 +474,24 @@ margin-left:25px; margin-right:11px; } + +.input label{ + color:#9edcf8; + font-size:20px; + font-weight:normal; + font-style:normal; + float:left; + margin-bottom:20px; + width:100%; +} + +#bookmarkForm label{ + margin-top:12px; + font-style:normal; +} + +#bookmarkForm input[type="text"]{ + width:100%; + margin-top:10px; + margin-left:10px; +} \ No newline at end of file Modified: trunk/src/main/webapp/css/connexion.css =================================================================== --- trunk/src/main/webapp/css/connexion.css 2011-01-21 14:54:13 UTC (rev 175) +++ trunk/src/main/webapp/css/connexion.css 2011-01-21 17:08:05 UTC (rev 176) @@ -142,4 +142,4 @@ #register{ margin-top:35px; -} +} \ No newline at end of file Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-21 14:54:13 UTC (rev 175) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-21 17:08:05 UTC (rev 176) @@ -53,14 +53,16 @@ } if ((String)request.getAttribute("formAction") == null) - request.setAttribute("formAction", "/bow/addUrl.action"); + request.setAttribute("formAction", "/addUrl.action"); %> -<div id="logout" xmlns="http://www.w3.org/1999/xhtml" +<div id="logoutDiv" xmlns="http://www.w3.org/1999/xhtml" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <s:form action="logout"> - <s:submit key="bow.rightMenu.logout" /> + <s:form action="logout" theme="simple"> + <div class="input"> + <s:submit key="bow.rightMenu.logout" /> + </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> @@ -85,10 +87,10 @@ <div id="add" class="clearfix"> <h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2> <s:form id="bookmarkForm" action="%{#request.formAction}"> - <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" /> - <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" /> - <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" /> - <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" value="%{#request.tags}" /> + <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" labelSeparator="" /> + <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /> + <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" labelSeparator="" /> + <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" value="%{#request.tags}" labelSeparator="" /> <s:submit key="bow.rightMenu.bookmark.submit" /> </s:form> </div> @@ -102,24 +104,30 @@ <% } %> </div> <div class="recherche"> - <h2><s:text name="bow.rightMenu.search" /></h2> <s:form action="search"> - <s:textfield name="searchLine" /> - <s:submit key="bow.rightMenu.find.submit" /> + <div class="input"> + <label for="searchLine"><s:text name="bow.rightMenu.search" /></label> + <input type="text" name="searchLine" id="searchLine" /> + <s:submit key="bow.rightMenu.find.submit" theme="simple" /> + </div> </s:form> </div> <div class="recherche"> - <h2><s:text name="bow.rightMenu.fullTextSearch" /></h2> <s:form action="fullText"> - <s:textfield name="fullTextLine" /> - <s:submit key="bow.rightMenu.find.submit" /> + <div class="input"> + <label for="fullTextLine"><s:text name="bow.rightMenu.fullTextSearch" /></label> + <input type="text" name="fullTextLine" id="fullTextLine" /> + <s:submit key="bow.rightMenu.find.submit" theme="simple" /> + </div> </s:form> </div> <div id="import"> - <h2><s:text name="bow.rightMenu.importBookmarks" /></h2> <s:form action="importBookmarks" method="post" enctype="multipart/form-data"> - <s:file name="upfile" size="15%" /><br /> - <s:submit key="bow.rightMenu.import.submit" /> + <div class="input"> + <label for="fileImport"><s:text name="bow.rightMenu.importBookmarks" /></label> + <input type="file" size="15%" id="upfile" name="upfile" /><br /> + <s:submit key="bow.rightMenu.import.submit" theme="simple" /> + </div> </s:form> <s:a action="exportBookmarks"><s:text name="bow.rightMenu.exportBookmarks" /></s:a> </div>
participants (1)
-
vbriand＠users.chorem.org