[LON-CAPA-cvs] cvs: loncom /interface lonaboutme.pm loncommon.pm lonsimplepage.pm lonsyllabus.pm lontemplate.pm
neumanie
neumanie@source.lon-capa.org
Sun, 01 Mar 2009 13:23:12 -0000
neumanie Sun Mar 1 13:23:12 2009 EDT
Modified files:
/loncom/interface lonaboutme.pm lonsyllabus.pm lonsimplepage.pm
lontemplate.pm loncommon.pm
Log:
Add bullets in the function fieldset(in aboutme,simplepage,sylabus).
Change the position from the helptext to over the fieldset(in aboutme,simplepage,sylabus)
Add styles LC_helptextbgcolor and LC_helptextfontcolor in loncommon for helptext
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.106 loncom/interface/lonaboutme.pm:1.107
--- loncom/interface/lonaboutme.pm:1.106 Thu Feb 26 16:17:30 2009
+++ loncom/interface/lonaboutme.pm Sun Mar 1 13:23:12 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Personal Information Page
#
-# $Id: lonaboutme.pm,v 1.106 2009/02/26 16:17:30 schafran Exp $
+# $Id: lonaboutme.pm,v 1.107 2009/03/01 13:23:12 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -221,14 +221,20 @@
}
+#Print Help Text
+if ($target ne 'tex') {
+ if($privleged){
+ $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
+ }
+}
+
#----------------Print Functions
if( $target ne 'tex'){
&Apache::lontemplate::print_start_page_functions($r);
if($allowed){
my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));
- &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
- }elsif($privleged){
+ }elsif($privleged){
my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>');
}
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.80 loncom/interface/lonsyllabus.pm:1.81
--- loncom/interface/lonsyllabus.pm:1.80 Wed Feb 25 13:25:52 2009
+++ loncom/interface/lonsyllabus.pm Sun Mar 1 13:23:12 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.80 2009/02/25 13:25:52 neumanie Exp $
+# $Id: lonsyllabus.pm,v 1.81 2009/03/01 13:23:12 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -229,13 +229,18 @@
&Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
}
}
+#-Pritn Help Text
+if ($target ne 'tex') {
+ if($allowed){
+ $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
+ }
+}
#--------Functions
if ($target ne 'tex') {
if($allowed || $privileged){
&Apache::lontemplate::print_start_page_functions($r);
if($allowed){
&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Public View').'</a>'.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));
- &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
}elsif($privileged){
&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forceedit=1">'.&mt('Edit').'</a>');
}
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.73 loncom/interface/lonsimplepage.pm:1.74
--- loncom/interface/lonsimplepage.pm:1.73 Wed Feb 25 23:27:21 2009
+++ loncom/interface/lonsimplepage.pm Sun Mar 1 13:23:12 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.73 2009/02/25 23:27:21 schualex Exp $
+# $Id: lonsimplepage.pm,v 1.74 2009/03/01 13:23:12 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -253,13 +253,18 @@
&Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
}
+#---Print help Text
+if($target ne 'tex'){
+ if($allowed){
+ $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
+ }
+}
#---Print Function
if ($target ne 'tex') {
if($allowed || $privileged){
&Apache::lontemplate::print_start_page_functions($r);
if($allowed){
&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Student View').'</a>'.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));
- &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
}elsif($privileged){
my $edittext = &mt('Edit');
if ($group ne '') {
Index: loncom/interface/lontemplate.pm
diff -u loncom/interface/lontemplate.pm:1.20 loncom/interface/lontemplate.pm:1.21
--- loncom/interface/lontemplate.pm:1.20 Wed Feb 25 13:25:52 2009
+++ loncom/interface/lontemplate.pm Sun Mar 1 13:23:12 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# "Template" Functions to generate html output
#
-# $Id: lontemplate.pm,v 1.20 2009/02/25 13:25:52 neumanie Exp $
+# $Id: lontemplate.pm,v 1.21 2009/03/01 13:23:12 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -154,7 +154,7 @@
sub print_functions_content
{
my($r,$content) = @_;
- $r->print($content.' ');
+ $r->print('<span class=\"LC_nobreak\">• '.$content.' </span>');
}
sub print_end_page_functions
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.758 loncom/interface/loncommon.pm:1.759
--- loncom/interface/loncommon.pm:1.758 Thu Feb 26 22:22:51 2009
+++ loncom/interface/loncommon.pm Sun Mar 1 13:23:12 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.758 2009/02/26 22:22:51 kaisler Exp $
+# $Id: loncommon.pm,v 1.759 2009/03/01 13:23:12 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -924,14 +924,14 @@
# Add the text
if ($text ne "") {
- $template.="<a style=\"background-color:#3333AA;\" target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF;\">$text</span></a>";
+ $template.="<span class=\"LC_nobreak\"><a class=\"LC_helptextbgcolor\" target=\"_top\" href=\"$link\"><span class=\"LC_helptextfontcolor\">$text</span></a>";
}
# Add the graphic
my $title = &mt('Online Help');
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>
+ <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a></span>
ENDTEMPLATE
return $template;
@@ -5591,7 +5591,14 @@
cursor:pointer;
text-decoration:underline;
}
-
+.LC_helptextbgcolor
+{
+ background-color:#5555FF;
+}
+.LC_helptextfontcolor
+{
+ color:#FFFFFF;
+}
dl,ul,div,fieldset {
margin: 10px 10px 10px 0px;