[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 and 1.106.2.5

version 1.106, 2010/01/31 06:03:55 version 1.106.2.5, 2010/02/17 18:42:38
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 52  sub handler { Line 62  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'},['forcestudent','register','forceedit','wrapperdisplay']);                          ($ENV{'QUERY_STRING'},['delete', 'rename', 'field', 'forcestudent','register','forceedit','forceflush','wrapperdisplay']);
 # ----------------------------------------------------- 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 66  sub handler { Line 76  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') {         if ($env{'form.wrapperdisplay'} eq 'menu') {
            $r->print(&Apache::lonwrapper::simple_menu());             $r->print(&Apache::lonwrapper::simple_menu());
        } else {         } else {
Line 84  sub handler { Line 92  sub handler {
        return OK;         return OK;
     }      }
   
 # ------------------------------ The buck stops here: internal syllabus display  # --------------------------------------------------------- The old syllabus fields
 # --------------------------------------------------------- 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 102  sub handler { Line 109  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 139  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; cursor: pointer; margin: 0px 5px 5px 5px; padding: 5px; padding-left: 1.5em; width: 200px; font-size:90% }
    .LC_Sortable li span.left { float: left; cursor: move; margin-left: -1.5em; }
    .LC_Sortable li span.right { float: right; cursor: auto; margin-right: 0em }
    .LC_EllipseOverflow { overflow: hidden; text-overflow: ellipsis; -o-text-overflow: ellipsis; white-space: nowrap; }
    .LC_ActivityBarButton-IconLeft { padding-left: 20px }
    .LC_ActivityBarButton-IconLeft .ui-icon { float:left; margin-left: -18px; }
    #scrollable-fields-container {float:left; background-color: white; width: 235px; border: 1px solid grey; margin: 0px; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px;}
    #syllabus-fields-actions {text-align: center}
    #syllabus-content {-moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; margin: -6px 0 0 239px; position: relative; z-index: 2; padding: 9px 5px 5px 5px; background-color: #fafafa; border:solid 1px grey}
    #activity-bar {-moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; border: solid 1px grey; background-color: #dddddd; padding: 0px 0px;margin: 5px 0 2px 0;}
    #activity-bar button { font-size: 100%; vertical-align: middle }
    #context-bar {z-index: 4; position: relative; -moz-border-bottom-left-radius: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-bottom-right-radius: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; border: solid 1px grey; background-color: #eeeeee; padding: 0px 0px;margin:-1px 0 0px 239px;}
    #title-bar {-moz-border-top-left-radius: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-top-right-radius: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; border: solid 1px grey; background-color: #eaeaea; padding: 0px 0px;margin: 2px 0 0 239px}
    #title-bar img {vertical-align: middle} 
    #title-bar button {vertical-align: middle}
    #title-bar h4 {padding:0px}
    #section-type-button {padding: 2px;margin-left:2px;}
   </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);
   
    var changesMade = false;
    var changesBreakVersion = false;
   
    jQuery(document).ready(function() {
    jQuery('.LC_EllipseOverflow').ellipsis();
    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();
    // START TEMPORARY CODE FOR DEMO'S SAKE
    jQuery('#syllabus-form .LC_hcell').hide();
    jQuery('#section-title-text').html(
    jQuery('#box-'+id[1]).find('.LC_hcell').html()
    ); 
    // END TEMPORARY CODE
    });
    jQuery('#syllabus-fields').sortable({
    revert: true,
    axis: 'y',
    cursor: 'move',
    placeholder: 'ui-state-highlight',
    handle: 'span.ui-icon-arrowthick-2-n-s',
    forcePlaceholderSize: 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]);
    });
    if (!changesMade) {
    changesMade = true;
    $('#save-button').addClass('ui-state-highlight');
    $('#save-button').removeClass('ui-state-disabled');
    }
    }
    });
    jQuery('#syllabus-fields li').disableSelection();
    jQuery('.RemoveSection').hide();
    jQuery('#syllabus-fields li').hover(
    function(){
    jQuery(this).find('.RemoveSection').toggle();
    },
    function(){
    jQuery(this).find('.RemoveSection').toggle();
    }
    );
    jQuery('#syllabus-fields li span.right').hover(
    function(){
    jQuery(this).css('background-image', 'url("/adm/jQuery/css/smoothness/images/ui-icons_2e83ff_256x240.png")');
    },
    function(){
    jQuery(this).css('background-image', 'url("/adm/jQuery/css/smoothness/images/ui-icons_454545_256x240.png")');
    }
    );
    jQuery('#syllabus-form .LC_Box').hide();
    jQuery('.LC_ActivityBarButton').hover(
    function(){ 
    $(this).addClass("ui-state-hover"); 
    },
    function(){ 
    $(this).removeClass("ui-state-hover"); 
    }
    );
    });
   </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 164  ENDSCRIPT Line 311  ENDSCRIPT
         }          }
     }      }
 # ---------------------------------------------------------- Load syllabus info  # ---------------------------------------------------------- Load syllabus info
     my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);      my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);  # load db
     my $allowed=0;      my $allowed=0;  # can we edit this page?
     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'}) {      if ($env{'user.environment'}) { # does this user have privileges to post, etc?
 # 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 (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {              if (($data{'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 (keys(%syllabusfields)) {              foreach my $syl_field (@fields) {
                 my $field=$env{'form.'.$syl_field};                  my $field=$env{'form.'.$syl_field};
                 chomp($field);                  my $type;
                 $field=~s/\s+$//s;                  my %field_hash;
                 $field=~s/^\s+//s;                  # only update a field if it already exists!
                 $field=~s/\<br\s*\/*\>$//s;                  if (exists($data{'data.field.'.$syl_field})) {
                 $field=&Apache::lonfeedback::clear_out_html($field,1);                  #$r->print("Creating/updated field ".$syl_field."<br />");
  #here it will be stored                  %field_hash = exists($data{'data.field.'.$syl_field}) ?
                 $syllabus{$syl_field}=$field;                  %{thaw($data{'data.field.'.$syl_field})} : ();
                 if ($syl_field eq 'lll_includeurl') { # clean up included URLs                  $type = exists($field_hash{type}) ? $field_hash{type} : TYPE_TEXT_HTML;
                     my $field='';   chomp($field);
                     foreach my $value (split(/\n/,$syllabus{$syl_field})) {   $field=~s/\s+$//s;
                         my $url=$value;   $field=~s/^\s+//s;
 # get rid of leading and trailing spaces   $field=~s/\<br\s*\/*\>$//s;
                         $url=~s/^\s+//;   $field=&Apache::lonfeedback::clear_out_html($field,1);
                         $url=~s/\s+$//;   $field_hash{content}=$field;
                         if ($url=~m|^https?\://([^/]+)/(.+)$|) {   if ($type eq TYPE_URL_INCLUDE) { # clean up included URLs
                             my $host = $1;   my $field='';
                             my $remainder=$2;   foreach my $value (split(/\n/,$field_hash{content})) {
 # remove the hostname from internal URLs   my $url=$value;
                             my $hostname = &Apache::lonnet::hostname($host);   # get rid of leading and trailing spaces
                             my %all_hostnames = &Apache::lonnet::all_hostnames();   $url=~s/^\s+//;
                             foreach my $possible_host (keys(%all_hostnames)) {   $url=~s/\s+$//;
                                 if ($possible_host =~ /\Q$hostname\E/i) {   if ($url=~m|^https?\://([^/]+)/(.+)$|) {
                                     $url=$remainder;   my $host = $1;
                                 }   my $remainder=$2;
                             }   # remove the hostname from internal URLs
                         }   my $hostname = &Apache::lonnet::hostname($host);
 # norm internal URLs   my %all_hostnames = &Apache::lonnet::all_hostnames();
                         unless ($url=~/^https?\:/) {   foreach my $possible_host (keys(%all_hostnames)) {
                             $url=&Apache::lonnet::clutter($url);   if ($possible_host =~ /\Q$hostname\E/i) {
                         }   $url=$remainder;
 # re-assemble field   }
                         if ($url) {   }
                             $field.=$url."\n";   }
                         }   # norm internal URLs
                     }   unless ($url=~/^https?\:/) {
                     $syllabus{$syl_field}=$field;   $url=&Apache::lonnet::clutter($url);
                 }   }
    # 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);
    } 
             }              }
             $syllabus{'uploaded.domain'}=$env{'user.domain'};              $data{'uploaded.domain'}=$env{'user.domain'};
             $syllabus{'uploaded.name'}=$env{'user.name'};              $data{'uploaded.name'}=$env{'user.name'};
             $syllabus{'uploaded.lastmodified'}=time;              my $time = $^T;
             &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);              $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};
               }
               }
                 
               &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);
         }          }
     }      }
   
Line 306  ENDSCRIPT Line 585  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 314  ENDSCRIPT Line 605  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 361  ENDSCRIPT Line 653  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 ($allowed) {
             &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');      &print_activity_bar($r, \%data, $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
             $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';          &print_title_bar($r, \%data, $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
             $r->print( '<a href="'.$editurl.'">'.&mt('New RSS Feed or Blog').'</a>');          &print_context_bar($r, \%data, $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
             &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));
     }      }
       
 # ---------------------------------------------------------------- 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=();
  my $url_include_handler = sub {   my $url_include_handler = sub {
  my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_;   my ($r, $field, $json_ref, $group, $target, $allowed) = @_;
  my %data = %{$data_ref};   my $message = $json_ref->{items}{$field}{content};
  my %fields = %{$fields_ref};   my $title = $json_ref->{items}{$field}{title};
  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 400  ENDSCRIPT Line 688  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 409  ENDSCRIPT Line 698  ENDSCRIPT
  }   }
  if ($allowed) {   if ($allowed) {
  &Apache::lonfeedback::newline_to_br(\$urls);   &Apache::lonfeedback::newline_to_br(\$urls);
  &Apache::lontemplate::print_start_template($r,$fields{$field}.   &Apache::lontemplate::print_start_template($r,$title.
   &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, $data{$field},   &Apache::lontemplate::print_textarea_template($r, $message,
  $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 423  ENDSCRIPT Line 712  ENDSCRIPT
  $r->print($message);   $r->print($message);
  }   }
  };   };
  my %custom_hash = ( 'lll_includeurl' => $url_include_handler );   my %custom_hash = ( TYPE_URL_INCLUDE() => $url_include_handler );
  @htmlids = &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields,     @htmlids = &print_template_new_fields($r, \%data, 
  $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);    $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);
           if ($allowed) {
               $r->print('</form>');
               $r->print(&Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
           }
           if ($target ne 'tex') {$r->print('</div><p style="clear:both">&nbsp;</p>');}
         if ($allowed) {          if ($allowed) {
             $r->print('</form>'.              &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
             &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));              $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 448  ENDSCRIPT Line 749  ENDSCRIPT
     return OK;      return OK;
 }  }
   
   sub print_activity_bar {
    my ($r, $data_ref, $target, $allowed, $default_rich_text, $group) = @_;
    $r->print("<div id='activity-bar'>
   <button id='save-button' type='button' class='LC_ActivityBarButton LC_ActivityBarButton-IconLeft ui-state-default ui-priority-primary ui-corner-all'>
    <span class='ui-icon ui-icon-disk'></span><a href='#'>Save</a>
   </button>
   
   </div>");
   }
   
   sub print_title_bar {
    my ($r, $data_ref, $target, $allowed, $default_rich_text, $group) = @_;
    $r->print("<div id='title-bar'><h4>
   <button id='section-type-button' type='button' class='LC_ActivityBarButton ui-helper-reset ui-state-default ui-corner-all'>
    <img src='/adm/lonIcons/text-rich.png' title='Rich Text Section'/>
   </button>
   <span id='section-title-text'>Title Goes Here</span>
   </h4>
   </div>");
   }
   
   sub print_context_bar {
    my ($r, $data_ref, $target, $allowed, $default_rich_text, $group) = @_;
    $r->print("<div id='context-bar'>
   <button id='add-section-button' type='button' class='LC_ActivityBarButton LC_ActivityBarButton-IconLeft ui-state-default ui-corner-all'>
    <span class='ui-icon ui-icon-triangle-1-n'></span><a href='#'>Move&nbsp;Up</a>
   </button>
   <button id='add-section-button' type='button' class='LC_ActivityBarButton LC_ActivityBarButton-IconLeft ui-state-default ui-corner-all'>
    <span class='ui-icon ui-icon-triangle-1-s'></span><a href='#'>Move&nbsp;Down</a>
   </button>
   <button id='add-section-button' type='button' class='LC_ActivityBarButton LC_ActivityBarButton-IconLeft ui-state-default ui-corner-all'>
    <span class='ui-icon ui-icon-pencil'></span><a href='#'>Rename</a>
   </button>
   <button id='add-section-button' type='button' class='LC_ActivityBarButton LC_ActivityBarButton-IconLeft ui-state-default ui-corner-all'>
    <span class='ui-icon ui-icon-closethick'></span><a href='#'>Delete</a>
   </button>
   </div>");
   }
   
   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-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 left'></span><span id='remove-$key' class='RemoveSection right ui-icon ui-icon-closethick' title='Delete'></span>$field{title}</li>\n");
    }
    $r->print("
   </ui>
   </div>
   <div id='syllabus-fields-actions'>
   <button id='add-section-button' type='button' class='LC_ActivityBarButton LC_ActivityBarButton-IconLeft ui-state-default ui-corner-all'>
    <span class='ui-icon ui-icon-circle-plus'></span><a href='#'>Add&nbsp;Section</a>
   </button>
   <button id='revert-order-button' type='button' class='LC_ActivityBarButton LC_ActivityBarButton-IconLeft ui-state-default ui-corner-all'>
    <span class='ui-icon ui-icon-arrowreturnthick-1-w'></span><a href='#'>Revert&nbsp;Order</a>
   </button>
   </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("<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  
changed lines
  Added in v.1.106.2.5

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