[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm /xml lonxml.pm doc/loncapafiles loncapafiles.lpml
www
lon-capa-cvs@mail.lon-capa.org
Sat, 05 Jun 2004 14:46:13 -0000
www Sat Jun 5 10:46:13 2004 EDT
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom/interface lonhtmlcommon.pm
/loncom/xml lonxml.pm
Log:
Fullpage editor for html files in Construction Space
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.358 doc/loncapafiles/loncapafiles.lpml:1.359
--- doc/loncapafiles/loncapafiles.lpml:1.358 Fri Jun 4 12:05:47 2004
+++ doc/loncapafiles/loncapafiles.lpml Sat Jun 5 10:46:12 2004
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.358 2004/06/04 16:05:47 www Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.359 2004/06/05 14:46:12 www Exp $ -->
<!--
@@ -479,6 +479,36 @@
</directory>
<directory dist='default'>
<protectionlevel>modest_delete</protectionlevel>
+ <targetdir dist='default'>home/httpd/html/htmlarea/plugins</targetdir>
+ <categoryname>server readonly</categoryname>
+ <description>Plugins for HTMLArea</description>
+</directory>
+<directory dist='default'>
+ <protectionlevel>modest_delete</protectionlevel>
+ <targetdir dist='default'>home/httpd/html/htmlarea/plugins/FullPage</targetdir>
+ <categoryname>server readonly</categoryname>
+ <description>FullPage plugin for HTMLArea</description>
+</directory>
+<directory dist='default'>
+ <protectionlevel>modest_delete</protectionlevel>
+ <targetdir dist='default'>home/httpd/html/htmlarea/plugins/FullPage/img</targetdir>
+ <categoryname>server readonly</categoryname>
+ <description>FullPage plugin for HTMLArea</description>
+</directory>
+<directory dist='default'>
+ <protectionlevel>modest_delete</protectionlevel>
+ <targetdir dist='default'>home/httpd/html/htmlarea/plugins/FullPage/lang</targetdir>
+ <categoryname>server readonly</categoryname>
+ <description>FullPage plugin for HTMLArea</description>
+</directory>
+<directory dist='default'>
+ <protectionlevel>modest_delete</protectionlevel>
+ <targetdir dist='default'>home/httpd/html/htmlarea/plugins/FullPage/popups</targetdir>
+ <categoryname>server readonly</categoryname>
+ <description>FullPage plugin for HTMLArea</description>
+</directory>
+<directory dist='default'>
+ <protectionlevel>modest_delete</protectionlevel>
<targetdir dist='default'>home/httpd/html/htmlarea/popups</targetdir>
<categoryname>server readonly</categoryname>
<description>Popup windows for HTMLArea</description>
@@ -1106,6 +1136,54 @@
Stylesheet for HTMLArea
</description>
</file>
+<file>
+<source>loncom/html/htmlarea/plugins/FullPage/full-page.js</source>
+<target dist='default'>home/httpd/html/htmlarea/plugins/FullPage/full-page.js</target>
+<categoryname>interface file</categoryname>
+<description>
+FullPage plugin for HTMLArea
+</description>
+</file>
+<fileglob>
+<glob>*.js</glob>
+<sourcedir>loncom/html/htmlarea/plugins/FullPage/lang/</sourcedir>
+<targetdir dist='default'>
+home/httpd/html/htmlarea/plugins/FullPage/lang/</targetdir>
+<categoryname>interface file</categoryname>
+<description>
+Language files belonging to FullPage plugin for HTMLArea.
+</description>
+<filenames>
+en.js;
+ro.js;
+</filenames>
+</fileglob>
+<fileglob>
+<glob>*.gif</glob>
+<sourcedir>loncom/html/htmlarea/plugins/FullPage/img/</sourcedir>
+<targetdir dist='default'>
+home/httpd/html/htmlarea/plugins/FullPage/img/</targetdir>
+<categoryname>interface file</categoryname>
+<description>
+Image files belonging to FullPage plugin for HTMLArea.
+</description>
+<filenames>
+docprop.gif;
+</filenames>
+</fileglob>
+<fileglob>
+<glob>*.html</glob>
+<sourcedir>loncom/html/htmlarea/plugins/FullPage/popups/</sourcedir>
+<targetdir dist='default'>
+home/httpd/html/htmlarea/plugins/FullPage/popups/</targetdir>
+<categoryname>interface file</categoryname>
+<description>
+Popup files belonging to FullPage plugin for HTMLArea.
+</description>
+<filenames>
+docprop.html;
+</filenames>
+</fileglob>
<fileglob>
<glob>*.js</glob>
<sourcedir>loncom/html/htmlarea/lang/</sourcedir>
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.74 loncom/interface/lonhtmlcommon.pm:1.75
--- loncom/interface/lonhtmlcommon.pm:1.74 Fri Jun 4 12:05:47 2004
+++ loncom/interface/lonhtmlcommon.pm Sat Jun 5 10:46:12 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.74 2004/06/04 16:05:47 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.75 2004/06/05 14:46:12 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -897,7 +897,8 @@
config.registerButton('ed_math_eqn','LaTeX Equation',
'/htmlarea/images/ed_math_eqn.gif',false,
function(editor,id) {
- editor.surroundHTML('<br /><m>\\\\[','\\\\]</m><br />');
+ editor.surroundHTML(
+ '<center><m>\\\\[','\\\\]</m></center>');
}
);
config.toolbar.push(['ed_math','ed_math_eqn']);
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.322 loncom/xml/lonxml.pm:1.323
--- loncom/xml/lonxml.pm:1.322 Fri Jun 4 18:56:46 2004
+++ loncom/xml/lonxml.pm Sat Jun 5 10:46:12 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.322 2004/06/04 22:56:46 albertel Exp $
+# $Id: lonxml.pm,v 1.323 2004/06/05 14:46:12 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1129,15 +1129,17 @@
$filecontents = &HTML::Entities::encode($filecontents,'<>&"');
# my $editheader='<a href="#editsection">Edit below</a><hr />';
my $xml_help = '';
- my $activate='';
my $initialize='';
if ($filetype eq 'html') {
+ my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons();
$initialize=&Apache::lonhtmlcommon::htmlareaheaders().(<<FULLPAGE);
<script type="text/javascript">
+$addbuttons
+
HTMLArea.loadPlugin("FullPage");
function initDocument() {
- var editor=new HTMLArea("editor");
+ var editor=new HTMLArea("filecont",config);
editor.registerPlugin(FullPage);
editor.generate();
}
@@ -1145,8 +1147,6 @@
FULLPAGE
$result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i;
$xml_help=&Apache::loncommon::helpLatexCheatsheet();
-#FIXME: need to install FullPage plugin during install
-# $activate=&Apache::lonhtmlcommon::htmlareaactive();
}
my $cleanbut = '';
if ($filetype eq 'html') {
@@ -1175,7 +1175,6 @@
<br />
</form>
$titledisplay
-$activate
</body>
ENDFOOTER
# $result=~s/(\<body[^\>]*\>)/$1$editheader/is;