[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework lonhomework.pm
raeburn
raeburn at source.lon-capa.org
Fri Sep 16 10:44:15 EDT 2016
raeburn Fri Sep 16 14:44:15 2016 EDT
Modified files: (Branch: version_2_11_X)
/loncom/homework lonhomework.pm
Log:
- For 2.11
- White space changes only.
-------------- next part --------------
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.344.2.5 loncom/homework/lonhomework.pm:1.344.2.6
--- loncom/homework/lonhomework.pm:1.344.2.5 Wed Sep 14 16:36:49 2016
+++ loncom/homework/lonhomework.pm Fri Sep 16 14:44:14 2016
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.344.2.5 2016/09/14 16:36:49 raeburn Exp $
+# $Id: lonhomework.pm,v 1.344.2.6 2016/09/16 14:44:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1553,19 +1553,19 @@
sub responseblock_dropdown_datastructure {
- my $mathCat = [
- [
+ my $mathCat = [
+ [
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
- ],
- &mt("Math"),
- undef
+ ],
+ &mt("Math"),
+ undef
];
- my $miscCat = [
- [
+ my $miscCat = [
+ [
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_imageresponse())) . "\')", &mt("Click on Image"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_customresponse())) . "\')", &mt("Custom Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_externalresponse())) . "\')", &mt("External Response"), undef],
@@ -1578,23 +1578,23 @@
undef
];
- my $chemCat = [
- [
+ my $chemCat = [
+ [
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef]
- ],
- &mt("Chemistry"),
- undef
- ];
-
- my $textCat = [
- [
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]
- ],
- &mt("Text"),
- undef
- ];
+ ],
+ &mt("Chemistry"),
+ undef
+ ];
+
+ my $textCat = [
+ [
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]
+ ],
+ &mt("Text"),
+ undef
+ ];
return [$mathCat, $miscCat, $chemCat, $textCat];
}
@@ -1609,18 +1609,18 @@
#TODO translated is currently temporarily here, another solution should be found where the
# needed string can be retrieved
- my $translatedTag = '
+ my $translatedTag = '
<translated>
<lang which="en"></lang>
<lang which="default"></lang>
</translated>';
return [
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]
];
}
@@ -1639,44 +1639,43 @@
# helper routine for the datastructure building subroutines
sub default_xml_tag {
- my ($tag) = @_;
- return "\n<$tag></$tag>";
+ my ($tag) = @_;
+ return "\n<$tag></$tag>";
}
-
sub helpmenu_datastructure {
- my $width = 500;
- my $height = 600;
-
- my $helpers = [
- ['Problem_LON-CAPA_Functions', &mt('Script Functions')],
- ['Greek_Symbols', &mt('Greek Symbols')],
- ['Other_Symbols', &mt('Other Symbols')],
- ['Authoring_Output_Tags', &mt('Output Tags')],
- ['Authoring_Multilingual_Problems', &mt('Languages')],
- ];
+ my $width = 500;
+ my $height = 600;
- my $help_structure = [];
-
- foreach my $count (0..(scalar(@{$helpers})-1)) {
- my $filename = $helpers->[$count]->[0];
- my $title = $helpers->[$count]->[1];
- my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename.hlp',$width,$height,'yes');");
- push @{$help_structure}, [$href, $title, undef];
- }
+ my $helpers = [
+ ['Problem_LON-CAPA_Functions', &mt('Script Functions')],
+ ['Greek_Symbols', &mt('Greek Symbols')],
+ ['Other_Symbols', &mt('Other Symbols')],
+ ['Authoring_Output_Tags', &mt('Output Tags')],
+ ['Authoring_Multilingual_Problems', &mt('Languages')],
+ ];
+
+ my $help_structure = [];
+
+ foreach my $count (0..(scalar(@{$helpers})-1)) {
+ my $filename = $helpers->[$count]->[0];
+ my $title = $helpers->[$count]->[1];
+ my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename.hlp',$width,$height,'yes');");
+ push @{$help_structure}, [$href, $title, undef];
+ }
- return $help_structure;
+ return $help_structure;
}
# we need substitution to not break javascript code
sub convert_for_js {
my $return = shift;
- $return =~ s|script|ESCAPEDSCRIPT|g;
- $return =~ s|\\|\\\\|g;
- $return =~ s|\n|\\r\\n|g;
- $return =~ s|'|\\'|g;
- $return =~ s|'|\\'|g;
+ $return =~ s|script|ESCAPEDSCRIPT|g;
+ $return =~ s|\\|\\\\|g;
+ $return =~ s|\n|\\r\\n|g;
+ $return =~ s|'|\\'|g;
+ $return =~ s|'|\\'|g;
return $return;
}
More information about the LON-CAPA-cvs
mailing list