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

[raeburn]

raeburn		Wed May 13 16:50:01 2026 EDT

  Modified files:              
    /rat	lonratedt.pm 
  Log:
  - WCAG 2 compliance: include landmark for page's main content
  - When creating new map, replace: "Map not loaded: The file does not exist."
    with instructions on what to do next, and omit useless display of table
    with column headers and nothing else.
  
  
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.112 rat/lonratedt.pm:1.113
--- rat/lonratedt.pm:1.112	Fri Jan 15 19:13:04 2016
+++ rat/lonratedt.pm	Wed May 13 16:50:00 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.112 2016/01/15 19:13:04 damieng Exp $
+# $Id: lonratedt.pm,v 1.113 2026/05/13 16:50:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -629,8 +629,9 @@
     my $start_page = &Apache::loncommon::start_page('Authoring Space',$js)
                     .&Apache::loncommon::head_subbox(
                          &Apache::loncommon::CSTR_pageheader()
-                        .&buttons(2));
-    my $end_page = &Apache::loncommon::end_page();
+                        .&mt('Switch to: [_1]',&buttons(2)))
+                    ."\n".'<div class="LC_landmark" role="main" id="LC_main_content">'."\n";
+    my $end_page = '</div>'.&Apache::loncommon::end_page();
 
     my $filetext = &mt('File: [_1]','<span class="LC_filename">'.$url.'</span>');
     $r->print(<<ENDSMPHEAD);
@@ -723,17 +724,18 @@
                                             {'bread_crumbs' => $brcrum,})
             .&Apache::loncommon::head_subbox(
                  &Apache::loncommon::CSTR_pageheader())
+            ."\n".'<div class="LC_landmark" role="main" id="LC_main_content">'."\n"
             .'<p class="LC_error">'
             .&mt('No such directory: [_1]','<span class="LC_filename">'.$dir.'</span>'
             .'</p>'
-            .&Apache::loncommon::end_page())
+            .'</div>'.&Apache::loncommon::end_page())
    );
 }
 
 # ---------------------------------------------------------------- View Handler
 
 sub viewmap {
-    my ($r,$url,$adv,$errtext)=@_;
+    my ($r,$fn,$url,$adv,$errtext)=@_;
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
@@ -750,15 +752,33 @@
     # Breadcrumbs are included by &start_page
     $r->print(&Apache::loncommon::start_page('Edit Content of a Map')
              .&Apache::loncommon::head_subbox(
-                  &Apache::loncommon::CSTR_pageheader()
-                 .&buttons($adv))
+                  &Apache::loncommon::CSTR_pageheader())
+             ."\n".'<div class="LC_landmark" role="main" id="LC_main_content">'."\n"
     );
     if ($errtext) {
-	$r->print('<div class="LC_error">'
-                 .$errtext
-                 .'</div>'
-                 .'<hr />'
-        );
+        if (!-e $fn) {
+            if ($fn =~ /\.page$/) {
+                $r->print(&mt('New assembled page: [_1]',
+                              '<span class="LC_filename">'.$url.'</span>'));
+            } else {
+                $r->print(&mt('New assembled sequence: [_1]',
+                              '<span class="LC_filename">'.$url.'</span>'));
+            }
+            $r->print('<p>'.&mt('Use either the Simple Editor or Advanced Editor to create the new file.').'</p>'
+                     .'<p>'.&buttons($adv).'</p>'
+                     .'</div>'.&Apache::loncommon::end_page()
+            );
+            return;
+        } else {
+            $r->print(&buttons($adv)
+                     .'<div class="LC_error">'
+                     .$errtext
+                     .'</div>'
+                     .'<hr />'
+            );
+        }
+    } else {
+        $r->print(&buttons($adv));
     }
     my $idx=0;
     $r->print('<p><span class="LC_filename">'.$url.'</span></p>');
@@ -822,7 +842,8 @@
         }
     }
     $r->print(&Apache::loncommon::end_data_table());
-    $r->print(&Apache::loncommon::end_page());
+    $r->print('</div>'.&Apache::loncommon::end_page());
+    return;
 }
 
 # ================================================================ Main Handler
@@ -876,7 +897,7 @@
   } elsif ($env{'form.forcesmp'}) {
       &smpedt($r,$url,$errtext);
   } else {
-      &viewmap($r,$url,$adv,$errtext);
+      &viewmap($r,$fn,$url,$adv,$errtext);
   }
   return OK;
 }