version 1.425, 2014/01/06 15:05:50
|
version 1.429, 2014/09/22 01:02:52
|
Line 514 sub create_submenu {
|
Line 514 sub create_submenu {
|
if ($count == $numsub) { |
if ($count == $numsub) { |
$borderbot = 'border-bottom:1px solid black;'; |
$borderbot = 'border-bottom:1px solid black;'; |
} |
} |
if ($href ne '') { |
unless (($href eq '') || ($href =~ /^\#/)) { |
$target = ' target="_top"'; |
$target = ' target="_top"'; |
} |
} |
$menu .= '<li style="margin:0;padding:0;'. |
$menu .= '<li style="margin:0;padding:0;'. |
Line 768 if(length($annotation) > 0){
|
Line 768 if(length($annotation) > 0){
|
} |
} |
$menuitems.="&Notes&&annotate()&"; |
$menuitems.="&Notes&&annotate()&"; |
$menuitems.="Make notes and annotations about this resource&&1\n"; |
$menuitems.="Make notes and annotations about this resource&&1\n"; |
|
my $is_mobile; |
|
if ($env{'browser.mobile'}) { |
|
$is_mobile = 1; |
|
} |
|
|
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) { |
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) { |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
s&6&3&catalog.png&Info&info[_1]&catalog_info()&Show Metadata |
s&6&3&catalog.png&Info&info[_1]&catalog_info('$is_mobile')&Show Metadata |
ENDREALRES |
ENDREALRES |
} |
} |
unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) || |
unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) || |
Line 1229 sub rawconfig {
|
Line 1233 sub rawconfig {
|
my $pub=($env{'request.state'} eq 'published'); |
my $pub=($env{'request.state'} eq 'published'); |
my $con=($env{'request.state'} eq 'construct'); |
my $con=($env{'request.state'} eq 'construct'); |
my $rol=$env{'request.role'}; |
my $rol=$env{'request.role'}; |
my $requested_domain = $env{'request.role.domain'}; |
my $requested_domain; |
|
if ($rol) { |
|
$requested_domain = $env{'request.role.domain'}; |
|
} |
foreach my $line (@desklines) { |
foreach my $line (@desklines) { |
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); |
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); |
$prt=~s/\$uname/$uname/g; |
$prt=~s/\$uname/$uname/g; |
Line 1243 sub rawconfig {
|
Line 1250 sub rawconfig {
|
next if ($crstype ne 'Community'); |
next if ($crstype ne 'Community'); |
$prt=~s/\$cmty/$crs/g; |
$prt=~s/\$cmty/$crs/g; |
} |
} |
$prt=~s/\$requested_domain/$requested_domain/g; |
if ($prt =~ m/\$requested_domain/) { |
|
if ((!$requested_domain) && ($pro eq 'pbre') && ($env{'user.adv'})) { |
|
$prt=~s/\$requested_domain/$env{'user.domain'}/g; |
|
} else { |
|
$prt=~s/\$requested_domain/$requested_domain/g; |
|
} |
|
} |
if ($category_names{$cat}!~/\w/) { $cat='oth'; } |
if ($category_names{$cat}!~/\w/) { $cat='oth'; } |
if ($pro eq 'clear') { |
if ($pro eq 'clear') { |
$output.=&clear($row,$col); |
$output.=&clear($row,$col); |
Line 1279 sub rawconfig {
|
Line 1292 sub rawconfig {
|
next; |
next; |
} |
} |
} |
} |
if (&Apache::lonnet::allowed($priv,$prt)) { |
if ((($priv eq 'bre') && (&Apache::lonnet::allowed($priv,$prt) eq 'F')) || |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
(($priv ne 'bre') && (&Apache::lonnet::allowed($priv,$prt)))) { |
|
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
} |
} |
} elsif ($pro eq 'course') { |
} elsif ($pro eq 'course') { |
if (($env{'request.course.fn'}) && ($crstype ne 'Community')) { |
if (($env{'request.course.fn'}) && ($crstype ne 'Community')) { |
Line 1492 sub utilityfunctions {
|
Line 1506 sub utilityfunctions {
|
|
|
my $countdown = &countdown_toggle_js(); |
my $countdown = &countdown_toggle_js(); |
|
|
|
my $hostvar = ' |
|
function setLCHost() { |
|
var lcHostname=""; |
|
'; |
|
if ($httphost =~ m{^https?\://}) { |
|
$hostvar .= ' var lcServer="'.$httphost.'";'."\n". |
|
' var hostReg = /^https?:\/\/([^\/]+)$/i;'."\n". |
|
' var match = hostReg.exec(lcServer);'."\n". |
|
' if (match.length) {'."\n". |
|
' if (match[1] == location.hostname) {'."\n". |
|
' lcHostname=lcServer;'."\n". |
|
' }'."\n". |
|
' }'."\n"; |
|
} |
|
|
|
$hostvar .= ' return lcHostname;'."\n". |
|
'}'."\n"; |
|
|
return (<<ENDUTILITY) |
return (<<ENDUTILITY) |
var host="$httphost"; |
$hostvar |
var currentURL=unescape("$esc_url"); |
var currentURL=unescape("$esc_url"); |
var reloadURL=unescape("$esc_url"); |
var reloadURL=unescape("$esc_url"); |
var currentSymb=unescape("$esc_symb"); |
var currentSymb=unescape("$esc_symb"); |
Line 1504 $jumptores
|
Line 1536 $jumptores
|
|
|
function gopost(url,postdata) { |
function gopost(url,postdata) { |
if (url!='') { |
if (url!='') { |
this.document.server.action=host+url; |
var lcHostname = setLCHost(); |
|
this.document.server.action=lcHostname+url; |
this.document.server.postdata.value=postdata; |
this.document.server.postdata.value=postdata; |
this.document.server.command.value=''; |
this.document.server.command.value=''; |
this.document.server.url.value=''; |
this.document.server.url.value=''; |
Line 1515 function gopost(url,postdata) {
|
Line 1548 function gopost(url,postdata) {
|
|
|
function gocmd(url,cmd) { |
function gocmd(url,cmd) { |
if (url!='') { |
if (url!='') { |
this.document.server.action=host+url; |
var lcHostname = setLCHost(); |
|
this.document.server.action=lcHostname+url; |
this.document.server.postdata.value=''; |
this.document.server.postdata.value=''; |
this.document.server.command.value=cmd; |
this.document.server.command.value=cmd; |
this.document.server.url.value=currentURL; |
this.document.server.url.value=currentURL; |
Line 1567 function golist(url) {
|
Line 1601 function golist(url) {
|
if (url!='' && url!= null) { |
if (url!='' && url!= null) { |
currentURL = null; |
currentURL = null; |
currentSymb= null; |
currentSymb= null; |
top.location.href=host+url; |
var lcHostname = setLCHost(); |
|
top.location.href=lcHostname+url; |
} |
} |
} |
} |
|
|
|
|
|
|
function catalog_info() { |
function catalog_info(isMobile) { |
openMyModal(window.location.pathname+'.meta',500,400,'yes'); |
if (isMobile == 1) { |
|
openMyModal(window.location.pathname+'.meta?modal=1',500,400,'yes'); |
|
} else { |
|
loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=500,width=400,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'); |
|
} |
} |
} |
|
|
function chat_win() { |
function chat_win() { |
lonchat=window.open(host+'/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no'); |
var lcHostname = setLCHost(); |
|
lonchat=window.open(lcHostname+'/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no'); |
} |
} |
|
|
function group_chat(group) { |
function group_chat(group) { |
var url = host+'/adm/groupchat?group='+group; |
var lcHostname = setLCHost(); |
|
var url = lcHostname+'/adm/groupchat?group='+group; |
var winName = 'LONchat_'+group; |
var winName = 'LONchat_'+group; |
grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no'); |
grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no'); |
} |
} |
Line 1602 function annotate() {
|
Line 1643 function annotate() {
|
|
|
function open_StoredLinks_Import(rat) { |
function open_StoredLinks_Import(rat) { |
var newWin; |
var newWin; |
|
var lcHostname = setLCHost(); |
if (rat) { |
if (rat) { |
newWin = window.open(host+'/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat, |
newWin = window.open(lcHostname+'/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat, |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
} |
} |
else { |
else { |
newWin = window.open(host+'/adm/wishlist?inhibitmenu=yes&mode=import', |
newWin = window.open(lcHostname+'/adm/wishlist?inhibitmenu=yes&mode=import', |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
} |
} |
newWin.focus(); |
newWin.focus(); |