knguyen 2004/12/09 15:41:58 CET
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/views/jsp/jahia/htmleditors/htmlarea
htmlarea_htmleditor.jsp
src/views/jsp/jahia/htmleditors/htmlarea/lang de.js
Added files: (Branch: JAHIA-4-0-BRANCH)
src/views/jsp/jahia/htmleditors/htmlarea/examples
character_map.html
dynamic_css.html
empty.html
src/views/jsp/jahia/htmleditors/htmlarea/images Thumbs.db
src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap
character-map.js
src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/img
ed_charmap.gif
src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang
de.js
en.js
es.js
fr.js
it.js
src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/popups
select_character.html
src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS
dynamiccss.js
src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang
de.js
en.js
es.js
fr.js
it.js
src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang
de.js
en.js
es.js
fr.js
it.js
src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType
list-type.js
Log:
- added some new plugins from Rc1 taken from cvs
Revision Changes Path
1.1.2.1 +33 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/examples/character_map.html (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/examples/character_map.html?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +44 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/examples/dynamic_css.html (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/examples/dynamic_css.html?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +22 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/examples/empty.html (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/examples/empty.html?rev=1.1.2.1&content-type=text/plain
1.1.2.9 +19 -4
jahia/src/views/jsp/jahia/htmleditors/htmlarea/htmlarea_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/htmlarea_htmleditor.jsp.diff?r1=1.1.2.8&r2=1.1.2.9&f=h
1.1.2.1 +318 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/images/Thumbs.db (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/images/Thumbs.db?rev=1.1.2.1&content-type=text/plain
1.1.2.3 +2 -1 jahia/src/views/jsp/jahia/htmleditors/htmlarea/lang/de.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/lang/de.js.diff?r1=1.1.2.2&r2=1.1.2.3&f=h
1.1.2.1 +70 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/character-map.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/character-map.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +1 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/img/ed_charmap.gif
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/img/ed_charmap.gif?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +16 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang/de.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang/de.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +16 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang/en.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang/en.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +16 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang/es.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang/es.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +16 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang/fr.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang/fr.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +16 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang/it.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/lang/it.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +251 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/popups/select_character.html
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/CharacterMap/popups/select_character.html?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +235 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/dynamiccss.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/dynamiccss.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +15 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang/de.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang/de.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +15 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang/en.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang/en.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +15 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang/es.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang/es.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +15 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang/fr.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang/fr.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +15 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang/it.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/DynamicCSS/lang/it.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +23 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang/de.js (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang/de.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +23 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang/en.js (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang/en.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +23 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang/es.js (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang/es.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +23 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang/fr.js (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang/fr.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +23 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang/it.js (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/lang/it.js?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +89 -0
jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/list-type.js
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/plugins/ListType/list-type.js?rev=1.1.2.1&content-type=text/plain
Index: htmlarea_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/htmlarea/Attic/htmlarea_htmleditor.jsp,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- htmlarea_htmleditor.jsp 30 Nov 2004 12:37:24 -0000 1.1.2.8
+++ htmlarea_htmleditor.jsp 9 Dec 2004 14:41:55 -0000 1.1.2.9
@@ -76,6 +76,8 @@
if ( !("".equals(cssURL)) ){
if ( cssURL.startsWith("/") ){
cssURL = request.getContextPath() + cssURL;
+ request.setAttribute("org.jahia.engines.html.headers",
+ "<link rel=\"stylesheet\" href=\"" + cssURL + "\"
/>");
}
}
@@ -124,8 +126,12 @@
HTMLArea.loadPlugin("TableOperations");
//HTMLArea.loadPlugin("SpellChecker");
//HTMLArea.loadPlugin("FullPage");
- //HTMLArea.loadPlugin("CSS");
+ HTMLArea.loadPlugin("CSS");
HTMLArea.loadPlugin("ContextMenu");
+ //HTMLArea.loadPlugin("HtmlTidy");
+ HTMLArea.loadPlugin("ListType");
+ HTMLArea.loadPlugin("CharacterMap");
+ HTMLArea.loadPlugin("DynamicCSS");
</script>
<script type="text/javascript">
@@ -136,7 +142,7 @@
cfg.width = "100%";
cfg.height = "60%";
cfg.killWordOnPaste = true;
- //cfg.pageStyle = "@import url(<%=cssURL%>);";
+ cfg.pageStyle = "@import url('<%=cssURL%>');";
if ( HTMLArea.is_gecko ){
cfg.height = "450";
@@ -152,8 +158,17 @@
// register the SpellChecker plugin
//editor.registerPlugin(SpellChecker);
+ // register the HtmlTidy plugin
+ //editor.registerPlugin(HtmlTidy);
+
+ // register the ListType plugin
+ editor.registerPlugin(ListType);
+
+ editor.registerPlugin(CharacterMap);
+
+ editor.registerPlugin(DynamicCSS);
+
// register the CSS plugin
- /*
editor.registerPlugin(CSS, {
combos : [
{ label: "CSSSyntax:",
@@ -183,7 +198,7 @@
}
}
]
- });*/
+ });
// add a contextual menu
editor.registerPlugin("ContextMenu");
Index: de.js
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/htmlarea/lang/Attic/de.js,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- de.js 3 Nov 2004 16:30:11 -0000 1.1.2.2
+++ de.js 9 Dec 2004 14:41:55 -0000 1.1.2.3
@@ -41,7 +41,8 @@
copy: "Kopieren",
paste: "Einfuegen",
lefttoright: "Direction left to right",
- righttoleft: "Direction right to left"
+ righttoleft: "Direction right to left",
+ removeformat: "Formatierung entfernen"
},
buttons: {
Index: Thumbs.db
===================================================================
<<Binary file>>
Index: ed_charmap.gif
===================================================================
<<Binary file>>
