version 1.956, 2010/03/18 09:00:35
|
version 1.968, 2010/05/14 18:29:52
|
Line 3687 sub submlink {
|
Line 3687 sub submlink {
|
} |
} |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
$symb=&escape($symb); |
$symb=&escape($symb); |
if ($target) { $target="target=\"$target\""; } |
if ($target) { $target=" target=\"$target\""; } |
return '<a href="/adm/grades?&command=submission&'. |
return |
'symb='.$symb.'&student='.$uname. |
'<a href="/adm/grades?command=submission'. |
'&userdom='.$udom.'" '.$target.'>'.$text.'</a>'; |
'&symb='.$symb. |
|
'&student='.$uname. |
|
'&userdom='.$udom.'"'. |
|
$target.'>'.$text.'</a>'; |
} |
} |
############################################## |
############################################## |
|
|
Line 4536 Inputs:
|
Line 4539 Inputs:
|
|
|
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value |
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value |
|
|
#SD |
|
#RC =item * $no_inline_link, if true and in remote mode, don't show the |
|
#RC 'Switch To Inline Menu' link |
|
#RC |
|
=item * $args, optional argument valid values are |
=item * $args, optional argument valid values are |
no_auto_mt_title -> prevents &mt()ing the title arg |
no_auto_mt_title -> prevents &mt()ing the title arg |
inherit_jsmath -> when creating popup window in a page, |
inherit_jsmath -> when creating popup window in a page, |
Line 4557 other decorations will be returned.
|
Line 4556 other decorations will be returned.
|
|
|
sub bodytag { |
sub bodytag { |
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg, |
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg, |
$no_nav_bar,$bgcolor,$no_inline_link,$args)=@_; |
$no_nav_bar,$bgcolor,$args)=@_; |
|
|
my $public; |
my $public; |
if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) |
if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) |
Line 4599 sub bodytag {
|
Line 4598 sub bodytag {
|
} |
} |
|
|
if (!$realm) { $realm=' '; } |
if (!$realm) { $realm=' '; } |
# Set messages |
|
my $messages=&domainlogo($domain); |
|
|
|
my $extra_body_attr = &make_attr_string($forcereg,\%design); |
my $extra_body_attr = &make_attr_string($forcereg,\%design); |
|
|
Line 4634 sub bodytag {
|
Line 4631 sub bodytag {
|
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role; |
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role; |
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); |
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); |
|
|
# No Remote |
|
if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { |
if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { |
return $bodytag; |
return $bodytag; |
} |
} |
Line 4676 sub bodytag {
|
Line 4672 sub bodytag {
|
$bodytag .= Apache::lonmenu::serverform(); |
$bodytag .= Apache::lonmenu::serverform(); |
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); |
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); |
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
$bodytag .= &Apache::lonmenu::innerregister($forcereg,'', |
$bodytag .= &Apache::lonmenu::innerregister($forcereg, |
$args->{'bread_crumbs'}); |
$args->{'bread_crumbs'}); |
} elsif ($forcereg) { |
} elsif ($forcereg) { |
$bodytag .= &Apache::lonmenu::innerregister($forcereg); |
$bodytag .= &Apache::lonmenu::innerregister($forcereg); |
Line 4795 sub standard_css {
|
Line 4791 sub standard_css {
|
my $vlink = &designparm($function.'.vlink', $domain); |
my $vlink = &designparm($function.'.vlink', $domain); |
my $link = &designparm($function.'.link', $domain); |
my $link = &designparm($function.'.link', $domain); |
|
|
my $loginbg = &designparm('login.sidebg',$domain); |
|
my $bgcol = &designparm('login.bgcol',$domain); |
|
my $textcol = &designparm('login.textcol',$domain); |
|
|
|
my $sans = 'Verdana,Arial,Helvetica,sans-serif'; |
my $sans = 'Verdana,Arial,Helvetica,sans-serif'; |
my $mono = 'monospace'; |
my $mono = 'monospace'; |
my $data_table_head = $sidebg; |
my $data_table_head = $sidebg; |
Line 4840 body {
|
Line 4832 body {
|
color:$font; |
color:$font; |
} |
} |
|
|
a:focus { |
a:focus, |
|
a:focus img { |
color: red; |
color: red; |
background: yellow; |
background: yellow; |
} |
} |
Line 5060 td.LC_table_cell_checkbox {
|
Line 5053 td.LC_table_cell_checkbox {
|
background: #F8F8F8; /* $sidebg; */ |
background: #F8F8F8; /* $sidebg; */ |
border: 1px solid $sidebg; |
border: 1px solid $sidebg; |
margin: 0 0 10px 0; |
margin: 0 0 10px 0; |
|
padding: 3px; |
} |
} |
|
|
.LC_fontsize_medium { |
.LC_fontsize_medium { |
Line 5586 table.LC_group_priv td {
|
Line 5580 table.LC_group_priv td {
|
padding: 0; |
padding: 0; |
} |
} |
|
|
table.LC_notify_front_page { |
|
background: white; |
|
border: 1px solid black; |
|
padding: 8px; |
|
} |
|
|
|
table.LC_notify_front_page td { |
|
padding: 8px; |
|
} |
|
|
|
.LC_navbuttons { |
.LC_navbuttons { |
margin: 2ex 0ex 2ex 0ex; |
margin: 2ex 0ex 2ex 0ex; |
} |
} |
Line 6029 fieldset > legend {
|
Line 6013 fieldset > legend {
|
|
|
#LC_nav_bar { |
#LC_nav_bar { |
float: left; |
float: left; |
margin: 0; |
margin: 0 0 2px 0; |
} |
} |
|
|
#LC_realm { |
#LC_realm { |
Line 6044 fieldset > legend {
|
Line 6028 fieldset > legend {
|
font-style: normal; |
font-style: normal; |
} |
} |
|
|
|
/* Preliminary fix to hide nav_bar inside bookmarks window */ |
|
#LC_bookmarks #LC_nav_bar { |
|
display:none; |
|
} |
|
|
ol.LC_primary_menu { |
ol.LC_primary_menu { |
float: right; |
float: right; |
margin: 0; |
margin: 0; |
Line 6118 ul.LC_TabContent {
|
Line 6107 ul.LC_TabContent {
|
|
|
ul.LC_TabContent li { |
ul.LC_TabContent li { |
vertical-align:middle; |
vertical-align:middle; |
padding: 0 10px 0 10px; |
padding: 0 16px 0 10px; |
background-color:$tabbg; |
background-color:$tabbg; |
border-bottom:solid 1px $lg_border_color; |
border-bottom:solid 1px $lg_border_color; |
border-right: solid 1px $font; |
border-right: solid 1px $font; |
Line 6134 ul.LC_TabContent li {
|
Line 6123 ul.LC_TabContent li {
|
text-decoration:none; |
text-decoration:none; |
font-size:95%; |
font-size:95%; |
font-weight:bold; |
font-weight:bold; |
padding-right: 16px; |
|
min-height:20px; |
min-height:20px; |
} |
} |
|
|
ul.LC_TabContent li a:hover { |
ul.LC_TabContent li a:hover, |
|
ul.LC_TabContent li a:focus { |
color: $button_hover; |
color: $button_hover; |
|
background:none; |
|
outline:none; |
} |
} |
|
|
ul.LC_TabContent li:hover { |
ul.LC_TabContent li:hover { |
Line 6154 ul.LC_TabContent li.active {
|
Line 6145 ul.LC_TabContent li.active {
|
cursor: default; |
cursor: default; |
} |
} |
|
|
|
ul.LC_TabContent li.active a { |
|
color:$font; |
|
background:#FFFFFF; |
|
outline: none; |
|
} |
#maincoursedoc { |
#maincoursedoc { |
clear:both; |
clear:both; |
} |
} |
Line 6172 ul.LC_TabContentBigger li {
|
Line 6168 ul.LC_TabContentBigger li {
|
color: #737373; |
color: #737373; |
} |
} |
|
|
|
ul.LC_TabContentBigger li.active { |
|
position: relative; |
|
top: 1px; |
|
} |
|
|
ul.LC_TabContentBigger li a { |
ul.LC_TabContentBigger li a { |
background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat; |
background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat; |
height: 30px; |
height: 30px; |
Line 6179 ul.LC_TabContentBigger li a {
|
Line 6180 ul.LC_TabContentBigger li a {
|
text-align: center; |
text-align: center; |
display: block; |
display: block; |
text-decoration: none; |
text-decoration: none; |
|
outline: none; |
} |
} |
|
|
ul.LC_TabContentBigger li.active a { |
ul.LC_TabContentBigger li.active a { |
Line 6191 ul.LC_TabContentBigger li b {
|
Line 6193 ul.LC_TabContentBigger li b {
|
display: block; |
display: block; |
float: left; |
float: left; |
padding: 0 30px; |
padding: 0 30px; |
|
border-bottom: 1px solid $lg_border_color; |
} |
} |
|
|
ul.LC_TabContentBigger li:hover b { |
ul.LC_TabContentBigger li:hover b { |
Line 6200 ul.LC_TabContentBigger li:hover b {
|
Line 6203 ul.LC_TabContentBigger li:hover b {
|
ul.LC_TabContentBigger li.active b { |
ul.LC_TabContentBigger li.active b { |
background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat; |
background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat; |
color:$font; |
color:$font; |
border-bottom: 1px solid #FFFFFF; |
border: 0; |
cursor:default; |
cursor:default; |
} |
} |
|
|
Line 6330 div.LC_columnSection>* {
|
Line 6333 div.LC_columnSection>* {
|
overflow:hidden; |
overflow:hidden; |
} |
} |
|
|
.LC_loginpage_container { |
|
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; |
|
} |
|
|
|
.LC_loginpage_loginContainer h2 { |
|
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; |
|
} |
|
|
|
.LC_loginpage_space { |
|
clear: both; |
|
margin-bottom: 20px; |
|
border-bottom: 1px solid #CCCCCC; |
|
} |
|
|
|
.LC_loginpage_floatLeft { |
|
float: left; |
|
width: 200px; |
|
margin: 0; |
|
} |
|
|
|
table em { |
table em { |
font-weight: bold; |
font-weight: bold; |
font-style: normal; |
font-style: normal; |
Line 6552 sub headtag {
|
Line 6509 sub headtag {
|
if (!$args->{'frameset'}) { |
if (!$args->{'frameset'}) { |
$result .= &Apache::lonhtmlcommon::htmlareaheaders(); |
$result .= &Apache::lonhtmlcommon::htmlareaheaders(); |
} |
} |
if ($args->{'force_register'}) { |
if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) { |
$result .= &Apache::lonmenu::registerurl(); |
$result .= Apache::lonxml::display_title(); |
} |
} |
if (!$args->{'no_nav_bar'} |
if (!$args->{'no_nav_bar'} |
&& !$args->{'only_body'} |
&& !$args->{'only_body'} |
Line 6579 ADDMETA
|
Line 6536 ADDMETA
|
$result .= '<title> LON-CAPA '.$title.'</title>' |
$result .= '<title> LON-CAPA '.$title.'</title>' |
.'<link rel="stylesheet" type="text/css" href="'.$url.'" />' |
.'<link rel="stylesheet" type="text/css" href="'.$url.'" />' |
.$head_extra; |
.$head_extra; |
return $result; |
return $result.'</head>'; |
} |
} |
|
|
=pod |
=pod |
Line 6636 sub xml_begin {
|
Line 6593 sub xml_begin {
|
|
|
=pod |
=pod |
|
|
=item * &endheadtag() |
|
|
|
Returns a uniform </head> for LON-CAPA web pages. |
|
|
|
Inputs: none |
|
|
|
=cut |
|
|
|
sub endheadtag { |
|
return '</head>'; |
|
} |
|
|
|
=pod |
|
|
|
=item * &head() |
|
|
|
Returns a uniform complete <head>..</head> section for LON-CAPA web pages. |
|
|
|
Inputs: |
|
|
|
=over 4 |
|
|
|
$title - optional title for the page |
|
|
|
$head_extra - optional extra HTML to put inside the <head> |
|
|
|
=back |
|
|
|
=cut |
|
|
|
sub head { |
|
my ($title,$head_extra,$args) = @_; |
|
return &headtag($title,$head_extra,$args).&endheadtag(); |
|
} |
|
|
|
=pod |
|
|
|
=item * &start_page() |
=item * &start_page() |
|
|
Returns a complete <html> .. <body> section for LON-CAPA web pages. |
Returns a complete <html> .. <body> section for LON-CAPA web pages. |
Line 6710 $args - additional optional args support
|
Line 6630 $args - additional optional args support
|
skip_phases -> hash ref of |
skip_phases -> hash ref of |
head -> skip the <html><head> generation |
head -> skip the <html><head> generation |
body -> skip all <body> generation |
body -> skip all <body> generation |
#RC no_inline_link -> if true and in remote mode, don't show the |
|
#RC 'Switch To Inline Menu' link |
|
no_auto_mt_title -> prevent &mt()ing the title arg |
no_auto_mt_title -> prevent &mt()ing the title arg |
inherit_jsmath -> when creating popup window in a page, |
inherit_jsmath -> when creating popup window in a page, |
should it have jsmath forced on by the |
should it have jsmath forced on by the |
Line 6728 $args - additional optional args support
|
Line 6646 $args - additional optional args support
|
sub start_page { |
sub start_page { |
my ($title,$head_extra,$args) = @_; |
my ($title,$head_extra,$args) = @_; |
#&Apache::lonnet::logthis("start_page ".join(':',caller(0))); |
#&Apache::lonnet::logthis("start_page ".join(':',caller(0))); |
|
#SD |
|
#I don't see why we copy certain elements of %$args to %head_args |
|
#head args is passed to headtag() and this routine only reads those |
|
#keys that are needed. There doesn't happen any writes or any processing |
|
#of other keys. |
|
#proposal: just pass $args to headtag instead of \%head_args and delete |
|
#marked lines |
|
#<- MARK |
my %head_args; |
my %head_args; |
foreach my $arg ('redirect','force_register','domain','function', |
foreach my $arg ('redirect','force_register','domain','function', |
'bgcolor','frameset','no_nav_bar','only_body', |
'bgcolor','frameset','no_nav_bar','only_body', |
Line 6736 sub start_page {
|
Line 6662 sub start_page {
|
$head_args{$arg} = $args->{$arg}; |
$head_args{$arg} = $args->{$arg}; |
} |
} |
} |
} |
|
#MARK -> |
|
|
$env{'internal.start_page'}++; |
$env{'internal.start_page'}++; |
my $result; |
my $result; |
|
|
if (! exists($args->{'skip_phases'}{'head'}) ) { |
if (! exists($args->{'skip_phases'}{'head'}) ) { |
$result.= |
$result .= |
&xml_begin(). |
&xml_begin() . &headtag($title,$head_extra,\%head_args); |
&headtag($title,$head_extra,\%head_args).&endheadtag(); |
#replace prev line by |
|
# &xml_begin() . &headtag($title, $head_extra, $args); |
} |
} |
|
|
if (! exists($args->{'skip_phases'}{'body'}) ) { |
if (! exists($args->{'skip_phases'}{'body'}) ) { |
Line 6756 sub start_page {
|
Line 6685 sub start_page {
|
$args->{'function'}, $args->{'add_entries'}, |
$args->{'function'}, $args->{'add_entries'}, |
$args->{'only_body'}, $args->{'domain'}, |
$args->{'only_body'}, $args->{'domain'}, |
$args->{'force_register'}, $args->{'no_nav_bar'}, |
$args->{'force_register'}, $args->{'no_nav_bar'}, |
$args->{'bgcolor'}, $args->{'no_inline_link'}, |
$args->{'bgcolor'}, $args); |
$args); |
|
} |
} |
} |
} |
|
|
Line 6773 sub start_page {
|
Line 6701 sub start_page {
|
# $result .= &build_functionlist(); |
# $result .= &build_functionlist(); |
#} |
#} |
|
|
# Don't add anything more if only_body wanted |
# Don't add anything more if only_body wanted or in const space |
return $result if $args->{'only_body'}; |
return $result if $args->{'only_body'} |
|
|| $env{'request.state'} eq 'construct'; |
|
|
#Breadcrumbs for Construction Space provided by &bodytag. |
|
if ( |
|
$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 6802 sub start_page {
|
Line 6725 sub start_page {
|
return $result; |
return $result; |
} |
} |
|
|
|
|
=pod |
|
|
|
=item * &head() |
|
|
|
Returns a complete </body></html> section for LON-CAPA web pages. |
|
|
|
Inputs: $args - additional optional args supported are: |
|
js_ready -> return a string ready for being used in |
|
a javascript writeln |
|
html_encode -> return a string ready for being used in |
|
a html attribute |
|
frameset -> if true will start with a <frameset> |
|
rather than <body> |
|
dicsussion -> if true will get discussion from |
|
lonxml::xmlend |
|
(you can pass the target and parser arguments |
|
through optional 'target' and 'parser' args |
|
to this routine) |
|
|
|
=cut |
|
|
|
sub end_page { |
sub end_page { |
my ($args) = @_; |
my ($args) = @_; |
$env{'internal.end_page'}++; |
$env{'internal.end_page'}++; |
Line 6913 sub simple_error_page {
|
Line 6814 sub simple_error_page {
|
|
|
{ |
{ |
my @row_count; |
my @row_count; |
|
|
|
sub start_data_table_count { |
|
unshift(@row_count, 0); |
|
return; |
|
} |
|
|
|
sub end_data_table_count { |
|
shift(@row_count); |
|
return; |
|
} |
|
|
sub start_data_table { |
sub start_data_table { |
my ($add_class) = @_; |
my ($add_class) = @_; |
my $css_class = (join(' ','LC_data_table',$add_class)); |
my $css_class = (join(' ','LC_data_table',$add_class)); |
unshift(@row_count,0); |
&start_data_table_count(); |
return '<table class="'.$css_class.'">'."\n"; |
return '<table class="'.$css_class.'">'."\n"; |
} |
} |
|
|
sub end_data_table { |
sub end_data_table { |
shift(@row_count); |
&end_data_table_count(); |
return '</table>'."\n";; |
return '</table>'."\n";; |
} |
} |
|
|
Line 10459 sub construct_course {
|
Line 10371 sub construct_course {
|
$title=&mt('Syllabus'); |
$title=&mt('Syllabus'); |
$url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus'; |
$url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus'; |
} else { |
} else { |
$title=&mt('Navigate Contents'); |
$title=&mt('Table of Contents'); |
$url='/adm/navmaps'; |
$url='/adm/navmaps'; |
} |
} |
|
|