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

Diff for /loncom/interface/lonsyllabus.pm between versions 1.106.2.3 and 1.110

version 1.106.2.3, 2010/02/15 20:28:51 version 1.110, 2010/08/07 19:23:51
Line 40  use Apache::lonlocal; Line 40  use Apache::lonlocal;
 use Apache::lonhtmlcommon;  use Apache::lonhtmlcommon;
 use Apache::lonspeller();  use Apache::lonspeller();
 use HTML::Entities();  use HTML::Entities();
 use Digest::MD5 qw(md5_hex);  
 use Storable qw(freeze thaw);  
   
 # These are strings representing types of fields  
 # that will used to parse/display a field correctly  
 use constant {  
  TYPE_TEXT_HTML => 'html',  #<-- default  
  TYPE_TEXT_PLAIN => 'text',  
  TYPE_URL_INCLUDE => 'include-url',  
 };  
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 62  sub handler { Line 52  sub handler {
     my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);      my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
 # ------------------------------------------------------------ Get query string  # ------------------------------------------------------------ Get query string
     &Apache::loncommon::get_unprocessed_cgi      &Apache::loncommon::get_unprocessed_cgi
                         ($ENV{'QUERY_STRING'},['delete', 'rename', 'field', 'forcestudent','register','forceedit','forceflush','wrapperdisplay']);                          ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']);
 # ----------------------------------------------------- Is this even a course?  # ----------------------------------------------------- Is this even a course?
     my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);      my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
     if ($homeserver eq 'no_host') {      if ($homeserver eq 'no_host') {
Line 76  sub handler { Line 66  sub handler {
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);      my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
   
 # ------------------------------------------------------------ Print the screen  # ------------------------------------------------------------ Print the screen
   
     if ($target eq 'tex') {      if ($target eq 'tex') {
         $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));          $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
     }      }
       
 # -------------------------------------------------- Let's see who handles this  # -------------------------------------------------- Let's see who handles this
     my $externalsyllabus=$courseenv{'externalsyllabus'};      my $externalsyllabus=$courseenv{'externalsyllabus'};
   
     if ($externalsyllabus=~/\w/) {      if ($externalsyllabus=~/\w/) {
        if ($env{'form.wrapperdisplay'} eq 'menu') {          $r->print( Apache::lonwrapper::wrapper($externalsyllabus) );
            $r->print(&Apache::lonwrapper::simple_menu());          return OK;
        } else {  
            $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",  
                            $externalsyllabus));  
        }  
        return OK;  
     }      }
   
 # --------------------------------------------------------- The old syllabus fields  # ------------------------------ The buck stops here: internal syllabus display
   # --------------------------------------------------------- The syllabus fields
     my %syllabusfields=&Apache::lonlocal::texthash(      my %syllabusfields=&Apache::lonlocal::texthash(
        'aaa_instructorinfo' => 'Instructor Information',         'aaa_instructorinfo' => 'Instructor Information',
        'bbb_description'    => 'Course Description',         'bbb_description'    => 'Course Description',
Line 109  sub handler { Line 96  sub handler {
        'jjj_weblinks'       => 'Web Links',         'jjj_weblinks'       => 'Web Links',
        'kkk_textbook'       => 'Textbook',         'kkk_textbook'       => 'Textbook',
        'lll_includeurl'     => 'URLs To Include in Syllabus');         'lll_includeurl'     => 'URLs To Include in Syllabus');
          
 # --------------------------------------------------------------- Force Student  # --------------------------------------------------------------- Force Student
     my $forcestudent='';      my $forcestudent='';
     if ($env{'form.forcestudent'}) { $forcestudent='student'; };      if ($env{'form.forcestudent'}) { $forcestudent='student'; };
Line 147  function getIndexByName(item) { Line 133  function getIndexByName(item) {
   
 ENDSCRIPT  ENDSCRIPT
         }          }
         $js .= <<'ENDSCRIPT';  
   
 <style type="text/css">  
  .LC_Sortable ul { list-style-type: none; margin: 0px; padding: 0px}  
  .LC_Sortable li { list-style-type: none; margin: 0px 5px 5px 5px; padding: 5px; padding-left: 1.5em; width: 175px; font-size:90% }  
  .LC_Sortable li span { float: left; margin-left: -1.5em; }  
  .LC_EllipseOverflow { overflow: hidden; text-overflow: ellipsis; -o-text-overflow: ellipsis; white-space: nowrap; }  
  #scrollable-fields-container {float: left; background-color: white; width: 235px; border: 1px solid grey; margin: 0px}  
  #syllabus-fields {position:relative; top: 0;}  
  #syllabus-fields-container {padding: 0 0 0 0}  
  #syllabus-content {margin-left: 245px}  
 </style>  
   
 <script type="text/javascript">  
  // public domain code to emulate text-overflow:ellipsis in Firefox using jQuery  
  (function($) {  
  $.fn.ellipsis = function(enableUpdating){  
  var s = document.documentElement.style;  
  if (!('textOverflow' in s || 'OTextOverflow' in s)) {  
  return this.each(function(){  
  var el = $(this);  
  if(el.css("overflow") == "hidden"){  
  var originalText = el.html();  
  var w = el.width();  
   
  var t = $(this.cloneNode(true)).hide().css({  
  'position': 'absolute',  
  'width': 'auto',  
  'overflow': 'visible',  
  'max-width': 'inherit'  
  });  
  el.after(t);  
   
  var text = originalText;  
  while(text.length > 0 && t.width() > el.width()){  
  text = text.substr(0, text.length - 1);  
  t.html(text + "...");  
  }  
  el.html(t.html());  
   
  t.remove();  
   
  if(enableUpdating == true){  
  var oldW = el.width();  
  setInterval(function(){  
  if(el.width() != oldW){  
  oldW = el.width();  
  el.html(originalText);  
  el.ellipsis();  
  }  
  }, 200);  
  }  
  }  
  });  
  } else return this;  
  };  
  })(jQuery);  
   
   
  jQuery(document).ready(function() {  
  jQuery('.LC_EllipseOverflow').ellipsis();  
  jQuery('#syllabus-fields').sortable({  
  revert: true,  
  start: function(event, ui) {  
  jQuery(ui.item).css('font-style', 'italic');  
  },  
  stop: function(event, ui) {  
  var order = [];  
  jQuery(ui.item).parent().children('li').each(function() {  
  var id = /title-([0-9_]+)/i.exec(jQuery(this).attr('id'));  
  order.push(id[1]);  
  });  
  }  
  });  
  jQuery('#syllabus-fields li').click(function() {  
  jQuery(this).parent().children('li').removeClass('ui-state-highlight');  
  jQuery(this).addClass('ui-state-highlight');  
  var id = /title-([0-9_]+)/i.exec(jQuery(this).attr('id'));  
  jQuery('#syllabus-form .LC_Box').hide();  
  jQuery('#box-'+id[1]).show();  
  });  
  jQuery('#syllabus-fields ui, li').disableSelection();  
  jQuery('#syllabus-fields-container').height('500px');  
  jQuery('#syllabus-fields-container').css('overflow-x', 'hidden');  
  jQuery('#syllabus-fields-container').css('overflow-y', 'auto');  
  jQuery('#syllabus-fields-container').css('position', 'relative');  
  jQuery('#syllabus-fields').css('position', 'relative');  
  jQuery('#syllabus-fields').css('top', '0px');  
  jQuery('#syllabus-fields').css('display','block');  
  jQuery('#syllabus-fields-container').scroll(function() {  
  jQuery('#syllabus-fields').sortable('refreshPositions');  
  });  
  jQuery('#syllabus-form .LC_Box').hide();  
  });  
 </script>  
 ENDSCRIPT  
         my $start_page =          my $start_page =
          &Apache::loncommon::start_page("Syllabus", $rss_link.$js,           &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
                        {'function'       => undef,                         {'function'       => undef,
Line 268  ENDSCRIPT Line 158  ENDSCRIPT
         }          }
     }      }
 # ---------------------------------------------------------- Load syllabus info  # ---------------------------------------------------------- Load syllabus info
     my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);  # load db      my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
     my $allowed=0;  # can we edit this page?      my $allowed=0;
     my $privileged=0;      my $privileged=0;
     my %data;  
     if ($env{'form.forceflush'}) {  
     delete $syllabus{'data.fields'};  
     &Apache::lonnet::del('syllabus', ['data.fields'], $cdom, $cnum);  
     delete $syllabus{'properties.v2_conflict'};  
     &Apache::lonnet::del('syllabus', ['properties.v2_conflict'], $cdom, $cnum);  
     delete $syllabus{'properties.v2_conflict_fail'};  
     &Apache::lonnet::del('syllabus', ['properties.v2_conflict_fail'], $cdom, $cnum);  
     delete $syllabus{'properties.last_modified'};  
     &Apache::lonnet::del('syllabus', ['properties.last_modified'], $cdom, $cnum);  
     delete $syllabus{'properties.v2_converted'};  
     &Apache::lonnet::del('syllabus', ['properties.v2_converted'], $cdom, $cnum);  
     delete $syllabus{'data.old_new_map'};  
     &Apache::lonnet::del('syllabus', ['data.old_new_map'], $cdom, $cnum);  
     delete $syllabus{'data.deleted_fields'};  
     &Apache::lonnet::del('syllabus', ['data.deleted_fields'], $cdom, $cnum);  
  %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);  # load db  
     $r->print("Flushed syllabus DB file.<br />");  
     $r->print("Syllabus conflict: ".$syllabus{'properties.v2_conflict'}."<br />");  
     }  
     #$r->print("Existing fields: ".$syllabus{'data.fields'}."<br />");  
     #$r->print("Old-new map: ".$syllabus{'data.old_new_map'}."<br />");  
     #$r->print("Deleted fields: ".$syllabus{'data.deleted_fields'}."<br />");  
     if (!exists($syllabus{'data.fields'})) {  
     # convert existing 2.x data to new DB fields  
     # which become new primary data source for document  
  %data = %{convert_from_v2($r, \%syllabus, \%syllabusfields, 0)};  
  #$r->print("New fields order: ".$data{'data.fields'}."<br />");  
  &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);  
     } elsif (  !exists($syllabus{'properties.v2_converted'}) &&   
       exists($syllabus{'uploaded.lastmodified'}) &&  
       exists($syllabus{'properties.last_modified'}) &&  
       ($syllabus{'uploaded.lastmodified'} !=  
       $syllabus{'properties.last_modified'})) {  
     # if the document has been saved in 3.x and later edited in   
     # 2.x, reconvert the existing document, with extra warning  
     %data = %{convert_from_v2($r, \%syllabus, \%syllabusfields, 1)};  
     delete $data{'properties.v2_converted'};  
     &Apache::lonnet::del('syllabus', ['properties.v2_converted'], $cdom, $cnum);  
     $data{'properties.v2_conflict'} = 1;  
  &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);      
     } else {  
     %data = %syllabus;  
      
     }  
   
   # This handler might be called anonymously ...
 # ----------------------------------------------------- Only if not public call  # ----------------------------------------------------- Only if not public call
     if ($env{'user.environment'}) { # does this user have privileges to post, etc?      if ($env{'user.environment'}) {
   # does this user have privileges to post, etc?
         if ($env{'request.course.id'}          if ($env{'request.course.id'}
         && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}          && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}
         && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {          && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {
             $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});              $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
             $privileged=$allowed;              $privileged=$allowed;
             if (($data{'uploaded.lastmodified'}) && (!$forceedit)) {              if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
                 $forcestudent='student';                  $forcestudent='student';
             }              }
             if ($forcestudent or $target eq 'tex') { $allowed=0; }              if ($forcestudent or $target eq 'tex') { $allowed=0; }
         }          }
  #store what the user typed in   #store what the user typed in
  my @fields = @{thaw($data{'data.fields'})};  
  if (($allowed) && ($env{'form.delete'})) {  
  my $field = $env{'form.delete'};  
  chomp($field);  
  #allow only numbers, underscores  
  $field=~s/[^0-9_]//g;  
  #check if the field exists  
  #do not delete if file in v2 conversion mode  
  if (exists($data{'data.field.'.$field}) &&  
  !exists($data{'properties.v2_converted'})) {  
  #$r->print("Field '$field' can be deleted.<br />");  
  # linearly parse "data.fields" and remove it  
  for (my $i = 0; $i < length(@fields); $i++) {  
  if ($fields[$i] eq $field) {  
  splice(@fields, $i, 1);  
  #$r->print("Removed entry $i from 'data.fields'<br />");  
  }  
  }  
  # if "data.deleted" does not exist, create it  
  my @deleted;  
  if (!exists($data{'data.deleted_fields'})) {  
  @deleted = [];  
  } else {  
  @deleted = @{thaw($data{'data.deleted_fields'})};  
  }  
  # only if deleted does not exist in 'data.deleted', push it  
  my $push = 1;  
  for (my $i = 0; $i < length(@deleted); $i++) {  
  if ($deleted[$i] eq $field) {  
  $push = 0;  
  last;  
  }  
  }  
  unless (!$push) {  
  push(@deleted, $field);  
  }  
  $data{'data.fields'} = freeze(\@fields);  
  $data{'data.deleted_fields'} = freeze(\@deleted);  
   
  &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);  
  }  
  }  
  if (($allowed) && ($env{'form.rename'})) {  
  my $field = $env{'form.rename'};  
  my $new_title = "Hello, World!";  
  chomp($field);  
  $field=~s/[^0-9_]//g;  
  #check if the field exists  
  #do not delete if file in v2 conversion mode  
  if (exists($data{'data.field.'.$field}) &&  
  !exists($data{'properties.v2_converted'})) {  
  #sanitize HTML content  
  #$r->print("Rename -- field found.<br />");  
  my %db_entry = %{thaw($data{'data.field.'.$field})};  
  $new_title = &Apache::lonfeedback::clear_out_html($new_title, 1);  
  $db_entry{title} = $new_title;  
  $data{'data.field.'.$field} = freeze(\%db_entry);  
  &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);  
  }  
  }  
         if (($allowed) && ($env{'form.storesyl'})) {          if (($allowed) && ($env{'form.storesyl'})) {
             foreach my $syl_field (@fields) {              foreach my $syl_field (keys(%syllabusfields)) {
                 my $field=$env{'form.'.$syl_field};                  my $field=$env{'form.'.$syl_field};
                 my $type;                  chomp($field);
                 my %field_hash;                  $field=~s/\s+$//s;
                 # only update a field if it already exists!                  $field=~s/^\s+//s;
                 if (exists($data{'data.field.'.$syl_field})) {                  $field=~s/\<br\s*\/*\>$//s;
                 #$r->print("Creating/updated field ".$syl_field."<br />");                  $field=&Apache::lonfeedback::clear_out_html($field,1);
                 %field_hash = exists($data{'data.field.'.$syl_field}) ?   #here it will be stored
                 %{thaw($data{'data.field.'.$syl_field})} : ();                  $syllabus{$syl_field}=$field;
                 $type = exists($field_hash{type}) ? $field_hash{type} : TYPE_TEXT_HTML;                  if ($syl_field eq 'lll_includeurl') { # clean up included URLs
  chomp($field);                      my $field='';
  $field=~s/\s+$//s;                      foreach my $value (split(/\n/,$syllabus{$syl_field})) {
  $field=~s/^\s+//s;                          my $url=$value;
  $field=~s/\<br\s*\/*\>$//s;  # get rid of leading and trailing spaces
  $field=&Apache::lonfeedback::clear_out_html($field,1);                          $url=~s/^\s+//;
  $field_hash{content}=$field;                          $url=~s/\s+$//;
  if ($type eq TYPE_URL_INCLUDE) { # clean up included URLs                          if ($url=~m|^https?\://([^/]+)/(.+)$|) {
  my $field='';                              my $host = $1;
  foreach my $value (split(/\n/,$field_hash{content})) {                              my $remainder=$2;
  my $url=$value;  # remove the hostname from internal URLs
  # get rid of leading and trailing spaces                              my $hostname = &Apache::lonnet::hostname($host);
  $url=~s/^\s+//;                              my %all_hostnames = &Apache::lonnet::all_hostnames();
  $url=~s/\s+$//;                              foreach my $possible_host (keys(%all_hostnames)) {
  if ($url=~m|^https?\://([^/]+)/(.+)$|) {                                  if ($possible_host =~ /\Q$hostname\E/i) {
  my $host = $1;                                      $url=$remainder;
  my $remainder=$2;                                  }
  # remove the hostname from internal URLs                              }
  my $hostname = &Apache::lonnet::hostname($host);                          }
  my %all_hostnames = &Apache::lonnet::all_hostnames();  # norm internal URLs
  foreach my $possible_host (keys(%all_hostnames)) {                          unless ($url=~/^https?\:/) {
  if ($possible_host =~ /\Q$hostname\E/i) {                              $url=&Apache::lonnet::clutter($url);
  $url=$remainder;                          }
  }  # re-assemble field
  }                          if ($url) {
  }                              $field.=$url."\n";
  # norm internal URLs                          }
  unless ($url=~/^https?\:/) {                      }
  $url=&Apache::lonnet::clutter($url);                      $syllabus{$syl_field}=$field;
  }                  }
  # re-assemble field  
  if ($url) {  
  $field.=$url."\n";  
  }  
  }  
                    $field_hash{content}=$field;  
                    $field_hash{type}=TYPE_URL_INCLUDE;  
  }  
  $data{'data.field.'.$syl_field} = freeze(\%field_hash);  
  }   
             }  
             $data{'uploaded.domain'}=$env{'user.domain'};  
             $data{'uploaded.name'}=$env{'user.name'};  
             my $time = $^T;  
             $data{'uploaded.lastmodified'}=$time;  
             $data{'properties.last_modified'}=$time;  
             delete $data{'properties.v2_converted'};  
             delete $data{'properties.v2_conflict'};  
             delete $data{'properties.v2_conflict_fail'};  
             &Apache::lonnet::del('syllabus', ['properties.v2_converted',   
             'properties.v2_conflict', 'properties.v2_conflict_fail'], $cdom, $cnum);  
              
             #2.x compatibility: write to old fields with new mapped fields  
             my %old_new_map = %{thaw($data{'data.old_new_map'})};  
             foreach my $old_field (keys(%old_new_map)) {  
             #$r->print("Looking for: ".$old_field." at ".$old_new_map{$old_field}."<br />");  
             if (exists($data{'data.field.'.$old_new_map{$old_field}})) {  
             #$r->print("updating old field ".$old_field."<br />");  
             my %new_field = %{thaw($data{'data.field.'.$old_new_map{$old_field}})};  
             $data{$old_field} = $new_field{content};  
             }  
             }              }
                             $syllabus{'uploaded.domain'}=$env{'user.domain'};
             &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);              $syllabus{'uploaded.name'}=$env{'user.name'};
               $syllabus{'uploaded.lastmodified'}=time;
               &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
         }          }
     }      }
   
Line 524  ENDSCRIPT Line 282  ENDSCRIPT
 #----------Print last update  #----------Print last update
     my $lastmod=$syllabus{'uploaded.lastmodified'};      my $lastmod=$syllabus{'uploaded.lastmodified'};
     $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));      $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
     my $who = &Apache::loncommon::aboutmewrapper(      my $who;
         &Apache::loncommon::plainname($syllabus{'uploaded.name'},      if (($env{'user.name'} ne 'public') && ($env{'user.domain'} ne 'public')) {
         $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},          $who = &Apache::loncommon::aboutmewrapper(
         $syllabus{'uploaded.domain'});                     &Apache::loncommon::plainname($syllabus{'uploaded.name'},
                      $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
                      $syllabus{'uploaded.domain'});
       } else {
           # Public user?
           # Only display name of user, but no link to personal information page
           $who = &Apache::loncommon::plainname(
                      $syllabus{'uploaded.name'},
                      $syllabus{'uploaded.domain'});
       }
   
     if ($target ne 'tex') {      if ($target ne 'tex') {
         $r->print('<div class="LC_info">'.&mt('Last updated').': '.          $r->print('<div class="LC_info">'.&mt('Last updated').': '.
             $lastmod . ' '.              $lastmod . ' '.
Line 542  ENDSCRIPT Line 310  ENDSCRIPT
                   :'')                    :'')
              .'\\\\');               .'\\\\');
     }      }
     if ($allowed && $data{'properties.v2_converted'} == 1) {  
     $r->print("<em>This document was created with LON-CAPA 2.x.  Modifying it may cause it to not display correctly on older servers.</em><br/>");  
  }  
  if ($allowed && $data{'properties.v2_conflict'} == 1) {  
  $r->print("<em>This document was saved with LON-CAPA 3.x, then further edited in LON-CAPA 2.x.</em><br/>");  
  if ($data{'properties.v2_conflict_fail'} == 1) {  
  $r->print("<em>Some fields in LON-CAPA 2.x no longer have an equivalent in LON-CAPA 3.x.  These fields were appended; some fields may be duplicated or not match.</em><br />");  
  } else {  
  $r->print("<em>These changes were automatically transferred to LON-CAPA 3.x</em>");  
  }  
  }  
   
 #----------------------------Print Headtitle  #----------------------------Print Headtitle
     if ($target ne 'tex') {      if ($target ne 'tex') {
         $r->print('<h1>'.$courseenv{'description'}.'</h1>');          $r->print('<h1>'.$courseenv{'description'}.'</h1>');
Line 562  ENDSCRIPT Line 318  ENDSCRIPT
         $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.          $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
         &Apache::lonnet::domain($cdom,'description').'}\\\\');          &Apache::lonnet::domain($cdom,'description').'}\\\\');
     }      }
   
 # -------------------------------------------------------- Get course personnel  # -------------------------------------------------------- Get course personnel
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);      my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
     if ($target ne 'tex') {      if ($target ne 'tex') {
Line 610  ENDSCRIPT Line 365  ENDSCRIPT
     my $day = &Apache::lonannounce::showday(time,2,      my $day = &Apache::lonannounce::showday(time,2,
              &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));               &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
     if ($target ne 'tex') {      if ($target ne 'tex') {
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {          if ($allowed) {
     $r->print("<br />");              &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
     &print_field_sortable($r, \%data, $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML);              $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
               my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
               $r->print( '<a href="'.$editurl.'">'.&mt('New RSS Feed or Blog').'</a>');
               &Apache::lontemplate::print_end_template($r);
           } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
               &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
               $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
               &Apache::lontemplate::print_end_template($r);
         }          }
         $r->print("<div id='syllabus-content'>\n");  
   
     } else {      } else {
         $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));          $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
     }      }
       
 # ---------------------------------------------------------------- Get syllabus  # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {      if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
         if ($allowed) {          if ($allowed) {
             $r->print('<form id="syllabus-form" method="post" action="">'.              $r->print('<form method="post" action="">'.
             '<input type="hidden" name="forceedit" value="edit" />');              '<input type="hidden" name="forceedit" value="edit" />');
         }          }
         my @htmlids=();  
  my $url_include_handler = sub {   my $url_include_handler = sub {
  my ($r, $field, $json_ref, $group, $target, $allowed) = @_;   my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_;
  my $message = $json_ref->{items}{$field}{content};   my %data = %{$data_ref};
  my $title = $json_ref->{items}{$field}{title};   my %fields = %{$fields_ref};
  my $urls = $message;   my $urls=$message;
    $message='';
  foreach my $filelink (split(/\n/,$urls)) {   foreach my $filelink (split(/\n/,$urls)) {
  my $output='';   my $output='';
    # embed style?     # embed style?
Line 643  ENDSCRIPT Line 403  ENDSCRIPT
  $output='<img src="'.$filelink.'" />';   $output='<img src="'.$filelink.'" />';
  }   }
  if ($output ne '') {   if ($output ne '') {
    $message='';  
    if ($target ne 'tex') {     if ($target ne 'tex') {
    $message.='<p>'.$output.'</p>';     $message.='<p>'.$output.'</p>';
    } else {     } else {
Line 653  ENDSCRIPT Line 412  ENDSCRIPT
  }   }
  if ($allowed) {   if ($allowed) {
  &Apache::lonfeedback::newline_to_br(\$urls);   &Apache::lonfeedback::newline_to_br(\$urls);
  &Apache::lontemplate::print_start_template($r,$title.   &Apache::lontemplate::print_start_template($r,$fields{$field}.
   &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box');    &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box');
  $r->print($urls);   $r->print($urls);
  $r->print("<br /><div>");   $r->print("<br /><div>");
  &Apache::lontemplate::print_textarea_template($r, $message,   &Apache::lontemplate::print_textarea_template($r, $data{$field},
  $field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);   $field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);
  &Apache::lontemplate::print_saveall_template($r);                            &Apache::lontemplate::print_saveall_template($r);                         
  $r->print("</div>");   $r->print("</div>");
Line 667  ENDSCRIPT Line 426  ENDSCRIPT
  $r->print($message);   $r->print($message);
  }   }
  };   };
  my %custom_hash = ( TYPE_URL_INCLUDE() => $url_include_handler );   my %custom_hash = ( 'lll_includeurl' => $url_include_handler );
   @htmlids = &print_template_new_fields($r, \%data,    &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields, 
   $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);   $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);
         if ($allowed) {          if ($allowed) {
             $r->print('</form>'.              $r->print('</form>'.
             &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));              &Apache::lonhtmlcommon::htmlareaselectactive());
         }  
         if ($target ne 'tex') {$r->print('</div><p style="clear:both">&nbsp;</p>');}  
         if ($allowed) {  
             &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');  
             $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));  
             my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';  
             $r->print( '<a href="'.$editurl.'">'.&mt('New RSS Feed or Blog').'</a>');  
             &Apache::lontemplate::print_end_template($r);  
         } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {  
             &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');  
             $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));  
             &Apache::lontemplate::print_end_template($r);  
         }          }
     } else {      } else {
         if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}          if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}
Line 704  ENDSCRIPT Line 451  ENDSCRIPT
     return OK;      return OK;
 }  }
   
 sub print_field_sortable {  
  my ($r, $data_ref, $target, $allowed, $default_rich_text, $group) = @_;  
  my %data = %{$data_ref};  
  my @fields = @{thaw($data{'data.fields'})};  
  $r->print("<div id='scrollable-fields-container'>  
 <!--<div id='syllabus-fields-up' class='ui-state-default' style='text-align:center'>Up</div>-->  
 <div id='syllabus-fields-container'>  
 <ui id='syllabus-fields' class='LC_Sortable LC_SyllabusFields'>\n");  
  foreach my $key (@fields) {  
  my %field = %{thaw($data{'data.field.'.$key})};  
  $r->print("<li id='title-$key' class='ui-state-default LC_EllipseOverflow' title='$field{title}'><span class='ui-icon ui-icon-arrowthick-2-n-s'></span>$field{title}</li>\n");  
  }  
  $r->print("  
 </ui>  
 </div>  
 <!--<div id='syllabus-fields-down' class='ui-state-default' style='text-align:center'>Down</div>-->  
 </div>\n");  
 }  
   
 sub print_template_new_fields {  
  my ($r, $data_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group) = @_;  
  my @html_ids = ();  
  my %data = %{$data_ref};  
  my @fields = @{thaw($data{'data.fields'})};  
  my %custom_handlers = %{$custom_handlers_ref};  
   
  foreach my $key (@fields) {  
  my %field = %{thaw($data{'data.field.'.$key})};  
  my $title = $field{title};  
  my $raw_message = $field{content};  
  my $type = $field{type};  
  my $message = $raw_message if (($raw_message=~/\w/) || ($allowed));  
  if ((%custom_handlers) && exists($custom_handlers{$type})) {  
  #$custom_handlers{$type}->($r, $field, $json_ref, $group, $target, $allowed);  
  } else {  
  if (($raw_message=~/\w/) || ($allowed)) {  
  if (!&Apache::lonfeedback::contains_block_html($message)) {  
  &Apache::lonfeedback::newline_to_br(\$message);  
  } else {  
  $message = &Apache::lonfeedback::tidy_html($message);  
  }  
  $message=&Apache::lonhtmlcommon::raw_href_to_link($message);  
  if ($allowed) {  
  $message=&Apache::lonspeller::markeduptext($message);  
  }  
  $message=&Apache::lontexconvert::msgtexconverted($message);  
  if ($target ne 'tex') {  
  #output of syllabusfields will be generated here.   
  &Apache::lontemplate::print_start_template($r,$title,'LC_Box', 'box-'.$key);  
  $r->print($message);  
  if ($allowed) {  
  $r->print("<br /><div>");  
  &Apache::lontemplate::print_textarea_template($r, $raw_message,  
  $key, $default_rich_text);  
  &Apache::lontemplate::print_saveall_template($r);  
  if (!exists($data{'properties.v2_converted'})) {  
  $r->print("<a href='?delete=$key&forceedit=1'>Delete</a> ");  
  $r->print("<a href='?rename=$key&forceedit=1'>Rename to \"Hello, World!\"</a>");  
  }  
  $r->print("</div>");  
  }   
  &Apache::lontemplate::print_end_template($r);  
  } else {  
     my $safeinit;  
                     $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$title.'</h3>'));  
                     $r->print(&Apache::lonxml::xmlparse($r,'tex',$message));  
  }  
  push(@html_ids,"hello");  
  }  
  }  
  }  
   
  return @html_ids;  
 }  
   
 sub convert_from_v2 {  
  my ($r, $data_ref, $fields_ref, $conflict) = @_;  
  my %data = %{$data_ref};  
  my %fields = %{$fields_ref};  
  my @fields_order = (!$conflict) ? () : @{thaw($data{'data.fields'})};  
  my %old_new_map = (!$conflict) ? () : %{thaw($data{'data.old_new_map'})};  
  my $repeat_int = 0;  #ensure fields with created timestamp are unique  
  foreach my $element (sort(keys(%fields))) {  
  my %new_element = ();  
  my $title = $fields{$element};  
  my $title_hash = time."_".$$;  
  if (exists($data{'data.field.'.$title_hash})) {  
  $title_hash .= "_".$repeat_int++;  
  }  
  my $content = $data{$element};  
  $new_element{title} = $title;  
  $new_element{content} = $content;  
  if ($element eq 'lll_includeurl') {  
  $new_element{type} = TYPE_URL_INCLUDE;  
  } else {  
  $new_element{type} = TYPE_TEXT_HTML;  
  }  
  if (!$conflict) {  
  $r->print("Creating new field with ID: ".$title_hash."<br />");  
  $data{'data.field.'.$title_hash} = freeze(\%new_element);  
  $old_new_map{$element} = $title_hash;  
  push(@fields_order, $title_hash);  
  } else {  
  if (exists($old_new_map{$element})) {  
  $r->print("Transferring old field ".$element." to new ID: ".$old_new_map{$element}."<br />");  
  if (exists($data{'data.field.'.$old_new_map{$element}})) {  
  my %new_field = %{thaw($data{'data.field.'.$old_new_map{$element}})};  
  $new_field{content} = $content;  
  $data{'data.field.'.$old_new_map{$element}} = freeze(\%new_field);  
  }  
  } else {  
  $data{'data.field.'.$title_hash} = freeze(\%new_element);  
  $old_new_map{$element} = $title_hash;  
  $data{'properties.v2_conflict_fail'} = 1;  
  push(@fields_order, $title_hash);  
  }  
  }  
  }  
  $data{'data.fields'} = freeze(\@fields_order);  
  $data{'data.old_new_map'} = freeze(\%old_new_map);  
  $data{'properties.last_modified'} = time;  
  $data{'properties.v2_converted'} = 1;  
  $data{'properties.type'} = 'syllabus';  
   
  return \%data;  
 }  
   
 1;  1;
 __END__  __END__
Removed from v.1.106.2.3  
changed lines
  Added in v.1.110

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