[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm londocs.pm
albertel
lon-capa-cvs-allow@mail.lon-capa.org
Tue, 03 Jul 2007 23:02:54 -0000
This is a MIME encoded message
--albertel1183503774
Content-Type: text/plain
albertel Tue Jul 3 19:02:54 2007 EDT
Modified files:
/loncom/interface londocs.pm loncommon.pm
Log:
- css
--albertel1183503774
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20070703190254.txt"
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.284 loncom/interface/londocs.pm:1.285
--- loncom/interface/londocs.pm:1.284 Mon Jul 2 20:30:47 2007
+++ loncom/interface/londocs.pm Tue Jul 3 19:02:53 2007
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.284 2007/07/03 00:30:47 albertel Exp $
+# $Id: londocs.pm,v 1.285 2007/07/03 23:02:53 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1489,7 +1489,7 @@
if ($randompick>=0) {
$r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
}
- $r->print('<table>');
+ $r->print('<table class="LC_docs_editor">');
foreach my $res (@LONCAPA::map::order) {
my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
$name=&LONCAPA::map::qtescape($name);
@@ -1798,14 +1798,14 @@
<input type="hidden" name="setparms" value="$orderidx" />
<input type="hidden" name="changeparms" value="0" />
<td>
- <table border='0' cellspacing='2' cellpadding='0'>
+ <table class="LC_docs_entry_move">
<tr>
- <td bgcolor="#DDDDDD">
+ <td>
<a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a>
</td>
</tr>
<tr>
- <td bgcolor="#DDDDDD">
+ <td>
<a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a>
</td>
</tr>
@@ -1814,7 +1814,7 @@
<td>
$selectbox
</td>
-<td bgcolor="#DDDDDD">
+<td class="LC_docs_entry_commands">
<a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_remove">$lt{'rm'}</a>
$cutlink
<a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
@@ -1904,7 +1904,7 @@
(&LONCAPA::map::getparameter($orderidx,
'parameter_randompick'))[0].
'" />'.
-'<font size="-2"><a href="javascript:void(0)">'.&mt('Save').'</a></font></label>';
+'<a href="javascript:void(0)">'.&mt('Save').'</a></label>';
}
if ($ispage) {
@@ -1925,10 +1925,13 @@
$url.='pagepath='.&escape($pagepath).
'&pagesymb='.&escape($symb).$cpinfo;
}
- $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
- '" class="LC_icon" /></a></td>'.
- "<td bgcolor='#FFFFBB'>".($url?"<a href=\"$url\">":'').$title.
- ($url?'</a>':' <font size="-2">'.&mt('(re-initialize course to access)').'</font>')."</td>";
+ $line.='
+ <td class="LC_docs_entry_icon">
+ <a href="'.$url.'"><img src="'.$icon.'" class="LC_icon" /></a>
+ </td>
+ <td class="LC_docs_entry_title">
+ '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>')."
+ </td>";
if (($allowed) && ($folder!~/^supplemental/)) {
my %lt=&Apache::lonlocal::texthash(
'hd' => 'Hidden',
@@ -1938,11 +1941,13 @@
my $hidtext=
((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
$line.=(<<ENDPARMS);
-<td bgcolor="#BBBBFF"><font size='-2'>
-<span class="LC_nobreak"><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label></span></td>
-<td bgcolor="#BBBBFF"><font size='-2'>
-<span class="LC_nobreak"><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label></span></td>
-<td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
+ <td class="LC_docs_entry_parameter">
+ <label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
+ </td>
+ <td class="LC_docs_entry_parameter">
+ <label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+ </td>
+ <td class="LC_docs_entry_parameter">$parameterset</td>
ENDPARMS
}
$line.="</form></tr>";
@@ -2718,9 +2723,9 @@
&mt('Editing the Table of Contents for your '.$type)));
}
# --------------------------------------------------------- Standard documents
- $r->print('<table border=2 cellspacing=4 cellpadding=4>');
+ $r->print('<table class="LC_docs_documents">');#border=2 cellspacing=4 cellpadding=4>');
if (($standard) && ($allowed) && (!$forcesupplement)) {
- $r->print('<tr><td bgcolor="#BBBBBB">');
+ $r->print('<tr><td class="LC_docs_document">');
# '<h2>'.&mt('Main Course Documents').
# ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
my $folder=$env{'form.folder'};
@@ -2750,12 +2755,14 @@
}
my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
$r->print(<<ENDFORM);
-<table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">$lt{'uplm'}</th>
-<th bgcolor="#DDDDDD">$lt{'impp'}</th>
-<th bgcolor="#DDDDDD">$lt{'spec'}</th>
+<table class="LC_docs_adddocs">
+<tr>
+<th>$lt{'uplm'}</th>
+<th>$lt{'impp'}</th>
+<th>$lt{'spec'}</th>
</tr>
-<tr><td bgcolor="#DDDDDD">
+<tr>
+<td>
$lt{'file'}:<br />
<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
<input type="file" name="uploaddoc" size="40">
@@ -2778,7 +2785,7 @@
</span>
</form>
</td>
-<td bgcolor="#DDDDDD">
+<td>
<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
$lt{'pubd'}<br />
$uploadtag
@@ -2822,7 +2829,7 @@
</form>
ENDFORM
}
- $r->print('</td><td bgcolor="#DDDDDD">');
+ $r->print('</td><td>');
unless ($env{'form.pagepath'}) {
my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
$r->print(<<ENDFORM);
@@ -2959,7 +2966,7 @@
}
# ----------------------------------------------------- Supplemental documents
if (!$forcestandard) {
- $r->print('<tr><td bgcolor="#BBBBBB">');
+ $r->print('<tr><td class="LC_docs_document">');
# '<h2>'.&mt('Supplemental Course Documents').
# ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
my $folder=$env{'form.folder'};
@@ -2979,11 +2986,11 @@
my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
$r->print(<<ENDSUPFORM);
-<table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">$lt{'upls'}</th>
-<th bgcolor="#DDDDDD">$lt{'spec'}</th>
+<table class="LC_docs_adddocs"><tr>
+<th>$lt{'upls'}</th>
+<th>$lt{'spec'}</th>
</tr>
-<tr><td bgcolor="#DDDDDD">
+<tr><td>
<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
<input type="file" name="uploaddoc" size="40">
<br />
@@ -3006,7 +3013,7 @@
</span>
</form>
</td>
-<td bgcolor="#DDDDDD">
+<td>
<form action="/adm/coursedocs" method="post" name="supnewfolder">
<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.544 loncom/interface/loncommon.pm:1.545
--- loncom/interface/loncommon.pm:1.544 Mon Jul 2 20:30:47 2007
+++ loncom/interface/loncommon.pm Tue Jul 3 19:02:53 2007
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.544 2007/07/03 00:30:47 albertel Exp $
+# $Id: loncommon.pm,v 1.545 2007/07/03 23:02:53 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2457,6 +2457,7 @@
split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
}
my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];
+ &Apache::lonnet::logthis($browser);
if ($browser) {
@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser));
}
@@ -4435,28 +4436,66 @@
white-space: nowrap;
}
-.LC_docs_course_commands div{
- float: left;
- border: 4px solid #AAAAAA;
- padding: 4px;
- background: #DDDDCC;
+table.LC_docs_documents {
+ background: #BBBBBB;
+ border-size: 0px;
+ border-collapse: collapse;
+}
+
+table.LC_docs_documents td.LC_docs_document {
+ border: 2px solid black;
+ padding: 4px;
+}
+
+.LC_docs_course_commands div {
+ float: left;
+ border: 4px solid #AAAAAA;
+ padding: 4px;
+ background: #DDDDCC;
+}
+
+.LC_docs_entry_move {
+ border: 0px;
+ border-collapse: collapse;
}
+.LC_docs_entry_move td {
+ border: 2px solid #BBBBBB;
+ background: #DDDDDD;
+}
+
+.LC_docs_editor td.LC_docs_entry_commands {
+ background: #DDDDDD;
+ font-size: x-small;
+}
.LC_docs_copy {
- color: #000099;
- font-size: x-small;
+ color: #000099;
}
.LC_docs_cut {
- color: #550044;
- font-size: x-small;
+ color: #550044;
}
.LC_docs_rename {
- color: #009900;
- font-size: x-small;
+ color: #009900;
}
.LC_docs_remove {
- color: #990000;
- font-size: x-small;
+ color: #990000;
+}
+
+.LC_docs_editor td.LC_docs_entry_title,
+.LC_docs_editor td.LC_docs_entry_icon {
+ background: #FFFFBB;
+}
+.LC_docs_editor td.LC_docs_entry_parameter {
+ background: #BBBBFF;
+ font-size: x-small;
+ white-space: nowrap;
+}
+
+table.LC_docs_adddocs td,
+table.LC_docs_adddocs th {
+ border: 1px solid #BBBBBB;
+ padding: 4px;
+ background: #DDDDDD;
}
END
--albertel1183503774--