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/12 22:06:55 UTC
svn commit: r232367 [2/2] - in /incubator/roller/branches/roller_2.0:
nbproject/ src/org/roller/presentation/
src/org/roller/presentation/website/actions/ web/ web/WEB-INF/
web/WEB-INF/classes/ web/bookmarks/ web/theme/ web/theme/images/
web/theme/scri...
Added: incubator/roller/branches/roller_2.0/web/theme/tiles-head.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-head.jsp?rev=232367&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-head.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-head.jsp Fri Aug 12 13:06:04 2005
@@ -0,0 +1,18 @@
+<%@ include file="/taglibs.jsp" %>
+
+<script type="text/javascript"
+ src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
+<link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/roller.css" />
+<link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/menu.css" />
+<link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/calendar.css" />
+<script type="text/javascript"
+ src="<%= request.getContextPath() %>/tags/calendar.js"></script>
+<script type="text/javascript"
+ src="<%= request.getContextPath() %>/theme/scripts/overlib.js"
+ ><!-- overLIB (c) Erik Bosrup --></script>
+
+
+
Added: incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp?rev=232367&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp Fri Aug 12 13:06:04 2005
@@ -0,0 +1,46 @@
+<% response.setContentType("text/html; charset=UTF-8"); %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ include file="/taglibs.jsp" %><html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title><%= RollerRuntimeConfig.getProperty("site.name") %></title>
+ <%-- this is included so cached pages can still set contentType --%>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <tiles:insert attribute="head" />
+ <link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/layout.css" />
+<style type="text/css">
+#banner {
+ height: 30px;
+}
+#centercontent {
+ margin:0px 330px 50px 10px;
+ padding:10px;
+}
+#rightcontent {
+ position:absolute;
+ top:50px;
+ right:20px;
+ width:300px;
+ padding:15px;
+ line-height:17px;
+}
+</style>
+</head>
+<body>
+<div id="wrapper">
+ <div id="banner">
+ <tiles:insert attribute="status" /><br />
+ </div>
+ <div id="leftcontent">
+ </div>
+ <div id="centercontent">
+ <tiles:insert attribute="content" />
+ </div>
+ <div id="rightcontent">
+ <tiles:insert attribute="sidebar" />
+ </div>
+ <div id="footer">
+ <tiles:insert attribute="footer" />
+ </div>
+</div>
+</body>
+</html>
Added: incubator/roller/branches/roller_2.0/web/theme/tiles-sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-sidebar.jsp?rev=232367&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-sidebar.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-sidebar.jsp Fri Aug 12 13:06:04 2005
@@ -0,0 +1,5 @@
+
+<%-- default is no sidebar --%>
+
+
+
Added: incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp?rev=232367&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp Fri Aug 12 13:06:04 2005
@@ -0,0 +1,61 @@
+<% response.setContentType("text/html; charset=UTF-8"); %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ include file="/taglibs.jsp" %><html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title><%= RollerRuntimeConfig.getProperty("site.name") %></title>
+ <%-- this is included so cached pages can still set contentType --%>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <tiles:insert attribute="head" />
+ <link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/layout.css" />
+<style type="text/css">
+#banner {
+ height: 30px;
+}
+#centercontent {
+ margin:0px 0px 50px 10px;
+ padding:10px;
+}
+.formtable { width:100%; }
+.formtable td {
+ vertical-align: top;
+ border-style: solid;
+ border-width: 0px 0px 1px 0px;
+ border-color: #e5e5e5;
+ padding: 10px;
+}
+.formtable td.label {
+ text-align: right;
+ width: 15%;
+}
+.formtable td.field {
+ width: 30%;
+}
+.formtable td.description {
+ width: 55%;
+}
+</style>
+</head>
+<body>
+<div id="wrapper">
+
+ <div id="banner">
+ <tiles:insert attribute="status" /><br />
+ </div>
+
+ <div id="leftcontent">
+ </div>
+
+ <div id="centercontent">
+ <tiles:insert attribute="messages" />
+ <tiles:insert attribute="content" />
+ </div>
+
+ <div id="rightcontent">
+ </div>
+
+ <div id="footer">
+ <tiles:insert attribute="footer" />
+ </div>
+</div>
+</body>
+</html>
Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp Fri Aug 12 13:06:04 2005
@@ -1,28 +1,28 @@
<%@ include file="/taglibs.jsp" %>
-<%@ include file="/theme/status.jsp" %>
-
-<table class="sidebarBox" >
- <tr>
- <td class="sidebarBox">
- <div class="menu-tr"><div class="menu-tl">
- <fmt:message key="mainPage.actions" />
- </div></div>
- </td>
- </tr>
- <tr>
- <td>
- <p>
+<div class="sidebarfade">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <div class="sidebarBody">
+
+ <h3><fmt:message key="mainPage.actions" /></h3>
+ <hr />
+
<%-- Add Category link --%>
- <img src='<c:url value="/images/FolderNew16.png"/>' border="0"alt="icon" />
+ <p>
+ <img src='<c:url value="/images/FolderNew16.png"/>' border="0"alt="icon" />
<roller:link page="/editor/categoryEdit.do">
<roller:linkparam id="<%= RollerRequest.PARENTID_KEY %>"
name="category" property="id" />
<fmt:message key="categoriesForm.addCategory" />
</roller:link>
</p>
- </td>
- </tr>
-</table>
-
-<br />
+
+ <br />
+ <br />
+ <br />
+
+ </div>
+ </div>
+ </div>
+</div>
Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp Fri Aug 12 13:06:04 2005
@@ -60,7 +60,14 @@
-->
</script>
-<h1><fmt:message key="weblogEdit.pageTitle" /></h1>
+<c:choose>
+ <c:when test="${empty weblogEntryFormEx.id}">
+ <h1><fmt:message key="weblogEdit.title.newEntry" /></h1>
+ </c:when>
+ <c:otherwise>
+ <h1><fmt:message key="weblogEdit.title.editEntry" /></h1>
+ </c:otherwise>
+</c:choose>
<html:form action="/editor/weblog" method="post" focus="title">
@@ -70,6 +77,7 @@
<html:hidden property="anchor"/>
<html:hidden property="updateTime"/>
<html:hidden property="status"/>
+ <html:hidden property="link"/>
<html:hidden name="method" property="method" value="save"/>
<%-- ================================================================== --%>
@@ -84,20 +92,37 @@
</div>
<div class="row">
- <label style="width:10%; float:left;" for="link"><fmt:message key="weblogEdit.link" /></label>
- <c:if test="${model.editMode && !empty model.comments}" >
- <a href="#comments" style="float:right"><fmt:message key="weblogEdit.comments" /></a>
- </c:if>
- <html:text property="link" size="70" maxlength="255" tabindex="2" />
- </div>
-
- <div class="row">
<label style="width:10%; float:left;" for="categoryId"><fmt:message key="weblogEdit.category" /></label>
<html:select property="categoryId" size="1" tabindex="4">
<html:optionsCollection name="model" property="categories" value="id" label="path" />
</html:select>
</div>
+ <br />
+
+ <div class="row">
+ <label style="width:10%; float:left;" for="link"><fmt:message key="weblogEdit.pubTime" /></label>
+ <c:if test="${model.editMode && !empty model.comments}" >
+ <a href="#comments" style="float:right"><fmt:message key="weblogEdit.comments" /></a>
+ </c:if>
+ <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>
+ </div>
+
<c:if test="${!empty weblogEntryFormEx.id}">
<div class="row">
<label style="width:10%; float:left;" for="categoryId">
@@ -144,6 +169,8 @@
</c:if>
</div>
+
+
<%-- ================================================================== --%>
<%-- Weblog edit, preview, or spell check area --%>
@@ -181,118 +208,10 @@
</div>
</c:if>
- <%-- ================================================================== --%>
- <%-- the button box --%>
-
- <br />
- <br />
- <div class="control">
-
- <%-- save draft and post buttons: only in edit and preview mode --%>
- <c:if test="${model.editMode || model.previewMode}" >
-
- <c:choose>
-
- <c:when test="${model.rollerSession.userAuthorizedToAuthor}" >
- <input type="button" name="post"
- value='<fmt:message key="weblogEdit.post" />'
- onclick="publish()" />
- <input type="button" name="draft"
- value='<fmt:message key="weblogEdit.save" />'
- onclick="saveDraft()" />
- <c:if test="${!empty weblogEntryFormEx.id}">
- <input type="button" name="draft"
- value='<fmt:message key="weblogEdit.deleteEntry" />'
- onclick="deleteWeblogEntry()" />
- </c:if>
- </c:when>
-
- <c:when test="${model.rollerSession.userAuthorized}" >
- <c:if test="${weblogEntryFormEx.status == 'DRAFT'}">
- <input type="button" name="post"
- value='<fmt:message key="weblogEdit.submitForReview" />'
- onclick="publish()" />
- <input type="button" name="draft"
- value='<fmt:message key="weblogEdit.save" />'
- onclick="saveDraft()" />
- <%-- only show delete button for saved entries --%>
- <c:if test="${!empty weblogEntryFormEx.id}">
- <input type="button" name="draft"
- value='<fmt:message key="weblogEdit.deleteEntry" />'
- onclick="deleteWeblogEntry()" />
- </c:if>
- </c:if>
- </c:when>
-
- </c:choose>
-
- </c:if>
-
- <%-- edit mode buttons --%>
- <c:if test="${model.editMode}" >
-
- <input type="button" name="preview"
- value='<fmt:message key="weblogEdit.previewMode" />'
- onclick="previewMode()" />
-
- <input type="button" name="spelling"
- value='<fmt:message key="weblogEdit.check" />'
- onclick="spellCheck()" />
-
- </c:if>
-
- <%-- preview mode buttons --%>
- <c:if test="${model.previewMode}" >
- <input type="button" name="edit" value='<fmt:message key="weblogEdit.returnToEditMode" />'
- onclick="returnToEditMode()" />
- </c:if>
-
- <%-- spell mode buttons --%>
- <c:if test="${model.spellMode}" >
-
- <input type="button" name="correctSpelling"
- value='<fmt:message key="weblogEdit.correctSpelling" />'
- onclick="submitSpellingCorrections()" />
-
- <input type="button" name="cancelSpelling"
- value='<fmt:message key="weblogEdit.cancelSpelling" />'
- onclick="returnToEditMode()" />
-
- </c:if>
- </div>
- <br />
- <%-- ================================================================== --%>
- <%-- publish time --%>
-
- <div id="dateControlToggle" class="controlToggle">
- <span id="idateControl">+</span>
- <a class="controlToggle" onclick="javascript:toggleControl('dateControlToggle','dateControl')">
- <fmt:message key="weblogEdit.pubTime" />
- </a>
- </div>
- <div id="dateControl" class="control" style="display:none">
- <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>
- <script type="text/javascript">
- <!--
- toggleControl('dateControlToggle','dateControl');
- -->
- </script>
-
+
+ <h2><fmt:message key="weblogEdit.otherSettings" /></h2>
+
<%-- ================================================================== --%>
<%-- comment settings --%>
@@ -302,7 +221,7 @@
<fmt:message key="weblogEdit.commentSettings" />
</a>
</div>
- <div id="commentControl" class="control" style="display:none">
+ <div id="commentControl" class="miscControl" style="display:none">
<html:checkbox property="allowComments" onchange="onAllowCommentsChange()" />
<fmt:message key="weblogEdit.allowComments" />
<fmt:message key="weblogEdit.commentDays" />
@@ -332,7 +251,7 @@
<a class="controlToggle" onclick="javascript:toggleControl('pluginControlToggle','pluginControl')">
<fmt:message key="weblogEdit.pluginsToApply" /></a>
</div>
- <div id="pluginControl" class="control" style="display:none">
+ <div id="pluginControl" class="miscControl" style="display:none">
<logic:iterate id="plugin" type="org.roller.presentation.velocity.PagePlugin"
collection="<%= org.roller.presentation.velocity.ContextLoader.getPagePlugins() %>">
<html:multibox property="pluginsArray"
@@ -354,7 +273,7 @@
<a class="controlToggle" onclick="javascript:toggleControl('miscControlToggle','miscControl')">
<fmt:message key="weblogEdit.miscSettings" /></a>
</div>
- <div id="miscControl" class="control" style="display:none">
+ <div id="miscControl" class="miscControl" style="display:none">
<html:checkbox property="rightToLeft" />
<fmt:message key="weblogEdit.rightToLeft" />
@@ -379,7 +298,7 @@
<a class="controlToggle" onclick="javascript:toggleControl('mediaCastControlToggle','mediaCastControl')">
MediaCast Settings</a>
</div>
- <div id="mediaCastControl" class="control" style="display:none">
+ <div id="mediaCastControl" class="miscControl" style="display:none">
<%
WeblogEntryFormEx form = model.getWeblogEntryForm();
String att_url = (String)form.getAttributes().get("att_mediacast_url");
@@ -398,6 +317,89 @@
<% } %>
</div>
+
+
+ <%-- ================================================================== --%>
+ <%-- the button box --%>
+
+ <br />
+ <div class="control">
+
+ <%-- save draft and post buttons: only in edit and preview mode --%>
+ <c:if test="${model.editMode || model.previewMode}" >
+
+ <c:choose>
+
+ <c:when test="${model.rollerSession.userAuthorizedToAuthor}" >
+ <input type="button" name="post"
+ value='<fmt:message key="weblogEdit.post" />'
+ onclick="publish()" />
+ <input type="button" name="draft"
+ value='<fmt:message key="weblogEdit.save" />'
+ onclick="saveDraft()" />
+ <c:if test="${!empty weblogEntryFormEx.id}">
+ <input type="button" name="draft"
+ value='<fmt:message key="weblogEdit.deleteEntry" />'
+ onclick="deleteWeblogEntry()" />
+ </c:if>
+ </c:when>
+
+ <c:when test="${model.rollerSession.userAuthorized}" >
+ <c:if test="${weblogEntryFormEx.status == 'DRAFT'}">
+ <input type="button" name="post"
+ value='<fmt:message key="weblogEdit.submitForReview" />'
+ onclick="publish()" />
+ <input type="button" name="draft"
+ value='<fmt:message key="weblogEdit.save" />'
+ onclick="saveDraft()" />
+ <%-- only show delete button for saved entries --%>
+ <c:if test="${!empty weblogEntryFormEx.id}">
+ <input type="button" name="draft"
+ value='<fmt:message key="weblogEdit.deleteEntry" />'
+ onclick="deleteWeblogEntry()" />
+ </c:if>
+ </c:if>
+ </c:when>
+
+ </c:choose>
+
+ </c:if>
+
+ <%-- edit mode buttons --%>
+ <c:if test="${model.editMode}" >
+
+ <input type="button" name="preview"
+ value='<fmt:message key="weblogEdit.previewMode" />'
+ onclick="previewMode()" />
+
+ <input type="button" name="spelling"
+ value='<fmt:message key="weblogEdit.check" />'
+ onclick="spellCheck()" />
+
+ </c:if>
+
+ <%-- preview mode buttons --%>
+ <c:if test="${model.previewMode}" >
+ <input type="button" name="edit" value='<fmt:message key="weblogEdit.returnToEditMode" />'
+ onclick="returnToEditMode()" />
+ </c:if>
+
+ <%-- spell mode buttons --%>
+ <c:if test="${model.spellMode}" >
+
+ <input type="button" name="correctSpelling"
+ value='<fmt:message key="weblogEdit.correctSpelling" />'
+ onclick="submitSpellingCorrections()" />
+
+ <input type="button" name="cancelSpelling"
+ value='<fmt:message key="weblogEdit.cancelSpelling" />'
+ onclick="returnToEditMode()" />
+
+ </c:if>
+ </div>
+ <br />
+
+
<%-- ================================================================== --%>
<%-- Trackback control --%>
<c:if test="${!empty weblogEntryFormEx.id && model.rollerSession.userAuthorizedToAuthor}">
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=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp Fri Aug 12 13:06:04 2005
@@ -5,51 +5,48 @@
WeblogEntryPageModel model = (WeblogEntryPageModel)request.getAttribute("model");
%>
-<%@ include file="/theme/status.jsp" %>
-
-<table class="sidebarBox" >
- <tr>
- <td class="sidebarBox">
- <div class="menu-tr"><div class="menu-tl">
- <fmt:message key="weblogEdit.draftEntries" />
- </div></div>
- </td>
- </tr>
- <tr>
- <td>
- <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>
- </td>
- </tr>
-</table>
+<div class="sidebarfade">
+ <div class="menu-tr">
+ <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 />
+
+ </div>
+ </div>
+ </div>
+</div>
<br />
<c:if test="${model.rollerSession.userAuthorizedToAuthor}">
- <table class="sidebarBox">
- <tr>
- <td class="sidebarBox">
- <div class="menu-tr"><div class="menu-tl">
- <fmt:message key="weblogEdit.publishedEntries" />
- </div></div>
- </td>
- </tr>
- <tr>
- <td>
+
+<div class="sidebarfade">
+ <div class="menu-tr">
+ <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>
@@ -63,25 +60,25 @@
<str:truncateNicely lower="50">
<c:out value="${post.title}" />
</str:truncateNicely>
- </roller:link>
+ </roller:link>
<br />
</c:forEach>
- </td>
- </tr>
- </table>
-
- <br />
-
- <table class="sidebarBox">
- <tr>
- <td class="sidebarBox">
- <div class="menu-tr"><div class="menu-tl">
- <fmt:message key="weblogEdit.pendingEntries" />
- </div></div>
- </td>
- </tr>
- <tr>
- <td>
+ <br />
+
+ </div>
+ </div>
+ </div>
+</div>
+
+<br />
+
+<div class="sidebarfade">
+ <div class="menu-tr">
+ <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>
@@ -98,9 +95,13 @@
</roller:link>
<br />
</c:forEach>
- </td>
- </tr>
- </table>
+ <br />
+
+ </div>
+ </div>
+ </div>
+</div>
+
</c:if>
<br />
Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp Fri Aug 12 13:06:04 2005
@@ -5,85 +5,6 @@
%>
<h1><fmt:message key="weblogEntryQuery.title" /></h1>
-<roller:StatusMessage/>
-
-<p><fmt:message key="weblogEntryQuery.description" /></p>
-
-<html:form action="/editor/weblogQuery" method="post" focus="title">
-
- <%-- ========================================================= --%>
- <%-- filter by category --%>
-
- <div class="formrow">
- <label for="categoryId" class="formrow">
- <fmt:message key="weblogEntryQuery.label.category" /></label>
- <html:select property="categoryId" size="1" tabindex="4">
- <html:option key="weblogEntryQuery.label.any" value="" />
- <html:optionsCollection name="model" property="categories" value="id" label="path" />
- </html:select>
- </div>
-
- <%-- ========================================================= --%>
- <%-- filter by date --%>
-
- <div class="formrow">
- <label for="startDateString" class="formrow">
- <fmt:message key="weblogEntryQuery.label.startDate" />:
- </label>
- <roller:Date property="startDateString" dateFormat='<%= model.getShortDateFormat() %>' />
- </div>
-
- <div class="formrow">
- <label for="endDateString" class="formrow">
- <fmt:message key="weblogEntryQuery.label.endDate" />:
- </label>
- <roller:Date property="endDateString" dateFormat='<%= model.getShortDateFormat() %>' />
- </div>
-
- <%-- ========================================================= --%>
- <%-- filter by status --%>
-
- <div class="formrow">
- <label for="status" class="formrow">
- <fmt:message key="weblogEntryQuery.label.status" />:
- </label>
- <html:radio property="status" value="ALL">
- <fmt:message key="weblogEntryQuery.label.allEntries" /></html:radio>
- <html:radio property="status" value="DRAFT">
- <fmt:message key="weblogEntryQuery.label.draftOnly" /></html:radio>
- <html:radio property="status" value="PUBLISHED" >
- <fmt:message key="weblogEntryQuery.label.publishedOnly" /></html:radio>
- </div>
-
- <%-- ========================================================= --%>
- <%-- limit number of results --%>
-
- <div class="formrow">
- <label for="maxEntries" class="formrow">
- <fmt:message key="weblogEntryQuery.label.maxEntries" />
- </label>
- <html:select property="maxEntries" size="1" tabindex="4">
- <html:option value="25" />
- <html:option value="50" />
- <html:option value="75" />
- <html:option value="100" />
- </html:select>
- </div>
-
- <%-- ========================================================= --%>
- <%-- search button --%>
-
- <br />
- <div class="control">
- <input type="button" name="post"
- value='<fmt:message key="weblogEntryQuery.button.query" />' onclick="submit()"></input>
- </div>
- <br />
- <html:hidden name="method" property="method" value="query"/>
-
-</html:form>
-
-<h1><fmt:message key="weblogEntryQuery.section.searchResults" /></h1>
<table class="rollertable">
@@ -120,6 +41,15 @@
</td>
<tr>
</c:forEach>
+
+ <c:if test="${empty model.recentWeblogEntries}" >
+ <tr>
+ <td height="400px">
+ <fmt:message key="weblogEntryQuery.noneFound" />
+ </td>
+ </tr>
+ </c:if>
+
</table>
<%@ include file="/theme/footer.jsp" %>
Added: 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=232367&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp Fri Aug 12 13:06:04 2005
@@ -0,0 +1,107 @@
+<%@ include file="/taglibs.jsp" %>
+
+<%@ page import="org.roller.presentation.weblog.actions.WeblogQueryPageModel" %>
+<%
+WeblogQueryPageModel model = (WeblogQueryPageModel)request.getAttribute("model");
+%>
+
+<div class="sidebarfade">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <div class="sidebarBody">
+
+<h3><fmt:message key="weblogEntryQuery.sidebarTitle" /></h3>
+<hr />
+
+<p><fmt:message key="weblogEntryQuery.sidebarDescription" /></p>
+
+<html:form action="/editor/weblogQuery" method="post" focus="title">
+
+ <%-- ========================================================= --%>
+ <%-- filter by category --%>
+
+ <div class="sideformrow">
+ <label for="categoryId" class="formrow">
+ <fmt:message key="weblogEntryQuery.label.category" /></label>
+ <html:select property="categoryId" size="1" tabindex="4">
+ <html:option key="weblogEntryQuery.label.any" value="" />
+ <html:optionsCollection name="model" property="categories" value="id" label="path" />
+ </html:select>
+ </div>
+
+ <%-- ========================================================= --%>
+ <%-- filter by date --%>
+
+ <div class="sideformrow">
+ <label for="startDateString" class="formrow">
+ <fmt:message key="weblogEntryQuery.label.startDate" />:
+ </label>
+ <roller:Date property="startDateString" dateFormat='<%= model.getShortDateFormat() %>' />
+ </div>
+
+ <div class="sideformrow">
+ <label for="endDateString" class="formrow">
+ <fmt:message key="weblogEntryQuery.label.endDate" />:
+ </label>
+ <roller:Date property="endDateString" dateFormat='<%= model.getShortDateFormat() %>' />
+ </div>
+
+ <%-- ========================================================= --%>
+ <%-- limit number of results --%>
+
+ <div class="sideformrow">
+ <label for="maxEntries" class="formrow">
+ <fmt:message key="weblogEntryQuery.label.maxEntries" />
+ </label>
+ <html:select property="maxEntries" size="1" tabindex="4">
+ <html:option value="25" />
+ <html:option value="50" />
+ <html:option value="75" />
+ <html:option value="100" />
+ </html:select>
+ </div>
+
+ <%-- ========================================================= --%>
+ <%-- filter by status --%>
+
+ <div class="sideformrow">
+ <label for="status" class="formrow">
+ <fmt:message key="weblogEntryQuery.label.status" />:
+ <br />
+ <br />
+ <br />
+ <br />
+ </label>
+ <div>
+ <html:radio property="status" value="ALL">
+ <fmt:message key="weblogEntryQuery.label.allEntries" /></html:radio>
+ <br />
+ <html:radio property="status" value="DRAFT">
+ <fmt:message key="weblogEntryQuery.label.draftOnly" /></html:radio>
+ <br />
+ <html:radio property="status" value="PUBLISHED" >
+ <fmt:message key="weblogEntryQuery.label.publishedOnly" /></html:radio>
+ <br />
+ <html:radio property="status" value="PENDING" >
+ <fmt:message key="weblogEntryQuery.label.pendingOnly" /></html:radio>
+ </div>
+ </div>
+
+ <%-- ========================================================= --%>
+ <%-- search button --%>
+
+ <br />
+ <input type="button" name="post"
+ value='<fmt:message key="weblogEntryQuery.button.query" />'
+ onclick="submit()">
+ </input>
+ <html:hidden name="method" property="method" value="query"/>
+
+</html:form>
+
+ </div>
+ </div>
+ </div>
+</div>
+
+
Modified: incubator/roller/branches/roller_2.0/web/weblog/editor-text.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/editor-text.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/editor-text.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/editor-text.jsp Fri Aug 12 13:06:04 2005
@@ -22,7 +22,7 @@
-->
</script>
-<html:textarea property="text" cols="75" rows="20" style="width: 95%" tabindex="2"/>
+<html:textarea property="text" cols="75" rows="20" style="width: 100%" tabindex="2"/>
<script type="text/javascript">
<!--
@@ -32,7 +32,7 @@
-->
</script>
- <div style="float:right">
+ <table style="width:100%"><tr><td align="right">
<script type="text/javascript">
<!--
function changeSize(e,num) {
@@ -46,5 +46,5 @@
<!-- Add buttons to make this textarea taller or shorter -->
<input type="button" name="taller" value=" ↓ " onclick="changeSize(this,5)" />
<input type="button" name="shorter" value=" ↑ " onclick="changeSize(this,-5)" />
- </div>
+ </td></tr></table>
Modified: incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp Fri Aug 12 13:06:04 2005
@@ -5,71 +5,82 @@
<% String ctxPath = request.getContextPath(); %>
document.preview.src="<%= ctxPath %>/images/preview/sm-theme-" + theme + ".png";
}
+function cancel() {
+ document.createWebsiteForm.method.value="cancel";
+ document.createWebsiteForm.submit();
+}
-->
</script>
<h1><fmt:message key="createWebsite.title" /></h1>
+<p><fmt:message key="createWebsite.prompt" /></p>
<br />
<html:form action="/editor/createWebsite" method="post" focus="handle">
+<input type="hidden" name="method" ></input>
- <div class="formrow">
- <label for="name" class="formrow" />
- <fmt:message key="createWebsite.name" /></label>
- <html:text property="name" size="30" maxlength="30" />
- </div>
-
- <div class="formrow">
- <label for="description" class="formrow" />
- <fmt:message key="createWebsite.description" /></label>
- <html:text property="description" size="30" maxlength="30" />
- </div>
-
- <div class="formrow">
- <label for="handle" class="formrow" />
- <fmt:message key="createWebsite.handle" /></label>
- <html:text property="handle" size="30" maxlength="30" />
- </div>
-
- <div class="formrow">
- <label for="emailAddress" class="formrow" />
- <fmt:message key="createWebsite.emailAddress" /></label>
- <html:text property="emailAddress" size="30" maxlength="30" />
- </div>
-
- <div class="formrow">
- <label for="locale" class="formrow" />
- <fmt:message key="createWebsite.locale" /></label>
+<table class="formtable">
+
+<tr>
+ <td class="label"><label for="name" /><fmt:message key="createWebsite.name" /></label></td>
+ <td class="field"><html:text property="name" size="30" maxlength="30" /></td>
+ <td class="description"><fmt:message key="createWebsite.tip.name" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="description" /><fmt:message key="createWebsite.description" /></td>
+ <td class="field"><html:text property="description" size="30" maxlength="30" /></td>
+ <td class="description"><fmt:message key="createWebsite.tip.description" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="handle" /><fmt:message key="createWebsite.handle" /></label></td>
+ <td class="field"><html:text property="handle" size="30" maxlength="30" /></td>
+ <td class="description"><fmt:message key="createWebsite.tip.handle" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="emailAddress" /><fmt:message key="createWebsite.emailAddress" /></label></td>
+ <td class="field"><html:text property="emailAddress" size="30" maxlength="30" /></td>
+ <td class="description"><fmt:message key="createWebsite.tip.email" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="locale" /><fmt:message key="createWebsite.locale" /></label></td>
+ <td class="field">
<html:select property="locale" size="1" >
<html:options collection="locales" property="value" labelProperty="label"/>
- </html:select>
- </div>
-
- <div class="formrow">
- <label for="timeZone" class="formrow" />
- <fmt:message key="createWebsite.timeZone" /></label>
+ </html:select>
+ </td>
+ <td class="description"><fmt:message key="createWebsite.tip.locale" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="timeZone" /><fmt:message key="createWebsite.timeZone" /></label></td>
+ <td class="field">
<html:select property="timeZone" size="1" >
<html:options collection="timeZones" property="value" labelProperty="label"/>
</html:select>
- </div>
-
- <div class="formrow">
- <label for="theme" class="formrow" />
- <fmt:message key="createWebsite.theme" /></label>
+ </td>
+ <td class="description"><fmt:message key="createWebsite.tip.timezone" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="theme" /><fmt:message key="createWebsite.theme" /></label></td>
+ <td class="field">
<html:select property="theme" size="1" onchange="previewImage(this[selectedIndex].value)">
<html:options name="model" property="themes" />
</html:select>
- </div>
-
- <div class="formrow">
- <label for="preview" class="formrow" /> </label>
- <img name="preview"
- src="<%= request.getContextPath() %>/images/preview/sm-theme-basic.png" height="268" width="322" />
- </div>
+ <br />
+ <br />
+ <img name="preview" src="<%= request.getContextPath() %>/images/preview/sm-theme-basic.png" height="268" width="322" />
+ </td>
+ <td class="description"><fmt:message key="createWebsite.tip.theme" /></td>
+</tr>
+</table>
- <div class="control">
- <input type="submit" value='<fmt:message key="createWebsite.button.save" />'></input>
- </div>
+<input type="submit" value='<fmt:message key="createWebsite.button.save" />'></input>
+<input type="button" value='<fmt:message key="createWebsite.button.cancel" />' onclick="cancel()"></input>
</html:form>
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=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/UserNew.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/UserNew.jsp Fri Aug 12 13:06:04 2005
@@ -8,66 +8,83 @@
<% }
else
{ %>
-<script>
- function previewImage(theme)
- {
- document.preview.src="<%= ctxPath %>/images/preview/sm-theme-" + theme + ".png";
- }
+<script type="text/javascript">
+<!--
+function cancel() {
+ document.userFormEx.method.value="cancel";
+ document.userFormEx.submit();
+}
+-->
</script>
-<br />
<h1><fmt:message key="newUser.addNewUser" /></h1>
+<p><fmt:message key="userRegister.prompt" /></p>
-<br />
<html:form action="/user" method="post" focus="userName">
<html:hidden property="method" name="method" value="add"/></input>
<html:hidden property="id" /></input>
<html:hidden property="adminCreated" /></input>
+ <html:hidden property="enabled" /></input>
- <div class="formrow">
- <label for="fullName" class="formrow" /><fmt:message key="userSettings.fullname" /></label>
- <html:text property="fullName" size="30" maxlength="30" />
- </div>
-
- <div class="formrow">
- <label for="userName" class="formrow" /><fmt:message key="userSettings.username" /></label>
- <html:text property="userName" size="30" maxlength="30" />
- </div>
+<table class="formtable">
- <div class="formrow">
- <label for="password" class="formrow" /><fmt:message key="userSettings.password" /></label>
+<tr>
+ <td class="label"><label for="fullName" /><fmt:message key="userSettings.fullname" /></label></td>
+ <td class="field"><html:text property="fullName" size="30" maxlength="30" /></td>
+ <td class="description"><fmt:message key="userRegister.tip.fullName" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="userName" /><fmt:message key="userSettings.username" /></label></td>
+ <td class="field"><html:text property="userName" size="30" maxlength="30" /></td>
+ <td class="description"><fmt:message key="userRegister.tip.userName" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="passwordText" /><fmt:message key="userSettings.password" /></label></td>
+ <td class="field">
<html:password property="passwordText" size="20" maxlength="20" />
<html:hidden property="password" />
- </div>
-
- <div class="formrow">
- <label for="passwordConfirm" class="formrow" /><fmt:message key="userSettings.passwordConfirm" /></label>
- <html:password property="passwordConfirm" size="20" maxlength="20" />
- </div>
-
- <div class="formrow">
- <label for="" class="formrow" /><fmt:message key="userSettings.email" /></label>
- <html:text property="emailAddress" size="40" maxlength="40" />
- </div>
-
- <div class="formrow">
- <label for="locale" class="formrow" /><fmt:message key="userSettings.locale" /></label>
+ </td>
+ <td class="description"><fmt:message key="userRegister.tip.password" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="passwordConfirm" /><fmt:message key="userSettings.passwordConfirm" /></label></td>
+ <td class="field"><html:password property="passwordConfirm" size="20" maxlength="20" /></td>
+ <td class="description"><fmt:message key="userRegister.tip.passwordConfirm" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="emailAddress" /><fmt:message key="userSettings.email" /></label></td>
+ <td class="field"><html:text property="emailAddress" size="40" maxlength="40" /></td>
+ <td class="description"><fmt:message key="userRegister.tip.email" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="locale" /><fmt:message key="userSettings.locale" /></label></td>
+ <td class="field">
<html:select property="locale" size="1" >
<html:options collection="locales" property="value" labelProperty="label"/>
</html:select>
- </div>
-
- <div class="formrow">
- <label for="timeZone" class="formrow" /><fmt:message key="userSettings.timeZone" /></label>
+ </td>
+ <td class="description"><fmt:message key="userRegister.tip.locale" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="timeZone" /><fmt:message key="userSettings.timeZone" /></label></td>
+ <td class="field">
<html:select property="timeZone" size="1" >
<html:options collection="timeZones" property="value" labelProperty="label"/>
</html:select>
- </div>
- <br />
-
- <div class="control">
- <html:submit /></input>
- </div>
+ </td>
+ <td class="description"><fmt:message key="userRegister.tip.timeZone" /></td>
+</tr>
+
+</table>
+
+<input type="submit" value='<fmt:message key="userRegister.button.save" />'></input>
+<input type="button" value='<fmt:message key="userSettings.button.cancel" />' onclick="cancel()"></input>
</html:form>
Modified: incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp Fri Aug 12 13:06:04 2005
@@ -1,59 +1,82 @@
<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<script type="text/javascript">
+<!--
+function cancel() {
+ document.userFormEx.method.value="cancel";
+ document.userFormEx.submit();
+}
+-->
+</script>
<h1><fmt:message key="yourProfile.title" /></h1>
-
<p><fmt:message key="yourProfile.description" /></p>
-<br />
<html:form action="/editor/yourProfile" method="post" focus="fullName">
- <html:hidden property="method" value="save"/></input>
- <html:hidden property="id"/></input>
+ <input type="hidden" name="method" value="save"></input>
<html:hidden property="userName" /></input>
+ <html:hidden property="id" /></input>
+ <html:hidden property="password" /></input>
<html:hidden property="enabled" /></input>
+
+<table class="formtable">
+
+<tr>
+ <td class="label"><label for="fullName" /><fmt:message key="userSettings.fullname" /></label></td>
+ <td class="field"><html:text property="fullName" size="30" maxlength="30" /></td>
+ <td class="description"><fmt:message key="userRegister.tip.fullName" /></td>
+</tr>
+
+<c:if test="${cookieLogin != 'true'}">
+ <tr>
+ <td class="label"><label for="passwordText" /><fmt:message key="userSettings.password" /></label></td>
+ <td class="field">
+ <html:password property="passwordText" size="20" maxlength="20" />
+ </td>
+ <td class="description"><fmt:message key="userRegister.tip.password" /></td>
+ </tr>
+
+ <tr>
+ <td class="label"><label for="passwordConfirm" /><fmt:message key="userSettings.passwordConfirm" /></label></td>
+ <td class="field"><html:password property="passwordConfirm" size="20" maxlength="20" /></td>
+ <td class="description"><fmt:message key="userRegister.tip.passwordConfirm" /></td>
+ </tr>
+</c:if>
- <div class="formrow">
- <label for="fullName" class="formrow" /><fmt:message key="userSettings.fullname" /></label>
- <html:text property="fullName" size="30" maxlength="30" onchange="dirty()" />
- </div>
-
- <c:if test="${cookieLogin != 'true'}">
- <div class="formrow">
- <label for="password" class="formrow" /><fmt:message key="userSettings.password" /></label>
- <html:password property="passwordText" size="20" maxlength="20" onchange="dirty()"/>
- <html:hidden property="password" />
- </div>
- <div class="formrow">
- <label for="passwordConfirm" class="formrow" /><fmt:message key="userSettings.passwordConfirm" /></label>
- <html:password property="passwordConfirm" size="20" maxlength="20" onchange="dirty()"/>
- </div>
- </c:if>
-
- <div class="formrow">
- <label for="" class="formrow" /><fmt:message key="userSettings.email" /></label>
- <html:text property="emailAddress" size="40" maxlength="40" onchange="dirty()"/>
- </div>
-
- <div class="formrow">
- <label for="locale" class="formrow" /><fmt:message key="userSettings.locale" /></label>
- <html:select property="locale" size="1" onchange="dirty()">
- <html:options collection="locales" property="value" labelProperty="label"/>
+<tr>
+ <td class="label"><label for="emailAddress" /><fmt:message key="userSettings.email" /></label></td>
+ <td class="field"><html:text property="emailAddress" size="40" maxlength="40" /></td>
+ <td class="description"><fmt:message key="userRegister.tip.email" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="locale" /><fmt:message key="userSettings.locale" /></label></td>
+ <td class="field">
+ <html:select property="locale" size="1" >
+ <html:options collection="locales" property="value" labelProperty="label"/>
</html:select>
- </div>
-
- <div class="formrow">
- <label for="timeZone" class="formrow" /><fmt:message key="userSettings.timeZone" /></label>
- <html:select property="timeZone" size="1" onchange="dirty()">
+ </td>
+ <td class="description"><fmt:message key="userRegister.tip.locale" /></td>
+</tr>
+
+<tr>
+ <td class="label"><label for="timeZone" /><fmt:message key="userSettings.timeZone" /></label></td>
+ <td class="field">
+ <html:select property="timeZone" size="1" >
<html:options collection="timeZones" property="value" labelProperty="label"/>
</html:select>
- </div>
-
- <br />
- <div class="control">
- <input type="submit" value='<fmt:message key="yourProfile.button.save" />'></input>
- </div>
+ </td>
+ <td class="description"><fmt:message key="userRegister.tip.timeZone" /></td>
+</tr>
+</table>
+
+<br />
+<br />
+
+<input type="submit" value='<fmt:message key="userSettings.button.save" />'></input>
+<input type="button" value='<fmt:message key="userSettings.button.cancel" />' onclick="cancel()"></input>
+
</html:form>
-<%@ include file="/theme/footer.jsp" %>
Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Fri Aug 12 13:06:04 2005
@@ -3,8 +3,15 @@
<script type="text/javascript">
<!--
-function selectWebsite(id)
+function selectWebsiteAction(id, action)
{
+ document.yourWebsitesForm.method.value = action;
+ document.yourWebsitesForm.websiteId.value = id;
+ document.yourWebsitesForm.submit();
+}
+function manageWeblog(id)
+{
+ document.yourWebsitesForm.method.value = "newEntry";
document.yourWebsitesForm.websiteId.value = id;
document.yourWebsitesForm.submit();
}
@@ -33,7 +40,6 @@
</script>
<%-- Choose appropriate prompt at start of page --%>
-<br />
<c:choose>
<c:when test="${empty model.permissions && !model.groupBloggingEnabled}">
<p><fmt:message key="yourWebsites.noBlogs" />
@@ -67,91 +73,86 @@
</c:if>
<c:choose>
+
<c:when test="${!empty model.permissions}">
<h1><fmt:message key="yourWebsites.title" /></h1>
- <p><fmt:message key="yourWebsites.websiteTablesPrompt" /></p>
- <table class="rollertable">
- <tr class="rHeaderTr">
- <th class="rollertable" width="20%">
- <fmt:message key="yourWebsites.tableTitle" />
- </th>
- <th class="rollertable" width="20%">
- <fmt:message key="yourWebsites.tableDescription" />
- </th>
- <th class="rollertable" width="20%">
- <fmt:message key="yourWebsites.permissions" />
- </th>
- <th class="rollertable" width="20%">
- <fmt:message key="yourWebsites.resign" />
- </th>
- </tr>
+ <p><fmt:message key="yourWebsites.prompt" /></p>
+ <table cellspacing="6px" cellpadding="4px" width="100%" >
+
<c:forEach var="perms" items="${model.permissions}">
- <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
- <td class="rollertable">
- <a href='javascript:selectWebsite("<c:out value='${perms.website.id}'/>")'>
- <c:out value="${perms.website.name}" />
- </a>
- </td>
- <td class="rollertable">
- <c:out value="${perms.website.description}" />
- </td>
- <td class="rollertable" align="center">
- <c:if test="${perms.permissionMask == 0}" >LIMITED</c:if>
- <c:if test="${perms.permissionMask == 1}" >AUTHOR</c:if>
- <c:if test="${perms.permissionMask == 3}" >ADMIN</c:if>
- </td>
- <td class="rollertable" align="center">
- <c:choose>
- <c:when test="${perms.website.adminUserCount == 1 && perms.permissionMask == 3}">
- <fmt:message key="yourWebsites.notAllowed" />
- </c:when>
- <c:otherwise>
- <a href='javascript:resignWebsite("<c:out value='${perms.website.id}'/>","<c:out value="${perms.website.handle}" />")'>
- <img src="../images/Remove16.gif" alt="remove-icon" border="0" align="bottom"
- title="<fmt:message key='yourWebsites.resign' />" />
- </a>
- </c:otherwise>
- </c:choose>
+ <tr>
+ <td style="border: 1px solid grey" >
+
+ <table width="100%">
+ <tr>
+ <td width="80%">
+
+ <h3 style="border-bottom: 1px #e5e5e5 solid; margin:0px; padding:5px">
+ <fmt:message key='yourWebsites.weblog' />:
+ <c:out value="${perms.website.name}" />
+ [<c:out value="${perms.website.handle}" />]
+ </h3>
+
+ <div class="formrow">
+ <label class="formrow"><fmt:message key='yourWebsites.weblog' /> URL</b></label>
+ <a href='<c:out value="${model.baseURL}" />/page/<c:out value="${perms.website.handle}" />'>
+ <c:out value="${model.baseURL}" />/page/<c:out value="${perms.website.handle}" />
+ </a>
+ </div>
+
+ <div class="formrow">
+ <label class="formrow"><fmt:message key='yourWebsites.permission' /></label>
+ <c:if test="${perms.permissionMask == 0}" >LIMITED</c:if>
+ <c:if test="${perms.permissionMask == 1}" >AUTHOR</c:if>
+ <c:if test="${perms.permissionMask == 3}" >ADMIN</c:if>
+ </div>
+
+ <div class="formrow">
+ <label class="formrow"><fmt:message key='yourWebsites.description' /></label>
+ <c:out value="${perms.website.description}" />
+ </div>
+
+ </td>
+
+ <td width="20%" align="center">
+
+ <fmt:message key='yourWebsites.actions' />
+ <br />
+ <a href='javascript:selectWebsiteAction("<c:out value='${perms.website.id}'/>", "newEntry")'>
+ <fmt:message key="yourWebsites.newEntry" /></a>
+ <br />
+ <a href='javascript:selectWebsiteAction("<c:out value='${perms.website.id}'/>", "editEntries")'>
+ <fmt:message key="yourWebsites.editEntries" /></a>
+ <br />
+ <a href='javascript:selectWebsiteAction("<c:out value='${perms.website.id}'/>", "manageWeblog")'>
+ <fmt:message key="yourWebsites.manage" /></a>
+ <br />
+ <c:choose>
+ <c:when test="${perms.website.adminUserCount == 1 && perms.permissionMask == 3}">
+ <%-- <fmt:message key="yourWebsites.notAllowed" /> --%>
+ </c:when>
+ <c:otherwise>
+ <a href='javascript:resignWebsite("<c:out value='${perms.website.id}'/>","<c:out value="${perms.website.handle}" />")'>
+ <fmt:message key='yourWebsites.resign' />
+ </a>
+ </c:otherwise>
+ </c:choose>
+ </div>
+
+ </td>
+ </tr>
+ </table>
+
</td>
- </roller:row>
+ </tr>
</c:forEach>
- </table>
-
- <c:if test="${model.groupBloggingEnabled}">
- <p>
- <img src="../images/New16.gif" alt="new-icon" />
- <roller:link page="/editor/createWebsite.do">
- <fmt:message key="yourWebsites.createWebsite" />
- </roller:link>
- </p>
- </c:if> <%-- group blogging enabled --%>
-
- </c:when>
-
- <c:when test="${empty model.permissions}">
- <h1><fmt:message key="yourWebsites.title" /></h1>
- <p>
- <fmt:message key="yourWebsites.youHaveNone" />
- <roller:link page="/editor/createWebsite.do">
- <fmt:message key="yourWebsites.youCanCreateOne" />
- </roller:link>?
- </p>
+
+ </table>
+
</c:when>
-
+
</c:choose>
</html:form>
-<br />
-
-<c:if test="${model.groupBloggingEnabled && !empty model.permissions}">
- <div class="helptext">
- <img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
- <fmt:message key="createWebsite.whyCreateMore" />
- </div>
- <div class="helptext">
- <img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
- <fmt:message key="memberPermissions.permissionHelp" />
- </div>
-</c:if> <%-- group blogging enabled --%>
<%@ include file="/theme/footer.jsp" %>
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=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp Fri Aug 12 13:06:04 2005
@@ -1,26 +1,52 @@
<%@ include file="/taglibs.jsp" %>
-<table class="sidebarBox" >
- <tr>
- <td class="sidebarBox">
- <div class="menu-tr"><div class="menu-tl">
- <fmt:message key="mainPage.sidebarHelpTitle" />
- </div></div>
- </td>
- </tr>
- <tr>
- <td>
- <img src="../images/Help16.gif" alt="help-icon" align="bottom" />
- <c:choose>
- <c:when test="${model.groupBloggingEnabled}">
- <fmt:message key="yourWebsites.groupBloggingEnabled" />
- </c:when>
- <c:when test="${!model.groupBloggingEnabled}">
- <fmt:message key="yourWebsites.groupBloggingDisabled" />
- </c:when>
- </c:choose>
- </td>
- </tr>
-</table>
-
-<br />
+<div class="sidebarfade">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <div class="sidebarBody">
+
+ <h3><fmt:message key="yourWebsites.shortCuts" /></h3>
+ <hr />
+
+ <c:if test="${model.groupBloggingEnabled}">
+ <p>
+ <roller:link forward="createWebsite">
+ <fmt:message key="yourWebsites.createWeblog" />
+ </roller:link>
+ <br />
+ <fmt:message key="yourWebsites.createWeblog.desc" />
+ </p>
+ </c:if>
+
+ <p>
+ <roller:link forward="yourProfile">
+ <fmt:message key="yourWebsites.editProfile" />
+ </roller:link>
+ <br />
+ <fmt:message key="yourWebsites.editProfile.desc" />
+ </p>
+
+ <p>
+ <roller:link forward="rollerConfig">
+ <fmt:message key="yourWebsites.globalAdmin" />
+ </roller:link>
+ <br />
+ <fmt:message key="yourWebsites.globalAdmin.desc" />
+ </p>
+
+ <p>
+ <roller:link forward="planetConfig">
+ <fmt:message key="yourWebsites.planetAdmin" />
+ </roller:link>
+ <br />
+ <fmt:message key="yourWebsites.planetAdmin.desc" />
+ </p>
+
+ <br />
+ <br />
+ <br />
+
+ </div>
+ </div>
+ </div>
+</div>