You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/08/16 15:29:21 UTC
svn commit: r232994 - in /incubator/roller/branches/roller_2.0:
src/org/roller/presentation/weblog/actions/
src/org/roller/presentation/website/actions/ web/ web/WEB-INF/
web/WEB-INF/classes/ web/theme/ web/weblog/ web/website/
Author: snoopdave
Date: Tue Aug 16 06:28:57 2005
New Revision: 232994
URL: http://svn.apache.org/viewcvs?rev=232994&view=rev
Log:
More tweaks to 2.0 pages, look and feel, we're ready for some screenshots
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
incubator/roller/branches/roller_2.0/web/denied.jsp
incubator/roller/branches/roller_2.0/web/theme/menu.css
incubator/roller/branches/roller_2.0/web/theme/roller.css
incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp
incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp
incubator/roller/branches/roller_2.0/web/website/UserNew.jsp
incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java Tue Aug 16 06:28:57 2005
@@ -117,7 +117,8 @@
throws Exception
{
RollerRequest rreq = RollerRequest.getRollerRequest(req);
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr =
+ RollerFactory.getRoller().getPingTargetManager();
PingTargetForm pingTargetForm = (PingTargetForm) form;
try
{
@@ -132,8 +133,11 @@
String pingTargetId = pingTargetForm.getId();
if (pingTargetId != null && pingTargetId.length() > 0)
{
- pingTarget = pingTargetMgr.retrievePingTarget(pingTargetForm.getId());
- if (pingTarget == null) throw new RollerException("No such ping target id: " + pingTargetId);
+ pingTarget = pingTargetMgr.retrievePingTarget(
+ pingTargetForm.getId());
+ if (pingTarget == null)
+ throw new RollerException(
+ "No such ping target id: " + pingTargetId);
pingTargetForm.copyTo(pingTarget, req.getLocale());
}
else
@@ -149,9 +153,16 @@
return mapping.findForward(PING_TARGET_EDIT_PAGE);
}
- // Appears to be ok. Save it, commit and return refreshed view of target list.
+ // Appears to be ok.
+ // Save it, commit and return refreshed view of target list.
pingTarget.save();
RollerFactory.getRoller().commit();
+
+ ActionMessages msgs = new ActionMessages();
+ msgs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("pingTarget.saved"));
+ saveMessages(req, msgs);
+
return view(mapping, form, req, res);
}
catch (Exception e)
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java Tue Aug 16 06:28:57 2005
@@ -67,6 +67,6 @@
{
// This mimics the check in other admin actions, but not sure why the latter is not sufficient.
RollerSession rollerSession = RollerSession.getRollerSession(rreq.getRequest());
- return (rollerSession.isUserAuthorizedToAdmin() && rollerSession.isAdminUser());
+ return rollerSession.isAdminUser();
}
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java Tue Aug 16 06:28:57 2005
@@ -117,7 +117,7 @@
BasePageModel pageModel =
new BasePageModel(request, response, mapping);
request.setAttribute("model",pageModel);
- if ( rollerSession.isUserAuthorizedToAdmin() && rollerSession.isAdminUser() ) {
+ if (rollerSession.isAdminUser()) {
// just grab our properties map and put it in the request
Roller mRoller = RollerFactory.getRoller();
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties Tue Aug 16 06:28:57 2005
@@ -156,6 +156,11 @@
# ---------------------------------------------------------------- Configuration
configForm.title=Roller Configuration
+configForm.subtitle=Change site-wide configuration settings.
+configForm.prompt=Changes you make here apply to the entire site. Note that \
+these are <i>runtime</i> properties only. Please refer to the Roller documentation \
+for information on overriding Roller's <i>startup</i> properties (in the \
+roller.properties file).
configForm.siteSettings=Site Settings
configForm.siteName=Site Name (for main RSS feed)
@@ -644,9 +649,10 @@
# ---------------------------------------------------- Ping Target Admin/Editing
+commonPingTargets.subtitle=Manage common weblog ping targets for all weblogs.
commonPingTargets.commonPingTargets=Common Weblog Ping Targets
-commonPingTargets.explanation=These target sites are available to all users for \
-weblog update pings.
+commonPingTargets.explanation=These target sites are available to all weblogs \
+for weblog update pings.
customPingTargets.customPingTargets=Custom Weblog Ping Targets
customPingTargets.subtitle=Manage custom ping targets for weblog [<b>{0}</b>]
@@ -714,6 +720,7 @@
pingTarget.auto=Automatic
pingTarget.manual=Manual
pingTarget.sendPingNow=Send Ping Now
+pingTarget.saved=Ping target saved.
pingTarget.nameNotUnique=The name of this target conflicts with another one in \
the same set of targets.
@@ -1305,7 +1312,6 @@
# ---------------------------------------------------------------- Your Weblogs
yourWebsites.title=Manage Weblogs
-yourWebsites.shortCuts=Shortcuts
yourWebsites.actions=Actions
yourWebsites.title.welcomeNoBlog=Welcome to Roller
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm Tue Aug 16 06:28:57 2005
@@ -30,7 +30,7 @@
#foreach( $item in $currentMenu.getMenuItems() )
#if ($item.isPermitted($req))
#if ( $count > 0 )
- |
+ |
#end
#if ( $item.isSelected( $req ) )
<a class="menuItemSelected" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a>
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml Tue Aug 16 06:28:57 2005
@@ -181,10 +181,11 @@
<definition name=".CommonPingTargets" extends=".tiles-adminpage" >
<put name="content" value="/website/CommonPingTargets.jsp" />
</definition>
-<definition name=".CommonPingTargetDeleteOK" extends=".tiles-adminpage" >
+
+<definition name=".CommonPingTargetDeleteOK" extends=".tiles-simplepage" >
<put name="content" value="/website/CommonPingTargetDeleteOK.jsp" />
</definition>
-<definition name=".CommonPingTargetEdit" extends=".tiles-adminpage" >
+<definition name=".CommonPingTargetEdit" extends=".tiles-simplepage" >
<put name="content" value="/website/CommonPingTargetEdit.jsp" />
</definition>
Modified: incubator/roller/branches/roller_2.0/web/denied.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/denied.jsp?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/denied.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/denied.jsp Tue Aug 16 06:28:57 2005
@@ -1,12 +1,5 @@
-
-<% try { %>
- <roller:NavigationBar/>
-<% }
-catch (Exception e)
-{
- System.err.println("ERROR: while displaying error page error page");
- e.printStackTrace();
-} %>
+
+<%@ include file="/taglibs.jsp" %>
<%@ page import="java.io.*,org.roller.util.Utilities" isErrorPage="true" %>
Modified: incubator/roller/branches/roller_2.0/web/theme/menu.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/menu.css?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/menu.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/menu.css Tue Aug 16 06:28:57 2005
@@ -67,7 +67,7 @@
background-color: #c6ab74;
}
.menuItemSelected, .menuItemUnselected {
- padding: 0px 5px 0px 5px; /* TRBL */
+ padding: 0px 1px 0px 1px; /* TRBL */
}
Modified: incubator/roller/branches/roller_2.0/web/theme/roller.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/roller.css?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Tue Aug 16 06:28:57 2005
@@ -127,25 +127,6 @@
textarea {
margin: 3px 0px 0px 0px;
}
-div.row {
- padding: 2px;
-}
-div.formrow {
- float: left:
- width: 80%;
-}
-label.formrow {
- float: left;
- text-align: right;
- width: 20%;
- padding-right: 1em;
-}
-label.formrow {
- float: left;
- text-align: right;
- width: 15%;
- padding-right: 1em;
-}
div.buttonBox {
width: 98%;
border: 1px solid black;
@@ -162,6 +143,7 @@
font-size: small;
font-weight: bold;
}
+
.formtable, .formtableNoDesc {
width: 100%;
border-collapse: collapse;
@@ -193,6 +175,20 @@
}
.formtableNoDesc td.description {
width: 0%;
+}
+
+div.row {
+ padding: 2px;
+}
+div.formrow {
+ float: left:
+ width: 80%;
+}
+label.formrow {
+ float: left;
+ text-align: right;
+ width: 20%;
+ padding-right: 1em;
}
div.sideformrow {
float: left:
Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp Tue Aug 16 06:28:57 2005
@@ -10,26 +10,27 @@
<div class="menu-tl">
<div class="sidebarBody">
- <h3><fmt:message key="weblogEdit.pendingEntries" /></h3>
- <hr />
- <c:if test="${empty model.recentPendingEntries}">
- <fmt:message key="application.none" />
- </c:if>
- <c:forEach var="post" items="${model.recentPendingEntries}">
- <roller:link page="/editor/weblog.do">
- <roller:linkparam
- id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
- name="post" property="id" />
- <roller:linkparam id="method" value="edit" />
- <img src='<c:url value="/images/Edit16.png"/>' align="absmiddle" border="0" alt="icon" title="Edit" />
- <str:truncateNicely lower="50">
- <c:out value="${post.title}" />
- </str:truncateNicely>
- </roller:link>
- <br />
- </c:forEach>
- <br />
- <br />
+<h3><fmt:message key="weblogEdit.pendingEntries" /></h3>
+<hr />
+<c:if test="${empty model.recentPendingEntries}">
+ <fmt:message key="application.none" />
+</c:if>
+<c:forEach var="post" items="${model.recentPendingEntries}">
+ <roller:link page="/editor/weblog.do">
+ <roller:linkparam
+ id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
+ name="post" property="id" />
+ <roller:linkparam id="method" value="edit" />
+ <img src='<c:url value="/images/Edit16.png"/>'
+ align="absmiddle" border="0" alt="icon" title="Edit" />
+ <str:truncateNicely lower="50">
+ <c:out value="${post.title}" />
+ </str:truncateNicely>
+ </roller:link>
+ <br />
+</c:forEach>
+<br />
+<br />
</div>
</div>
@@ -43,27 +44,28 @@
<div class="menu-tl">
<div class="sidebarBody">
- <h3><fmt:message key="weblogEdit.draftEntries" /></h3>
- <hr />
-
- <c:if test="${empty model.recentDraftEntries}">
- <fmt:message key="application.none" />
- </c:if>
- <c:forEach var="post" items="${model.recentDraftEntries}">
- <roller:link page="/editor/weblog.do">
- <roller:linkparam
- id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
- name="post" property="id" />
- <roller:linkparam id="method" value="edit" />
- <img src='<c:url value="/images/Edit16.png"/>' align="absmiddle" border="0" alt="icon" title="Edit" />
- <str:truncateNicely lower="50">
- <c:out value="${post.title}" />
- </str:truncateNicely>
- </roller:link>
- <br />
- </c:forEach>
- <br />
- <br />
+<h3><fmt:message key="weblogEdit.draftEntries" /></h3>
+<hr />
+
+<c:if test="${empty model.recentDraftEntries}">
+ <fmt:message key="application.none" />
+</c:if>
+<c:forEach var="post" items="${model.recentDraftEntries}">
+ <roller:link page="/editor/weblog.do">
+ <roller:linkparam
+ id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
+ name="post" property="id" />
+ <roller:linkparam id="method" value="edit" />
+ <img src='<c:url value="/images/Edit16.png"/>'
+ align="absmiddle" border="0" alt="icon" title="Edit" />
+ <str:truncateNicely lower="50">
+ <c:out value="${post.title}" />
+ </str:truncateNicely>
+ </roller:link>
+ <br />
+</c:forEach>
+<br />
+<br />
</div>
</div>
@@ -79,26 +81,27 @@
<div class="menu-tl">
<div class="sidebarBody">
- <h3><fmt:message key="weblogEdit.publishedEntries" /></h3>
- <hr />
- <c:if test="${empty model.recentPublishedEntries}">
- <fmt:message key="application.none" />
- </c:if>
- <c:forEach var="post" items="${model.recentPublishedEntries}">
- <roller:link page="/editor/weblog.do">
- <roller:linkparam
- id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
- name="post" property="id" />
- <roller:linkparam id="method" value="edit" />
- <img src='<c:url value="/images/Edit16.png"/>' align="absmiddle" border="0" alt="icon" title="Edit" />
- <str:truncateNicely lower="50">
- <c:out value="${post.title}" />
- </str:truncateNicely>
- </roller:link>
- <br />
- </c:forEach>
- <br />
- <br />
+<h3><fmt:message key="weblogEdit.publishedEntries" /></h3>
+<hr />
+<c:if test="${empty model.recentPublishedEntries}">
+ <fmt:message key="application.none" />
+</c:if>
+<c:forEach var="post" items="${model.recentPublishedEntries}">
+ <roller:link page="/editor/weblog.do">
+ <roller:linkparam
+ id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
+ name="post" property="id" />
+ <roller:linkparam id="method" value="edit" />
+ <img src='<c:url value="/images/Edit16.png"/>'
+ align="absmiddle" border="0" alt="icon" title="Edit" />
+ <str:truncateNicely lower="50">
+ <c:out value="${post.title}" />
+ </str:truncateNicely>
+ </roller:link>
+ <br />
+</c:forEach>
+<br />
+<br />
</div>
</div>
Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp Tue Aug 16 06:28:57 2005
@@ -60,6 +60,7 @@
<html:option value="100" />
</html:select>
</div>
+ <br />
<%-- ========================================================= --%>
<%-- filter by status --%>
Modified: incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp Tue Aug 16 06:28:57 2005
@@ -4,9 +4,7 @@
<br />
<h1><fmt:message key="commonPingTargets.commonPingTargets" /></h1>
<p class="subtitle">
- <fmt:message key="commonPingTargets.subtitle" >
- <fmt:param value="${model.weblogEntry.website.handle}" />
- </fmt:message>
+ <fmt:message key="commonPingTargets.subtitle" />
</p>
<p/><fmt:message key="commonPingTargets.explanation"/><p/>
Modified: incubator/roller/branches/roller_2.0/web/website/UserNew.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/UserNew.jsp?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/UserNew.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/UserNew.jsp Tue Aug 16 06:28:57 2005
@@ -82,6 +82,7 @@
</tr>
</table>
+<br />
<input type="submit" value='<fmt:message key="userRegister.button.save" />'></input>
<input type="button" value='<fmt:message key="userSettings.button.cancel" />' onclick="cancel()"></input>
Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp Tue Aug 16 06:28:57 2005
@@ -5,7 +5,7 @@
<div class="menu-tl">
<div class="sidebarBody">
- <h3><fmt:message key="yourWebsites.shortCuts" /></h3>
+ <h3><fmt:message key="yourWebsites.actions" /></h3>
<hr />
<c:if test="${!empty model.permissions && model.groupBloggingEnabled}">
Modified: incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp?rev=232994&r1=232993&r2=232994&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp Tue Aug 16 06:28:57 2005
@@ -12,6 +12,9 @@
<roller:StatusMessage/>
<h1><fmt:message key="configForm.title" /></h1>
+<p class="subtitle"><fmt:message key="configForm.subtitle" /></a>
+<p><fmt:message key="configForm.prompt" /></a>
+
<form action="rollerConfig.do" method="post">
<input type="hidden" name="method" value="update">