[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm lonquickgrades.pm
www
www@source.lon-capa.org
Tue, 03 May 2011 23:51:19 -0000
www Tue May 3 23:51:19 2011 EDT
Modified files:
/loncom/interface loncommon.pm lonquickgrades.pm
Log:
Work in progress: resource browser window
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1003 loncom/interface/loncommon.pm:1.1004
--- loncom/interface/loncommon.pm:1.1003 Tue May 3 21:38:40 2011
+++ loncom/interface/loncommon.pm Tue May 3 23:51:18 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1003 2011/05/03 21:38:40 www Exp $
+# $Id: loncommon.pm,v 1.1004 2011/05/03 23:51:18 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -438,21 +438,21 @@
sub resourcebrowser_javascript {
unless ($env{'request.course.id'}) { return ''; }
- return (<<'ENDSTDBRW');
+ return (<<'ENDRESBRW');
<script type="text/javascript" language="Javascript">
// <![CDATA[
var reseditbrowser;
- function openresbrowser(formname,uname,udom,clicker,roleflag,ignorefilter,courseadvonly) {
- var url = '/adm/pickresource?';
+ function openresbrowser(formname,reslink) {
+ var url = '/adm/pickresource?form='+formname+'&reslink='.reslink;
var title = 'Resource_Browser';
var options = 'scrollbars=1,resizable=1,menubar=0';
options += ',width=700,height=600';
- stdeditbrowser = open(url,title,options,'1');
- stdeditbrowser.focus();
+ reseditbrowser = open(url,title,options,'1');
+ reseditbrowser.focus();
}
// ]]>
</script>
-ENDSTDBRW
+ENDRESBRW
}
sub selectstudent_link {
@@ -483,6 +483,19 @@
return '';
}
+sub selectresource_link {
+ my ($form,$reslink,$arg)=@_;
+
+ my $callargs = "'".&Apache::lonhtmlcommon::entity_encode($form)."','".
+ &Apache::lonhtmlcommon::entity_encode($reslink)."'";
+ unless ($env{'request.course.id'}) { return $arg; }
+ return '<span class="LC_nobreak">'.
+ '<a href="javascript:openresbrowser('.$callargs.');">'.
+ $arg.'</a></span>';
+}
+
+
+
sub authorbrowser_javascript {
return <<"ENDAUTHORBRW";
<script type="text/javascript" language="JavaScript">
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.83 loncom/interface/lonquickgrades.pm:1.84
--- loncom/interface/lonquickgrades.pm:1.83 Mon Mar 28 01:26:39 2011
+++ loncom/interface/lonquickgrades.pm Tue May 3 23:51:19 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.83 2011/03/28 01:26:39 www Exp $
+# $Id: lonquickgrades.pm,v 1.84 2011/05/03 23:51:19 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -464,7 +464,8 @@
&output_category_table($r,$cangrade,$navmap,%categories);
#
if ($cangrade) {
- $r->print('<input type="hidden" name="storemove" value="" />'.
+ $r->print(&Apache::loncommon::resourcebrowser_javascript().
+ '<input type="hidden" name="storemove" value="" />'.
'<input type="hidden" name="cmd" value="" />'.
'<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" />'.
'<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>');
@@ -652,8 +653,8 @@
}
$r->print('</ul>');
if ($cangrade) {
- $r->print('<br />'.&mt('Add Problem or Folder').'<br />'.
- &Apache::lonstathelpers::problem_selector('.',undef,1,1,'addcont_'.$id.'_',1,'this.form.cmd.value="addcont_'.$id.'";this.form.submit();'));
+ $r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id.'_res',&mt('Add Problem or Folder')).'<br />'.
+ '<input type="hidden" name="addcont_'.$id.'_res" onChange='."'".'this.form.cmd.value="addcont_'.$id.'";this.form.submit();'."' />");
}
$r->print('</td>');