You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2005/09/25 09:35:48 UTC
svn commit: r291384 - in /incubator/roller/branches/roller_2.0/web:
theme/bannerStatus.jsp theme/layout.css theme/roller.css
weblog/WeblogEdit.jsp weblog/WeblogEditSidebar.jsp website/YourWebsites.jsp
Author: agilliland
Date: Sun Sep 25 00:35:44 2005
New Revision: 291384
URL: http://svn.apache.org/viewcvs?rev=291384&view=rev
Log:
updated layouts for Entry Edit page and Main Menu page, along with slightly modified banner status layout. all with corresponding css tweaks.
Modified:
incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp
incubator/roller/branches/roller_2.0/web/theme/layout.css
incubator/roller/branches/roller_2.0/web/theme/roller.css
incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp
incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
Modified: incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp?rev=291384&r1=291383&r2=291384&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp Sun Sep 25 00:35:44 2005
@@ -6,11 +6,16 @@
UserData user = rollerSession.getAuthenticatedUser();
WebsiteData website = rreq.getWebsite();
String absURL = rctx.getAbsoluteContextUrl(request);
-boolean allowNewUsers = RollerConfig.getBooleanProperty("users.registration.enabled");
+boolean allowNewUsers = RollerRuntimeConfig.getBooleanProperty("users.registration.enabled");
+String customRegUrl = RollerRuntimeConfig.getProperty("users.registration.url");
+if(customRegUrl != null && customRegUrl.trim().equals(""))
+ customRegUrl = null;
%>
<div class="bannerStatusBox">
- <div class="bannerLeft">
+ <table class="bannerStatusBox" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="bannerLeft">
<% if (user != null) { %>
<fmt:message key="mainPage.loggedInAs" />
@@ -27,9 +32,9 @@
</c:if>
- </div>
+ </td>
- <div class="bannerRight">
+ <td class="bannerRight">
<roller:link forward="main">
<%= RollerRuntimeConfig.getProperty("site.shortName") %>
@@ -43,22 +48,27 @@
| <html:link forward="logout-redirect">
<fmt:message key="navigationBar.logout"/>
</html:link>
- <% } else if (allowNewUsers) { %>
- | <html:link forward="login-redirect">
- <fmt:message key="navigationBar.login"/>
- </html:link>
- | <html:link forward="registerUser">
- <fmt:message key="navigationBar.register"/>
- </html:link>
<% } else { %>
| <html:link forward="login-redirect">
<fmt:message key="navigationBar.login"/>
</html:link>
+
+ <% if(allowNewUsers) { %>
+ | <html:link forward="registerUser">
+ <fmt:message key="navigationBar.register"/>
+ </html:link>
+ <% } else if(customRegUrl != null) { %>
+ | <a href="<%= customRegUrl %>">
+ <fmt:message key="navigationBar.register"/>
+ </a>
+ <% } %>
+
<% } %>
- </div>
+ </td>
+ </tr>
+ </table>
</div>
-
Modified: incubator/roller/branches/roller_2.0/web/theme/layout.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/layout.css?rev=291384&r1=291383&r2=291384&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/layout.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/layout.css Sun Sep 25 00:35:44 2005
@@ -6,16 +6,13 @@
width: 100%;
}
#banner {
- height: 30px;
margin: 0px;
padding: 0px 0px 0px 0px;
}
.bannerBox {
- height: 78px;
width: 100%;
}
.bannerStatusBox {
- height: 21px;
width: 100%;
}
.sidebarBodyHead {
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=291384&r1=291383&r2=291384&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Sun Sep 25 00:35:44 2005
@@ -24,9 +24,8 @@
}
h1 {
background: transparent;
- font-size: 19px;
+ font-size: 20px;
font-weight: bold;
- letter-spacing: 0.2em;
}
h2 {
background: transparent;
@@ -75,21 +74,21 @@
font-weight: bold;
}
.bannerLeft {
- float: left;
- padding: 4px 15px 4px 15px;
+ padding: 4px 15px 4px 10px;
}
.bannerRight {
- float: right;
- padding: 4px 15px 4px 15px;
+ padding: 4px 10px 4px 15px;
+ text-align: right;
}
.bannerBox {
- height: 78px;
width: 100%;
- background:#f00;
+ background: #f00;
}
#footer {
- margin: 10px 0px 0px 0px;
- border-top: 1px grey solid;
+ margin: 25px 0px 20px 0px;
+ font-size: smaller;
+ text-align: center;
+ clear: both;
}
.sidebarBodyHead h3, .searchSidebarBody h3 {
padding: 5px;
@@ -207,7 +206,8 @@
width: 30%;
}
.formtable td.description {
- width: 50%;
+ width: 50%;
+ line-height: 140%;
}
.formtableNoDesc td.label {
text-align: right;
@@ -245,18 +245,8 @@
}
div.yourWeblogBox {
- width: 95%;
- padding: 5px 0px 5px 0px;
-}
-div.yourWeblogBox div.formrow {
- float: left:
- width: 80%;
-}
-div.yourWeblogBox label.formrow {
- float: left;
- text-align: left;
- width: 20%;
- padding-right: 1em;
+ padding: 8px 0px 10px 0px;
+ margin-right: 10px;
}
/* ----------------------------------------------------------------------
@@ -574,7 +564,34 @@
background-image: url(transparent-logo.png);
}
+/* main menu page */
+span.mm_weblog_name {
+ font-size: large;
+ font-weight: bold;
+}
+table.mm_table {
+ margin-top: 8px;
+}
+td.mm_table_actions {
+ padding-left: 4px;
+}
+td.mm_subtable_label {
+ width: 100px;
+ vertical-align: top;
+ font-weight: bold;
+}
+/* weblog entry form page */
-
+span.entryEditSidebarLink {
+ font-size: smaller;
+}
+.entryEditTable td {
+ padding: 0px 0px 8px 0px;
+}
+td.entryEditFormLabel {
+ padding-right: 15px;
+ padding-left: 2px;
+ font-weight: bold;
+}
\ No newline at end of file
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=291384&r1=291383&r2=291384&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp Sun Sep 25 00:35:44 2005
@@ -93,26 +93,28 @@
<%-- ================================================================== --%>
<%-- weblog entry fields: title, link, category, etc. --%>
- <div class="row">
- <label style="width:10%; float:left;" for="title"><fmt:message key="weblogEdit.title" /></label>
- <c:if test="${!empty weblogEntryFormEx.id}">
- <a href="#trackbacks" style="float:right"><fmt:message key="weblogEdit.trackbacks" /></a>
- </c:if>
- <html:text property="title" size="70" maxlength="255" tabindex="1" />
- </div>
-
- <div class="row">
- <label style="width:10%; float:left;" for="categoryId"><fmt:message key="weblogEdit.category" /></label>
+ <table class="entryEditTable" cellpadding="0" cellspacing="0">
+ <tr><td class="entryEditFormLabel">
+ <label for="title"><fmt:message key="weblogEdit.title" /></label>
+ </td><td>
+ <html:text property="title" size="50" maxlength="255" tabindex="1" />
+ </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>
- </div>
+ </td></tr>
- <div class="row">
- <label style="width:10%; float:left;" for="link"><fmt:message key="weblogEdit.pubTime" /></label>
+ <tr><td class="entryEditFormLabel">
+ <label 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>
+ </td><td>
<div>
<html:select property="hours">
<html:options name="model" property="hoursList" />
@@ -129,23 +131,25 @@
<roller:Date property="dateString" dateFormat='<%= model.getShortDateFormat() %>' />
<c:out value="${model.weblogEntry.website.timeZone}" />
</div>
- </div>
+ </td></tr>
<c:if test="${!empty weblogEntryFormEx.id}">
- <div class="row">
- <label style="width:10%; float:left;" for="categoryId">
+ <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>
- </div>
+ </td></tr>
</c:if>
- <div class="row">
- <label style="width:10%; float:left;" for="title">
+ <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">
@@ -175,9 +179,8 @@
<c:if test="${empty weblogEntryFormEx.id}">
<span style="color:red; font-weight:bold"><fmt:message key="weblogEdit.unsaved" /></span>
</c:if>
- </div>
-
-
+ </td></tr>
+ </table>
<%-- ================================================================== --%>
<%-- Weblog edit, preview, or spell check area --%>
@@ -188,7 +191,7 @@
<div style="width: 100%;"> <%-- need this div to control text-area size in IE 6 --%>
<%-- include edit page --%>
- <div style="clear:both">
+ <div >
<jsp:include page="<%= model.getEditorPage() %>" />
</div>
@@ -215,7 +218,6 @@
<c:out value="${model.spellCheckHtml}" escapeXml="false" />
</div>
</c:if>
-
<h2><fmt:message key="weblogEdit.otherSettings" /></h2>
@@ -330,7 +332,7 @@
<%-- ================================================================== --%>
<%-- the button box --%>
- <br />
+ <br></br>
<div class="control">
<%-- save draft and post buttons: only in edit and preview mode --%>
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=291384&r1=291383&r2=291384&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp Sun Sep 25 00:35:44 2005
@@ -17,7 +17,7 @@
<span><fmt:message key="application.none" /></span>
</c:if>
<c:forEach var="post" items="${model.recentPendingEntries}">
- <span><roller:link page="/editor/weblog.do">
+ <span class="entryEditSidebarLink"><roller:link page="/editor/weblog.do">
<roller:linkparam
id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
name="post" property="id" />
@@ -39,7 +39,7 @@
<span><fmt:message key="application.none" /></span>
</c:if>
<c:forEach var="post" items="${model.recentDraftEntries}">
- <span><roller:link page="/editor/weblog.do">
+ <span class="entryEditSidebarLink"><roller:link page="/editor/weblog.do">
<roller:linkparam
id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
name="post" property="id" />
@@ -63,7 +63,7 @@
<span><fmt:message key="application.none" /></span>
</c:if>
<c:forEach var="post" items="${model.recentPublishedEntries}">
- <span><roller:link page="/editor/weblog.do">
+ <span class="entryEditSidebarLink"><roller:link page="/editor/weblog.do">
<roller:linkparam
id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
name="post" property="id" />
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=291384&r1=291383&r2=291384&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Sun Sep 25 00:35:44 2005
@@ -1,42 +1,6 @@
<%@ include file="/taglibs.jsp" %>
<% pageContext.setAttribute("leftPage","/website/YourWebsitesSidebar.jsp"); %>
-<div class="prop"></div> <%-- force minimum height --%>
-
-<script type="text/javascript">
-<!--
-function acceptInvite(id)
-{
- document.yourWebsitesForm.method.value = "accept";
- document.yourWebsitesForm.inviteId.value = id;
- document.yourWebsitesForm.submit();
-}
-function declineInvite(id)
-{
- document.yourWebsitesForm.method.value = "decline";
- document.yourWebsitesForm.inviteId.value = id;
- document.yourWebsitesForm.submit();
-}
-function resignWebsite(id,handle)
-{
- if (confirm('<fmt:message key="yourWebsites.confirmResignation" /> [' + handle +"] ?"))
- {
- document.yourWebsitesForm.method.value = "resign";
- document.yourWebsitesForm.websiteId.value = id;
- document.yourWebsitesForm.submit();
- }
-}
--->
-</script>
-
-<html:form action="/editor/yourWebsites" method="post">
- <input type="hidden" name="inviteId" value="" />
- <input type="hidden" name="websiteId" value="" />
- <input type="hidden" name="method" value="select" />
-
-<%-- TITLE: Main Menu --%>
-<p class="subtitle"><fmt:message key="yourWebsites.subtitle" /></p>
-
<%-- Choose appropriate prompt at start of page --%>
<c:choose>
@@ -60,64 +24,67 @@
<fmt:message key="yourWebsites.youAreInvited" >
<fmt:param value="${invite.website.handle}" />
</fmt:message>
- <a href='javascript:acceptInvite("<c:out value='${invite.id}'/>")'>
+ <c:url value="/editor/yourWebsites.do" var="acceptInvite">
+ <c:param name="method" value="accept" />
+ <c:param name="inviteId" value="${invite.id}" />
+ </c:url>
+ <a href='<c:out value="${acceptInvite}" />'>
<fmt:message key="yourWebsites.accept" />
</a>
|
- <a href='javascript:declineInvite("<c:out value='${invite.id}'/>")'>
+ <c:url value="/editor/yourWebsites.do" var="declineInvite">
+ <c:param name="method" value="decline" />
+ <c:param name="inviteId" value="${invite.id}" />
+ </c:url>
+ <a href='<c:out value="${declineInvite}" />'>
<fmt:message key="yourWebsites.decline" />
</a><br />
</c:forEach>
<br />
</c:when>
+ <%-- PROMPT: default ... select a weblog to edit --%>
<c:otherwise>
- <p><fmt:message key="yourWebsites.prompt.hasBlog" /></p>
+ <p class="subtitle"><fmt:message key="yourWebsites.prompt.hasBlog" /></p>
</c:otherwise>
</c:choose>
-
+
+<%-- if we have weblogs, then loop through and list them --%>
<c:if test="${!empty model.permissions}">
- <br />
+
<c:forEach var="perms" items="${model.permissions}">
<div class="yourWeblogBox">
- <table width="100%">
+ <span class="mm_weblog_name"><img src='<c:url value="/images/Folder16.png"/>' /> <c:out value="${perms.website.name}" /></span>
+
+ <table class="mm_table" width="100%" cellpadding="0" cellspacing="0">
<tr>
- <td width="75%" style="padding: 0px 10px 0px 10px">
-
- <h3 style="border-bottom: 1px #e5e5e5 solid; margin:0px; padding:5px">
- <img src='<c:url value="/images/Folder16.png"/>' />
- <c:out value="${perms.website.name}" />
- [<c:out value="${perms.website.handle}" />]
- </h3>
+ <td valign="top">
- <table>
+ <table cellpadding="0" cellspacing="0">
<tr>
- <td width="30%"><b><fmt:message key='yourWebsites.weblog' /></b></td>
- <td width="80%"><a href='<c:out value="${model.baseURL}" />/page/<c:out value="${perms.website.handle}" />'>
- <c:out value="${perms.website.handle}" />
+ <td class="mm_subtable_label"><fmt:message key='yourWebsites.weblog' /></td>
+ <td><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></td>
</tr>
<tr>
- <td><b><fmt:message key='yourWebsites.permission' /></b></td>
+ <td class="mm_subtable_label"><fmt:message key='yourWebsites.permission' /></td>
<td><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>
</tr>
<tr>
- <td><b><fmt:message key='yourWebsites.description' /></b></td>
+ <td class="mm_subtable_label"><fmt:message key='yourWebsites.description' /></td>
<td><c:out value="${perms.website.description}" /></td>
</tr>
</table>
</td>
-
- <td class="actions" width="25%" align="left" style="padding: 4px">
-
- <fmt:message key='yourWebsites.actions' />
- <br />
+
+ <td class="mm_table_actions" width="20%" align="left" >
<c:url value="/editor/weblog.do" var="newEntry">
<c:param name="method" value="create" />
@@ -160,21 +127,14 @@
</a>
</c:if>
- </div>
-
</td>
</tr>
-
- </table>
-
+ </table>
+
</div>
-
+
</c:forEach>
</c:if>
-
-</html:form>
-
-<div class="clear"></div> <%-- force minimum height --%>