Return-Path: 
 <roller-commits-return-1470-apmail-incubator-roller-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org
Received: (qmail 45496 invoked from network); 12 Jun 2006 18:50:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 12 Jun 2006 18:50:05 -0000
Received: (qmail 34235 invoked by uid 500); 12 Jun 2006 18:50:04 -0000
Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org
Received: (qmail 34203 invoked by uid 500); 12 Jun 2006 18:50:04 -0000
Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:roller-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:roller-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:roller-commits@incubator.apache.org>
List-Id: <roller-commits.incubator.apache.org>
Reply-To: roller-dev@incubator.apache.org
Delivered-To: mailing list roller-commits@incubator.apache.org
Received: (qmail 34192 invoked by uid 99); 12 Jun 2006 18:50:04 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2006 11:50:04 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2006 11:50:02 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 3870F1A9846; Mon, 12 Jun 2006 11:49:42 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r413725 [3/3] - in /incubator/roller/branches/roller_3.0:
 metadata/xdoclet/ src/org/apache/roller/ui/authoring/ajax/
 src/org/apache/roller/ui/authoring/struts/actions/
 src/org/apache/roller/ui/rendering/servlets/ web/WEB-INF/ web/WEB-INF/cl...
Date: Mon, 12 Jun 2006 18:49:29 -0000
To: roller-commits@incubator.apache.org
From: agilliland@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060612184942.3870F1A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Modified: incubator/roller/branches/roller_3.0/web/roller-ui/authoring/editors/editor-dhtml.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/roller-ui/authoring/editors/editor-dhtml.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/roller-ui/authoring/editors/editor-dhtml.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/roller-ui/authoring/editors/editor-dhtml.jsp Mon Jun 12 11:49:26 2006
@@ -15,295 +15,295 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 -->
-<%-- 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">
-<!--
-    // dhtml editor requires IE 6
-    var agt=navigator.userAgent.toLowerCase();
-    msie = agt.indexOf("msie");
-    ie   = (msie != -1);
-    major = parseInt(navigator.appVersion);
-    if (ie)
-    {
-        major = parseInt( agt.substring( msie+5 ) );
-    }
-    if (!ie || major < 6)
-    {
-        document.write("<span class=\"statusMsg\">");
-        document.write("We recommend ");
-        document.write("<a href=\"http://www.microsoft.com/windows/ie/default.asp\">IE 6 or higher</a> ");
-        document.write("for using the dHtml editor. ")
-        document.write("Please <a href=\"");
-        document.write("editor/website.do?method=edit&rmik=Settings\">");
-        document.write("change to the text editor</a> or upgrade ");
-        document.write("your browser.</span>");
-    }
-    
-    function postWeblogEntry(publish)
-    {
-        document.weblogEntryFormEx.text.value = iView.document.body.innerHTML;
-        if (publish)
-            document.weblogEntryFormEx.publishEntry.value = "true";
-        document.weblogEntryFormEx.submit();
-    }
-
-    var viewMode = 1; // WYSIWYG
-
-    function selOn(ctrl)
-    {
-        ctrl.style.borderColor = '#000000';
-        ctrl.style.backgroundColor = '#B5BED6';
-        ctrl.style.cursor = 'hand'; 
-    }
-
-    function selOff(ctrl)
-    {
-        ctrl.style.borderColor = '#D6D3CE';  
-        ctrl.style.backgroundColor = '#D6D3CE';
-    }
-
-    function selDown(ctrl)
-    {
-        ctrl.style.backgroundColor = '#8492B5';
-    }
-
-    function selUp(ctrl)
-    {
-        ctrl.style.backgroundColor = '#B5BED6';
-    }
-
-    function doBold()
-    {
-        iView.document.execCommand('bold', false, null);
-    }
-
-    function doItalic()
-    {
-        iView.document.execCommand('italic', false, null);
-    }
-
-    function doUnderline()
-    {
-        iView.document.execCommand('underline', false, null);
-    }
-
-    function doLeft()
-    {
-        iView.document.execCommand('justifyleft', false, null);
-    }
-
-    function doCenter()
-    {
-        iView.document.execCommand('justifycenter', false, null);
-    }
-
-    function doRight()
-    {
-        iView.document.execCommand('justifyright', false, null);
-    }
-
-    function doOrdList()
-    {
-        iView.document.execCommand('insertorderedlist', false, null);
-    }
-
-    function doBulList()
-    {
-        iView.document.execCommand('insertunorderedlist', false, null);
-    }
-
-    function doForeCol()
-    {
-        var fCol = prompt('Enter foreground color', '');
-
-        if(fCol != null)
-            iView.document.execCommand('forecolor', false, fCol);
-    }
-
-    function doBackCol()
-    {
-        var bCol = prompt('Enter background color', '');
-
-        if(bCol != null)
-            iView.document.execCommand('backcolor', false, bCol);
-    }
-
-    function doLink()
-    {
-        iView.document.execCommand('createlink');
-    }
-
-    function doImage()
-    {
-        var imgSrc = prompt('Enter image location', '');
-
-        if(imgSrc != null)    
-            iView.document.execCommand('insertimage', false, imgSrc);
-    }
-
-    function doRule()
-    {
-        iView.document.execCommand('inserthorizontalrule', false, null);
-    }
-
-    function doFont(fName)
-    {
-        if(fName != '')
-            iView.document.execCommand('fontname', false, fName);
-    }
-
-    function doSize(fSize)
-    {
-        if(fSize != '')
-            iView.document.execCommand('fontsize', false, fSize);
-    }
-
-    function doHead(hType)
-    {
-        if(hType != '')
-        {
-            iView.document.execCommand('formatblock', false, hType);  
-            doFont(selFont.options[selFont.selectedIndex].value);
-        }
-    }
-
-    function doToggleView()
-    {  
-        if(viewMode == 1)
-        {
-            iHTML = iView.document.body.innerHTML;
-            iView.document.body.innerText = iHTML;
-
-            // Hide all controls
-            tblCtrls.style.display = 'none';
-            tblCtrls2.style.display = 'none';
-            //selFont.style.display = 'none';
-            //selSize.style.display = 'none';
-            //selHeading.style.display = 'none';
-            iView.focus();
-
-            viewMode = 2; // Code
-        }
-        else
-        {
-            iText = iView.document.body.innerText;
-            iView.document.body.innerHTML = iText;
-
-            // Show all controls
-            tblCtrls.style.display = 'inline';
-            tblCtrls2.style.display = 'inline';
-            //selFont.style.display = 'inline';
-            //selSize.style.display = 'inline';
-            //selHeading.style.display = 'inline';
-            iView.focus();
-
-            viewMode = 1; // WYSIWYG
-        }
-    }
-// -->
-</script>
-<style>
-
-    .butClass
-    {    
-        border: 1px solid;
-        border-color: #D6D3CE;
-    }
-
-    .tdClass
-    {
-        padding-left: 3px;
-        padding-top:3px;
-    }
-
-</style>
-
-<table width="95%" height="30px" border="0" cellspacing="0" cellpadding="0" bgcolor="#D6D3CE">
-<tr>
-    <td id="tblCtrls" class="tdClass">
-        <img alt="Bold" class="butClass" src="<%= request.getContextPath() %>/images/editor/bold.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doBold()">
-        <img alt="Italic" class="butClass" src="<%= request.getContextPath() %>/images/editor/italic.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doItalic()">
-        <img alt="Underline" class="butClass" src="<%= request.getContextPath() %>/images/editor/underline.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doUnderline()">
-
-        <img alt="Left" class="butClass" src="<%= request.getContextPath() %>/images/editor/left.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doLeft()">
-        <img alt="Center" class="butClass" src="<%= request.getContextPath() %>/images/editor/center.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doCenter()">
-        <img alt="Right" class="butClass" src="<%= request.getContextPath() %>/images/editor/right.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doRight()">
-
-        <img alt="Ordered List" class="butClass" src="<%= request.getContextPath() %>/images/editor/ordlist.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doOrdList()">
-        <img alt="Bulleted List" class="butClass" src="<%= request.getContextPath() %>/images/editor/bullist.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doBulList()">
-
-        <img alt="Text Color" class="butClass" src="<%= request.getContextPath() %>/images/editor/forecol.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doForeCol()">
-        <img alt="Background Color" class="butClass" src="<%= request.getContextPath() %>/images/editor/bgcol.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doBackCol()">
-
-        <img alt="Hyperlink" class="butClass" src="<%= request.getContextPath() %>/images/editor/link.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doLink()">
-        <img alt="Image" class="butClass" src="<%= request.getContextPath() %>/images/editor/image.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doImage()">
-        <img alt="Horizontal Rule" class="butClass" src="<%= request.getContextPath() %>/images/editor/rule.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doRule()">
-
-    </td>
-    <td class="tdClass" colspan="1" width="20%" align="right">
-      <img alt="Toggle Mode" class="butClass" src="<%= request.getContextPath() %>/images/editor/mode.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doToggleView()">
-      &nbsp;&nbsp;&nbsp;
-    </td>
-</tr>
-</table>
-
-<table width="95%" height="30px" border="0" cellspacing="0" cellpadding="0" bgcolor="#D6D3CE">
-<tr>
-    <td id="tblCtrls2" class="tdClass" colspan="1" width="80%">
-      <select id="selFont" onChange="doFont(this.options[this.selectedIndex].value)">
-        <option value="">-- Font --</option>
-        <option value="Arial">Arial</option>
-        <option value="Courier">Courier</option>
-        <option value="Sans Serif">Sans Serif</option>
-        <option value="Tahoma">Tahoma</option>
-        <option value="Verdana">Verdana</option>
-        <option value="Wingdings">Wingdings</option>
-      </select>
-      <select id="selSize" onChange="doSize(this.options[this.selectedIndex].value)">
-        <option value="">-- Size --</option>
-        <option value="1">Very Small</option>
-        <option value="2">Small</option>
-        <option value="3">Medium</option>
-        <option value="4">Large</option>
-        <option value="5">Larger</option>
-        <option value="6">Very Large</option>
-      </select>
-      <select id="selHeading" onChange="doHead(this.options[this.selectedIndex].value)">
-        <option value="">-- Heading --</option>
-        <option value="Heading 1">H1</option>
-        <option value="Heading 2">H2</option>
-        <option value="Heading 3">H3</option>
-        <option value="Heading 4">H4</option>
-        <option value="Heading 5">H5</option>
-        <option value="Heading 6">H6</option>
-      </select>
-    </td>
-</tr>
-
-</table>
-
-<% // hack to support iframe's src attribute doing a call out 
-// No longer needed because form is now session scope
-//session.setAttribute("weblogEntryFormEx", 
-    //request.getAttribute("weblogEntryFormEx")); 
-%>
-<table width="95%" border="0" cellspacing="0" cellpadding="0" >
-<tr>
-    <td><iframe id="iView" width="100%" height="250" tabindex="2">
-        Your browser does not support iframes.  
-        Either change browsers or select a 
-        different editor for your website.</iframe>
-    </td>
-</tr>
-</table>
-<script language="JavaScript">
-    iView.document.designMode = 'On';
-    iView.document.open();
-    iView.document.write(document.weblogEntryFormEx.text.value);
-    iView.document.close();
-</script>
-
+<%-- 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">
+<!--
+    // dhtml editor requires IE 6
+    var agt=navigator.userAgent.toLowerCase();
+    msie = agt.indexOf("msie");
+    ie   = (msie != -1);
+    major = parseInt(navigator.appVersion);
+    if (ie)
+    {
+        major = parseInt( agt.substring( msie+5 ) );
+    }
+    if (!ie || major < 6)
+    {
+        document.write("<span class=\"statusMsg\">");
+        document.write("We recommend ");
+        document.write("<a href=\"http://www.microsoft.com/windows/ie/default.asp\">IE 6 or higher</a> ");
+        document.write("for using the dHtml editor. ")
+        document.write("Please <a href=\"");
+        document.write("roller-ui/authoring/website.do?method=edit&rmik=Settings\">");
+        document.write("change to the text editor</a> or upgrade ");
+        document.write("your browser.</span>");
+    }
+    
+    function postWeblogEntry(publish)
+    {
+        document.weblogEntryFormEx.text.value = iView.document.body.innerHTML;
+        if (publish)
+            document.weblogEntryFormEx.publishEntry.value = "true";
+        document.weblogEntryFormEx.submit();
+    }
+
+    var viewMode = 1; // WYSIWYG
+
+    function selOn(ctrl)
+    {
+        ctrl.style.borderColor = '#000000';
+        ctrl.style.backgroundColor = '#B5BED6';
+        ctrl.style.cursor = 'hand'; 
+    }
+
+    function selOff(ctrl)
+    {
+        ctrl.style.borderColor = '#D6D3CE';  
+        ctrl.style.backgroundColor = '#D6D3CE';
+    }
+
+    function selDown(ctrl)
+    {
+        ctrl.style.backgroundColor = '#8492B5';
+    }
+
+    function selUp(ctrl)
+    {
+        ctrl.style.backgroundColor = '#B5BED6';
+    }
+
+    function doBold()
+    {
+        iView.document.execCommand('bold', false, null);
+    }
+
+    function doItalic()
+    {
+        iView.document.execCommand('italic', false, null);
+    }
+
+    function doUnderline()
+    {
+        iView.document.execCommand('underline', false, null);
+    }
+
+    function doLeft()
+    {
+        iView.document.execCommand('justifyleft', false, null);
+    }
+
+    function doCenter()
+    {
+        iView.document.execCommand('justifycenter', false, null);
+    }
+
+    function doRight()
+    {
+        iView.document.execCommand('justifyright', false, null);
+    }
+
+    function doOrdList()
+    {
+        iView.document.execCommand('insertorderedlist', false, null);
+    }
+
+    function doBulList()
+    {
+        iView.document.execCommand('insertunorderedlist', false, null);
+    }
+
+    function doForeCol()
+    {
+        var fCol = prompt('Enter foreground color', '');
+
+        if(fCol != null)
+            iView.document.execCommand('forecolor', false, fCol);
+    }
+
+    function doBackCol()
+    {
+        var bCol = prompt('Enter background color', '');
+
+        if(bCol != null)
+            iView.document.execCommand('backcolor', false, bCol);
+    }
+
+    function doLink()
+    {
+        iView.document.execCommand('createlink');
+    }
+
+    function doImage()
+    {
+        var imgSrc = prompt('Enter image location', '');
+
+        if(imgSrc != null)    
+            iView.document.execCommand('insertimage', false, imgSrc);
+    }
+
+    function doRule()
+    {
+        iView.document.execCommand('inserthorizontalrule', false, null);
+    }
+
+    function doFont(fName)
+    {
+        if(fName != '')
+            iView.document.execCommand('fontname', false, fName);
+    }
+
+    function doSize(fSize)
+    {
+        if(fSize != '')
+            iView.document.execCommand('fontsize', false, fSize);
+    }
+
+    function doHead(hType)
+    {
+        if(hType != '')
+        {
+            iView.document.execCommand('formatblock', false, hType);  
+            doFont(selFont.options[selFont.selectedIndex].value);
+        }
+    }
+
+    function doToggleView()
+    {  
+        if(viewMode == 1)
+        {
+            iHTML = iView.document.body.innerHTML;
+            iView.document.body.innerText = iHTML;
+
+            // Hide all controls
+            tblCtrls.style.display = 'none';
+            tblCtrls2.style.display = 'none';
+            //selFont.style.display = 'none';
+            //selSize.style.display = 'none';
+            //selHeading.style.display = 'none';
+            iView.focus();
+
+            viewMode = 2; // Code
+        }
+        else
+        {
+            iText = iView.document.body.innerText;
+            iView.document.body.innerHTML = iText;
+
+            // Show all controls
+            tblCtrls.style.display = 'inline';
+            tblCtrls2.style.display = 'inline';
+            //selFont.style.display = 'inline';
+            //selSize.style.display = 'inline';
+            //selHeading.style.display = 'inline';
+            iView.focus();
+
+            viewMode = 1; // WYSIWYG
+        }
+    }
+// -->
+</script>
+<style>
+
+    .butClass
+    {    
+        border: 1px solid;
+        border-color: #D6D3CE;
+    }
+
+    .tdClass
+    {
+        padding-left: 3px;
+        padding-top:3px;
+    }
+
+</style>
+
+<table width="95%" height="30px" border="0" cellspacing="0" cellpadding="0" bgcolor="#D6D3CE">
+<tr>
+    <td id="tblCtrls" class="tdClass">
+        <img alt="Bold" class="butClass" src="<%= request.getContextPath() %>/images/editor/bold.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doBold()">
+        <img alt="Italic" class="butClass" src="<%= request.getContextPath() %>/images/editor/italic.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doItalic()">
+        <img alt="Underline" class="butClass" src="<%= request.getContextPath() %>/images/editor/underline.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doUnderline()">
+
+        <img alt="Left" class="butClass" src="<%= request.getContextPath() %>/images/editor/left.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doLeft()">
+        <img alt="Center" class="butClass" src="<%= request.getContextPath() %>/images/editor/center.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doCenter()">
+        <img alt="Right" class="butClass" src="<%= request.getContextPath() %>/images/editor/right.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doRight()">
+
+        <img alt="Ordered List" class="butClass" src="<%= request.getContextPath() %>/images/editor/ordlist.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doOrdList()">
+        <img alt="Bulleted List" class="butClass" src="<%= request.getContextPath() %>/images/editor/bullist.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doBulList()">
+
+        <img alt="Text Color" class="butClass" src="<%= request.getContextPath() %>/images/editor/forecol.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doForeCol()">
+        <img alt="Background Color" class="butClass" src="<%= request.getContextPath() %>/images/editor/bgcol.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doBackCol()">
+
+        <img alt="Hyperlink" class="butClass" src="<%= request.getContextPath() %>/images/editor/link.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doLink()">
+        <img alt="Image" class="butClass" src="<%= request.getContextPath() %>/images/editor/image.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doImage()">
+        <img alt="Horizontal Rule" class="butClass" src="<%= request.getContextPath() %>/images/editor/rule.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doRule()">
+
+    </td>
+    <td class="tdClass" colspan="1" width="20%" align="right">
+      <img alt="Toggle Mode" class="butClass" src="<%= request.getContextPath() %>/images/editor/mode.gif" onMouseOver="selOn(this)" onMouseOut="selOff(this)" onMouseDown="selDown(this)" onMouseUp="selUp(this)" onClick="doToggleView()">
+      &nbsp;&nbsp;&nbsp;
+    </td>
+</tr>
+</table>
+
+<table width="95%" height="30px" border="0" cellspacing="0" cellpadding="0" bgcolor="#D6D3CE">
+<tr>
+    <td id="tblCtrls2" class="tdClass" colspan="1" width="80%">
+      <select id="selFont" onChange="doFont(this.options[this.selectedIndex].value)">
+        <option value="">-- Font --</option>
+        <option value="Arial">Arial</option>
+        <option value="Courier">Courier</option>
+        <option value="Sans Serif">Sans Serif</option>
+        <option value="Tahoma">Tahoma</option>
+        <option value="Verdana">Verdana</option>
+        <option value="Wingdings">Wingdings</option>
+      </select>
+      <select id="selSize" onChange="doSize(this.options[this.selectedIndex].value)">
+        <option value="">-- Size --</option>
+        <option value="1">Very Small</option>
+        <option value="2">Small</option>
+        <option value="3">Medium</option>
+        <option value="4">Large</option>
+        <option value="5">Larger</option>
+        <option value="6">Very Large</option>
+      </select>
+      <select id="selHeading" onChange="doHead(this.options[this.selectedIndex].value)">
+        <option value="">-- Heading --</option>
+        <option value="Heading 1">H1</option>
+        <option value="Heading 2">H2</option>
+        <option value="Heading 3">H3</option>
+        <option value="Heading 4">H4</option>
+        <option value="Heading 5">H5</option>
+        <option value="Heading 6">H6</option>
+      </select>
+    </td>
+</tr>
+
+</table>
+
+<% // hack to support iframe's src attribute doing a call out 
+// No longer needed because form is now session scope
+//session.setAttribute("weblogEntryFormEx", 
+    //request.getAttribute("weblogEntryFormEx")); 
+%>
+<table width="95%" border="0" cellspacing="0" cellpadding="0" >
+<tr>
+    <td><iframe id="iView" width="100%" height="250" tabindex="2">
+        Your browser does not support iframes.  
+        Either change browsers or select a 
+        different editor for your website.</iframe>
+    </td>
+</tr>
+</table>
+<script language="JavaScript">
+    iView.document.designMode = 'On';
+    iView.document.open();
+    iView.document.write(document.weblogEntryFormEx.text.value);
+    iView.document.close();
+</script>
+

