--- loncom/interface/loncommon.pm 2009/05/14 17:28:23 1.814
+++ loncom/interface/loncommon.pm 2009/05/19 22:52:10 1.822
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.814 2009/05/14 17:28:23 bisitz Exp $
+# $Id: loncommon.pm,v 1.822 2009/05/19 22:52:10 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4144,41 +4144,92 @@ Returns: value of designparamter $which
##############################################
sub designparm {
my ($which,$domain)=@_;
- if ($env{'browser.blackwhite'} eq 'on') {
- if ($which=~/\.(font|alink|vlink|link|textcol)$/) {
- return '#000000';
- }
- if ($which=~/\.(pgbg|sidebg|bgcol)$/) {
- return '#FFFFFF';
- }
- if ($which=~/\.tabbg$/) {
- return '#CCCCCC';
- }
- }
if (exists($env{'environment.color.'.$which})) {
- return $env{'environment.color.'.$which};
+ return $env{'environment.color.'.$which};
}
$domain=&determinedomain($domain);
my %domdesign = &get_domainconf($domain);
my $output;
if ($domdesign{$domain.'.'.$which} ne '') {
- $output = $domdesign{$domain.'.'.$which};
+ $output = $domdesign{$domain.'.'.$which};
} else {
$output = $defaultdesign{$which};
}
if (($which =~ /^(student|coordinator|author|admin)\.img$/) ||
($which =~ /login\.(img|logo|domlogo|login)/)) {
if ($output =~ m{^/(adm|res)/}) {
- if ($output =~ m{^/res/}) {
- my $local_name = &Apache::lonnet::filelocation('',$output);
- &Apache::lonnet::repcopy($local_name);
- }
+ if ($output =~ m{^/res/}) {
+ my $local_name = &Apache::lonnet::filelocation('',$output);
+ &Apache::lonnet::repcopy($local_name);
+ }
$output = &lonhttpdurl($output);
}
}
return $output;
}
+##############################################
+=pod
+
+=item * &head_subbox()
+
+Inputs: $content (contains HTML code with page functions, etc.)
+
+Returns: HTML div with $content
+ To be included in page header
+
+=cut
+
+sub head_subbox {
+ my ($content)=@_;
+ my $output =
+ '' #FIXME: solve conflicts with lonhtmlcommon:breadcrumbs LC_head_subbox
+ .$content
+ .'
'
+}
+
+##############################################
+=pod
+
+=item * &CSTR_pageheader()
+
+Inputs: ./.
+
+Returns: HTML div with CSTR path and recent box
+ To be included on Construction Space pages
+
+=cut
+
+sub CSTR_pageheader {
+ # this is for resources; directories have customtitle, and crumbs
+ # and select recent are created in lonpubdir.pm
+ my ($uname,$thisdisfn)=
+ ($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
+ my $formaction='/priv/'.$uname.'/'.$thisdisfn;
+ $formaction=~s/\/+/\//g;
+
+ my $parentpath = '';
+ my $lastitem = '';
+ if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
+ $parentpath = $1;
+ $lastitem = $2;
+ } else {
+ $lastitem = $thisdisfn;
+ }
+ return
+ ''
+ .&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
+ .''.&mt('Construction Space:').' '
+ .''
+ .&Apache::lonmenu::constspaceform()
+ .'
';
+}
+
###############################################
###############################################
@@ -4220,8 +4271,6 @@ Inputs:
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value
-=item * $notitle, if true keep the nav controls, but remove the title bar
-
=item * $no_inline_link, if true and in remote mode, don't show the
'Switch To Inline Menu' link
@@ -4242,7 +4291,7 @@ other decorations will be returned.
sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
- $no_nav_bar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+ $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
@@ -4333,40 +4382,14 @@ ENDROLE
$forcereg=1;
}
- if (!$customtitle && $env{'request.state'} eq 'construct') {
- # this is for resources; directories have customtitle, and crumbs
- # and select recent are created in lonpubdir.pm
- my ($uname,$thisdisfn)=
- ($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
- my $formaction='/priv/'.$uname.'/'.$thisdisfn;
- $formaction=~s/\/+/\//g;
-
- my $parentpath = '';
- my $lastitem = '';
- if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
- $parentpath = $1;
- $lastitem = $2;
- } else {
- $lastitem = $thisdisfn;
- }
- $titleinfo =
- &Apache::loncommon::help_open_menu('','',3,'Authoring')
- .''.&mt('Construction Space').': '
- .''
- .&Apache::lonmenu::constspaceform();
- }
-
- my $titletable;
- if (!$notitle) {
- $titletable =
- ''.
- "| $titleinfo $dc_info | ".$roleinfo.
- '
';
- }
+ if (!$customtitle && $env{'request.state'} eq 'construct') {
+ $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
+ }
+
+ my $titletable = ''
+ ."| $titleinfo $dc_info | ".$roleinfo
+ .'
';
+
if ($no_nav_bar) {
$bodytag .= $titletable;
} else {
@@ -4397,9 +4420,6 @@ ENDROLE
my $menu= ($no_inline_link?''
:'
'.&mt('Switch to Inline Menu Mode').'');
#
- if ($notitle) {
- return $bodytag;
- }
return(<
@@ -4452,15 +4472,6 @@ sub make_attr_string {
$attr_ref->{'style'}=$style.'; font-size: x-large;';
}
- if ($env{'browser.blackwhite'} eq 'on') {
- delete($attr_ref->{'font'});
- delete($attr_ref->{'link'});
- delete($attr_ref->{'alink'});
- delete($attr_ref->{'vlink'});
- delete($attr_ref->{'bgcolor'});
- delete($attr_ref->{'background'});
- }
-
my $attr_string;
foreach my $attr (keys(%$attr_ref)) {
$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';
@@ -4702,6 +4713,7 @@ table#LC_title_bar a {
}
table#LC_title_bar {
+ clear: both;
/*display: none;*/
}
@@ -4717,6 +4729,7 @@ table#LC_title_bar.LC_with_remote {
font-family: $sans;
border-collapse: collapse;
padding: 0;
+ margin: 0;
}
table.LC_docs_path {
@@ -4740,15 +4753,15 @@ table#LC_title_bar .LC_title_bar_who {
margin: 0;
}
-table#LC_title_bar .LC_title_bar_name {
+table#LC_title_bar div.LC_title_bar_name {
margin: 0;
}
-table#LC_title_bar .LC_title_bar_role {
+table#LC_title_bar div.LC_title_bar_role {
margin: 0;
}
-table#LC_title_bar .LC_title_bar_realm {
+table#LC_title_bar div.LC_title_bar_realm {
margin: 0;
}
@@ -4825,6 +4838,24 @@ table#LC_mainmenu td.LC_mainmenu_column
font-size: 70%;
}
+#LC_head_subbox {
+ clear:both;
+ background: $sidebg;
+ border-bottom: 1px solid $lg_border_color;
+ height: 32px;
+ line-height: 32px;
+ margin: 0;
+ padding: 0;
+}
+
+#LC_head_subbox2 { /* FIXME: replace by LC_head_subbox once lonhtmlcommon::breadcrumbs has been fixed */
+ clear:both;
+ background: #F8F8F8; /* $sidebg; */
+ border-bottom: 1px solid $lg_border_color;
+ margin: 0 0 10px 0;
+ padding: 5px;
+}
+
.LC_fontsize_medium {
font-size: 85%;
}
@@ -5969,25 +6000,16 @@ ul.LC_TabContentBigger li a {
ol#LC_MenuBreadcrumbs,
ol#LC_PathBreadcrumbs,
ul.LC_CourseBreadcrumbs {
- border-top: solid 1px RGB(255, 255, 255);
- height: 20px;
- line-height: 20px;
- vertical-align: bottom;
- margin: 0 0 30px 0;
padding-left: 10px;
+ margin: 0;
list-style-position: inside;
- background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
}
ol#LC_MenuBreadcrumbs li,
ol#LC_PathBreadcrumbs li,
ul.LC_CourseBreadcrumbs li {
-/*
- background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;
-*/
display: inline;
padding: 0 0 0 10px;
-/* vertical-align: bottom; */
overflow:hidden;
}
@@ -6486,7 +6508,6 @@ $args - additional optional args support
is not auto translated like the $title is
frameset -> if true will start with a