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

20 May 2010

Author: bbrossaud
Date: 2010-05-20 11:38:01 +0200 (Thu, 20 May 2010)
New Revision: 29

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

Log:
addition bow image for opensearch

Added:
   trunk/src/main/webapp/img/bow.gif
Modified:
   trunk/TODO.txt
   trunk/src/main/webapp/css/styles.css
   trunk/src/main/webapp/openSearchResult.jsp
   trunk/src/main/webapp/permanentXml.jsp
   trunk/src/main/webapp/search.jsp
   trunk/src/main/webapp/temporaryXml.jsp

Modified: trunk/TODO.txt
===================================================================

--- trunk/TODO.txt	2010-05-19 15:58:07 UTC (rev 28)
+++ trunk/TODO.txt	2010-05-20 09:38:01 UTC (rev 29)
@@ -3,10 +3,10 @@
 
 -> edition, suppression bookmark + tag (14 mai) OK
 -> triage multiple(nbre de clics, date d'ajout, Alpha) (14 mai) OK
--> token temporaire (14 mai)
--> completion   ==> openSearch(xml)
-                ==> meta(ex:<link rel="search" type="application/opensearchdescription+xml" href="/w/opensearch_desc.php" title="Wikip�dia (fr)" />)
+-> token temporaire (14 mai) OK
+-> completion   ==> openSearch(xml) OK
+                ==> meta(ex:<link rel="search" type="application/opensearchdescription+xml" href="/w/opensearch_desc.php" title="Wikip�dia (fr)" />) OK
 -> le && pour le nuage de tag (11 mai) OK
--> gestion des sessions (14 mai)
--> javascript  ==> var script = document.createElement('script');script.src = url;script.type='text/javascript';document.body.appendChild(script); (11 mai) NOK
+-> gestion des sessions (14 mai) OK
+-> javascript  ==> (11 mai) OK
 -> Mise en forme (28 mai)
\ No newline at end of file

Modified: trunk/src/main/webapp/css/styles.css
===================================================================
--- trunk/src/main/webapp/css/styles.css	2010-05-19 15:58:07 UTC (rev 28)
+++ trunk/src/main/webapp/css/styles.css	2010-05-20 09:38:01 UTC (rev 29)
@@ -4,6 +4,12 @@
     width:90%;
     margin:auto;
 }
+table.actions {
+    border-collapse:collapse;
+    width:90%;
+    margin:auto;
+}
+
 th.result {
     font-family:monospace;
     border:1px dotted #6495ed;
@@ -36,31 +42,29 @@
     padding-top: 5px;
     margin-bottom: 5px;
     text-align: center;
+    border-radius:40px;
     -webkit-border-radius:40px;
+    -opera-border-radius:40px;
     -moz-border-radius:40px;
-    border-radius:40px;
 }
 
-li.search {
-    display: inline;
-    margin-left: 5px;
-    margin-right: 5px;
-}
-
-ul.search {
+#menu {
     list-style-type: none;
     margin: 0;
     padding: 0;
     text-align: center;
 }
 
-a.menu {
+#menu li {
+    display: inline;
+}
+
+#menu a {
     font-family:monospace;
     background-color:#EFF6FF;
     color:black;
     text-decoration:none;
-    text-align:center;
-    padding:5px;
+    padding:2px;
     border:2px solid;
     /*pour avoir un effet "outset" avec IE :*/
     border-color:#75CEFF #6495ed #6495ed #75CEFF;
@@ -78,9 +82,10 @@
     color: #EF5252;
     margin-left: 2px;
     margin-right: 2px;
+    border-radius: 30px;
     -webkit-border-radius: 30px;
     -moz-border-radius: 30px;
