Update of /cvsroot/roller/roller/web/bookmarks
In directory sc8-pr-cvs1:/tmp/cvs-serv27885/web/bookmarks
Modified Files:
edit-bookmark.jsp edit-folder.jsp edit-topfolders.jsp
import.jsp
Log Message:
Changes to JSP's to make the display consistent, and wrap text in <p> rather
than just using <br> (this helps with applying CSS styles as well).
Index: edit-bookmark.jsp
===================================================================
RCS file: /cvsroot/roller/roller/web/bookmarks/edit-bookmark.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** edit-bookmark.jsp 17 Apr 2003 02:27:33 -0000 1.1
--- edit-bookmark.jsp 27 Oct 2003 02:37:00 -0000 1.2
***************
*** 6,42 ****
<html:form action="/bookmark" method="post" focus="name">
<html:hidden property="method" value="update"/></input>
<html:hidden property="id" /></input>
! Bookmark Name<br />
! <html:text property="name" /></input><br />
! Bookmark Description<br />
! <html:textarea property="description" rows="3" cols="50"/><br />
! Bookmark URL<br />
! <html:text property="url" size="60"/></input><br />
! Newsfeed URL<br />
! <html:text property="feedUrl"/></input><br />
! Bookmark Priority (determines ordering of display)<br />
! <html:text property="priority"/></input><br />
! Bookmark Weight (prominence of bookmark)<br />
! <html:text property="weight"/></input><br />
! Bookmark Image<br />
! <html:text property="image" size="30" /></input><br />
! Bookmark Folder<br />
<html:select property="folderId" size="1">
<html:options collection="folders"
property="id" labelProperty="name"
/>
! </html:select>
! <br /><br /><br />
! <html:submit />
</html:form>
--- 6,43 ----
<html:form action="/bookmark" method="post" focus="name">
+ <h3>Edit Bookmark: <bean:write name="bookmarkFormEx" property="name"
/></h3>
+
<html:hidden property="method" value="update"/></input>
<html:hidden property="id" /></input>
! <p>Bookmark Name<br />
! <html:text property="name" /></input></p>
! <p>Bookmark Description<br />
! <html:textarea property="description" rows="3" cols="50"/></p>
! <p>Bookmark URL<br />
! <html:text property="url" size="60"/></input></p>
! <p>Newsfeed URL<br />
! <html:text property="feedUrl"/></input></p>
! <p>Bookmark Priority (determines ordering of display)<br />
! <html:text property="priority"/></input></p>
! <p>Bookmark Weight (prominence of bookmark)<br />
! <html:text property="weight"/></input></p>
! <p>Bookmark Image<br />
! <html:text property="image" size="30" /></input></p>
! <p>Bookmark Folder<br />
<html:select property="folderId" size="1">
<html:options collection="folders"
property="id" labelProperty="name"
/>
! </html:select></p>
! <p><html:submit /></p>
</html:form>
Index: edit-folder.jsp
===================================================================
RCS file: /cvsroot/roller/roller/web/bookmarks/edit-folder.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** edit-folder.jsp 31 Aug 2003 00:38:12 -0000 1.2
--- edit-folder.jsp 27 Oct 2003 02:37:00 -0000 1.3
***************
*** 15,31 ****
<%-- FORM 0 --%>
<%-- Form allows editing of folder and folder's position --%>
- <h2>Properties of this folder</h2>
<html:form action="/folder" method="post" focus="name">
<html:hidden property="method" name="method" value="update"/>
<html:hidden property="id" />
<html:hidden property="parentId" />
! Folder Name:<br />
! <html:text property="name" size="50"/><br />
! Folder Description:<br />
! <html:textarea property="description" rows="3" cols="50"/>
! <p />
! <html:submit value="Update Properties"/>
</html:form>
! <div id="separator" />
<%-- ************************************************** --%>
--- 15,37 ----
<%-- FORM 0 --%>
<%-- Form allows editing of folder and folder's position --%>
<html:form action="/folder" method="post" focus="name">
+
+ <h3>Edit folder: <bean:write name="folderFormEx" property="name" /></h3>
<html:hidden property="method" name="method" value="update"/>
<html:hidden property="id" />
<html:hidden property="parentId" />
!
! <p>Folder Name:<br />
! <html:text property="name" size="50"/></p>
!
! <p>Folder Description:<br />
! <html:textarea property="description" rows="3" cols="50"/></p>
!
! <p>
! <html:submit value="Update Properties"/></p>
!
</html:form>
!
! <div id="separator" ><%-- apparently not all browsers like <div /> --%></div>
<%-- ************************************************** --%>
***************
*** 37,41 ****
! <h2>Bookmarks in this folder</h2>
<html:form action="/folder" method="post">
<html:hidden property="method" value="NOT_YET_SET" /></input>
--- 43,47 ----
! <h3>Bookmarks in '<bean:write name="folderFormEx" property="name" />'</h3>
<html:form action="/folder" method="post">
<html:hidden property="method" value="NOT_YET_SET" /></input>
***************
*** 75,79 ****
</logic:iterate>
</table>
! <p />
<a href="javascript:setChecked(1)">Check All</a>
|
--- 81,85 ----
</logic:iterate>
</table>
! <p>
<a href="javascript:setChecked(1)">Check All</a>
|
***************
*** 86,91 ****
property="id" labelProperty="name"/>
</html:select>
</html:form>
! <div id="separator" />
<%-- JavaScript for bookmarks table --%>
--- 92,99 ----
property="id" labelProperty="name"/>
</html:select>
+ </p>
</html:form>
!
! <div id="separator" ><%-- apparently not all browsers like <div /> --%></div>
<%-- JavaScript for bookmarks table --%>
***************
*** 125,129 ****
<%-- FORM 2 --%>
<%-- Show interface for adding a bookmark to this this folder --%>
! <h2>Add a new bookmark to this folder</h2>
<html:form action="/bookmark" method="post">
<html:hidden property="method" value="add" /></input>
--- 133,137 ----
<%-- FORM 2 --%>
<%-- Show interface for adding a bookmark to this this folder --%>
! <h3>Add a new bookmark to '<bean:write name="folderFormEx" property="name"
/>'</h3>
<html:form action="/bookmark" method="post">
<html:hidden property="method" value="add" /></input>
Index: edit-topfolders.jsp
===================================================================
RCS file: /cvsroot/roller/roller/web/bookmarks/edit-topfolders.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** edit-topfolders.jsp 31 Aug 2003 00:38:12 -0000 1.2
--- edit-topfolders.jsp 27 Oct 2003 02:37:00 -0000 1.3
***************
*** 9,13 ****
<%-- FORM 0 --%>
! <h2>Current bookmark folders</h2>
<html:form action="/folder" method="post">
<html:hidden property="method" value="NOT_YET_SET" /></input>
--- 9,13 ----
<%-- FORM 0 --%>
! <h3>Current bookmark folders</h3>
<html:form action="/folder" method="post">
<html:hidden property="method" value="NOT_YET_SET" /></input>
***************
*** 41,45 ****
</logic:iterate>
</table>
! <p />
<a href="javascript:setChecked(1)">Check All</a>
|
--- 41,45 ----
</logic:iterate>
</table>
! <p>
<a href="javascript:setChecked(1)">Check All</a>
|
***************
*** 47,50 ****
--- 47,51 ----
<input type="button" value="Delete" onclick="onDelete()"/></input>
+ </p>
</html:form>
***************
*** 77,83 ****
<%-- FORM 1 --%>
! <div id="separator" />
! <h2>Add a new bookmark folder</h2>
<html:form action="/folder" method="post">
<html:text property="name" size="30"/></input>
--- 78,84 ----
<%-- FORM 1 --%>
! <div id="separator" ><%-- apparently not all browsers like <div /> --%></div>
! <h3>Add a new bookmark folder</h3>
<html:form action="/folder" method="post">
<html:text property="name" size="30"/></input>
Index: import.jsp
===================================================================
RCS file: /cvsroot/roller/roller/web/bookmarks/import.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** import.jsp 17 Apr 2003 02:27:32 -0000 1.1
--- import.jsp 27 Oct 2003 02:37:00 -0000 1.2
***************
*** 4,8 ****
<div id="content">
! <h2>Bookmark Import</h2>
<p>
Please upload your OPML format bookmark file:
--- 4,8 ----
<div id="content">
! <h3>Bookmark Import</h3>
<p>
Please upload your OPML format bookmark file:
-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community? Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
|
