--- loncom/interface/lonsyllabus.pm 2008/12/17 00:44:53 1.74
+++ loncom/interface/lonsyllabus.pm 2010/02/17 04:48:09 1.106.2.4
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.74 2008/12/17 00:44:53 ehlerst Exp $
+# $Id: lonsyllabus.pm,v 1.106.2.4 2010/02/17 04:48:09 faziophi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,6 +40,16 @@ use Apache::lonlocal;
use Apache::lonhtmlcommon;
use Apache::lonspeller();
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 {
my $r = shift;
@@ -52,40 +62,37 @@ sub handler {
my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
# ------------------------------------------------------------ Get query string
&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?
my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
if ($homeserver eq 'no_host') {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- &Apache::loncommon::simple_error_page($r,'No syllabus available',
- 'No syllabus available');
+ &Apache::loncommon::simple_error_page($r,'No syllabus available',
+ 'No syllabus available');
return OK;
}
# ------------------------------------- There is such a course, get environment
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
# ------------------------------------------------------------ Print the screen
-
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
my $externalsyllabus=$courseenv{'externalsyllabus'};
-
if ($externalsyllabus=~/\w/) {
-
if ($env{'form.wrapperdisplay'} eq 'menu') {
- $r->print(&Apache::lonwrapper::simple_menu());
- } else {
- $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",
- $externalsyllabus));
+ $r->print(&Apache::lonwrapper::simple_menu());
+ } else {
+ $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",
+ $externalsyllabus));
}
return OK;
- }
+ }
-# ------------------------------ The buck stops here: internal syllabus display
-# --------------------------------------------------------- The syllabus fields
+# --------------------------------------------------------- The old syllabus fields
my %syllabusfields=&Apache::lonlocal::texthash(
'aaa_instructorinfo' => 'Instructor Information',
'bbb_description' => 'Course Description',
@@ -102,15 +109,16 @@ sub handler {
'jjj_weblinks' => 'Web Links',
'kkk_textbook' => 'Textbook',
'lll_includeurl' => 'URLs To Include in Syllabus');
+
# --------------------------------------------------------------- Force Student
my $forcestudent='';
if ($env{'form.forcestudent'}) { $forcestudent='student'; };
my $forceedit='';
if ($env{'form.forceedit'}) { $forceedit='edit'; }
-
-# ----------------------------------------------------------------- Make header
+
+# ----------------------------------------------------------------- Make header
if ($target ne 'tex') {
- my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+ my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
my $js;
if ($env{'form.backto'} eq 'coursecatalog') {
$js .= <<"ENDSCRIPT";
@@ -118,11 +126,11 @@ sub handler {
<script type="text/javascript">
function ToCatalog(caller) {
numidx = getIndexByName('coursenum');
- if (numidx > -1) {
- if (caller != 'details') {
- document.backtocat.elements[numidx].value = '';
+ if (numidx > -1) {
+ if (caller != 'details') {
+ document.backtocat.elements[numidx].value = '';
+ }
}
- }
document.backtocat.submit();
}
@@ -139,267 +147,580 @@ function getIndexByName(item) {
ENDSCRIPT
}
- my $start_page =
- &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
- {'function' => $forcestudent,
- 'domain' => $cdom,
- 'force_register' =>
- $env{'form.register'},});
+ $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 {margin-left: 245px}
+ #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 }
+</style>
- $r->print($start_page);
+<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();
+ });
+ 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 =
+ &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
+ {'function' => undef,
+ 'domain' => $cdom,
+ 'force_register' =>
+ $env{'form.register'},});
+
+ $r->print($start_page);
if ($env{'form.backto'} eq 'coursecatalog') {
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:ToCatalog()",
- text=>"Course Catalog"});
+ ({href=>"javascript:ToCatalog()",
+ text=>"Course/Community Catalog"});
if ($env{'form.coursenum'} ne '') {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:ToCatalog('details')",
- text=>"Course details"});
+ ({href=>"javascript:ToCatalog('details')",
+ text=>"Course details"});
}
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>$r->uri,
- text=>"Course syllabus"});
+ ({href=>$r->uri,
+ text=>"Course syllabus"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs());
}
- $r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
- &Apache::lonnet::domain($cdom,'description').'</h3>');
+ }
+# ---------------------------------------------------------- Load syllabus info
+ my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); # load db
+ my $allowed=0; # can we edit this page?
+ 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 {
- $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
- &Apache::lonnet::domain($cdom,'description').'}\\\\');
+ %data = %syllabus;
+
}
-# -------------------------------------------------------------- Announcements?
- my $day = &Apache::lonannounce::showday(time,2,
- &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
+
+# ----------------------------------------------------- Only if not public call
+ if ($env{'user.environment'}) { # does this user have privileges to post, etc?
+ if ($env{'request.course.id'}
+ && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}
+ && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {
+ $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+ $privileged=$allowed;
+ if (($data{'uploaded.lastmodified'}) && (!$forceedit)) {
+ $forcestudent='student';
+ }
+ if ($forcestudent or $target eq 'tex') { $allowed=0; }
+ }
+ #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'})) {
+ foreach my $syl_field (@fields) {
+ my $field=$env{'form.'.$syl_field};
+ my $type;
+ my %field_hash;
+ # only update a field if it already exists!
+ if (exists($data{'data.field.'.$syl_field})) {
+ #$r->print("Creating/updated field ".$syl_field."<br />");
+ %field_hash = exists($data{'data.field.'.$syl_field}) ?
+ %{thaw($data{'data.field.'.$syl_field})} : ();
+ $type = exists($field_hash{type}) ? $field_hash{type} : TYPE_TEXT_HTML;
+ chomp($field);
+ $field=~s/\s+$//s;
+ $field=~s/^\s+//s;
+ $field=~s/\<br\s*\/*\>$//s;
+ $field=&Apache::lonfeedback::clear_out_html($field,1);
+ $field_hash{content}=$field;
+ if ($type eq TYPE_URL_INCLUDE) { # clean up included URLs
+ my $field='';
+ foreach my $value (split(/\n/,$field_hash{content})) {
+ my $url=$value;
+ # get rid of leading and trailing spaces
+ $url=~s/^\s+//;
+ $url=~s/\s+$//;
+ if ($url=~m|^https?\://([^/]+)/(.+)$|) {
+ my $host = $1;
+ my $remainder=$2;
+ # remove the hostname from internal URLs
+ my $hostname = &Apache::lonnet::hostname($host);
+ my %all_hostnames = &Apache::lonnet::all_hostnames();
+ foreach my $possible_host (keys(%all_hostnames)) {
+ if ($possible_host =~ /\Q$hostname\E/i) {
+ $url=$remainder;
+ }
+ }
+ }
+ # norm internal URLs
+ unless ($url=~/^https?\:/) {
+ $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);
+ }
+ }
+ $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};
+ }
+ }
+
+ &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);
+ }
+ }
+
+#--------Functions
+ if( ($allowed || $privileged) && $target ne 'tex') {
+ my $functions=&Apache::lonhtmlcommon::start_funclist();
+ if ($allowed) {
+ #if you have the register flag, keep it
+ if($env{'form.register'} == 1) {
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ '<a href="'.$r->uri.'?forcestudent=1&register=1">'
+ .&mt('Show Public View').'</a>'
+ .&Apache::loncommon::help_open_topic(
+ 'Uploaded_Templates_PublicView'));
+ } else {
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ '<a href="'.$r->uri.'?forcestudent=1">'
+ .&mt('Show Public View').'</a>'
+ .&Apache::loncommon::help_open_topic(
+ 'Uploaded_Templates_PublicView'));
+ }
+ } elsif ($privileged) {
+ if($env{'form.register'} == 1) {
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ '<a href="'.$r->uri.'?forceedit=1&register=1">'
+ .&mt('Edit').'</a>');
+ } else {
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ '<a href="'.$r->uri.'?forceedit=1">'
+ .&mt('Edit').'</a>');
+ }
+ }
+
+ $functions.=&Apache::lonhtmlcommon::end_funclist();
+ $r->print(&Apache::loncommon::head_subbox($functions));
+ }
+
+#---------------------Print External URL Syllabus Info and Help Text
+ if( ($allowed) && ($target ne 'tex') ) {
+ my $protocol = $Apache::lonnet::protocol{$homeserver};
+ $protocol = 'http' if ($protocol ne 'https');
+ $r->print('<p class="LC_info">'
+ .&mt('This syllabus can be publicly viewed at [_1]'
+ ,'<tt>'.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'</tt>')
+ .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink')
+ .'</p>'
+ .'<p class="LC_info">'
+ .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].'
+ ,'<a href="/adm/courseprefs?actions=courseinfo&phase=display">','</a>')
+ .'</p>'
+ );
+ #-Print Help Text
+ $r->print(&Apache::loncommon::help_open_topic(
+ 'Uploaded_Templates_TextBoxes',
+ &mt('Help with filling in text boxes')));
+ }
+
+#----------Print last update
+ my $lastmod=$syllabus{'uploaded.lastmodified'};
+ $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
+ my $who = &Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'});
if ($target ne 'tex') {
- $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
+ $r->print('<div class="LC_info">'.&mt('Last updated').': '.
+ $lastmod . ' '.
+ ($who ? &mt('by').' '.$who
+ : '' ) .
+ '</div>' );
+
} else {
- $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
+ $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
+ ($who? &mt('by').'\\\\ '.
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
+ :'')
+ .'\\\\');
+ }
+ 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
+ if ($target ne 'tex') {
+ $r->print('<h1>'.$courseenv{'description'}.'</h1>');
+ $r->print('<h3>'. &Apache::lonnet::domain($cdom,'description').'</h3>');
+ } else {
+ $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
+ &Apache::lonnet::domain($cdom,'description').'}\\\\');
}
# -------------------------------------------------------- Get course personnel
my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
} else {
- $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
+ $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
}
my @personnel=sort(keys(%coursepersonnel));
my $lastpers=$personnel[$#personnel];
foreach my $element (@personnel) {
- if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::row_title($element));
- } else {
- $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
- }
+ if ($target ne 'tex') {
+ $r->print(&Apache::lonhtmlcommon::row_title($element));
+ } else {
+ $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
+ }
foreach (split(/\,/,$coursepersonnel{$element})) {
- my ($puname,$pudom)=split(/\:/,$_);
- if ($target ne 'tex') {
+ my ($puname,$pudom)=split(/\:/,$_);
+ if ($target ne 'tex') {
my $courseperson = &Apache::loncommon::plainname($puname,$pudom);
if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
- $r->print(' '.$courseperson);
+ $r->print(' '.$courseperson);
} else {
$r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson,
$puname,$pudom));
}
- } else {
- $r->print(' '.&Apache::loncommon::plainname($puname,
+ } else {
+ $r->print(' '.&Apache::loncommon::plainname($puname,
$pudom).' ');
- }
- }
- if ($target ne 'tex') {
+ }
+ }
+ if ($target ne 'tex') {
my $lastclose=$element eq $lastpers?1:0;
$r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
- } else {
- $r->print('\\\\ \hline');
- }
+ } else {
+ $r->print('\\\\ \hline');
+ }
}
if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
- $r->print('\end{tabular}\\\\');
+ $r->print('\end{tabular}\\\\');
}
-# ---------------------------------------------------------- Load syllabus info
- my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
- my $allowed=0;
- my $privileged=0;
+# -------------------------------------------------------------- Announcements?
+ my $day = &Apache::lonannounce::showday(time,2,
+ &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
+ if ($target ne 'tex') {
+ if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
+ &print_activity_bar($r, \%data, $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
+ &print_field_sortable($r, \%data, $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
+ }
+ $r->print("<div id='syllabus-content'>\n");
-# This handler might be called anonymously ...
-# ----------------------------------------------------- Only if not public call
- if ($env{'user.environment'}) {
-# does this user have privileges to post, etc?
- if ($env{'request.course.id'}
- && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}
- && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {
- $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
- $privileged=$allowed;
- if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
- $forcestudent='student';
- }
- if ($forcestudent or $target eq 'tex') { $allowed=0; }
- }
- if ($allowed) {
- $r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.
-&mt('Show Public View').'</font></a>'.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
- '</p><p>'.
-&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p>'.&mt('This syllabus can be publicly viewed at')
- .' <tt>http://'.
- &Apache::lonnet::hostname($homeserver).$r->uri.'</tt>'.
- &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.
- '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>');
- } elsif ($privileged) {
- if ($target ne 'tex') {
- $r->print('<p><a href="'.$r->uri.'?forceedit=1"><font size="+1">'.
- &mt('Edit').'</font></a>');
- }
- }
- if (($allowed) && ($env{'form.storesyl'})) {
- foreach my $syl_field (keys(%syllabusfields)) {
- my $field=$env{'form.'.$syl_field};
- chomp($field);
- $field=~s/\s+$//s;
- $field=~s/^\s+//s;
- $field=~s/\<br\s*\/*\>$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
- $syllabus{$syl_field}=$field;
- if ($syl_field eq 'lll_includeurl') { # clean up included URLs
- my $field='';
- foreach my $value (split(/\n/,$syllabus{$syl_field})) {
- my $url=$value;
-# get rid of leading and trailing spaces
- $url=~s/^\s+//;
- $url=~s/\s+$//;
- if ($url=~m|^http://([^/]+)/(.+)$|) {
- my $host = $1;
- my $remainder=$2;
-# remove the hostname from internal URLs
- my $hostname = &Apache::lonnet::hostname($host);
- my %all_hostnames = &Apache::lonnet::all_hostnames();
- foreach my $possible_host (keys(%all_hostnames)) {
- if ($possible_host =~ /\Q$hostname\E/i) {
- $url=$remainder;
- }
- }
- }
-# norm internal URLs
- unless ($url=~/^http\:/) {
- $url=&Apache::lonnet::clutter($url);
- }
-# re-assemble field
- if ($url) {
- $field.=$url."\n";
- }
- }
- $syllabus{$syl_field}=$field;
- }
- }
- $syllabus{'uploaded.domain'}=$env{'user.domain'};
- $syllabus{'uploaded.name'}=$env{'user.name'};
- $syllabus{'uploaded.lastmodified'}=time;
- &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
- }
+ } else {
+ $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
}
+
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
- my $lastmod=$syllabus{'uploaded.lastmodified'};
- $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
- my $who = &Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'});
- if ($target ne 'tex') {
- $r->print('<table><tr><td>'.&mt('Last updated').':</td><td>'.
- $lastmod.'</td><td>'.
- ($who ? &mt('by').' '.$who
- : '' ).
- '</td></tr></table><p>');
- } else {
- $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
- ($who? &mt('by').'\\\\ '.
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
- :'')
- .'\\\\');
- }
- if ($allowed) {
- $r->print('<form method="post">'.
- '<input type="hidden" name="forceedit" value="edit" />');
- }
- my @htmlids=();
- &Apache::lontemplate::start_columnSection($r);
- &Apache::lontemplate::start_ContentBox($r, $allowed);
- foreach my $field (sort(keys(%syllabusfields))) {
- if (($syllabus{$field}=~/\w/) || ($allowed)) {
- my $message=$syllabus{$field};
- if ($field eq 'lll_includeurl') { # this is the "included" field
- my $urls=$message;
- $message='';
- foreach my $filelink (split(/\n/,$urls)) {
- my $output='';
-# embed style?
- my ($curfext)=($filelink=~/\.([^\.]+)$/);
- my $embstyle=&Apache::loncommon::fileembstyle($curfext);
- if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {
-# make ssi call and remove everything but the body contents
- $output=&Apache::lonnet::ssi_body($filelink);
- } elsif ($embstyle eq 'img') {
-# embed as an image
- $output='<img src="'.$filelink.'" />';
- }
- if ($target ne 'tex') {
- $message.='<p>'.$output.'</p>';
- } else {
- $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
- }
- }
- if ($allowed) {
- $r->print('<h3>'.$syllabusfields{$field}.
- &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>');
- } else {
- $r->print($message);
- }
- } else {
- &Apache::lonfeedback::newline_to_br(\$message);
- $message =~s|(https*://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
- if ($allowed) {
- $message=&Apache::lonspeller::markeduptext($message);
- }
- $message=&Apache::lontexconvert::msgtexconverted($message);
- if ($target ne 'tex') {
- if($allowed){
- $r->print('<p>');
- }
- &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
- } else {
- $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
- &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
- }
- push(@htmlids,$field);
- }
- if ($allowed) {
- if($target ne 'tex'){
- $r->print('</p>');
- }
- &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
- }
- }
- }
if ($allowed) {
- $r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
+ $r->print('<form id="syllabus-form" method="post" action="">'.
+ '<input type="hidden" name="forceedit" value="edit" />');
+ }
+ my @htmlids=();
+ my $url_include_handler = sub {
+ my ($r, $field, $json_ref, $group, $target, $allowed) = @_;
+ my $message = $json_ref->{items}{$field}{content};
+ my $title = $json_ref->{items}{$field}{title};
+ my $urls = $message;
+ foreach my $filelink (split(/\n/,$urls)) {
+ my $output='';
+ # embed style?
+ my ($curfext)=($filelink=~/\.([^\.]+)$/);
+ my $embstyle=&Apache::loncommon::fileembstyle($curfext);
+ if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {# make ssi call and remove everything but the body contents
+ $output=&Apache::lonnet::ssi_body($filelink);
+ } elsif ($embstyle eq 'img') {# embed as an image
+ $output='<img src="'.$filelink.'" />';
+ }
+ if ($output ne '') {
+ $message='';
+ if ($target ne 'tex') {
+ $message.='<p>'.$output.'</p>';
+ } else {
+ $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
+ }
+ }
+ }
+ if ($allowed) {
+ &Apache::lonfeedback::newline_to_br(\$urls);
+ &Apache::lontemplate::print_start_template($r,$title.
+ &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box');
+ $r->print($urls);
+ $r->print("<br /><div>");
+ &Apache::lontemplate::print_textarea_template($r, $message,
+ $field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);
+ &Apache::lontemplate::print_saveall_template($r);
+ $r->print("</div>");
+ &Apache::lontemplate::print_end_template($r);
+
+ } else {
+ $r->print($message);
+ }
+ };
+ my %custom_hash = ( TYPE_URL_INCLUDE() => $url_include_handler );
+ @htmlids = &print_template_new_fields($r, \%data,
+ $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);
+ if ($allowed) {
+ $r->print('</form>');
+ #&Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
+ }
+ if ($target ne 'tex') {$r->print('</div><p style="clear:both"> </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);
}
- &Apache::lontemplate::end_ContentBox($r);
- &Apache::lontemplate::end_columnSection($r);
- if ($allowed) {
- $r->print('</form>'.
- &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
- }
- if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
} else {
- if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}
- $r->print(&mt('No syllabus information provided.'));
- if ($target ne 'tex') {$r->print('</p>');}
+ if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}
+ $r->print(&mt('No syllabus information provided.'));
+ if ($target ne 'tex') {$r->print('</p>');}
}
if ($target ne 'tex') {
if ($env{'form.backto'} eq 'coursecatalog') {
@@ -407,12 +728,155 @@ ENDSCRIPT
&Apache::lonhtmlcommon::echo_form_input(['backto','courseid']).
'</form>');
}
- $r->print(&Apache::loncommon::end_page());
+ $r->print(&Apache::loncommon::end_page());
} else {
- $r->print('\end{document}');
+ $r->print('\end{document}');
}
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_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-priority-secondary ui-corner-all'>
+ <span class='ui-icon ui-icon-circle-plus'></span><a href='#'>Add Section</a>
+</button>
+<button id='revert-order-button' type='button' class='LC_ActivityBarButton LC_ActivityBarButton-IconLeft ui-state-default ui-priority-secondary ui-corner-all'>
+ <span class='ui-icon ui-icon-arrowreturnthick-1-w'></span><a href='#'>Revert 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("<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;
__END__