[LON-CAPA-cvs] cvs: loncom /html/res/adm/pages menu.html /interface mydesk.tab /xml lonxml.pm

www lon-capa-cvs@mail.lon-capa.org
Tue, 12 Nov 2002 20:11:10 -0000


This is a MIME encoded message

--www1037131870
Content-Type: text/plain

www		Tue Nov 12 15:11:10 2002 EDT

  Modified files:              
    /loncom/html/res/adm/pages	menu.html 
    /loncom/interface	mydesk.tab 
    /loncom/xml	lonxml.pm 
  Log:
  Extended display works now.
  
  
--www1037131870
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20021112151110.txt"

Index: loncom/html/res/adm/pages/menu.html
diff -u loncom/html/res/adm/pages/menu.html:1.75 loncom/html/res/adm/pages/menu.html:1.76
--- loncom/html/res/adm/pages/menu.html:1.75	Tue Nov 12 13:20:33 2002
+++ loncom/html/res/adm/pages/menu.html	Tue Nov 12 15:11:10 2002
@@ -4,7 +4,7 @@
 Remote Control
 
 //
-// $Id: menu.html,v 1.75 2002/11/12 18:20:33 www Exp $
+// $Id: menu.html,v 1.76 2002/11/12 20:11:10 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -360,14 +360,15 @@
   '<html><body bgcolor="#666666" text="#DDDDDD" link="#666666">'+
   '<h2>LON-CAPA Extended Display Remote Control</h2>'+
   '<script>var currentURL="'+currentURL+'";self.focus();</script>'+
