--- loncom/interface/loncommon.pm 2009/05/07 16:25:02 1.806
+++ loncom/interface/loncommon.pm 2009/05/14 17:28:23 1.814
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.806 2009/05/07 16:25:02 bisitz Exp $
+# $Id: loncommon.pm,v 1.814 2009/05/14 17:28:23 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4215,8 +4215,8 @@ Inputs:
in the title box that appears, this text
is not auto translated like the $title is
-=item * $notopbar, if true, keep the 'what is this' info but remove the
- navigational links
+=item * $no_nav_bar, if true, keep the 'what is this' info but remove the
+ navigational links
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value
@@ -4242,7 +4242,7 @@ other decorations will be returned.
sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
- $notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+ $no_nav_bar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
@@ -4367,9 +4367,11 @@ ENDROLE
"| $titleinfo $dc_info | ".$roleinfo.
'
';
}
- if ($notopbar) {
+ if ($no_nav_bar) {
$bodytag .= $titletable;
} else {
+ $bodytag .= qq|$name ($role)
+ $realm $dc_info
|;
if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
$titletable);
@@ -4575,20 +4577,6 @@ a:focus {
background: yellow
}
-table.thinborder,
-table.thinborder tr th {
- border-style: solid;
- border-width: 1px;
- border-color: $lg_border_color;
- background: $tabbg;
-}
-
-table.thinborder tr td {
- border-style: solid;
- border-width: 1px;
- border-color: $lg_border_color;
-}
-
form, .inline {
display: inline;
}
@@ -4646,20 +4634,11 @@ div.LC_confirm_box .LC_success img {
vertical-align: middle;
}
-.LC_unknown {
- color: yellow;
-}
-
.LC_icon {
border: none;
vertical-align: middle;
}
-.LC_indexer_icon {
- border: none;
- height: 22px;
-}
-
.LC_docs_spacer {
width: 25px;
height: 1px;
@@ -4721,6 +4700,10 @@ table#LC_nav_location {
table#LC_title_bar a {
color: $fontmenu;
}
+
+table#LC_title_bar {
+ /*display: none;*/
+}
table#LC_title_bar,
table.LC_breadcrumbs,
@@ -4884,11 +4867,6 @@ td.LC_menubuttons_text {
font-weight: bold;
}
-.LC_dropadd_labeltext {
- font-family: $sans;
- text-align: right;
-}
-
.LC_preferences_labeltext {
font-family: $sans;
text-align: right;
@@ -4902,12 +4880,6 @@ td.LC_menubuttons_text {
font-weight: bold;
}
-table.LC_aboutme_port {
- border: none;
- border-collapse: collapse;
- border-spacing: 0;
-}
-
table.LC_data_table,
table.LC_mail_list {
border: 1px solid #000000;
@@ -4951,15 +4923,13 @@ table.LC_data_table tr.LC_info_row > td
}
table.LC_data_table tr.LC_odd_row > td,
-table.LC_pick_box tr > td.LC_odd_row,
-table.LC_aboutme_port tr td {
+table.LC_pick_box tr > td.LC_odd_row {
background-color: $data_table_light;
padding: 2px;
}
table.LC_data_table tr.LC_even_row > td,
-table.LC_pick_box tr > td.LC_even_row,
-table.LC_aboutme_port tr.LC_even_row td {
+table.LC_pick_box tr > td.LC_even_row {
background-color: $data_table_dark;
padding: 2px;
}
@@ -5821,7 +5791,7 @@ ul.LC_TabContent li:hover a {
}
h1 {
- padding:5px 10px 5px 20px;
+ padding: 0;
line-height:130%;
}
@@ -5874,6 +5844,20 @@ dl,ul,div,fieldset {
/* overflow: hidden; */
}
+#LC_nav_bar {
+ float: left;
+ margin: 0;
+}
+
+#LC_nav_bar em{
+ font-weight: bold;
+ font-style: normal;
+}
+
+ol.LC_smallMenu {
+ float: right;
+}
+
ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
margin: 0;
}
@@ -5894,7 +5878,27 @@ ol.LC_smallMenu a {
text-decoration: none;
}
-ol#LC_TabMainMenuContent,
+ul#LC_TabMainMenuContent {
+ clear: both;
+ color: $fontmenu;
+ background: $tabbg;
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ float:left;
+ width: 100%;
+}
+
+ul#LC_TabMainMenuContent li {
+ float: left;
+ font-weight: bold;
+ line-height: 1.8em;
+ padding: 0 0.8em;
+ border-right: 1px solid black;
+ display: inline;
+ vertical-align: middle;
+}
+
ul.LC_TabContent ,
ul.LC_TabContentBigger {
display:block;
@@ -5903,7 +5907,6 @@ ul.LC_TabContentBigger {
padding: 0;
}
-ol#LC_TabMainMenuContent li,
ul.LC_TabContent li,
ul.LC_TabContentBigger li {
display: inline;
@@ -5913,18 +5916,8 @@ ul.LC_TabContentBigger li {
white-space:nowrap;
}
-ol#LC_TabMainMenuContent li {
- vertical-align: bottom;
- border-bottom: solid 1px RGB(175, 175, 175);
- padding: 5px 10px 5px 10px;
- margin-right:5px;
- margin-bottom:3px;
- font-weight: bold;
- background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
-}
-
-ol#LC_TabMainMenuContent li a {
- color: RGB(47, 47, 47);
+ul#LC_TabMainMenuContent li a {
+ color: $fontmenu;
text-decoration: none;
}
@@ -6474,7 +6467,7 @@ $args - additional optional args support
only_body -> is true will set &bodytag() onlybodytag
arg on
- no_nav_bar -> is true will set &bodytag() notopbar arg on
+ no_nav_bar -> is true will set &bodytag() no_nav_bar arg on
add_entries -> additional attributes to add to the
domain -> force to color decorate a page for a
specific domain
@@ -6554,7 +6547,15 @@ sub start_page {
$result = &html_encode($result);
}
- #Breadcrumbs
+ # Preparation for new and consistent functionlist at top of screen
+ # if ($args->{'functionlist'}) {
+ # $result .= &build_functionlist();
+ #}
+
+ # Don't add anything more if only_body wanted
+ return $result if $args->{'only_body'};
+
+ #Breadcrumbs
if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
&Apache::lonhtmlcommon::clear_breadcrumbs();
#if any br links exists, add them to the breadcrumbs