svn commit: r580211 - in /lenya/branches/revolution/1.3.x/src: java/org/apache/lenya/cms/cocoon/components/source/impl/ java/org/apache/lenya/cms/content/flat/ webapp/lenya/modules/authoring/ webapp/lenya/modules/xinha/ webapp/lenya/modules/xinha/modul...
[email protected] Fri, 28 Sep 2007 03:42:08 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: solprovider
Date: Thu Sep 27 20:42:06 2007
New Revision: 580211
URL: http://svn.apache.org/viewvc?rev=580211&view=rev
Log:
Fixed editing flat content for 1.2's opening sequence. Changed " " to " "; needed to fix Xinha so corrected every occurrence. Tested; current functionality works; updated TODO. (Commit all errors so sending portions.)
Modified:
lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/cocoon/components/source/impl/ContentSourceFactory.java
lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatResource.java
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/authoring/module.xmap
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/XinhaCore.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/Gecko/paraHandlerBest.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/Gecko/paraHandlerDirty.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/GetHtml/DOMwalk.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/InternetExplorer/InternetExplorer.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/CharCounter/char-counter.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/CharacterMap/popups/select_character.html
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ContextMenu/context-menu.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/DefinitionList/definition-list.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ExtendedFileManager/images.php
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ExtendedFileManager/manager.php
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/Filter/filters/word.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FindReplace/find-replace.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/default_form.html
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/form-operations.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/panel.html
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/Forms/forms.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/InsertSmiley/insert-smiley.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/PasteText/paste-text.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/QuickTag/quick-tag.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/SmartReplace/smart-replace.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/SuperClean/filters/word.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/TableOperations/table-operations.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xml/code.js
lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xml/edit.xmap
lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default13/content/resource/0002/en/1189740862906.xml
lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default13/content/resource/0002/en/1190179939593.xml
Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/cocoon/components/source/impl/ContentSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/cocoon/components/source/impl/ContentSourceFactory.java?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/cocoon/components/source/impl/ContentSourceFactory.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/cocoon/components/source/impl/ContentSourceFactory.java Thu Sep 27 20:42:06 2007
@@ -107,12 +107,12 @@
int colonCount = 0;
while(token.equals(":")){
colonCount++;
- token = tokens.nextToken();
+ token = (tokens.hasMoreTokens() ? tokens.nextToken() : "");
}
int slashCount = 0;
while(token.equals("/")){
slashCount++;
- token = tokens.nextToken();
+ token = (tokens.hasMoreTokens() ? tokens.nextToken() : "");
}
int requestType = colonCount - 1;
boolean isFormat2 = false;
@@ -136,28 +136,38 @@
slashCount = (slashCount > slashCount2 ? slashCount : slashCount2);
}
// System.out.println("SL=" + slashCount + "TOK=" + token);
- String structure = "";
- String unid = "";
- String fullid = "";
- if(slashCount == 1){
- if(tokens.hasMoreTokens()){
- slashCount = 0;
- }else unid = token;
- }
- if((slashCount == 0) || (slashCount == 2)){
- structure = token;
- }
- if((slashCount == 0) || (slashCount == 2) || (slashCount == 3)){
- StringBuffer buffer = new StringBuffer();
- while(tokens.hasMoreTokens())
- buffer.append(tokens.nextToken());
- fullid = buffer.toString();
- }
- // Convert fullid to unid
- if(unid.length() < 1){
- unid = content.getUNID(structure, fullid);
- }
- // Defaults
+ // ## Decide UNID
+ // String structure = "";
+ // String unid = "";
+ // String fullid = "";
+ // if(slashCount == 1){
+ // if(tokens.hasMoreTokens()){
+ // slashCount = 0;
+ // }else unid = token;
+ // }
+ // if((slashCount == 0) || (slashCount == 2)){
+ // structure = token;
+ // }
+ // if((slashCount == 0) || (slashCount == 2) || (slashCount == 3)){
+ // StringBuffer buffer = new StringBuffer();
+ // while(tokens.hasMoreTokens())
+ // buffer.append(tokens.nextToken());
+ // fullid = buffer.toString();
+ // }
+ // // Convert fullid to unid
+ // if(unid.length() < 1){
+ // unid = content.getUNID(structure, fullid);
+ // }
+ // ## 20070927 solprovider: This rewrite did not work. Simpler is good. Test later.
+ String structure = (2 < slashCount ? "" : token);
+ String unid = token;
+ StringBuffer buffer = new StringBuffer();
+ while(tokens.hasMoreTokens())
+ buffer.append(tokens.nextToken());
+ String fullid = buffer.toString();
+ if((1 < slashCount) || (0 < fullid.length())) unid = content.getUNID(structure, fullid);
+ // ASSUME: UNID
+ // ## Defaults
if(language.length() < 1){
Resource resource = content.getResource(unid);
if(resource != null) language = resource.getDefaultLanguage();
Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatResource.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatResource.java?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatResource.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatResource.java Thu Sep 27 20:42:06 2007
@@ -265,7 +265,7 @@
return newElement;
}
public Document update(Document document) {
- System.out.println("FlatResource.update - BEGIN");
+ // System.out.println("FlatResource.update - BEGIN");
Element root = document.getDocumentElement();
if(root.hasAttribute("id")) setID(root.getAttribute("id"));
if(root.hasAttribute("defaultlanguage")) setDefaultLanguage(root.getAttribute("defaultlanguage"));
@@ -285,12 +285,12 @@
exist = false;
}
}
- System.out.println("FlatResource.update - Get translation");
+ // System.out.println("FlatResource.update - Get translation");
if(exist){
ft = getTranslation(language, false);
if(null == ft) exist = false;
}
- System.out.println("FlatResource.update - Update Translation");
+ // System.out.println("FlatResource.update - Update Translation");
if(exist){
if(translation.hasAttribute("live")) ft.setLive(translation.getAttribute("live"));
if(translation.hasAttribute("edit")) ft.setEdit(translation.getAttribute("edit"));
@@ -312,7 +312,7 @@
ft.save();
}
}
- System.out.println("FlatResource.update - RETURN");
+ // System.out.println("FlatResource.update - RETURN");
return document;
}
private void setID(String newid) {
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/authoring/module.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/authoring/module.xmap?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/authoring/module.xmap (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/authoring/module.xmap Thu Sep 27 20:42:06 2007
@@ -62,8 +62,7 @@
<map:parameter name="parameter-selector-test" value="{publication:contenttype}"/>
<map:when test="flat">
<map:act type="resource-exists" src="module://edit/module.xmap">
- <map:generate src="cocoon://{publication:publication}/edit/module.xmap"/>
- <map:serialize type="html"/>
+ <map:redirect-to uri="/{publication:publication}/edit"/>
</map:act>
</map:when>
</map:select>
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/XinhaCore.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/XinhaCore.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/XinhaCore.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/XinhaCore.js Thu Sep 27 20:42:06 2007
@@ -2843,7 +2843,7 @@
str=str.replace(/&/ig,"&");
str=str.replace(/</ig,"<");
str=str.replace(/>/ig,">");
-str=str.replace(/\xA0/g," ");
+str=str.replace(/\xA0/g," ");
str=str.replace(/\x22/g,""");
return str;
};
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/Gecko/paraHandlerBest.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/Gecko/paraHandlerBest.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/Gecko/paraHandlerBest.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/Gecko/paraHandlerBest.js Thu Sep 27 20:42:06 2007
@@ -186,7 +186,7 @@
fill=this.forEachNodeUnder(cnt,"find_fill","ltr",false);
if(fill&&this._pifySibling.test(_33.nodeName)&&((pifyOffset==0)||(pifyOffset==1&&this._pifyForced.test(_33.nodeName)))){
_29=_30._doc.createElement("p");
-_29.innerHTML=" ";
+_29.innerHTML=" ";
if((_28=="left")&&_33.previousSibling){
return new Array(_33.previousSibling,"AfterEnd",_29);
}else{
@@ -203,11 +203,11 @@
}
if((fill.nodeType==1&&!this._elemSolid.test())||fill.nodeType==11){
var _34=_30._doc.createElement("p");
-_34.innerHTML=" ";
+_34.innerHTML=" ";
fill.appendChild(_34);
}else{
var _34=_30._doc.createElement("p");
-_34.innerHTML=" ";
+_34.innerHTML=" ";
fill.parentNode.insertBefore(parentNode,fill);
}
}
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/Gecko/paraHandlerDirty.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/Gecko/paraHandlerDirty.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/Gecko/paraHandlerDirty.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/Gecko/paraHandlerDirty.js Thu Sep 27 20:42:06 2007
@@ -96,7 +96,7 @@
df.appendChild(nb);
}
if(!(/\S/.test(_b.innerHTML))){
-_b.innerHTML=" ";
+_b.innerHTML=" ";
}
p=df.firstChild;
if(!(/\S/.test(p.innerHTML))){
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/GetHtml/DOMwalk.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/GetHtml/DOMwalk.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/GetHtml/DOMwalk.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/GetHtml/DOMwalk.js Thu Sep 27 20:42:06 2007
@@ -126,7 +126,7 @@
}
if(_a!==""){
if(_b&&_d=="p"){
-_a+="> </p>";
+_a+="> </p>";
}else{
if(_b){
_a+=" />";
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/InternetExplorer/InternetExplorer.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/InternetExplorer/InternetExplorer.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/InternetExplorer/InternetExplorer.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/modules/InternetExplorer/InternetExplorer.js Thu Sep 27 20:42:06 2007
@@ -56,10 +56,12 @@
};
InternetExplorer.prototype.inwardHtml=function(_9){
_9=_9.replace(/<(\/?)del(\s|>|\/)/ig,"<$1strike$2");
-_9=_9.replace(/( )?([\s\S]*?)(<script|<!--)/i,"$2 $3");
+_9=_9.replace(/( )?([\s\S]*?)(<script|<!--)/i,"$2 $3");
+_9=_9.replace(/( )?([\s\S]*?)(<script|<!--)/i,"$2&$160;$3");
return _9;
};
InternetExplorer.prototype.outwardHtml=function(_a){
+_a=_a.replace(/ (\s*)(<script|<!--)/i,"$1$2");
_a=_a.replace(/ (\s*)(<script|<!--)/i,"$1$2");
return _a;
};
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/CharCounter/char-counter.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/CharCounter/char-counter.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/CharCounter/char-counter.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/CharCounter/char-counter.js Thu Sep 27 20:42:06 2007
@@ -57,6 +57,7 @@
_a=_a.replace(/<\/?\s*!--[^-->]*-->/gi,"");
_a=_a.replace(/<(.+?)>/g,"");
_a=_a.replace(/ /gi," ");
+_a=_a.replace(/ /gi," ");
_a=_a.replace(/([\n\r\t])/g," ");
_a=_a.replace(/( +)/g," ");
_a=_a.replace(/&(.*);/g," ");
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/CharacterMap/popups/select_character.html
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/CharacterMap/popups/select_character.html?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/CharacterMap/popups/select_character.html (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/CharacterMap/popups/select_character.html Thu Sep 27 20:42:06 2007
@@ -176,7 +176,7 @@
<td class="character" onmouseover="View(this,'&OElig;')" onclick="Set('Œ')">Œ</td>
<td class="character" onmouseover="View(this,'&oelig;')" onclick="Set('œ')">œ</td>
<td class="character" onmouseover="View(this,'&Scaron;')" onclick="Set('Š')">Š</td>
-<td class="character" colspan="4"> </td>
+<td class="character" colspan="4"> </td>
</tr>
</table><br>
<form action="#"><button type="button" id="cancel" name="cancel" onclick="return onCancel();">Cancel</button></form>
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ContextMenu/context-menu.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ContextMenu/context-menu.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ContextMenu/context-menu.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ContextMenu/context-menu.js Thu Sep 27 20:42:06 2007
@@ -298,7 +298,7 @@
var _3a=">";
if(HTMLArea.is_ie){
td.unselectable="on";
-_3a=" unselectable='on' style='height=1px'> ";
+_3a=" unselectable='on' style='height=1px'> ";
}
td.innerHTML="<div"+_3a+"</div>";
var td1=td.cloneNode(true);
@@ -337,7 +337,7 @@
td2.innerHTML=_3c;
_37.onmouseover=function(){
this.className+=" hover";
-_20.editor._statusBarTree.innerHTML=this.__msh.tooltip||" ";
+_20.editor._statusBarTree.innerHTML=this.__msh.tooltip||" ";
};
_37.onmouseout=function(){
this.className="item";
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/DefinitionList/definition-list.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/DefinitionList/definition-list.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/DefinitionList/definition-list.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/DefinitionList/definition-list.js Thu Sep 27 20:42:06 2007
@@ -41,7 +41,7 @@
pe=pe.parentNode;
}
var dx=_e._doc.createElement(_f);
-dx.innerHTML=" ";
+dx.innerHTML=" ";
if(pe.parentNode.lastChild==pe){
pe.parentNode.appendChild(dx);
}else{
@@ -53,13 +53,13 @@
while(pe&&(pe.nodeType==1)&&(pe.tagName.toLowerCase()!="body")){
if(pe.tagName.toLowerCase()=="dl"){
var dx=_e._doc.createElement(_f);
-dx.innerHTML=" ";
+dx.innerHTML=" ";
pe.appendChild(dx);
break;
}else{
if((pe.tagName.toLowerCase()=="dt")||(pe.tagName.toLowerCase()=="dd")){
var dx=_e._doc.createElement(_f);
-dx.innerHTML=" ";
+dx.innerHTML=" ";
if(pe.parentNode.lastChild==pe){
pe.parentNode.appendChild(dx);
}else{
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ExtendedFileManager/images.php
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ExtendedFileManager/images.php?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ExtendedFileManager/images.php (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ExtendedFileManager/images.php Thu Sep 27 20:42:06 2007
@@ -74,7 +74,7 @@
?>
<table class="listview">
<thead>
- <tr><th colspan="2">Name</th><th>Size</th><th>Image Size</th><th>Date Modified</th><th> </th></tr></thead>
+ <tr><th colspan="2">Name</th><th>Size</th><th>Image Size</th><th>Date Modified</th><th> </th></tr></thead>
<tbody>
<?php
// start of foreach for draw listview folders .
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ExtendedFileManager/manager.php
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ExtendedFileManager/manager.php?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ExtendedFileManager/manager.php (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/ExtendedFileManager/manager.php Thu Sep 27 20:42:06 2007
@@ -207,7 +207,7 @@
<tr>
<td align="right"><?php if($insertMode=='image') { ?> <label for="f_width">Width</label><?php }?></td>
- <td><?php if($insertMode=='image') { ?> <input type="text" id="f_width" class="smallWidth" value="" onchange="javascript:checkConstrains('width');"/><?php } else echo " ";?></td>
+ <td><?php if($insertMode=='image') { ?> <input type="text" id="f_width" class="smallWidth" value="" onchange="javascript:checkConstrains('width');"/><?php } else echo "            ";?></td>
<td rowspan="2"><?php if($insertMode=='image') { ?><img src="<?php print $IMConfig['base_url'];?>img/locked.gif" id="imgLock" width="25" height="32" alt="Constrained Proportions" />
<input type="hidden" id="orginal_width" />
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/Filter/filters/word.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/Filter/filters/word.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/Filter/filters/word.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/Filter/filters/word.js Thu Sep 27 20:42:06 2007
@@ -33,7 +33,7 @@
// Remove Tags with XML namespace declarations: <o:p></o:p>
html = html.replace(/<\/?\w+:[^>]*>/gi, "") ;
// Replace the
- html = html.replace(/ /, " " );
+ html = html.replace(/ /, " " ).replace(/ /, " " );
// Transform <p><br /></p> to <br>
//html = html.replace(/<\s*p[^>]*>\s*<\s*br\s*\/>\s*<\/\s*p[^>]*>/gi, "<br>");
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FindReplace/find-replace.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FindReplace/find-replace.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FindReplace/find-replace.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FindReplace/find-replace.js Thu Sep 27 20:42:06 2007
@@ -20,7 +20,7 @@
var sel = editor.getSelectedHTML();
if(/\w/.test(sel)) {
sel = sel.replace(/<[^>]*>/g,"");
- sel = sel.replace(/ /g,"");
+ sel = sel.replace(/ /g,"").replace(/&$160;/g,"");
}
var param = /\w/.test(sel) ? {fr_pattern: sel} : null;
editor._popupDialog("plugin://FindReplace/find_replace", null, param);
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/default_form.html
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/default_form.html?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/default_form.html (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/default_form.html Thu Sep 27 20:42:06 2007
@@ -32,5 +32,5 @@
</tr>
</tbody>
</table>
- <input type="submit" value="Send" /> <input type="reset" value="Reset" />
+ <input type="submit" value="Send" />    <input type="reset" value="Reset" />
</form>
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/form-operations.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/form-operations.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/form-operations.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/form-operations.js Thu Sep 27 20:42:06 2007
@@ -29,7 +29,7 @@
if(_1.config.FormOperations.default_form_html){
_8=pasteAndSelect(_1.config.FormOperations.default_form_html);
}else{
-_8=pasteAndSelect("<form> </form>");
+_8=pasteAndSelect("<form> </form>");
}
if(_1.config.FormOperations.default_form_action&&!_8.action){
_8.action=_1.config.FormOperations.default_form_action;
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/panel.html
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/panel.html?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/panel.html (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/FormOperations/panel.html Thu Sep 27 20:42:06 2007
@@ -21,8 +21,8 @@
<td>
<input type="text" name="[text_name]" id="[text_name]" size="25" />
</td>
- <th> </th>
- <td> </td>
+ <th> </th>
+ <td> </td>
</tr>
<tr>
<th>Type:</th>
@@ -112,8 +112,8 @@
<option value="reset">Reset</option>
</select>
</td>
- <td> </td>
- <td> </td>
+ <td> </td>
+ <td> </td>
</tr>
</table>
</fieldset>
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/Forms/forms.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/Forms/forms.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/Forms/forms.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/Forms/forms.js Thu Sep 27 20:42:06 2007
@@ -96,7 +96,7 @@
frm+=" target=\""+_1b["f_target"]+"\"";
}
frm+=">";
-_10.surroundHTML(frm," </form>");
+_10.surroundHTML(frm," </form>");
}
}
},_15);
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html Thu Sep 27 20:42:06 2007
@@ -118,7 +118,7 @@
<td class="chooser" id="hrpv"
onmouseover="document.getElementById('hrbtn').style.borderColor='black'"
onmouseout="document.getElementById('hrbtn').style.borderColor='ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight'"
- > </td>
+ > </td>
<td class="nocolor" id="hrclr"
onmouseover="document.getElementById('hrclr').style.color='#f00'"
onmouseout="document.getElementById('hrclr').style.color='#000'"
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/InsertSmiley/insert-smiley.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/InsertSmiley/insert-smiley.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/InsertSmiley/insert-smiley.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/InsertSmiley/insert-smiley.js Thu Sep 27 20:42:06 2007
@@ -41,7 +41,7 @@
InsertSmiley.prototype.buttonPress = function(editor) {
var self = this;
- var sel = editor.getSelectedHTML().replace(/(<[^>]*>| |\n|\r)/g,"");
+ var sel = editor.getSelectedHTML().replace(/(<[^>]*>| |\n|\r)/g,"").replace(/(<[^>]*>| |\n|\r)/g,"");
var param = new Object();
param.editor = editor;
param.editor_url = _editor_url;
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/PasteText/paste-text.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/PasteText/paste-text.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/PasteText/paste-text.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/PasteText/paste-text.js Thu Sep 27 20:42:06 2007
@@ -53,7 +53,7 @@
html = html.replace(/>/g, ">");
if ( ret.insertParagraphs)
{
- html = html.replace(/\t/g," ");
+ html = html.replace(/\t/g,"    ");
html = html.replace(/\n/g,"</p><p>");
html="<p>" + html + "</p>";
if (Xinha.is_ie)
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/QuickTag/quick-tag.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/QuickTag/quick-tag.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/QuickTag/quick-tag.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/QuickTag/quick-tag.js Thu Sep 27 20:42:06 2007
@@ -23,7 +23,7 @@
QuickTag.prototype.buttonPress = function(editor) {
var self = this;
-var sel = editor.getSelectedHTML().replace(/(<[^>]*>| |\n|\r)/g,"");
+var sel = editor.getSelectedHTML().replace(/(<[^>]*>| |\n|\r)/g,"");
var param = new Object();
param.editor = editor;
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/SmartReplace/smart-replace.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/SmartReplace/smart-replace.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/SmartReplace/smart-replace.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/SmartReplace/smart-replace.js Thu Sep 27 20:42:06 2007
@@ -133,6 +133,7 @@
_1b=_1b.replace(_1e,"$1"+this.closingQuotes);
var _1f=new RegExp("(\\S)("+_1a.join("|")+")","g");
_1b=_1b.replace(_1f,"$1"+this.closingQuote);
+// 20070927 solprovider: Did not change this while fixing " " -> " ".
var _20=new RegExp("( | )(-)( | )","g");
_1b=_1b.replace(_20," "+String.fromCharCode(8211)+" ");
this.editor.setHTML(_1b);
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/SuperClean/filters/word.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/SuperClean/filters/word.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/SuperClean/filters/word.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/SuperClean/filters/word.js Thu Sep 27 20:42:06 2007
@@ -33,7 +33,7 @@
// Remove Tags with XML namespace declarations: <o:p></o:p>
html = html.replace(/<\/?\w+:[^>]*>/gi, "") ;
// Replace the
- html = html.replace(/ /, " " );
+ html = html.replace(/ /, " " ).replace(/&$160;/, " " );
// Transform <p><br /></p> to <br>
//html = html.replace(/<\s*p[^>]*>\s*<\s*br\s*\/>\s*<\/\s*p[^>]*>/gi, "<br>");
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/TableOperations/table-operations.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/TableOperations/table-operations.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/TableOperations/table-operations.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xinha/plugins/TableOperations/table-operations.js Thu Sep 27 20:42:06 2007
@@ -118,7 +118,7 @@
return val?" selected":"";
}
_1a.content.style.width="400px";
-_1a.content.innerHTML=" <div class='title'>"+HTMLArea._lc("Table Properties","TableOperations")+"</div> <table style='width:100%'> <tr> <td> <fieldset><legend>"+HTMLArea._lc("Description","TableOperations")+"</legend> <table style='width:100%'> <tr> <td class='label'>"+HTMLArea._lc("Caption","TableOperations")+":</td> <td class='value'><input type='text' name='f_caption' value='"+_1b+"'/></td> </tr><tr> <td class='label'>"+HTMLArea._lc("Summary","TableOperations")+":</td> <td class='value'><input type='text' name='f_summary' value='"+_1d+"'/></td> </tr> </table> </fieldset> </td> </tr> <tr><td id='--HA-layout'></td></tr> <tr> <td> <fieldset><legend>"+HTMLArea._lc("Spacing an
d padding","TableOperations")+"</legend> <table style='width:100%'> "+" <tr> <td class='label'>"+HTMLArea._lc("Spacing","TableOperations")+":</td> <td><inpu
t type='text' name='f_spacing' size='5' value='"+_21+"' /> "+HTMLArea._lc("Padding","TableOperations")+": <input type='text' name='f_padding' size='5' value='"+_22+"' /> "+HTMLArea._lc("pixels","TableOperations")+" </td> </tr> </table> </fieldset> </td> </tr> <tr> <td> <fieldset><legend>"+HTMLArea._lc("Frame and borders","TableOperations")+"</legend> <table width='100%'> <tr> <td class='label'>"+HTMLArea._lc("Borders","TableOperations")+":</td> <td><input name='f_borders' type='text' size='5' value='"+_23+"' /> "+HTMLArea._lc("pixels","TableOperations")+"</td> </tr> <tr> <td class='label'>"+HTMLArea._lc("Frames","TableOperations
")+":</td> <td> <select name='f_frames'> <option value='void'"+selected(_24=="void")+">"+HTMLArea._lc("No sides","TableOperations")+"</option>
<option value='above'"+selected(_24=="above")+">"+HTMLArea._lc("The top side only","TableOperations")+"</option> <option value='below'"+selected(_24=="below")+">"+HTMLArea._lc("The bottom side only","TableOperations")+"</option> <option value='hsides'"+selected(_24=="hsides")+">"+HTMLArea._lc("The top and bottom sides only","TableOperations")+"</option> <option value='vsides'"+selected(_24=="vsides")+">"+HTMLArea._lc("The right and left sides only","TableOperations")+"</option> <option value='lhs'"+selected(_24=="lhs")+">"+HTMLArea._lc("The left-hand side only","TableOperations")+"</option> <option value='rhs'"+selected(_24=="rhs")+">"+HTMLArea._lc("The right-hand side only","TableOperations")+"</op
tion> <option value='box'"+selected(_24=="box")+">"+HTMLArea._lc("All four sides","TableOperations")+"</option> </select> </td> </tr>
<tr> <td class='label'>"+HTMLArea._lc("Rules","TableOperations")+":</td> <td> <select name='f_rules'> <option value='none'"+selected(_25=="none")+">"+HTMLArea._lc("No rules","TableOperations")+"</option> <option value='rows'"+selected(_25=="rows")+">"+HTMLArea._lc("Rules will appear between rows only","TableOperations")+"</option> <option value='cols'"+selected(_25=="cols")+">"+HTMLArea._lc("Rules will appear between columns only","TableOperations")+"</option> <option value='all'"+selected(_25=="all")+">"+HTMLArea._lc("Rules will appear between all rows and columns","TableOperations")+"</option> </select> </td> </tr> </table> </field
set> </td> </tr> <tr> <td id='--HA-style'></td> </tr> </table> ";
+_1a.content.innerHTML=" <div class='title'>"+HTMLArea._lc("Table Properties","TableOperations")+"</div> <table style='width:100%'> <tr> <td> <fieldset><legend>"+HTMLArea._lc("Description","TableOperations")+"</legend> <table style='width:100%'> <tr> <td class='label'>"+HTMLArea._lc("Caption","TableOperations")+":</td> <td class='value'><input type='text' name='f_caption' value='"+_1b+"'/></td> </tr><tr> <td class='label'>"+HTMLArea._lc("Summary","TableOperations")+":</td> <td class='value'><input type='text' name='f_summary' value='"+_1d+"'/></td> </tr> </table> </fieldset> </td> </tr> <tr><td id='--HA-layout'></td></tr> <tr> <td> <fieldset><legend>"+HTMLArea._lc("Spacing an
d padding","TableOperations")+"</legend> <table style='width:100%'> "+" <tr> <td class='label'>"+HTMLArea._lc("Spacing","TableOperations")+":</td> <td><inpu
t type='text' name='f_spacing' size='5' value='"+_21+"' />  "+HTMLArea._lc("Padding","TableOperations")+": <input type='text' name='f_padding' size='5' value='"+_22+"' />   "+HTMLArea._lc("pixels","TableOperations")+" </td> </tr> </table> </fieldset> </td> </tr> <tr> <td> <fieldset><legend>"+HTMLArea._lc("Frame and borders","TableOperations")+"</legend> <table width='100%'> <tr> <td class='label'>"+HTMLArea._lc("Borders","TableOperations")+":</td> <td><input name='f_borders' type='text' size='5' value='"+_23+"' />   "+HTMLArea._lc("pixels","TableOperations")+"</td> </tr> <tr> <td class='label'>"+HTMLArea._lc("Frames","TableOperations
")+":</td> <td> <select name='f_frames'> <option value='void'"+selected(_24=="void")+">"+HTMLArea._lc("No sides","TableOperations")+"</option>
<option value='above'"+selected(_24=="above")+">"+HTMLArea._lc("The top side only","TableOperations")+"</option> <option value='below'"+selected(_24=="below")+">"+HTMLArea._lc("The bottom side only","TableOperations")+"</option> <option value='hsides'"+selected(_24=="hsides")+">"+HTMLArea._lc("The top and bottom sides only","TableOperations")+"</option> <option value='vsides'"+selected(_24=="vsides")+">"+HTMLArea._lc("The right and left sides only","TableOperations")+"</option> <option value='lhs'"+selected(_24=="lhs")+">"+HTMLArea._lc("The left-hand side only","TableOperations")+"</option> <option value='rhs'"+selected(_24=="rhs")+">"+HTMLArea._lc("The right-hand side only","TableOperations")+"</op
tion> <option value='box'"+selected(_24=="box")+">"+HTMLArea._lc("All four sides","TableOperations")+"</option> </select> </td> </tr>
<tr> <td class='label'>"+HTMLArea._lc("Rules","TableOperations")+":</td> <td> <select name='f_rules'> <option value='none'"+selected(_25=="none")+">"+HTMLArea._lc("No rules","TableOperations")+"</option> <option value='rows'"+selected(_25=="rows")+">"+HTMLArea._lc("Rules will appear between rows only","TableOperations")+"</option> <option value='cols'"+selected(_25=="cols")+">"+HTMLArea._lc("Rules will appear between columns only","TableOperations")+"</option> <option value='all'"+selected(_25=="all")+">"+HTMLArea._lc("Rules will appear between all rows and columns","TableOperations")+"</option> </select> </td> </tr> </table> </field
set> </td> </tr> <tr> <td id='--HA-style'></td> </tr> </table> ";
var _27=TableOperations.createStyleFieldset(_1a.doc,_1a.editor,_12);
var p=_1a.doc.getElementById("--HA-style");
p.appendChild(_27);
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xml/code.js
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xml/code.js?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xml/code.js (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xml/code.js Thu Sep 27 20:42:06 2007
@@ -29,10 +29,10 @@
var content = pub.getContent();
var resource = content.getResource(unid);
//Input
-print("####### XML RESOURCE UPDATE BEGIN #######");
+//print("####### XML RESOURCE UPDATE BEGIN #######");
var dom = loadDocument("cocoon:/" + module + "/savedata/" + unid);
var root = dom.getDocumentElement();
-print("ROOT=" + root.getTagName());
+//print("ROOT=" + root.getTagName());
var child = root.getFirstChild();
while(child != null){
var childtag = child.getNodeName();
@@ -56,7 +56,7 @@
}
function create(){
- print("####### XML CREATE REVISION #######");
+// print("####### XML CREATE REVISION #######");
var module = cocoon.parameters.module;
var unid = cocoon.parameters.unid;
var dom = loadDocument("cocoon:/" + module + "/saverevisiondata/" + unid);
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xml/edit.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xml/edit.xmap?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xml/edit.xmap (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xml/edit.xmap Thu Sep 27 20:42:06 2007
@@ -5,14 +5,16 @@
<map:pipelines>
<map:pipeline>
<!-- Remove Revision -->
+<!-- Was this a bad idea from last year? -->
<map:match pattern="edit/*!*">
<map:generate src="cocoon:/edit/{1}"/>
<map:serialize type="html"/>
</map:match>
<!-- Show Resource -->
- <map:match pattern="edit/*">
+ <map:match pattern="edit/*">
+ <map:act type="resource-exists" src="content:::/{1}">
<map:aggregate element="content">
- <map:part src="content:::/{1}!edit"/>
+ <map:part src="content:::/{../1}!edit"/>
</map:aggregate>
<map:transform src="module:///resource.xsl">
<map:parameter name="module" value="{module:module}"/>
@@ -22,7 +24,10 @@
</map:transform>
<map:transform type="i18n"/>
<map:serialize type="html"/>
- </map:match>
+ </map:act>
+ </map:match>
+<!-- BUG Cocoon: map:handle-errors does not work here. -->
+
</map:pipeline>
</map:pipelines>
</map:sitemap>
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default13/content/resource/0002/en/1189740862906.xml
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default13/content/resource/0002/en/1189740862906.xml?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default13/content/resource/0002/en/1189740862906.xml (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default13/content/resource/0002/en/1189740862906.xml Thu Sep 27 20:42:06 2007
@@ -41,7 +41,7 @@
<body>
<h1>Document Type Examples</h1>
- <p>The default publication comes with the <a href="/lenya/default/authoring/doctypes/xhtml-document.html">XHTML Doctype</a>.</p>
+ <p>The default publication comes with the <a href="/default13/live/doctypes/xhtml-document.html">XHTML Doctype</a>.</p>
<p>The XHTML Doctype is for situations where
users ask for complete freedom on what information can be inserted
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default13/content/resource/0002/en/1190179939593.xml
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default13/content/resource/0002/en/1190179939593.xml?rev=580211&r1=580210&r2=580211&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default13/content/resource/0002/en/1190179939593.xml (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default13/content/resource/0002/en/1190179939593.xml Thu Sep 27 20:42:06 2007
@@ -43,7 +43,7 @@
<body>
<h1>Document Type Examples</h1>
- <p>The default publication comes with the <a href="/lenya/default/authoring/doctypes/xhtml-document.html">XHTML Doctype</a>.</p>
+ <p>The default publication comes with the <a href="/default13/live/doctypes/xhtml-document.html">XHTML Doctype</a>.</p>
<p>The XHTML Doctype allows complete freedom of what information and formatting
can be inserted into a document. While this approach is very flexible, it also