[LON-CAPA-cvs] cvs: loncom /interface slotrequest.pm /localize/localize de.pm

[raeburn]

raeburn		Fri Sep 12 15:23:02 2014 EDT

  Modified files:              
    /loncom/interface	slotrequest.pm 
    /loncom/localize/localize	de.pm 
  Log:
  - Bug 6743.  Issue restricted to Domain Coordinators.
    Prevent table showing available slots when using "Sign-up for time to work". 
    for time to work" for a resource in a course.
  
  
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.120 loncom/interface/slotrequest.pm:1.121
--- loncom/interface/slotrequest.pm:1.120	Fri Feb 28 19:20:06 2014
+++ loncom/interface/slotrequest.pm	Fri Sep 12 15:22:58 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.120 2014/02/28 19:20:06 bisitz Exp $
+# $Id: slotrequest.pm,v 1.121 2014/09/12 15:22:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -847,13 +847,13 @@
     if (ref($consumed_uniqueperiods) eq 'HASH') {
         if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
             $r->print('<span class="LC_error">'.
-                      &mt('An error occurred determining slot availability').
+                      &mt('An error occurred determining slot availability.').
                       '</span>');
             return;
         }
     } elsif ($consumed_uniqueperiods =~ /^error: /) {
         $r->print('<span class="LC_error">'.
-                  &mt('An error occurred determining slot availability').
+                  &mt('An error occurred determining slot availability.').
                   '</span>');
         return;
     }
@@ -862,7 +862,7 @@
     my @got_slots=&check_for_reservation($symb,'allslots');
     if ($got_slots[0] =~ /^error: /) {
         $r->print('<span class="LC_error">'.
-                  &mt('An error occurred determining slot availability').
+                  &mt('An error occurred determining slot availability.').
                   '</span>');
         return;
     }
@@ -877,12 +877,11 @@
         push(@available,$slot);
     }
     if (!@available) {
-        $output = '<div class="LC_info">'.&mt('No available times.');
+        $output = '<span class="LC_info">'.&mt('No available times.').'</span>';
         if ($env{'form.command'} ne 'manageresv') {
             $output .= ' <a href="/adm/flip?postdata=return:">'.
                        &mt('Return to last resource').'</a>';
         }
-        $output .= '</div>';
         $r->print($output);
         return;
     }
@@ -958,6 +957,7 @@
        $output .= &Apache::loncommon::end_data_table();
     }
     $r->print($output);
+    return;
 }
 
 sub to_show {
@@ -2683,7 +2683,9 @@
 	    return OK;
 	}
 	if ($env{'form.requestattempt'}) {
+            $r->print('<div class="LC_left_float">'); 
 	    &show_choices($r,$symb);
+            $r->print('</div><div style="padding:0;clear:both;margin:0;border:0"></div>');
 	} elsif ($env{'form.command'} eq 'release') {
 	    &release_slot($r,$symb);
 	} elsif ($env{'form.command'} eq 'get') {
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.595 loncom/localize/localize/de.pm:1.596
--- loncom/localize/localize/de.pm:1.595	Thu Jul 17 14:40:04 2014
+++ loncom/localize/localize/de.pm	Fri Sep 12 15:23:01 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.595 2014/07/17 14:40:04 bisitz Exp $
+# $Id: de.pm,v 1.596 2014/09/12 15:23:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24959,7 +24959,7 @@
    'Already reserved: [_1]'
 => 'Bereits reserviert: [_1]',
 
-   'An error occurred determining slot availability'
+   'An error occurred determining slot availability.'
 => 'Beim Feststellen der Slot-Verfügbarkeit ist ein Fehler aufgetreten.',
 
    'An error occurred when attempting to delete slot: [_1]'