[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm loncreatecourse.pm lonnotify.pm /localize/localize de.pm
bisitz
bisitz@source.lon-capa.org
Fri, 14 May 2010 18:29:52 -0000
This is a MIME encoded message
--bisitz1273861792
Content-Type: text/plain
bisitz Fri May 14 18:29:52 2010 EDT
Modified files:
/loncom/localize/localize de.pm
/loncom/interface loncommon.pm lonnotify.pm loncreatecourse.pm
Log:
Bug 6273 - Consistent menus (use generate_menu)
Reuse existing icons where reasonable. Some icons are only temporary - category fits though.
- Send and display broadcast e-mail
- Course and community creation
Other included changes:
- loncreatecourse.pm:
- Localization - added missing mt call to button text
- de.pm:
- Added translations
--- Work in progress ---
--bisitz1273861792
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20100514182952.txt"
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.379 loncom/localize/localize/de.pm:1.380
--- loncom/localize/localize/de.pm:1.379 Mon May 3 13:53:50 2010
+++ loncom/localize/localize/de.pm Fri May 14 18:29:35 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.379 2010/05/03 13:53:50 bisitz Exp $
+# $Id: de.pm,v 1.380 2010/05/14 18:29:35 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -14838,8 +14838,14 @@
'Broadcast e-mail to Domain'
=> 'Broadcast-E-Mail an Domäne',
+ 'Send e-mail to selected users'
+=> 'E-Mail an ausgewählte Benutzer senden',
+
'Send a new e-mail to selected users from this domain'
-=> 'Senden einer neuen E-Mail an ausgewählte Benutzer dieser Domäne',
+=> 'Senden einer E-Mail an ausgewählte Benutzer dieser Domäne',
+
+ 'Display sent e-mails'
+=> 'Anzeige gesendeter E-Mails',
'Display e-mail sent by Domain Coordinators in this domain'
=> 'Anzeige von Domänen-Koordinatoren gesendeter E-Mails in dieser Domäne',
@@ -16302,6 +16308,9 @@
'Community Creation'
=> 'Community-Erstellung',
+ 'Course/ommunity Creation'
+=> 'Kurs-/Community-Erstellung',
+
'User Management in course'
=> 'Benutzerverwaltung im Kurs',
@@ -17997,6 +18006,9 @@
'Display Course/Community Catalog link?'
=> 'Link zum Kurs-/Community-Katalog anzeigen?',
+ 'View creation log'
+=> 'Erstellungsprotokoll anzeigen',
+
'Display information about when, how and by whom courses and communities were created in this domain.'
=> 'Zeige Informationen darüber, wann, wie und von wem Kurse und Communitys in dieser Domäne erzeugt wurden.',
@@ -18252,8 +18264,8 @@
"Select a user name to view the user's personal page."
=> "Wählen Sie einen Benutzernamen um die Persönliche Seite des Benutzers zu betrachten.",
-'Select all that are <b>[_1]</b>.'
-=> 'Alle auswählen, die <b>[_1]</b> sind.',
+ 'Select all that are <b>[_1]</b>.'
+=> 'Wählen Sie alle aus, die <b>[_1]</b> sind.',
'Selected [_1]Problems[_2] from page [_3]'
=> 'Ausgewählte [_1]Aufgaben[_2] von Seite [_3]',
@@ -18438,6 +18450,12 @@
'Upload a courses or communities attributes file'
=> 'Eine Kurs- oder Community-Attributedatei hochladen',
+ 'Upload Course/Community Attributes File'
+=> 'Eine Kurs-/Community-Attributedatei hochladen',
+
+ 'Create Courses/Communities'
+=> 'Kurse/Communitys erstellen',
+
'Upload an attributes file containing specifications for one or more courses or communities in XML format.'
=> 'Eine Attributedatei hochladen, die Spezifikationen für ein oder mehrere Kurse oder Communitys im XML-Format beinhaltet.',
@@ -18723,9 +18741,24 @@
'Disk usage [_1] exceeds the quota for this community.'
=> 'Speicherplatzbedarf übersteigt [_1] den zugewiesenen Speicherplatz.', #[_1] = now oder leer
+ 'Display official course requests'
+=> 'Offizielle Kursanträge anzeigen',
+
+ 'Display Pending Queue'
+=> 'Anzeige der Warteschlange offener Punkte',
+
+ 'There are currently no requests for official courses awaiting validation.'
+=> 'Derzeit gibt es keine Anträge auf offizielle Kurse, die auf Validierung warten.',
+
+ 'Display official course requests submitted by authorized users, held pending validation of instructor status.'
+=> 'Zeige Kursanträge, die durch autorisierte Benutzer eingereicht wurden und auf Validierung durch einen Dozenten warten.',
+
'Display course and community creation requests submitted by authorized users, held pending approval by a Domain Coordinator.'
=> 'Zeige Anträge zu Kurs- und Community-Erstellung, die durch autorisierte Benutzer eingereicht wurden und auf Zustimmung durch einen Domänen-Koordinator warten.',
+ 'Course/Community requests queued pending approval by a Domain Coordinator'
+=> 'Kurs-/Community-Anträge, die auf Zustimmung durch einen Domänen-Koordinator warten.',
+
'Display listing of contents in a new folder, with folder name:'
=> 'Zeige eine Liste des Inhalts in einem neuen Verzeichnis mit dem Verzeichnisnamen:',
@@ -19403,6 +19436,9 @@
'Course Settings'
=> 'Kurs-Einstellungen',
+ 'Course/Community Creation'
+=> 'Kurs/Community-Erstellung',
+
'Course and community creation'
=> 'Kurs- und Community-Erstellung',
@@ -19838,8 +19874,8 @@
'Visited link'
=> 'Besuchter link',
- 'Window during which course was created:'
-=> 'Zeitfenster, in dem der Kurs erstellt wurde:',
+ 'Window during which course/community was created:'
+=> 'Zeitfenster, in dem der Kurs/die Community erstellt wurde:',
'With validation'
=> 'mit Bestätigung',
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.967 loncom/interface/loncommon.pm:1.968
--- loncom/interface/loncommon.pm:1.967 Thu May 6 16:16:02 2010
+++ loncom/interface/loncommon.pm Fri May 14 18:29:52 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.967 2010/05/06 16:16:02 bisitz Exp $
+# $Id: loncommon.pm,v 1.968 2010/05/14 18:29:52 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5580,16 +5580,6 @@
padding: 0;
}
-table.LC_notify_front_page {
- background: white;
- border: 1px solid black;
- padding: 8px;
-}
-
-table.LC_notify_front_page td {
- padding: 8px;
-}
-
.LC_navbuttons {
margin: 2ex 0ex 2ex 0ex;
}
Index: loncom/interface/lonnotify.pm
diff -u loncom/interface/lonnotify.pm:1.35 loncom/interface/lonnotify.pm:1.36
--- loncom/interface/lonnotify.pm:1.35 Wed May 20 20:27:37 2009
+++ loncom/interface/lonnotify.pm Fri May 14 18:29:52 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Sending messages
#
-# $Id: lonnotify.pm,v 1.35 2009/05/20 20:27:37 raeburn Exp $
+# $Id: lonnotify.pm,v 1.36 2010/05/14 18:29:52 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -118,7 +118,7 @@
$start_page
$breadcrumbs
<br />
-<form name="$formname" method="post">
+<form name="$formname" method="post" action="">
ENDONE
return $output;
@@ -143,19 +143,35 @@
}
|;
- my $output = &start_page(&add_script($jscript),
- 'Broadcast e-mail to Domain', $formname);
-
- $output .= '<input type="hidden" name="command" />';
- $output .= '<table class="LC_notify_front_page">'.
- '<tr><td><a href="javascript:next_page('."'new'".')">'.
- &mt('Send a new e-mail to selected users from this domain').'</a></td></tr><tr>'.
- '<td><a href="javascript:next_page('."'view'".')">'.
- &mt('Display e-mail sent by Domain Coordinators in this domain').
- '</a></td></tr></table>';
- $output .= &end_page();
- $r->print($output);
+ my @menu=
+ ({ categorytitle=>'Broadcast e-mail to Domain',
+ items =>[
+ { linktext => 'Send e-mail to selected users',
+ url => 'javascript:next_page('."'new'".')',
+ permission => 1,
+ #help => '',
+ icon => 'mail-reply-all.png',
+ linktitle => 'Send a new e-mail to selected users from this domain'
+ },
+ { linktext => 'Display sent e-mails',
+ url => 'javascript:next_page('."'view'".')',
+ permission => 1,
+ #help => '',
+ icon => 'messalog.png',
+ linktitle => 'Display e-mail sent by Domain Coordinators in this domain'
+ },
+ ]
+ },
+ );
+
+ $r->print(
+ &start_page(&add_script($jscript),
+ 'Broadcast e-mail to Domain', $formname)
+ .'<input type="hidden" name="command" />'
+ .&Apache::lonhtmlcommon::generate_menu(@menu)
+ .&end_page()
+ );
return;
}
Index: loncom/interface/loncreatecourse.pm
diff -u loncom/interface/loncreatecourse.pm:1.137 loncom/interface/loncreatecourse.pm:1.138
--- loncom/interface/loncreatecourse.pm:1.137 Tue Apr 13 21:19:15 2010
+++ loncom/interface/loncreatecourse.pm Fri May 14 18:29:52 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.137 2010/04/13 21:19:15 raeburn Exp $
+# $Id: loncreatecourse.pm,v 1.138 2010/05/14 18:29:52 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -699,62 +699,78 @@
my $end_page =
&Apache::loncommon::end_page();
my $helplink=&Apache::loncommon::help_open_topic('Create_Course_Community',&mt('Help on Creating Courses and Communities'));
- my @choices = ({ internal_name => 'courseone',
- name => &mt('Create a single course'),
- short_description => &mt('Create a new course by completing an online form.'),
- });
- if ($show_all_choices) {
- push(@choices,{ internal_name => 'groupone',
- name => &mt('Create a single community'),
- short_description =>
- &mt('Create a new collaborative community by completing an online form.'),
- },
- { internal_name => 'batchone',
- name => &mt('Create courses/communities by uploading an attributes file'),
- short_description =>
- &mt('Upload an attributes file containing specifications for one or more courses or communities in XML format.'),
- help => 'Batch_Creation',
- },
- { internal_name => 'requestdisplay',
- name => &mt('Approve or reject requests'),
- short_description =>
- &mt('Display course and community creation requests submitted by authorized users, held pending approval by a Domain Coordinator.'),
- },
- { internal_name => 'pendingdisplay',
- name => &mt('Display official course requests'),
- short_description =>
- &mt('Display official course requests submitted by authorized users, held pending validation of instructor status.'),
- },
- { internal_name => 'creationlog',
- name => &mt('View creation log'),
- short_description =>
- &mt('Display information about when, how and by whom courses and communities were created in this domain.'),
- });
- } else {
- push(@choices,{ internal_name => 'batchone',
- name => &mt('Create courses by uploading an attributes file'),
- short_description =>
- &mt('Upload an attributes file containing specifications for one or more courses in XML format.'),
- help => 'Batch_Creation',
- });
- }
- my $options;
- foreach my $choice (@choices) {
- $options .=' <h3><a href="/adm/createcourse?phase='.
- $choice->{'internal_name'}.'" >'.
- $choice->{'name'}.'</a>';
- if (exists($choice->{'help'})) {
- $options .= &Apache::loncommon::help_open_topic($choice->{'help'});
- }
- $options .= "</h3>\n".' '.(' 'x8).$choice->{'short_description'}.
- "\n";
- }
- $r->print(<<ENDDOCUMENT);
-$start_page
-$crumbs
-$options
-$end_page
-ENDDOCUMENT
+
+ # Create menu
+ my @menu;
+ @menu =
+ ({ categorytitle => 'Course/Community Creation',
+ items => [
+ {
+ linktext => 'Create a single course',
+ url => '/adm/createcourse?phase=courseone',
+ permission => 1,
+ #help => '',
+ icon => 'ccrs.png',
+ linktitle => 'Create a new course by completing an online form.'
+ },
+ {
+ linktext => 'Create a single community',
+ url => '/adm/createcourse?phase=groupone',
+ permission => $show_all_choices,
+ #help => '',
+ icon => 'ccrs.png',
+ linktitle => 'Create a new collaborative community by completing an online form.'
+ },
+ {
+ linktext => 'Create courses/communities by uploading an attributes file',
+ url => '/adm/createcourse?phase=batchone',
+ permission => 1,
+ help => 'Batch_Creation',
+ icon => 'ccrs.png',
+ linktitle => 'Upload an attributes file containing specifications for one or more courses or communities in XML format.'
+ },
+ ]
+ },
+ { categorytitle => 'Course/Community Requests',
+ items => [
+ {
+ linktext => 'Approve or reject requests',
+ url => '/adm/createcourse?phase=requestdisplay',
+ permission => $show_all_choices,
+ #help => '',
+ icon => 'ccrs.png',
+ linktitle => 'Display course and community creation requests submitted by authorized users, held pending approval by a Domain Coordinator.'
+ },
+ {
+ linktext => 'Display official course requests',
+ url => '/adm/createcourse?phase=pendingdisplay',
+ permission => $show_all_choices,
+ #help => '',
+ icon => 'ccrs.png',
+ linktitle => 'Display official course requests submitted by authorized users, held pending validation of instructor status.'
+ },
+ ]
+ },
+ { categorytitle => 'Administration',
+ items => [
+ {
+ linktext => 'View creation log',
+ url => '/adm/createcourse?phase=creationlog',
+ permission => $show_all_choices,
+ #help => '',
+ icon => 'document-properties.png',
+ linktitle => 'Display information about when, how and by whom courses and communities were created in this domain.'
+ },
+ ]
+ },
+ );
+
+ $r->print(
+ $start_page
+ .$crumbs
+ .&Apache::lonhtmlcommon::generate_menu(@menu)
+ .$end_page
+ );
}
sub upload_batchfile {
@@ -771,7 +787,7 @@
'<input type="file" name="coursecreatorxml" />'.
'<input type="hidden" name="phase" value="batchtwo" /><br /><br />'.
'<input type="submit" name="batchsubmit" '.
- 'value="Create Courses/Communities" /></form>');
+ 'value="'.&mt('Create Courses/Communities').'" /></form>');
$r->print($end_page);
return;
}
--bisitz1273861792--