-  '<table border="2">');
+  '<table border="2"><tr><th>Select Functionality from Below</th>'+
+  '<th>Description</th></tr>');
    for (var i=0; i<=ds.length; i++) {
        if (typeof(ds[i])!='undefined') {
           if (ds[i]!='') {
              extdisp.document.writeln(
                 '<tr><td><a href="javascript:opener.'+
                   hr[i]+';self.close();"><img border="0" src="'+
-                  this.document['b'+i].src+'" /><br />'+
+                  this.document['b'+i].src+'" /></a><br />'+
   '<table hspace="0" border="0" cellspacing="1" cellpadding="0"><tr>');
              for (var j=0;j<=7;j++) {
                 if (j<dt[i].length) {
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.30 loncom/interface/mydesk.tab:1.31
--- loncom/interface/mydesk.tab:1.30	Thu Oct 10 13:17:11 2002
+++ loncom/interface/mydesk.tab	Tue Nov 12 15:11:10 2002
@@ -11,47 +11,47 @@
 # course         allowed if in course
 # author         allowed if an author
 #
-1:1:smp:any:courses.gif:choose:course:go('/adm/roles');:Choose Course
-1:1:smp:rst:courses.gif:switch:course:go('/adm/roles');:Switch Course
-1:1:adv:any:roles.gif:switch:role:go('/adm/roles');:Switch Role
-1:1:adv:rcm:roles.gif:choose:role:go('/adm/roles');:Choose Role
+1:1:smp:any:courses.gif:choose:course:go('/adm/roles');:Choose the course to work on
+1:1:smp:rst:courses.gif:switch:course:go('/adm/roles');:Switch to another course
+1:1:adv:any:roles.gif:switch:role:go('/adm/roles');:Switch to another user role
+1:1:adv:rcm:roles.gif:choose:role:go('/adm/roles');:Choose the user role
 1:2:clear
-1:2:course:any:docs.gif:course:docs:go('/adm/coursedocs');:Course Documents
+1:2:course:any:docs.gif:course:docs:go('/adm/coursedocs');:Documents included in this course
 2:1:clear
 2:2:clear
-2:2:course:any:nav.gif:navigate:contents:gopost('/adm/navmaps',currentURL);:Navigate Contents
+2:2:course:any:nav.gif:navigate:contents:gopost('/adm/navmaps',currentURL);:Navigate the table of contents for this course
 2:3:clear
 3:1:clear
 4:1:clear
-4:1:course:any:grds.gif:my:grades:go('/adm/studentcalc');:Check My Grades
-4:1:pvgr:$crs:sprs.gif:course:grades:go('/adm/classcalc');:Check Course Grades
+4:1:course:any:grds.gif:my:grades:go('/adm/studentcalc');:Calculate my grade
+4:1:pvgr:$crs:sprs.gif:course:grades:go('/adm/classcalc');:Calculate course grades
 4:2:clear
-4:2:pvgr:$crs:chrt.gif:course:chart:gopost('/adm/statistics','Student Assessment');:Course Assessment Chart
+4:2:pvgr:$crs:chrt.gif:course:chart:gopost('/adm/statistics','Student Assessment');:View the course assessment progress chart
 4:3:clear
-4:3:pvgr:$crs:stat.gif:course:stats:gopost('/adm/statistics','Problem Statistics');:Course Assessment Statistics
+4:3:pvgr:$crs:stat.gif:course:stats:gopost('/adm/statistics','Problem Statistics');:View course assessment statistics
 5:1:clear
-5:1:pcst:$crs:enrl.gif:course:enroll:go('/adm/dropadd');:Drop/Add Students
+5:1:pcst:$crs:enrl.gif:course:enroll:go('/adm/dropadd');:Drop/Add students in this course
 5:2:clear
-5:2:pcst:$crs:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
-5:2:pcca:$requested_domain:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
-5:2:pmau:$requested_domain:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
+5:2:pcst:$crs:cprv.gif:user:roles:go('/adm/createuser');:Create a user or modify the roles and privileges of a user
+5:2:pcca:$requested_domain:cprv.gif:user:roles:go('/adm/createuser');:Create a user or modify the roles and privileges of a user
+5:2:pmau:$requested_domain:cprv.gif:user:roles:go('/adm/createuser');:Create a user or modify the roles and privileges of a user
 5:3:clear
-5:3:pccc:$requested_domain:ccrs.gif:create:course:go('/adm/createcourse');:Create New Course
-5:3:popa:$crs:parm.gif:course:parms:go('/adm/parmset');:Set Parameters/Deadlines/etc
+5:3:pccc:$requested_domain:ccrs.gif:create:course:go('/adm/createcourse');:Create a new course
+5:3:popa:$crs:parm.gif:course:parms:go('/adm/parmset');:Set deadlines and other assessment parameters, as well as modify course environment 
 6:1:clear
-6:1:author:any:cstr.gif:con-:struct:cstrgo(currentURL,'/priv/$uname/');:Enter Construction Space
-6:1:author:rca:cstr.gif:co con-:struct:cstrgo(currentURL,'/priv/$uname/');:Enter Co-Construction Space
+6:1:author:any:cstr.gif:con-:struct:cstrgo(currentURL,'/priv/$uname/');:Enter my resource construction space
+6:1:author:rca:cstr.gif:co con-:struct:cstrgo(currentURL,'/priv/$uname/');:Enter construction space as a co-author
 6:2:clear
-6:2:author:any:res.gif:resource:space:go('/res/$udom/$uname/?launch=1');:Browse Published Resources
-6:2:author:rca:res.gif:co res:space:go('/res/$udom/$uname/?launch=1');:Browse Published Resources
+6:2:author:any:res.gif:resource:space:go('/res/$udom/$uname/?launch=1');:Browse published resources
+6:2:author:rca:res.gif:co res:space:go('/res/$udom/$uname/?launch=1');:Browse published resources
 6:3:clear
 7:2:clear
-7:2:adv:rcm:egrd.gif:enter:grades:go('/adm/grades');:Enter Grades
+7:2:adv:rcm:egrd.gif:enter:grades:go('/adm/grades');:Enter grades from check-out assessment resources
 10:1:clear
-10:1:any:any:anno.gif:calendar:announce:go('/adm/announcements');:Announcements and Calendar
-10:2:any:any:com.gif:commu-:nication:go('/adm/communicate');:Communicate/Messages
+10:1:any:any:anno.gif:calendar:announce:go('/adm/announcements');:Course announcements and my calendar
+10:2:any:any:com.gif:commu-:nication:go('/adm/communicate');:Sned and receive messages
 10:3:clear
-10:3:course:any:bchat.gif:course:chat:go('/res/adm/pages/chatroom.html');:Chat
-11:1:adv:any:src.gif:search:library:go('/adm/searchcat');:Search Published Resources
-11:2:any:any:pref.gif:prefer-:ences:go('/adm/preferences');:Set Preferences
-11:3:any:any:logout.gif:exit::go('/adm/logout');:Exit
+10:3:course:any:bchat.gif:course:chat:go('/res/adm/pages/chatroom.html');:Enter the chatroom for the course
+11:1:adv:any:src.gif:search:library:go('/adm/searchcat');:Search the database of published resources
+11:2:any:any:pref.gif:prefer-:ences:go('/adm/preferences');:Set my user preferences
+11:3:any:any:logout.gif:exit::go('/adm/logout');:Exit LON-CAPA
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.213 loncom/xml/lonxml.pm:1.214
--- loncom/xml/lonxml.pm:1.213	Thu Nov  7 14:33:52 2002
+++ loncom/xml/lonxml.pm	Tue Nov 12 15:11:10 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.213 2002/11/07 19:33:52 albertel Exp $
+# $Id: lonxml.pm,v 1.214 2002/11/12 20:11:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -404,17 +404,20 @@
         if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDSUBM);
-                     menu.switchbutton(7,1,'subm.gif','view sub','missions','gocmd("/adm/grades","submission")');
+                     menu.switchbutton(7,1,'subm.gif','view sub','missions','gocmd("/adm/grades","submission")',
+                     'View user submissions for this assessment resource');
 ENDSUBM
             }
 	    if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDGRDS);
-                     menu.switchbutton(7,2,'pgrd.gif','problem','grades','gocmd("/adm/grades","gradingmenu")');
+                     menu.switchbutton(7,2,'pgrd.gif','problem','grades','gocmd("/adm/grades","gradingmenu")',
+                     'Modify user grades for this assessment resource');
 ENDGRDS
             }
 	    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDPARM);
