Author: agilliland
Date: Wed Apr 19 09:33:36 2006
New Revision: 395306
URL: http://svn.apache.org/viewcvs?rev=395306&view=rev
Log:
merging in changes to trunk between revisions 394832 and 395240.
Removed:
incubator/roller/branches/roller-newbackend/web/editor/html2xhtml.js
Modified:
incubator/roller/branches/roller-newbackend/metadata/database/createdb.vm
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/velocity/PageHelper.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntryContentTag.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntrySummaryTag.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntryTextTag.java
incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/flavors/atom.vm
incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/flavors/rss.vm
incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/weblog.vm
incubator/roller/branches/roller-newbackend/web/editor/richtext.js
incubator/roller/branches/roller-newbackend/web/editor/rte.css
incubator/roller/branches/roller-newbackend/web/theme/sun/colors.css
incubator/roller/branches/roller-newbackend/web/theme/tan/colors.css
incubator/roller/branches/roller-newbackend/web/weblog/WeblogEdit.jsp
incubator/roller/branches/roller-newbackend/web/weblog/editor-rte.jsp
Modified:
incubator/roller/branches/roller-newbackend/metadata/database/createdb.vm
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/metadata/database/createdb.vm?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/metadata/database/createdb.vm
(original)
+++ incubator/roller/branches/roller-newbackend/metadata/database/createdb.vm
Wed Apr 19 09:33:36 2006
@@ -187,7 +187,7 @@
pinnedtomain $BOOLEAN_SQL_TYPE_FALSE not null,
locale varchar(20),
status varchar(20) not null,
- content $TEXT_SQL_TYPE default null,
+ summary $TEXT_SQL_TYPE default null,
content_type varchar(48) default null,
content_src varchar(512) default null
);
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/velocity/PageHelper.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/velocity/PageHelper.java?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/velocity/PageHelper.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/velocity/PageHelper.java
Wed Apr 19 09:33:36 2006
@@ -454,7 +454,11 @@
{
PagePlugin pagePlugin =
(PagePlugin)mPagePlugins.get(key);
if (!(singleEntry &&
pagePlugin.getSkipOnSingleEntry())) {
- ret = pagePlugin.render(entry.getPojo(), ret);
+ try {
+ ret = pagePlugin.render(entry.getPojo(), ret);
+ } catch (Throwable t) {
+ mLogger.error("ERROR from plugin: " +
pagePlugin.getName(), t);
+ }
}
}
}
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntryContentTag.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntryContentTag.java?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntryContentTag.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntryContentTag.java
Wed Apr 19 09:33:36 2006
@@ -1,4 +1,4 @@
-/* Created on Feb 27, 2004 */
+/* Created on April 14, 2006 */
package org.roller.presentation.weblog.tags;
import javax.servlet.http.HttpServletRequest;
@@ -24,7 +24,6 @@
/**
* Shows entry text with plugins applied.
* @jsp.tag name="ShowEntryContent"
- * @author David M Johnson
*/
public class ShowEntryContentTag extends TagSupport {
static final long serialVersionUID = 3166731504235428544L;
@@ -44,48 +43,46 @@
*/
public int doStartTag() throws JspException {
Roller roller = RollerFactory.getRoller();
- WeblogEntryData entry =
- (WeblogEntryData)RequestUtils.lookup(pageContext, name, property,
scope);
-
- String xformed = null;
-
- if (entry.getPlugins() != null) {
- RollerContext rctx =
- RollerContext.getRollerContext();
+ WeblogEntryData entry = (WeblogEntryData)
+ RequestUtils.lookup(pageContext, name, property, scope);
+ if (Utilities.isNotEmpty(entry.getText())) {
+ String xformed = entry.getText();;
try {
- PagePluginManager ppmgr = roller.getPagePluginManager();
- Map plugins = ppmgr.createAndInitPagePlugins(
- entry.getWebsite(),
- rctx.getServletContext(),
- rctx.getAbsoluteContextUrl(),
- new VelocityContext());
- xformed = ppmgr.applyPagePlugins(
- entry, plugins, entry.getText(), singleEntry);
-
- } catch (Exception e) {
- mLogger.error(e);
+ if (entry.getPlugins() != null) {
+ RollerContext rctx =
+ RollerContext.getRollerContext();
+ try {
+ PagePluginManager ppmgr =
roller.getPagePluginManager();
+ Map plugins = ppmgr.createAndInitPagePlugins(
+ entry.getWebsite(),
+ rctx.getServletContext(),
+ rctx.getAbsoluteContextUrl(),
+ new VelocityContext());
+ xformed = ppmgr.applyPagePlugins(
+ entry, plugins, entry.getText(), singleEntry);
+ } catch (Exception e) {
+ mLogger.error(e);
+ }
+ }
+
+ if (stripHtml) {
+ // don't escape ampersands
+ xformed = Utilities.escapeHTML(
Utilities.removeHTML(xformed), false );
+ }
+
+ if (maxLength != -1) {
+ xformed = Utilities.truncateNicely(xformed, maxLength,
maxLength, "...");
+ }
+
+ // somehow things (“) are getting double-escaped
+ // but I cannot seem to track it down
+ xformed = Utilities.stringReplace(xformed, "&#", "&#");
+
+ pageContext.getOut().println(xformed);
+
+ } catch (Throwable e) {
+ throw new JspException("ERROR applying plugin to entry", e);
}
- } else {
- xformed = entry.getText();
- }
-
- if (stripHtml) {
- // don't escape ampersands
- xformed = Utilities.escapeHTML( Utilities.removeHTML(xformed),
false );
- }
-
- if (maxLength != -1) {
- xformed = Utilities.truncateNicely(xformed, maxLength, maxLength,
"...");
- }
-
- // somehow things (“) are getting double-escaped
- // but I cannot seem to track it down
- xformed = Utilities.stringReplace(xformed, "&#", "&#");
-
- try {
- pageContext.getOut().println(xformed);
- } catch (IOException e) {
- throw new JspException("ERROR applying plugin to entry", e);
}
return TagSupport.SKIP_BODY;
}
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntrySummaryTag.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntrySummaryTag.java?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntrySummaryTag.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntrySummaryTag.java
Wed Apr 19 09:33:36 2006
@@ -1,4 +1,4 @@
-/* Created on Feb 27, 2004 */
+/* Created on April 14, 2006 */
package org.roller.presentation.weblog.tags;
import javax.servlet.http.HttpServletRequest;
@@ -24,7 +24,6 @@
/**
* Shows entry summary with plugins applied.
* @jsp.tag name="ShowEntrySummary"
- * @author David M Johnson
*/
public class ShowEntrySummaryTag extends TagSupport {
static final long serialVersionUID = 3166731504235428544L;
@@ -41,35 +40,27 @@
*/
public int doStartTag() throws JspException {
Roller roller = RollerFactory.getRoller();
- WeblogEntryData entry =
- (WeblogEntryData)RequestUtils.lookup(pageContext, name, property,
scope);
-
- String xformed = null;
-
- if (entry.getPlugins() != null) {
- RollerContext rctx =
- RollerContext.getRollerContext();
- try {
- PagePluginManager ppmgr = roller.getPagePluginManager();
- Map plugins = ppmgr.createAndInitPagePlugins(
+ WeblogEntryData entry = (WeblogEntryData)
+ RequestUtils.lookup(pageContext, name, property, scope);
+ if (Utilities.isNotEmpty(entry.getSummary())) {
+ String xformed = entry.getSummary();
+ try {
+ if (entry.getPlugins() != null) {
+ RollerContext rctx =
+ RollerContext.getRollerContext();
+ PagePluginManager ppmgr = roller.getPagePluginManager();
+ Map plugins = ppmgr.createAndInitPagePlugins(
entry.getWebsite(),
rctx.getServletContext(),
rctx.getAbsoluteContextUrl(),
new VelocityContext());
- xformed = ppmgr.applyPagePlugins(
- entry, plugins, entry.getSummary(), true);
-
- } catch (Exception e) {
- mLogger.error(e);
+ xformed = ppmgr.applyPagePlugins(
+ entry, plugins, entry.getSummary(), true);
+ }
+ pageContext.getOut().println(xformed);
+ } catch (Throwable e) {
+ throw new JspException("ERROR applying plugin to entry", e);
}
- } else {
- xformed = entry.getText();
- }
-
- try {
- pageContext.getOut().println(xformed);
- } catch (IOException e) {
- throw new JspException("ERROR applying plugin to entry", e);
}
return TagSupport.SKIP_BODY;
}
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntryTextTag.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntryTextTag.java?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntryTextTag.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/tags/ShowEntryTextTag.java
Wed Apr 19 09:33:36 2006
@@ -1,4 +1,4 @@
-/* Created on Feb 27, 2004 */
+/* Created on April 14, 2006 */
package org.roller.presentation.weblog.tags;
import javax.servlet.http.HttpServletRequest;
@@ -25,7 +25,6 @@
/**
* Shows either entry summary or text, as appropriate and with plugins applied.
* @jsp.tag name="ShowEntryText"
- * @author David M Johnson
*/
public class ShowEntryTextTag extends TagSupport {
static final long serialVersionUID = 3166731504235428544L;
@@ -45,50 +44,58 @@
*/
public int doStartTag() throws JspException {
Roller roller = RollerFactory.getRoller();
- WeblogEntryData entry =
- (WeblogEntryData)RequestUtils.lookup(pageContext, name, property,
scope);
+ WeblogEntryData entry = (WeblogEntryData)
+ RequestUtils.lookup(pageContext, name, property, scope);
- String sourceText = entry.getSummary();
- if (sourceText == null || (singleEntry && entry.getText() != null)) {
- sourceText = entry.getText();
+ String sourceText = null;
+ boolean hasSummary = Utilities.isNotEmpty(entry.getSummary());
+ boolean hasText= Utilities.isNotEmpty(entry.getText());
+ if (singleEntry) {
+ if (hasText) sourceText = entry.getText();
+ else if (hasSummary) sourceText = entry.getSummary();
+ } else {
+ if (hasSummary) sourceText = entry.getSummary();
+ else if (hasText) sourceText = entry.getText();
}
-
- String xformed = sourceText;
- if (entry.getPlugins() != null) {
- RollerContext rctx =
- RollerContext.getRollerContext();
+ if (Utilities.isNotEmpty(sourceText)) {
try {
- PagePluginManager ppmgr = roller.getPagePluginManager();
- Map plugins = ppmgr.createAndInitPagePlugins(
- entry.getWebsite(),
- rctx.getServletContext(),
- rctx.getAbsoluteContextUrl(),
- new VelocityContext());
+ String xformed = sourceText;
+ if (entry.getPlugins() != null) {
+ RollerContext rctx =
+ RollerContext.getRollerContext();
+ try {
+ PagePluginManager ppmgr =
roller.getPagePluginManager();
+ Map plugins = ppmgr.createAndInitPagePlugins(
+ entry.getWebsite(),
+ rctx.getServletContext(),
+ rctx.getAbsoluteContextUrl(),
+ new VelocityContext());
+
+ xformed = ppmgr.applyPagePlugins(entry, plugins,
sourceText, true);
+
+ } catch (Exception e) {
+ mLogger.error(e);
+ }
+ }
+
+ if (stripHtml) {
+ // don't escape ampersands
+ xformed = Utilities.escapeHTML(
Utilities.removeHTML(xformed), false );
+ }
- xformed = ppmgr.applyPagePlugins(entry, plugins, sourceText,
true);
+ if (maxLength != -1) {
+ xformed = Utilities.truncateNicely(xformed, maxLength,
maxLength, "...");
+ }
+
+ // somehow things (“) are getting double-escaped
+ // but I cannot seem to track it down
+ xformed = Utilities.stringReplace(xformed, "&#", "&#");
+
+ pageContext.getOut().println(xformed);
- } catch (Exception e) {
- mLogger.error(e);
+ } catch (Throwable e) {
+ throw new JspException("ERROR applying plugin to entry", e);
}
- }
-
- if (stripHtml) {
- // don't escape ampersands
- xformed = Utilities.escapeHTML( Utilities.removeHTML(xformed),
false );
- }
-
- if (maxLength != -1) {
- xformed = Utilities.truncateNicely(xformed, maxLength, maxLength,
"...");
- }
-
- // somehow things (“) are getting double-escaped
- // but I cannot seem to track it down
- xformed = Utilities.stringReplace(xformed, "&#", "&#");
-
- try {
- pageContext.getOut().println(xformed);
- } catch (IOException e) {
- throw new JspException("ERROR applying plugin to entry", e);
}
return TagSupport.SKIP_BODY;
}
Modified:
incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/flavors/atom.vm
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/flavors/atom.vm?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/flavors/atom.vm
(original)
+++
incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/flavors/atom.vm
Wed Apr 19 09:33:36 2006
@@ -30,8 +30,8 @@
<published>$utilities.formatIso8601Date($entry.pubTime)</published>
<updated>$utilities.formatIso8601Date($entry.updateTime)</updated>
<category term="$utilities.textToHTML($entry.category.path, true)"
label="$utilities.textToHTML($entry.category.name, true)" />
- #if( $entry.summary )<summary
type="html">#showEntrySummary($entry)</summary>#end
- #if( $entry.text )<content
type="html">#showEntryContent($entry)</content>#end
+ #if( $utilities.isNotEmpty($entry.summary) )<summary
type="html">#showEntrySummary($entry)</summary>#end
+ #if( $utilities.isNotEmpty($entry.text) )<content
type="html">#showEntryContent($entry)</content>#end
#set( $mc_url = $entry.findEntryAttribute("att_mediacast_url") )
#set( $mc_type = $entry.findEntryAttribute("att_mediacast_type") )
#set( $mc_length = $entry.findEntryAttribute("att_mediacast_length") )
Modified:
incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/flavors/rss.vm
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/flavors/rss.vm?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/flavors/rss.vm
(original)
+++
incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/flavors/rss.vm
Wed Apr 19 09:33:36 2006
@@ -1,7 +1,7 @@
$pageHelper.setContentType("application/rss+xml;charset=utf-8")<?xml
version="1.0" encoding="utf-8"?>
<rss version="2.0"
xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:content="http://purl.org/rss/1.0/modules/content/"; >
+ xmlns:atom="http://www.w3.org/2005/Atom"; >
<channel>
<title>$utilities.textToHTML($utilities.removeHTML($website.name))</title>
<link>$websiteURL</link>
@@ -22,8 +22,8 @@
#end
<pubDate>$utilities.formatRfc822Date($entry.pubTime)</pubDate>
<category>$utilities.textToHTML($entry.category.name,true)</category>
- #if( $entry.summary
)<description>#showEntrySummary($entry)</description>#end
- #if( $entry.text
)<content:encoded>#showEntryContent($entry)</content:encoded>#end
+ #if( $utilities.isNotEmpty($entry.summary) )<atom:summary
type="html">#showEntrySummary($entry)</atom:summary>#end
+ #if( $utilities.isNotEmpty($entry.text)
)<description>#showEntryContent($entry)</description>#end
#set( $mc_url = $entry.findEntryAttribute("att_mediacast_url") )
#set( $mc_type = $entry.findEntryAttribute("att_mediacast_type") )
#set( $mc_length = $entry.findEntryAttribute("att_mediacast_length") )
Modified:
incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/weblog.vm
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/weblog.vm?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/weblog.vm
(original)
+++ incubator/roller/branches/roller-newbackend/web/WEB-INF/classes/weblog.vm
Wed Apr 19 09:33:36 2006
@@ -257,44 +257,36 @@
* Roller uses this macro to display entry.summary in RSS and Atom feeds.
*#
#macro( showEntrySummary $entry )
- #if($descPage)
- #parse($descPage.id)
- #else
- #if( $entry.plugins)
- #set( $displayText = $pageHelper.renderPlugins( $entry,
$entry.summary))
- #else
- #set( $displayText = $entry.summary )
- #end
- #if( $displayText == -1 )
- $utilities.textToXML($displayText)
- #else
- #set( $displayText = $stringUtils.left( $displayText, $entryLength ) )
- #set( $displayText =
$utilities.textToXML($utilities.removeHTML($displayText)) )
- $displayText... [$entry.text.length() characters]
- #end
- #end
+ #if( $entry.plugins)
+ #set( $displayText = $pageHelper.renderPlugins($entry, $entry.summary))
+ #else
+ #set( $displayText = $entry.summary )
+ #end
+ #if( $entryLength == -1 )
+ $utilities.textToXML($displayText)
+ #else
+ #set( $displayText = $stringUtils.left( $displayText, $entryLength ) )
+ #set( $displayText =
$utilities.textToXML($utilities.removeHTML($displayText)) )
+ $displayText... [$entry.text.length() characters]
+ #end
#end
#**
* Roller uses this macro to display entry.text in RSS and Atom feeds.
*#
#macro( showEntryContent $entry )
- #if($descPage)
- #parse($descPage.id)
- #else
- #if( $entry.plugins)
- #set( $displayText = $pageHelper.renderPlugins( $entry, $entry.text))
- #else
- #set( $displayText = $entry.text )
- #end
- #if( $entryLength == -1 )
- $utilities.textToXML($displayText)
- #else
- #set( $displayText = $stringUtils.left( $displayText, $entryLength ) )
- #set( $displayText =
$utilities.textToXML($utilities.removeHTML($displayText)) )
- $displayText... [$entry.text.length() characters]
- #end
- #end
+ #if( $entry.plugins)
+ #set( $displayText = $pageHelper.renderPlugins( $entry, $entry.text))
+ #else
+ #set( $displayText = $entry.text )
+ #end
+ #if( $entryLength == -1 )
+ $utilities.textToXML($displayText)
+ #else
+ #set( $displayText = $stringUtils.left( $displayText, $entryLength ) )
+ #set( $displayText =
$utilities.textToXML($utilities.removeHTML($displayText)) )
+ $displayText... [$entry.text.length() characters]
+ #end
#end
Modified: incubator/roller/branches/roller-newbackend/web/editor/richtext.js
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/editor/richtext.js?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/web/editor/richtext.js
(original)
+++ incubator/roller/branches/roller-newbackend/web/editor/richtext.js Wed Apr
19 09:33:36 2006
@@ -122,7 +122,7 @@
// ROLLER_MOD: changed icon images
- document.writeln(' <td><img id="bold"
class="rteImage" src="' + imagesPath + 'bold.gif" width="16" height="16"
alt="Bold" title="Bold" onClick="rteCommand(\'' + rte + '\', \'bold\',
\'\')"></td>');
+ document.writeln(' <td><img id="bold"
class="rteImage" src="' + imagesPath + 'text_bold.png" width="16" height="16"
alt="Bold" title="Bold" onClick="rteCommand(\'' + rte + '\', \'bold\',
\'\')"></td>');
document.writeln(' <td><img
class="rteImage" src="' + imagesPath + 'text_italic.png" width="16"
height="16" alt="Italic" title="Italic" onClick="rteCommand(\'' + rte + '\',
\'italic\', \'\')"></td>');
document.writeln(' <td><img
class="rteImage" src="' + imagesPath + 'text_underline.png" width="16"
height="16" alt="Underline" title="Underline" onClick="rteCommand(\'' + rte +
'\', \'underline\', \'\')"></td>');
document.writeln(' <td><img
class="rteVertSep" src="' + imagesPath + 'blackdot.gif" width="1" height="20"
border="0" alt=""></td>');
Modified: incubator/roller/branches/roller-newbackend/web/editor/rte.css
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/editor/rte.css?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/web/editor/rte.css (original)
+++ incubator/roller/branches/roller-newbackend/web/editor/rte.css Wed Apr 19
09:33:36 2006
@@ -1,63 +1,50 @@
.rteImage {
- background: #FFFFFF;
- background: #F0F0F0;
- border: 1px solid #D3D3D3;
+ /* background: #F0F0F0; */
+ /* border: 1px solid #D3D3D3; */
padding: 2px;
cursor: pointer;
cursor: hand;
}
-
.rteImageSm {
- background: #FFFFFF;
- background: #F0F0F0;
- border: 1px solid #D3D3D3;
+ /* background: #F0F0F0; */
+ /* border: 1px solid #D3D3D3; */
padding: 2px;
margin: 2px 0px 0px 0px;
cursor: pointer;
cursor: hand;
}
-
.rteImageRaised, .rteImage:hover {
- background: #FFFFFF;
- background: #F0F0F0;
+ /* background: #F0F0F0; */
border: 1px outset;
cursor: pointer;
cursor: hand;
}
-
.rteImageLowered, .rteImage:active {
- background: #FFFFFF;
- background: #F0F0F0;
- /*border: 1px inset;*/
+ /* background: #F0F0F0; */
+ /* border: 1px inset; */
cursor: pointer;
cursor: hand;
}
-
.rteVertSep {
margin: 0 4px 0 4px;
}
-
.rteBack {
- background: #FFFFFF;
- background: #F0F0F0;
- /*border: 1px outset; */
+ /* background: #F0F0F0; */
+ /* border: 1px outset; */
letter-spacing: 0;
padding: 2px;
}
-
.rteBack tbody tr td, .rteBack tr td {
- background: #FFFFFF;
- background: #F0F0F0;
+ /* background: #F0F0F0; */
padding: 0;
}
.rteDiv {
display: block;
position: relative;
- background: #F0F0F0;
- border: 1px solid #F0F0F0;
+ /* background: #F0F0F0; */
+ /* border: 1px solid #F0F0F0; */
}
-
.rteFrame {
border: 0px;
}
Modified: incubator/roller/branches/roller-newbackend/web/theme/sun/colors.css
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/theme/sun/colors.css?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/web/theme/sun/colors.css
(original)
+++ incubator/roller/branches/roller-newbackend/web/theme/sun/colors.css Wed
Apr 19 09:33:36 2006
@@ -154,4 +154,22 @@
}
td.mm_table_actions {
background: #fff4d4;
-}
\ No newline at end of file
+}
+
+/* RTE editor */
+
+.rteBack tbody tr td, .rteBack tr td, .rteDiv, .rteBack .rteImageLowered,
.rteImage:active, .rteImageRaised, .rteImage:hover, .rteImageSm, .rteImage {
+ background: #dee7ef;
+}
+.rteImage {
+ border: 1px solid #bcc5cd;
+}
+.rteImageSm {
+ border: 1px solid #bcc5cd;
+}
+.rteDiv {
+ border: 1px solid #bcc5cd;
+}
+
+
+
Modified: incubator/roller/branches/roller-newbackend/web/theme/tan/colors.css
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/theme/tan/colors.css?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/web/theme/tan/colors.css
(original)
+++ incubator/roller/branches/roller-newbackend/web/theme/tan/colors.css Wed
Apr 19 09:33:36 2006
@@ -145,3 +145,22 @@
td.mm_table_actions {
background: #fff4d4;
}
+
+/* RTE editor */
+
+.rteBack tbody tr td, .rteBack tr td, .rteDiv, .rteBack .rteImageLowered,
.rteImage:active, .rteImageRaised, .rteImage:hover, .rteImageSm, .rteImage {
+ background: #f1ebdf;
+}
+.rteImage {
+ border: 1px solid #d0cabc;
+}
+.rteImageSm {
+ border: 1px solid #d0cabc;
+}
+.rteDiv {
+ border: 1px solid #d0cabc;
+}
+
+
+
+
Modified: incubator/roller/branches/roller-newbackend/web/weblog/WeblogEdit.jsp
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/WeblogEdit.jsp?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/web/weblog/WeblogEdit.jsp
(original)
+++ incubator/roller/branches/roller-newbackend/web/weblog/WeblogEdit.jsp Wed
Apr 19 09:33:36 2006
@@ -86,12 +86,100 @@
<html:hidden name="method" property="method" value="save"/>
<%-- ==================================================================
--%>
- <%-- Title field --%>
+ <%-- Title, category, dates and other metadata --%>
- <p class="toplabel"><fmt:message key="weblogEdit.title" /></p>
- <html:text property="title" style="width:100%" maxlength="255"
tabindex="1" />
+ <table class="entryEditTable" cellpadding="0" cellspacing="0"
width="100%">
+
+ <tr><td class="entryEditFormLabel">
+ <label for="title">
+ <fmt:message key="weblogEdit.title" />
+ </label>
+ </td><td>
+ <html:text property="title" style="width:100%" maxlength="255"
tabindex="1" />
+ </td></tr>
+
+ <tr><td class="entryEditFormLabel">
+ <label for="status">
+ <fmt:message key="weblogEdit.status" />
+ </label>
+ </td><td>
+ <c:if test="${!empty weblogEntryFormEx.id}">
+ <c:if test="${weblogEntryFormEx.published}">
+ <span style="color:green; font-weight:bold">
+ <fmt:message key="weblogEdit.published" />
+ (<fmt:message key="weblogEdit.updateTime" />
+ <fmt:formatDate value="${weblogEntryFormEx.updateTime}"
type="both"
+ dateStyle="short" timeStyle="short" />)
+ </span>
+ </c:if>
+ <c:if test="${weblogEntryFormEx.draft}">
+ <span style="color:orange; font-weight:bold">
+ <fmt:message key="weblogEdit.draft" />
+ (<fmt:message key="weblogEdit.updateTime" />
+ <fmt:formatDate value="${weblogEntryFormEx.updateTime}"
type="both"
+ dateStyle="short" timeStyle="short" />)
+ </span>
+ </c:if>
+ <c:if test="${weblogEntryFormEx.pending}">
+ <span style="color:orange; font-weight:bold">
+ <fmt:message key="weblogEdit.pending" />
+ (<fmt:message key="weblogEdit.updateTime" />
+ <fmt:formatDate value="${weblogEntryFormEx.updateTime}"
type="both"
+ dateStyle="short" timeStyle="short" />)
+ </span>
+ </c:if>
+ </c:if>
+ <c:if test="${empty weblogEntryFormEx.id}">
+ <span style="color:red; font-weight:bold"><fmt:message
key="weblogEdit.unsaved" /></span>
+ </c:if>
+ </td></tr>
+
+ <tr><td class="entryEditFormLabel">
+ <label for="categoryId"><fmt:message key="weblogEdit.category"
/></label>
+ </td><td>
+ <html:select property="categoryId" size="1" tabindex="4">
+ <html:optionsCollection name="model" property="categories" value="id"
label="path" />
+ </html:select>
+ </td></tr>
+
+ <tr>
+ <td class="entryEditFormLabel">
+ <label for="link"><fmt:message key="weblogEdit.pubTime" /></label>
+ </td>
+ <td>
+ <div>
+ <html:select property="hours">
+ <html:options name="model" property="hoursList" />
+ </html:select>
+ :
+ <html:select property="minutes" >
+ <html:options name="model" property="minutesList" />
+ </html:select>
+ :
+ <html:select property="seconds">
+ <html:options name="model" property="secondsList" />
+ </html:select>
+
+ <roller:Date property="dateString" dateFormat='<%=
model.getShortDateFormat() %>' />
+ <c:out value="${model.weblogEntry.website.timeZone}" />
+ </div>
+ </td></tr>
+ <c:if test="${!empty weblogEntryFormEx.id}">
+ <tr><td class="entryEditFormLabel">
+ <label for="categoryId">
+ <fmt:message key="weblogEdit.permaLink" />
+ </label>
+ </td><td>
+ <a href='<c:out value="${model.permaLink}" />'>
+ <c:out value="${model.permaLink}" />
+ </a>
+ </td></tr>
+ </c:if>
+ </table>
+
+
<%-- ==================================================================
--%>
<%-- Weblog edit, preview, or spell check area --%>
@@ -222,99 +310,11 @@
<%-- ==================================================================
--%>
<%-- Other settings --%>
- <br />
<h2><fmt:message key="weblogEdit.otherSettings" /></h2>
-
- <table class="entryEditTable" cellpadding="0" cellspacing="0"
width="100%">
-
- <tr><td class="entryEditFormLabel">
- <label for="title">
- <fmt:message key="weblogEdit.status" />
- </label>
- </td><td>
- <c:if test="${!empty weblogEntryFormEx.id}">
- <c:if test="${weblogEntryFormEx.published}">
- <span style="color:green; font-weight:bold">
- <fmt:message key="weblogEdit.published" />
- (<fmt:message key="weblogEdit.updateTime" />
- <fmt:formatDate value="${weblogEntryFormEx.updateTime}"
type="both"
- dateStyle="short" timeStyle="short" />)
- </span>
- </c:if>
- <c:if test="${weblogEntryFormEx.draft}">
- <span style="color:orange; font-weight:bold">
- <fmt:message key="weblogEdit.draft" />
- (<fmt:message key="weblogEdit.updateTime" />
- <fmt:formatDate value="${weblogEntryFormEx.updateTime}"
type="both"
- dateStyle="short" timeStyle="short" />)
- </span>
- </c:if>
- <c:if test="${weblogEntryFormEx.pending}">
- <span style="color:orange; font-weight:bold">
- <fmt:message key="weblogEdit.pending" />
- (<fmt:message key="weblogEdit.updateTime" />
- <fmt:formatDate value="${weblogEntryFormEx.updateTime}"
type="both"
- dateStyle="short" timeStyle="short" />)
- </span>
- </c:if>
- </c:if>
- <c:if test="${empty weblogEntryFormEx.id}">
- <span style="color:red; font-weight:bold"><fmt:message
key="weblogEdit.unsaved" /></span>
- </c:if>
- </td></tr>
-
- <tr><td class="entryEditFormLabel">
- <label for="categoryId"><fmt:message key="weblogEdit.category"
/></label>
- </td><td>
- <html:select property="categoryId" size="1" tabindex="4">
- <html:optionsCollection name="model" property="categories" value="id"
label="path" />
- </html:select>
- </td></tr>
-
- <tr>
- <td class="entryEditFormLabel">
- <label for="link"><fmt:message key="weblogEdit.pubTime" /></label>
- </td>
- <td>
- <div>
- <html:select property="hours">
- <html:options name="model" property="hoursList" />
- </html:select>
- :
- <html:select property="minutes" >
- <html:options name="model" property="minutesList" />
- </html:select>
- :
- <html:select property="seconds">
- <html:options name="model" property="secondsList" />
- </html:select>
-
- <roller:Date property="dateString" dateFormat='<%=
model.getShortDateFormat() %>' />
- <c:out value="${model.weblogEntry.website.timeZone}" />
- </div>
- </td></tr>
-
- <c:if test="${!empty weblogEntryFormEx.id}">
- <tr><td class="entryEditFormLabel">
- <label for="categoryId">
- <fmt:message key="weblogEdit.permaLink" />
- </label>
- </td><td>
- <a href='<c:out value="${model.permaLink}" />'>
- <c:out value="${model.permaLink}" />
- </a>
- </td></tr>
- </c:if>
-
- </table>
-
-
- <%-- ==================================================================
--%>
- <%-- More other settings --%>
-
- <%-- comment settings --%>
+
+ <%-- ================================================================== --%>
+ <%-- comment settings --%>
- <br />
<div id="commentControlToggle" class="controlToggle">
<span id="icommentControl">+</span>
<a class="controlToggle"
onclick="javascript:toggleControl('commentControlToggle','commentControl')">
Modified: incubator/roller/branches/roller-newbackend/web/weblog/editor-rte.jsp
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/editor-rte.jsp?rev=395306&r1=395305&r2=395306&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/web/weblog/editor-rte.jsp
(original)
+++ incubator/roller/branches/roller-newbackend/web/weblog/editor-rte.jsp Wed
Apr 19 09:33:36 2006
@@ -16,7 +16,7 @@
document.weblogEntryFormEx.submit();
}
// Usage: initRTE(imagesPath, includesPath, cssFile, genXHTML)
- initRTE("images/", "<%= request.getContextPath() %>/editor/", false, true);
+ initRTE("images/", "<%= request.getContextPath() %>/editor/", '', false);
//-->
</script>
<noscript><p><b>Javascript must be enabled to use this form.</b></p></noscript>
