[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework structuretags.pm

[raeburn]

raeburn		Wed Sep 14 19:36:30 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/homework	structuretags.pm 
  Log:
  - For 2.11
    - Backport 1.527, 1.530, 1.533, 1.534, 1.535
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.512.2.10 loncom/homework/structuretags.pm:1.512.2.11
--- loncom/homework/structuretags.pm:1.512.2.10	Tue Apr 21 22:48:46 2015
+++ loncom/homework/structuretags.pm	Wed Sep 14 19:36:30 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.512.2.10 2015/04/21 22:48:46 raeburn Exp $
+# $Id: structuretags.pm,v 1.512.2.11 2016/09/14 19:36:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -270,6 +270,7 @@
         $jstimeout = 1000 * $timeout;
     }
     return &Apache::loncommon::resize_textarea_js().
+           &Apache::loncommon::colorfuleditor_js().
            &setmode_javascript().
 	<<"JS";
 <script type="text/javascript">
@@ -751,53 +752,82 @@
 
 sub problem_edit_buttons {
    my ($mode)=@_;
+# Buttons that save
+   my $result = '<div style="float:right">';
+   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";
 # Buttons that do not save
-   my $result='<div class="LC_edit_problem_discards">'.
+   $result .= '<div>'.
               &problem_edit_action_button('subdiscview','discard','d','Discard Edits and View',1);
    if ($mode eq 'editxml') {
        $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
        $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
-       $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
+       if ($env{'environment.nocodemirror'}) {
+           $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
+       }
    } else {
        $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
        $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 {
-    return '<input type="hidden" name="submitted" value="edit" />'.
+    my ($mode)=@_;
+    my $return = '<input type="hidden" name="submitted" value="edit" />'.
 	&remember_problem_state('edit').'
-<div class="LC_edit_problem_header">
-<div class="LC_edit_problem_header_title">
-'.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
-</div>'.
-'<input type="hidden" name="problemmode" value="saveedit" />'.
-&problem_edit_buttons().'
-<hr style="clear:both;" />
-'.&Apache::lonxml::message_location().'
-</div>
-'.
-       '<table id="LC_edit_problem_colorful" border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
+        <div class="LC_edit_problem_header">
+        <div class="LC_edit_problem_header_title">
+        '.&mt('Problem Editing').$mode.&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
+         </div><div class="LC_edit_actionbar" id="actionbar">'.
+         '<input type="hidden" name="problemmode" value="saveedit" />'.
+         &problem_edit_buttons();
+
+    $return .= '</div></div>' . &Apache::lonxml::message_location();
+    $return .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined.css" />
+    <script type="text/javascript" src="/adm/codemirror/codemirror-compressed-colorful.js"></script>';
+
+    $return .= '<script type="text/javascript" src="/adm/jQuery/addons/jquery-scrolltofixed.js"></script>
+        <script type="text/javascript">
+            // unless internet explorer
+            if (!(window.navigator.appName == "Microsoft Internet Explorer" && (document.documentMode || document.compatMode))){
+                $(document).ready(
+                    function() {
+                        $(\'.LC_edit_actionbar\').scrollToFixed(
+                            {
+                                fixed: function(){
+                                    //$(this).find(\'.LC_edit_actionbar\').css(\'height\', \'31px\');
+                                    $(this).find(\'.LC_edit_actionbar\');
+                                }
+                            }
+                        );
+                    }
+                );
+            }
+        </script>
+        <table id="LC_edit_problem_colorful" border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
+    return $return;
 }
 
+
 sub problem_edit_footer {
+    my $resource = $env{'request.ambiguous'};
     return '</td></tr></table><br />
 <div class="LC_edit_problem_footer">
   <hr />'.
 &problem_edit_buttons().'
   <hr style="clear:both;" />
+  <script type="text/javascript">
+      restoreState("'.$resource.'");
+      restoreScrollPosition("'.$resource.'");
+  </script>
 </div>
 '.
     "\n</form>\n".&Apache::loncommon::end_page();
@@ -2898,7 +2928,8 @@
     if ($target eq 'edit') {
 	my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
 	$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
-	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>"
+        $result.=&Apache::edit::start_table($token)."<tr><td>".&Apache::loncommon::insert_folding_button()
+                 ." ".&mt('Text Block')."</td>"
                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
                  .&Apache::edit::deletelist($target,$token)
                  .'</span></td>'