[LON-CAPA-cvs] cvs: loncom /homework insertlist.xml /xml londefdef.pm
albertel
lon-capa-cvs-allow@mail.lon-capa.org
Tue, 17 Jul 2007 19:05:25 -0000
albertel Tue Jul 17 15:05:25 2007 EDT
Modified files:
/loncom/homework insertlist.xml
/loncom/xml londefdef.pm
Log:
- BUG#5319 implement edit/modifed targets for <meta>
Index: loncom/homework/insertlist.xml
diff -u loncom/homework/insertlist.xml:1.7 loncom/homework/insertlist.xml:1.8
--- loncom/homework/insertlist.xml:1.7 Tue Jun 26 16:51:53 2007
+++ loncom/homework/insertlist.xml Tue Jul 17 15:05:14 2007
@@ -400,6 +400,12 @@
<description>Image Options</description>
</help>
</tag>
+ <tag name="meta">
+ <description>Custom Metadata</description>
+ <color>#aacccc</color>
+ <insert_sub>Apache::londefdef::insert_meta</insert_sub>
+ <allow></allow>
+ </tag>
<tag name="window">
<description>Text In Separate Window</description>
<color>#aacccc</color>
@@ -446,7 +452,7 @@
<description>Start of Homework</description>
<color>#FFFFFF</color>
<insert_sub>default</insert_sub>
- <allow>allow,block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,mathresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parameter,parserlib,part,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,while,window</allow>
+ <allow>allow,block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,mathresponse,meta,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parameter,parserlib,part,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,while,window</allow>
</tag>
<tag name="allow">
<description>File Dependencies</dscription>
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.373 loncom/xml/londefdef.pm:1.374
--- loncom/xml/londefdef.pm:1.373 Fri Jul 13 14:35:20 2007
+++ loncom/xml/londefdef.pm Tue Jul 17 15:05:24 2007
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.373 2007/07/13 18:35:20 albertel Exp $
+# $Id: londefdef.pm,v 1.374 2007/07/17 19:05:24 albertel Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -448,6 +448,16 @@
if ((not defined $content) && (not defined $name)) {
&Apache::lonxml::startredirection();
}
+ } elsif ($target eq 'edit') {
+ $currentstring .= &Apache::edit::tag_start($target,$token);
+ $currentstring .= &Apache::edit::text_arg('Name:','name',$token,30);
+ $currentstring .= &Apache::edit::text_arg('Content:','content',$token,70);
+ $currentstring .= &Apache::edit::end_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag =
+ &Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 'name','content');
+ if ($constructtag) { $currentstring = &Apache::edit::rebuild_tag($token); }
}
return $currentstring;
}
@@ -471,6 +481,11 @@
return $currentstring;
}
+sub insert_meta {
+ return '
+ <meta />';
+}
+
# accessrule
sub start_accessrule {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;