[Bow-commits] r30 - in trunk/src/main/webapp: . css

20 May 2010

Author: bbrossaud
Date: 2010-05-20 17:11:58 +0200 (Thu, 20 May 2010)
New Revision: 30

Url: http://chorem.org/repositories/revision/bow/30

Log:
addition last search design

Modified:
   trunk/src/main/webapp/css/styles.css
   trunk/src/main/webapp/search.jsp

Modified: trunk/src/main/webapp/css/styles.css
===================================================================

--- trunk/src/main/webapp/css/styles.css	2010-05-20 09:38:01 UTC (rev 29)
+++ trunk/src/main/webapp/css/styles.css	2010-05-20 15:11:58 UTC (rev 30)
@@ -1,7 +1,7 @@
 table.result {
     border:3px solid #6495ed;
     border-collapse:collapse;
-    width:90%;
+    width:750px;
     margin:auto;
 }
 table.actions {
@@ -15,11 +15,34 @@
     border:1px dotted #6495ed;
     padding:5px;
     background-color:#EFF6FF;
-    width:15%;
 }
+
+.remove {
+    width:5%;
+}
+
+.edit {
+    width:30%;
+}
+
+.name {
+    width:20%;
+}
+
+.click {
+    width:14%;
+}
+
+.date {
+    width:12%;
+}
+
+.tags {
+    width:19%;
+}
+
 td.result {
-    font-family:sans-serif;
-    font-size:80%;
+    font-family:monospace;
     border:1px solid #6495ed;
     padding:5px;
     text-align:center;
@@ -33,7 +56,7 @@
 }
 
 div.tagCloud {
-    background: #EEEEEE none repeat scroll 0 0;
+    background: #C5E3F7 none repeat scroll 0 0;
     max-width: 300px;
     min-width: 200px;
     padding-bottom: 5px;
@@ -49,37 +72,62 @@
 }
 
 #menu {
-    list-style-type: none;
     margin: 0;
     padding: 0;
-    text-align: center;
+    float: left;
+    background-color:#eaf3f9;
+    display: inline-block;
+    position: relative;
+    width: 20%;
 }
 
-#menu li {
-    display: inline;
+#table {
+    margin: 0;
+    padding: 0;
+    background-color:#eaf3f9;
+    display: inline-block;
+    float: left;
+    position: relative;
+    width: 80%;
 }
 
-#menu a {
+div.menu{
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+}
+
+#meta{
+    list-style-type: none;
+    padding-left: 0px;
+}
+
+#meta li {
+    margin-bottom: 5px;
+}
+
+a {
     font-family:monospace;
-    background-color:#EFF6FF;
-    color:black;
-    text-decoration:none;
-    padding:2px;
-    border:2px solid;
+    /*background-color:#EFF6FF;*/
+    color:#0078C8;
+    padding: 0;
+    margin: 0;
+    /*text-decoration:none;*/
+    /*border:2px solid;*/
     /*pour avoir un effet "outset" avec IE :*/
-    border-color:#75CEFF #6495ed #6495ed #75CEFF;
+    /*border-color:#75CEFF #6495ed #6495ed #75CEFF;*/
 
 }
 
