Modified: incubator/roller/branches/roller-newbackend/web/editor/richtext.js URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/editor/richtext.js?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/editor/richtext.js (original) +++ incubator/roller/branches/roller-newbackend/web/editor/richtext.js Tue Apr 18 11:08:54 2006 @@ -78,7 +78,7 @@ if (buttons == true) { document.writeln('<table class="rteBack" cellpadding=2 cellspacing=0 id="Buttons1_' + rte + '" width="' + tablewidth + '">'); document.writeln(' <tr>'); - document.writeln(' <td>'); + document.writeln(' <td>'); document.writeln(' <select id="formatblock_' + rte + '" onchange="selectFont(\'' + rte + '\', this.id);">'); document.writeln(' <option value="">[Style]</option>'); document.writeln(' <option value="<p>">Paragraph <p></option>'); @@ -119,58 +119,74 @@ document.writeln('</table>'); document.writeln('<table class="rteBack" cellpadding="0" cellspacing="0" id="Buttons2_' + rte + '" width="' + tablewidth + '">'); document.writeln(' <tr>'); - document.writeln(' <td><img id="bold" class="rteImage" src="' + imagesPath + 'bold.gif" width="25" height="24" alt="Bold" title="Bold" onClick="rteCommand(\'' + rte + '\', \'bold\', \'\')"></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'italic.gif" width="25" height="24" alt="Italic" title="Italic" onClick="rteCommand(\'' + rte + '\', \'italic\', \'\')"></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'underline.gif" width="25" height="24" alt="Underline" title="Underline" onClick="rteCommand(\'' + rte + '\', \'underline\', \'\')"></td>'); + +// ROLLER_MOD: changed icon images + + document.writeln(' <td><img id="bold" class="rteImage" src="' + imagesPath + 'bold.gif" width="16" height="16" alt="Bold" title="Bold" onClick="rteCommand(\'' + rte + '\', \'bold\', \'\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_italic.png" width="16" height="16" alt="Italic" title="Italic" onClick="rteCommand(\'' + rte + '\', \'italic\', \'\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_underline.png" width="16" height="16" alt="Underline" title="Underline" onClick="rteCommand(\'' + rte + '\', \'underline\', \'\')"></td>'); document.writeln(' <td><img class="rteVertSep" src="' + imagesPath + 'blackdot.gif" width="1" height="20" border="0" alt=""></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'left_just.gif" width="25" height="24" alt="Align Left" title="Align Left" onClick="rteCommand(\'' + rte + '\', \'justifyleft\', \'\')"></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'centre.gif" width="25" height="24" alt="Center" title="Center" onClick="rteCommand(\'' + rte + '\', \'justifycenter\', \'\')"></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'right_just.gif" width="25" height="24" alt="Align Right" title="Align Right" onClick="rteCommand(\'' + rte + '\', \'justifyright\', \'\')"></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'justifyfull.gif" width="25" height="24" alt="Justify Full" title="Justify Full" onclick="rteCommand(\'' + rte + '\', \'justifyfull\', \'\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_align_left.png" width="16" height="16" alt="Align Left" title="Align Left" onClick="rteCommand(\'' + rte + '\', \'justifyleft\', \'\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_align_center.png" width="16" height="16" alt="Center" title="Center" onClick="rteCommand(\'' + rte + '\', \'justifycenter\', \'\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_align_right.png" width="16" height="16" alt="Align Right" title="Align Right" onClick="rteCommand(\'' + rte + '\', \'justifyright\', \'\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_align_justify.png" width="16" height="16" alt="Justify Full" title="Justify Full" onclick="rteCommand(\'' + rte + '\', \'justifyfull\', \'\')"></td>'); document.writeln(' <td><img class="rteVertSep" src="' + imagesPath + 'blackdot.gif" width="1" height="20" border="0" alt=""></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'hr.gif" width="25" height="24" alt="Horizontal Rule" title="Horizontal Rule" onClick="rteCommand(\'' + rte + '\', \'inserthorizontalrule\', \'\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_horizontalrule.png" width="16" height="16" alt="Horizontal Rule" title="Horizontal Rule" onClick="rteCommand(\'' + rte + '\', \'inserthorizontalrule\', \'\')"></td>'); document.writeln(' <td><img class="rteVertSep" src="' + imagesPath + 'blackdot.gif" width="1" height="20" border="0" alt=""></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'numbered_list.gif" width="25" height="24" alt="Ordered List" title="Ordered List" onClick="rteCommand(\'' + rte + '\', \'insertorderedlist\', \'\')"></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'list.gif" width="25" height="24" alt="Unordered List" title="Unordered List" onClick="rteCommand(\'' + rte + '\', \'insertunorderedlist\', \'\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_list_numbers.png" width="16" height="16" alt="Ordered List" title="Ordered List" onClick="rteCommand(\'' + rte + '\', \'insertorderedlist\', \'\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_list_bullets.png" width="16" height="16" alt="Unordered List" title="Unordered List" onClick="rteCommand(\'' + rte + '\', \'insertunorderedlist\', \'\')"></td>'); document.writeln(' <td><img class="rteVertSep" src="' + imagesPath + 'blackdot.gif" width="1" height="20" border="0" alt=""></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'outdent.gif" width="25" height="24" alt="Outdent" title="Outdent" onClick="rteCommand(\'' + rte + '\', \'outdent\', \'\')"></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'indent.gif" width="25" height="24" alt="Indent" title="Indent" onClick="rteCommand(\'' + rte + '\', \'indent\', \'\')"></td>'); - document.writeln(' <td><div id="forecolor_' + rte + '"><img class="rteImage" src="' + imagesPath + 'textcolor.gif" width="25" height="24" alt="Text Color" title="Text Color" onClick="dlgColorPalette(\'' + rte + '\', \'forecolor\', \'\')"></div></td>'); - document.writeln(' <td><div id="hilitecolor_' + rte + '"><img class="rteImage" src="' + imagesPath + 'bgcolor.gif" width="25" height="24" alt="Background Color" title="Background Color" onClick="dlgColorPalette(\'' + rte + '\', \'hilitecolor\', \'\')"></div></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_indent_remove.png" width="16" height="16" alt="Outdent" title="Outdent" onClick="rteCommand(\'' + rte + '\', \'outdent\', \'\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'text_indent.png" width="16" height="16" alt="Indent" title="Indent" onClick="rteCommand(\'' + rte + '\', \'indent\', \'\')"></td>'); + document.writeln(' <td><div id="forecolor_' + rte + '"><img class="rteImage" src="' + imagesPath + 'color_swatch.png" width="16" height="16" alt="Text Color" title="Text Color" onClick="dlgColorPalette(\'' + rte + '\', \'forecolor\', \'\')"></div></td>'); + document.writeln(' <td><div id="hilitecolor_' + rte + '"><img class="rteImage" src="' + imagesPath + 'paintcan.png" width="16" height="16 alt="Background Color" title="Background Color" onClick="dlgColorPalette(\'' + rte + '\', \'hilitecolor\', \'\')"></div></td>'); document.writeln(' <td><img class="rteVertSep" src="' + imagesPath + 'blackdot.gif" width="1" height="20" border="0" alt=""></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'hyperlink.gif" width="25" height="24" alt="Insert Link" title="Insert Link" onClick="dlgInsertLink(\'' + rte + '\', \'link\')"></td>'); - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'image.gif" width="25" height="24" alt="Add Image" title="Add Image" onClick="addImage(\'' + rte + '\')"></td>'); - document.writeln(' <td><div id="table_' + rte + '"><img class="rteImage" src="' + imagesPath + 'insert_table.gif" width="25" height="24" alt="Insert Table" title="Insert Table" onClick="dlgInsertTable(\'' + rte + '\', \'table\', \'\')"></div></td>'); - if (isIE) { - document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'spellcheck.gif" width="25" height="24" alt="Spell Check" title="Spell Check" onClick="checkspell()"></td>'); - } - // document.writeln(' <td><img class="rteVertSep" src="' + imagesPath + 'blackdot.gif" width="1" height="20" border="0" alt=""></td>'); - // document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'cut.gif" width="25" height="24" alt="Cut" title="Cut" onClick="rteCommand(\'' + rte + '\', \'cut\')"></td>'); - // document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'copy.gif" width="25" height="24" alt="Copy" title="Copy" onClick="rteCommand(\'' + rte + '\', \'copy\')"></td>'); - // document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'paste.gif" width="25" height="24" alt="Paste" title="Paste" onClick="rteCommand(\'' + rte + '\', \'paste\')"></td>'); - // document.writeln(' <td><img class="rteVertSep" src="' + imagesPath + 'blackdot.gif" width="1" height="20" border="0" alt=""></td>'); - // document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'undo.gif" width="25" height="24" alt="Undo" title="Undo" onClick="rteCommand(\'' + rte + '\', \'undo\')"></td>'); - // document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'redo.gif" width="25" height="24" alt="Redo" title="Redo" onClick="rteCommand(\'' + rte + '\', \'redo\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'link_add.png" width="16" height="16" alt="Insert Link" title="Insert Link" onClick="dlgInsertLink(\'' + rte + '\', \'link\')"></td>'); + document.writeln(' <td><img class="rteImage" src="' + imagesPath + 'image_add.png" width="16" height="16" alt="Add Image" title="Add Image" onClick="addImage(\'' + rte + '\')"></td>'); + document.writeln(' <td><div id="table_' + rte + '"><img class="rteImage" src="' + imagesPath + 'table_add.png" width="16" height="16" alt="Insert Table" title="Insert Table" onClick="dlgInsertTable(\'' + rte + '\', \'table\', \'\')"></div></td>'); document.writeln(' <td width="100%"></td>'); document.writeln(' </tr>'); document.writeln('</table>'); } - document.writeln('<iframe id="' + rte + '" name="' + rte + '" width="' + width + 'px" height="' + height + 'px" src="' + includesPath + 'blank.htm"></iframe>'); - if (!readOnly) document.writeln('<br /><input type="checkbox" id="chkSrc' + rte + '" onclick="toggleHTMLSrc(\'' + rte + '\',' + buttons + ');" /> <label for="chkSrc' + rte + '">View Source</label>'); + if (getCookie(rte + '_size') != null) { + height = getCookie(rte + '_size'); + } + document.writeln('<iframe class="rteFrame" id="' + rte + '" name="' + rte + '" width="' + width + '" height="' + height + '" src="' + includesPath + 'blank.htm"></iframe>'); + +// ROLLER_MOD: added resize buttons + + document.writeln('<table class="rteBack" cellpadding="0" cellspacing="0" id="Buttons3_' + rte + '" width="' + tablewidth + '"><tr>'); + if (!readOnly) { + document.writeln('<td><input type="checkbox" id="chkSrc' + rte + '" onclick="toggleHTMLSrc(\'' + rte + '\',' + buttons + ');" /> <label for="chkSrc' + rte + '">View Source</label></td>'); + } + document.writeln('<td align="right"><a href="#" onclick="changeSize(\'' + rte + '\',\'' + rte + '_size\', 20)" /><img class="rteImageSm" src="' + imagesPath + 'arrow_down.png" width="16" height="16" border="0" /></a>' ); + document.writeln('<a href="#" onclick="changeSize(\'' + rte + '\',\'' + rte + '_size\', -20)" /><img class="rteImageSm" src="' + imagesPath + 'arrow_up.png" width="16" height="16" border="0" /></a></td>' ); + document.writeln("</tr></table>"); + document.writeln('<iframe width="154" height="104" id="cp' + rte + '" src="' + includesPath + 'palette.htm" marginwidth="0" marginheight="0" scrolling="no" style="visibility:hidden; position: absolute;"></iframe>'); document.writeln('<input type="hidden" id="hdn' + rte + '" name="' + rte + '" value="">'); document.writeln('</div>'); - document.getElementById('hdn' + rte).value = html; enableDesignMode(rte, html, readOnly); + } else { if (!readOnly) { - document.writeln('<textarea name="' + rte + '" id="' + rte + '" style="width: ' + width + 'px; height: ' + height + 'px;">' + html + '</textarea>'); + document.writeln('<textarea name="' + rte + '" id="' + rte + '" style="width: ' + width + '; height: ' + height + ';">' + html + '</textarea>'); } else { - document.writeln('<textarea name="' + rte + '" id="' + rte + '" style="width: ' + width + 'px; height: ' + height + 'px;" readonly>' + html + '</textarea>'); + document.writeln('<textarea name="' + rte + '" id="' + rte + '" style="width: ' + width + '; height: ' + height + ';" readonly>' + html + '</textarea>'); } } } + +// ROLLER_MOD: added resize method +function changeSize(id, cookiename, num) { + var frame = document.getElementById(id); + frame.height = Number(frame.height) + Number(num); + var expires = new Date(); + expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 * 1000); // sets it for approx 90 days. + setCookie(cookiename, frame.height, expires); +} + function enableDesignMode(rte, html, readOnly) { var frameHtml = "<html id=\"" + rte + "\">\n";
Modified: incubator/roller/branches/roller-newbackend/web/editor/rte.css URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/editor/rte.css?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/editor/rte.css (original) +++ incubator/roller/branches/roller-newbackend/web/editor/rte.css Tue Apr 18 11:08:54 2006 @@ -1,20 +1,34 @@ .rteImage { - background: #D3D3D3; - border: 1px solid #D3D3D3; + background: #FFFFFF; + background: #F0F0F0; + border: 1px solid #D3D3D3; + padding: 2px; + cursor: pointer; + cursor: hand; +} + +.rteImageSm { + background: #FFFFFF; + background: #F0F0F0; + border: 1px solid #D3D3D3; + padding: 2px; + margin: 2px 0px 0px 0px; cursor: pointer; cursor: hand; } .rteImageRaised, .rteImage:hover { - background: #D3D3D3; + background: #FFFFFF; + background: #F0F0F0; border: 1px outset; cursor: pointer; cursor: hand; } .rteImageLowered, .rteImage:active { - background: #D3D3D3; - border: 1px inset; + background: #FFFFFF; + background: #F0F0F0; + /*border: 1px inset;*/ cursor: pointer; cursor: hand; } @@ -24,18 +38,27 @@ } .rteBack { - background: #D3D3D3; - border: 1px outset; + background: #FFFFFF; + background: #F0F0F0; + /*border: 1px outset; */ letter-spacing: 0; padding: 2px; } .rteBack tbody tr td, .rteBack tr td { - background: #D3D3D3; + background: #FFFFFF; + background: #F0F0F0; padding: 0; } .rteDiv { display: block; position: relative; -} \ No newline at end of file + background: #F0F0F0; + border: 1px solid #F0F0F0; +} + +.rteFrame { + border: 0px; +} + Modified: incubator/roller/branches/roller-newbackend/web/main.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/main.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/main.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/main.jsp Tue Apr 18 11:08:54 2006 @@ -52,7 +52,7 @@ <br /> </span> - <roller:ApplyPlugins name="post" scope="page" skipFlag="false" /> + <roller:ShowEntryText name="post" scope="page" singleEntry="true" /> </div> </c:forEach> @@ -84,7 +84,7 @@ </span> <span class="entryDescription"> - <roller:ApplyPlugins name="post" scope="page" stripHtml="true" maxLength="120" skipFlag="true" /> + <roller:ShowEntryText name="post" scope="page" stripHtml="true" maxLength="120" singleEntry="false" /> </span> </div> Modified: incubator/roller/branches/roller-newbackend/web/theme/roller.css URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/theme/roller.css?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/theme/roller.css (original) +++ incubator/roller/branches/roller-newbackend/web/theme/roller.css Tue Apr 18 11:08:54 2006 @@ -447,7 +447,15 @@ weblog editor styles ---------------------------------------------------------------------- */ -div.previewEntry { +div.previewEntrySummary { + border: 1px solid gray; + clear: both; + height: 12em; + width: 98%; + padding: 10px; + overflow: auto; +} +div.previewEntryContent { border: 1px solid gray; clear: both; height: 22em; @@ -641,3 +649,10 @@ overflow: auto; overflow-x: auto; } + +.toplabel { + font-weight: bold; + margin: 10px 0px 0px 0px; +} + + Modified: incubator/roller/branches/roller-newbackend/web/theme/searchResults.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/theme/searchResults.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/theme/searchResults.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/theme/searchResults.jsp Tue Apr 18 11:08:54 2006 @@ -127,7 +127,7 @@ </span> <span class="entryDescription"> - <roller:ApplyPlugins name="post" scope="page" stripHtml="true" maxLength="120" skipFlag="true" /> + <roller:ShowEntryText name="post" scope="page" stripHtml="true" maxLength="120" singleEntry="true" /> </span> <span style="font-size:x-small;">(<a Modified: incubator/roller/branches/roller-newbackend/web/weblog/WeblogEdit.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/WeblogEdit.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/weblog/WeblogEdit.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/weblog/WeblogEdit.jsp Tue Apr 18 11:08:54 2006 @@ -74,36 +74,203 @@ </c:choose> <html:form action="/editor/weblog" method="post" focus="title"> - <html:hidden property="day"/> <html:hidden property="id"/> <html:hidden property="creatorId"/> <html:hidden property="websiteId"/> <html:hidden property="anchor"/> - <%-- updateTime is now set after the entry is submitted -- Allen G - <html:hidden property="updateTime"/> --%> <html:hidden property="status"/> <html:hidden property="link"/> + <html:hidden property="contentType" /> + <html:hidden property="contentSrc" /> <html:hidden name="method" property="method" value="save"/> + + <%-- ================================================================== --%> + <%-- Title field --%> + <p class="toplabel"><fmt:message key="weblogEdit.title" /></p> + <html:text property="title" style="width:100%" maxlength="255" tabindex="1" /> + + + <%-- ================================================================== --%> + <%-- Weblog edit, preview, or spell check area --%> + + <%-- EDIT MODE --%> + <c:if test="${model.editMode}"> + <div style="width: 100%;"> <%-- need this div to control text-area size in IE 6 --%> + <%-- include edit page --%> + <div > + <jsp:include page="<%= model.getEditorPage() %>" /> + </div> + </div> + </c:if> + + <%-- PREVIEW MODE --%> + <c:if test="${model.previewMode}" > + <html:hidden property="text" /> + <html:hidden property="summary" /> + + <br /> + <br /> + <div class="centerTitle"><fmt:message key="weblogEdit.previewSummary" /></div> + <div class="previewEntrySummary"> + <roller:ShowEntrySummary name="model" property="weblogEntry" /> + </div> + + <br /> + <br /> + <div class="centerTitle"><fmt:message key="weblogEdit.previewContent" /></div> + <div class="previewEntryContent"> + <roller:ShowEntryContent name="model" property="weblogEntry" /> + </div> + </c:if> + + <%-- SPELLCHECK MODE --%> + <c:if test="${model.spellMode}" > + <html:hidden property="text" /> + <html:hidden property="summary" /> + + <br /> + <br /> + <div class="centerTitle"><fmt:message key="weblogEdit.spellCheckContent" /></div> + <div class="previewEntryContent"> + <c:out value="${model.spellCheckHtml}" escapeXml="false" /> + </div> + </c:if> + + <%-- ================================================================== --%> - <%-- weblog entry fields: title, link, category, etc. --%> + <%-- the button box --%> - <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> + <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.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.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> + + + <%-- ================================================================== --%> + <%-- Other settings --%> + + <br /> + <h2><fmt:message key="weblogEdit.otherSettings" /></h2> + + <table class="entryEditTable" cellpadding="0" cellspacing="0" width="100%"> + + <tr><td class="entryEditFormLabel"> + <label for="title"> + <fmt:message key="weblogEdit.status" /> + </label> + </td><td> + <c:if test="${!empty weblogEntryFormEx.id}"> + <c:if test="${weblogEntryFormEx.published}"> + <span style="color:green; font-weight:bold"> + <fmt:message key="weblogEdit.published" /> + (<fmt:message key="weblogEdit.updateTime" /> + <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both" + dateStyle="short" timeStyle="short" />) + </span> + </c:if> + <c:if test="${weblogEntryFormEx.draft}"> + <span style="color:orange; font-weight:bold"> + <fmt:message key="weblogEdit.draft" /> + (<fmt:message key="weblogEdit.updateTime" /> + <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both" + dateStyle="short" timeStyle="short" />) + </span> + </c:if> + <c:if test="${weblogEntryFormEx.pending}"> + <span style="color:orange; font-weight:bold"> + <fmt:message key="weblogEdit.pending" /> + (<fmt:message key="weblogEdit.updateTime" /> + <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both" + dateStyle="short" timeStyle="short" />) + </span> + </c:if> + </c:if> + <c:if test="${empty weblogEntryFormEx.id}"> + <span style="color:red; font-weight:bold"><fmt:message key="weblogEdit.unsaved" /></span> + </c:if> + </td></tr> + <tr><td class="entryEditFormLabel"> - <label for="categoryId"><fmt:message key="weblogEdit.category" /></label> - </td><td> - <html:select property="categoryId" size="1" tabindex="4"> - <html:optionsCollection name="model" property="categories" value="id" label="path" /> - </html:select> + <label for="categoryId"><fmt:message key="weblogEdit.category" /></label> + </td><td> + <html:select property="categoryId" size="1" tabindex="4"> + <html:optionsCollection name="model" property="categories" value="id" label="path" /> + </html:select> </td></tr> - + <tr> <td class="entryEditFormLabel"> <label for="link"><fmt:message key="weblogEdit.pubTime" /></label> @@ -138,87 +305,16 @@ </a> </td></tr> </c:if> - - <tr><td class="entryEditFormLabel"> - <label for="title"> - <fmt:message key="weblogEdit.status" /> - </label> - </td><td> - <c:if test="${!empty weblogEntryFormEx.id}"> - <c:if test="${weblogEntryFormEx.published}"> - <span style="color:green; font-weight:bold"> - <fmt:message key="weblogEdit.published" /> - (<fmt:message key="weblogEdit.updateTime" /> - <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both" - dateStyle="short" timeStyle="short" />) - </span> - </c:if> - <c:if test="${weblogEntryFormEx.draft}"> - <span style="color:orange; font-weight:bold"> - <fmt:message key="weblogEdit.draft" /> - (<fmt:message key="weblogEdit.updateTime" /> - <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both" - dateStyle="short" timeStyle="short" />) - </span> - </c:if> - <c:if test="${weblogEntryFormEx.pending}"> - <span style="color:orange; font-weight:bold"> - <fmt:message key="weblogEdit.pending" /> - (<fmt:message key="weblogEdit.updateTime" /> - <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both" - dateStyle="short" timeStyle="short" />) - </span> - </c:if> - </c:if> - <c:if test="${empty weblogEntryFormEx.id}"> - <span style="color:red; font-weight:bold"><fmt:message key="weblogEdit.unsaved" /></span> - </c:if> - </td></tr> - </table> + </table> + + <%-- ================================================================== --%> - <%-- Weblog edit, preview, or spell check area --%> - - <%-- EDIT MODE --%> - <c:if test="${model.editMode}"> - - <div style="width: 100%;"> <%-- need this div to control text-area size in IE 6 --%> - - <%-- include edit page --%> - <div > - <jsp:include page="<%= model.getEditorPage() %>" /> - </div> - - </div> - - </c:if> - - <%-- PREVIEW MODE --%> - <c:if test="${model.previewMode}" > - <br /> - <div class="centerTitle"><fmt:message key="weblogEdit.previewMode" /></div> - <html:hidden property="text" /> - <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" /> - <div class="previewEntry"> - <c:out value="${model.spellCheckHtml}" escapeXml="false" /> - </div> - </c:if> - + <%-- More other settings --%> - <h2><fmt:message key="weblogEdit.otherSettings" /></h2> - - <%-- ================================================================== --%> - <%-- comment settings --%> - + <%-- comment settings --%> + + <br /> <div id="commentControlToggle" class="controlToggle"> <span id="icommentControl">+</span> <a class="controlToggle" onclick="javascript:toggleControl('commentControlToggle','commentControl')"> @@ -321,95 +417,13 @@ <% } %> </div> - - - <%-- ================================================================== --%> - <%-- 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.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.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> - - <%-- ================================================================== --%> <%-- Trackback control --%> <c:if test="${!empty weblogEntryFormEx.id && model.userAuthorizedToAuthor}"> <br /> - <br /> <a name="trackbacks"></a> - <h1><fmt:message key="weblogEdit.trackback" /></h1> + <h2><fmt:message key="weblogEdit.trackback" /></h2> <fmt:message key="weblogEdit.trackbackUrl" /><br /> <html:text property="trackbackUrl" size="80" maxlength="255" /> Modified: incubator/roller/branches/roller-newbackend/web/weblog/WeblogEntryManagement.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/WeblogEntryManagement.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/weblog/WeblogEntryManagement.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/weblog/WeblogEntryManagement.jsp Tue Apr 18 11:08:54 2006 @@ -182,7 +182,7 @@ <br /> <div style="overflow:auto"> - <roller:ApplyPlugins name="post" skipFlag="true" scope="page" /> + <roller:ShowEntryText name="post" singleEntry="false" scope="page" /> </div> </td></tr> Modified: incubator/roller/branches/roller-newbackend/web/weblog/editor-dhtml.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/editor-dhtml.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/weblog/editor-dhtml.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/weblog/editor-dhtml.jsp Tue Apr 18 11:08:54 2006 @@ -1,8 +1,6 @@ - <%-- This page is designed to be included in edit-weblog.jsp --%> - <%@ include file="/taglibs.jsp" %> - +<html:hidden property="summary" /> <html:hidden property="text" /> <script language="JavaScript"> Modified: incubator/roller/branches/roller-newbackend/web/weblog/editor-ekit.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/editor-ekit.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/weblog/editor-ekit.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/weblog/editor-ekit.jsp Tue Apr 18 11:08:54 2006 @@ -1,7 +1,7 @@ - <%-- This page is designed to be included in edit-weblog.jsp --%> <%@ page import="org.roller.presentation.weblog.formbeans.WeblogEntryFormEx" %> <%@ include file="/taglibs.jsp" %> +<html:hidden property="summary" /> <script type="text/javascript"> <!-- Modified: incubator/roller/branches/roller-newbackend/web/weblog/editor-midas.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/editor-midas.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/weblog/editor-midas.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/weblog/editor-midas.jsp Tue Apr 18 11:08:54 2006 @@ -1,8 +1,6 @@ - <%-- This page is designed to be included in edit-weblog.jsp --%> - <%@ include file="/taglibs.jsp" %> - +<html:hidden property="summary" /> <html:hidden property="text" /> <script type="text/javascript"> Modified: incubator/roller/branches/roller-newbackend/web/weblog/editor-rte.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/editor-rte.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/weblog/editor-rte.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/weblog/editor-rte.jsp Tue Apr 18 11:08:54 2006 @@ -1,55 +1,77 @@ - <%-- This page is designed to be included in edit-weblog.jsp --%> - <%@ include file="/taglibs.jsp" %> - +<html:hidden property="summary" /> <html:hidden property="text" /> + <script type="text/javascript" src="richtext.js" ></script> <script type="text/javascript" src="html2xhtml.js" ></script> <script type="text/javascript"> <!-- - function postWeblogEntry(publish) - { - updateRTE('rte1'); - document.weblogEntryFormEx.text.value = document.weblogEntryFormEx.rte1.value; + function postWeblogEntry(publish) { + updateRTE('rte1'); + document.weblogEntryFormEx.summary.value = document.weblogEntryFormEx.rte1.value; + updateRTE('rte2'); + document.weblogEntryFormEx.text.value = document.weblogEntryFormEx.rte2.value; if (publish) document.weblogEntryFormEx.publishEntry.value = "true"; document.weblogEntryFormEx.submit(); } - //Usage: initRTE(imagesPath, includesPath, cssFile, genXHTML) - initRTE("images/", "<%= request.getContextPath() %>/editor/", "", true); + // Usage: initRTE(imagesPath, includesPath, cssFile, genXHTML) + initRTE("images/", "<%= request.getContextPath() %>/editor/", false, true); //--> </script> <noscript><p><b>Javascript must be enabled to use this form.</b></p></noscript> +<%-- ===================================================================== --%> +<p class="toplabel"><fmt:message key="weblogEdit.summary" /></p> -<br /> <script language="JavaScript" type="text/javascript"> <!-- -//Usage: writeRichText(fieldname, html, width, height, buttons, readOnly) -writeRichText('rte1', document.weblogEntryFormEx.text.value, '95%', 300, true, false); +// Usage: writeRichText(fieldname, html, width, height, buttons, readOnly) +writeRichText('rte1', document.weblogEntryFormEx.summary.value, '100%', '50px', true, false); //--> </script> - <script type="text/javascript"> - <!-- - if (getCookie("editorSize") != null) { - document.weblogEntryFormEx.text.rows = getCookie("editorSize"); - } - --> - </script> - <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.rte1.rows,expires); - } - --> - </script> - <!-- 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> \ No newline at end of file + +<script type="text/javascript"> +<!-- +if (getCookie("rte1size") != null) { + var frame = document.getElementById('rte1'); + frame.height = getCookie("rte1size"); +} +--> +</script> + +<!-- +<div style="float:right"> +<input type="button" name="taller" value=" ↓ " onclick="changeSize('rte1', 'rte1size', 20)" /> +<input type="button" name="shorter" value=" ↑ " onclick="changeSize('rte1', 'rte1size', -20)" /> +</div> +--> + +<%-- ===================================================================== --%> +<p class="toplabel"><fmt:message key="weblogEdit.content" /></p> + +<script language="JavaScript" type="text/javascript"> +<!-- +// Usage: writeRichText(fieldname, html, width, height, buttons, readOnly) +writeRichText('rte2', document.weblogEntryFormEx.text.value, '100%', '250px', true, false); +//--> +</script> + + +<script type="text/javascript"> +<!-- +if (getCookie("rte2size") != null) { + var frame = document.getElementById('rte2'); + frame.height = getCookie("rte2size"); +} +--> +</script> + +<!-- Add buttons to make this textarea taller or shorter --> +<!-- +<input type="button" name="taller" value=" ↓ " onclick="changeSize('rte2', 'rte2size', 20)" /> +<input type="button" name="shorter" value=" ↑ " onclick="changeSize('rte2', 'rte2size', -20)" /> +--> + + Modified: incubator/roller/branches/roller-newbackend/web/weblog/editor-text-js.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/editor-text-js.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/weblog/editor-text-js.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/weblog/editor-text-js.jsp Tue Apr 18 11:08:54 2006 @@ -1,7 +1,7 @@ - <%-- This page is designed to be included in edit-weblog.jsp --%> - <%@ include file="/taglibs.jsp" %> +<html:hidden property="summary" /> + <script type="text/javascript" src="<html:rewrite page="/theme/scripts/xmlp.js"/>"></script> <script type="text/javascript"> <!-- Modified: incubator/roller/branches/roller-newbackend/web/weblog/editor-text.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/editor-text.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/weblog/editor-text.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/weblog/editor-text.jsp Tue Apr 18 11:08:54 2006 @@ -1,50 +1,53 @@ - <%-- This page is designed to be included in edit-weblog.jsp --%> - <%@ include file="/taglibs.jsp" %> <script type="text/javascript"> <!-- -function postWeblogEntry(publish) -{ +function postWeblogEntry(publish) { if (publish) document.weblogEntryFormEx.publishEntry.value = "true"; document.weblogEntryFormEx.submit(); } +function changeSize(e, num) { + e.rows = e.rows + num; + var expires = new Date(); + expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 * 1000); // sets it for approx 90 days. + setCookie("editorSize",e.rows,expires); +} // --> </script> - <script type="text/javascript"> - <!-- - if (getCookie("editorSize") != null) { - document.weblogEntryFormEx.text.rows = getCookie("editorSize"); - } - --> - </script> +<%-- ===================================================================== --%> +<p class="toplabel"><fmt:message key="weblogEdit.summary" /></p> -<html:textarea property="text" cols="75" rows="20" style="width: 100%" tabindex="2"/> +<html:textarea property="summary" cols="75" rows="5" style="width: 100%" tabindex="2"/> +<script type="text/javascript"> + <!-- + if (getCookie("editorSize") != null) { + document.weblogEntryFormEx.text.rows = getCookie("editorSize"); + } + --> +</script> +<table style="width:100%"><tr><td align="right"> + <!-- Add buttons to make this textarea taller or shorter --> + <input type="button" name="taller" value=" ↓ " onclick="changeSize(document.weblogEntryFormEx.summary, 5)" /> + <input type="button" name="shorter" value=" ↑ " onclick="changeSize(document.weblogEntryFormEx.summary, -5)" /> +</td></tr></table> - <script type="text/javascript"> - <!-- - if (getCookie("editorSize") != null) { - document.weblogEntryFormEx.text.rows = getCookie("editorSize"); - } - --> - </script> +<%-- ===================================================================== --%> +<p class="toplabel"><fmt:message key="weblogEdit.content" /></p> - <table style="width:100%"><tr><td align="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); - } - --> - </script> - <!-- 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)" /> - </td></tr></table> +<html:textarea property="text" cols="75" rows="25" style="width: 100%" tabindex="3"/> +<script type="text/javascript"> + <!-- + if (getCookie("editorSize") != null) { + document.weblogEntryFormEx.text.rows = getCookie("editorSize"); + } + --> +</script> +<table style="width:100%"><tr><td align="right"> + <!-- Add buttons to make this textarea taller or shorter --> + <input type="button" name="taller" value=" ↓ " onclick="changeSize(document.weblogEntryFormEx.text, 5)" /> + <input type="button" name="shorter" value=" ↑ " onclick="changeSize(document.weblogEntryFormEx.text, -5)" /> +</td></tr></table> Modified: incubator/roller/branches/roller-newbackend/web/weblog/editor-wiki-js.jsp URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/web/weblog/editor-wiki-js.jsp?rev=394994&r1=394993&r2=394994&view=diff ============================================================================== --- incubator/roller/branches/roller-newbackend/web/weblog/editor-wiki-js.jsp (original) +++ incubator/roller/branches/roller-newbackend/web/weblog/editor-wiki-js.jsp Tue Apr 18 11:08:54 2006 @@ -1,7 +1,6 @@ - <%-- This page is designed to be included in edit-weblog.jsp --%> - <%@ include file="/taglibs.jsp" %> +<html:hidden property="summary" /> <script type="text/javascript"> <!--
