--- loncom/interface/lonhelp.pm 2007/07/17 22:07:52 1.36
+++ loncom/interface/lonhelp.pm 2013/07/15 17:42:11 1.41
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonhelp.pm,v 1.36 2007/07/17 22:07:52 albertel Exp $
+# $Id: lonhelp.pm,v 1.41 2013/07/15 17:42:11 raeburn Exp $
#
# .tex help system web server handler
#
@@ -57,8 +57,8 @@ sub processLabelName {
# Serve out the text
sub servetext {
- my ($r,$text) = @_;
- my $bugs=&Apache::loncommon::help_open_bug('Documentation','Report a documentation bug');
+ my ($r,$text,$is_mobile,$firstfile) = @_;
+ my $bugs=&Apache::loncommon::help_open_bug('Documentation',&mt('Report a documentation bug'));
my $morehelp;#=&Apache::loncommon::help_open_menu(undef,undef,1,undef,undef,undef,undef,'Help and Assistance Menu');
my $header=&mt('LON-CAPA Help');
$r->print(<$header
HEADER
-
- $r->print($text);
+ if ($is_mobile) {
+ my $width = 500;
+ my $height = 400;
+ my $machine = &Apache::lonnet::absolute_url();
+ $r->print(&Apache::loncommon::nicescroll_javascript('helpwrapper',
+ {cursorcolor => '#00F',
+ railalign => 'right',
+ railoffset => '{top:5,left:40}'},
+ undef,1,$machine.$firstfile));
+ $r->print(''.
+ $text.
+ '
');
+ } else {
+ $r->print($text);
+ }
if (&Apache::lonnavmaps::advancedUser()) {
my $search=&mt('Search LON-CAPA help');
@@ -106,20 +119,26 @@ sub render {
$tex =~ s| \\ref\{([^}]*)\}
|
my $label=$1;
+ my $icon='/adm/help/help.png';
+ my $ext;
if ($1!~/\.hlp$/) {
- if ((!exists($fragmentLabels{$1})) && ($1!~/\.hlp$/)) {
+ if (($1 =~ /^\w+\.manual\.pdf$/) && (-e $docroot.'/adm/help/'.$1)) {
+ $icon = '/adm/lonIcons/pdf.gif';
+ } elsif ((!exists($fragmentLabels{$1})) && ($1!~/\.hlp$/)) {
&Apache::lonnet::logthis("ERROR: $1 not a valid help label");
$label='Error';
} else {
$label=substr($fragmentLabels{$1}, 0, -4);
+ $ext = '.hlp#' . &processLabelName($1);
}
} else {
$label=~s/\.hlp$//;
+ $ext = '.hlp#' . &processLabelName($1);
}
'\\begin{html}
' .
+ $ext .
+ '">
' .
'\\end{html}'
|gxe;
@@ -193,9 +212,20 @@ sub handler {
&Apache::lonlocal::get_language_handle($r);
&Apache::loncommon::content_type($r,"text/html");
+ my $caller;
+ if ($env{'form.searchterm'}=~/\w/) {
+ $caller = 'search';
+ }
+ my $starthash = {
+ only_body => 1,
+ add_entries => {
+ 'onload' => "javascript:expand_div('$caller');",
+ },
+ };
+
+ my $firstfile;
my $start_page=
- &Apache::loncommon::start_page('LON-CAPA Help',undef,
- {'only_body' => 1,});
+ &Apache::loncommon::start_page('LON-CAPA Help',undef,$starthash);
my $text='';
if ($env{'form.searchterm'}=~/\w/) {
($text,my $matches)=&listmatches($docroot,$env{'form.searchterm'},&Apache::lonlocal::current_language().'/');
@@ -225,7 +255,8 @@ sub handler {
# so replace : with ,
$filenames =~ s/:/,/g;
my @files = split(/,/, $filenames);
-
+ $firstfile = '/adm/help/'.$files[0].'.hlp';
+
for my $filename (@files) {
if (-e $docroot.'/adm/help/tex/'.
&Apache::lonlocal::current_language().'/'.
@@ -243,7 +274,7 @@ sub handler {
$r->send_http_header;
$r->print($start_page);
- &servetext($r,$text);
+ &servetext($r,$text,$env{'browser.mobile'},$firstfile);
$r->print(&Apache::loncommon::end_page());
return OK;