version 1.914, 2009/11/14 04:03:00
|
version 1.920, 2009/11/30 21:29:47
|
Line 4503 sub bodytag {
|
Line 4503 sub bodytag {
|
$env{'course.'.$env{'request.course.id'}. |
$env{'course.'.$env{'request.course.id'}. |
'.domain'}.'/'})) { |
'.domain'}.'/'})) { |
my $cid = $env{'request.course.id'}; |
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 =~ s/\s+$//; |
$dc_info = '('.$dc_info.')'; |
|
} |
} |
|
|
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role; |
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role; |
Line 4513 sub bodytag {
|
Line 4512 sub bodytag {
|
|
|
if ($env{'environment.remote'} eq 'off') { |
if ($env{'environment.remote'} eq 'off') { |
# No Remote |
# No Remote |
if ($no_nav_bar) { return $bodytag; } |
if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { |
|
return $bodytag; |
|
} |
|
|
if ($env{'request.state'} eq 'construct') { $forcereg=1; } |
if ($env{'request.state'} eq 'construct') { $forcereg=1; } |
|
|
Line 4521 sub bodytag {
|
Line 4522 sub bodytag {
|
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls |
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls |
# } |
# } |
|
|
$bodytag .= qq|<div id="LC_nav_bar">$name $role<br /> |
|
<em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'}; |
|
|
|
if ( $env{'form.inhibitmenu'} eq 'yes' |
|
|| $ENV{'REQUEST_URI'} eq '/adm/logout' |
|
|| $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { |
|
|
|
|
if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { |
|
if ($dc_info) { |
|
$dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|; |
|
} |
|
$bodytag .= qq|<div id="LC_nav_bar">$name $role<br /> |
|
<em>$realm</em> $dc_info</div>|; |
return $bodytag; |
return $bodytag; |
} |
} |
|
|
|
$bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|; |
|
|
$bodytag .= Apache::lonhtmlcommon::scripttag( |
$bodytag .= Apache::lonhtmlcommon::scripttag( |
Apache::lonmenu::utilityfunctions(), 'start'); |
Apache::lonmenu::utilityfunctions(), 'start'); |
|
|
$bodytag .= Apache::lonmenu::primary_menu(); |
$bodytag .= Apache::lonmenu::primary_menu(); |
|
|
|
if ($dc_info) { |
|
$dc_info = &dc_courseid_toggle($dc_info); |
|
} |
|
$bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|; |
|
|
#don't show menus for public users |
#don't show menus for public users |
if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){ |
if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){ |
$bodytag .= Apache::lonmenu::secondary_menu(); |
$bodytag .= Apache::lonmenu::secondary_menu(); |
$bodytag .= Apache::lonmenu::serverform(); |
$bodytag .= Apache::lonmenu::serverform(); |
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); |
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); |
$bodytag .= Apache::lonmenu::innerregister($forcereg) if $forcereg; |
if ($env{'request.state'} eq 'construct') { |
|
$bodytag .= &Apache::lonmenu::innerregister($forcereg,'', |
|
$args->{'bread_crumbs'}); |
|
} elsif ($forcereg) { |
|
$bodytag .= &Apache::lonmenu::innerregister($forcereg); |
|
} |
}else{ |
}else{ |
# this is to seperate menu from content when there's no secondary |
# this is to seperate menu from content when there's no secondary |
# menu. Especially needed for public accessible ressources. |
# menu. Especially needed for public accessible ressources. |
Line 4567 sub bodytag {
|
Line 4581 sub bodytag {
|
# Explicit link to get inline menu |
# Explicit link to get inline menu |
my $menu= ($no_inline_link?'' |
my $menu= ($no_inline_link?'' |
:'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>'); |
:'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>'); |
$bodytag .= qq|<div id="LC_nav_bar">$name $role |
|
<em>$realm</em> $dc_info </div> |
if ($dc_info) { |
|
$dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|; |
|
} |
|
|
|
$bodytag .= qq|<div id="LC_nav_bar">$name $role</div> |
<ol class="LC_primary_menu LC_right"> |
<ol class="LC_primary_menu LC_right"> |
<li>$menu</li> |
<li>$menu</li> |
</ol>| unless $env{'form.inhibitmenu'}; |
</ol><div id="LC_realm"> $realm $dc_info</div>| unless $env{'form.inhibitmenu'}; |
# |
|
return(<<ENDBODY); |
return(<<ENDBODY); |
$bodytag |
$bodytag |
<table id="LC_title_bar" class="LC_with_remote"> |
<table id="LC_title_bar" class="LC_with_remote"> |
Line 4585 $bodytag
|
Line 4602 $bodytag
|
ENDBODY |
ENDBODY |
} |
} |
|
|
|
sub dc_courseid_toggle { |
|
my ($dc_info) = @_; |
|
return ' <span id="dccidtext" class="LC_cusr_subheading">'. |
|
'<a href="javascript:showCourseID();">'. |
|
&mt('(More ...)').'</a></span>'. |
|
'<div id="dccid" class="LC_dccid">'.$dc_info.'</div>'; |
|
} |
|
|
sub make_attr_string { |
sub make_attr_string { |
my ($register,$attr_ref) = @_; |
my ($register,$attr_ref) = @_; |
|
|
Line 4994 table#LC_mainmenu td.LC_mainmenu_column
|
Line 5019 table#LC_mainmenu td.LC_mainmenu_column
|
background: $sidebg; |
background: $sidebg; |
border-bottom: 1px solid $lg_border_color; |
border-bottom: 1px solid $lg_border_color; |
line-height: 2.5em; |
line-height: 2.5em; |
/* SD working here |
/* SD working here |
height: 2.5em; |
height: 2.5em; |
overflow: hidden; */ |
overflow: hidden; */ |
margin: 0; |
margin: 0; |
padding: 0; |
padding: 0; |
} |
} |
Line 5009 table#LC_mainmenu td.LC_mainmenu_column
|
Line 5034 table#LC_mainmenu td.LC_mainmenu_column
|
#LC_head_subbox { |
#LC_head_subbox { |
clear:both; |
clear:both; |
background: #F8F8F8; /* $sidebg; */ |
background: #F8F8F8; /* $sidebg; */ |
border-bottom: 1px solid $lg_border_color; |
border: 1px solid $sidebg; |
margin: 0 0 10px 0; |
margin: 0 0 10px 0; |
padding: 5px; |
|
} |
} |
|
|
.LC_fontsize_medium { |
.LC_fontsize_medium { |
Line 5208 table.LC_createuser tr.LC_info_row td {
|
Line 5232 table.LC_createuser tr.LC_info_row td {
|
table.LC_calendar { |
table.LC_calendar { |
border: 1px solid #000000; |
border: 1px solid #000000; |
border-collapse: collapse; |
border-collapse: collapse; |
|
width: 98%; |
} |
} |
|
|
table.LC_calendar_pickdate { |
table.LC_calendar_pickdate { |
Line 5217 table.LC_calendar_pickdate {
|
Line 5242 table.LC_calendar_pickdate {
|
table.LC_calendar tr td { |
table.LC_calendar tr td { |
border: 1px solid #000000; |
border: 1px solid #000000; |
vertical-align: top; |
vertical-align: top; |
|
width: 14%; |
} |
} |
|
|
table.LC_calendar tr td.LC_calendar_day_empty { |
table.LC_calendar tr td.LC_calendar_day_empty { |
Line 5520 table.LC_notify_front_page td {
|
Line 5546 table.LC_notify_front_page td {
|
|
|
.LC_topic_bar { |
.LC_topic_bar { |
font-weight: bold; |
font-weight: bold; |
width: 100%; |
|
background: $tabbg; |
background: $tabbg; |
vertical-align: middle; |
margin: 1em 0em 1em 2em; |
margin: 2ex 0ex 2ex 0ex; |
|
padding: 3px; |
padding: 3px; |
|
font-size: 1.2em; |
} |
} |
|
|
.LC_topic_bar span { |
.LC_topic_bar span { |
|
left: 0.5em; |
|
position: absolute; |
vertical-align: middle; |
vertical-align: middle; |
|
font-size: 1.2em; |
} |
} |
|
|
.LC_topic_bar img { |
.LC_topic_bar img { |
Line 5914 div.LC_createcourse {
|
Line 5942 div.LC_createcourse {
|
margin: 10px 10px 10px 10px; |
margin: 10px 10px 10px 10px; |
} |
} |
|
|
|
.LC_dccid { |
|
margin: 0.2em 0 0 0; |
|
padding: 0; |
|
font-size: 90%; |
|
display:none; |
|
} |
|
|
/* ---- Remove when done ---- |
/* ---- Remove when done ---- |
# The following styles is part of the redesign of LON-CAPA and are |
# The following styles is part of the redesign of LON-CAPA and are |
# subject to change during this project. |
# subject to change during this project. |
Line 5961 h6 {
|
Line 5996 h6 {
|
|
|
.LC_noBorder { |
.LC_noBorder { |
border: 0; |
border: 0; |
vertical-align: middle; |
|
} |
} |
|
|
.LC_Right { |
.LC_Right { |
Line 6005 fieldset > legend {
|
Line 6039 fieldset > legend {
|
margin: 0.2em 0 0 0; |
margin: 0.2em 0 0 0; |
} |
} |
|
|
|
#LC_realm { |
|
margin: 0.2em 0 0 0; |
|
padding: 0; |
|
font-weight: bold; |
|
text-align: center; |
|
} |
|
|
#LC_nav_bar em { |
#LC_nav_bar em { |
font-weight: bold; |
font-weight: bold; |
font-style: normal; |
font-style: normal; |
Line 6169 ol#LC_PathBreadcrumbs {
|
Line 6210 ol#LC_PathBreadcrumbs {
|
padding-left: 10px; |
padding-left: 10px; |
margin: 0; |
margin: 0; |
list-style-position: inside; |
list-style-position: inside; |
/* SD working here |
/* SD working here |
white-space: nowrap; */ |
white-space: nowrap; */ |
} |
} |
|
|
Line 6178 ol#LC_PathBreadcrumbs li,
|
Line 6219 ol#LC_PathBreadcrumbs li,
|
ul.LC_CourseBreadcrumbs li { |
ul.LC_CourseBreadcrumbs li { |
display: inline; |
display: inline; |
white-space: nowrap; |
white-space: nowrap; |
/* SD working here |
/* SD working here |
white-space: normal; */ |
white-space: normal; */ |
} |
} |
|
|
ol#LC_MenuBreadcrumbs li a, |
ol#LC_MenuBreadcrumbs li a, |
Line 6433 a.LC_toolbarItem {
|
Line 6474 a.LC_toolbarItem {
|
background-color:transparent; |
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 { |
ul.LC_funclist li { |
float: left; |
display: inline; |
white-space: nowrap; |
white-space: nowrap; |
height: 35px; /* at least as high as heighest list item */ |
margin: 0 0 0 25px; |
margin: 0 15px 15px 10px; |
line-height: 150%; |
} |
} |
|
|
|
|
Line 6716 sub start_page {
|
Line 6775 sub start_page {
|
# Don't add anything more if only_body wanted |
# Don't add anything more if only_body wanted |
return $result if $args->{'only_body'}; |
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 |
#Breadcrumbs |
if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) { |
if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) { |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
Line 9594 sub extract_categories {
|
Line 9658 sub extract_categories {
|
my $trailstr; |
my $trailstr; |
if ($name eq 'instcode') { |
if ($name eq 'instcode') { |
$trailstr = &mt('Official courses (with institutional codes)'); |
$trailstr = &mt('Official courses (with institutional codes)'); |
|
} elsif ($name eq 'communities') { |
|
$trailstr = &mt('Communities'); |
} else { |
} else { |
$trailstr = $name; |
$trailstr = $name; |
} |
} |
Line 9706 cathash - reference to hash of categorie
|
Line 9772 cathash - reference to hash of categorie
|
|
|
currcat - scalar with an & separated list of categories assigned to a course. |
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) |
Returns: $output (markup to be displayed) |
|
|
=cut |
=cut |
|
|
sub assign_categories_table { |
sub assign_categories_table { |
my ($cathash,$currcat) = @_; |
my ($cathash,$currcat,$type) = @_; |
my $output; |
my $output; |
if (ref($cathash) eq 'HASH') { |
if (ref($cathash) eq 'HASH') { |
my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth); |
my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth); |
Line 9720 sub assign_categories_table {
|
Line 9788 sub assign_categories_table {
|
if (@cats > 0) { |
if (@cats > 0) { |
my $itemcount = 0; |
my $itemcount = 0; |
if (ref($cats[0]) eq 'ARRAY') { |
if (ref($cats[0]) eq 'ARRAY') { |
$output = &Apache::loncommon::start_data_table(); |
|
my @currcategories; |
my @currcategories; |
if ($currcat ne '') { |
if ($currcat ne '') { |
@currcategories = split('&',$currcat); |
@currcategories = split('&',$currcat); |
} |
} |
|
my $table; |
for (my $i=0; $i<@{$cats[0]}; $i++) { |
for (my $i=0; $i<@{$cats[0]}; $i++) { |
my $parent = $cats[0][$i]; |
my $parent = $cats[0][$i]; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
next if ($parent eq 'instcode'); |
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 $item = &escape($parent).'::0'; |
my $checked = ''; |
my $checked = ''; |
if (@currcategories > 0) { |
if (@currcategories > 0) { |
Line 9736 sub assign_categories_table {
|
Line 9809 sub assign_categories_table {
|
$checked = ' checked="checked"'; |
$checked = ' checked="checked"'; |
} |
} |
} |
} |
$output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'. |
my $parent_title = $parent; |
'<input type="checkbox" name="usecategory" value="'. |
if ($parent eq 'communities') { |
$item.'"'.$checked.' />'.$parent.'</span>'. |
$parent_title = &mt('Communities'); |
'<input type="hidden" name="catname" value="'.$parent.'" /></td>'; |
} |
|
$table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'. |
|
'<input type="checkbox" name="usecategory" value="'. |
|
$item.'"'.$checked.' />'.$parent_title.'</span>'. |
|
'<input type="hidden" name="catname" value="'.$parent.'" /></td>'; |
my $depth = 1; |
my $depth = 1; |
push(@path,$parent); |
push(@path,$parent); |
$output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories); |
$table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories); |
pop(@path); |
pop(@path); |
$output .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>'; |
$table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
$output .= &Apache::loncommon::end_data_table(); |
if ($itemcount) { |
|
$output = &Apache::loncommon::start_data_table(). |
|
$table. |
|
&Apache::loncommon::end_data_table(); |
|
} |
} |
} |
} |
} |
} |
} |