[LON-CAPA-cvs] cvs: doc /loncapafiles loncapafiles.lpml loncom/html/adm/help help.png loncom/interface loncommon.pm lonhelp.pm lonhelpmenu.pm lonsupportreq.pm
raeburn
lon-capa-cvs-allow@mail.lon-capa.org
Tue, 08 Jul 2008 01:09:16 -0000
raeburn Mon Jul 7 21:09:16 2008 EDT
Added files:
/loncom/html/adm/help help.png
Modified files:
/loncom/interface lonsupportreq.pm lonhelp.pm lonhelpmenu.pm
loncommon.pm
/doc/loncapafiles loncapafiles.lpml
Log:
- Move help.png help icon from /res into /adm/help so it is available for users are not logged into LON-CAPA on servers where lonhttpd points at port 80.
- Revert to use of calls to lonhttpd in in those cases where they had been eliminated in the switch of help icon to the current (tango) icon (3/24/2008).
Index: loncom/interface/lonsupportreq.pm
diff -u loncom/interface/lonsupportreq.pm:1.48 loncom/interface/lonsupportreq.pm:1.49
--- loncom/interface/lonsupportreq.pm:1.48 Sun Mar 23 21:11:36 2008
+++ loncom/interface/lonsupportreq.pm Mon Jul 7 21:08:57 2008
@@ -1,5 +1,5 @@
#
-# $Id: lonsupportreq.pm,v 1.48 2008/03/24 01:11:36 www Exp $
+# $Id: lonsupportreq.pm,v 1.49 2008/07/08 01:08:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -778,7 +778,7 @@
<fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' /> <b><font size="+1">LON-CAPA $lt{'headline'}</font></b></legend>
<table id="LC_helpmenu_links">
<tr>
- <td align="center"><span class="LC_nobreak"><img src="/res/adm/pages/help.png" border="0" alt="($lt{'login'})" valign="middle" /> <b><a href="/adm/loginproblems.html">$lt{'login'}</a></b> </span></td>
+ <td align="center"><span class="LC_nobreak"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" valign="middle" /> <b><a href="/adm/loginproblems.html">$lt{'login'}</a></b> </span></td>
<td align="center"><span class="LC_nobreak"> <b>$helpdesk_link<img src="$location/lonIcons/helpdesk.gif" border="0" alt="($lt{'ask'})" valign="middle" /> $lt{'ask'}</a></b> </span></td>$getstartlink
<td align="center"><span class="LC_nobreak"> <b><a href="$origurl" target="_top"><img src="$location/lonIcons/move_up.gif" border="0" alt="($lt{'back'})" valign="middle" /> $lt{'back'}</a></b> </span></td>
</tr>
Index: loncom/interface/lonhelp.pm
diff -u loncom/interface/lonhelp.pm:1.38 loncom/interface/lonhelp.pm:1.39
--- loncom/interface/lonhelp.pm:1.38 Sun Mar 23 21:11:36 2008
+++ loncom/interface/lonhelp.pm Mon Jul 7 21:08:57 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonhelp.pm,v 1.38 2008/03/24 01:11:36 www Exp $
+# $Id: lonhelp.pm,v 1.39 2008/07/08 01:08:57 raeburn Exp $
#
# .tex help system web server handler
#
@@ -119,7 +119,7 @@
'\\begin{html}<a href="/adm/help/'.
$label .
'.hlp#' . &processLabelName($1) .
- '"><img src="/res/adm/pages/help.png" border="0" /></a>' .
+ '"><img src="/adm/help/help.png" border="0" /></a>' .
'\\end{html}'
|gxe;
Index: loncom/interface/lonhelpmenu.pm
diff -u loncom/interface/lonhelpmenu.pm:1.34 loncom/interface/lonhelpmenu.pm:1.35
--- loncom/interface/lonhelpmenu.pm:1.34 Sun Mar 23 21:11:36 2008
+++ loncom/interface/lonhelpmenu.pm Mon Jul 7 21:08:57 2008
@@ -153,11 +153,11 @@
<table id="LC_helpmenu_links">
<tr>
<td><span class="LC_nobreak"><a href="/adm/help/$general_help.hlp" target="bodyframe">
- <img src="/res/adm/pages/help.png" border="0" alt="(General help)" valign="middle" /> General Help</a> </span></td>
+ <img src="'.$location.'/help/help.png" border="0" alt="(General help)" valign="middle" /> General Help</a> </span></td>
END
if ($component_url) {
$r->print("<td><span class=\"LC_nobreak\"><a href=\"$component_url\" target=\"bodyframe\">".
- '<img src="/res/adm/pages/help.png" border="0" alt="(Topic help)" valign="middle" /> '.$topic.'</a> </span></td>');
+ '<img src="'.$location.'/help/help.png" border="0" alt="(Topic help)" valign="middle" /> '.$topic.'</a> </span></td>');
}
if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
$r->print('
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.666 loncom/interface/loncommon.pm:1.667
--- loncom/interface/loncommon.pm:1.666 Mon Jul 7 20:49:18 2008
+++ loncom/interface/loncommon.pm Mon Jul 7 21:08:57 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.666 2008/07/08 00:49:18 raeburn Exp $
+# $Id: loncommon.pm,v 1.667 2008/07/08 01:08:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -878,7 +878,7 @@
# Add the graphic
my $title = &mt('Online Help');
- my $helpicon=&lonhttpdurl("/res/adm/pages/help.png");
+ my $helpicon=&lonhttpdurl("/adm/help/help.png");
$template .= <<"ENDTEMPLATE";
<a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
ENDTEMPLATE
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.592 doc/loncapafiles/loncapafiles.lpml:1.593
--- doc/loncapafiles/loncapafiles.lpml:1.592 Tue Jul 1 06:59:39 2008
+++ doc/loncapafiles/loncapafiles.lpml Mon Jul 7 21:09:16 2008
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.592 2008/07/01 10:59:39 foxr Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.593 2008/07/08 01:09:16 raeburn Exp $ -->
<!--
@@ -2124,6 +2124,14 @@
</dependencies>
</file>
<file>
+<source>loncom/html/adm/help/help.png</source>
+<target dist='default'>home/httpd/html/adm/help/help.png</target>
+<categoryname>interface file</categoryname>
+<description>
+help icon
+</description>
+</file>
+<file>
<source>loncom/html/adm/help/abouthelp.html</source>
<target dist='default'>home/httpd/html/adm/help/abouthelp.html</target>
<categoryname>interface file</categoryname>
@@ -6363,7 +6371,6 @@
del.png;
egrd.png;
fdbk.png;
-help.png;
keys.png;
list.png;
mcrs.png;