Re: [xwiki-devs] [xwiki-notifications] r13009 - platform/web/trunk/standard/src/main/webapp/templates
mflorea (SVN) wrote:
Author: mflorea Date: 2008-09-26 12:48:14 +0200 (Fri, 26 Sep 2008) New Revision: 13009
Modified: platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm Log: The teletype feature will be included in 1.7 so I removed it from the tool bar. I also changed the way the editor loads. Now it gets as input HTML and not wiki syntax. This way the editor loads faster.
The textarea held wiki markup, so that in case JS is disabled, the user can still edit the content. Is it OK to break this? Will such a user know to open the wiki editor instead? Should there be 2 textareas, one with the wiki markup, and a hidden one with the HTML content?
Modified: platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm =================================================================== --- platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm 2008-09-26 10:45:11 UTC (rev 13008) +++ platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm 2008-09-26 10:48:14 UTC (rev 13009) @@ -26,14 +26,14 @@ <link rel="stylesheet" href="${request.contextPath}/com.xpn.xwiki.wysiwyg.Wysiwyg/Wysiwyg.css" /> <script type="text/javascript" src="${request.contextPath}/com.xpn.xwiki.wysiwyg.Wysiwyg/com.xpn.xwiki.wysiwyg.Wysiwyg.nocache.js"></script> <iframe src="javascript:''" id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe> -$xwiki.getTextArea($tdoc.content) +$xwiki.getTextArea($xwiki.wysiwyg.toHTML($tdoc.content, $doc.syntaxId)) <script type="text/javascript"> //<![CDATA[ var Wysiwyg0 = { hookId: 'content', syntax: "$doc.syntaxId", plugins: 'separator text valign list indent undo format symbol', - toolbar: 'bold italic underline strikethrough teletype | subscript superscript | unorderedlist orderedlist | outdent indent | undo redo | format | hr symbol', + toolbar: 'bold italic underline strikethrough | subscript superscript | unorderedlist orderedlist | outdent indent | undo redo | format | hr symbol', debug: #if($request.debug)'true'#else'false'#end }; //]]>
-- Sergiu Dumitriu http://purl.org/net/sergiu/
Sergiu Dumitriu wrote:
mflorea (SVN) wrote:
Author: mflorea Date: 2008-09-26 12:48:14 +0200 (Fri, 26 Sep 2008) New Revision: 13009
Modified: platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm Log: The teletype feature will be included in 1.7 so I removed it from the tool bar. I also changed the way the editor loads. Now it gets as input HTML and not wiki syntax. This way the editor loads faster.
The textarea held wiki markup, so that in case JS is disabled, the user can still edit the content. Is it OK to break this? Will such a user know to open the wiki editor instead? Should there be 2 textareas, one with the wiki markup, and a hidden one with the HTML content?
I'll try.
Modified: platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm =================================================================== --- platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm 2008-09-26 10:45:11 UTC (rev 13008) +++ platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm 2008-09-26 10:48:14 UTC (rev 13009) @@ -26,14 +26,14 @@ <link rel="stylesheet" href="${request.contextPath}/com.xpn.xwiki.wysiwyg.Wysiwyg/Wysiwyg.css" /> <script type="text/javascript" src="${request.contextPath}/com.xpn.xwiki.wysiwyg.Wysiwyg/com.xpn.xwiki.wysiwyg.Wysiwyg.nocache.js"></script> <iframe src="javascript:''" id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe> -$xwiki.getTextArea($tdoc.content) +$xwiki.getTextArea($xwiki.wysiwyg.toHTML($tdoc.content, $doc.syntaxId)) <script type="text/javascript"> //<![CDATA[ var Wysiwyg0 = { hookId: 'content', syntax: "$doc.syntaxId", plugins: 'separator text valign list indent undo format symbol', - toolbar: 'bold italic underline strikethrough teletype | subscript superscript | unorderedlist orderedlist | outdent indent | undo redo | format | hr symbol', + toolbar: 'bold italic underline strikethrough | subscript superscript | unorderedlist orderedlist | outdent indent | undo redo | format | hr symbol', debug: #if($request.debug)'true'#else'false'#end }; //]]>
Could we put a test beforehand ? Like, if we know the browser has Javascript deactivated, automatically send the user to the wiki editor when he clicks on edit ? I don't know if that can be done without javascript itself being activated to test whether JS is activated or not... Is there a way to do that on the server side somehow ? Because it would be cleaner / easier... Guillaume On Fri, Sep 26, 2008 at 2:06 PM, Marius Dumitru Florea < [email protected]> wrote:
Sergiu Dumitriu wrote:
mflorea (SVN) wrote:
Author: mflorea Date: 2008-09-26 12:48:14 +0200 (Fri, 26 Sep 2008) New Revision: 13009
Modified:
platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm
Log: The teletype feature will be included in 1.7 so I removed it from the tool bar. I also changed the way the editor loads. Now it gets as input HTML and not wiki syntax. This way the editor loads faster.
The textarea held wiki markup, so that in case JS is disabled, the user can still edit the content. Is it OK to break this? Will such a user know to open the wiki editor instead? Should there be 2 textareas, one with the wiki markup, and a hidden one with the HTML content?
I'll try.
Modified:
platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm
=================================================================== --- platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm 2008-09-26 10:45:11 UTC (rev 13008) +++ platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm 2008-09-26 10:48:14 UTC (rev 13009) @@ -26,14 +26,14 @@ <link rel="stylesheet" href="${request.contextPath}/com.xpn.xwiki.wysiwyg.Wysiwyg/Wysiwyg.css" /> <script type="text/javascript" src="${request.contextPath}/com.xpn.xwiki.wysiwyg.Wysiwyg/com.xpn.xwiki.wysiwyg.Wysiwyg.nocache.js"></script> <iframe src="javascript:''" id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe> -$xwiki.getTextArea($tdoc.content) +$xwiki.getTextArea($xwiki.wysiwyg.toHTML($tdoc.content, $doc.syntaxId)) <script type="text/javascript"> //<![CDATA[ var Wysiwyg0 = { hookId: 'content', syntax: "$doc.syntaxId", plugins: 'separator text valign list indent undo format symbol', - toolbar: 'bold italic underline strikethrough teletype | subscript superscript | unorderedlist orderedlist | outdent indent | undo redo | format | hr symbol', + toolbar: 'bold italic underline strikethrough | subscript superscript | unorderedlist orderedlist | outdent indent | undo redo | format | hr symbol', debug: #if($request.debug)'true'#else'false'#end }; //]]>
_______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
-- Guillaume Lerouge Product Manager - XWiki Skype ID : wikibc http://blog.xwiki.com/
participants (3)
-
Guillaume Lerouge -
Marius Dumitru Florea -
Sergiu Dumitriu