[BACK]Return to structuretags.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.484 and 1.489

version 1.484, 2011/01/07 05:09:32 version 1.489, 2011/06/06 21:01:06
Line 144  function image_response_click (which, e) Line 144  function image_response_click (which, e)
     var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll();      var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll();
     var click = x+':'+y;      var click = x+':'+y;
     input_element.value = click;      input_element.value = click;
     img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;      img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
 }  }
 // ]]>  // ]]>
 </script>  </script>
Line 154  JS Line 154  JS
 sub setmode_javascript {  sub setmode_javascript {
     return <<"ENDSCRIPT";      return <<"ENDSCRIPT";
 <script type="text/javascript">  <script type="text/javascript">
   // <![CDATA[
 function setmode(form,probmode) {  function setmode(form,probmode) {
     form.problemmode.value = probmode;      form.problemmode.value = probmode;
     form.submit();      form.submit();
 }  }
   // ]]>
 </script>  </script>
 ENDSCRIPT  ENDSCRIPT
 }  }
Line 409  sub setup_rndseed { Line 411  sub setup_rndseed {
     delete($env{'form.resetdata'});      delete($env{'form.resetdata'});
     delete($env{'form.newrandomization'});      delete($env{'form.newrandomization'});
  }   }
  if (defined($rndseed) && $rndseed ne int($rndseed)) {          $rndseed=~s/\,/\:/g;
     $rndseed=join(':',&Apache::lonnet::digest($rndseed));          $rndseed=~s/[^\w\d\:\-]//g;
    if (defined($rndseed)) {
               my ($c1,$c2)=split(/\:/,$rndseed);
               unless ($c2) { $c2=0; }
               unless (($c1==int($c1)) && ($c2==int($c2))) {
          $rndseed=join(':',&Apache::lonnet::digest($rndseed));
               }
         }          }
         if ($Apache::lonhomework::history{'resource.CODE'}) {          if ($Apache::lonhomework::history{'resource.CODE'}) {
    $rndseed=&Apache::lonnet::rndseed();     $rndseed=&Apache::lonnet::rndseed();
Line 462  sub remember_problem_state { Line 470  sub remember_problem_state {
        <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';         <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
 }  }
   
   sub problem_edit_action_button {
       my ($name,$action,$accesskey,$text,$flag)=@_;
       my $actionscript="setmode(this.form,'$action')";
       return "\n<input type='button' name='$name' accesskey='$accesskey' value='".&mt($text)."'".
              ($flag?&Apache::edit::submit_ask_anyway($actionscript):&Apache::edit::submit_dont_ask($actionscript))." />";
   }
   
 sub problem_edit_buttons {  sub problem_edit_buttons {
    return  '     my ($mode)=@_;
 <div class="LC_edit_problem_discards">  # Buttons that do not save
        <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.     my $result='<div class="LC_edit_problem_discards">'.
        ' onclick="javscript:setmode(this.form,'."'discard'".')"  />                &problem_edit_action_button('subdiscview','discard','d','Discard Edits and View',1);
        <input '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'editxml'".')').' type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" />     if ($mode eq 'editxml') {
        <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />         $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
 </div>         $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
 <div class="LC_edit_problem_saves">         $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
        <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save and Edit').'" />     } else {
        <input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" />         $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
 </div>';         $result.=&problem_edit_action_button('subundo','undo','u','Undo',1);
      }
      $result.="\n</div>";
   # Buttons that save
      $result.='<div class="LC_edit_problem_saves">';
      if ($mode eq 'editxml') {
          $result.=&problem_edit_action_button('subsaveedit','saveeditxml','s','Save and EditXML');
          $result.=&problem_edit_action_button('subsaveview','saveviewxml','v','Save and View');
      } else {
          $result.=&problem_edit_action_button('subsaveedit','saveedit','s','Save and Edit');
          $result.=&problem_edit_action_button('subsaveview','saveview','v','Save and View');
      }
      $result.="\n</div>\n";
      return $result;
 }  }
   
 sub problem_edit_header {  sub problem_edit_header {
     return '<input type="hidden" name="submitted" value="edit" /><input type="hidden" name="problemmode" value="edit" />'.      return '<input type="hidden" name="submitted" value="edit" />'.
  &Apache::structuretags::remember_problem_state().'   &remember_problem_state('edit').'
 <div class="LC_edit_problem_header">  <div class="LC_edit_problem_header">
 <div class="LC_edit_problem_header_title">  <div class="LC_edit_problem_header_title">
 '.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'  '.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
 </div>'.  </div>'.
   '<input type="hidden" name="problemmode" value="saveedit" />'.
 &problem_edit_buttons().'  &problem_edit_buttons().'
 <hr style="clear:both;" />  <hr style="clear:both;" />
 '.&Apache::lonxml::message_location().'  '.&Apache::lonxml::message_location().'
Line 619  $show_all Line 648  $show_all
    <div class="LC_edit_problem_header_randomize_row">     <div class="LC_edit_problem_header_randomize_row">
      <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />       <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
      <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />       <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
      <input type="text" name="rndseed" size="10" value="'.       <input type="text" name="rndseed" size="24" value="'.
        $rndseed.'"         $rndseed.'"
              onchange="javascript:document.lonhomework.changerandseed.click()" />';               onchange="javascript:document.lonhomework.changerandseed.click()" />';
   
Line 2267  sub start_simpleeditbutton { Line 2296  sub start_simpleeditbutton {
 #              .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')  #              .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
 #              .&Apache::loncommon::help_open_topic('Caching')  #              .&Apache::loncommon::help_open_topic('Caching')
 #              .'</p>';  #              .'</p>';
         $result.=&Apache::lonhtmlcommon::start_funclist()          $result.=&Apache::loncommon::head_subbox(
                    &Apache::lonhtmlcommon::start_funclist()
                 .&Apache::lonhtmlcommon::add_item_funclist(                  .&Apache::lonhtmlcommon::add_item_funclist(
                      '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'                       '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'
                     .&mt('Edit').'</a>')                      .&mt('Edit').'</a>')
                 .&Apache::lonhtmlcommon::end_funclist();                  .&Apache::lonhtmlcommon::end_funclist());
   
     }      }
     return $result;      return $result;
Removed from v.1.484  
changed lines
  Added in v.1.489

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>