[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm mydesk.tab /localize/localize de.pm

www lon-capa-cvs-allow@mail.lon-capa.org
Wed, 11 Apr 2007 19:39:10 -0000


www		Wed Apr 11 15:39:10 2007 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm mydesk.tab 
    /loncom/localize/localize	de.pm 
  Log:
  Slightly different categories
  "oth" as fallback
  Update German
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.210 loncom/interface/lonmenu.pm:1.211
--- loncom/interface/lonmenu.pm:1.210	Wed Apr 11 11:37:04 2007
+++ loncom/interface/lonmenu.pm	Wed Apr 11 15:38:59 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.210 2007/04/11 15:37:04 albertel Exp $
+# $Id: lonmenu.pm,v 1.211 2007/04/11 19:38:59 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -965,6 +965,7 @@
         $prt=~s/\$udom/$udom/g;
         $prt=~s/\$crs/$crs/g; 
         $prt=~s/\$requested_domain/$requested_domain/g;
+        if ($category_names{$cat}!~/\w/) { $cat='oth'; }
         my $type = &Apache::loncommon::course_type();
         if ($type eq 'Group') {
             $desc = &convert_menu_function($desc,$type);
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.80 loncom/interface/mydesk.tab:1.81
--- loncom/interface/mydesk.tab:1.80	Tue Apr 10 22:42:00 2007
+++ loncom/interface/mydesk.tab	Wed Apr 11 15:38:59 2007
@@ -1,7 +1,7 @@
 # Categories
-# cat:column:row:title
+# cat:column,row:title
 cat:1,2:com:Communication
-cat:1,3:set:Settings
+cat:1,3:set:My Space
 cat:2,1:umn:User Management
 cat:2,2:cmn:Course Management
 cat:2,2:dmn:Domain Management
@@ -9,7 +9,8 @@
 cat:2,4:crc:Course Content
 cat:1,1:rol:My Roles
 cat:1,1:rcr:My Courses
-cat:2,5:oth:Other
+cat:1,4:cnt:Content Library
+cat:2,6:oth:Other
 
 # 
 # row:col:pro:prt:img:top:bot:act:txt:cat
@@ -59,7 +60,7 @@
 5:1:courseenv_student_classlist_view:any:clst.gif:course[_12]:roster[_1]:go('/adm/viewclasslist');:View course roster:umn
 5:1:pcst:$crs:enrl.gif:course[_7]:enroll[_1]:go('/adm/dropadd');:Manage student enrollment:umn
 #and groups in this course
-5:1:pmky:$requested_domain:keys.gif:manage[_1]:acc keys[_1]:go('/adm/managekeys');:Manage Access Keys
+5:1:pmky:$requested_domain:keys.gif:manage[_1]:acc keys[_1]:go('/adm/managekeys');:Manage Access Keys:dom
 5:2:clear
 5:2:pcst:$crs:cprv.gif:user[_1]:roles[_1]:go('/adm/createuser');:Create a user or modify the roles and privileges of a user:umn
 5:2:pcca:$requested_domain:cprv.gif:user[_1]:roles[_1]:go('/adm/createuser');:Create a user or modify the roles and privileges of a user:umn
@@ -73,9 +74,9 @@
 6:1:author:rca:cstr.gif:co con-[_1]:struct[_2]:go('/priv/$caname/');:Enter construction space as a co-author:rol
 6:1:pmau:$requested_domain:conf.gif:domain[_1]:config[_1]:go('/adm/domainprefs');:Set domain configuration:dom
 6:2:clear
-6:2:pbre:$requested_domain:res.gif:resource[_1]:space[_1]:go('/res/$udom/?launch=1');:Browse published resources:oth
-6:2:author:rau:res.gif:resource[_1]:space[_1]:go('/res/$udom/$uname/?launch=1');:Browse published resources:oth
-6:2:author:rca:res.gif:co res[_1]:space[_2]:go('/res/$udom/$uname/?launch=1');:Browse published resources:oth
+6:2:pbre:$requested_domain:res.gif:resource[_1]:space[_1]:go('/res/$udom/?launch=1');:Browse published resources:cnt
+6:2:author:rau:res.gif:resource[_1]:space[_1]:go('/res/$udom/$uname/?launch=1');:Browse published resources:cnt
+6:2:author:rca:res.gif:co res[_1]:space[_2]:go('/res/$udom/$uname/?launch=1');:Browse published resources:cnt
 6:3:clear
 6:3:pccc:$requested_domain:mcrs.gif:modify:course:go('/adm/modifycourse');:Modify course settings:cmn
 7:1:clear
@@ -91,14 +92,14 @@
 10:3:ppsa:$requested_domain:mail.gif:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail:com
 10:3:course_plc:any:bchat.gif:course[_10]:chat[_1]:chat_win();:Enter the chatroom for the course:com
 11:1:clear
-11:1:course:any:grps.gif:course[_12]:groups[_1]:go('/adm/coursegroups');:Enter my groups in the course:rcr
-11:1:course_vcg:any:grps.gif:course[_12]:groups[_1]:go('/adm/coursegroups');:Enter any group in the course:rcr
-11:1:course_mdg:any:grps.gif:course[_12]:groups[_1]:go('/adm/coursegroups');:Edit any group in the course:rcr
-11:2:any:any:port.gif:port-[_1]:folio[_1]:go('/adm/portfolio');:Enter my portfolio space:com
-11:3:any:any:blog.gif:edit[_1]:blogs[_1]:go('/adm/$udom/$uname/_rss.html');:Edit blogs, RSS feeds, and podcasts:com
+11:1:course:any:grps.gif:course[_12]:groups[_1]:go('/adm/coursegroups');:Enter my groups in the course:set
+11:1:course_vcg:any:grps.gif:course[_12]:groups[_1]:go('/adm/coursegroups');:Enter any group in the course:cmn
+11:1:course_mdg:any:grps.gif:course[_12]:groups[_1]:go('/adm/coursegroups');:Edit any group in the course:cmn
+11:2:any:any:port.gif:port-[_1]:folio[_1]:go('/adm/portfolio');:Enter my portfolio space:set
+11:3:any:any:blog.gif:edit[_1]:blogs[_1]:go('/adm/$udom/$uname/_rss.html');:Edit blogs, RSS feeds, and podcasts:set
 12:1:clear
-12:1:any:any:src.gif:search[_3]:prtfolio[_1]:go('/adm/searchcat');:Search the database of accessible portfolio files:com
-12:1:course:any:src.gif:search[_1]:course[_11]:go('/adm/searchcat');:Search the contents of this course or accessible portfolio files:com
-12:1:pbre:$requested_domain:src.gif:search[_2]:library[_1]:go('/adm/searchcat');:Search the database of published resources and accessible portfolio files:com
+12:1:any:any:src.gif:search[_3]:prtfolio[_1]:go('/adm/searchcat');:Search the database of accessible portfolio files:cnt
+12:1:course:any:src.gif:search[_1]:course[_11]:go('/adm/searchcat');:Search the contents of this course or accessible portfolio files:cnt
+12:1:pbre:$requested_domain:src.gif:search[_2]:library[_1]:go('/adm/searchcat');:Search the database of published resources and accessible portfolio files:cnt
 12:2:any:any:pref.gif:prefer-[_1]:ences[_1]:go('/adm/preferences');:Set my user preferences:set
 12:3:any:any:logout.gif:exit[_1]: [_1]:go('/adm/logout');:Exit LON-CAPA:oth
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.82 loncom/localize/localize/de.pm:1.83
--- loncom/localize/localize/de.pm:1.82	Wed Mar  7 12:34:59 2007
+++ loncom/localize/localize/de.pm	Wed Apr 11 15:39:09 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.82 2007/03/07 17:34:59 raeburn Exp $
+# $Id: de.pm,v 1.83 2007/04/11 19:39:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6804,7 +6804,7 @@
    'Modify Resource Parameters - Overview Mode'
 => 'Ändern von Ressourcen-Parametern - Übersichtsmodus',
 
-   'Modify parameter settings for resources and the course'
+   'Modify parameter settings (due dates, etc) for resources and the course'
 => 'Kurs- und Ressourcen-Parameter',
 
    'Modify parameter settings for this resource'