--- loncom/homework/structuretags.pm 2013/01/03 21:04:44 1.510
+++ loncom/homework/structuretags.pm 2014/11/21 18:04:57 1.523
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.510 2013/01/03 21:04:44 raeburn Exp $
+# $Id: structuretags.pm,v 1.523 2014/11/21 18:04:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -254,6 +254,55 @@ function image_response_click (which, e)
input_element.value = click;
img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
}
+
+var submithandled = 0;
+var keypresshandled = 0;
+
+$(document).ready(function(){
+
+ $(document).keypress(function(event){
+ var keycode = (event.keyCode ? event.keyCode : event.which);
+ if ((keycode == '13') && (keypresshandled == 0)) {
+ if ( $( document.activeElement ).hasClass("LC_textline") ) {
+ keypresshandled = 1;
+ var idsArray = $( document.activeElement ).attr("id").split(/HWVAL_/);
+ if (idsArray.length) {
+ event.preventDefault();
+ var itemsArray = idsArray[1].split(/_/);
+ var buttonId = idsArray[0]+'submit_'+itemsArray[0];
+ $("#"+buttonId).trigger("click");
+ }
+ }
+ }
+ });
+
+ $(document).delegate('form :submit', 'click', function( event ) {
+ if ( $( this ).hasClass( "LC_hwk_submit" ) ) {
+ var buttonId = this.id;
+ if (submithandled == 0) {
+ submithandled = 1;
+ $( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa",
+ "color": "black","padding": "2px"}) ;
+ if (( $(this.form).id == "LC_page" ) && ($('input[name="all_submit"]').length )) {
+ if (buttonId != "all_submit") {
+ $( ".LC_status_"+buttonId ).hide();
+ if (( "#"+buttonId+"_pressed" ).length) {
+ $( "#"+buttonId+"_pressed" ).val( "1" );
+ }
+ }
+ } else {
+ $( ".LC_status_"+buttonId ).hide();
+ }
+ $(this.form).submit();
+ $( ".LC_hwk_submit" ).prop( "disabled", true);
+ $( ".LC_textline" ).prop( "readonly", "readonly");
+ event.preventDefault();
+ return true;
+ }
+ }
+ });
+});
+
// ]]>
JS
@@ -379,10 +428,10 @@ sub page_start {
} elsif (!defined($found{'body'})
&& $env{'request.state'} eq 'construct') {
if ($target eq 'web' || $target eq 'edit') {
- # Breadcrumbs for Construction Space
+ # Breadcrumbs for Authoring Space
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb({
- 'text' => 'Construction Space',
+ 'text' => 'Authoring Space',
'href' => &Apache::loncommon::authorspace($env{'request.uri'}),
});
# breadcrumbs (and tools) will be created
@@ -414,6 +463,8 @@ sub page_start {
$body_args{'add_entries'} = \%add_entries;
if ( $env{'request.state'} eq 'construct') {
$body_args{'only_body'} = 1;
+ } elsif ($target eq 'web') {
+ $body_args{'print_suppress'} = 1;
}
}
$body_args{'no_auto_mt_title'} = 1;
@@ -637,7 +688,7 @@ sub problem_edit_header {
'.&Apache::lonxml::message_location().'
'.
- '
';
+ '
';
}
sub problem_edit_footer {
@@ -728,7 +779,7 @@ $show_all
@@ -846,9 +897,9 @@ sub initialize_storage {
=item finalize_storage()
- Stores away the result has to a student's environment
- checks form.grade_ for specific values, other wises stores
- to the running users environment
+ Stores away the result hash to a student's environment
+ checks form.grade_ for specific values, otherwise stores
+ to the running user's environment.
Will increment totals for attempts, students, and corrects
if running user has student role.
@@ -975,7 +1026,7 @@ sub checkout_msg {
$lt{'warning'}
ENDCHECKOUT
}
@@ -1009,7 +1060,7 @@ sub firstaccess_msg {
$result .= (<
-
+
ENDCHECKOUT
return $result;
@@ -1168,7 +1219,7 @@ sub start_problem {
$target eq 'tex') {
if ($env{'form.markaccess'}) {
my @interval=&Apache::lonnet::EXT("resource.0.interval");
- &Apache::lonnet::set_first_access($interval[1]);
+ &Apache::lonnet::set_first_access($interval[1],$interval[0]);
}
($status,$accessmsg,$slot_name,$slot) =
@@ -2057,9 +2108,15 @@ sub end_while {
}
$return = &Apache::run::run($code,$safeeval);
}
- if ($error) {
- &Apache::lonxml::error('
'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running <while> on line').' '.$line.'
'
+ .&mt('Code ran too long. It ran for more than [_1] seconds.',
+ $Apache::lonnet::perlvar{'lonScriptTimeout'})
+ .&mt('This occurred while running <while> on line [_1].',
+ $line)
+ .'