[LON-CAPA-cvs] cvs: loncom /localize/localize de.pm rat lonratedt.pm

bisitz bisitz@source.lon-capa.org
Wed, 20 May 2009 13:55:50 -0000


bisitz		Wed May 20 13:55:50 2009 EDT

  Modified files:              
    /rat	lonratedt.pm 
    /loncom/localize/localize	de.pm 
  Log:
  Changes related to modification of LON-CAPA screen header.
  start_page calls:
  - Added breadcrumbs (only basic call)
  - Added head_subbox and included CSTR standard header
  - Moved edit buttons to head_subbox and removed <hr />
  
  "no such dir" error screen:
  - Added page header
  - Added standard error style to error message
  - Added &mt() to error message
  - Standard style for path/filename
  
  de.pm:
  - Added translation for error message
  - Optimized German wording for Simple Edit
  
  
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.94 rat/lonratedt.pm:1.95
--- rat/lonratedt.pm:1.94	Thu Apr 23 17:31:25 2009
+++ rat/lonratedt.pm	Wed May 20 13:55:40 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.94 2009/04/23 17:31:25 bisitz Exp $
+# $Id: lonratedt.pm,v 1.95 2009/05/20 13:55:40 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,6 +58,7 @@
       &Apache::loncommon::start_page('Edit Sequence',$js,
 				     {'frameset'    => 1,
 				      'add_entries' => \%layout});
+
   my $end_page = 
       &Apache::loncommon::end_page({'frameset' => 1});
 
@@ -87,7 +88,7 @@
 	$output.='<input type="submit" name="forceadv" value="'.&mt('Advanced Edit').'" />'.
 	    &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');
     }
-    return $output.'</form><hr />';
+    return $output.'</form>';
 }
 
 # ----------------------------------------------------------------- Edit script
@@ -214,7 +215,6 @@
 
 sub smpedt {
    my ($r,$url,$errtext)=@_;
-   my $buttons=&buttons(2);
    my $tmpfn=&Apache::lonnet::filelocation('',$url).'.tmp';
    my $targetmsg='';
    if ($env{'form.save'}) {
@@ -540,15 +540,18 @@
 </script>
 ENDJS
 
-    my $start_page = &Apache::loncommon::start_page(undef,$js).
-        &Apache::loncommon::help_open_menu('Sequence_Simple_Editor_Creation',
-					   'Sequence_Simple_Editor_Creation',
-					   6,'RAT');    
+    my $start_page = &Apache::loncommon::start_page('Construction Space',$js)
+                    .&Apache::lonhtmlcommon::breadcrumbs(# FIXME add breadcrumbs
+                         &Apache::loncommon::help_open_menu('Sequence_Simple_Editor_Creation',
+                             'Sequence_Simple_Editor_Creation',
+                             6,'RAT'))
+                    .&Apache::loncommon::head_subbox(
+                         &Apache::loncommon::CSTR_pageheader()
+                        .&buttons(2));
     my $end_page = &Apache::loncommon::end_page();
 
     $r->print(<<ENDSMPHEAD);
 $start_page
-$buttons
 <span class="LC_error">$errtext</span>
 <form name="simpleedit" method="post">
 <input type="hidden" name="forcesmp" value="1" />
@@ -624,21 +627,28 @@
 sub nodir {
    my ($r,$dir)=@_;
    $dir=~s{^/home/$LONCAPA::username_re/public_html}{};
-   $r->print(&Apache::loncommon::start_page(undef,undef,
-					    {'only_body' => 1,
-					     'bgcolor'   => '#FFFFFF',}).
-	     "<h1>No such directory: $dir</h1>".
-	     &Apache::loncommon::end_page());
+   $r->print(&Apache::loncommon::start_page('Construction Space',undef)
+            .&Apache::lonhtmlcommon::breadcrumbs() # FIXME add breadcrumbs
+            .&Apache::loncommon::head_subbox(
+                 &Apache::loncommon::CSTR_pageheader())
+            .'<p class="LC_error">'
+            .&mt('No such directory: [_1]','<span class="LC_filename">'.$dir.'</span>'
+            .'</p>'
+            .&Apache::loncommon::end_page())
+   );
 }
 
 # ---------------------------------------------------------------- View Handler
 
 sub viewmap {
     my ($r,$url,$adv,$errtext)=@_;
-    $r->print(
-	      &Apache::loncommon::start_page('Edit Content of a Map').
-	      &Apache::loncommon::help_open_menu('','',6,'RAT').
-	      &buttons($adv));
+    $r->print(&Apache::loncommon::start_page('Edit Content of a Map')
+             .&Apache::lonhtmlcommon::breadcrumbs(# FIXME add breadcrumbs
+                  &Apache::loncommon::help_open_menu('','',6,'RAT')) # FIXME help broken?
+             .&Apache::loncommon::head_subbox(
+                  &Apache::loncommon::CSTR_pageheader()
+                 .&buttons($adv))
+    );
     if ($errtext) {
 	$r->print('<div class="LC_error">'
                  .$errtext
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.303 loncom/localize/localize/de.pm:1.304
--- loncom/localize/localize/de.pm:1.303	Wed May 20 09:50:07 2009
+++ loncom/localize/localize/de.pm	Wed May 20 13:55:50 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.303 2009/05/20 09:50:07 bisitz Exp $
+# $Id: de.pm,v 1.304 2009/05/20 13:55:50 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4176,7 +4176,7 @@
 => 'Parameter',
 
    'Paste after selected'
-=> 'In Auswahl einfügen',
+=> 'Nach der Auswahl einfügen',
 
    'Personal Data'
 => 'Persönliche Daten',
@@ -4566,7 +4566,7 @@
 => 'Eine komma-separierte Liste institutioneller Sektionsnummern, jeweils getrennt durch einen Doppelpunkt von der in LON-CAPA verwendeten entsprechenden (optionalen) Sektions-ID, z.B. 001:1,002:2',
 
    'after selected'
-=> 'nach erfolgter Auswahl',
+=> 'Einfügen nach der Auswahl',
 
    'and'
 => 'und',
@@ -11459,6 +11459,9 @@
    'Construction space'
 => 'Konstruktionsbereich',
 
+   'No such directory: [_1]'
+=> 'Verzeichnis existiert nicht: [_1]',
+
    'discard'
 => 'verwerfen',