--- loncom/interface/loncommon.pm 2009/09/06 19:09:54 1.888
+++ loncom/interface/loncommon.pm 2009/12/15 05:08:50 1.925.2.5
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.888 2009/09/06 19:09:54 raeburn Exp $
+# $Id: loncommon.pm,v 1.925.2.5 2009/12/15 05:08:50 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -482,8 +482,11 @@ ENDAUTHORBRW
}
sub coursebrowser_javascript {
- my ($domainfilter,$sec_element,$formname)=@_;
- my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Community - for which you wish to add/modify a user role.');
+ my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;
+ my $wintitle = &mt('Course Browser');
+ if ($crstype ne '') {
+ $wintitle = &mt($crstype);
+ }
my $id_functions = &javascript_index_functions();
my $output = '
END_MYBLOCK
+
+ $output = Apache::lonhtmlcommon::scripttag($output);
+
my $popupUrl = "/adm/blockingstatus/$querystring";
+ my $text = mt('Communication Blocked');
+
$output .= <<"END_BLOCK";
END_BLOCK
@@ -4047,7 +4116,7 @@ sub determinedomain {
my $domain=shift;
if (! $domain) {
# Determine domain if we have not been given one
- $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+ $domain = &Apache::lonnet::default_login_domain();
if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
if ($env{'request.role.domain'}) {
$domain=$env{'request.role.domain'};
@@ -4298,18 +4367,30 @@ sub CSTR_pageheader {
} else {
$lastitem = $thisdisfn;
}
- return
+
+ my $output =
''
.&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
.''.&mt('Construction Space:').' '
.''
.&Apache::lonmenu::constspaceform()
.'
';
+
+ return $output;
}
###############################################
@@ -4386,6 +4467,10 @@ sub bodytag {
'link' => &designparm($function.'.link',$domain),);
@design{keys(%$addentries)} = @$addentries{keys(%$addentries)};
+ my $custommenu;
+ if ($env{'environment.remote'} eq 'off') {
+ $custommenu = &needs_gci_custom();
+ }
# role and realm
my ($role,$realm) = split(/\./,$env{'request.role'},2);
if ($role eq 'ca') {
@@ -4395,11 +4480,22 @@ sub bodytag {
# realm
if ($env{'request.course.id'}) {
if ($env{'request.role'} !~ /^cr/) {
- $role = &Apache::lonnet::plaintext($role,&course_type());
+ if (($custommenu) && ($role eq 'cm')) {
+ undef($role);
+ } else {
+ $role = &Apache::lonnet::plaintext($role,&course_type());
+ }
}
+ if ($env{'request.course.sec'}) {
+ $role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'};
+ }
$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
} else {
- $role = &Apache::lonnet::plaintext($role);
+ if (($custommenu) && ($role eq 'cm')) {
+ undef($role);
+ } else {
+ $role = &Apache::lonnet::plaintext($role);
+ }
}
if (!$realm) { $realm=' '; }
@@ -4431,40 +4527,83 @@ sub bodytag {
$env{'course.'.$env{'request.course.id'}.
'.domain'}.'/'})) {
my $cid = $env{'request.course.id'};
- $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
+ $dc_info = $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
$dc_info =~ s/\s+$//;
- $dc_info = '('.$dc_info.')';
}
- $role = "($role)" if $role;
+ $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
-# }
-
- my $titletable = ''
- ." $titleinfo $dc_info "
- .'
';
+ if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
+ return $bodytag;
+ }
- if ($no_nav_bar) {
- $bodytag .= $titletable;
- } else {
- $bodytag .= qq|$name $role$realm $dc_info
| unless $env{'form.inhibitmenu'};
+ if ($env{'request.state'} eq 'construct') { $forcereg=1; }
- if ($env{'request.state'} eq 'construct') {
- $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$titletable);
- } else {
- $bodytag .= &Apache::lonmenu::menubuttons($forcereg).$titletable;
- }
+ # if ($env{'request.state'} eq 'construct') {
+ # $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
+ # }
+
+ my $role_selector;
+ if (($custommenu) && ($env{'request.course.id'}) &&
+ ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gcitest') &&
+ ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
+ $role_selector = &Apache::lonmenu::roles_selector(
+ $env{'course.' . $env{'request.course.id'} . '.domain'},
+ $env{'course.' . $env{'request.course.id'} . '.num'} );
+ if ($role_selector) {
+ $role_selector = '$dc_info |;
+ }
+ $bodytag .= qq|$name $role$realm $dc_info
|;
+ return $bodytag;
+ }
+
+ $bodytag .= qq|$name $role $role_selector
|;
+
+ $bodytag .= Apache::lonhtmlcommon::scripttag(
+ Apache::lonmenu::utilityfunctions('',$custommenu), 'start');
+
+ $bodytag .= Apache::lonmenu::primary_menu();
+
+ if ($dc_info) {
+ $dc_info = &dc_courseid_toggle($dc_info);
+ }
+ $bodytag .= qq|$realm $dc_info
|;
+
+ #don't show menus for public users
+ if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
+ if (($custommenu) &&
+ ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
+ $bodytag .= &Apache::lonmenu::gci_secondary_menu();
+ } else {
+ $bodytag .= Apache::lonmenu::secondary_menu();
+ }
+ $bodytag .= Apache::lonmenu::serverform();
+ $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+ if ($env{'request.state'} eq 'construct') {
+ $bodytag .= &Apache::lonmenu::innerregister($forcereg,'',
+ $args->{'bread_crumbs'});
+ } elsif ($forcereg) {
+ $bodytag .= &Apache::lonmenu::innerregister($forcereg);
+ }
+ }else{
+ # this is to seperate menu from content when there's no secondary
+ # menu. Especially needed for public accessible ressources.
+ $bodytag .= ''.&mt('Switch to Inline Menu Mode').' ');
- $bodytag .= qq|$name $role
- $realm $dc_info
- $realm $dc_info
| unless $env{'form.inhibitmenu'};
return(<
@@ -4499,6 +4641,14 @@ $bodytag
ENDBODY
}
+sub dc_courseid_toggle {
+ my ($dc_info) = @_;
+ return ' '.
+ ''.
+ &mt('(More ...)').' '.
+ ''.$dc_info.'
';
+}
+
sub make_attr_string {
my ($register,$attr_ref) = @_;
@@ -4630,57 +4780,48 @@ sub standard_css {
my $mail_other_hover = '#669999';
my $table_header = '#DDDDDD';
my $feedback_link_bg = '#BBBBBB';
- my $lg_border_color = '#C8C8C8';
+ my $lg_border_color = '#C8C8C8';
my $border = ($env{'browser.type'} eq 'explorer' ||
- $env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px'
- : '0 3px 0 4px';
+ $env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px'
+ : '0 3px 0 4px';
return < td
text-align: left;
}
-table.LC_data_table tr.LC_odd_row > td,
+table.LC_data_table tr.LC_odd_row > td {
+ background-color: $data_table_light;
+ padding: 2px;
+ vertical-align: top;
+}
+
table.LC_pick_box tr > td.LC_odd_row {
background-color: $data_table_light;
+ vertical-align: top;
+}
+
+table.LC_data_table tr.LC_even_row > td {
+ background-color: $data_table_dark;
padding: 2px;
+ vertical-align: top;
}
-table.LC_data_table tr.LC_even_row > td,
table.LC_pick_box tr > td.LC_even_row {
background-color: $data_table_dark;
- padding: 2px;
+ vertical-align: top;
}
table.LC_data_table tr.LC_data_table_highlight td {
@@ -5006,6 +5154,9 @@ table.LC_nested tr.LC_empty_row td {
padding: 8px;
}
+table.LC_caption {
+}
+
table.LC_nested tr.LC_empty_row td {
padding: 4ex
}
@@ -5070,6 +5221,7 @@ table.LC_createuser tr.LC_info_row td {
table.LC_calendar {
border: 1px solid #000000;
border-collapse: collapse;
+ width: 98%;
}
table.LC_calendar_pickdate {
@@ -5079,6 +5231,7 @@ table.LC_calendar_pickdate {
table.LC_calendar tr td {
border: 1px solid #000000;
vertical-align: top;
+ width: 14%;
}
table.LC_calendar tr td.LC_calendar_day_empty {
@@ -5097,12 +5250,6 @@ table.LC_mail_list tr.LC_mail_new:hover
background-color: $mail_new_hover;
}
-table.LC_mail_list tr.LC_mail_even {
-}
-
-table.LC_mail_list tr.LC_mail_odd {
-}
-
table.LC_mail_list tr.LC_mail_read {
background-color: $mail_read;
}
@@ -5129,7 +5276,7 @@ table.LC_mail_list tr.LC_mail_other:hove
table.LC_data_table tr > td.LC_browser_file,
table.LC_data_table tr > td.LC_browser_file_published {
- background: #CCFF88;
+ background: #AAEE77;
}
table.LC_data_table tr > td.LC_browser_file_locked,
@@ -5138,20 +5285,20 @@ table.LC_data_table tr > td.LC_browser_f
}
table.LC_data_table tr > td.LC_browser_file_obsolete {
- background: #AAAAAA;
+ background: #888888;
}
table.LC_data_table tr > td.LC_browser_file_modified,
table.LC_data_table tr > td.LC_browser_file_metamodified {
- background: #FFFF77;
+ background: #F8F866;
}
table.LC_data_table tr.LC_browser_folder > td {
- background: #CCCCFF;
+ background: #E0E8FF;
}
table.LC_data_table tr > td.LC_roles_is {
-/* background: #77FF77; */
+ /* background: #77FF77; */
}
table.LC_data_table tr > td.LC_roles_future {
@@ -5199,7 +5346,8 @@ span.LC_parm_part {
color: blue;
}
-span.LC_parm_folder, span.LC_parm_symb {
+span.LC_parm_folder,
+span.LC_parm_symb {
font-size: x-small;
font-family: $mono;
color: #AAAAAA;
@@ -5289,7 +5437,7 @@ table.LC_pick_box {
table.LC_pick_box td.LC_pick_box_title {
background: $sidebg;
font-weight: bold;
- text-align: right;
+ text-align: left;
vertical-align: top;
width: 184px;
padding: 8px;
@@ -5327,40 +5475,6 @@ table.LC_pick_box td.LC_oddrow_value {
background-color: $data_table_light;
}
-table.LC_helpform_receipt {
- width: 620px;
- border-collapse: separate;
- background: white;
- border: 1px solid black;
- border-spacing: 1px;
-}
-
-table.LC_helpform_receipt td.LC_pick_box_title {
- background: $tabbg;
- font-weight: bold;
- text-align: right;
- width: 184px;
- padding: 8px;
-}
-
-table.LC_helpform_receipt td.LC_evenrow_value {
- text-align: left;
- padding: 8px;
- background-color: $data_table_light;
-}
-
-table.LC_helpform_receipt td.LC_oddrow_value {
- text-align: left;
- padding: 8px;
- background-color: $data_table_light;
-}
-
-table.LC_helpform_receipt td.LC_pick_box_separator {
- padding: 0;
- height: 1px;
- background: black;
-}
-
span.LC_helpform_receipt_cat {
font-weight: bold;
}
@@ -5415,15 +5529,17 @@ table.LC_notify_front_page td {
.LC_topic_bar {
font-weight: bold;
- width: 100%;
background: $tabbg;
- vertical-align: middle;
- margin: 2ex 0ex 2ex 0ex;
+ margin: 1em 0em 1em 2em;
padding: 3px;
+ font-size: 1.2em;
}
.LC_topic_bar span {
+ left: 0.5em;
+ position: absolute;
vertical-align: middle;
+ font-size: 1.2em;
}
.LC_topic_bar img {
@@ -5456,12 +5572,12 @@ div.LC_feedback_link img {
vertical-align:middle;
}
-div.LC_feedback_link a{
+div.LC_feedback_link a {
text-decoration: none;
}
div.LC_comblock {
- display:inline;
+ display:inline;
color:$font;
font-size:90%;
}
@@ -5539,12 +5655,12 @@ span.LC_prior_string,
span.LC_prior_custom,
span.LC_prior_reaction,
span.LC_prior_math {
- font-family: monospace;
+ font-family: $mono;
white-space: pre;
}
span.LC_prior_string {
- font-family: monospace;
+ font-family: $mono;
white-space: pre;
}
@@ -5553,7 +5669,7 @@ table.LC_prior_option {
border-collapse: collapse;
}
-table.LC_prior_rank,
+table.LC_prior_rank,
table.LC_prior_match {
border-collapse: collapse;
}
@@ -5577,17 +5693,6 @@ span.LC_cusr_subheading {
font-size: 85%;
}
-table.LC_docs_documents {
- background: #BBBBBB;
- border-width: 0;
- border-collapse: collapse;
-}
-
-table.LC_docs_documents td.LC_docs_document {
- border: 2px solid black;
- padding: 4px;
-}
-
div.LC_docs_entry_move {
border: 1px solid #BBBBBB;
background: #DDDDDD;
@@ -5783,30 +5888,24 @@ div.LC_edit_problem_saves {
padding-bottom: 5px;
}
-img.stift{
+img.stift {
border-width: 0;
vertical-align: middle;
}
-table#LC_mainmenu{
- margin-top:10px;
- width:80%;
-}
-
-table#LC_mainmenu td.LC_mainmenu_col_fieldset{
+table td.LC_mainmenu_col_fieldset {
vertical-align: top;
- width: 45%;
}
-.LC_mainmenu_fieldset_category {
- color: $font;
- background: $pgbg;
- font-size: small;
- font-weight: bold;
+div.LC_createcourse {
+ margin: 10px 10px 10px 10px;
}
-div.LC_createcourse {
- margin: 10px 10px 10px 10px;
+.LC_dccid {
+ margin: 0.2em 0 0 0;
+ padding: 0;
+ font-size: 90%;
+ display:none;
}
/* ---- Remove when done ----
@@ -5817,226 +5916,236 @@ div.LC_createcourse {
# --------------------------*/
a:hover,
-ol.LC_smallMenu a:hover,
+ol.LC_primary_menu a:hover,
ol#LC_MenuBreadcrumbs a:hover,
ol#LC_PathBreadcrumbs a:hover,
-ul#LC_TabMainMenuContent a:hover,
+ul#LC_secondary_menu a:hover,
.LC_FormSectionClearButton input:hover
ul.LC_TabContent li:hover a {
- color:#BF2317;
- text-decoration:none;
+ color:#BF2317;
+ text-decoration:none;
}
h1 {
- padding: 0;
- line-height:130%;
+ padding: 0;
+ line-height:130%;
}
-h2,h3,h4,h5,h6 {
- margin: 5px 0 5px 0;
- padding: 0;
- line-height:130%;
+h2,
+h3,
+h4,
+h5,
+h6 {
+ margin: 5px 0 5px 0;
+ padding: 0;
+ line-height:130%;
}
.LC_hcell {
- padding:3px 15px 3px 15px;
- margin: 0;
- background-color:$tabbg;
- color:$fontmenu;
- border-bottom:solid 1px $lg_border_color;
+ padding:3px 15px 3px 15px;
+ margin: 0;
+ background-color:$tabbg;
+ color:$fontmenu;
+ border-bottom:solid 1px $lg_border_color;
}
.LC_Box > .LC_hcell {
- margin: 0 -10px 10px -10px;
+ margin: 0 -10px 10px -10px;
}
.LC_noBorder {
- border: 0;
-}
-
-.LC_Right {
- float: right;
- margin: 0;
- padding: 0;
+ border: 0;
}
.LC_FormSectionClearButton input {
- background-color:transparent;
- border: none;
- cursor:pointer;
- text-decoration:underline;
+ background-color:transparent;
+ border: none;
+ cursor:pointer;
+ text-decoration:underline;
}
.LC_help_open_topic {
- color: #FFFFFF;
- background-color: #EEEEFF;
- margin: 1px;
- padding: 4px;
- border: 1px solid #000033;
- white-space: nowrap;
-/* vertical-align: middle; */
+ color: #FFFFFF;
+ background-color: #EEEEFF;
+ margin: 1px;
+ padding: 4px;
+ border: 1px solid #000033;
+ white-space: nowrap;
+ /* vertical-align: middle; */
}
-dl,ul,div,fieldset {
- margin: 10px 10px 10px 0;
-/* overflow: hidden; */
+dl,
+ul,
+div,
+fieldset {
+ margin: 10px 10px 10px 0;
+ /* overflow: hidden; */
}
fieldset > legend {
- font-weight: bold;
- padding: 0 5px 0 5px;
+ font-weight: bold;
+ padding: 0 5px 0 5px;
}
#LC_nav_bar {
- float: left;
- margin: 0.2em 0 0 0;
+ float: left;
+ margin: 0.2em 0 0 0;
}
-#LC_nav_bar em{
- font-weight: bold;
- font-style: normal;
+#LC_realm {
+ margin: 0.2em 0 0 0;
+ padding: 0;
+ font-weight: bold;
+ text-align: center;
}
-ol.LC_smallMenu {
- float: right;
- margin: 0.2em 0 0 0;
+#LC_nav_bar em {
+ font-weight: bold;
+ font-style: normal;
+}
+
+ol.LC_primary_menu {
+ float: right;
+ margin: 0.2em 0 0 0;
}
ol#LC_PathBreadcrumbs {
- margin: 0;
+ margin: 0;
}
-ol.LC_smallMenu li {
- display: inline;
- padding: 5px 5px 0 10px;
- vertical-align: top;
+ol.LC_primary_menu li {
+ display: inline;
+ padding: 5px 5px 0 10px;
+ vertical-align: top;
}
-ol.LC_smallMenu li img {
- vertical-align: bottom;
+ol.LC_primary_menu li img {
+ vertical-align: bottom;
}
-ol.LC_smallMenu a {
- font-size: 90%;
- color: RGB(80, 80, 80);
- text-decoration: none;
+ol.LC_primary_menu a {
+ font-size: 90%;
+ color: RGB(80, 80, 80);
+ text-decoration: none;
}
-ul#LC_TabMainMenuContent {
- clear: both;
- color: $fontmenu;
- background: $tabbg;
- list-style: none;
- padding: 0;
- margin: 0;
- width: 100%;
+ul#LC_secondary_menu {
+ clear: both;
+ color: $fontmenu;
+ background: $tabbg;
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ width: 100%;
}
-ul#LC_TabMainMenuContent li {
- font-weight: bold;
- line-height: 1.8em;
- padding: 0 0.8em;
- border-right: 1px solid black;
- display: inline;
- vertical-align: middle;
+ul#LC_secondary_menu li {
+ font-weight: bold;
+ line-height: 1.8em;
+ padding: 0 0.8em;
+ border-right: 1px solid black;
+ display: inline;
+ vertical-align: middle;
}
ul.LC_TabContent {
- display:block;
- background: $sidebg;
- border-bottom: solid 1px $lg_border_color;
- list-style:none;
- margin: 0 -10px;
- padding: 0;
+ display:block;
+ background: $sidebg;
+ border-bottom: solid 1px $lg_border_color;
+ list-style:none;
+ margin: 0 -10px;
+ padding: 0;
}
ul.LC_TabContent li,
ul.LC_TabContentBigger li {
- float:left;
+ float:left;
}
-ul#LC_TabMainMenuContent li a {
- color: $fontmenu;
- text-decoration: none;
+ul#LC_secondary_menu li a {
+ color: $fontmenu;
+ text-decoration: none;
}
ul.LC_TabContent {
- min-height:1.5em;
+ min-height:1.5em;
}
ul.LC_TabContent li {
- vertical-align:middle;
- padding: 0 10px 0 10px;
- background-color:$tabbg;
- border-bottom:solid 1px $lg_border_color;
+ vertical-align:middle;
+ padding: 0 10px 0 10px;
+ background-color:$tabbg;
+ border-bottom:solid 1px $lg_border_color;
}
ul.LC_TabContent .right {
- float:right;
+ float:right;
}
-ul.LC_TabContent li a, ul.LC_TabContent li {
- color:rgb(47,47,47);
- text-decoration:none;
- font-size:95%;
- font-weight:bold;
- padding-right: 16px;
+ul.LC_TabContent li a,
+ul.LC_TabContent li {
+ color:rgb(47,47,47);
+ text-decoration:none;
+ font-size:95%;
+ font-weight:bold;
+ padding-right: 16px;
}
-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 2px #FFFFFF;
- padding-right: 16px;
+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 2px #FFFFFF;
+ padding-right: 16px;
}
#maincoursedoc {
- clear:both;
+ clear:both;
}
ul.LC_TabContentBigger {
- display:block;
- list-style:none;
- padding: 0;
+ display:block;
+ list-style:none;
+ padding: 0;
}
ul.LC_TabContentBigger li {
- vertical-align:bottom;
- height: 30px;
- font-size:110%;
- font-weight:bold;
- color: #737373;
+ vertical-align:bottom;
+ height: 30px;
+ font-size:110%;
+ font-weight:bold;
+ color: #737373;
}
ul.LC_TabContentBigger li a {
- background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat;
- height: 30px;
- line-height: 30px;
- text-align: center;
- display: block;
- text-decoration: none;
+ background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat;
+ height: 30px;
+ line-height: 30px;
+ text-align: center;
+ display: block;
+ text-decoration: none;
}
-ul.LC_TabContentBigger li:hover a,
+ul.LC_TabContentBigger li:hover a,
ul.LC_TabContentBigger li.active a {
- background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat;
- color:$font;
- text-decoration: underline;
+ background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat;
+ color:$font;
+ text-decoration: underline;
}
ul.LC_TabContentBigger li b {
- background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom;
- display: block;
- float: left;
- padding: 0 30px;
+ background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom;
+ display: block;
+ float: left;
+ padding: 0 30px;
}
ul.LC_TabContentBigger li:hover b,
ul.LC_TabContentBigger li.active b {
- background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;
- color:$font;
- border-bottom: 1px solid #FFFFFF;
+ background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;
+ color:$font;
+ border-bottom: 1px solid #FFFFFF;
}
@@ -6049,65 +6158,68 @@ ul.LC_CourseBreadcrumbs {
}
-ol#LC_MenuBreadcrumbs,
+ol#LC_MenuBreadcrumbs,
ol#LC_PathBreadcrumbs {
- padding-left: 10px;
- margin: 0;
- list-style-position: inside;
+ padding-left: 10px;
+ margin: 0;
+ list-style-position: inside;
+ /* SD working here
+ white-space: nowrap; */
}
-ol#LC_MenuBreadcrumbs li,
-ol#LC_PathBreadcrumbs li,
+ol#LC_MenuBreadcrumbs li,
+ol#LC_PathBreadcrumbs li,
ul.LC_CourseBreadcrumbs li {
- display: inline;
- white-space: nowrap;
+ display: inline;
+ white-space: nowrap;
+ /* SD working here
+ white-space: normal; */
}
ol#LC_MenuBreadcrumbs li a,
ul.LC_CourseBreadcrumbs li a {
- text-decoration: none;
- font-size:90%;
+ text-decoration: none;
+ font-size:90%;
}
ol#LC_PathBreadcrumbs li a {
- text-decoration:none;
- font-size:100%;
- font-weight:bold;
+ text-decoration:none;
+ font-size:100%;
+ font-weight:bold;
}
.LC_Box {
- border: solid 1px $lg_border_color;
- padding: 0 10px 10px 10px;
+ border: solid 1px $lg_border_color;
+ padding: 0 10px 10px 10px;
}
.LC_AboutMe_Image {
- float:left;
- margin-right:10px;
+ float:left;
+ margin-right:10px;
}
.LC_Clear_AboutMe_Image {
- clear:left;
+ clear:left;
}
dl.LC_ListStyleClean dt {
- padding-right: 5px;
- display: table-header-group;
+ padding-right: 5px;
+ display: table-header-group;
}
dl.LC_ListStyleClean dd {
- display: table-row;
+ display: table-row;
}
.LC_ListStyleClean,
.LC_ListStyleSimple,
.LC_ListStyleNormal,
-.LC_ListStyle_Border,
.LC_ListStyleSpecial {
- /*display:block; */
- list-style-position: inside;
- list-style-type: none;
- overflow: hidden;
- padding: 0;
+ /* display:block; */
+ list-style-position: inside;
+ list-style-type: none;
+ overflow: hidden;
+ padding: 0;
}
.LC_ListStyleSimple li,
@@ -6116,211 +6228,254 @@ dl.LC_ListStyleClean dd {
.LC_ListStyleNormal dd,
.LC_ListStyleSpecial li,
.LC_ListStyleSpecial dd {
- margin: 0;
- padding: 5px 5px 5px 10px;
- clear: both;
+ margin: 0;
+ padding: 5px 5px 5px 10px;
+ clear: both;
}
.LC_ListStyleClean li,
.LC_ListStyleClean dd {
- padding-top: 0;
- padding-bottom: 0;
+ padding-top: 0;
+ padding-bottom: 0;
}
.LC_ListStyleSimple dd,
.LC_ListStyleSimple li {
- border-bottom: solid 1px $lg_border_color;
+ border-bottom: solid 1px $lg_border_color;
}
.LC_ListStyleSpecial li,
.LC_ListStyleSpecial dd {
- list-style-type: none;
- background-color: RGB(220, 220, 220);
- margin-bottom: 4px;
+ list-style-type: none;
+ background-color: RGB(220, 220, 220);
+ margin-bottom: 4px;
}
table.LC_SimpleTable {
- margin:5px;
- border:solid 1px $lg_border_color;
+ margin:5px;
+ border:solid 1px $lg_border_color;
}
table.LC_SimpleTable tr {
- padding: 0;
- border:solid 1px $lg_border_color;
+ padding: 0;
+ border:solid 1px $lg_border_color;
}
table.LC_SimpleTable thead {
- background:rgb(220,220,220);
+ background:rgb(220,220,220);
}
div.LC_columnSection {
- display: block;
- clear: both;
- overflow: hidden;
- margin: 0;
+ display: block;
+ clear: both;
+ overflow: hidden;
+ margin: 0;
}
div.LC_columnSection>* {
- float: left;
- margin: 10px 20px 10px 0;
- overflow:hidden;
+ float: left;
+ margin: 10px 20px 10px 0;
+ overflow:hidden;
}
.LC_loginpage_container {
- text-align:left;
- margin : 0 auto;
- width:90%;
- padding: 10px;
- height: auto;
- background-color:#FFFFFF;
- border:1px solid #CCCCCC;
+ text-align:left;
+ margin : 0 auto;
+ width:90%;
+ padding: 10px;
+ height: auto;
+ background-color:#FFFFFF;
+ border:1px solid #CCCCCC;
}
.LC_loginpage_loginContainer {
- float:left;
- width: 182px;
- padding: 2px;
- border:1px solid #CCCCCC;
- background-color:$loginbg;
+ float:left;
+ width: 182px;
+ padding: 2px;
+ border:1px solid #CCCCCC;
+ background-color:$loginbg;
}
.LC_loginpage_loginContainer h2 {
- margin-top: 0;
- display:block;
- background:$bgcol;
- color:$textcol;
- padding-left:5px;
+ margin-top: 0;
+ display:block;
+ background:$bgcol;
+ color:$textcol;
+ padding-left:5px;
}
.LC_loginpage_loginInfo {
- float:left;
- width:182px;
- border:1px solid #CCCCCC;
- padding:2px;
+ float:left;
+ width:182px;
+ border:1px solid #CCCCCC;
+ padding:2px;
}
.LC_loginpage_space {
- clear: both;
- margin-bottom: 20px;
- border-bottom: 1px solid #CCCCCC;
+ clear: both;
+ margin-bottom: 20px;
+ border-bottom: 1px solid #CCCCCC;
}
.LC_loginpage_floatLeft {
- float: left;
- width: 200px;
- margin: 0;
+ float: left;
+ width: 200px;
+ margin: 0;
}
table em {
- font-weight: bold;
- font-style: normal;
+ font-weight: bold;
+ font-style: normal;
}
table.LC_tableBrowseRes,
table.LC_tableOfContent {
- border:none;
- border-spacing: 1px;
- padding: 3px;
- background-color: #FFFFFF;
- font-size: 90%;
+ border:none;
+ border-spacing: 1px;
+ padding: 3px;
+ background-color: #FFFFFF;
+ font-size: 90%;
}
-table.LC_tableOfContent{
- border-collapse: collapse;
+table.LC_tableOfContent {
+ border-collapse: collapse;
}
table.LC_tableBrowseRes a,
table.LC_tableOfContent a {
- background-color: transparent;
- text-decoration: none;
-}
-
-table.LC_tableBrowseRes tr.LC_trOdd,
-table.LC_tableOfContent tr.LC_trOdd{
- background-color: #EEEEEE;
+ background-color: transparent;
+ text-decoration: none;
}
table.LC_tableOfContent img {
- border: none;
- height: 1.3em;
- vertical-align: text-bottom;
- margin-right: 0.3em;
+ border: none;
+ height: 1.3em;
+ vertical-align: text-bottom;
+ margin-right: 0.3em;
}
a#LC_content_toolbar_firsthomework {
- background-image:url(/res/adm/pages/open-first-problem.gif);
+ background-image:url(/res/adm/pages/open-first-problem.gif);
}
a#LC_content_toolbar_launchnav {
- background-image:url(/res/adm/pages/start-navigation.gif);
+ background-image:url(/res/adm/pages/start-navigation.gif);
}
a#LC_content_toolbar_closenav {
- background-image:url(/res/adm/pages/close-navigation.gif);
+ background-image:url(/res/adm/pages/close-navigation.gif);
}
a#LC_content_toolbar_everything {
- background-image:url(/res/adm/pages/show-all.gif);
+ background-image:url(/res/adm/pages/show-all.gif);
}
a#LC_content_toolbar_uncompleted {
- background-image:url(/res/adm/pages/show-incomplete-problems.gif);
+ background-image:url(/res/adm/pages/show-incomplete-problems.gif);
}
#LC_content_toolbar_clearbubbles {
- background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
+ background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
}
a#LC_content_toolbar_changefolder {
- background : url(/res/adm/pages/close-all-folders.gif) top center ;
+ background : url(/res/adm/pages/close-all-folders.gif) top center ;
}
a#LC_content_toolbar_changefolder_toggled {
- background-image:url(/res/adm/pages/open-all-folders.gif);
+ background-image:url(/res/adm/pages/open-all-folders.gif);
}
ul#LC_toolbar li a:hover {
- background-position: bottom center;
+ background-position: bottom center;
}
ul#LC_toolbar {
- padding: 0;
- margin: 2px;
- list-style:none;
- position:relative;
- background-color:white;
+ padding: 0;
+ margin: 2px;
+ list-style:none;
+ position:relative;
+ background-color:white;
}
ul#LC_toolbar li {
- border:1px solid white;
- padding: 0;
- margin: 0;
- float: left;
- display:inline;
- vertical-align:middle;
-}
+ border:1px solid white;
+ padding: 0;
+ margin: 0;
+ float: left;
+ display:inline;
+ vertical-align:middle;
+}
a.LC_toolbarItem {
- display:block;
- padding: 0;
- margin: 0;
- height: 32px;
- width: 32px;
- color:white;
- border: none;
- background-repeat:no-repeat;
- background-color:transparent;
+ display:block;
+ padding: 0;
+ margin: 0;
+ height: 32px;
+ width: 32px;
+ color:white;
+ border: none;
+ background-repeat:no-repeat;
+ background-color:transparent;
+}
+
+ul.LC_funclist {
+ margin: 0;
+ padding: 0.5em 1em 0.5em 0;
+}
+
+ul.LC_funclist + ul.LC_funclist {
+ /*
+ left border as a seperator if we have more than
+ one list
+ */
+ border-left: 1px solid $sidebg;
+ /*
+ this hides the left border behind the border of the
+ outer box if element is wrapped to the next 'line'
+ */
+ margin-left: -1px;
}
ul.LC_funclist li {
- float: left;
+ display: inline;
white-space: nowrap;
- height: 35px; /* at least as high as heighest list item */
- margin: 0 15px 15px 10px;
+ margin: 0 0 0 25px;
+ line-height: 150%;
}
+#gciheader {
+ float:left;
+ width:100%;
+ background:#DAE0D2 url("/gcimenu_bg.gif") repeat-x bottom;
+ font-size:93%;
+ line-height:normal;
+}
+#gciheader ul {
+ margin:0;
+ padding:10px 10px 0;
+ list-style:none;
+}
+#gciheader li {
+ float:left;
+ background:url("/gcimenu_left.gif") no-repeat left top;
+ margin:0;
+ padding:0 0 0 9px;
+}
+#gciheader a {
+ display:block;
+ background:url("/gcimenu_right.gif") no-repeat right top;
+ padding:5px 15px 4px 6px;
+}
+#gciheader #current {
+ background-image:url("/gcimenu_left_on.gif");
+}
+#gciheader #current a {
+ background-image:url("/gcimenu_right_on.gif");
+ padding-bottom:5px;
+}
END
}
@@ -6597,6 +6752,11 @@ sub start_page {
# Don't add anything more if only_body wanted
return $result if $args->{'only_body'};
+ #Breadcrumbs for Construction Space provided by &bodytag.
+ if (($env{'environment.remote'} eq 'off') && ($env{'request.state'} eq 'construct')) {
+ return $result;
+ }
+
#Breadcrumbs
if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
&Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -6744,14 +6904,14 @@ sub simple_error_page {
my ($add_class) = @_;
$row_count[0]++;
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
- $css_class = (join(' ',$css_class,$add_class));
+ $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
return ''."\n";;
}
sub continue_data_table_row {
my ($add_class) = @_;
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
- $css_class = (join(' ',$css_class,$add_class));
+ $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');;
return ' '."\n";;
}
@@ -6775,6 +6935,11 @@ sub simple_error_page {
sub end_data_table_header_row {
return ' '."\n";;
}
+
+ sub data_table_caption {
+ my $caption = shift;
+ return "$caption ";
+ }
}
=pod
@@ -6845,7 +7010,7 @@ sub get_users_function {
if ($env{'request.role'}=~/^(st)/) {
$function='student';
}
- if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
+ if ($env{'request.role'}=~/^(cc|co|in|ta|ep)/) {
$function='coordinator';
}
if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
@@ -6916,7 +7081,7 @@ sub check_user_status {
my $active_chk = 'none';
my $now = time;
if (@uroles > 0) {
- if (($role eq 'cc') || ($sec eq '') || (!defined($sec))) {
+ if (($role eq 'cc') || ($role eq 'co') || ($sec eq '') || (!defined($sec))) {
$srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
} else {
$srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;
@@ -9470,6 +9635,8 @@ sub extract_categories {
my $trailstr;
if ($name eq 'instcode') {
$trailstr = &mt('Official courses (with institutional codes)');
+ } elsif ($name eq 'communities') {
+ $trailstr = &mt('Communities');
} else {
$trailstr = $name;
}
@@ -9582,12 +9749,14 @@ cathash - reference to hash of categorie
currcat - scalar with an & separated list of categories assigned to a course.
+type - scalar contains course type (Course or Community).
+
Returns: $output (markup to be displayed)
=cut
sub assign_categories_table {
- my ($cathash,$currcat) = @_;
+ my ($cathash,$currcat,$type) = @_;
my $output;
if (ref($cathash) eq 'HASH') {
my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
@@ -9596,15 +9765,20 @@ sub assign_categories_table {
if (@cats > 0) {
my $itemcount = 0;
if (ref($cats[0]) eq 'ARRAY') {
- $output = &Apache::loncommon::start_data_table();
my @currcategories;
if ($currcat ne '') {
@currcategories = split('&',$currcat);
}
+ my $table;
for (my $i=0; $i<@{$cats[0]}; $i++) {
my $parent = $cats[0][$i];
- my $css_class = $itemcount%2?' class="LC_odd_row"':'';
next if ($parent eq 'instcode');
+ if ($type eq 'Community') {
+ next unless ($parent eq 'communities');
+ } else {
+ next if ($parent eq 'communities');
+ }
+ my $css_class = $itemcount%2?' class="LC_odd_row"':'';
my $item = &escape($parent).'::0';
my $checked = '';
if (@currcategories > 0) {
@@ -9612,18 +9786,26 @@ sub assign_categories_table {
$checked = ' checked="checked"';
}
}
- $output .= ''.
- ' '.
- ''.
+ ' '.
+ ' 
+ title='$text'>
+