From bbrossaud@users.chorem.org Fri May 21 12:13:25 2010 From: bbrossaud@users.chorem.org To: bow-commits@list.chorem.org Subject: [Bow-commits] r32 - in trunk/src/main: java/org/chorem/bow webapp webapp/css Date: Fri, 21 May 2010 12:13:25 +0200 Message-ID: <20100521101325.E06C21591C@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0876279031282708648==" --===============0876279031282708648== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: bbrossaud Date: 2010-05-21 12:13:25 +0200 (Fri, 21 May 2010) New Revision: 32 Url: http://chorem.org/repositories/revision/bow/32 Log: addition 'http://' to the bookmark adress if it doesn't exist Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/webapp/css/styles.css trunk/src/main/webapp/home.jsp trunk/src/main/webapp/openSearchResult.jsp trunk/src/main/webapp/register.jsp trunk/src/main/webapp/search.jsp Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-21 08:09:= 47 UTC (rev 31) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-21 10:13:= 25 UTC (rev 32) @@ -61,6 +61,9 @@ =20 if (url !=3D null && !url.isEmpty()) { String link =3D url.trim(); + if (!link.contains("http://")) { + link =3D "http://" + link; + } bookmark.setLink(link); } bookmark.setClick(0); Modified: trunk/src/main/webapp/css/styles.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/main/webapp/css/styles.css 2010-05-21 08:09:47 UTC (rev 31) +++ trunk/src/main/webapp/css/styles.css 2010-05-21 10:13:25 UTC (rev 32) @@ -89,6 +89,41 @@ width: 80%; } =20 +h1.result { + font-family:monospace; + color:#FF3F42; + font-size:1.6em; + font-weight:normal; + line-height:20px; + margin-bottom:20px; + margin-left: 5px; + margin-right: 5px; + text-align: center; + background-color: #C5E3F7; + border-radius: 30px; + -webkit-border-radius: 30px; + -moz-border-radius: 30px; + -opera-border-radius:30px; + +} + +h1.login { + font-family:monospace; + color:#FF3F42; + border-bottom: 3px solid #C5E3F7; + margin-bottom: 10px; +} + +h2.result { + font-family:monospace; + color:#FF3F42; + font-size:1em; + font-weight:normal; + line-height:20px; + margin-top:50px; + text-align: center; +} + div.menu{ margin: 10px; border-bottom: 1px solid #ccc; @@ -105,22 +140,13 @@ =20 a { font-family:monospace; - /*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;*/ - } =20 a:hover { color: #0095f8; - /*background-color:#D3D3D3;*/ - /*border-color:#696969 #DCDCDC #DCDCDC #696969;*/ - } =20 a.tag { Modified: trunk/src/main/webapp/home.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/main/webapp/home.jsp 2010-05-21 08:09:47 UTC (rev 31) +++ trunk/src/main/webapp/home.jsp 2010-05-21 10:13:25 UTC (rev 32) @@ -4,8 +4,9 @@ %> =20 + -

Login

email
password @@ -14,6 +15,6 @@ <%if (error !=3D null) {%> <%=3Derror%> <%}%> -
register + register \ No newline at end of file Modified: trunk/src/main/webapp/openSearchResult.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/main/webapp/openSearchResult.jsp 2010-05-21 08:09:47 UTC (rev 3= 1) +++ trunk/src/main/webapp/openSearchResult.jsp 2010-05-21 10:13:25 UTC (rev 3= 2) @@ -22,14 +22,14 @@ %> =20 + -

Result

Results

=20 <% if (bookmarkActions !=3D null) { List bookmarkList =3D bookmarkActions.getB= ookmarks(); if (!bookmarkList.isEmpty()) { %> -

Results:
<% - SimpleDateFormat sdf =3D new SimpleDateFormat(= "dd/MM/yyyy"); - for (Bookmark bookmark : bookmarkList) { + SimpleDateFormat sdf =3D new SimpleD= ateFormat("dd/MM/yyyy"); + for (Bookmark bookmark : bookmarkLis= t) { %> - <% - } - %> + + <% + } + %>

@@ -62,8 +62,8 @@
@@ -89,14 +89,15 @@	<%=3Dbookmark.getClick()%>

<% - } else { + } else { %> -

No Bookmarks found

+

No Bookmarks found

<% } } %> Modified: trunk/src/main/webapp/register.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/main/webapp/register.jsp 2010-05-21 08:09:47 UTC (rev 31) +++ trunk/src/main/webapp/register.jsp 2010-05-21 10:13:25 UTC (rev 32) @@ -1,8 +1,9 @@ <%@page contentType=3D"text/html" pageEncoding=3D"UTF-8"%> <%String error =3D (String) request.getAttribute("errorMessage");%> + -

Register

+ =20 email
@@ -12,6 +13,6 @@ <%if (error !=3D null && error.isEmpty() =3D=3D false) {%>
<%=3Derror%> <%}%> -
Return to the login page + Return to the login page \ No newline at end of file Modified: trunk/src/main/webapp/search.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/main/webapp/search.jsp 2010-05-21 08:09:47 UTC (rev 31) +++ trunk/src/main/webapp/search.jsp 2010-05-21 10:13:25 UTC (rev 32) @@ -30,12 +30,12 @@ bow?action=3DpermanentXml" />

My Bookmarks

<% if (bookmarkActions !=3D null) { List bookmarkList =3D bookmarkActions.= getBookmarks(); if (!bookmarkList.isEmpty()) { %> - Results:
@@ -70,8 +70,8 @@ <% - SimpleDateFormat sdf =3D new Sim= pleDateFormat("dd/MM/yyyy"); - for (Bookmark bookmark : bookmar= kList) { + SimpleDateFormat sdf =3D new= SimpleDateFormat("dd/MM/yyyy"); + for (Bookmark bookmark : boo= kmarkList) { %> - <% + + <% } - %> + %>

Remove
@@ -111,16 +111,17 @@	<%=3Dbookmark.getClick()%>

<% - } - } else { + } else { %> -

No Bookmarks

+

No Bookmarks

<% } + } %>