[LON-CAPA-cvs] cvs: rat / lonratedt.pm lonratmenu.pm /client ratcode.js doc/loncapafiles loncapafiles.lpml loncom loncapa_apache.conf startup.pl loncom/interface groupsort.pm loncommon.pm londocs.pm lonmenu.pm mydesk.tab
wenzelju
wenzelju@source.lon-capa.org
Tue, 24 Aug 2010 09:11:44 -0000
This is a MIME encoded message
--wenzelju1282641104
Content-Type: text/plain
wenzelju Tue Aug 24 09:11:44 2010 EDT
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom loncapa_apache.conf startup.pl
/loncom/interface groupsort.pm loncommon.pm londocs.pm lonmenu.pm
mydesk.tab
/rat lonratedt.pm lonratmenu.pm
/rat/client ratcode.js
Log:
Removed old bookmark-collection (replaced by wishlist).
--wenzelju1282641104
Content-Type: text/plain
Content-Disposition: attachment; filename="wenzelju-20100824091144.txt"
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.700 doc/loncapafiles/loncapafiles.lpml:1.701
--- doc/loncapafiles/loncapafiles.lpml:1.700 Wed Aug 18 12:53:18 2010
+++ doc/loncapafiles/loncapafiles.lpml Tue Aug 24 09:11:32 2010
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.700 2010/08/18 12:53:18 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.701 2010/08/24 09:11:32 wenzelju Exp $ -->
<!--
@@ -795,13 +795,6 @@
</directory>
<directory dist='default'>
<protectionlevel>modest_delete</protectionlevel>
- <targetdir dist='default'>home/httpd/html/res/adm/pages/bookmarkmenu
- </targetdir>
- <categoryname>server readonly</categoryname>
- <description>bookmark user interface code</description>
-</directory>
-<directory dist='default'>
- <protectionlevel>modest_delete</protectionlevel>
<targetdir dist='default'>home/httpd/html/res/adm/pages/annotations
</targetdir>
<categoryname>server readonly</categoryname>
@@ -2701,7 +2694,6 @@
Author_Numerical_and_Formula.tex;
Author_Remote_Control.tex;
Batch_Creation.tex;
-Bookmarks.tex;
BridgeTask_About.tex;
BridgeTask_Conditions.tex;
BridgeTask_Create.tex;
@@ -4792,16 +4784,6 @@
<status>works/unverified</status>
</file>
<file>
-<source>loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm</source>
-<target dist='default'>home/httpd/lib/perl/Apache/admbookmarks.pm</target>
-<categoryname>handler</categoryname>
-<description>
-This will take bookmarks and get/write/display them for the LON-CAPA user
-interface.
-</description>
-<status>works/unverified</status>
-</file>
-<file>
<source>rat/lonratsrv.pm</source>
<target dist='default'>home/httpd/lib/perl/Apache/lonratsrv.pm</target>
<categoryname>handler</categoryname>
@@ -6925,56 +6907,6 @@
</filenames>
</fileglob>
<fileglob>
-<glob>*.gif</glob>
-<sourcedir>loncom/html/res/adm/pages/bookmarkmenu/</sourcedir>
-<targetdir dist='default'>home/httpd/html/res/adm/pages/bookmarkmenu/
-</targetdir>
-<categoryname>graphic file</categoryname>
-<description>
-icons used for the bookmark portion of the LON-CAPA user interface
-</description>
-<filenames>
-folder_anim.gif;
-folder_close.gif;
-folder_drag.gif;
-folder_new.gif;
-folder_open.gif;
-folder_pointer_closed.gif;
-folder_pointer_opened.gif;
-folder_static.gif;
-folder_trash.gif;
-folder_trash_hover.gif;
-left_bar.gif;
-link.gif;
-link_anim.gif;
-link_drag.gif;
-ll_corner.gif;
-lower_bar.gif;
-lr_corner.gif;
-pix.gif;
-right_bar.gif;
-toolbar_bg.gif;
-ul_corner.gif;
-upper_bar.gif;
-ur_corner.gif
-</filenames>
-</fileglob>
-<fileglob>
-<glob>*.html</glob>
-<sourcedir>loncom/html/res/adm/pages/bookmarkmenu/</sourcedir>
-<targetdir dist='default'>home/httpd/html/res/adm/pages/bookmarkmenu/
-</targetdir>
-<categoryname>interface file</categoryname>
-<description>
-associated with the scheme of displaying bookmarks
-</description>
-<filenames>
-bookmarkmenu_toolbar.html;
-blank.html;
-closechildren.html
-</filenames>
-</fileglob>
-<fileglob>
<glob>*.*</glob>
<sourcedir>loncom/html/res/adm/pages/reactionresponse/</sourcedir>
<targetdir dist='default'>home/httpd/html/res/adm/pages/reactionresponse/</targetdir>
@@ -6991,15 +6923,6 @@
</filenames>
</fileglob>
<file>
-<source>loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js</source>
-<target dist='default'>
-home/httpd/html/res/adm/pages/bookmarkmenu/bookmarklib.js</target>
-<categoryname>interface file</categoryname>
-<description>
-javascript for handling client-side interactions with bookmark interface
-</description>
-</file>
-<file>
<source dist='default'>loncom/build/CHECKRPMS</source>
<target dist='default'>usr/local/loncapa/bin/CHECKRPMS</target>
<categoryname>system script</categoryname>
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.197 loncom/loncapa_apache.conf:1.198
--- loncom/loncapa_apache.conf:1.197 Tue Aug 10 14:30:28 2010
+++ loncom/loncapa_apache.conf Tue Aug 24 09:11:35 2010
@@ -1,7 +1,7 @@
##
## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
##
-## $Id: loncapa_apache.conf,v 1.197 2010/08/10 14:30:28 wenzelju Exp $
+## $Id: loncapa_apache.conf,v 1.198 2010/08/24 09:11:35 wenzelju Exp $
##
#
@@ -637,16 +637,6 @@
ErrorDocument 500 /adm/errorhandler
</Location>
-<Location /adm/bookmarks>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::admbookmarks
-ErrorDocument 403 /adm/login
-ErrorDocument 500 /adm/errorhandler
-</Location>
-
<Location /adm/flip>
AuthType LONCAPA
Require valid-user
Index: loncom/startup.pl
diff -u loncom/startup.pl:1.36 loncom/startup.pl:1.37
--- loncom/startup.pl:1.36 Tue Aug 10 14:30:28 2010
+++ loncom/startup.pl Tue Aug 24 09:11:35 2010
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: startup.pl,v 1.36 2010/08/10 14:30:28 wenzelju Exp $
+# $Id: startup.pl,v 1.37 2010/08/24 09:11:35 wenzelju Exp $
BEGIN {
eval "use Apache2::compat();";
@@ -114,7 +114,6 @@
use Apache::lonuploadedacc();
use Apache::lonwrapper();
use Apache::admannotations();
-use Apache::admbookmarks();
use Apache::lonwishlist();
use Apache::style();
use Apache::lontex();
Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.66 loncom/interface/groupsort.pm:1.67
--- loncom/interface/groupsort.pm:1.66 Mon May 3 13:53:47 2010
+++ loncom/interface/groupsort.pm Tue Aug 24 09:11:37 2010
@@ -2,7 +2,7 @@
# The LON-CAPA group sort handler
# Allows for sorting prior to import into RAT.
#
-# $Id: groupsort.pm,v 1.66 2010/05/03 13:53:47 bisitz Exp $
+# $Id: groupsort.pm,v 1.67 2010/08/24 09:11:37 wenzelju Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -181,31 +181,13 @@
}
}
-# --------------------------------------------------------- Read from bookmarks
-
-sub readfrombookmarks {
- my ($r,$resources)=@_;
- my %bookmarks=&Apache::lonnet::dump('bookmarks');
-# the bookmark "hash" is just one entry
-# it's a javascript program code with arguments like ('title','url');
- my @bookmarks=($bookmarks{'bookmarks'}=~/\((?:\'([^\']+)\'\,\'([^\']+)\'|\"([^\"]+)\"\,\"([^\"]+)\")\)\;/g);
- for (my $index=0;$index<($#bookmarks+1)/2;$index++) {
- if ($bookmarks[$index*2+1]) {
- my $url = $bookmarks[$index*2+1];
- my $name = $bookmarks[$index*2];
- $name =~ s/^LON\-CAPA\s+//;
-
- push(@{$resources},{'url' => $url, 'title' => $name});
- }
- }
-}
# ---------------------------------------------------------------- Main Handler
sub handler {
my $r = shift;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['acts','mode','readfile','recover','bookmarks']);
+ ['acts','mode','readfile','recover']);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -215,7 +197,7 @@
my $finishimport='';
my $begincondition='';
my $endcondition='';
- if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+ if (($env{'form.readfile'})) {
$begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {';
$endcondition='}';
}
@@ -299,8 +281,6 @@
if ($env{'form.readfile'}) {
&readfromfile($r,\@resources);
- } elsif ($env{'form.bookmarks'}) {
- &readfrombookmarks($r,\@resources);
} else {
&readfromdb($r,\@resources);
}
@@ -313,10 +293,7 @@
} else {
$title = 'Sort Imported Resources';
}
- if ($env{'form.bookmarks'}) {
- $title = 'Import Resources from Bookmarks';
- }
- if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+ if (($clen > 1) || ($env{'form.readfile'})) {
my %lt=&Apache::lonlocal::texthash(
'fin'=> 'Finalize order of resources',
'ci' => 'Continue Import',
@@ -342,7 +319,6 @@
<input type="hidden" name="newval" value="" />
<input type="hidden" name="mode" value="$env{'form.mode'}" />
<input type="hidden" name="readfile" value="$env{'form.readfile'}" />
-<input type="hidden" name="bookmarks" value="$env{'form.bookmarks'}" />
<input type="hidden" name="recover" value="$env{'form.recover'}" />
END
@@ -350,10 +326,7 @@
# ---
my $buttontext = $lt{'re'};
- if ($env{'form.bookmarks'}) {
- $buttontext = $lt{'ip'}
- }
- if ($env{'form.recover'} || $env{'form.bookmarks'}) {
+ if ($env{'form.recover'}) {
$r->print(<<END);
<input type="button" name="alter" value="$buttontext"
onClick="finish_import()" />
@@ -382,7 +355,7 @@
if ($clen > 0) {
$r->print(&Apache::loncommon::start_data_table()
.&Apache::loncommon::start_data_table_header_row());
- if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+ if (($env{'form.readfile'})) {
$r->print("<th>$lt{'in'}</th>\n");
} else {
$r->print('<th colspan="2">'.$lt{'co'}.'</th>'."\n");
@@ -397,9 +370,6 @@
} else {
$errtxt = 'There are no resources to import.';
}
- if ($env{'form.bookmarks'}) {
- $errtxt = 'There are no resources in your bookmarks to import.';
- }
$r->print('<p class="LC_info">'.&mt($errtxt).'</p>');
}
} else {
@@ -420,10 +390,10 @@
foreach my $resource (@resources) {
$ctr++;
my $iconname=&Apache::loncommon::icon($resource->{'url'});
- if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+ if (($clen > 1) || ($env{'form.readfile'})) {
$r->print(&Apache::loncommon::start_data_table_row()
."<td>");
- if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+ if (($env{'form.readfile'})) {
$r->print(&checkbox($ctr-1));
} else {
$r->print(&movers($clen,$ctr));
@@ -431,9 +401,9 @@
}
$r->print(&hidden($ctr-1,$resource->{'title'},$resource->{'url'},
$resource->{'id'}));
- if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+ if (($clen > 1) || ($env{'form.readfile'})) {
$r->print("</td>");
- unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+ unless (($env{'form.readfile'})) {
$r->print("<td>".
&select_box($clen,$ctr).
"</td>");
@@ -447,7 +417,7 @@
."\n");
}
}
- if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+ if (($clen > 1) || ($env{'form.readfile'})) {
if ($clen > 0) {
$r->print(&Apache::loncommon::end_data_table());
}
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.978 loncom/interface/loncommon.pm:1.979
--- loncom/interface/loncommon.pm:1.978 Wed Aug 18 17:59:28 2010
+++ loncom/interface/loncommon.pm Tue Aug 24 09:11:37 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.978 2010/08/18 17:59:28 raeburn Exp $
+# $Id: loncommon.pm,v 1.979 2010/08/24 09:11:37 wenzelju Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -6046,11 +6046,6 @@
font-style: normal;
}
-/* Preliminary fix to hide nav_bar inside bookmarks window */
-#LC_bookmarks #LC_nav_bar {
- display:none;
-}
-
ol.LC_primary_menu {
float: right;
margin: 0;
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.435 loncom/interface/londocs.pm:1.436
--- loncom/interface/londocs.pm:1.435 Mon Aug 16 08:58:39 2010
+++ loncom/interface/londocs.pm Tue Aug 24 09:11:37 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.435 2010/08/16 08:58:39 wenzelju Exp $
+# $Id: londocs.pm,v 1.436 2010/08/24 09:11:37 wenzelju Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2920,7 +2920,6 @@
'upld' => 'Import Document',
'srch' => 'Search',
'impo' => 'Import',
- 'book' => 'Import Bookmarks',
'wish' => 'Import from Wishlist',
'selm' => 'Select Map',
'load' => 'Load Map',
@@ -2994,7 +2993,6 @@
my @simpleeditdefaultforma = (
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
- { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/vbkm.png" alt="'.$lt{book}.'" onclick="javascript:groupopen(0,1,1);" />' => "<a class='LC_menubuttons_link' href='javascript:groupopen(0,1,1);'>$lt{'book'}</a>" },
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{wish}.'" onclick="javascript:open_Wishlist_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_Wishlist_Import();'>$lt{'wish'}</a>" },
);
$simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));
@@ -3123,7 +3121,7 @@
my $recoverform=(<<RFORM);
<form action="/adm/groupsort" method="post" name="recover">
- <a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1,0)">$lt{'reco'}</a>
+ <a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1)">$lt{'reco'}</a>
</form>
RFORM
@@ -3312,7 +3310,7 @@
my @tools = (
# {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
# {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
- {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1,0)" />'=>$recoverform},
+ {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1)" />'=>$recoverform},
);
my %orderhash = (
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.336 loncom/interface/lonmenu.pm:1.337
--- loncom/interface/lonmenu.pm:1.336 Fri Aug 20 17:53:40 2010
+++ loncom/interface/lonmenu.pm Tue Aug 24 09:11:38 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.336 2010/08/20 17:53:40 raeburn Exp $
+# $Id: lonmenu.pm,v 1.337 2010/08/24 09:11:38 wenzelju Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1107,15 +1107,6 @@
my $end_page_annotate =
&Apache::loncommon::end_page({'js_ready' => 1});
- my $start_page_bookmark =
- &Apache::loncommon::start_page('Bookmarks',undef,
- {'only_body' => 1,
- 'js_ready' => 1,
- 'bgcolor' => '#BBBBBB',});
-
- my $end_page_bookmark =
- &Apache::loncommon::end_page({'js_ready' => 1});
-
my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
&mt('Switch server?');
@@ -1272,13 +1263,6 @@
grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
}
-function edit_bookmarks() {
- go('');
- w_BookmarkPal_flag=1;
- bookmarkpal=window.open("/adm/bookmarks",
- "BookmarkPal", "width=500,height=505,scrollbars=0");
-}
-
function annotate() {
w_Annotator_flag=1;
annotator=window.open('','Annotator','width=365,height=265,scrollbars=0');
@@ -1292,28 +1276,6 @@
annotator.document.close();
}
-function set_bookmark() {
- go('');
- clienttitle=document.title;
- clienthref=location.pathname;
- w_bmquery_flag=1;
- bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
- bmquery.document.write(
- '$start_page_bookmark'
- +'<center><form method="post"'
- +' name="newlink" action="/adm/bookmarks" target="bmquery" '
- +'> <table width="340" height="150" '
- +'bgcolor="#FFFFFF" align="center"><tr><td>Link Name:<br /><input '
- +'type="text" name="title" size="45" value="'+clienttitle+'" />'
- +'<br />Address:<br /><input type="text" name="address" size="45" '
- +'value="'+clienthref+'" /><br /><center><input type="submit" '
- +'value="Save" /> <input type="button" value="Close" '
- +'onclick="javascript:window.close();" /></center></td>'
- +'</tr></table></form></center>'
- +'$end_page_bookmark' );
- bmquery.document.close();
-}
-
function set_wishlistlink(title, path) {
if (!title) {
title=document.title;
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.137 loncom/interface/mydesk.tab:1.138
--- loncom/interface/mydesk.tab:1.137 Tue Aug 10 14:30:20 2010
+++ loncom/interface/mydesk.tab Tue Aug 24 09:11:38 2010
@@ -198,7 +198,6 @@
8:1:clear
8:1:tools:reqcrsshc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rcr
8:1:tools:reqcrsnsc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rol
-9:2:any:any:vbkm.png:view[_1]:bookmark[_1]:edit_bookmarks():Use or edit my bookmark collection:set
9:3:pbre:$requested_domain:wishlist.png:view[_1]:wishlist[_1]:go('/adm/wishlist'):Wishlist:set
10:1:clear
10:1:any:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Announcements and my calendar:com
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.100 rat/lonratedt.pm:1.101
--- rat/lonratedt.pm:1.100 Fri Aug 20 08:13:38 2010
+++ rat/lonratedt.pm Tue Aug 24 09:11:40 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.100 2010/08/20 08:13:38 wenzelju Exp $
+# $Id: lonratedt.pm,v 1.101 2010/08/24 09:11:40 wenzelju Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -151,10 +151,10 @@
}
// ------------------------------------------------------ Open groupsort window
-function groupopen(url,recover,bookmarks) {
+function groupopen(url,recover) {
var options="scrollbars=1,resizable=1,menubar=0";
idxflag=1;
- idx=open("/adm/groupsort?inhibitmenu=yes&mode=$mode&recover="+recover+"&readfile="+url+"&bookmarks="+bookmarks,"idxout",options);
+ idx=open("/adm/groupsort?inhibitmenu=yes&mode=$mode&recover="+recover+"&readfile="+url,"idxout",options);
idx.focus();
}
@@ -491,7 +491,6 @@
'nt' => 'New Title',
'se' => 'Search',
'im' => 'Import',
- 'bk' => 'Import Bookmarks',
'wl' => 'Import from Wishlist',
'vi' => 'View',
'lm' => 'Load Map',
@@ -602,11 +601,9 @@
<input type="button" onClick=
"javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}" />
<input type="button" onClick=
-"javascript:impfortarget.value=1;groupopen(0,1,1);" value="$lt{'bk'}" />
-<input type="button" onClick=
"javascript:impfortarget.value=1;open_Wishlist_Import('simple');" value="$lt{'wl'}" />
<input type="button" onClick=
-"javascript:impfortarget.value=1;groupopen('$url',1,0);" value="$lt{'reco'}" />
+"javascript:impfortarget.value=1;groupopen('$url',1);" value="$lt{'reco'}" />
$lt{'as'}
<hr />
<input type="submit" name="moveup" value="$lt{'mu'}" />
Index: rat/lonratmenu.pm
diff -u rat/lonratmenu.pm:1.16 rat/lonratmenu.pm:1.17
--- rat/lonratmenu.pm:1.16 Fri Aug 20 08:13:38 2010
+++ rat/lonratmenu.pm Tue Aug 24 09:11:40 2010
@@ -2,7 +2,7 @@
# Build menu bar for Advanced RAT. Uses javascript code originally in
# static file: rat/client/code.html, now in rat/client/ratcode.js
#
-# $Id: lonratmenu.pm,v 1.16 2010/08/20 08:13:38 wenzelju Exp $
+# $Id: lonratmenu.pm,v 1.17 2010/08/24 09:11:40 wenzelju Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -108,9 +108,6 @@
'<a href="javascript:groupimport();">'
.&mt('Import').'</a>')
.&Apache::lonhtmlcommon::add_item_funclist(
- '<a href="javascript:bookmarkopen();">'
- .&mt('Import Bookmarks').'</a>')
- .&Apache::lonhtmlcommon::add_item_funclist(
'<a href="javascript:open_Wishlist_Import('."'advanced'".');">'
.&mt('Import from Wishlist').'</a>')
.&Apache::lonhtmlcommon::add_item_funclist(
Index: rat/client/ratcode.js
diff -u rat/client/ratcode.js:1.11 rat/client/ratcode.js:1.12
--- rat/client/ratcode.js:1.11 Mon May 3 12:39:49 2010
+++ rat/client/ratcode.js Tue Aug 24 09:11:43 2010
@@ -1,7 +1,7 @@
<!--
The LearningOnline Network
Resource Assembly Tool
-// $Id: ratcode.js,v 1.11 2010/05/03 12:39:49 bisitz Exp $
+// $Id: ratcode.js,v 1.12 2010/08/24 09:11:43 wenzelju Exp $
//
// Copyright Michigan State University Board of Trustees
//
@@ -1687,14 +1687,6 @@
idx=open("/adm/groupsort?inhibitmenu=yes&mode=rat&recover=1&readfile="+url,"idxout",options);
idx.focus();
}
-// ------------------------------------------------------- Open bookmark window
-function bookmarkopen() {
- var options="scrollbars=1,resizable=1,menubar=0";
- idxmode=mode;
- idxflag=1;
- idx=open("/adm/groupsort?inhibitmenu=yes&mode=rat&bookmarks=1","idxout",options);
- idx.focus();
-}
// ------------------------------------------------- Open browser to select map
var editbrowser;
function openbrowser(formname,elementname,only,omit) {
--wenzelju1282641104--