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

Diff for /loncom/xml/londefdef.pm between versions 1.406 and 1.415

version 1.406, 2009/05/26 14:06:23 version 1.415, 2010/02/01 12:03:19
Line 540  sub start_body { Line 540  sub start_body {
   
     # Breadcrumbs      # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();      &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({      if ($env{'request.state'} eq 'construct') {
         'text'  => 'Construction Space',          &Apache::lonhtmlcommon::add_breadcrumb({
         'href'  => '', # FIXME Add link to /priv/[user]              'text'  => 'Construction Space',
     });              'href'  => &Apache::loncommon::authorspace(),
     &Apache::lonhtmlcommon::add_breadcrumb({          });
         'text'  => 'HTML Editor',          &Apache::lonhtmlcommon::add_breadcrumb({
         'href'  => '',              'text'  => 'HTML Editor',
     });                  'href'  => '',
           });
           # breadcrumbs (and tools) will be created 
           # in start_page->bodytag->innerregister
       } else {
           # FIXME Where are we?
       }
   
  $currentstring =    $currentstring = 
     &Apache::loncommon::start_page($Apache::londefdef::title,      &Apache::loncommon::start_page($Apache::londefdef::title,
Line 557  sub start_body { Line 563  sub start_body {
 #    'no_title'       => 1,  #    'no_title'       => 1,
     'force_register' => 1});      'force_register' => 1});
   
     $currentstring .= &Apache::lonhtmlcommon::breadcrumbs()          my $header = '';
                      .&Apache::loncommon::head_subbox(          if ($env{'request.state'} ne 'published' &&
                           &Apache::loncommon::CSTR_pageheader());               $env{'request.state'} ne 'construct') {
               $header=&Apache::lonmenu::constspaceform();
  if ($env{'request.state'} ne 'published') {          }
     $currentstring.=&Apache::lonmenu::constspaceform();          if ($env{'request.state'} ne 'published') {
     $currentstring.=&Apache::londefdef::edit_controls();              $header.=&Apache::londefdef::edit_controls();
  }          }
  $currentstring.=&Apache::lonxml::message_location();          if ($env{'request.state'} eq 'construct') {
               $currentstring.=&Apache::loncommon::head_subbox(
                                   &Apache::loncommon::CSTR_pageheader()
                                  .$header);
           } elsif ($env{'request.state'} eq 'edit') {
               $currentstring.=&Apache::loncommon::head_subbox($header);
           }
           $currentstring.=&Apache::lonxml::message_location();
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '';   #  '\begin{document}' is in header.          $currentstring = '';   #  '\begin{document}' is in header.
     }       }
   
     return $currentstring;      return $currentstring;
 }  }
   
Line 585  sub edit_controls { Line 599  sub edit_controls {
 </div>';  </div>';
     }      }
     $result .= '      $result .= '
 <div class="LC_edit_problem_header_edit_row"><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" /></div></div>  <div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />';
       if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
           $result .= ('&nbsp;' x 3).'<input type="button" value="'.&mt('Course View').'" onclick="javascript:location.href=currentURL" />';
       }
       $result .= '</div>
   </div>
 </form>  </form>
 <br />';  ';
     return $result;      return $result;
 }  }
   
Line 4732  sub align_latex_image { Line 4751  sub align_latex_image {
     #    Even though we set a default alignment value, the user      #    Even though we set a default alignment value, the user
     #    could have given us an illegal value.  In that case we      #    could have given us an illegal value.  In that case we
     #    just use the default alignment of bottom..      #    just use the default alignment of bottom..
     $currentstring = "\n% figurewrapping \n";      $currentstring = '';
     if      ($align eq "top")    {      if      ($align eq "top")    {
  $currentstring .= '\raisebox{-'.$height.'mm}{'.$image;   $currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
  $closure = '}';   $closure = '}';
Line 4775  sub align_latex_image { Line 4794  sub align_latex_image {
  $currentstring .= "{$image";   $currentstring .= "{$image";
  $closure       = '}';   $closure       = '}';
     }      }
     $currentstring .= "\n% end wrappage\n";  
     $closure        = "\n% Begin closure\n".$closure."\n% End closure\n";  
     return ($currentstring, $closure);      return ($currentstring, $closure);
 }  }
   
Line 4796  sub is_inside_of { Line 4813  sub is_inside_of {
 #  #
 #   This sub provides the typical LaTeX prefix matter for tex output:  #   This sub provides the typical LaTeX prefix matter for tex output:
 #  #
 sub latex_header  sub latex_header {
 {  
     my ($mode) = @_;      my ($mode) = @_;
     my $currentstring = '';      my $currentstring = '';
   
Removed from v.1.406  
changed lines
  Added in v.1.415

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.