From bisitz at source.lon-capa.org Mon Dec 16 08:44:33 2013 From: bisitz at source.lon-capa.org (bisitz) Date: Mon, 16 Dec 2013 13:44:33 -0000 Subject: [LON-CAPA-cvs] cvs: doc /build ubuntu10LTS_install.frag ubuntu12LTS_install.frag ubuntu8LTS_install.frag Message-ID: bisitz Mon Dec 16 13:44:33 2013 EDT Modified files: /doc/build ubuntu8LTS_install.frag ubuntu10LTS_install.frag ubuntu12LTS_install.frag Log: Valid HTML code/nested tags; unbalanced tags/correct tag closure; W3C HTML validity -------------- next part -------------- Index: doc/build/ubuntu8LTS_install.frag diff -u doc/build/ubuntu8LTS_install.frag:1.7 doc/build/ubuntu8LTS_install.frag:1.8 --- doc/build/ubuntu8LTS_install.frag:1.7 Thu Jun 9 14:54:24 2011 +++ doc/build/ubuntu8LTS_install.frag Mon Dec 16 13:44:33 2013 @@ -33,10 +33,10 @@
  • Log in to LON-CAPA
  • -
    +

    1. Obtain Ubuntu 8.04 LTS .iso file

    -Ubuntu 8.04 LTS (server install) isos can be obtained from links on the Ubuntu Releases page at mirrors.kernel.org.
    +Ubuntu 8.04 LTS (server install) isos can be obtained from links on the Ubuntu Releases page at mirrors.kernel.org.
    An .iso file (either 32 bit or 64 bit) can be burned to a CD.

    @@ -86,12 +86,13 @@
    The base system will be installed. Once that is complete you will have the option to select additional software collections. Leave all unselected.

    - Finish installing your server, reboot it, and log in with the username you created during installation. -

    Firewall Configuration
    -
    Use ufw to allow incoming traffic for the following services: - ssh, www, https -
    +

    +

    Firewall Configuration

    +

    +Use ufw to allow incoming traffic for the following services: +ssh, www, https +

     sudo ufw default deny
     sudo ufw enable
    @@ -99,12 +100,13 @@
     sudo ufw allow www
     sudo ufw allow https
     
    -
    E-mail Configuration
    -
    By default Ubuntu disallows mailing to remote domains. Change using
    +

    E-mail Configuration

    +

    +By default Ubuntu disallows mailing to remote domains. Change using +

     sudo dpkg-reconfigure exim4-config
    -
    +

    4. Update your system

    @@ -185,7 +187,7 @@

  • Configure Apache web server
  • Configure start-up of services
  • Check firewall settings
  • -
  • Stop services not used by LON-CAPA,
    +
  • Stop services not used by LON-CAPA,
    e.g., services for a print server: cups daemon
  • Download LON-CAPA source code in readiness for installation
  • @@ -208,7 +210,7 @@
    Each site or school which installs LON-CAPA needs its own domain. Here at MSU we use 'msu'. You should choose something short but meaningful. Restriction: One word, no hyphens, underscores, or - special characters.
    Domain names which include a departmental + special characters.
    Domain names which include a departmental abbreviation are not recommended as although LON-CAPA may start in a single department, other departments frequently join subsequently. For a domain name: 'msu' is a superior choice to 'msuphys' for example. @@ -284,7 +286,7 @@ coordinator. Congratulations!

    -
    +

    If things aren't working right

    If you've followed the steps above and the server doesn't start or you think Index: doc/build/ubuntu10LTS_install.frag diff -u doc/build/ubuntu10LTS_install.frag:1.7 doc/build/ubuntu10LTS_install.frag:1.8 --- doc/build/ubuntu10LTS_install.frag:1.7 Thu Jun 9 14:54:24 2011 +++ doc/build/ubuntu10LTS_install.frag Mon Dec 16 13:44:33 2013 @@ -33,10 +33,10 @@

  • Log in to LON-CAPA
  • -
    +

    1. Obtain Ubuntu 10.04 LTS .iso file

    -Ubuntu 10.04 LTS (server install) isos can be obtained from the Ubuntu Server download page
    +Ubuntu 10.04 LTS (server install) isos can be obtained from the Ubuntu Server download page
    An .iso file (either 32 bit or 64 bit) can be burned to a CD.

    @@ -86,12 +86,13 @@
    The base system will be installed. Once that is complete you will have the option to select additional software collections. Leave all unselected.

    - Finish installing your server, reboot it, and log in with the username you created during installation. -

    Firewall Configuration
    -
    Use ufw to allow incoming traffic for the following services: - ssh, www, https -
    +

    +

    Firewall Configuration

    +

    +Use ufw to allow incoming traffic for the following services: +ssh, www, https +

     sudo ufw default deny
     sudo ufw enable
    @@ -99,17 +100,20 @@
     sudo ufw allow www
     sudo ufw allow https
     
    -
    E-mail: Postfix Installation
    -
    Configure to "Internet Site" to allow LON-CAPA to send e-mail to users.
    +

    E-mail: Postfix Installation

    +

    +Configure to "Internet Site" to allow LON-CAPA to send e-mail to users. +

     sudo apt-get install postfix
     
    -
    E-mail: Postfix Configuration
    -
    If you need to change the postfix configuration in the future use:
    +

    E-mail: Postfix Configuration

    +

    +If you need to change the postfix configuration in the future use: +

     sudo dpkg-reconfigure postfix
     
    -

    4. Update your system

    @@ -182,7 +186,7 @@

  • Configure Apache web server
  • Configure start-up of services
  • Check firewall settings
  • -
  • Stop services not used by LON-CAPA,
    +
  • Stop services not used by LON-CAPA,
    e.g., services for a print server: cups daemon
  • Download LON-CAPA source code in readiness for installation
  • @@ -205,7 +209,7 @@
    Each site or school which installs LON-CAPA needs its own domain. Here at MSU we use 'msu'. You should choose something short but meaningful. Restriction: One word, no hyphens, underscores, or - special characters.
    Domain names which include a departmental + special characters.
    Domain names which include a departmental abbreviation are not recommended as although LON-CAPA may start in a single department, other departments frequently join subsequently. For a domain name: 'msu' is a superior choice to 'msuphys' for example. @@ -281,7 +285,7 @@ coordinator. Congratulations!

    -
    +

    If things aren't working right

    If you've followed the steps above and the server doesn't start or you think Index: doc/build/ubuntu12LTS_install.frag diff -u doc/build/ubuntu12LTS_install.frag:1.1 doc/build/ubuntu12LTS_install.frag:1.2 --- doc/build/ubuntu12LTS_install.frag:1.1 Mon Jul 30 13:04:37 2012 +++ doc/build/ubuntu12LTS_install.frag Mon Dec 16 13:44:33 2013 @@ -33,10 +33,10 @@

  • Log in to LON-CAPA
  • -
    +

    1. Obtain Ubuntu 12.04 LTS .iso file

    -Ubuntu 12.04 LTS (server install) isos can be obtained from the Ubuntu Server download page
    +Ubuntu 12.04 LTS (server install) isos can be obtained from the Ubuntu Server download page
    An .iso file (either 32 bit or 64 bit) can be burned to a CD.

    @@ -86,12 +86,13 @@
    The base system will be installed. Once that is complete you will have the option to select additional software collections. Leave all unselected.

    - Finish installing your server, reboot it, and log in with the username you created during installation. -

    Firewall Configuration
    -
    Use ufw to allow incoming traffic for the following services: - ssh, www, https -
    +

    +

    Firewall Configuration

    +

    +Use ufw to allow incoming traffic for the following services: +ssh, www, https +

     sudo ufw default deny
     sudo ufw enable
    @@ -99,17 +100,20 @@
     sudo ufw allow www
     sudo ufw allow https
     
    -
    E-mail: Postfix Installation
    -
    Configure to "Internet Site" to allow LON-CAPA to send e-mail to users.
    +

    E-mail: Postfix Installation

    +

    +Configure to "Internet Site" to allow LON-CAPA to send e-mail to users. +

     sudo apt-get install postfix
     
    -
    E-mail: Postfix Configuration
    -
    If you need to change the postfix configuration in the future use:
    +

    E-mail: Postfix Configuration

    +

    +If you need to change the postfix configuration in the future use: +

     sudo dpkg-reconfigure postfix
     
    -

    4. Update your system

    @@ -182,7 +186,7 @@

  • Configure Apache web server
  • Configure start-up of services
  • Check firewall settings
  • -
  • Stop services not used by LON-CAPA,
    +
  • Stop services not used by LON-CAPA,
    e.g., services for a print server: cups daemon
  • Download LON-CAPA source code in readiness for installation
  • @@ -205,7 +209,7 @@
    Each site or school which installs LON-CAPA needs its own domain. Here at MSU we use 'msu'. You should choose something short but meaningful. Restriction: One word, no hyphens, underscores, or - special characters.
    Domain names which include a departmental + special characters.
    Domain names which include a departmental abbreviation are not recommended as although LON-CAPA may start in a single department, other departments frequently join subsequently. For a domain name: 'msu' is a superior choice to 'msuphys' for example. @@ -281,7 +285,7 @@ coordinator. Congratulations!

    -
    +

    If things aren't working right

    If you've followed the steps above and the server doesn't start or you think From bisitz at source.lon-capa.org Mon Dec 16 08:53:28 2013 From: bisitz at source.lon-capa.org (bisitz) Date: Mon, 16 Dec 2013 13:53:28 -0000 Subject: [LON-CAPA-cvs] cvs: doc /build RHEL5_install.frag RHEL6_install.frag scientific6_install.frag Message-ID: bisitz Mon Dec 16 13:53:28 2013 EDT Modified files: /doc/build RHEL5_install.frag RHEL6_install.frag scientific6_install.frag Log: W3C HTML validity Index: doc/build/RHEL5_install.frag diff -u doc/build/RHEL5_install.frag:1.8 doc/build/RHEL5_install.frag:1.9 --- doc/build/RHEL5_install.frag:1.8 Fri Dec 13 18:10:11 2013 +++ doc/build/RHEL5_install.frag Mon Dec 16 13:53:28 2013 @@ -171,7 +171,7 @@ The script will analyze your system to determine which actions are recommended. The script will then prompt you to choose the actions you would like taken. Once a choice has been entered for all nine possible actions, required changes will be made.

    -

    The possible actions are: +

    The possible actions are:

    -

    -

    Determine LON-CAPA Settings

    LON-CAPA requires a number of identifying parameters to be set in order Index: doc/build/RHEL6_install.frag diff -u doc/build/RHEL6_install.frag:1.4 doc/build/RHEL6_install.frag:1.5 --- doc/build/RHEL6_install.frag:1.4 Fri Dec 13 18:10:11 2013 +++ doc/build/RHEL6_install.frag Mon Dec 16 13:53:28 2013 @@ -171,7 +171,7 @@ The script will analyze your system to determine which actions are recommended. The script will then prompt you to choose the actions you would like taken. Once a choice has been entered for all nine possible actions, required changes will be made.

    -

    The possible actions are: +

    The possible actions are:

    -

    -

    Determine LON-CAPA Settings

    LON-CAPA requires a number of identifying parameters to be set in order Index: doc/build/scientific6_install.frag diff -u doc/build/scientific6_install.frag:1.5 doc/build/scientific6_install.frag:1.6 --- doc/build/scientific6_install.frag:1.5 Fri Dec 13 18:10:11 2013 +++ doc/build/scientific6_install.frag Mon Dec 16 13:53:28 2013 @@ -173,7 +173,7 @@ The script will analyze your system to determine which actions are recommended. The script will then prompt you to choose the actions you would like taken. Once a choice has been entered for all nine possible actions, required changes will be made.

    -

    The possible actions are: +

    The possible actions are:

    -

    -

    Determine LON-CAPA Settings

    LON-CAPA requires a number of identifying parameters to be set in order From www at source.lon-capa.org Mon Dec 16 18:04:28 2013 From: www at source.lon-capa.org (www) Date: Mon, 16 Dec 2013 23:04:28 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /html/adm/geogebra geogebra.jar geogebra.jar.pack.gz geogebra_algos.jar geogebra_algos.jar.pack.gz geogebra_cas.jar geogebra_cas.jar.pack.gz geogebra_export.jar geogebra_export.jar.pack.gz geogebra_gui.jar geogebra_gui.jar.pack.gz geogebra_javascript.jar geogebra_javascript.jar.pack.gz geogebra_main.jar geogebra_main.jar.pack.gz geogebra_properties.jar geogebra_properties.jar.pack.gz jlatexmath.jar jlatexmath.jar.pack.gz jlm_cyrillic.jar jlm_cyrillic.jar.pack.gz jlm_greek.jar jlm_greek.jar.pack.gz doc/loncapafiles loncapafiles.lpml Message-ID: www Mon Dec 16 23:04:28 2013 EDT Modified files: /doc/loncapafiles loncapafiles.lpml /loncom/html/adm/geogebra geogebra.jar geogebra.jar.pack.gz geogebra_algos.jar geogebra_algos.jar.pack.gz geogebra_cas.jar geogebra_cas.jar.pack.gz geogebra_export.jar geogebra_export.jar.pack.gz geogebra_gui.jar geogebra_gui.jar.pack.gz geogebra_javascript.jar geogebra_javascript.jar.pack.gz geogebra_main.jar geogebra_main.jar.pack.gz geogebra_properties.jar geogebra_properties.jar.pack.gz jlatexmath.jar jlatexmath.jar.pack.gz jlm_cyrillic.jar jlm_cyrillic.jar.pack.gz jlm_greek.jar jlm_greek.jar.pack.gz Log: GeoGebra 4.4 Index: doc/loncapafiles/loncapafiles.lpml diff -u doc/loncapafiles/loncapafiles.lpml:1.871 doc/loncapafiles/loncapafiles.lpml:1.872 --- doc/loncapafiles/loncapafiles.lpml:1.871 Thu Dec 5 21:23:21 2013 +++ doc/loncapafiles/loncapafiles.lpml Mon Dec 16 23:04:16 2013 @@ -2,7 +2,7 @@ "http://lpml.sourceforge.net/DTD/lpml.dtd"> - + HEADER if ($is_mobile) { @@ -83,18 +93,20 @@ } if (&Apache::lonnavmaps::advancedUser()) { - my $search=&mt('Search LON-CAPA help'); - my $query=&mt('Search'); - my $uri = $r->uri; - $r->print(<

    - -
    -
    + $r->print(<
    +
    +
    $lt{'search'} + + +
    +
    +
    +
    +
    +
    $bugs -$morehelp FOOTER - } $r->print(<uri; if ($env{'form.searchterm'}=~/\w/) { ($text,my $matches)=&listmatches($docroot,$env{'form.searchterm'},&Apache::lonlocal::current_language().'/'); if ($matches) { @@ -238,8 +251,7 @@ $text=&listmatches($docroot,$env{'form.searchterm'}); } } else { - my $filenames = &unescape(substr($ENV{'REQUEST_URI'} , - rindex($ENV{'REQUEST_URI'}, '/') + 1, -4)); + my $filenames = &unescape(substr($uri,rindex($uri,'/')+1,-4)); # Security check on the file; the whole filename must consist # of nothing but alphanums, ' ,, or ., or the file @@ -274,7 +286,7 @@ $r->send_http_header; $r->print($start_page); - &servetext($r,$text,$env{'browser.mobile'},$firstfile); + &servetext($r,$uri,$text,$env{'browser.mobile'},$firstfile); $r->print(&Apache::loncommon::end_page()); return OK; From raeburn at source.lon-capa.org Tue Dec 17 20:29:21 2013 From: raeburn at source.lon-capa.org (raeburn) Date: Wed, 18 Dec 2013 01:29:21 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /interface portfolio.pm Message-ID: raeburn Wed Dec 18 01:29:21 2013 EDT Modified files: /loncom/interface portfolio.pm Log: - MB instead of Mb Index: loncom/interface/portfolio.pm diff -u loncom/interface/portfolio.pm:1.250 loncom/interface/portfolio.pm:1.251 --- loncom/interface/portfolio.pm:1.250 Wed Aug 21 15:42:22 2013 +++ loncom/interface/portfolio.pm Wed Dec 18 01:29:20 2013 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.250 2013/08/21 15:42:22 bisitz Exp $ +# $Id: portfolio.pm,v 1.251 2013/12/18 01:29:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2400,7 +2400,7 @@ if (%curr_groups) { my %group_info = &Apache::longroup::get_group_settings( $curr_groups{$group}); - $group_quota = $group_info{'quota'}; #expressed in Mb + $group_quota = $group_info{'quota'}; #expressed in MB if ($group_quota) { $group_quota = 1000 * $group_quota; #expressed in k } @@ -2522,8 +2522,8 @@ } } else { $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'}, - $env{'user.domain'}); #expressed in Mb - $disk_quota = 1000 * $disk_quota; # convert from Mb to kb + $env{'user.domain'}); #expressed in MB + $disk_quota = 1000 * $disk_quota; # convert from MB to kB } return $disk_quota; } From raeburn at source.lon-capa.org Tue Dec 17 20:30:52 2013 From: raeburn at source.lon-capa.org (raeburn) Date: Wed, 18 Dec 2013 01:30:52 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm Message-ID: raeburn Wed Dec 18 01:30:52 2013 EDT Modified files: /loncom/interface domainprefs.pm Log: - MB instead of Mb Index: loncom/interface/domainprefs.pm diff -u loncom/interface/domainprefs.pm:1.212 loncom/interface/domainprefs.pm:1.213 --- loncom/interface/domainprefs.pm:1.212 Sun Oct 6 21:25:59 2013 +++ loncom/interface/domainprefs.pm Wed Dec 18 01:30:52 2013 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.212 2013/10/06 21:25:59 raeburn Exp $ +# $Id: domainprefs.pm,v 1.213 2013/12/18 01:30:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -259,7 +259,7 @@ help => 'Domain_Configuration_Quotas', header => [{col1 => 'User affiliation', col2 => 'Available tools', - col3 => 'Quotas, Mb; (Authoring requires role)',}], + col3 => 'Quotas, MB; (Authoring requires role)',}], }, 'autoenroll' => { text => 'Auto-enrollment settings', @@ -3765,7 +3765,7 @@ 'datelocale_def','portal_def'); my %defaults; if (ref($settings) eq 'HASH') { - %defaults = %{$settings}; + %defaults = %{$settings}; } else { my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); foreach my $item (@items) { @@ -6057,7 +6057,7 @@ if ($type eq 'default') { $typetitle = $othertitle; } - $resulttext .= '
  • '.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'defaultquota'}{$type}).'
  • '; + $resulttext .= '
  • '.&mt('[_1] set to [_2] MB',$typetitle,$confhash{'defaultquota'}{$type}).'
  • '; } } $resulttext .= ''; @@ -6070,7 +6070,7 @@ if ($type eq 'default') { $typetitle = $othertitle; } - $resulttext .= '
  • '.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'authorquota'}{$type}).'
  • '; + $resulttext .= '
  • '.&mt('[_1] set to [_2] MB',$typetitle,$confhash{'authorquota'}{$type}).'
  • '; } } $resulttext .= ''; @@ -8158,7 +8158,7 @@ $dom); if ($putresult eq 'ok') { if (keys(%changes) > 0) { - my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); + my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || ($changes{'uploadquota'})) { if ($changes{'canuse_pdfforms'}) { $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'}; From raeburn at source.lon-capa.org Tue Dec 17 20:31:44 2013 From: raeburn at source.lon-capa.org (raeburn) Date: Wed, 18 Dec 2013 01:31:44 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /interface loncoursegroups.pm Message-ID: raeburn Wed Dec 18 01:31:44 2013 EDT Modified files: /loncom/interface loncoursegroups.pm Log: - MB instead of Mb Index: loncom/interface/loncoursegroups.pm diff -u loncom/interface/loncoursegroups.pm:1.121 loncom/interface/loncoursegroups.pm:1.122 --- loncom/interface/loncoursegroups.pm:1.121 Tue Sep 17 15:04:30 2013 +++ loncom/interface/loncoursegroups.pm Wed Dec 18 01:31:43 2013 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursegroups.pm,v 1.121 2013/09/17 15:04:30 raeburn Exp $ +# $Id: loncoursegroups.pm,v 1.122 2013/12/18 01:31:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -189,7 +189,7 @@ crtd => 'Created', last => 'Last Modified', func => 'Collaborative Tools', - quot => 'Quota (Mb)', + quot => 'Quota (MB)', memb => 'Members', file => 'Files', dibd => 'Discussion Boards', @@ -812,7 +812,7 @@ } var maxposs = '.sprintf("%.2f",$maxposs).'; if (newquota > maxposs) { - alert("The group portfolio quota you entered for this group ("+newquota+" Mb) exceeds the maximum possible ("+maxposs+" Mb). Please enter a smaller number."); + alert("The group portfolio quota you entered for this group ("+newquota+" MB) exceeds the maximum possible ("+maxposs+" MB). Please enter a smaller number."); return; } var re_quota = '.$float_check.'; @@ -831,7 +831,7 @@ } } if (warn_zero == 1) { - alert("You have indicated that the group portfolio should be enabled, but you have set the respository quota to 0 Mb.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature."); + alert("You have indicated that the group portfolio should be enabled, but you have set the respository quota to 0 MB.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature."); return; } } @@ -1757,19 +1757,19 @@ } else { $r->print(&mt('Quota allocated to group portfolio:')); } - $r->print(' '.&mt('[_1] Mb','')); + $r->print(' '.&mt('[_1] MB','')); if ($action eq 'create') { $r->print('
    ' - .&mt('A total of [_1] Mb can be divided amongst all '.$gpterm.'s in the ' - .lc($crstype).', and [_2] Mb are currently unallocated.' + .&mt('A total of [_1] MB can be divided amongst all '.$gpterm.'s in the ' + .lc($crstype).', and [_2] MB are currently unallocated.' ,$crsquota,sprintf("%.2f",$freespace)) ); } else { - $r->print('  ('.&mt('The quota is currently [_1] Mb', + $r->print('  ('.&mt('The quota is currently [_1] MB', $$stored{'quota'}).').'); $r->print('
    ' - .&mt('The quota can be increased to [_1] Mb, ' + .&mt('The quota can be increased to [_1] MB, ' .'by adding all unallocated space for '.$gpterm.'s in the '.lc($crstype).'.' ,sprintf("%.2f",$maxposs))); } @@ -2070,7 +2070,7 @@ $r->print(''); } - my $quota_text=&mt('[_1] Mb',$quota); + my $quota_text=&mt('[_1] MB',$quota); my $granu_text=&mt($granularity); $r->print(<<"END"); @@ -3198,7 +3198,7 @@ $quota = 0; $r->print('
    ' .&mt('The value you entered for the quota for the group portfolio in this '.$gpterm - .' contained invalid characters, so it has been set to 0 Mb. You can change this by' + .' contained invalid characters, so it has been set to 0 MB. You can change this by' .' modifying the '.$gpterm.' settings.') .'
    '); } @@ -3206,7 +3206,7 @@ $quota = $maxposs; $r->print('
    ' .&mt('The value you entered for the quota for the group portfolio in this '.$gpterm - .' exceeded the maximum possible value, so it has been set to [_1] Mb ' + .' exceeded the maximum possible value, so it has been set to [_1] MB ' .'(the maximum possible value).',sprintf("%.2f",$maxposs)) .'
    '); } From raeburn at source.lon-capa.org Tue Dec 17 20:32:16 2013 From: raeburn at source.lon-capa.org (raeburn) Date: Wed, 18 Dec 2013 01:32:16 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /interface loncommon.pm Message-ID: raeburn Wed Dec 18 01:32:16 2013 EDT Modified files: /loncom/interface loncommon.pm Log: - MB instead of Mb Index: loncom/interface/loncommon.pm diff -u loncom/interface/loncommon.pm:1.1162 loncom/interface/loncommon.pm:1.1163 --- loncom/interface/loncommon.pm:1.1162 Sun Dec 1 21:29:12 2013 +++ loncom/interface/loncommon.pm Wed Dec 18 01:32:16 2013 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.1162 2013/12/01 21:29:12 raeburn Exp $ +# $Id: loncommon.pm,v 1.1163 2013/12/18 01:32:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -8697,7 +8697,7 @@ course Returns: -1. Disk quota (in Mb) assigned to student. +1. Disk quota (in MB) assigned to student. 2. (Optional) Type of setting: custom or default (individually assigned or default for user's institutional status). @@ -8813,14 +8813,14 @@ Returns: -1. Default disk quota (in Mb) for user portfolios in the domain. +1. Default disk quota (in MB) for user portfolios in the domain. 2. (Optional) institutional type which determined the value of the default quota. If a value has been stored in the domain's configuration db, it will return that, otherwise it returns 20 (for backwards compatibility with domains which have not set up a configuration -db file; the original statically defined portfolio quota was 20 Mb). +db file; the original statically defined portfolio quota was 20 MB). If the user's status includes multiple types (e.g., staff and student), the largest default quota which applies to the user determines the From raeburn at source.lon-capa.org Wed Dec 18 13:56:42 2013 From: raeburn at source.lon-capa.org (raeburn) Date: Wed, 18 Dec 2013 18:56:42 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /interface londocs.pm Message-ID: raeburn Wed Dec 18 18:56:42 2013 EDT Modified files: /loncom/interface londocs.pm Log: - Fix documentation links on Course Utilities menu in Course Editor - Supply appropriate help link on right side of breadcrumbs container when using Course Utilities - Only display table (and headers) for Check Resource Versions screen if there are imported published resources with version changes in specified time frame. - Sort resources in Check Resource Versions screen in date order (items most recently changed listed first). -------------- next part -------------- Index: loncom/interface/londocs.pm diff -u loncom/interface/londocs.pm:1.570 loncom/interface/londocs.pm:1.571 --- loncom/interface/londocs.pm:1.570 Sun Nov 17 14:40:31 2013 +++ loncom/interface/londocs.pm Wed Dec 18 18:56:41 2013 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.570 2013/11/17 14:40:31 raeburn Exp $ +# $Id: londocs.pm,v 1.571 2013/12/18 18:56:41 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4033,8 +4033,8 @@ sub checkversions { my ($r) = @_; my $crstype = &Apache::loncommon::course_type(); - $r->print(&Apache::loncommon::start_page("Check $crstype Document Versions")); - $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions")); + $r->print(&Apache::loncommon::start_page("Check $crstype Resource Versions")); + $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Resource Versions")); $r->print(&startContentScreen('tools')); my $header=''; @@ -4190,10 +4190,30 @@

    $lt{'vers'}

    - ENDHEADERS #number of columns for version history + my %changedbytime; + foreach my $key (keys(%changes)) { + #excludes not versionable problems from resource version history: + next if ($key =~ /^\/res\/lib\/templates/); + my $chg; + if ($env{'form.timerange'} eq 'all') { + my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); + $chg = &Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate'); + } else { + $chg = $changes{$key}; + next if ($chg < $starttime); + } + push(@{$changedbytime{$chg}},$key); + } + if (keys(%changedbytime) == 0) { + &untiehash(); + $r->print(&mt('No content changes in imported content in specified time frame'). + &endContentScreen()); + return; + } $r->print( + ''. &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). ''.&mt('Resources').''. @@ -4203,26 +4223,25 @@ ''.&mt('History').''. &Apache::loncommon::end_data_table_header_row() ); - foreach my $key (sort(keys(%changes))) { - #excludes not versionable problems from resource version history: - next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/); - my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); - my $currentversion=&Apache::lonnet::getversion($key); - if ($currentversion<0) { - $currentversion=''.&mt('Could not be determined.').''; - } - my $linkurl=&Apache::lonnet::clutter($key); - $r->print( - &Apache::loncommon::start_data_table_row(). - ''.&Apache::lonnet::gettitle($linkurl).'
    '. - ''.$linkurl.''. - ''.$currentversion.'
    ('. - &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')
    '. - '' - ); - # Used in course - my $usedversion=$hash{'version_'.$linkurl}; - if (($usedversion) && ($usedversion ne 'mostrecent')) { + foreach my $chg (sort {$b <=> $a } keys(%changedbytime)) { + foreach my $key (sort(@{$changedbytime{$chg}})) { + my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); + my $currentversion=&Apache::lonnet::getversion($key); + if ($currentversion<0) { + $currentversion=''.&mt('Could not be determined.').''; + } + my $linkurl=&Apache::lonnet::clutter($key); + $r->print( + &Apache::loncommon::start_data_table_row(). + ''.&Apache::lonnet::gettitle($linkurl).'
    '. + ''.$linkurl.''. + ''.$currentversion.'
    ('. + &Apache::lonlocal::locallocaltime($chg).')
    '. + '' + ); + # Used in course + my $usedversion=$hash{'version_'.$linkurl}; + if (($usedversion) && ($usedversion ne 'mostrecent')) { if ($usedversion != $currentversion) { $r->print(''.$usedversion.''); } else { @@ -4231,44 +4250,45 @@ } else { $r->print($currentversion); } - $r->print(''); - # Set version - $r->print(&Apache::loncommon::select_form( - $setversions{$linkurl}, - 'set_version_'.$linkurl, - {'select_form_order' => ['',1..$currentversion,'mostrecent'], - '' => '', - 'mostrecent' => &mt('most recent'), - map {$_,$_} (1..$currentversion)})); - my $lastold=1; - for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { - my $url=$root.'.'.$prevvers.'.'.$extension; - if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) { - $lastold=$prevvers; - } - } - $r->print(''); - # List all available versions - $r->print(''); - for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { - my $url=$root.'.'.$prevvers.'.'.$extension; - $r->print( - '' - .'' - .&mt('Version [_1]',$prevvers).'' - .' ('.&Apache::lonlocal::locallocaltime( - &Apache::lonnet::metadata($url,'lastrevisiondate')) - .')'); - if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { + $r->print(''); + # Set version + $r->print(&Apache::loncommon::select_form( + $setversions{$linkurl}, + 'set_version_'.$linkurl, + {'select_form_order' => ['',1..$currentversion,'mostrecent'], + '' => '', + 'mostrecent' => &mt('most recent'), + map {$_,$_} (1..$currentversion)})); + my $lastold=1; + for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { + my $url=$root.'.'.$prevvers.'.'.$extension; + if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) { + $lastold=$prevvers; + } + } + $r->print(''); + # List all available versions + $r->print(''); + for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { + my $url=$root.'.'.$prevvers.'.'.$extension; $r->print( - ' &'). - '" target="diffs">'.&mt('Diffs').''); + '' + .'' + .&mt('Version [_1]',$prevvers).'' + .' ('.&Apache::lonlocal::locallocaltime( + &Apache::lonnet::metadata($url,'lastrevisiondate')) + .')'); + if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { + $r->print( + ' &'). + '" target="diffs">'.&mt('Diffs').''); + } + $r->print('
    '); } - $r->print('

    '); + $r->print('
    '.&Apache::loncommon::end_data_table_row()); } - $r->print('
    '.&Apache::loncommon::end_data_table_row()); } $r->print( &Apache::loncommon::end_data_table(). @@ -4278,6 +4298,7 @@ &untiehash(); $r->print(&endContentScreen()); + return; } sub mark_hash_old { @@ -4332,13 +4353,13 @@ sub init_breadcrumbs { - my ($form,$text)=@_; + my ($form,$text,$help)=@_; &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1", text=>&Apache::loncommon::course_type().' Editor', faq=>273, bug=>'Instructor Interface', - help => 'Docs_Adding_Course_Doc'}); + help => $help}); &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1', text=>$text, faq=>273, @@ -4422,9 +4443,8 @@ 'Adding_Folders','Docs_Overview', 'Load_Map', 'Supplemental','Score_Upload_Form','Adding_Pages', 'Importing_LON-CAPA_Resource','Importing_IMS_Course', - 'Uploading_From_Harddrive', - 'Check_Resource_Versions','Verify_Content', - 'Course_Roster','Web_Page','Dropbox') { + 'Uploading_From_Harddrive','Course_Roster','Web_Page', + 'Dropbox') { $help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); } # Composite help files @@ -4454,7 +4474,7 @@ &choose_dump_server($r); return OK; } elsif ($allowed && $env{'form.verify'}) { - &init_breadcrumbs('verify','Verify Content'); + &init_breadcrumbs('verify','Verify Content','Docs_Verify_Content'); &verifycontent($r); } elsif ($allowed && $env{'form.listsymbs'}) { &init_breadcrumbs('listsymbs','List Content IDs'); @@ -4467,7 +4487,7 @@ } &docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath); } elsif ($allowed && $env{'form.versions'}) { - &init_breadcrumbs('versions','Check/Set Resource Versions'); + &init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions'); &checkversions($r); } elsif ($allowed && $env{'form.dumpcourse'}) { &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space'); @@ -4679,6 +4699,14 @@ if ($showdoc) { $r->print(&Apache::loncommon::start_page("$crstype documents",undef, {'force_register' => $showdoc,})); + } elsif ($toolsflag) { + &Apache::lonhtmlcommon::add_breadcrumb({ + href=>"/adm/coursedocs",text=>"$crstype Contents"}); + $r->print(&Apache::loncommon::start_page("$crstype Contents", $script) + .&Apache::loncommon::help_open_menu('','',273,'RAT') + .&Apache::lonhtmlcommon::breadcrumbs( + 'Editing Course Contents') + ); } elsif ($r->uri eq '/adm/supplemental') { my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, @@ -5535,14 +5563,14 @@ { linktext => $lt{'vc'}, url => "javascript:injectData(document.courseverify,'dummy','verify','$lt{'vc'}')", permission => 'F', - help => 'Verify_Content', + help => 'Docs_Verify_Content', icon => 'verify.png', linktitle => 'Verify contents can be retrieved/rendered', }, { linktext => $lt{'cv'}, url => "javascript:injectData(document.courseverify,'dummy','versions','$lt{'cv'}')", permission => 'F', - help => 'Check_Resource_Versions', + help => 'Docs_Check_Resource_Versions', icon => 'resversion.png', linktitle => "View version information for resources in your $lc_crstype, and fix/unfix use of specific versions", }, @@ -5567,7 +5595,7 @@ { linktext => $lt{'dcd'}, url => $dumpurl, permission => $candump, - #help => '', + help => 'Docs_Dump_Course_Docs', icon => 'dump.png', linktitle => $lt{'dcd'}, }, From raeburn at source.lon-capa.org Wed Dec 18 14:05:29 2013 From: raeburn at source.lon-capa.org (raeburn) Date: Wed, 18 Dec 2013 19:05:29 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /html/adm/help/tex Docs_Check_Resource_Versions.tex Message-ID: raeburn Wed Dec 18 19:05:29 2013 EDT Modified files: /loncom/html/adm/help/tex Docs_Check_Resource_Versions.tex Log: - Update documentation for Check Resource Versions screen for consistency with interface changes. Index: loncom/html/adm/help/tex/Docs_Check_Resource_Versions.tex diff -u loncom/html/adm/help/tex/Docs_Check_Resource_Versions.tex:1.6 loncom/html/adm/help/tex/Docs_Check_Resource_Versions.tex:1.7 --- loncom/html/adm/help/tex/Docs_Check_Resource_Versions.tex:1.6 Thu Jul 25 03:29:50 2013 +++ loncom/html/adm/help/tex/Docs_Check_Resource_Versions.tex Wed Dec 18 19:05:28 2013 @@ -1,28 +1,45 @@ \label{Docs_Check_Resource_Versions} -To check or set the versions of your resources, do the following: - +To check or set the versions of resources imported into your course, do the following: \begin{enumerate} -\item Select \textbf{Course Contents} on the Inline Menu or +\item Select \textbf{Course Editor} on the Inline Menu or \includegraphics[width=0.03\paperwidth]{docs} \textbf{Edit course contents} -within Main Menu. +within Main Menu. +\item Click the \textbf{Content Utilities} tab in the Course Editor screen \item Click \includegraphics[width=0.03\paperwidth]{resversion} -\textbf{Check/Set Resource Versions} after clicking on \fbox{Content Utilities} on the -in-line menu of the -\textbf{Course Editor} screen to see which resources have been updated over a specific +to see which resources have been updated over a specific time frame. \end{enumerate} -NOTE: When you import a resource, you get -the most current resource by default. By using the -\textbf{Check/Resource Versions} tool, -you can lock all of your resources in their current versions. You can -also view which changes have occured in a particular time frame by -choosing a time frame from the drop-down box and clicking -the \fbox{Display} button. From here, you can choose to lock one -or more individual resources in place. LON-CAPA recommends that you use -the default settings to keep all resources up-to-date because most -resource changes are improvements by their authors. + +NOTE: When you import a resource into a course, you get +the most current resource by default. + +You can also fix the version of a resource used in a course, +so it will not change automatically should the author republish it. + +However, LON-CAPA recommends that you use the default settings to keep all resources +up-to-date because most resource changes are improvements by their authors. + +There are three parts to the ``Check Resource Versions'' screen. + +\begin{itemize} + +\item Change display + +Select the time frame for which version changes are to be displayed, and click the \fbox{Display} button to update the listing. If resources changed within the time frame they will be listed in date order with most recently changed listed first. + +\item Actions + +If you wish to apply a version rule to all resources imported into your course, click the \fbox{Go} button for one of the two options -- either always use the most recent published version for all resources, or fix all resources to the version currently in use in the course. + +\item Version choice(s) for specific resources + +If you wish to fix only specific resources to a particular version, but allow others to use the most recent version, select a version from the select box for each of the resources to be fixed, and click either of the \fbox{Save changes} buttons. + +The ``History'' column includes links to versioned resources and also links to display the differences between any version and the most recently published one. + +\end{itemize} From raeburn at source.lon-capa.org Wed Dec 18 17:11:44 2013 From: raeburn at source.lon-capa.org (raeburn) Date: Wed, 18 Dec 2013 22:11:44 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /html/adm/help/png bomb.png /html/adm/help/tex Docs_Verify_Content.tex Message-ID: raeburn Wed Dec 18 22:11:44 2013 EDT Added files: /loncom/html/adm/help/png bomb.png Modified files: /loncom/html/adm/help/tex Docs_Verify_Content.tex Log: - Update documentation for Verify Content screen for consistency with interface changes. - Add a bomb icon to help image files. Index: loncom/html/adm/help/tex/Docs_Verify_Content.tex diff -u loncom/html/adm/help/tex/Docs_Verify_Content.tex:1.5 loncom/html/adm/help/tex/Docs_Verify_Content.tex:1.6 --- loncom/html/adm/help/tex/Docs_Verify_Content.tex:1.5 Thu Jul 25 03:29:50 2013 +++ loncom/html/adm/help/tex/Docs_Verify_Content.tex Wed Dec 18 22:11:40 2013 @@ -1,10 +1,31 @@ \label{Docs_Verify_Content} -Click +The ``Verify Content'' utility will attempt to retrieve and render all content in your course +(including any dependencies such as image files) and will report the retrieval +status and rendering status of each item. + +\begin{itemize} + +\item Select \textbf{Course Editor} on the Inline Menu or +\includegraphics[width=0.03\paperwidth]{docs} +\textbf{Edit course contents} +within the Main Menu. + +\item Click the \textbf{Content Utilities} tab on the Course Editor screen. + +\item Click \includegraphics[width=0.03\paperwidth]{verify} -\textbf{Verify Content} after clicking on \fbox{Content Utilities} -on the in-line menu of the -\textbf{Course Editor} screen -to view warnings and errors in resource code. Warnings in html pages +\textbf{Verify Content} to view warnings and errors in resource code. + +\end{itemize} + +A retrieval status +of ``ok'' means the file contents were successfully retrieved (including replication from the resource's home server, if required). + +A render status +of ``ok'' means that LON-CAPA was able to process the file contents to create the output +which would be sent to the user's web browser (e.g., parsing XML for LON-CAPA problems, or HTML for web pages) without error. + +In the case of an error, \includegraphics[width=0.03\paperwidth]{bomb} is displayed. Warnings in html pages will not affect your students' scores. From raeburn at source.lon-capa.org Wed Dec 18 17:32:33 2013 From: raeburn at source.lon-capa.org (raeburn) Date: Wed, 18 Dec 2013 22:32:33 -0000 Subject: [LON-CAPA-cvs] cvs: doc /loncapafiles loncapafiles.lpml Message-ID: raeburn Wed Dec 18 22:32:33 2013 EDT Modified files: /doc/loncapafiles loncapafiles.lpml Log: - New help files. Index: doc/loncapafiles/loncapafiles.lpml diff -u doc/loncapafiles/loncapafiles.lpml:1.872 doc/loncapafiles/loncapafiles.lpml:1.873 --- doc/loncapafiles/loncapafiles.lpml:1.872 Mon Dec 16 23:04:16 2013 +++ doc/loncapafiles/loncapafiles.lpml Wed Dec 18 22:32:33 2013 @@ -2,7 +2,7 @@ "http://lpml.sourceforge.net/DTD/lpml.dtd"> - + - + - + - +