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:
-Ubuntu 8.04 LTS (server install) isos can be obtained from links on the Ubuntu Releases page at mirrors.kernel.org.
-
Finish installing your server, reboot it, and log in with the username you created during installation.
-
+
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.
An .iso file (either 32 bit or 64 bit) can be burned to a CD.
+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-
+By default Ubuntu disallows mailing to remote domains. Change using +
sudo dpkg-reconfigure exim4-config -+
@@ -185,7 +187,7 @@
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 @@
-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.
- Finish installing your server, reboot it, and log in with the username you created during installation. -
+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-
+Configure to "Internet Site" to allow LON-CAPA to send e-mail to users. +
sudo apt-get install postfix-
+If you need to change the postfix configuration in the future use: +
sudo dpkg-reconfigure postfix-
@@ -182,7 +186,7 @@
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 @@
-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.
- Finish installing your server, reboot it, and log in with the username you created during installation. -
+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-
+Configure to "Internet Site" to allow LON-CAPA to send e-mail to users. +
sudo apt-get install postfix-
+If you need to change the postfix configuration in the future use: +
sudo dpkg-reconfigure postfix-
@@ -182,7 +186,7 @@
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:
The possible actions are: +
The possible actions are:
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:
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:
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:
+ $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('
$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(' '.&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:
');
}
- $r->print('
');
+ $r->print('