[LON-CAPA-cvs] cvs: loncom /interface lonaboutme.pm loncommon.pm lonsimplepage.pm lonsyllabus.pm
neumanie
neumanie@source.lon-capa.org
Fri, 13 Feb 2009 17:26:56 -0000
This is a MIME encoded message
--neumanie1234546016
Content-Type: text/plain
neumanie Fri Feb 13 17:26:56 2009 EDT
Modified files:
/loncom/interface lonaboutme.pm lonsyllabus.pm loncommon.pm
lonsimplepage.pm
Log:
Change the desgin of aboutme,simple page,syllabus. Add/change css class's in loncommon.pm.
--neumanie1234546016
Content-Type: text/plain
Content-Disposition: attachment; filename="neumanie-20090213172656.txt"
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.92 loncom/interface/lonaboutme.pm:1.93
--- loncom/interface/lonaboutme.pm:1.92 Thu Feb 12 21:15:47 2009
+++ loncom/interface/lonaboutme.pm Fri Feb 13 17:26:55 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# "About Me" Personal Information
#
-# $Id: lonaboutme.pm,v 1.92 2009/02/12 21:15:47 schafran Exp $
+# $Id: lonaboutme.pm,v 1.93 2009/02/13 17:26:55 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -281,22 +281,21 @@
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
$lastmod=$syllabus{'uploaded.lastmodified'};
$lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
- $r->print('<br />'.&mt('Last updated').': '.$lastmod);
+ $r->print('<br />'.&mt('Last updated').': '.$lastmod);
if ($syllabus{'uploaded.photourl'}) {
&Apache::lonnet::allowuploaded('/adm/aboutme',
$syllabus{'uploaded.photourl'});
#This call is to resize all "about me" images in the LonCapa System. When its done, you can remove this line.
&Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'}));
+ #---End Resize---
-#--End Resize---
-
- $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'}" />};
+ $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " style="float:left;margin-right:10px;" />};
if ($target eq 'tex') {
$image=&Apache::lonxml::xmlparse($r,'tex',$image);
}
- # $r->print($image); #Print old Image
+
}
if ($allowed) {
$r->print(
@@ -305,7 +304,7 @@
'<input type="file" name="uploaddoc" size="50" />'.
'<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
'<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
- '</form><form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>
+ '</form><form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form><p>
');
}
@@ -314,32 +313,35 @@
$r->print('<form method="post">');
}
- &Apache::lontemplate::start_columnSection($r);
- &Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
- if($target ne 'tex')
- {
- &Apache::lontemplate::start_ContentBox($r);
- $r->print($image);
+ if($target ne 'tex') #print Image
+ {
+ &Apache::lontemplate::start_ContentBox($r);
&Apache::lontemplate::send_message($r,$cnum,$cdom);
&Apache::lontemplate::end_ContentBox($r);
- &Apache::lontemplate::end_columnSection($r);
-
- &Apache::lontemplate::start_columnSection($r);
- &Apache::lontemplate::start_ContentBox($r);
+ $r->print($image);
+
+ }#End Print Image
+
+ #Print Content eg. Contactinfo aboutme,...
+ &Apache::lontemplate::print_aboutme_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
+ #End Print Content
+
+ if($target ne 'tex')#Begin Print RSS and portfiles
+ {
+
&print_portfiles_link($r,$is_course);
if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){
$r->print('<div class="LC_ContentBoxSpecial">');
$r->print('<h4 class="LC_hcell">'.'RSS Feeds and Blogs'.'</h4>');
$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
$r->print('</div>');
- }
- &Apache::lontemplate::end_ContentBox($r);
- &Apache::lontemplate::end_columnSection($r);
+ }
+
if($allowed){
$r->print('<p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
}
- }
+ }#End Print RSS and portfiles
if ($allowed) {
if ($env{'form.popup'}) {
$r->print('<input type="hidden" name="popup" value="'.
@@ -352,11 +354,7 @@
&Apache::lontemplate::send_message($r,$cnum,$cdom);
$r->print('<p>'.&mt('No personal information provided').'.</p>');
}
-
- if ($target ne 'tex') {
- # &print_portfiles_link($r,$is_course); #old Print files
-
- }
+
if ($env{'request.course.id'}
&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.75 loncom/interface/lonsyllabus.pm:1.76
--- loncom/interface/lonsyllabus.pm:1.75 Wed Dec 24 07:55:54 2008
+++ loncom/interface/lonsyllabus.pm Fri Feb 13 17:26:55 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.75 2008/12/24 07:55:54 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.76 2009/02/13 17:26:55 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -329,8 +329,8 @@
'<input type="hidden" name="forceedit" value="edit" />');
}
my @htmlids=();
- &Apache::lontemplate::start_columnSection($r);
- &Apache::lontemplate::start_ContentBox($r, $allowed);
+ #&Apache::lontemplate::start_columnSection($r);
+ #&Apache::lontemplate::start_ContentBox($r, $allowed);
foreach my $field (sort(keys(%syllabusfields))) {
if (($syllabus{$field}=~/\w/) || ($allowed)) {
my $message=$syllabus{$field};
@@ -371,8 +371,8 @@
if ($target ne 'tex') {
if($allowed){
$r->print('<p>');
- }
- &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
+ }
+ &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial');
} else {
$r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
&Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -391,8 +391,8 @@
$r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.
&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
}
- &Apache::lontemplate::end_ContentBox($r);
- &Apache::lontemplate::end_columnSection($r);
+ #&Apache::lontemplate::end_ContentBox($r);
+ #&Apache::lontemplate::end_columnSection($r);
if ($allowed) {
$r->print('</form>'.
&Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.745 loncom/interface/loncommon.pm:1.746
--- loncom/interface/loncommon.pm:1.745 Tue Feb 10 14:23:18 2009
+++ loncom/interface/loncommon.pm Fri Feb 13 17:26:55 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.745 2009/02/10 14:23:18 ehlerst Exp $
+# $Id: loncommon.pm,v 1.746 2009/02/13 17:26:55 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5726,6 +5726,14 @@
.LC_ContentBoxSpecial
{
border: solid 1px $lg_border_color;
+ max-width:70%;
+ min-width:70%;
+}
+.LC_ContentBoxSpecialContactInfo
+{
+ border: solid 1px $lg_border_color;
+ max-width:25%;
+ min-width:25%;
}
dl.LC_ListStyleClean dt {
@@ -5813,7 +5821,7 @@
.ContentBoxSpecialTemplate
{
- border: solid 1px $lg_border_color;
+ border: solid 1px $lg_border_color;
}
.ContentBoxTemplate {
padding:10px;
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.64 loncom/interface/lonsimplepage.pm:1.65
--- loncom/interface/lonsimplepage.pm:1.64 Wed Jan 28 14:45:06 2009
+++ loncom/interface/lonsimplepage.pm Fri Feb 13 17:26:56 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.64 2009/01/28 14:45:06 bisitz Exp $
+# $Id: lonsimplepage.pm,v 1.65 2009/02/13 17:26:56 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -284,7 +284,7 @@
$syllabus{'uploaded.photourl'});
$image='<img src="'.$syllabus{'uploaded.photourl'}.'"
- align="right" />';
+ />';
if ($target eq 'tex') {
$image=&Apache::lonxml::xmlparse($r,'tex',$image);
}
@@ -299,12 +299,11 @@
'</form><form method="post">'.
'<input type="hidden" name="forceedit" value="edit" />'.
'<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />' );
- }
- &Apache::lontemplate::start_columnSection($r);
+ }
if($allowed){
$r->print($image.'<div class="clear"> </div>');
- }
- &Apache::lontemplate::start_ContentBox($r,$allowed);
+ }
+
foreach my $field (sort(keys(%syllabusfields))) {
if (($syllabus{$field}) || ($allowed) ||
($field eq 'abb_links' && $group ne '')) {
@@ -349,7 +348,7 @@
if($allowed){
$r->print('<p>');
}
- &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed);
+ &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
} else {
my $safeinit;
$r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
@@ -367,11 +366,11 @@
}
}
}
- &Apache::lontemplate::end_ContentBox($r);
+
if(!$allowed){
$r->print($image);
}
- &Apache::lontemplate::end_columnSection($r);
+
if ($allowed) {
$r->print('<p>'.'<br /><a href="'.$r->uri.'?forcestudent=1'.$refarg.'">'
.'<font size="+1">'.&mt('Show Student View').'</font></a>'.
--neumanie1234546016--