[LON-CAPA-cvs] cvs: loncom /homework daxepage.pm /html/adm/split.js LICENSE.txt split.css split.js split.min.js /html/adm/split.js/grips horizontal.png vertical.png doc/loncapafiles loncapafiles.lpml
damieng
damieng at source.lon-capa.org
Tue Jan 12 14:07:22 EST 2016
damieng Tue Jan 12 19:07:22 2016 EDT
Removed files:
/loncom/html/adm/split.js LICENSE.txt split.css split.js
split.min.js
/loncom/html/adm/split.js/grips horizontal.png vertical.png
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom/homework daxepage.pm
Log:
improved layout for Daxe+preview; split.js is no longer needed
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.925 doc/loncapafiles/loncapafiles.lpml:1.926
--- doc/loncapafiles/loncapafiles.lpml:1.925 Thu Dec 10 16:26:36 2015
+++ doc/loncapafiles/loncapafiles.lpml Tue Jan 12 19:07:12 2016
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.925 2015/12/10 16:26:36 damieng Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.926 2016/01/12 19:07:12 damieng Exp $ -->
<!--
@@ -643,18 +643,6 @@
</directory>
<directory dist='default'>
<protectionlevel>modest_delete</protectionlevel>
- <targetdir dist='default'>home/httpd/html/adm/split.js</targetdir>
- <categoryname>server readonly</categoryname>
- <description>Split.js</description>
-</directory>
-<directory dist='default'>
- <protectionlevel>modest_delete</protectionlevel>
- <targetdir dist='default'>home/httpd/html/adm/split.js/grips</targetdir>
- <categoryname>server readonly</categoryname>
- <description>Split.js grip icons</description>
-</directory>
-<directory dist='default'>
- <protectionlevel>modest_delete</protectionlevel>
<targetdir dist='default'>home/httpd/html/ckeditor</targetdir>
<categoryname>server readonly</categoryname>
<description>Rich Text Editor</description>
@@ -4767,42 +4755,6 @@
</file>
<file>
- <source>loncom/html/adm/split.js/split.min.js</source>
- <target dist='default'>home/httpd/html/adm/split.js/split.min.js</target>
- <categoryname>interface file</categoryname>
- <description>
- Split.js minimized
- </description>
-</file>
-
-<file>
- <source>loncom/html/adm/split.js/split.css</source>
- <target dist='default'>home/httpd/html/adm/split.js/split.css</target>
- <categoryname>interface file</categoryname>
- <description>
- Split.js CSS
- </description>
-</file>
-
-<file>
- <source>loncom/html/adm/split.js/grips/horizontal.png</source>
- <target dist='default'>home/httpd/html/adm/split.js/grips/horizontal.png</target>
- <categoryname>interface file</categoryname>
- <description>
- Split.js horizontal grip icon
- </description>
-</file>
-
-<file>
- <source>loncom/html/adm/split.js/grips/vertical.png</source>
- <target dist='default'>home/httpd/html/adm/split.js/grips/vertical.png</target>
- <categoryname>interface file</categoryname>
- <description>
- Split.js vertical grip icon
- </description>
-</file>
-
-<file>
<source>loncom/javascriptlib/file_upload.js</source>
<target dist='default'>home/httpd/html/res/adm/includes/file_upload.js</target>
<categoryname>interface file</categoryname>
Index: loncom/homework/daxepage.pm
diff -u loncom/homework/daxepage.pm:1.2 loncom/homework/daxepage.pm:1.3
--- loncom/homework/daxepage.pm:1.2 Wed Jan 6 16:44:30 2016
+++ loncom/homework/daxepage.pm Tue Jan 12 19:07:16 2016
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Page with Daxe on the left side and the preview on the right side
#
-# $Id: daxepage.pm,v 1.2 2016/01/06 16:44:30 damieng Exp $
+# $Id: daxepage.pm,v 1.3 2016/01/12 19:07:16 damieng Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,21 +47,15 @@
my $name = $uri;
$name =~ s/^.*\/([^\/]+)$/$1/;
$result .= " <title>LON-CAPA Daxe: $name</title>\n";
- $result .= ' <script src="/adm/split.js/split.min.js"></script>'."\n";
- $result .= ' <link rel="stylesheet" href="/adm/split.js/split.css">'."\n";
$result .= " <style>\n";
- $result .= " #daxe, #preview { border: none; }\n";
+ $result .= " body { margin: 0; }\n";
+ $result .= " #daxe { position:absolute; top:0; left:0; width:100%; height:100%; border:none; }\n";
$result .= " </style>\n";
$result .= "</head>\n";
$result .= "<body>\n";
- $result .= ' <div class="split-parent">'."\n";;
my $daxeurl = '/adm/daxe/daxe.html?config=config/loncapa_config.xml&file=/daxeopen'.$uri.
'&save=/daxesave';
- $result .= ' <iframe id="daxe" src="'.$daxeurl.'" class="split split-horizontal"></iframe>'."\n";
- my $previewurl = $uri.'?inhibitmenu=yes';
- $result .= ' <iframe id="preview" src="'.$previewurl.'" class="split split-horizontal"></iframe>'."\n";
- $result .= " </div>\n";
- $result .= ' <script>Split(["#daxe", "#preview"], {sizes: [75, 25], minSize: [400, 20]});</script>'."\n";
+ $result .= ' <iframe id="daxe" src="'.$daxeurl.'"></iframe>'."\n";
$result .= "</body>\n";
$result .= "</html>\n";
$request->print($result);
More information about the LON-CAPA-cvs
mailing list