Update of /cvsroot/roller/roller/web/weblog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1371/web/weblog
Modified Files:
WeblogEdit.jsp
Log Message:
Add "keepalive" back in.
Index: WeblogEdit.jsp
===================================================================
RCS file: /cvsroot/roller/roller/web/weblog/WeblogEdit.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** WeblogEdit.jsp 13 Apr 2004 02:08:03 -0000 1.5
--- WeblogEdit.jsp 15 Apr 2004 02:37:32 -0000 1.6
***************
*** 44,49 ****
<html:hidden property="anchor"/>
<html:hidden name="method" property="method" value="save"/>
!
! <%-- title, link, and category fields --%>
<div class="row">
<label style="width:10%; float:left;" for="title"><fmt:message
key="weblogEdit.title" /></label>
--- 44,49 ----
<html:hidden property="anchor"/>
<html:hidden name="method" property="method" value="save"/>
!
! <%-- title, link, and category fields --%>
<div class="row">
<label style="width:10%; float:left;" for="title"><fmt:message
key="weblogEdit.title" /></label>
***************
*** 51,76 ****
</div>
! <div class="row">
! <label style="width:10%; float:left;" for="link"><fmt:message
key="weblogEdit.link" /></label>
<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>
! <%-- EDIT MODE --%>
<c:if test="${model.editMode}">
! <div style="float:right">
! <script type="text/javascript">
<!--
! function changeSize(e,num) {
! e.form.text.rows = e.form.text.rows + num;
! var expires = new Date();
! expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 * 1000);
// sets it for approx 90 days.
setCookie("editorSize",e.form.text.rows,expires);
}
--- 51,76 ----
</div>
! <div class="row">
! <label style="width:10%; float:left;" for="link"><fmt:message
key="weblogEdit.link" /></label>
<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>
! <%-- EDIT MODE --%>
<c:if test="${model.editMode}">
! <div style="float:right">
! <script type="text/javascript">
<!--
! function changeSize(e,num) {
! e.form.text.rows = e.form.text.rows + num;
! var expires = new Date();
! expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 *
1000); // sets it for approx 90 days.
setCookie("editorSize",e.form.text.rows,expires);
}
***************
*** 80,312 ****
<input type="button" name="taller" value=" ↓ "
onclick="changeSize(this,5)" />
<input type="button" name="shorter" value=" ↑ "
onclick="changeSize(this,-5)" />
! </div>
! <%-- include edit page --%>
<div style="clear:both">
<jsp:include page="<%= model.getEditorPage() %>" />
</div>
!
! <script type="text/javascript">
<!--
if (getCookie("editorSize") != null) {
document.weblogEntryFormEx.text.rows =
getCookie("editorSize");
! }
-->
</script>
</c:if>
!
! <%-- PREVIEW MODE --%>
<c:if test="${model.previewMode}" >
<br />
<div class="centerTitle"><fmt:message key="weblogEdit.previewMode"
/></div>
<html:hidden property="text" />
! <script type="text/javascript">
! <!--
! function postWeblogEntry()
{document.weblogEntryFormEx.submit();}
! // -->
! </script>
! <div class="previewEntry">
! <roller:ApplyPlugins name="model" property="weblogEntry"
skipFlag="true" />
! </div>
! </c:if>
!
! <%-- SPELLCHECK MODE --%>
<c:if test="${model.spellMode}" >
<br />
<div class="centerTitle"><fmt:message key="weblogEdit.spellMode"
/></div>
<html:hidden property="text" />
! <script type="text/javascript">
! <!--
! function postWeblogEntry()
{document.weblogEntryFormEx.submit();}
! // -->
! </script>
! <div class="previewEntry">
<c:out value="${model.spellCheckHtml}" escapeXml="false" />
! </div>
</c:if>
!
! <%-- publish and update times --%>
! <div style="float:left">
<fmt:message key="weblogEdit.pubTime" /><br />
! <roller:Date property="dateString" dateFormat='<%=
model.getShortDateFormat() %>' />
!
! <div style="float:left; clear:both">
<label><fmt:message key="weblogEdit.updateTime" /></label><br />
! <c:if test="${!empty weblogEntryFormEx.updateTime}">
! <input readonly="readonly" value='<fmt:formatDate
value="${weblogEntryFormEx.updateTime}" type="both" dateStyle="short"
timeStyle="short" />'></input>
! </c:if>
! <c:if test="${empty weblogEntryFormEx.updateTime}">
! <input readonly="readonly" value='<fmt:message
key="weblogEdit.noUpdateTime" />'></input>
! </c:if>
! </div>
<div style="float:left; clear:both; padding-top:1em">
<label style="width:20%"><fmt:message key="weblogEdit.status"
/>:</label>
! <c:if test="${!empty weblogEntryFormEx.id}">
! <c:if test="${weblogEntryFormEx.publishEntry}">
! <span style="color:green;
font-weight:bold"><fmt:message key="weblogEdit.published" /></span>
! </c:if>
! <c:if test="${!weblogEntryFormEx.publishEntry}">
! <span style="color:orange;
font-weight:bold"><fmt:message key="weblogEdit.draft" /></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>
! <br />
! <br />
</div>
! </div>
! <div style="float:left; padding-right: 5px;">
<fmt:message key="weblogEdit.hours" /><br />
<html:select property="hours">
<html:options name="model" property="hoursList" />
</html:select>
! </div>
! <div style="float:left; padding-right: 5px;">
<fmt:message key="weblogEdit.minutes" /><br />
<html:select property="minutes" >
<html:options name="model" property="minutesList" />
</html:select>
! </div>
! <div style="float:left">
<fmt:message key="weblogEdit.seconds" /><br />
<html:select property="seconds">
<html:options name="model" property="secondsList" />
</html:select>
! </div>
! <%-- plugin chooser --%>
! <c:choose>
! <c:when test="${model.hasPagePlugins}">
! <div style="float:right">
! <fmt:message key="weblogEdit.formatEntryWith" /><br />
! <logic:iterate id="plugin"
! collection="<%=
org.roller.presentation.velocity.ContextLoader.getPagePlugins() %>">
! <html:multibox property="pluginsArray"
! title="<%= plugin.toString() %>" value="<%=
plugin.toString() %>"
! styleId="<%= plugin.toString() %>"/></input>
! <label for="<%= plugin %>"><%= plugin %></label><br
/>
! </logic:iterate>
! <br />
! <br />
! </div>
</c:when>
</c:choose>
! <div class="buttonBox">
!
! <%-- 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>
! <%-- save draft and post buttons: only in edit and preview mode
--%>
! <c:if test="${model.editMode || model.previewMode}" >
!
! <%-- if entry has been saved, then show delete button --%>
! <c:if test="${!empty weblogEntryFormEx.updateTime}">
! <input type="button" name="draft"
! value='<fmt:message key="weblogEdit.deleteEntry"
/>'
! onclick="deleteWeblogEntry()" />
! </c:if>
!
! <input type="button" name="draft"
! value='<fmt:message key="weblogEdit.save" />'
! onclick="postWeblogEntry()" />
! <input type="button" name="post"
! value='<fmt:message key="weblogEdit.post" />'
! onclick="postWeblogEntry(true)" />
! <fmt:message key="weblogEdit.ping" />
! <html:checkbox property="sendWeblogsPing" />
! </c:if>
!
! </div>
! <c:if test="${model.editMode && empty model.comments}" >
! <br />
! <br />
! <h2><fmt:message key="weblogEdit.comments" /></h2>
! <fmt:message key="weblogEdit.noComments" />
</c:if>
!
! <c:if test="${model.editMode && !empty model.comments}" >
! <br />
! <br />
! <h2><fmt:message key="weblogEdit.comments" /></h2>
! <table class="rollertable">
! <tr>
! <th class="rollertable"><fmt:message
key="weblogEdit.commentDelete" /></th>
! <th class="rollertable"><fmt:message
key="weblogEdit.commentSpam" /></th>
! <th class="rollertable"><fmt:message
key="weblogEdit.comment" /></th>
! <tr>
! <c:forEach var="comment" items="${model.comments}">
! <tr>
!
! <td class="rollertable_entry" >
! <html:multibox property="deleteComments">
! <c:out value="${comment.id}" />
! </html:multibox>
! </td>
!
! <td class="rollertable_entry" >
! <html:multibox property="spamComments">
! <c:out value="${comment.id}" />
! </html:multibox>
! </td>
!
! <td class="rollertable_entry" valign="top" >
! <span class="entryDetails">
! <fmt:message
key="weblogEdit.commenterName" />
! [<c:out value="${comment.name}" />] |
! <fmt:formatDate
value="${comment.postTime}" type="both"
! dateStyle="medium"
timeStyle="medium" /><br />
! <fmt:message
key="weblogEdit.commenterEmail" />:
! <c:out value="${comment.email}"
/><br />
! <fmt:message
key="weblogEdit.commenterUrl" />:
! <c:out value="${comment.url}" /><br
/>
! </span>
<br />
<c:out value="${comment.content}" />
! </td>
! </tr>
! </c:forEach>
! </table>
!
! <br />
! <input type="button" name="post"
value='<fmt:message key="weblogEdit.updateComments" />'
! onclick="updateComments(true)" />
! </c:if>
</html:form>
<%@ include file="/theme/footer.jsp" %>
--- 80,315 ----
<input type="button" name="taller" value=" ↓ "
onclick="changeSize(this,5)" />
<input type="button" name="shorter" value=" ↑ "
onclick="changeSize(this,-5)" />
! </div>
! <%-- include edit page --%>
<div style="clear:both">
<jsp:include page="<%= model.getEditorPage() %>" />
</div>
!
! <script type="text/javascript">
<!--
if (getCookie("editorSize") != null) {
document.weblogEntryFormEx.text.rows =
getCookie("editorSize");
! }
-->
</script>
</c:if>
!
! <%-- PREVIEW MODE --%>
<c:if test="${model.previewMode}" >
<br />
<div class="centerTitle"><fmt:message key="weblogEdit.previewMode"
/></div>
<html:hidden property="text" />
! <script type="text/javascript">
! <!--
! function postWeblogEntry() {document.weblogEntryFormEx.submit();}
! // -->
! </script>
! <div class="previewEntry">
! <roller:ApplyPlugins name="model" property="weblogEntry"
skipFlag="true" />
! </div>
! </c:if>
!
! <%-- SPELLCHECK MODE --%>
<c:if test="${model.spellMode}" >
<br />
<div class="centerTitle"><fmt:message key="weblogEdit.spellMode"
/></div>
<html:hidden property="text" />
! <script type="text/javascript">
! <!--
! function postWeblogEntry() {document.weblogEntryFormEx.submit();}
! // -->
! </script>
! <div class="previewEntry">
<c:out value="${model.spellCheckHtml}" escapeXml="false" />
! </div>
</c:if>
!
! <%-- publish and update times --%>
! <div style="float:left">
<fmt:message key="weblogEdit.pubTime" /><br />
! <roller:Date property="dateString" dateFormat='<%=
model.getShortDateFormat() %>' />
!
! <div style="float:left; clear:both">
<label><fmt:message key="weblogEdit.updateTime" /></label><br />
! <c:if test="${!empty weblogEntryFormEx.updateTime}">
! <input readonly="readonly" value='<fmt:formatDate
value="${weblogEntryFormEx.updateTime}" type="both" dateStyle="short"
timeStyle="short" />'></input>
! </c:if>
! <c:if test="${empty weblogEntryFormEx.updateTime}">
! <input readonly="readonly" value='<fmt:message
key="weblogEdit.noUpdateTime" />'></input>
! </c:if>
! </div>
<div style="float:left; clear:both; padding-top:1em">
<label style="width:20%"><fmt:message key="weblogEdit.status"
/>:</label>
! <c:if test="${!empty weblogEntryFormEx.id}">
! <c:if test="${weblogEntryFormEx.publishEntry}">
! <span style="color:green; font-weight:bold"><fmt:message
key="weblogEdit.published" /></span>
! </c:if>
! <c:if test="${!weblogEntryFormEx.publishEntry}">
! <span style="color:orange; font-weight:bold"><fmt:message
key="weblogEdit.draft" /></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>
! <br />
! <br />
</div>
! </div>
! <div style="float:left; padding-right: 5px;">
<fmt:message key="weblogEdit.hours" /><br />
<html:select property="hours">
<html:options name="model" property="hoursList" />
</html:select>
! </div>
! <div style="float:left; padding-right: 5px;">
<fmt:message key="weblogEdit.minutes" /><br />
<html:select property="minutes" >
<html:options name="model" property="minutesList" />
</html:select>
! </div>
! <div style="float:left">
<fmt:message key="weblogEdit.seconds" /><br />
<html:select property="seconds">
<html:options name="model" property="secondsList" />
</html:select>
! </div>
! <%-- plugin chooser --%>
! <c:choose>
! <c:when test="${model.hasPagePlugins}">
! <div style="float:right">
! <fmt:message key="weblogEdit.formatEntryWith" /><br />
! <logic:iterate id="plugin"
! collection="<%=
org.roller.presentation.velocity.ContextLoader.getPagePlugins() %>">
! <html:multibox property="pluginsArray"
! title="<%= plugin.toString() %>" value="<%=
plugin.toString() %>"
! styleId="<%= plugin.toString() %>"/></input>
! <label for="<%= plugin %>"><%= plugin %></label><br />
! </logic:iterate>
! <br />
! <br />
! </div>
</c:when>
</c:choose>
! <div class="buttonBox">
! <%-- 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>
!
! <%-- save draft and post buttons: only in edit and preview mode --%>
! <c:if test="${model.editMode || model.previewMode}" >
!
! <%-- if entry has been saved, then show delete button --%>
! <c:if test="${!empty weblogEntryFormEx.updateTime}">
! <input type="button" name="draft"
! value='<fmt:message key="weblogEdit.deleteEntry" />'
! onclick="deleteWeblogEntry()" />
! </c:if>
!
! <input type="button" name="draft"
! value='<fmt:message key="weblogEdit.save" />'
! onclick="postWeblogEntry()" />
! <input type="button" name="post"
! value='<fmt:message key="weblogEdit.post" />'
! onclick="postWeblogEntry(true)" />
! <fmt:message key="weblogEdit.ping" />
! <html:checkbox property="sendWeblogsPing" />
! </c:if>
!
! </div>
!
! <c:if test="${model.editMode && empty model.comments}" >
! <br />
! <br />
! <h2><fmt:message key="weblogEdit.comments" /></h2>
! <fmt:message key="weblogEdit.noComments" />
</c:if>
!
! <c:if test="${model.editMode && !empty model.comments}" >
! <br />
! <br />
! <h2><fmt:message key="weblogEdit.comments" /></h2>
! <table class="rollertable">
! <tr>
! <th class="rollertable"><fmt:message
key="weblogEdit.commentDelete" /></th>
! <th class="rollertable"><fmt:message
key="weblogEdit.commentSpam" /></th>
! <th class="rollertable"><fmt:message key="weblogEdit.comment"
/></th>
! <tr>
! <c:forEach var="comment" items="${model.comments}">
! <tr>
!
! <td class="rollertable_entry" >
! <html:multibox property="deleteComments">
! <c:out value="${comment.id}" />
! </html:multibox>
! </td>
!
! <td class="rollertable_entry" >
! <html:multibox property="spamComments">
! <c:out value="${comment.id}" />
! </html:multibox>
! </td>
!
! <td class="rollertable_entry" valign="top" >
! <span class="entryDetails">
! <fmt:message key="weblogEdit.commenterName" />
! [<c:out value="${comment.name}" />] |
! <fmt:formatDate value="${comment.postTime}"
type="both"
! dateStyle="medium" timeStyle="medium" /><br />
! <fmt:message key="weblogEdit.commenterEmail" />:
! <c:out value="${comment.email}" /><br />
! <fmt:message key="weblogEdit.commenterUrl" />:
! <c:out value="${comment.url}" /><br />
! </span>
<br />
<c:out value="${comment.content}" />
! </td>
! </tr>
! </c:forEach>
! </table>
!
! <br />
! <input type="button" name="post"
value='<fmt:message key="weblogEdit.updateComments" />'
! onclick="updateComments(true)" />
! </c:if>
</html:form>
+ <iframe id="keepalive" width="100%" height="25" style="border:0;"
+ src="<%= request.getContextPath() %>/keepalive.jsp" ></iframe>
+
<%@ include file="/theme/footer.jsp" %>
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
|