-                     menu.switchbutton(7,3,'pparm.gif','problem','parms','gocmd("/adm/parmset","set")');
+                     menu.switchbutton(7,3,'pparm.gif','problem','parms','gocmd("/adm/parmset","set")',
+                     'Modify deadlines, etc, for this assessment resource');
 ENDPARM
             }
 	}
@@ -430,26 +433,28 @@
           $newmail
 	  menu.currentURL=window.location.pathname;
           menu.reloadURL=window.location.pathname;
+          menu.currentSymb="$ENV{'request.symb'}";
+          menu.reloadSymb="$ENV{'request.symb'}";
           menu.currentStale=0;
           menu.clearbut(3,1);
           menu.switchbutton
        (6,3,'catalog.gif','catalog','info','catalog_info()');
           menu.switchbutton
-       (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)');
+       (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)','Provide my evaluation of this resource');
           menu.switchbutton
-    (8,2,'fdbk.gif','feedback','discuss','gopost("/adm/feedback",currentURL)');
+    (8,2,'fdbk.gif','feedback','discuss','gopost("/adm/feedback",currentURL)','Provide feedback messages or contribute to the course discussion about this resource');
           menu.switchbutton
-     (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)');
+     (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)','Prepare a printable document');
           menu.switchbutton
-       (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)');
+       (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)','Go to the previous resource in the course sequence');
           menu.switchbutton
-     (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)');
+     (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)','Go to the next resource in the course sequence');
           menu.switchbutton
-                            (9,1,'sbkm.gif','set','bookmark','set_bookmark()');
+                            (9,1,'sbkm.gif','set','bookmark','set_bookmark()','Set a bookmark for this resource');
           menu.switchbutton
-                         (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()');
+                         (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()','Use or edit my bookmark collection');
           menu.switchbutton
-                               (9,3,'anot.gif','anno-','tations','annotate()');
+                               (9,3,'anot.gif','anno-','tations','annotate()','Make notes and annotations about this resource');
           $hwkadd
     }
 
@@ -458,7 +463,7 @@
           menu.currentStale=1;
           if (menu.reloadURL!='' && menu.reloadURL!= null) { 
              menu.switchbutton
-             (3,1,'reload.gif','return','location','go(reloadURL)');
+             (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence');
 	  }
           menu.clearbut(7,1);
           menu.clearbut(7,2);

--www1037131870--