shuber 2004/11/04 20:07:47 CET
Modified files:
war/src/webapp/WEB-INF/etc/config feed_definitions.xml
war/src/webapp/WEB-INF/etc/stylesheets rss_90_91_10.xsl
war/src/webapp/jsp admin.jsp customise.jsp edit-mylist.jsp
extra.css feedentry.jsp multiple-view.jsp
single-view.jsp template.jsp
Log:
Fix for JAHIA-196 :
XSLPublisher
- Renamed it to: RSS NewsFeeds
- Completely redid UI, using Jahia standard CSS styles
- Removed JavaLobby Frontpage RSS News
Revision Changes Path
1.2 +114 -1
rssnewsfeeds/war/src/webapp/WEB-INF/etc/config/feed_definitions.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/rssnewsfeeds/war/src/webapp/WEB-INF/etc/config/feed_definitions.xml.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1
rssnewsfeeds/war/src/webapp/WEB-INF/etc/stylesheets/rss_90_91_10.xsl
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/rssnewsfeeds/war/src/webapp/WEB-INF/etc/stylesheets/rss_90_91_10.xsl.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -31 rssnewsfeeds/war/src/webapp/jsp/admin.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/rssnewsfeeds/war/src/webapp/jsp/admin.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -28 rssnewsfeeds/war/src/webapp/jsp/customise.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/rssnewsfeeds/war/src/webapp/jsp/customise.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -28 rssnewsfeeds/war/src/webapp/jsp/edit-mylist.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/rssnewsfeeds/war/src/webapp/jsp/edit-mylist.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +17 -1 rssnewsfeeds/war/src/webapp/jsp/extra.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/rssnewsfeeds/war/src/webapp/jsp/extra.css.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -28 rssnewsfeeds/war/src/webapp/jsp/feedentry.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/rssnewsfeeds/war/src/webapp/jsp/feedentry.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +8 -37 rssnewsfeeds/war/src/webapp/jsp/multiple-view.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/rssnewsfeeds/war/src/webapp/jsp/multiple-view.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -32 rssnewsfeeds/war/src/webapp/jsp/single-view.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/rssnewsfeeds/war/src/webapp/jsp/single-view.jsp.diff?r1=1.1&r2=1.2&f=h
1.3 +4 -2 rssnewsfeeds/war/src/webapp/jsp/template.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/rssnewsfeeds/war/src/webapp/jsp/template.jsp.diff?r1=1.2&r2=1.3&f=h
Index: feed_definitions.xml
===================================================================
RCS file:
/home/cvs/repository/rssnewsfeeds/war/src/webapp/WEB-INF/etc/config/feed_definitions.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- feed_definitions.xml 21 Sep 2004 13:42:36 -0000 1.1
+++ feed_definitions.xml 4 Nov 2004 19:07:46 -0000 1.2
@@ -1,2 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feeds totalfeeds="4" defaultcode="F8649275139280505488" xmlns=""><feed
code="F-1970145145312278303" active="true" addedby="nobody"><name>TheServerSide.Com:
Your J2EE Community Forum</name><description>TheServerSide.Com is a J2EE Community,
containing up-to-date news, discussions, patterns, resources, and
media</description><source>http://www.theserverside.com/rss/theserverside-1.0.rdf</source><stylesheet>rss_90_91_10</stylesheet><param
editable="true" paramtype="xsl"><title>Items to Display</title><description>Number of
items visible</description><key>items</key><value>5</value><customiser>Drop-down List
(1 to 15)</customiser></param><param editable="true" paramtype="xsl"><title>Show
Description</title><description>Show item
descriptions</description><key>showdesc</key><value>true</value><customiser>Boolean</customiser></param><param
editable="true" paramtype="xsl"><title>Description Length</title><description>Maximum
number of characters allowed in a description</descrip
tion><key>maxdescriptionlength</key><value>250</value><customiser>Drop-down List (10
to 500)</customiser></param><param editable="true" paramtype="xsl"><title>Open In New
Window</title><description>Any links will open in a new
window</description><key>openinpopup</key><value>true</value><customiser>Boolean</customiser></param><param
editable="true"
paramtype="url"><title>mvnforum</title><description></description><key>mvnforum</key><value>mvnforum</value><customiser>Free
Text</customiser></param><updaterate>60</updaterate></feed><feed
code="F-245846512622144987" active="true" addedby="guest"><name>java.net
Weblogs</name><description>Java Today on
java.net</description><source>http://weblogs.java.net/pub/q/weblogs_rss?x-ver=1.0</source><stylesheet>rss_90_91_10</stylesheet><param
editable="true" paramtype="xsl"><title>Items to Display</title><description>Number of
items visible</description><key>items</key><value>5</value><customiser>Drop-down List
(1 to 15)</customiser></para
m><param editable="true" paramtype="xsl"><title>Show
Description</title><description>Show item
descriptions</description><key>showdesc</key><value>true</value><customiser>Boolean</customiser></param><param
editable="true" paramtype="xsl"><title>Description Length</title><description>Maximum
number of characters allowed in a
description</description><key>maxdescriptionlength</key><value>250</value><customiser>Drop-down
List (10 to 500)</customiser></param><param editable="true"
paramtype="xsl"><title>Open In New Window</title><description>Any links will open in a
new
window</description><key>openinpopup</key><value>true</value><customiser>Boolean</customiser></param><updaterate>60</updaterate></feed><feed
code="F8634904886955307206" active="true" addedby="guest"><name>Javalobby Front
Page</name><description>Top Java developer news and issue discussions from
Javalobby.org.</description><source>http://www.javalobby.org/forum.jspa?forumID=61</source><stylesheet>rss_90_91_10</sty
lesheet><param editable="true" paramtype="xsl"><title>Items to
Display</title><description>Number of items
visible</description><key>items</key><value>5</value><customiser>Drop-down List (1 to
15)</customiser></param><param editable="true" paramtype="xsl"><title>Show
Description</title><description>Show item
descriptions</description><key>showdesc</key><value>true</value><customiser>Boolean</customiser></param><param
editable="true" paramtype="xsl"><title>Description Length</title><description>Maximum
number of characters allowed in a
description</description><key>maxdescriptionlength</key><value>250</value><customiser>Drop-down
List (10 to 500)</customiser></param><param editable="true"
paramtype="xsl"><title>Open In New Window</title><description>Any links will open in a
new
window</description><key>openinpopup</key><value>true</value><customiser>Boolean</customiser></param><updaterate>60</updaterate></feed><feed
code="F8649275139280505488" active="true" addedby="guest"><n
ame>Slashdot</name><description>News for nerds, stuff that
matters</description><source>http://slashdot.org/index.rss</source><stylesheet>rss_90_91_10</stylesheet><param
editable="true" paramtype="xsl"><title>Items to Display</title><description>Number of
items visible</description><key>items</key><value>5</value><customiser>Drop-down List
(1 to 15)</customiser></param><param editable="true" paramtype="xsl"><title>Show
Description</title><description>Show item
descriptions</description><key>showdesc</key><value>true</value><customiser>Boolean</customiser></param><param
editable="true" paramtype="xsl"><title>Description Length</title><description>Maximum
number of characters allowed in a
description</description><key>maxdescriptionlength</key><value>250</value><customiser>Drop-down
List (10 to 500)</customiser></param><param editable="true"
paramtype="xsl"><title>Open In New Window</title><description>Any links will open in a
new window</description><key>openinpopup</key><val
ue>true</value><customiser>Boolean</customiser></param><updaterate>60</updaterate></feed></feeds>
\ No newline at end of file
+<feeds totalfeeds="3" defaultcode="F8649275139280505488" xmlns="">
+ <feed code="F-1970145145312278303" active="true" addedby="nobody">
+ <name>TheServerSide.Com: Your J2EE Community Forum</name>
+ <description>TheServerSide.Com is a J2EE Community, containing up-to-date news,
discussions, patterns, resources, and media</description>
+ <source>http://www.theserverside.com/rss/theserverside-1.0.rdf</source>
+ <stylesheet>rss_90_91_10</stylesheet>
+ <param editable="true" paramtype="xsl">
+ <title>Items to Display</title>
+ <description>Number of items visible</description>
+ <key>items</key>
+ <value>5</value>
+ <customiser>Drop-down List (1 to 15)</customiser>
+ </param>
+ <param editable="true" paramtype="xsl">
+ <title>Show Description</title>
+ <description>Show item descriptions</description>
+ <key>showdesc</key>
+ <value>true</value>
+ <customiser>Boolean</customiser>
+ </param>
+ <param editable="true" paramtype="xsl">
+ <title>Description Length</title>
+ <description>Maximum number of characters allowed in a
description</description>
+ <key>maxdescriptionlength</key>
+ <value>250</value>
+ <customiser>Drop-down List (10 to 500)</customiser>
+ </param>
+ <param editable="true" paramtype="xsl">
+ <title>Open In New Window</title>
+ <description>Any links will open in a new window</description>
+ <key>openinpopup</key>
+ <value>true</value>
+ <customiser>Boolean</customiser>
+ </param>
+ <param editable="true" paramtype="url">
+ <title>mvnforum</title>
+ <description> </description>
+ <key>mvnforum</key>
+ <value>mvnforum</value>
+ <customiser>Free Text</customiser>
+ </param>
+ <updaterate>60</updaterate>
+ </feed>
+ <feed code="F-245846512622144987" active="true" addedby="guest">
+ <name>java.net Weblogs</name>
+ <description>Java Today on java.net</description>
+ <source>http://weblogs.java.net/pub/q/weblogs_rss?x-ver=1.0</source>
+ <stylesheet>rss_90_91_10</stylesheet>
+ <param editable="true" paramtype="xsl">
+ <title>Items to Display</title>
+ <description>Number of items visible</description>
+ <key>items</key>
+ <value>5</value>
+ <customiser>Drop-down List (1 to 15)</customiser>
+ </param>
+ <param editable="true" paramtype="xsl">
+ <title>Show Description</title>
+ <description>Show item descriptions</description>
+ <key>showdesc</key>
+ <value>true</value>
+ <customiser>Boolean</customiser>
+ </param>
+ <param editable="true" paramtype="xsl">
+ <title>Description Length</title>
+ <description>Maximum number of characters allowed in a
description</description>
+ <key>maxdescriptionlength</key>
+ <value>250</value>
+ <customiser>Drop-down List (10 to 500)</customiser>
+ </param>
+ <param editable="true" paramtype="xsl">
+ <title>Open In New Window</title>
+ <description>Any links will open in a new window</description>
+ <key>openinpopup</key>
+ <value>true</value>
+ <customiser>Boolean</customiser>
+ </param>
+ <updaterate>60</updaterate>
+ </feed>
+ <feed code="F8649275139280505488" active="true" addedby="guest">
+ <name>Slashdot</name>
+ <description>News for nerds, stuff that matters</description>
+ <source>http://slashdot.org/index.rss</source>
+ <stylesheet>rss_90_91_10</stylesheet>
+ <param editable="true" paramtype="xsl">
+ <title>Items to Display</title>
+ <description>Number of items visible</description>
+ <key>items</key>
+ <value>5</value>
+ <customiser>Drop-down List (1 to 15)</customiser>
+ </param>
+ <param editable="true" paramtype="xsl">
+ <title>Show Description</title>
+ <description>Show item descriptions</description>
+ <key>showdesc</key>
+ <value>true</value>
+ <customiser>Boolean</customiser>
+ </param>
+ <param editable="true" paramtype="xsl">
+ <title>Description Length</title>
+ <description>Maximum number of characters allowed in a
description</description>
+ <key>maxdescriptionlength</key>
+ <value>250</value>
+ <customiser>Drop-down List (10 to 500)</customiser>
+ </param>
+ <param editable="true" paramtype="xsl">
+ <title>Open In New Window</title>
+ <description>Any links will open in a new window</description>
+ <key>openinpopup</key>
+ <value>true</value>
+ <customiser>Boolean</customiser>
+ </param>
+ <updaterate>60</updaterate>
+ </feed>
+</feeds>
Index: rss_90_91_10.xsl
===================================================================
RCS file:
/home/cvs/repository/rssnewsfeeds/war/src/webapp/WEB-INF/etc/stylesheets/rss_90_91_10.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rss_90_91_10.xsl 21 Sep 2004 13:42:37 -0000 1.1
+++ rss_90_91_10.xsl 4 Nov 2004 19:07:47 -0000 1.2
@@ -29,7 +29,7 @@
<td class="waNormal">
<a>
<xsl:attribute name="href"><xsl:value-of select="$url"/></xsl:attribute>
- <xsl:attribute name="class">waNormal</xsl:attribute>
+ <xsl:attribute name="class">waUnderline</xsl:attribute>
<xsl:if test="$openinpopup = 'true'">
<xsl:attribute name="target">_blank</xsl:attribute>
</xsl:if>
Index: admin.jsp
===================================================================
RCS file: /home/cvs/repository/rssnewsfeeds/war/src/webapp/jsp/admin.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- admin.jsp 21 Sep 2004 13:42:38 -0000 1.1
+++ admin.jsp 4 Nov 2004 19:07:47 -0000 1.2
@@ -39,26 +39,12 @@
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr><td colspan="5"> </td></tr>
<tr>
- <td colspan="5" bgcolor="#3D3B94">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="10" align="left" valign="top"><img
src="<%=contextPath%>/images/box_top_left.gif" width="10" height="16" alt=""/></td>
- <td width="7" align="left" valign="top"><img
src="<%=contextPath%>/images/triangle.gif" width="7" height="16" alt=""/></td>
- <td width="100%"><span
class="boxTitle"><%=title%></span></td>
-
- </tr>
- </table>
+ <td class="boxtitlecolor1">
+ <%=title%>
</td>
</tr>
<tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td colspan="3" width="158"><img src="<%=contextPath%>/images/pix.gif"
width="158" height="3" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" align="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="100%">
+ <td width="100%" class="boxcontentcolor1">
<p align="left" class="waRed"><%=dmsg%></p>
<p align="left" class="waNormal">
<form name="admin<%=contextId%>Frm"
action="<%=response.encodeURL(servlet)%>" method="POST">
@@ -78,20 +64,7 @@
</form>
</p>
</td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="148"><img src="<%=contextPath%>/images/pix.gif" width="148"
height="3" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td colspan="5" width="160" bgcolor="#3D3B94"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="1" alt=""/></td>
- </tr>
-
+ </tr>
<tr>
<td colspan="5" width="160" height="5"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="5" alt=""/></td>
</tr>
Index: customise.jsp
===================================================================
RCS file: /home/cvs/repository/rssnewsfeeds/war/src/webapp/jsp/customise.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- customise.jsp 21 Sep 2004 13:42:38 -0000 1.1
+++ customise.jsp 4 Nov 2004 19:07:47 -0000 1.2
@@ -29,25 +29,12 @@
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr><td colspan="5"> </td></tr>
<tr>
- <td colspan="5" bgcolor="#3D3B94">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="10" align="left" valign="top"><img
src="<%=contextPath%>/images/box_top_left.gif" width="10" height="16" alt=""/></td>
- <td width="7" align="left" valign="top"><img
src="<%=contextPath%>/images/triangle.gif" width="7" height="16" alt=""/></td>
- <td width="100%"><span
class="boxTitle"><%=title%></span></td>
- </tr>
- </table>
+ <td class="boxtitlecolor1">
+ <%=title%>
</td>
</tr>
<tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td colspan="3" width="158"><img src="<%=contextPath%>/images/pix.gif"
width="158" height="3" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" align="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="100%" class="waBoxBG">
+ <td width="100%" class="boxcontentcolor1">
<p align="left" class="waRed"><%=dmsg%></p>
<p class="waNormal">
<form name="customise<%=contextId%>Frm"
action="<%=response.encodeURL(servlet)%>" method="POST">
@@ -88,18 +75,6 @@
</form>
</p>
</td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="148"><img src="<%=contextPath%>/images/pix.gif" width="148"
height="3" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td colspan="5" width="160" bgcolor="#3D3B94"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="1" alt=""/></td>
</tr>
<tr>
<td colspan="5" width="160" height="5"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="5" alt=""/></td>
Index: edit-mylist.jsp
===================================================================
RCS file: /home/cvs/repository/rssnewsfeeds/war/src/webapp/jsp/edit-mylist.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit-mylist.jsp 21 Sep 2004 13:42:38 -0000 1.1
+++ edit-mylist.jsp 4 Nov 2004 19:07:47 -0000 1.2
@@ -85,25 +85,12 @@
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr><td colspan="5"> </td></tr>
<tr>
- <td colspan="5" bgcolor="#3D3B94">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="10" align="left" valign="top"><img
src="<%=contextPath%>/images/box_top_left.gif" width="10" height="16" alt=""/></td>
- <td width="7" align="left" valign="top"><img
src="<%=contextPath%>/images/triangle.gif" width="7" height="16" alt=""/></td>
- <td width="100%"><span
class="boxTitle"><%=title%></span></td>
- </tr>
- </table>
+ <td class="boxtitlecolor1">
+ <%=title%>
</td>
</tr>
<tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td colspan="3" width="158"><img src="<%=contextPath%>/images/pix.gif"
width="158" height="3" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" align="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="100%" class="waBoxBG">
+ <td width="100%" class="boxcontentcolor1">
<p align="left" class="waRed"><%=dmsg%></p>
<p class="waNormal">
<form name="edit<%=contextId%>Frm"
action="<%=response.encodeURL(servlet)%>" method="POST">
@@ -154,18 +141,6 @@
</table>
</p>
</td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="148"><img src="<%=contextPath%>/images/pix.gif" width="148"
height="3" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td colspan="5" width="160" bgcolor="#3D3B94"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="1" alt=""/></td>
</tr>
<tr>
<td colspan="5" width="160" height="5"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="5" alt=""/></td>
Index: extra.css
===================================================================
RCS file: /home/cvs/repository/rssnewsfeeds/war/src/webapp/jsp/extra.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extra.css 21 Sep 2004 13:42:38 -0000 1.1
+++ extra.css 4 Nov 2004 19:07:47 -0000 1.2
@@ -1 +1,17 @@
-.boxtitle { font-size: 11px; color: #FFFFFF; font-weight:bold; }
\ No newline at end of file
+.boxtitle { font-size: 11px; color: #FFFFFF; font-weight:bold; }
+.boxtitlecolor1 {
+ color: #ffffff;
+ background-color: #006699;
+ padding-left: 5px;
+ padding-right: 5px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ white-space: nowrap;
+}
+.boxcontentcolor1 {
+ border-left: 1px solid #006699;
+ border-right: 1px solid #006699;
+ border-bottom: 1px solid #006699;
+ padding: 5px;
+ background-color: #E7E7E7;
+}
\ No newline at end of file
Index: feedentry.jsp
===================================================================
RCS file: /home/cvs/repository/rssnewsfeeds/war/src/webapp/jsp/feedentry.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- feedentry.jsp 21 Sep 2004 13:42:38 -0000 1.1
+++ feedentry.jsp 4 Nov 2004 19:07:47 -0000 1.2
@@ -187,25 +187,12 @@
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr><td colspan="5"> </td></tr>
<tr>
- <td colspan="5" bgcolor="#3D3B94">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="10" align="left" valign="top"><img
src="<%=contextPath%>/images/box_top_left.gif" width="10" height="16" alt=""/></td>
- <td width="7" align="left" valign="top"><img
src="<%=contextPath%>/images/triangle.gif" width="7" height="16" alt=""/></td>
- <td width="100%"><span
class="boxTitle"><%=title%></span></td>
- </tr>
- </table>
+ <td class="boxtitlecolor1">
+ <%=title%>
</td>
</tr>
<tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td colspan="3" width="158"><img src="<%=contextPath%>/images/pix.gif"
width="158" height="3" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" align="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="100%" class="waBoxBG">
+ <td width="100%" class="boxcontentcolor1">
<p align="left" class="waRed"><%=dmsg%></p>
<p align="left" class="waNormal">
<form name="addFeed<%=contextId%>Frm"
action="<%=response.encodeURL(servlet)%>" method="POST">
@@ -425,18 +412,6 @@
</table>
</p>
</td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="148"><img src="<%=contextPath%>/images/pix.gif" width="148"
height="3" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td colspan="5" width="160" bgcolor="#3D3B94"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="1" alt=""/></td>
</tr>
<tr>
<td colspan="5" width="160" height="5"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="5" alt=""/></td>
Index: multiple-view.jsp
===================================================================
RCS file: /home/cvs/repository/rssnewsfeeds/war/src/webapp/jsp/multiple-view.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multiple-view.jsp 21 Sep 2004 13:42:38 -0000 1.1
+++ multiple-view.jsp 4 Nov 2004 19:07:47 -0000 1.2
@@ -102,13 +102,10 @@
%>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
- <td colspan="5" bgcolor="#3D3B94">
- <table border="0" cellspacing="0"
cellpadding="0">
- <tr>
- <td width="10" align="left"
valign="top"><img src="<%=contextPath%>/images/box_top_left.gif" width="10"
height="16" alt=""/></td>
- <td width="7" align="left"
valign="top"><img src="<%=contextPath%>/images/triangle.gif" width="7" height="16"
alt=""/></td>
- <td width="95%"><span
class="boxTitle"><%=feed.getName()%></span></td>
- <td nowrap="true">
+ <td class="boxtitlecolor1" width="100%">
+ <%=feed.getName()%>
+ </td>
+ <td class="boxtitlecolor1" nowrap="true" align="right">
<%if (!pEnt.getMinimised()) {%>
<a
href="javascript:xslsendMult<%=contextId%>Frm('minimise','<%=pEnt.getFeedcode()%>');"><img
src="<%=contextPath%>/images/minimise.gif" border="0" alt="Collapse this
feedlet"/></a>
<%} else {%>
@@ -116,44 +113,18 @@
<%}%>
<a
href="javascript:xslcustomise<%=contextId%>Frm('<%=pEnt.getFeedcode()%>');"><img
src="<%=contextPath%>/images/edit.gif" border="0" alt="Customise this feedlet"/></a>
- </td>
- </tr>
- </table>
- </td>
+ </td>
</tr>
<%if (!pEnt.getMinimised()) {%>
<tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td colspan="3" width="158"><img
src="<%=contextPath%>/images/pix.gif" width="158" height="3" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" align="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img
src="<%=contextPath%>/images/pix.gif" width="5" height="1" alt=""/></td>
- <td width="100%" class="waBoxBG">
+ <td colspan="2" width="100%" class="boxcontentcolor1">
<%=result%>
</td>
- <td width="5"><img
src="<%=contextPath%>/images/pix.gif" width="5" height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img
src="<%=contextPath%>/images/pix.gif" width="5" height="1" alt=""/></td>
- <td width="148"><img
src="<%=contextPath%>/images/pix.gif" width="148" height="3" alt=""/></td>
- <td width="5"><img
src="<%=contextPath%>/images/pix.gif" width="5" height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td colspan="5" width="160" bgcolor="#3D3B94"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="1" alt=""/></td>
- </tr>
-
- <tr>
- <td colspan="5" width="160" height="5"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="5" alt=""/></td>
</tr>
<%} else {%>
- <tr><td colspan="5"><img
src="<%=contextPath%>/images/pix.gif"/></td></tr>
<%}%>
- </table>
+ </table>
+ <br>
<%}%>
</td></tr>
<%} else {%>
Index: single-view.jsp
===================================================================
RCS file: /home/cvs/repository/rssnewsfeeds/war/src/webapp/jsp/single-view.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- single-view.jsp 21 Sep 2004 13:42:38 -0000 1.1
+++ single-view.jsp 4 Nov 2004 19:07:47 -0000 1.2
@@ -26,27 +26,14 @@
}
%>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr><td colspan="5"> </td></tr>
+ <tr><td> </td></tr>
<tr>
- <td colspan="5" bgcolor="#3D3B94">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="10" align="left" valign="top"><img
src="<%=contextPath%>/images/box_top_left.gif" width="10" height="16" alt=""/></td>
- <td width="7" align="left" valign="top"><img
src="<%=contextPath%>/images/triangle.gif" width="7" height="16" alt=""/></td>
- <td width="100%"><span
class="boxTitle"><%=title%></span></td>
- </tr>
- </table>
+ <td class="boxtitlecolor1">
+ <%=title%>
</td>
</tr>
<tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td colspan="3" width="158"><img src="<%=contextPath%>/images/pix.gif"
width="158" height="3" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" align="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="100%" class="waBoxBG">
+ <td width="100%" class="boxcontentcolor1">
<%if (!result.equals("")) {%>
<p align="left" class="waNormal">
<%=result%></td>
@@ -58,20 +45,5 @@
</p>
<%}%>
</td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_left_border.gif"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="148"><img src="<%=contextPath%>/images/pix.gif" width="148"
height="3" alt=""/></td>
- <td width="5"><img src="<%=contextPath%>/images/pix.gif" width="5"
height="1" alt=""/></td>
- <td width="1" bgcolor="#3D3B94"
background="<%=contextPath%>/images/box_right_border.gif" valign="right"><img
src="<%=contextPath%>/images/pix.gif" width="1" height="1" alt=""/></td>
- </tr>
- <tr>
- <td colspan="5" width="160" bgcolor="#3D3B94"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="1" alt=""/></td>
- </tr>
- <tr>
- <td colspan="5" width="160" height="5"><img
src="<%=contextPath%>/images/pix.gif" width="160" height="5" alt=""/></td>
</tr>
</table>
Index: template.jsp
===================================================================
RCS file: /home/cvs/repository/rssnewsfeeds/war/src/webapp/jsp/template.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- template.jsp 22 Sep 2004 13:53:47 -0000 1.2
+++ template.jsp 4 Nov 2004 19:07:47 -0000 1.3
@@ -9,13 +9,16 @@
application.setAttribute("defaultfeed",
AppRef._FeedConfigMgr().getDefaultcode());
%>
<head>
+<%if (JAHIA.equals("false")) { %>
+ <link rel="stylesheet" href="<%=contextPath%>/jsp/application.css">
+ <link rel="stylesheet" href="<%=contextPath%>/jsp/extra.css">
+<% } %>
<title>Edna Xsl Publisher portlet</title>
</head>
<body>
<%if (JAHIA.equals("false")) {
Vector roles = (Vector)request.getSession().getAttribute("roles");
%>
- <link rel="stylesheet" href="<%=contextPath%>/jsp/application.css">
<form name="role<%=contextId%>Frm" method="POST"
action="<%=response.encodeURL((String)request.getSession().getAttribute("erss_servletURI"))%>">
<p class="waNormal" align="left">
Debug role:
@@ -34,7 +37,6 @@
</tr>
</table>
<%}%>
-<link rel="stylesheet" href="<%=contextPath%>/jsp/extra.css">
<!-- <<<< WORKAREA -->
<jsp:include page="<%=template%>" flush="true"/>
<!-- >>>> -->