-    border-radius: 30px;
+    -opera-border-radius:30px;
     text-decoration:none;
 }
 a.tag:hover {

Added: trunk/src/main/webapp/img/bow.gif
===================================================================
(Binary files differ)


Property changes on: trunk/src/main/webapp/img/bow.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/src/main/webapp/openSearchResult.jsp
===================================================================
--- trunk/src/main/webapp/openSearchResult.jsp	2010-05-19 15:58:07 UTC (rev 28)
+++ trunk/src/main/webapp/openSearchResult.jsp	2010-05-20 09:38:01 UTC (rev 29)
@@ -30,9 +30,9 @@
                         if (!bookmarkList.isEmpty()) {
         %>
         <br/><br/>Results:<br/>
-        <table border="1">
-            <tr>
-                <th>
+        <table class="result">
+            <tr class="result">
+                <th class="result">
                     Date
                     <a style="text-decoration:none" href="bow?action=orderAscOS&type=date&searchLine=<%=searchLine%>" >
                         <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
@@ -41,7 +41,7 @@
                         <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
                     </a>
                 </th>
-                <th>
+                <th class="result">
                     Name
                     <a style="text-decoration:none" href="bow?action=orderAscOS&type=name&searchLine=<%=searchLine%>">
                         <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
@@ -50,8 +50,8 @@
                         <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
                     </a>
                 </th>
-                <th>Tags</th>
-                <th>
+                <th class="result">Tags</th>
+                <th class="result">
                     Click
                     <a style="text-decoration:none" href="bow?action=orderAscOS&type=click&searchLine=<%=searchLine%>">
                         <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
@@ -65,14 +65,14 @@
                               SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
                               for (Bookmark bookmark : bookmarkList) {
             %>
-            <tr>
-                <td>
+            <tr class="result">
+                <td class="result">
                     <%=sdf.format(bookmark.getDate())%>
                 </td>
-                <td>
+                <td class="result">
                     <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a>
                 </td>
-                <td>
+                <td class="result">
                     <%
                                                       Set<String> tagList = bookmark.getTags();
                                                       if (tagList != null && !tagList.isEmpty()) {
@@ -86,7 +86,7 @@
                 <%
                                                   }
                 %>
-                <td>
+                <td class="result">
                     <%=bookmark.getClick()%>
                 </td>
                 <%

Modified: trunk/src/main/webapp/permanentXml.jsp
===================================================================
--- trunk/src/main/webapp/permanentXml.jsp	2010-05-19 15:58:07 UTC (rev 28)
+++ trunk/src/main/webapp/permanentXml.jsp	2010-05-20 09:38:01 UTC (rev 29)
@@ -17,7 +17,7 @@
     <ShortName>bowPermanentSearchEngine</ShortName>
     <Description>bookmarkSearch</Description>
     <InputEncoding>inputEncoding</InputEncoding>
-    <Image width="16" height="16">data:image/x-icon;base64,imageData</Image>
+    <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image>
     <Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" />
     <Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&search={searchTerms}" />
     <moz:SearchForm><%=url%>bow</moz:SearchForm>

Modified: trunk/src/main/webapp/search.jsp
===================================================================
--- trunk/src/main/webapp/search.jsp	2010-05-19 15:58:07 UTC (rev 28)
+++ trunk/src/main/webapp/search.jsp	2010-05-20 09:38:01 UTC (rev 29)
@@ -29,42 +29,50 @@
     <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 class="search">
-            <li style="display: inline;"><a class="menu" href="bow?action=logout">Logout</a></li>
-            <li style="display: inline;"><a class="menu" 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 style="display: inline;"><a class="menu" 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 style="display: inline;"><a class="menu" href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate permanent token</a></li>
+        <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/>
-        <div id="searchbox" style="position: absolute; top: 100px; right: 20px;">
-            <form method="POST" action="bow?action=addUrl">
-                URL  <input type="text" name="url" size="20" value="URL" /><br />
-                Name and Tags  <input type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br />
-                <input type="submit" value="add" />
-            </form>
-        </div>
 
-        <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);
-            %>
-            <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" class="tag" style="font-size: <%=font%>px;"><%=tag%></a>
-            <%
-                  }
-            %>
-        </div>
+        <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);
+                        %>
+                        <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tag%></a>
+                        <%
+                              }
+                        %>
+                    </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" />
+                        </form>
+                    </div>
+                </td>
+            </tr>
+        </table>
         <%
               List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
               if (!bookmarkList.isEmpty()) {
         %>
-        <form method="POST" action="bow?action=search" style="text-align: left;margin-left: 20px">
-            <input type="text" name="searchLine" size="20" value="<%=searchLine%>" /><br />
-            <input type="submit" value="Find" />
-        </form>
         <br/><br/>Results:<br/>
         <table class="result">
             <tr class="result">
@@ -100,8 +108,8 @@
                 </th>
             </tr>
             <%
-                              SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-                              for (Bookmark bookmark : bookmarkList) {
+                      SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+                      for (Bookmark bookmark : bookmarkList) {
             %>
             <tr class="result">
                 <td class="result">
@@ -117,9 +125,9 @@
                 </td>
                 <td class="result" style="text-align: left">
                     <%
-                                                      Set<String> tagList = bookmark.getTags();
-                                                      if (tagList != null && !tagList.isEmpty()) {
-                                                          for (String tag : tagList) {
+                                              Set<String> tagList = bookmark.getTags();
+                                              if (tagList != null && !tagList.isEmpty()) {
+                                                  for (String tag : tagList) {
                     %>
                     <div>
                         <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>">
@@ -128,8 +136,8 @@
                         <%=tag%>
                     </div>
                     <%
-                                                          }
-                                                      }
+                                                  }
+                                              }
                     %>
                 </td>
                 <td class="result">
@@ -142,11 +150,11 @@
                     <%=bookmark.getClick()%>
                 </td>
                 <%
-                                  }
+                          }
                 %>
         </table>
         <%
-                      } else {
+              } else {
         %>
         <br/><br/>No Bookmarks<br/><br/>
         <%                }

Modified: trunk/src/main/webapp/temporaryXml.jsp
===================================================================
--- trunk/src/main/webapp/temporaryXml.jsp	2010-05-19 15:58:07 UTC (rev 28)
+++ trunk/src/main/webapp/temporaryXml.jsp	2010-05-20 09:38:01 UTC (rev 29)
@@ -17,7 +17,7 @@
     <ShortName>bowTemporarySearchEngine</ShortName>
     <Description>bookmarkSearch</Description>
     <InputEncoding>inputEncoding</InputEncoding>
-    <Image width="16" height="16">data:image/x-icon;base64,imageData</Image>
+    <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image>
     <Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" />
     <Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&search={searchTerms}" />
     <moz:SearchForm><%=url%>bow</moz:SearchForm>

    

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

bbrossaud＠users.chorem.org