version 1.856, 2009/07/10 15:10:26
|
version 1.867, 2009/07/27 11:30:05
|
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 3872 sub build_block_table {
|
Line 3872 sub build_block_table {
|
$output .= &end_data_table(); |
$output .= &end_data_table(); |
} |
} |
sub blocking_status { |
sub blocking_status { |
my $blocked = blocking_status_print(@_); |
my $blocked; |
my ($activity,$uname,$udom) = @_; |
my ($activity,$uname,$udom) = @_; |
|
my %setters; |
|
my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom); |
|
if ($startblock && $endblock) { |
|
$blocked = 1; |
|
} |
if(!wantarray) { |
if(!wantarray) { |
return $blocked; |
return $blocked; |
} |
} |
my $output; |
my $output; |
my $querystring; |
my $querystring; |
$querystring = "?activity=$activity"; |
$querystring = "?activity=$activity"; |
if(defined($uname)) { |
|
$querystring .= "&uname=$uname"; |
|
}if(defined($udom)) { |
|
$querystring .= "&udom=$udom"; |
|
} |
|
|
|
$output .= <<"END_MYBLOCK"; |
$output .= <<"END_MYBLOCK"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
Line 3901 sub blocking_status {
|
Line 3901 sub blocking_status {
|
</script> |
</script> |
END_MYBLOCK |
END_MYBLOCK |
my $popupUrl = "/adm/blockingstatus/$querystring"; |
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>"; |
$output .= <<"END_BLOCK"; |
|
<div class='LC_comblock'> |
|
<a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'> |
|
<img class='LC_noBorder LC_middle' src='/res/adm/pages/comblock.png' alt='Communication Blocking'/></a> |
|
<a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'>Communication Blocking</a> |
|
</div> |
|
|
|
END_BLOCK |
|
|
return ($blocked, $output); |
return ($blocked, $output); |
} |
} |
sub blocking_status_print { |
|
my ($activity,$uname,$udom) = @_; |
|
my %setters; |
|
my ($blocked,$output,$ownitem,$is_course); |
|
my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom); |
|
if ($startblock && $endblock) { |
|
$blocked = 1; |
|
if (wantarray) { |
|
my $category; |
|
if ($activity eq 'boards') { |
|
$category = 'Discussion posts in this course'; |
|
} elsif ($activity eq 'blogs') { |
|
$category = 'Blogs'; |
|
} elsif ($activity eq 'port') { |
|
if (defined($uname) && defined($udom)) { |
|
if ($uname eq $env{'user.name'} && |
|
$udom eq $env{'user.domain'}) { |
|
$ownitem = 1; |
|
} |
|
} |
|
$is_course = &Apache::lonnet::is_course($udom,$uname); |
|
if ($ownitem) { |
|
$category = 'Your portfolio files'; |
|
} elsif ($is_course) { |
|
my $coursedesc; |
|
foreach my $course (keys(%setters)) { |
|
my %courseinfo = |
|
&Apache::lonnet::coursedescription($course); |
|
$coursedesc = $courseinfo{'description'}; |
|
} |
|
$category = "Group portfolio in the course '$coursedesc'"; |
|
} else { |
|
$category = 'Portfolio files belonging to '; |
|
if ($env{'user.name'} eq 'public' && |
|
$env{'user.domain'} eq 'public') { |
|
$category .= &plainname($uname,$udom); |
|
} else { |
|
$category .= &aboutmewrapper(&plainname($uname,$udom),$uname,$udom); |
|
} |
|
} |
|
} elsif ($activity eq 'groups') { |
|
$category = 'Groups in this course'; |
|
} |
|
my $showstart = &Apache::lonlocal::locallocaltime($startblock); |
|
my $showend = &Apache::lonlocal::locallocaltime($endblock); |
|
$output = '<br />'.&mt('[_1] will be inaccessible between [_2] and [_3] because communication is being blocked.',$category,$showstart,$showend).'<br />'; |
|
if (!($activity eq 'port' && !($ownitem) && !($is_course))) { |
|
$output .= &build_block_table($startblock,$endblock,\%setters); |
|
} |
|
} |
|
} |
|
if (wantarray) { |
|
return ($blocked,$output); |
|
} else { |
|
return $blocked; |
|
} |
|
} |
|
|
|
############################################### |
############################################### |
|
|
Line 4451 sub bodytag {
|
Line 4401 sub bodytag {
|
<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') { |
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 4868 table#LC_mainmenu td.LC_mainmenu_column
|
Line 4816 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 5284 table.LC_pick_box td.LC_pick_box_title {
|
Line 5233 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 5450 div.LC_feedback_link {
|
Line 5391 div.LC_feedback_link {
|
|
|
div.LC_feedback_link img { |
div.LC_feedback_link img { |
height: 22px; |
height: 22px; |
|
vertical-align:middle; |
} |
} |
|
|
div.LC_feedback_link a{ |
div.LC_feedback_link a{ |
text-decoration: none; |
text-decoration: none; |
} |
} |
|
|
|
div.LC_comblock { |
|
display:inline; |
|
color:$font; |
|
font-size:90%; |
|
} |
|
|
|
div.LC_feedback_link div.LC_comblock { |
|
padding-left:5px; |
|
} |
|
|
|
div.LC_feedback_link div.LC_comblock a { |
|
color:$font; |
|
} |
|
|
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 5570 table.LC_docs_documents td.LC_docs_docum
|
Line 5526 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 5606 table.LC_docs_documents td.LC_docs_docum
|
Line 5565 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 5938 ul#LC_TabMainMenuContent li {
|
Line 5886 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 6010 ul.LC_TabContentBigger li {
|
Line 5958 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 6028 ul#LC_CourseBreadcrumbs {
|
Line 5986 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 6190 table em {
|
Line 6148 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 6507 $args - additional optional args support
|
Line 6465 $args - additional optional args support
|
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 |
current page |
current page |
|
bread_crumbs -> Array containing breadcrumbs |
|
bread_crumbs_components -> if exists show it as headline else show only the breadcrumbs |
|
|
=back |
=back |
|
|
Line 10218 sub group_term {
|
Line 10178 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 10411 sub init_user_environment {
|
Line 10371 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'); |