Modified: incubator/roller/branches/roller_3.0/web/roller-ui/login-redirect.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/roller-ui/login-redirect.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/roller-ui/login-redirect.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/roller-ui/login-redirect.jsp Mon Jun 12 11:49:26 2006
@@ -26,9 +26,9 @@
 
 if (websites.size() == 1) {
     WebsiteData website = (WebsiteData) websites.get(0);
-    response.sendRedirect(request.getContextPath()+"/editor/weblog.do?method=create&weblog="+website.getHandle());
+    response.sendRedirect(request.getContextPath()+"/roller-ui/authoring/weblog.do?method=create&weblog="+website.getHandle());
 } else {
-    response.sendRedirect(request.getContextPath()+"/editor/yourWebsites.do");
+    response.sendRedirect(request.getContextPath()+"/roller-ui/authoring/yourWebsites.do");
 }
 
 %>

Modified: incubator/roller/branches/roller_3.0/web/roller-ui/scripts/ajax-user.js
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/roller-ui/scripts/ajax-user.js?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/roller-ui/scripts/ajax-user.js (original)
+++ incubator/roller/branches/roller_3.0/web/roller-ui/scripts/ajax-user.js Mon Jun 12 11:49:26 2006
@@ -30,7 +30,7 @@
 var http = createRequestObject();
 var init = false;
 var isBusy = false;
-var userURL = "<%= request.getContextPath() %>" + "/editor/userdata?length=50";
+var userURL = "<%= request.getContextPath() %>" + "/roller-ui/authoring/userdata?length=50";
 
 function onUserNameFocus(enabled) {
     if (!init) {