version 1.849, 2009/07/02 15:55:08
|
version 1.866, 2009/07/26 20:39:46
|
Line 483 ENDAUTHORBRW
|
Line 483 ENDAUTHORBRW
|
|
|
sub coursebrowser_javascript { |
sub coursebrowser_javascript { |
my ($domainfilter,$sec_element,$formname)=@_; |
my ($domainfilter,$sec_element,$formname)=@_; |
my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role'); |
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 $output = ' |
my $output = ' |
<script type="text/javascript" language="JavaScript"> |
<script type="text/javascript" language="JavaScript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 532 sub coursebrowser_javascript {
|
Line 532 sub coursebrowser_javascript {
|
if (multflag !=null && multflag != '') { |
if (multflag !=null && multflag != '') { |
url += '&multiple='+multflag; |
url += '&multiple='+multflag; |
} |
} |
if (crstype == 'Course/Group') { |
if (crstype == 'Course/Community') { |
if (formname == 'cu') { |
if (formname == 'cu') { |
crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value; |
crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value; |
if (crstype == "") { |
if (crstype == "") { |
Line 3766 sub blockcheck {
|
Line 3766 sub blockcheck {
|
($env{'request.role'} !~ m{^st\./\Q$cdom\E/\Q$cnum\E})); |
($env{'request.role'} !~ m{^st\./\Q$cdom\E/\Q$cnum\E})); |
next if ($no_userblock); |
next if ($no_userblock); |
|
|
# Retrieve blocking times and identity of blocker for course |
# Retrieve blocking times and identity of locker for course |
# of specified user, unless user has 'evb' privilege. |
# of specified user, unless user has 'evb' privilege. |
|
|
my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum); |
my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum); |
Line 3871 sub build_block_table {
|
Line 3871 sub build_block_table {
|
} |
} |
$output .= &end_data_table(); |
$output .= &end_data_table(); |
} |
} |
|
|
sub blocking_status { |
sub blocking_status { |
|
my $blocked = blocking_status_print(@_); |
|
my ($activity,$uname,$udom) = @_; |
|
if(!wantarray) { |
|
return $blocked; |
|
} |
|
my $output; |
|
my $querystring; |
|
$querystring = "?activity=$activity"; |
|
if(defined($uname)) { |
|
$querystring .= "&uname=$uname"; |
|
}if(defined($udom)) { |
|
$querystring .= "&udom=$udom"; |
|
} |
|
|
|
$output .= <<"END_MYBLOCK"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function openWindow(url, wdwName, w, h, toolbar,scrollbar) { |
|
var options = "width=" + w + ",height=" + h + ","; |
|
options += "resizable=yes,scrollbars="+scrollbar+",status=no,"; |
|
options += "menubar=no,toolbar="+toolbar+",location=no,directories=no"; |
|
var newWin = window.open(url, wdwName, options); |
|
newWin.focus(); |
|
} |
|
|
|
// ]]> |
|
</script> |
|
END_MYBLOCK |
|
my $popupUrl = "/adm/blockingstatus/$querystring"; |
|
$output.="\n<img src='/res/adm/pages/emblem-readonly.png' /><a onclick='openWindow(\"$popupUrl\",\"Blocking Table\",600,300,\"no\",\"no\");return false;' href='/adm/blockingstatus/$querystring'>Blocking Table</a>"; |
|
|
|
return ($blocked, $output); |
|
} |
|
sub blocking_status_print { |
my ($activity,$uname,$udom) = @_; |
my ($activity,$uname,$udom) = @_; |
my %setters; |
my %setters; |
my ($blocked,$output,$ownitem,$is_course); |
my ($blocked,$output,$ownitem,$is_course); |
Line 3883 sub blocking_status {
|
Line 3916 sub blocking_status {
|
my $category; |
my $category; |
if ($activity eq 'boards') { |
if ($activity eq 'boards') { |
$category = 'Discussion posts in this course'; |
$category = 'Discussion posts in this course'; |
|
} elsif ($activity eq 'chat') { |
|
$category = 'Chat'; |
|
} elsif ($activity eq 'msgdisplay') { |
|
$category = 'This message'; |
} elsif ($activity eq 'blogs') { |
} elsif ($activity eq 'blogs') { |
$category = 'Blogs'; |
$category = 'Blogs'; |
} elsif ($activity eq 'port') { |
} elsif ($activity eq 'port') { |
if (defined($uname) && defined($udom)) { |
if (defined($uname) && defined($udom)) { |
if ($uname eq $env{'user.name'} && |
if ($uname eq $env{'user.name'} && |
Line 3914 sub blocking_status {
|
Line 3951 sub blocking_status {
|
} |
} |
} elsif ($activity eq 'groups') { |
} elsif ($activity eq 'groups') { |
$category = 'Groups in this course'; |
$category = 'Groups in this course'; |
|
} else { |
|
$category = 'Communication'; |
} |
} |
my $showstart = &Apache::lonlocal::locallocaltime($startblock); |
my $showstart = &Apache::lonlocal::locallocaltime($startblock); |
my $showend = &Apache::lonlocal::locallocaltime($endblock); |
my $showend = &Apache::lonlocal::locallocaltime($endblock); |
Line 4394 sub bodytag {
|
Line 4433 sub bodytag {
|
$dc_info = '('.$dc_info.')'; |
$dc_info = '('.$dc_info.')'; |
} |
} |
|
|
|
$role = "($role)" if $role; |
|
&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') { |
Line 4411 sub bodytag {
|
Line 4453 sub bodytag {
|
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>|; |
<em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'}; |
|
|
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg, |
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$titletable); |
$titletable); |
|
} else { |
} else { |
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg). |
$bodytag .= &Apache::lonmenu::menubuttons($forcereg).$titletable; |
$titletable; |
|
} |
} |
} |
} |
return $bodytag; |
return $bodytag; |
Line 4436 sub bodytag {
|
Line 4477 sub bodytag {
|
|
|
# Explicit link to get inline menu |
# Explicit link to get inline menu |
my $menu= ($no_inline_link?'' |
my $menu= ($no_inline_link?'' |
:'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>'); |
:'<a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>'); |
|
$bodytag .= qq|<div id="LC_nav_bar">$name $role |
|
<em>$realm</em> $dc_info </div> |
|
<ol class="LC_smallMenu LC_right"> |
|
<li>$menu</li> |
|
</ol>| unless $env{'form.inhibitmenu'}; |
# |
# |
return(<<ENDBODY); |
return(<<ENDBODY); |
$bodytag |
$bodytag |
Line 4566 sub standard_css {
|
Line 4612 sub standard_css {
|
|
|
my $sans = 'Verdana,Arial,Helvetica,sans-serif'; |
my $sans = 'Verdana,Arial,Helvetica,sans-serif'; |
my $mono = 'monospace'; |
my $mono = 'monospace'; |
my $data_table_head = $tabbg; |
my $data_table_head = $sidebg; |
my $data_table_light = '#EEEEEE'; |
my $data_table_light = '#FAFAFA'; |
my $data_table_dark = '#DDDDDD'; |
my $data_table_dark = '#F0F0F0'; |
my $data_table_darker = '#CCCCCC'; |
my $data_table_darker = '#CCCCCC'; |
my $data_table_highlight = '#FFFF00'; |
my $data_table_highlight = '#FFFF00'; |
my $mail_new = '#FFBB77'; |
my $mail_new = '#FFBB77'; |
Line 4826 table#LC_mainmenu td.LC_mainmenu_column
|
Line 4872 table#LC_mainmenu td.LC_mainmenu_column
|
margin: 0; |
margin: 0; |
padding: 0; |
padding: 0; |
} |
} |
|
|
/* Preliminary fix to hide breadcrumbs inside remote control window */ |
/* Preliminary fix to hide breadcrumbs inside remote control window */ |
#LC_remote #LC_breadcrumbs { |
#LC_remote #LC_breadcrumbs { |
display:none; |
display:none; |
Line 5234 table.LC_pick_box {
|
Line 5281 table.LC_pick_box {
|
} |
} |
|
|
table.LC_pick_box td.LC_pick_box_title { |
table.LC_pick_box td.LC_pick_box_title { |
background: $tabbg; |
background: $sidebg; |
font-weight: bold; |
font-weight: bold; |
text-align: right; |
text-align: right; |
vertical-align: top; |
vertical-align: top; |
Line 5242 table.LC_pick_box td.LC_pick_box_title {
|
Line 5289 table.LC_pick_box td.LC_pick_box_title {
|
padding: 8px; |
padding: 8px; |
} |
} |
|
|
table.LC_pick_box td.LC_selfenroll_pick_box_title { |
|
background: $tabbg; |
|
font-weight: bold; |
|
text-align: right; |
|
width: 350px; |
|
padding: 8px; |
|
} |
|
|
|
table.LC_pick_box td.LC_pick_box_value { |
table.LC_pick_box td.LC_pick_box_value { |
text-align: left; |
text-align: left; |
padding: 8px; |
padding: 8px; |
Line 5415 div.LC_feedback_link a{
|
Line 5454 div.LC_feedback_link a{
|
} |
} |
|
|
span.LC_feedback_link { |
span.LC_feedback_link { |
//background: $feedback_link_bg; |
/* background: $feedback_link_bg; */ |
font-size: larger; |
font-size: larger; |
} |
} |
|
|
span.LC_message_link { |
span.LC_message_link { |
//background: $feedback_link_bg; |
/* background: $feedback_link_bg; */ |
font-size: larger; |
font-size: larger; |
position: absolute; |
position: absolute; |
right: 1em; |
right: 1em; |
Line 5504 table.LC_prior_match tr td {
|
Line 5543 table.LC_prior_match tr td {
|
border: 1px solid #000000; |
border: 1px solid #000000; |
} |
} |
|
|
td.LC_nobreak, |
.LC_nobreak { |
span.LC_nobreak { |
|
white-space: nowrap; |
white-space: nowrap; |
} |
} |
|
|
Line 5529 table.LC_docs_documents td.LC_docs_docum
|
Line 5567 table.LC_docs_documents td.LC_docs_docum
|
padding: 4px; |
padding: 4px; |
} |
} |
|
|
.LC_docs_entry_move { |
div.LC_docs_entry_move { |
border: none; |
border: 1px solid #BBBBBB; |
border-collapse: collapse; |
|
} |
|
|
|
.LC_docs_entry_move td { |
|
border: 2px solid #BBBBBB; |
|
background: #DDDDDD; |
background: #DDDDDD; |
|
width: 22px; |
|
padding: 1px; |
|
margin: 0; |
} |
} |
|
|
.LC_docs_editor td.LC_docs_entry_commands { |
table.LC_data_table tr > td.LC_docs_entry_commands, |
|
table.LC_data_table tr > td.LC_docs_entry_parameter { |
background: #DDDDDD; |
background: #DDDDDD; |
font-size: x-small; |
font-size: x-small; |
} |
} |
|
|
|
.LC_docs_entry_parameter { |
|
white-space: nowrap; |
|
} |
|
|
.LC_docs_copy { |
.LC_docs_copy { |
color: #000099; |
color: #000099; |
} |
} |
Line 5565 table.LC_docs_documents td.LC_docs_docum
|
Line 5606 table.LC_docs_documents td.LC_docs_docum
|
font-size: x-small; |
font-size: x-small; |
} |
} |
|
|
.LC_docs_editor td.LC_docs_entry_title, |
|
.LC_docs_editor td.LC_docs_entry_icon { |
|
background: #FFFFBB; |
|
} |
|
|
|
.LC_docs_editor td.LC_docs_entry_parameter { |
|
background: #BBBBFF; |
|
font-size: x-small; |
|
white-space: nowrap; |
|
} |
|
|
|
table.LC_docs_adddocs td, |
table.LC_docs_adddocs td, |
table.LC_docs_adddocs th { |
table.LC_docs_adddocs th { |
border: 1px solid #BBBBBB; |
border: 1px solid #BBBBBB; |
Line 5842 fieldset > legend {
|
Line 5872 fieldset > legend {
|
|
|
#LC_nav_bar { |
#LC_nav_bar { |
float: left; |
float: left; |
margin: 0; |
margin: 0.2em 0 0 0; |
} |
} |
|
|
#LC_nav_bar em{ |
#LC_nav_bar em{ |
Line 5852 fieldset > legend {
|
Line 5882 fieldset > legend {
|
|
|
ol.LC_smallMenu { |
ol.LC_smallMenu { |
float: right; |
float: right; |
|
margin: 0.2em 0 0 0; |
} |
} |
|
|
ol.LC_smallMenu, ol#LC_PathBreadcrumbs { |
ol#LC_PathBreadcrumbs { |
margin: 0; |
margin: 0; |
} |
} |
|
|
Line 5881 ul#LC_TabMainMenuContent {
|
Line 5912 ul#LC_TabMainMenuContent {
|
list-style: none; |
list-style: none; |
padding: 0; |
padding: 0; |
margin: 0; |
margin: 0; |
float:left; |
|
width: 100%; |
width: 100%; |
} |
} |
|
|
ul#LC_TabMainMenuContent li { |
ul#LC_TabMainMenuContent li { |
float: left; |
|
font-weight: bold; |
font-weight: bold; |
line-height: 1.8em; |
line-height: 1.8em; |
padding: 0 0.8em; |
padding: 0 0.8em; |
Line 5898 ul#LC_TabMainMenuContent li {
|
Line 5927 ul#LC_TabMainMenuContent li {
|
ul.LC_TabContent { |
ul.LC_TabContent { |
display:block; |
display:block; |
background: $sidebg; |
background: $sidebg; |
border-bottom: solid 1px $lg_border_color |
border-bottom: solid 1px $lg_border_color; |
list-style:none; |
list-style:none; |
margin: -10px -10px 0 -10px; |
margin: -10px -10px 0 -10px; |
padding: 0; |
padding: 0; |
Line 5970 ul.LC_TabContentBigger li {
|
Line 5999 ul.LC_TabContentBigger li {
|
ul.LC_TabContentBigger li:hover, |
ul.LC_TabContentBigger li:hover, |
ul.LC_TabContentBigger li.active { |
ul.LC_TabContentBigger li.active { |
background: #ffffff; |
background: #ffffff; |
|
color:$font; |
} |
} |
|
|
ul.LC_TabContentBigger li, |
ul.LC_TabContentBigger li, |
ul.LC_TabContentBigger li a { |
ul.LC_TabContentBigger li a { |
font-size:110%; |
font-size:110%; |
font-weight:bold; |
font-weight:bold; |
|
color: #737373; |
|
} |
|
|
|
ul.LC_CourseBreadcrumbs { |
|
background: $sidebg; |
|
line-height: 32px; |
|
padding-left: 10px; |
|
margin: 0 0 10px 0; |
|
list-style-position: inside; |
|
|
} |
} |
|
|
ol#LC_MenuBreadcrumbs, |
ol#LC_MenuBreadcrumbs, |
ol#LC_PathBreadcrumbs, |
ol#LC_PathBreadcrumbs { |
ul#LC_CourseBreadcrumbs { |
|
padding-left: 10px; |
padding-left: 10px; |
margin: 0; |
margin: 0; |
list-style-position: inside; |
list-style-position: inside; |
Line 5988 ul#LC_CourseBreadcrumbs {
|
Line 6027 ul#LC_CourseBreadcrumbs {
|
|
|
ol#LC_MenuBreadcrumbs li, |
ol#LC_MenuBreadcrumbs li, |
ol#LC_PathBreadcrumbs li, |
ol#LC_PathBreadcrumbs li, |
ul#LC_CourseBreadcrumbs li { |
ul.LC_CourseBreadcrumbs li { |
display: inline; |
display: inline; |
white-space: nowrap; |
white-space: nowrap; |
} |
} |
|
|
ol#LC_MenuBreadcrumbs li a, |
ol#LC_MenuBreadcrumbs li a, |
ul#LC_CourseBreadcrumbs li a { |
ul.LC_CourseBreadcrumbs li a { |
text-decoration: none; |
text-decoration: none; |
font-size:90%; |
font-size:90%; |
} |
} |
Line 6096 div.LC_columnSection>* {
|
Line 6135 div.LC_columnSection>* {
|
overflow:hidden; |
overflow:hidden; |
} |
} |
|
|
.clear { |
|
clear: both; |
|
line-height: 0; |
|
font-size: 0; |
|
height: 0; |
|
} |
|
|
|
.LC_loginpage_container { |
.LC_loginpage_container { |
text-align:left; |
text-align:left; |
margin : 0 auto; |
margin : 0 auto; |
Line 6157 table em {
|
Line 6189 table em {
|
table.LC_tableBrowseRes, |
table.LC_tableBrowseRes, |
table.LC_tableOfContent { |
table.LC_tableOfContent { |
border:none; |
border:none; |
border-spacing: 1; |
border-spacing: 1px; |
padding: 3px; |
padding: 3px; |
background-color: #FFFFFF; |
background-color: #FFFFFF; |
font-size: 90%; |
font-size: 90%; |
Line 10185 sub group_term {
|
Line 10217 sub group_term {
|
my $crstype = &course_type(); |
my $crstype = &course_type(); |
my %names = ( |
my %names = ( |
'Course' => 'group', |
'Course' => 'group', |
'Group' => 'team', |
'Community' => 'group', |
); |
); |
return $names{$crstype}; |
return $names{$crstype}; |
} |
} |
Line 10378 sub init_user_environment {
|
Line 10410 sub init_user_environment {
|
&Apache::lonnet::usertools_access($username,$domain,$tool,'reload'); |
&Apache::lonnet::usertools_access($username,$domain,$tool,'reload'); |
} |
} |
|
|
foreach my $crstype ('official','unofficial') { |
foreach my $crstype ('official','unofficial','community') { |
$userenv{'canrequest.'.$crstype} = |
$userenv{'canrequest.'.$crstype} = |
&Apache::lonnet::usertools_access($username,$domain,$crstype, |
&Apache::lonnet::usertools_access($username,$domain,$crstype, |
'reload','requestcourses'); |
'reload','requestcourses'); |