[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm londocs.pm
albertel
lon-capa-cvs-allow@mail.lon-capa.org
Tue, 03 Jul 2007 00:30:47 -0000
This is a MIME encoded message
--albertel1183422647
Content-Type: text/plain
albertel Mon Jul 2 20:30:47 2007 EDT
Modified files:
/loncom/interface londocs.pm loncommon.pm
Log:
- removing some font tags in favor of css
- removing <nobr> in favor of <span>
--albertel1183422647
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20070702203047.txt"
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.283 loncom/interface/londocs.pm:1.284
--- loncom/interface/londocs.pm:1.283 Mon Jul 2 20:17:42 2007
+++ loncom/interface/londocs.pm Mon Jul 2 20:30:47 2007
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.283 2007/07/03 00:17:42 albertel Exp $
+# $Id: londocs.pm,v 1.284 2007/07/03 00:30:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1783,14 +1783,12 @@
if (!$nocopy) {
$copylink=(<<ENDCOPY);
-<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a>
+<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_copy">$lt{'cp'}</a>
ENDCOPY
}
if (!$nocut) {
$cutlink=(<<ENDCUT);
-<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder");'>
-<font size="-2" color="#550044">$lt{'ct'}</font></a>
+<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_cut">$lt{'ct'}</a>
ENDCUT
}
$line.=(<<END);
@@ -1817,9 +1815,9 @@
$selectbox
</td>
<td bgcolor="#DDDDDD">
- <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb");'><font size="-2" color="#990000">$lt{'rm'}</font></a>
+ <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");'><font size="-2" color="#009900">$lt{'rn'}</font></a>
+ <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
$copylink
</td>
END
@@ -1941,9 +1939,9 @@
((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
$line.=(<<ENDPARMS);
<td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
+<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'>
-<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
+<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>
ENDPARMS
}
@@ -2274,10 +2272,10 @@
'lastrevisiondate')
).
'</td>'.
- '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '.
+ '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.
'<font size="+1">'.$currentversion.'</font>'.
- '</nobr></td>'.
- '<td title="'.$lt{'ve'}.'"><nobr>In '.$type.': '.
+ '</span></td>'.
+ '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '.
'<font size="+1">');
# Used in course
my $usedversion=$hash{'version_'.$linkurl};
@@ -2286,8 +2284,8 @@
} else {
$r->print($currentversion);
}
- $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'.
- '<nobr>Use: ');
+ $r->print('</font></span></td><td title="'.$lt{'vu'}.'">'.
+ '<span class="LC_nobreak">Use: ');
# Set version
$r->print(&Apache::loncommon::select_form($setversions{$linkurl},
'set_version_'.$linkurl,
@@ -2296,7 +2294,7 @@
'' => '',
'mostrecent' => 'most recent',
map {$_,$_} (1..$currentversion))));
- $r->print('</nobr></td></tr><tr><td></td>');
+ $r->print('</span></td></tr><tr><td></td>');
my $lastold=1;
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -2320,7 +2318,7 @@
my $cols_output = 1;
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
my $url=$root.'.'.$prevvers.'.'.$extension;
- $r->print('<nobr><a href="'.&Apache::lonnet::clutter($url).
+ $r->print('<span class="LC_nobreak"><a href="'.&Apache::lonnet::clutter($url).
'">'.&mt('Version').' '.$prevvers.'</a> ('.
&Apache::lonlocal::locallocaltime(
&Apache::lonnet::metadata($url,
@@ -2333,7 +2331,7 @@
'&versionone='.$prevvers.
'">'.&mt('Diffs').'</a>');
}
- $r->print('</nobr><br />');
+ $r->print('</span><br />');
if (++$entries_count % $entries_per_col == 0) {
$r->print('</font></td>');
if ($cols_output != 4) {
@@ -2767,17 +2765,17 @@
$uploadtag
<input type="hidden" name="cmd" value="upload_default">
<br />
-<nobr>
+<span class="LC_nobreak">
<label>$lt{'parse'}?
<input type="checkbox" name="parserflag" />
</label>
-</nobr>
+</span>
<br />
<br />
-<nobr>
+<span class="LC_nobreak">
<input type="submit" value="$lt{'upld'}">
$help{'Uploading_From_Harddrive'}
-</nobr>
+</span>
</form>
</td>
<td bgcolor="#DDDDDD">
@@ -2786,20 +2784,20 @@
$uploadtag
<input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}" />
<br />
-<nobr>
+<span class="LC_nobreak">
<input type=button onClick="javascript:groupimport();" value="$lt{'impo'}" />
$help{'Importing_LON-CAPA_Resource'}
-</nobr>
+</span>
<br />
<input type=button onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
<p>
<hr />
$lt{'copm'}<br />
<input type="text" size="40" name="importmap" /><br />
-<nobr><input type=button
+<span class="LC_nobreak"><input type=button
onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
-$help{'Load_Map'}</nobr>
+$help{'Load_Map'}</span>
</p>
</form>
<hr />
@@ -2813,10 +2811,10 @@
<form action="/adm/coursedocs" method="post" name="newext">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newext" type="button" onClick="javascript:makenewext('newext');"
value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/imsimportdocs" method="post" name="ims">
<input type="hidden" name="folder" value="$folder" />
@@ -2831,106 +2829,106 @@
<br /><form action="/adm/coursedocs" method="post" name="newfolder">
<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newfolder" type="button"
onClick="javascript:makenewfolder(this.form,'$folderseq');"
value="$lt{'newf'}" />$help{'Adding_Folders'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newpage">
<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newpage" type="button"
onClick="javascript:makenewpage(this.form,'$pageseq');"
value="$lt{'newp'}" />$help{'Adding_Pages'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newsyl">
$uploadtag
<input type="hidden" name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-<nobr>
+<span class="LC_nobreak">
<input name="newsyl" type="submit" value="$lt{'syll'}" />
$help{'Syllabus'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newnav">
$uploadtag
<input type="hidden" name="importdetail"
value="Navigate Content=/adm/navmaps" />
-<nobr>
+<span class="LC_nobreak">
<input name="newnav" type="submit" value="$lt{'navc'}" />
$help{'Navigate_Content'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newsmppg">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newsmppg" type="button" value="$lt{'sipa'}"
onClick="javascript:makesmppage();" /> $help{'Simple Page'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newdropbox">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newdropbox" type="button" value="$lt{'drbx'}"
onClick="javascript:makedropbox();" />
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newexamupload" type="button" value="$lt{'scuf'}"
onClick="javascript:makeexamupload();" />
$help{'Score_Upload_Form'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newbul">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newbulletin" type="button" value="$lt{'bull'}"
onClick="javascript:makebulboard();" />
$help{'Bulletin Board'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newaboutme">
$uploadtag
<input type="hidden" name="importdetail"
value="$plainname=/adm/$udom/$uname/aboutme" />
-<nobr>
+<span class="LC_nobreak">
<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
$help{'My Personal Info'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newaboutsomeone" type="button" value="$lt{'abou'}"
onClick="javascript:makeabout();" />
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
$uploadtag
<input type="hidden" name="importdetail"
value="Group Files=/adm/$coursedom/$coursenum/aboutme" />
-<nobr>
+<span class="LC_nobreak">
<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
$help{'Group Files'}
-</nobr>
+</span>
</form>
ENDFORM
}
@@ -2939,19 +2937,19 @@
<form action="/adm/coursedocs" method="post" name="newsmpproblem">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newexamupload" type="button" value="$lt{'scuf'}"
onClick="javascript:makeexamupload();" />
$help{'Score_Upload_Form'}
-</nobr>
+</span>
</form>
ENDBLOCK
}
@@ -2990,11 +2988,11 @@
<input type="file" name="uploaddoc" size="40">
<br />
<br />
-<nobr>
+<span class="LC_nobreak">
<label>$lt{'parse'}?
<input type="checkbox" name="parserflag" />
</label>
-</nobr>
+</span>
<br /><br />
$lt{'comment'}:<br />
<textarea cols=50 rows=4 name='comment'>
@@ -3002,48 +3000,48 @@
<br />
<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="cmd" value="upload_supplemental">
-<nobr>
+<span class="LC_nobreak">
<input type="submit" value="$lt{'upld'}">
$help{'Uploading_From_Harddrive'}
-</nobr>
+</span>
</form>
</td>
<td bgcolor="#DDDDDD">
<form action="/adm/coursedocs" method="post" name="supnewfolder">
<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newfolder" type="button"
onClick="javascript:makenewfolder(this.form,'$folderseq');"
value="$lt{'newf'}" /> $help{'Adding_Folders'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="supnewext">
<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newext" type="button"
onClick="javascript:makenewext('supnewext');"
value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-<nobr>
+<span class="LC_nobreak">
<input name="newsyl" type="submit" value="$lt{'syll'}" />
$help{'Syllabus'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail"
value="$plainname=/adm/$udom/$uname/aboutme" />
-<nobr>
+<span class="LC_nobreak">
<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
$help{'My Personal Info'}
-</nobr>
+</span>
</form>
</td></tr>
</table></td></tr>
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.543 loncom/interface/loncommon.pm:1.544
--- loncom/interface/loncommon.pm:1.543 Mon Jul 2 20:17:42 2007
+++ loncom/interface/loncommon.pm Mon Jul 2 20:30:47 2007
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.543 2007/07/03 00:17:42 albertel Exp $
+# $Id: loncommon.pm,v 1.544 2007/07/03 00:30:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4432,17 +4432,33 @@
}
span.LC_nobreak {
- white-space: nowrap;
+ white-space: nowrap;
}
.LC_docs_course_commands div{
- float: left;
- border: 4px solid #AAAAAA;
- padding: 4px;
- background: #DDDDCC;
+ float: left;
+ border: 4px solid #AAAAAA;
+ padding: 4px;
+ background: #DDDDCC;
+}
+
+.LC_docs_copy {
+ color: #000099;
+ font-size: x-small;
+}
+.LC_docs_cut {
+ color: #550044;
+ font-size: x-small;
+}
+.LC_docs_rename {
+ color: #009900;
+ font-size: x-small;
+}
+.LC_docs_remove {
+ color: #990000;
+ font-size: x-small;
}
-
END
}
--albertel1183422647--