--- loncom/homework/daxepage.pm 2023/11/19 21:28:17 1.6 +++ loncom/homework/daxepage.pm 2024/03/23 23:11:52 1.12 @@ -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.6 2023/11/19 21:28:17 raeburn Exp $ +# $Id: daxepage.pm,v 1.12 2024/03/23 23:11:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,10 +31,14 @@ package Apache::daxepage; use strict; use Apache::loncommon(); +use Apache::lonnet(); use Apache::lonhtmlcommon(); +use Apache::lonxml(); +use Apache::edit(); use Apache::lonmenu(); use Apache::lonlocal; use Apache::Constants qw(:common); +use LONCAPA qw(:DEFAULT :match); use HTML::Entities(); sub handler { @@ -42,7 +46,15 @@ sub handler { my $uri = $request->uri; $uri =~ s{^/daxepage}{}; &Apache::loncommon::content_type($request,'text/html'); - if ($uri !~ /\.(task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$/) { + my ($is_not_assess,$is_assess); + if ($uri =~/\.(xml|html|htm|xhtml|xhtm)$/) { + $is_not_assess = 1; + } elsif ($uri =~ /$LONCAPA::assess_re/) { + unless ($uri =~ /\.form$/) { + $is_assess = 1; + } + } + unless ($is_not_assess || $is_assess) { $request->status(406); return OK; } @@ -53,18 +65,78 @@ sub handler { &do_redirect($request,$uri,$msg); return OK; } + if ($is_not_assess) { + delete($editors{'xml'}); + $editors{'edit'} = 1; + } my %lt = &Apache::lonlocal::texthash( 'noif' => 'No iframe support.', 'show' => 'Show content in pop-up window', + 'save' => 'Save', + 'oeds' => 'other editors', + 'othe' => 'other editor', + 'edit' => 'Save and Edit', + 'disc' => 'Discard and View', + 'save' => 'Save and View', ); my $name = $uri; $name =~ s/^.*\/([^\/]+)$/$1/; + my $filearg = '/daxeopen'.$uri; my $daxeurl = '/adm/daxe/daxe.html?config=config/loncapa_config.xml&save=/daxesave'. - '&file=/daxeopen'.$uri; + '&file='.$filearg; my $headjs = &Apache::loncommon::iframe_wrapper_headjs(). - &toggle_LCmenus_js(); + &listener_js($filearg). + &toggle_LCmenus_js().&saveandview_js(). + &Apache::edit::js_change_detection(); + + my ($clickexit,$clicksave,$clickedit); + if ($is_assess) { + $headjs .= &Apache::lonxml::setmode_javascript(); + $clickexit = "javascript:setmode(this.form,'view');"; + } else { + $headjs .= &Apache::lonxml::seteditor_javascript(); + $clickexit = "javascript:seteditmode(this.form,'view');"; + } + $clicksave = "javascript:daxesave('exit');"; + $clickedit = "javascript:daxesave();"; + my $form_events = &Apache::edit::form_change_detection(); + my $editheader = '
'."\n"; + my $start_collapsed = &collapsible_std_LCmenus(); my $args = { - 'collapsible_header' => 1, + 'collapsible_header' => $editheader, + 'start_collapsed' => $start_collapsed, }; my $startpage = &Apache::loncommon::start_page('Daxe: '.$name,$headjs,$args). &Apache::lonmenu::constspaceform(); @@ -79,13 +151,57 @@ sub handler { $startpage $script