[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm lonparmset.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Fri, 23 Jun 2006 05:25:28 -0000
albertel Fri Jun 23 01:25:28 2006 EDT
Modified files:
/loncom/interface lonparmset.pm loncommon.pm
Log:
- parm log and overview, and main menu no longer use <font>
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.315 loncom/interface/lonparmset.pm:1.316
--- loncom/interface/lonparmset.pm:1.315 Fri Jun 23 01:05:33 2006
+++ loncom/interface/lonparmset.pm Fri Jun 23 01:25:27 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.315 2006/06/23 05:05:33 albertel Exp $
+# $Id: lonparmset.pm,v 1.316 2006/06/23 05:25:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2545,12 +2545,12 @@
}
$middle=~s/\.+$//;
$middle=~s/^\.+//;
- my $realm='<font color="red">'.&mt('All Resources').'</font>';
+ my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
if ($middle=~/^(.+)\_\_\_\(all\)$/) {
- $realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
+ $realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</span></span>';
} elsif ($middle) {
my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
- $realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
+ $realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
}
if ($sortorder eq 'realmstudent') {
if ($realm ne $oldrealm) {
@@ -2577,7 +2577,7 @@
}
if ($part ne $oldpart) {
$r->print(&tableend().
- "\n<font color='blue'>".&mt('Part').": $part</font>");
+ "\n<span class=\"LC_parm_part\">".&mt('Part').": $part</span>");
$oldpart=$part;
}
#
@@ -3046,14 +3046,14 @@
}
next if (! $menu_item->{'permission'});
$menu_html.='<p>';
- $menu_html.='<font size="+1">';
+ $menu_html.='<span class="LC_parm_menu_item">';
if (exists($menu_item->{'url'})) {
$menu_html.=qq{<a href="$menu_item->{'url'}">};
} else {
$menu_html.=
qq{<a href="/adm/parmset?action=$menu_item->{'action'}">};
}
- $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+ $menu_html.= &mt($menu_item->{'text'}).'</a></span>';
if (exists($menu_item->{'help'})) {
$menu_html.=
&Apache::loncommon::help_open_topic($menu_item->{'help'});
@@ -3324,14 +3324,14 @@
$section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);
$issection='';
}
- my $realm='<font color="red">'.&mt('All Resources').'</font>';
+ my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
my $realmdescription=&mt('all resources');
if ($middle=~/^(.+)\_\_\_\(all\)$/) {
- $realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
+ $realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <span class="LC_parm_folder"><br />('.$1.')</span></span>';
$realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);
} elsif ($middle) {
my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
- $realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
+ $realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
$realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
}
my $what=$part.'.'.$name;
@@ -3459,7 +3459,7 @@
$r->print($value);
}
if ($value ne $all[$level]) {
- $r->print('<br /><span class="LC_error">'.&mt('Not active anymore').'</span>');
+ $r->print('<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>');
} else {
$stillactive=1;
}
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.394 loncom/interface/loncommon.pm:1.395
--- loncom/interface/loncommon.pm:1.394 Thu Jun 22 23:14:00 2006
+++ loncom/interface/loncommon.pm Fri Jun 23 01:25:27 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.394 2006/06/23 03:14:00 albertel Exp $
+# $Id: loncommon.pm,v 1.395 2006/06/23 05:25:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3107,6 +3107,7 @@
my $link = &designparm($function.'.link', $domain);
my $sans = 'Arial,Helvetica,sans-serif';
+ my $mono = 'monospace';
my $data_table_head = $tabbg;
my $data_table_light = '#EEEEEE';
my $data_table_dark = '#DDD';
@@ -3130,7 +3131,7 @@
table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}
form, .inline { display: inline; }
.center { text-align: center; }
-.LC_filename {font-family: monospace;}
+.LC_filename {font-family: $mono;}
.LC_error {
color: red;
font-size: larger;
@@ -3373,6 +3374,28 @@
background: $pgbg;
}
+span.LC_parm_menu_item {
+ font-size: larger;
+ font-family: $sans;
+}
+span.LC_parm_scope_all {
+ color: red;
+}
+span.LC_parm_scope_folder {
+ color: green;
+}
+span.LC_parm_scope_resource {
+ color: orange;
+}
+span.LC_parm_part {
+ color: blue;
+}
+span.LC_parm_folder, span.LC_parm_symb {
+ font-size: x-small;
+ font-family: $mono;
+ color: #AAAAAA;
+}
+
END
}