[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.2 and 1.106.2.3

version 1.106.2.2, 2010/02/15 16:05:32 version 1.106.2.3, 2010/02/15 20:28:51
Line 147  function getIndexByName(item) { Line 147  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 195  ENDSCRIPT Line 291  ENDSCRIPT
     $r->print("Flushed syllabus DB file.<br />");      $r->print("Flushed syllabus DB file.<br />");
     $r->print("Syllabus conflict: ".$syllabus{'properties.v2_conflict'}."<br />");      $r->print("Syllabus conflict: ".$syllabus{'properties.v2_conflict'}."<br />");
     }      }
     $r->print("Existing fields: ".$syllabus{'data.fields'}."<br />");      #$r->print("Existing fields: ".$syllabus{'data.fields'}."<br />");
     $r->print("Old-new map: ".$syllabus{'data.old_new_map'}."<br />");      #$r->print("Old-new map: ".$syllabus{'data.old_new_map'}."<br />");
     $r->print("Deleted fields: ".$syllabus{'data.deleted_fields'}."<br />");      #$r->print("Deleted fields: ".$syllabus{'data.deleted_fields'}."<br />");
     if (!exists($syllabus{'data.fields'})) {      if (!exists($syllabus{'data.fields'})) {
     # convert existing 2.x data to new DB fields      # convert existing 2.x data to new DB fields
     # which become new primary data source for document      # which become new primary data source for document
  %data = %{convert_from_v2($r, \%syllabus, \%syllabusfields, 0)};   %data = %{convert_from_v2($r, \%syllabus, \%syllabusfields, 0)};
  $r->print("New fields order: ".$data{'data.fields'}."<br />");   #$r->print("New fields order: ".$data{'data.fields'}."<br />");
  &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);   &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);
     } elsif (  !exists($syllabus{'properties.v2_converted'}) &&       } elsif (  !exists($syllabus{'properties.v2_converted'}) && 
       exists($syllabus{'uploaded.lastmodified'}) &&        exists($syllabus{'uploaded.lastmodified'}) &&
Line 244  ENDSCRIPT Line 340  ENDSCRIPT
  #do not delete if file in v2 conversion mode   #do not delete if file in v2 conversion mode
  if (exists($data{'data.field.'.$field}) &&   if (exists($data{'data.field.'.$field}) &&
  !exists($data{'properties.v2_converted'})) {   !exists($data{'properties.v2_converted'})) {
  $r->print("Field '$field' can be deleted.<br />");   #$r->print("Field '$field' can be deleted.<br />");
  # linearly parse "data.fields" and remove it   # linearly parse "data.fields" and remove it
  for (my $i = 0; $i < length(@fields); $i++) {   for (my $i = 0; $i < length(@fields); $i++) {
  if ($fields[$i] eq $field) {   if ($fields[$i] eq $field) {
  splice(@fields, $i, 1);   splice(@fields, $i, 1);
  $r->print("Removed entry $i from 'data.fields'<br />");   #$r->print("Removed entry $i from 'data.fields'<br />");
  }   }
  }   }
  # if "data.deleted" does not exist, create it   # if "data.deleted" does not exist, create it
Line 286  ENDSCRIPT Line 382  ENDSCRIPT
  if (exists($data{'data.field.'.$field}) &&   if (exists($data{'data.field.'.$field}) &&
  !exists($data{'properties.v2_converted'})) {   !exists($data{'properties.v2_converted'})) {
  #sanitize HTML content   #sanitize HTML content
  $r->print("Rename -- field found.<br />");   #$r->print("Rename -- field found.<br />");
  my %db_entry = %{thaw($data{'data.field.'.$field})};   my %db_entry = %{thaw($data{'data.field.'.$field})};
  $new_title = &Apache::lonfeedback::clear_out_html($new_title, 1);   $new_title = &Apache::lonfeedback::clear_out_html($new_title, 1);
  $db_entry{title} = $new_title;   $db_entry{title} = $new_title;
Line 301  ENDSCRIPT Line 397  ENDSCRIPT
                 my %field_hash;                  my %field_hash;
                 # only update a field if it already exists!                  # only update a field if it already exists!
                 if (exists($data{'data.field.'.$syl_field})) {                  if (exists($data{'data.field.'.$syl_field})) {
                 $r->print("Creating/updated field ".$syl_field."<br />");                  #$r->print("Creating/updated field ".$syl_field."<br />");
                 %field_hash = exists($data{'data.field.'.$syl_field}) ?                  %field_hash = exists($data{'data.field.'.$syl_field}) ?
                 %{thaw($data{'data.field.'.$syl_field})} : ();                  %{thaw($data{'data.field.'.$syl_field})} : ();
                 $type = exists($field_hash{type}) ? $field_hash{type} : TYPE_TEXT_HTML;                  $type = exists($field_hash{type}) ? $field_hash{type} : TYPE_TEXT_HTML;
Line 359  ENDSCRIPT Line 455  ENDSCRIPT
             #2.x compatibility: write to old fields with new mapped fields              #2.x compatibility: write to old fields with new mapped fields
             my %old_new_map = %{thaw($data{'data.old_new_map'})};              my %old_new_map = %{thaw($data{'data.old_new_map'})};
             foreach my $old_field (keys(%old_new_map)) {              foreach my $old_field (keys(%old_new_map)) {
             $r->print("Looking for: ".$old_field." at ".$old_new_map{$old_field}."<br />");              #$r->print("Looking for: ".$old_field." at ".$old_new_map{$old_field}."<br />");
             if (exists($data{'data.field.'.$old_new_map{$old_field}})) {              if (exists($data{'data.field.'.$old_new_map{$old_field}})) {
             $r->print("updating old field ".$old_field."<br />");              #$r->print("updating old field ".$old_field."<br />");
             my %new_field = %{thaw($data{'data.field.'.$old_new_map{$old_field}})};              my %new_field = %{thaw($data{'data.field.'.$old_new_map{$old_field}})};
             $data{$old_field} = $new_field{content};              $data{$old_field} = $new_field{content};
             }              }
Line 514  ENDSCRIPT Line 610  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 ($allowed) {      if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
             &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');      $r->print("<br />");
             $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));      &print_field_sortable($r, \%data, $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
             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);  
         }          }
           $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));
Line 533  ENDSCRIPT Line 623  ENDSCRIPT
 # ---------------------------------------------------------------- Get syllabus  # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {      if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
         if ($allowed) {          if ($allowed) {
             $r->print('<form method="post" action="">'.              $r->print('<form id="syllabus-form" method="post" action="">'.
             '<input type="hidden" name="forceedit" value="edit" />');              '<input type="hidden" name="forceedit" value="edit" />');
         }          }
         my @htmlids=();          my @htmlids=();
Line 584  ENDSCRIPT Line 674  ENDSCRIPT
             $r->print('</form>'.              $r->print('</form>'.
             &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));              &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
         }          }
           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 ');}
         $r->print(&mt('No syllabus information provided.'));          $r->print(&mt('No syllabus information provided.'));
Line 602  ENDSCRIPT Line 704  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 {  sub print_template_new_fields {
  my ($r, $data_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group) = @_;   my ($r, $data_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group) = @_;
  my @html_ids = ();   my @html_ids = ();
Line 631  sub print_template_new_fields { Line 752  sub print_template_new_fields {
  $message=&Apache::lontexconvert::msgtexconverted($message);   $message=&Apache::lontexconvert::msgtexconverted($message);
  if ($target ne 'tex') {   if ($target ne 'tex') {
  #output of syllabusfields will be generated here.    #output of syllabusfields will be generated here. 
  &Apache::lontemplate::print_start_template($r,$title,'LC_Box');   &Apache::lontemplate::print_start_template($r,$title,'LC_Box', 'box-'.$key);
  $r->print($message);   $r->print($message);
  if ($allowed) {   if ($allowed) {
  $r->print("<br /><div>");   $r->print("<br /><div>");
Removed from v.1.106.2.2  
changed lines
  Added in v.1.106.2.3

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