-a.menu:hover {
-    background-color:#D3D3D3;
-    border-color:#696969 #DCDCDC #DCDCDC #696969;
+a:hover {
+    color: #0095f8;
+    /*background-color:#D3D3D3;*/
+    /*border-color:#696969 #DCDCDC #DCDCDC #696969;*/
 
 }
 
 a.tag {
     font-family:monospace;
-    color: #EF5252;
+    color: #FF3F42;
     margin-left: 2px;
     margin-right: 2px;
     border-radius: 30px;

Modified: trunk/src/main/webapp/search.jsp
===================================================================
--- trunk/src/main/webapp/search.jsp	2010-05-20 09:38:01 UTC (rev 29)
+++ trunk/src/main/webapp/search.jsp	2010-05-20 15:11:58 UTC (rev 30)
@@ -29,136 +29,139 @@
     <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" />
     <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" />
     <body>
-        <ul id="menu">
-            <li><a href="bow?action=logout">Logout</a></li>
-            <li><a 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+'|');var%20link='<%=url%>bow?action=addUrl&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);">Temporary token</a></li>
-            <li><a 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+'|');var%20link='<%=url%>bow?action=addUrl&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);">Current permanent token</a></li>
-            <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate permanent token</a></li>
-        </ul>
-        <br/><br/>
-
-        <table class="actions">
-            <tr>
-                <td>
-                    <div class="tagCloud">
-                        <%  if (bookmarkActions != null) {
-                                        Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud();
-                                        Set<String> tags = tagsCloud.keySet();
-                                        for (String tag : tags) {
-                                            int value = tagsCloud.get(tag);
-                                            int font = bookmarkActions.getFont(value);
+        <div id="table">
+            <%
+                        if (bookmarkActions != null) {
+                            List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
+                            if (!bookmarkList.isEmpty()) {
+            %>
+            Results:<br/>
+            <table class="result">
+                <tr class="result">
+                    <th class="result remove">Remove</th>
+                    <th class="result date">
+                        Date
+                        <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>" >
+                            <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
+                        </a>
+                        <a style="text-decoration:none" href="bow?action=orderDesc&type=date&searchLine=<%=searchLine%>">
+                            <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
+                        </a>
+                    </th>
+                    <th class="result name">
+                        Name
+                        <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>">
+                            <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
+                        </a>
+                        <a style="text-decoration:none" href="bow?action=orderDesc&type=name&searchLine=<%=searchLine%>">
+                            <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
+                        </a>
+                    </th>
+                    <th class ="result tags">Tags</th>
+                    <th class="result edit">Edit</th>
+                    <th class=" result click">
+                        Click
+                        <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>">
+                            <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
+                        </a>
+                        <a style="text-decoration:none" href="bow?action=orderDesc&type=click&searchLine=<%=searchLine%>">
+                            <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
+                        </a>
+                    </th>
+                </tr>
+                <%
+                                            SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+                                            for (Bookmark bookmark : bookmarkList) {
+                %>
+                <tr class="result">
+                    <td class="result">
+                        <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>">
+                            <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" />
+                        </a>
+                    </td>
+                    <td class="result">
+                        <%=sdf.format(bookmark.getDate())%>
+                    </td>
+                    <td class="result">
+                        <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a>
+                    </td>
+                    <td class="result" style="text-align: left">
+                        <%
+                                                                            Set<String> tagList = bookmark.getTags();
+                                                                            if (tagList != null && !tagList.isEmpty()) {
+                                                                                for (String tag : tagList) {
                         %>
-                        <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tag%></a>
+                        <div>
+                            <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>">
+                                <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" />
+                            </a>
+                            <%=tag%>
+                        </div>
                         <%
-                              }
+                                                                                }
+                                                                            }
                         %>
-                    </div>
-                    <form method="POST" action="bow?action=search" style="text-align: left;margin-left: 20px;">
-                        <input style="float: left" type="text" name="searchLine" size="20" value="<%=searchLine%>" />
-                        <input style="float: left;" type="submit" value="Find" />
-                    </form>
-                </td>
-                <td>
-                    <div style="float: right">
-                        <form method="POST" action="bow?action=addUrl">
-                            URL  <input onclick="this.value=''" type="text" name="url" size="20" value="URL" /><br />
-                            Name and Tags  <input onclick="this.value='|'" type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br />
-                            <input type="submit" value="add" />
+                    </td>
+                    <td class="result">
+                        <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>">
+                            <input type="text" name="nameAndTags" size="32" value="<%=bookmark.getDescription()%>|tag1 tag2 tag3" />
+                            <input type="image" src="img/edit.png" title="Edit"/>
                         </form>
-                    </div>
-                </td>
-            </tr>
-        </table>
-        <%
-              List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
-              if (!bookmarkList.isEmpty()) {
-        %>
-        <br/><br/>Results:<br/>
-        <table class="result">
-            <tr class="result">
-                <th class="result">Remove</th>
-                <th class="result">
-                    Date
-                    <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>" >
-                        <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
-                    </a>
-                    <a style="text-decoration:none" href="bow?action=orderDesc&type=date&searchLine=<%=searchLine%>">
-                        <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
-                    </a>
-                </th>
-                <th class="result">
-                    Name
-                    <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>">
-                        <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
-                    </a>
-                    <a style="text-decoration:none" href="bow?action=orderDesc&type=name&searchLine=<%=searchLine%>">
-                        <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
-                    </a>
-                </th>
-                <th class ="result">Tags</th>
-                <th class="result">Edit</th>
-                <th class="result">
-                    Click
-                    <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>">
-                        <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
-                    </a>
-                    <a style="text-decoration:none" href="bow?action=orderDesc&type=click&searchLine=<%=searchLine%>">
-                        <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
-                    </a>
-                </th>
-            </tr>
+                    </td>
+                    <td class="result">
+                        <%=bookmark.getClick()%>
+                    </td>
+                    <%
+                                                }
+                    %>
+            </table>
             <%
-                      SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-                      for (Bookmark bookmark : bookmarkList) {
+                            }
+                        } else {
             %>
-            <tr class="result">
-                <td class="result">
-                    <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>">
-                        <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" />
-                    </a>
-                </td>
-                <td class="result">
-                    <%=sdf.format(bookmark.getDate())%>
-                </td>
-                <td class="result">
-                    <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a>
-                </td>
-                <td class="result" style="text-align: left">
-                    <%
-                                              Set<String> tagList = bookmark.getTags();
-                                              if (tagList != null && !tagList.isEmpty()) {
-                                                  for (String tag : tagList) {
+            <br/><br/>No Bookmarks<br/><br/>
+            <%                }
+            %>
+        </div>
+        <div id="menu">
+            <div class="menu">
+                <ul id="meta">
+                    <li><a href="bow?action=logout">Logout</a></li>
+                    <li><a 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+'|');var%20link='<%=url%>bow?action=addUrl&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);">Temporary token</a></li>
+                    <li><a 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+'|');var%20link='<%=url%>bow?action=addUrl&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);">Current permanent token</a></li>
+                    <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate permanent token</a></li>
+                </ul>
+            </div>
+            <div class="menu">
+                <form method="POST" action="bow?action=addUrl">
+                    URL<br />
+                    <input onclick="this.value=''" type="text" name="url" size="20" value="URL" /><br />
+                    Name and Tags<br />
+                    <input onclick="this.value='|'" type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br />
+                    <input type="submit" value="add" />
+                </form>
+            </div>
+
+            <div class="menu">
+                <div class="tagCloud">
+                    <%  if (bookmarkActions != null) {
+                                    Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud();
+                                    Set<String> tags = tagsCloud.keySet();
+                                    for (String tag : tags) {
+                                        int value = tagsCloud.get(tag);
+                                        int font = bookmarkActions.getFont(value);
                     %>
-                    <div>
-                        <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>">
-                            <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" />
-                        </a>
-                        <%=tag%>
-                    </div>
+                    <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tag%></a>
                     <%
-                                                  }
-                                              }
+                                    }
+                                }
                     %>
-                </td>
-                <td class="result">
-                    <form style="display: inline" method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>">
-                        <input type="text" name="nameAndTags" size="50" value="<%=bookmark.getDescription()%>|tag1 tag2 tag3" />
-                        <input type="image" src="img/edit.png" title="Edit"/>
+                    <form method="POST" action="bow?action=search" style="text-align: center;margin-left: 20px;">
+                        <input style="float: left" type="text" name="searchLine" size="20" value="<%=searchLine%>" />
+                        <input style="float: left;" type="submit" value="Find" />
                     </form>
-                </td>
-                <td class="result">
-                    <%=bookmark.getClick()%>
-                </td>
-                <%
-                          }
-                %>
-        </table>
-        <%
-              } else {
-        %>
-        <br/><br/>No Bookmarks<br/><br/>
-        <%                }
-                    }
-        %>
+                </div>
+            </div>
+        </div>
     </body>
 </html>
\ No newline at end of file

    

[Bow-commits] r30 - in trunk/src/main/webapp: . css

bbrossaud＠users.chorem.org