' #FIXME: solve conflicts with lonhtmlcommon:breadcrumbs LC_head_subbox
+ '
'
.$content
.'
'
}
@@ -4381,21 +4414,6 @@ sub bodytag {
$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
}
- my $roleinfo=(<
-
- $name
-
-
-
-$role
-
-
-$realm
-
-
-ENDROLE
-
my $titleinfo = ''.$title.'
';
#
# Extra info if you are the DC
@@ -4409,25 +4427,29 @@ ENDROLE
$dc_info = '('.$dc_info.')';
}
- if (($env{'environment.remote'} eq 'off') || ($args->{'suppress_header_logos'})) {
+ $role = "($role)" if $role;
+ &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+
+ if ($env{'environment.remote'} eq 'off') {
# No Remote
if ($env{'request.state'} eq 'construct') {
$forcereg=1;
}
- if ($env{'request.state'} eq 'construct') {
- $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
- }
+# if ($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
+ ."
| $titleinfo $dc_info | "
.'
';
if ($no_nav_bar) {
$bodytag .= $titletable;
} else {
- $bodytag .= qq|$name ($role)
- $realm $dc_info
|;
+ $bodytag .= qq|$name $role
+ $realm $dc_info
| unless $env{'form.inhibitmenu'};
+
if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
$titletable);
@@ -4451,7 +4473,12 @@ ENDROLE
# Explicit link to get inline menu
my $menu= ($no_inline_link?''
- :'
'.&mt('Switch to Inline Menu Mode').'');
+ :''.&mt('Switch to Inline Menu Mode').'');
+ $bodytag .= qq|$name $role
+ $realm $dc_info
+ | unless $env{'form.inhibitmenu'};
#
return(<$messages
| $titleinfo $dc_info $menu |
-$roleinfo
ENDBODY
@@ -4582,9 +4608,9 @@ sub standard_css {
my $sans = 'Verdana,Arial,Helvetica,sans-serif';
my $mono = 'monospace';
- my $data_table_head = $tabbg;
- my $data_table_light = '#EEEEEE';
- my $data_table_dark = '#DDDDDD';
+ my $data_table_head = $sidebg;
+ my $data_table_light = '#FAFAFA';
+ my $data_table_dark = '#F0F0F0';
my $data_table_darker = '#CCCCCC';
my $data_table_highlight = '#FFFF00';
my $mail_new = '#FFBB77';
@@ -4621,6 +4647,14 @@ a:focus {
background: yellow
}
+hr {
+ clear: both;
+ color: $tabbg;
+ background-color: $tabbg;
+ height: 3px;
+ border: none;
+}
+
form, .inline {
display: inline;
}
@@ -4743,10 +4777,10 @@ table#LC_nav_location {
table#LC_title_bar a {
color: $fontmenu;
}
-
+
table#LC_title_bar {
clear: both;
- /*display: none;*/
+ display: none;
}
table#LC_title_bar,
@@ -4763,38 +4797,10 @@ table#LC_title_bar.LC_with_remote {
margin: 0;
}
-table.LC_docs_path {
- width: 100%;
- border: 0;
- background: $pgbg;
- border-collapse: collapse;
- padding: 0;
-}
-
table#LC_title_bar td {
background: $tabbg;
}
-table#LC_title_bar .LC_title_bar_who {
- background: $tabbg;
- color: $fontmenu;
- font: small;
- text-align: right;
- margin: 0;
-}
-
-table#LC_title_bar div.LC_title_bar_name {
- margin: 0;
-}
-
-table#LC_title_bar div.LC_title_bar_role {
- margin: 0;
-}
-
-table#LC_title_bar div.LC_title_bar_realm {
- margin: 0;
-}
-
table#LC_menubuttons img{
border: none;
}
@@ -4834,19 +4840,12 @@ table#LC_top_nav td.LC_top_nav_login {
text-align: center;
}
-table.LC_breadcrumbs td,
-table.LC_docs_path td {
- background: $tabbg;
- color: $fontmenu;
- font-size: smaller;
+.LC_breadcrumbs_component {
+ float: right;
+ margin: 0 1em;
}
-
-table.LC_breadcrumbs td.LC_breadcrumbs_component,
-table.LC_docs_path td.LC_docs_path_component {
- background: $tabbg;
- color: $fontmenu;
- font-size: larger;
- text-align: right;
+.LC_breadcrumbs_component img {
+ vertical-align: middle;
}
td.LC_table_cell_checkbox {
@@ -4861,17 +4860,20 @@ table#LC_mainmenu td.LC_mainmenu_column
font-size: 70%;
}
-#LC_head_subbox {
+#LC_breadcrumbs {
clear:both;
background: $sidebg;
border-bottom: 1px solid $lg_border_color;
- height: 32px;
line-height: 32px;
margin: 0;
padding: 0;
}
+/* Preliminary fix to hide breadcrumbs inside remote control window */
+#LC_remote #LC_breadcrumbs {
+ display:none;
+}
-#LC_head_subbox2 { /* FIXME: replace by LC_head_subbox once lonhtmlcommon::breadcrumbs has been fixed */
+#LC_head_subbox {
clear:both;
background: #F8F8F8; /* $sidebg; */
border-bottom: 1px solid $lg_border_color;
@@ -4921,10 +4923,6 @@ td.LC_menubuttons_text {
font-size: small;
}
-.LC_mail_functions {
- font-weight: bold;
-}
-
table.LC_data_table,
table.LC_mail_list {
border: 1px solid #000000;
@@ -5226,7 +5224,6 @@ table#LC_helpmenu {
table#LC_helpmenu fieldset legend {
font-size: larger;
- font-weight: bold;
}
table#LC_helpmenu_links {
@@ -5279,7 +5276,7 @@ table.LC_pick_box {
}
table.LC_pick_box td.LC_pick_box_title {
- background: $tabbg;
+ background: $sidebg;
font-weight: bold;
text-align: right;
vertical-align: top;
@@ -5549,8 +5546,7 @@ table.LC_prior_match tr td {
border: 1px solid #000000;
}
-td.LC_nobreak,
-span.LC_nobreak {
+.LC_nobreak {
white-space: nowrap;
}
@@ -5781,14 +5777,6 @@ div.LC_edit_problem_saves {
padding-bottom: 5px;
}
-hr.LC_edit_problem_divide {
- clear: both;
- color: $tabbg;
- background-color: $tabbg;
- height: 3px;
- border: none;
-}
-
img.stift{
border-width: 0;
vertical-align: middle;
@@ -5852,7 +5840,7 @@ h2,h3,h4,h5,h6 {
border-bottom:solid 1px $lg_border_color;
}
-.LC_ContentBoxSpecial > .LC_hcell {
+.LC_Box > .LC_hcell {
margin: 0 -10px 10px -10px;
}
@@ -5860,9 +5848,6 @@ h2,h3,h4,h5,h6 {
border: 0;
}
-
-/* Main Header with discription of Person, Course, etc. */
-
.LC_Right {
float: right;
margin: 0;
@@ -5891,9 +5876,14 @@ dl,ul,div,fieldset {
/* overflow: hidden; */
}
+fieldset > legend {
+ font-weight: bold;
+ padding: 0 5px 0 5px;
+}
+
#LC_nav_bar {
float: left;
- margin: 0;
+ margin: 0.2em 0 0 0;
}
#LC_nav_bar em{
@@ -5903,9 +5893,10 @@ dl,ul,div,fieldset {
ol.LC_smallMenu {
float: right;
+ margin: 0.2em 0 0 0;
}
-ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
+ol#LC_PathBreadcrumbs {
margin: 0;
}
@@ -5932,12 +5923,10 @@ ul#LC_TabMainMenuContent {
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;
@@ -5946,14 +5935,22 @@ ul#LC_TabMainMenuContent li {
vertical-align: middle;
}
-ul.LC_TabContent ,
-ul.LC_TabContentBigger {
+ul.LC_TabContent {
display:block;
+ background: $sidebg;
+ border-bottom: solid 1px $lg_border_color
list-style:none;
- margin: 0;
+ margin: -10px -10px 0 -10px;
padding: 0;
}
+ul.LC_TabContentBigger {
+ display:block;
+ list-style:none;
+ padding: 0;
+}
+
+
ul.LC_TabContent li,
ul.LC_TabContentBigger li {
display: inline;
@@ -5969,7 +5966,7 @@ ul#LC_TabMainMenuContent li a {
}
ul.LC_TabContent {
- min-height:1.6em;
+ min-height:1.5em;
}
ul.LC_TabContent li {
@@ -5979,6 +5976,10 @@ ul.LC_TabContent li {
border-bottom:solid 1px $lg_border_color;
}
+ul.LC_TabContent .right {
+ float:right;
+}
+
ul.LC_TabContent li a, ul.LC_TabContent li {
color:rgb(47,47,47);
text-decoration:none;
@@ -5989,7 +5990,7 @@ ul.LC_TabContent li a, ul.LC_TabContent
ul.LC_TabContent li:hover, ul.LC_TabContent li.active {
background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
- border-bottom:solid 1px #FFFFFF;
+ border-bottom:solid 2px #FFFFFF;
padding-right: 16px;
}
@@ -5999,18 +6000,24 @@ ul.LC_TabContentBigger li {
border-left:solid 1px $lg_border_color;
padding:5px 10px 5px 10px;
margin-left:2px;
- background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+ background: #d9d9d9;
+}
+
+#maincoursedoc {
+ clear:both;
}
ul.LC_TabContentBigger li:hover,
ul.LC_TabContentBigger li.active {
- background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom;
+ background: #ffffff;
+ color:$font;
}
ul.LC_TabContentBigger li,
ul.LC_TabContentBigger li a {
font-size:110%;
font-weight:bold;
+ color: #737373;
}
ol#LC_MenuBreadcrumbs,
@@ -6024,9 +6031,8 @@ ul#LC_CourseBreadcrumbs {
ol#LC_MenuBreadcrumbs li,
ol#LC_PathBreadcrumbs li,
ul#LC_CourseBreadcrumbs li {
- display: inline;
- padding: 0 0 0 10px;
- overflow:hidden;
+ display: inline;
+ white-space: nowrap;
}
ol#LC_MenuBreadcrumbs li a,
@@ -6041,7 +6047,7 @@ ol#LC_PathBreadcrumbs li a {
font-weight:bold;
}
-.LC_ContentBoxSpecial {
+.LC_Box {
border: solid 1px $lg_border_color;
padding: 0 10px 10px 10px;
}
@@ -6132,13 +6138,6 @@ div.LC_columnSection>* {
overflow:hidden;
}
-.clear {
- clear: both;
- line-height: 0;
- font-size: 0;
- height: 0;
-}
-
.LC_loginpage_container {
text-align:left;
margin : 0 auto;
@@ -6287,7 +6286,7 @@ a.LC_toolbarItem {
background-color:transparent;
}
-ul.LC_functionslist li {
+ul.LC_funclist li {
float: left;
white-space: nowrap;
height: 35px; /* at least as high as heighest list item */
@@ -6422,7 +6421,8 @@ sub xml_begin {
.'';
} else {
- $output='';
+ $output=''
+ .'';
}
return $output;
}
@@ -8571,7 +8571,7 @@ sub csv_print_samples {
$r->print(&mt('Samples').'
'.&start_data_table().
&start_data_table_header_row());
foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
- $r->print(''.&mt('Column [_1]',($sample+1)).' | '); }
+ $r->print(''.&mt('Column [_1]',($sample+1)).' | '); }
$r->print(&end_data_table_header_row());
foreach my $hash (@$samples) {
$r->print(&start_data_table_row());
Blocking Table";
+
+ return ($blocked, $output);
+}
+sub blocking_status_print {
my ($activity,$uname,$udom) = @_;
my %setters;
my ($blocked,$output,$ownitem,$is_course);
@@ -4223,7 +4256,7 @@ Returns: HTML div with $content
sub head_subbox {
my ($content)=@_;
my $output =
- '