version 1.887, 2009/08/28 22:47:07
|
version 1.900, 2009/10/22 13:13:12
|
Line 493 sub coursebrowser_javascript {
|
Line 493 sub coursebrowser_javascript {
|
$output .= <<"ENDSTDBRW"; |
$output .= <<"ENDSTDBRW"; |
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { |
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { |
var url = '/adm/pickcourse?'; |
var url = '/adm/pickcourse?'; |
|
var formid = getFormIdByName(formname); |
var domainfilter = getDomainFromSelectbox(formname,udom); |
var domainfilter = getDomainFromSelectbox(formname,udom); |
if (domainfilter != null) { |
if (domainfilter != null) { |
if (domainfilter != '') { |
if (domainfilter != '') { |
Line 602 sub userbrowser_javascript {
|
Line 603 sub userbrowser_javascript {
|
my $id_functions = &javascript_index_functions(); |
my $id_functions = &javascript_index_functions(); |
return <<"ENDUSERBRW"; |
return <<"ENDUSERBRW"; |
|
|
function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom) { |
function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom,caller) { |
var url = '/adm/pickuser?'; |
var url = '/adm/pickuser?'; |
var userdom = getDomainFromSelectbox(formname,udom); |
var userdom = getDomainFromSelectbox(formname,udom); |
if (userdom != null) { |
if (userdom != null) { |
Line 617 function openuserbrowser(formname,uname,
|
Line 618 function openuserbrowser(formname,uname,
|
'&uemailelement='+uemail+ |
'&uemailelement='+uemail+ |
'&hideudomelement='+hideudom+ |
'&hideudomelement='+hideudom+ |
'&coursedom='+crsdom; |
'&coursedom='+crsdom; |
|
if ((caller != null) && (caller != undefined)) { |
|
url += '&caller='+caller; |
|
} |
var title = 'User_Browser'; |
var title = 'User_Browser'; |
var options = 'scrollbars=1,resizable=1,menubar=0'; |
var options = 'scrollbars=1,resizable=1,menubar=0'; |
options += ',width=700,height=600'; |
options += ',width=700,height=600'; |
Line 624 function openuserbrowser(formname,uname,
|
Line 628 function openuserbrowser(formname,uname,
|
stdeditbrowser.focus(); |
stdeditbrowser.focus(); |
} |
} |
|
|
function fix_domain (formname,udom,origdom) { |
function fix_domain (formname,udom,origdom,uname) { |
var formid = getFormIdByName(formname); |
var formid = getFormIdByName(formname); |
if (formid > -1) { |
if (formid > -1) { |
|
var unameid = getIndexByName(formid,uname); |
var domid = getIndexByName(formid,udom); |
var domid = getIndexByName(formid,udom); |
var hidedomid = getIndexByName(formid,origdom); |
var hidedomid = getIndexByName(formid,origdom); |
if (hidedomid > -1) { |
if (hidedomid > -1) { |
var fixeddom = document.forms[formid].elements[hidedomid].value; |
var fixeddom = document.forms[formid].elements[hidedomid].value; |
if (domid > -1) { |
var unameval = document.forms[formid].elements[unameid].value; |
var slct = document.forms[formid].elements[domid]; |
if ((fixeddom != '') && (fixeddom != undefined) && (fixeddom != null) && (unameval != '') && (unameval != undefined) && (unameval != null)) { |
if (slct.type == 'select-one') { |
if (domid > -1) { |
var i; |
var slct = document.forms[formid].elements[domid]; |
for (i=0;i<slct.length;i++) { |
if (slct.type == 'select-one') { |
if (slct.options[i].value==fixeddom) { slct.selectedIndex=i; } |
var i; |
|
for (i=0;i<slct.length;i++) { |
|
if (slct.options[i].value==fixeddom) { slct.selectedIndex=i; } |
|
} |
|
} |
|
if (slct.type == 'hidden') { |
|
slct.value = fixeddom; |
} |
} |
} |
|
if (slct.type == 'hidden') { |
|
slct.value = fixeddom; |
|
} |
} |
} |
} |
} |
} |
Line 715 sub selectauthor_link {
|
Line 723 sub selectauthor_link {
|
|
|
sub selectuser_link { |
sub selectuser_link { |
my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem, |
my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem, |
$coursedom,$linktext) = @_; |
$coursedom,$linktext,$caller) = @_; |
return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',". |
return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',". |
"'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom'". |
"'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom','$caller'". |
');">'.$linktext.'</a>'; |
');">'.$linktext.'</a>'; |
} |
} |
|
|
Line 2947 sub messagewrapper {
|
Line 2955 sub messagewrapper {
|
sub noteswrapper { |
sub noteswrapper { |
my ($link,$un,$do)=@_; |
my ($link,$un,$do)=@_; |
return |
return |
"<a href='/adm/email?recordftf=retrieve&recname=$un&recdom=$do'>$link</a>"; |
"<a href='/adm/email?recordftf=retrieve&recname=$un&recdom=$do'>$link</a>"; |
} |
} |
|
|
# ------------------------------------------------------------- Aboutme Wrapper |
# ------------------------------------------------------------- Aboutme Wrapper |
Line 2957 sub aboutmewrapper {
|
Line 2965 sub aboutmewrapper {
|
if (!defined($username) && !defined($domain)) { |
if (!defined($username) && !defined($domain)) { |
return; |
return; |
} |
} |
return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'. |
return '<a href="/adm/'.$domain.'/'.$username.'/aboutme?forcestudent=1"'. |
($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>'; |
($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>'; |
} |
} |
|
|
Line 3918 sub parse_block_record {
|
Line 3926 sub parse_block_record {
|
} |
} |
|
|
sub blocking_status { |
sub blocking_status { |
my $blocked; |
|
my ($activity,$uname,$udom) = @_; |
my ($activity,$uname,$udom) = @_; |
my %setters; |
my %setters; |
|
|
|
# check for active blocking |
my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom); |
my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom); |
if ($startblock && $endblock) { |
|
$blocked = 1; |
|
} |
|
if(!wantarray) { |
|
return $blocked; |
|
} |
|
my $output; |
|
my $querystring; |
|
$querystring = "?activity=$activity"; |
|
|
|
$output .= <<"END_MYBLOCK"; |
my $blocked = $startblock && $endblock ? 1 : 0; |
<script type="text/javascript"> |
|
// <![CDATA[ |
# caller just wants to know whether a block is active |
|
if (!wantarray) { return $blocked; } |
|
|
|
# build a link to a popup window containing the details |
|
my $querystring = "?activity=$activity"; |
|
# $uname and $udom decide whose portfolio the user is trying to look at |
|
$querystring .= "&udom=$udom" if $udom; |
|
$querystring .= "&uname=$uname" if $uname; |
|
|
|
my $output .= <<'END_MYBLOCK'; |
function openWindow(url, wdwName, w, h, toolbar,scrollbar) { |
function openWindow(url, wdwName, w, h, toolbar,scrollbar) { |
var options = "width=" + w + ",height=" + h + ","; |
var options = "width=" + w + ",height=" + h + ","; |
options += "resizable=yes,scrollbars="+scrollbar+",status=no,"; |
options += "resizable=yes,scrollbars="+scrollbar+",status=no,"; |
Line 3942 sub blocking_status {
|
Line 3951 sub blocking_status {
|
var newWin = window.open(url, wdwName, options); |
var newWin = window.open(url, wdwName, options); |
newWin.focus(); |
newWin.focus(); |
} |
} |
|
|
// ]]> |
|
</script> |
|
END_MYBLOCK |
END_MYBLOCK |
|
|
|
$output = Apache::lonhtmlcommon::scripttag($output); |
|
|
my $popupUrl = "/adm/blockingstatus/$querystring"; |
my $popupUrl = "/adm/blockingstatus/$querystring"; |
|
my $text = mt('Communication Blocked'); |
|
|
$output .= <<"END_BLOCK"; |
$output .= <<"END_BLOCK"; |
<div class='LC_comblock'> |
<div class='LC_comblock'> |
<a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring' |
<a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring' |
title='Communication Blocked'> |
title='$text'> |
<img class='LC_noBorder LC_middle' title='Communication Blocked' src='/res/adm/pages/comblock.png' alt='Communication Blocked'/></a> |
<img class='LC_noBorder LC_middle' title='$text' src='/res/adm/pages/comblock.png' alt='$text'/></a> |
<a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring' |
<a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring' |
title='Communication Blocked'>Communication Blocked</a> |
title='$text'>$text</a> |
</div> |
</div> |
|
|
END_BLOCK |
END_BLOCK |
Line 4036 sub determinedomain {
|
Line 4047 sub determinedomain {
|
my $domain=shift; |
my $domain=shift; |
if (! $domain) { |
if (! $domain) { |
# Determine domain if we have not been given one |
# 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{'user.domain'}) { $domain=$env{'user.domain'}; } |
if ($env{'request.role.domain'}) { |
if ($env{'request.role.domain'}) { |
$domain=$env{'request.role.domain'}; |
$domain=$env{'request.role.domain'}; |
Line 4386 sub bodytag {
|
Line 4397 sub bodytag {
|
if ($env{'request.role'} !~ /^cr/) { |
if ($env{'request.role'} !~ /^cr/) { |
$role = &Apache::lonnet::plaintext($role,&course_type()); |
$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'}; |
$realm = $env{'course.'.$env{'request.course.id'}.'.description'}; |
} else { |
} else { |
$role = &Apache::lonnet::plaintext($role); |
$role = &Apache::lonnet::plaintext($role); |
Line 4425 sub bodytag {
|
Line 4439 sub bodytag {
|
$dc_info = '('.$dc_info.')'; |
$dc_info = '('.$dc_info.')'; |
} |
} |
|
|
$role = "($role)" 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']); |
|
|
if ($env{'environment.remote'} eq 'off') { |
if ($env{'environment.remote'} eq 'off') { |
# No Remote |
# No Remote |
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
$forcereg=1; |
$forcereg=1; |
} |
} |
|
|
# if ($env{'request.state'} eq 'construct') { |
# if ($env{'request.state'} eq 'construct') { |
# $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 |
# } |
# } |
|
|
my $titletable = '<table id="LC_title_bar">' |
my $titletable = '<table id="LC_title_bar">' |
."<tr><td> $titleinfo $dc_info</td>" |
."<tr><td> $titleinfo $dc_info</td>" |
.'</tr></table>'; |
.'</tr></table>'; |
|
|
if ($no_nav_bar) { |
if ($no_nav_bar) { |
$bodytag .= $titletable; |
$bodytag .= $titletable; |
} else { |
} else { |
$bodytag .= qq|<div id="LC_nav_bar">$name $role<br /> |
$bodytag .= qq|<div id="LC_nav_bar">$name $role<br /> |
<em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'}; |
<em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'}; |
|
|
if ($env{'request.state'} eq 'construct') { |
#SD $titletable is obsolete |
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$titletable); |
#SD if ($env{'request.state'} eq 'construct') { |
} else { |
#SD $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$titletable); |
$bodytag .= &Apache::lonmenu::menubuttons($forcereg).$titletable; |
#SD } else { |
} |
#SD $bodytag .= &Apache::lonmenu::menubuttons($forcereg).$titletable; |
|
#SD } |
|
if ( $env{'form.inhibitmenu'} eq 'yes' |
|
|| $ENV{'REQUEST_URI'} eq '/adm/logout' |
|
|| $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { |
|
|
|
return $bodytag; |
|
} |
|
|
|
$bodytag .= Apache::lonhtmlcommon::scripttag( |
|
Apache::lonmenu::utilityfunctions(), |
|
'start'); |
|
$bodytag .= Apache::lonmenu::primary_menu(); |
|
$bodytag .= Apache::lonmenu::secondary_menu(); |
|
#SD remove next line |
|
#$bodytag .= Apache::lonmenu::menubuttons($forcereg); |
|
$bodytag .= Apache::lonmenu::serverform(); |
|
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); |
|
$bodytag .= Apache::lonmenu::innerregister($forcereg) if $forcereg; |
} |
} |
return $bodytag; |
return $bodytag; |
} |
} |
Line 4472 sub bodytag {
|
Line 4504 sub bodytag {
|
:'<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 |
$bodytag .= qq|<div id="LC_nav_bar">$name $role |
<em>$realm</em> $dc_info </div> |
<em>$realm</em> $dc_info </div> |
<ol class="LC_smallMenu LC_right"> |
<ol class="LC_primary_menu LC_right"> |
<li>$menu</li> |
<li>$menu</li> |
</ol>| unless $env{'form.inhibitmenu'}; |
</ol>| unless $env{'form.inhibitmenu'}; |
# |
# |
Line 4643 a:focus {
|
Line 4675 a:focus {
|
background: yellow |
background: yellow |
} |
} |
|
|
hr { |
|
clear: both; |
|
color: $tabbg; |
|
background-color: $tabbg; |
|
height: 3px; |
|
border: none; |
|
} |
|
|
|
form, .inline { |
form, .inline { |
display: inline; |
display: inline; |
} |
} |
Line 4969 table.LC_data_table tr.LC_odd_row > td,
|
Line 4993 table.LC_data_table tr.LC_odd_row > td,
|
table.LC_pick_box tr > td.LC_odd_row { |
table.LC_pick_box tr > td.LC_odd_row { |
background-color: $data_table_light; |
background-color: $data_table_light; |
padding: 2px; |
padding: 2px; |
|
vertical-align: top; |
} |
} |
|
|
table.LC_data_table tr.LC_even_row > td, |
table.LC_data_table tr.LC_even_row > td, |
table.LC_pick_box tr > td.LC_even_row { |
table.LC_pick_box tr > td.LC_even_row { |
background-color: $data_table_dark; |
background-color: $data_table_dark; |
padding: 2px; |
padding: 2px; |
|
vertical-align: top; |
} |
} |
|
|
table.LC_data_table tr.LC_data_table_highlight td { |
table.LC_data_table tr.LC_data_table_highlight td { |
Line 4995 table.LC_nested tr.LC_empty_row td {
|
Line 5021 table.LC_nested tr.LC_empty_row td {
|
padding: 8px; |
padding: 8px; |
} |
} |
|
|
|
table.LC_caption { |
|
} |
|
|
table.LC_nested tr.LC_empty_row td { |
table.LC_nested tr.LC_empty_row td { |
padding: 4ex |
padding: 4ex |
} |
} |
Line 5118 table.LC_mail_list tr.LC_mail_other:hove
|
Line 5147 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, |
table.LC_data_table tr > td.LC_browser_file_published { |
table.LC_data_table tr > td.LC_browser_file_published { |
background: #CCFF88; |
background: #AAEE77; |
} |
} |
|
|
table.LC_data_table tr > td.LC_browser_file_locked, |
table.LC_data_table tr > td.LC_browser_file_locked, |
Line 5127 table.LC_data_table tr > td.LC_browser_f
|
Line 5156 table.LC_data_table tr > td.LC_browser_f
|
} |
} |
|
|
table.LC_data_table tr > td.LC_browser_file_obsolete { |
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_modified, |
table.LC_data_table tr > td.LC_browser_file_metamodified { |
table.LC_data_table tr > td.LC_browser_file_metamodified { |
background: #FFFF77; |
background: #F8F866; |
} |
} |
|
|
table.LC_data_table tr.LC_browser_folder > td { |
table.LC_data_table tr.LC_browser_folder > td { |
background: #CCCCFF; |
background: #E0E8FF; |
} |
} |
|
|
table.LC_data_table tr > td.LC_roles_is { |
table.LC_data_table tr > td.LC_roles_is { |
Line 5278 table.LC_pick_box {
|
Line 5307 table.LC_pick_box {
|
table.LC_pick_box td.LC_pick_box_title { |
table.LC_pick_box td.LC_pick_box_title { |
background: $sidebg; |
background: $sidebg; |
font-weight: bold; |
font-weight: bold; |
text-align: right; |
text-align: left; |
vertical-align: top; |
vertical-align: top; |
width: 184px; |
width: 184px; |
padding: 8px; |
padding: 8px; |
Line 5806 div.LC_createcourse {
|
Line 5835 div.LC_createcourse {
|
# --------------------------*/ |
# --------------------------*/ |
|
|
a:hover, |
a:hover, |
ol.LC_smallMenu a:hover, |
ol.LC_primary_menu a:hover, |
ol#LC_MenuBreadcrumbs a:hover, |
ol#LC_MenuBreadcrumbs a:hover, |
ol#LC_PathBreadcrumbs a:hover, |
ol#LC_PathBreadcrumbs a:hover, |
ul#LC_TabMainMenuContent a:hover, |
ul#LC_secondary_menu a:hover, |
.LC_FormSectionClearButton input:hover |
.LC_FormSectionClearButton input:hover |
ul.LC_TabContent li:hover a { |
ul.LC_TabContent li:hover a { |
color:#BF2317; |
color:#BF2317; |
Line 5886 fieldset > legend {
|
Line 5915 fieldset > legend {
|
font-style: normal; |
font-style: normal; |
} |
} |
|
|
ol.LC_smallMenu { |
ol.LC_primary_menu { |
float: right; |
float: right; |
margin: 0.2em 0 0 0; |
margin: 0.2em 0 0 0; |
} |
} |
Line 5895 ol#LC_PathBreadcrumbs {
|
Line 5924 ol#LC_PathBreadcrumbs {
|
margin: 0; |
margin: 0; |
} |
} |
|
|
ol.LC_smallMenu li { |
ol.LC_primary_menu li { |
display: inline; |
display: inline; |
padding: 5px 5px 0 10px; |
padding: 5px 5px 0 10px; |
vertical-align: top; |
vertical-align: top; |
} |
} |
|
|
ol.LC_smallMenu li img { |
ol.LC_primary_menu li img { |
vertical-align: bottom; |
vertical-align: bottom; |
} |
} |
|
|
ol.LC_smallMenu a { |
ol.LC_primary_menu a { |
font-size: 90%; |
font-size: 90%; |
color: RGB(80, 80, 80); |
color: RGB(80, 80, 80); |
text-decoration: none; |
text-decoration: none; |
} |
} |
|
|
ul#LC_TabMainMenuContent { |
ul#LC_secondary_menu { |
clear: both; |
clear: both; |
color: $fontmenu; |
color: $fontmenu; |
background: $tabbg; |
background: $tabbg; |
Line 5921 ul#LC_TabMainMenuContent {
|
Line 5950 ul#LC_TabMainMenuContent {
|
width: 100%; |
width: 100%; |
} |
} |
|
|
ul#LC_TabMainMenuContent li { |
ul#LC_secondary_menu li { |
font-weight: bold; |
font-weight: bold; |
line-height: 1.8em; |
line-height: 1.8em; |
padding: 0 0.8em; |
padding: 0 0.8em; |
Line 5944 ul.LC_TabContentBigger li {
|
Line 5973 ul.LC_TabContentBigger li {
|
float:left; |
float:left; |
} |
} |
|
|
ul#LC_TabMainMenuContent li a { |
ul#LC_secondary_menu li a { |
color: $fontmenu; |
color: $fontmenu; |
text-decoration: none; |
text-decoration: none; |
} |
} |
Line 6733 sub simple_error_page {
|
Line 6762 sub simple_error_page {
|
my ($add_class) = @_; |
my ($add_class) = @_; |
$row_count[0]++; |
$row_count[0]++; |
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row'; |
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 '<tr class="'.$css_class.'">'."\n";; |
return '<tr class="'.$css_class.'">'."\n";; |
} |
} |
|
|
sub continue_data_table_row { |
sub continue_data_table_row { |
my ($add_class) = @_; |
my ($add_class) = @_; |
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row'; |
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 '<tr class="'.$css_class.'">'."\n";; |
return '<tr class="'.$css_class.'">'."\n";; |
} |
} |
|
|
Line 6764 sub simple_error_page {
|
Line 6793 sub simple_error_page {
|
sub end_data_table_header_row { |
sub end_data_table_header_row { |
return '</tr>'."\n";; |
return '</tr>'."\n";; |
} |
} |
|
|
|
sub data_table_caption { |
|
my $caption = shift; |
|
return "<caption class=\"LC_caption\">$caption</caption>"; |
|
} |
} |
} |
|
|
=pod |
=pod |