[LON-CAPA-cvs] cvs: loncom /interface lonwishlist.pm rat lonpageflip.pm

[bisitz]

bisitz		Tue Jun 18 13:23:43 2013 EDT

  Modified files:              
    /rat	lonpageflip.pm 
    /loncom/interface	lonwishlist.pm 
  Log:
  - Consistent and improved navigation and layout (actionbox, headline)
  
  
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.81 rat/lonpageflip.pm:1.82
--- rat/lonpageflip.pm:1.81	Fri May 10 12:49:39 2013
+++ rat/lonpageflip.pm	Tue Jun 18 13:23:37 2013
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.81 2013/05/10 12:49:39 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.82 2013/06/18 13:23:37 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -464,21 +464,17 @@
                      }
                      $r->print('</table>');
                   } else {
-		      my $start_page=
-			  &Apache::loncommon::start_page('No Resource');
-		      $r->print(<<ENDNONE);
-$start_page
-<h3>$lt{'title'}</h3>
-<p>$lt{'explain'}</p>
-ENDNONE
-		  }
-		  $r->print(<<ENDMENU);
-<ul>
-<li><a href="/adm/flip?postdata=return:">$lt{'back'}</a></li>
-<li><a href="/adm/navmaps">$lt{'nav'}</a></li>
-</ul>
-ENDMENU
-                  $r->print(&Apache::loncommon::end_page());
+                      $r->print(
+                          &Apache::loncommon::start_page('No Resource')
+                         .'<h2>'.$lt{'title'}.'</h2>'
+                         .'<p>'.$lt{'explain'}.'</p>');
+                  }
+                  $r->print(
+                      &Apache::lonhtmlcommon::actionbox(
+                          ['<a href="/adm/flip?postdata=return:">'.$lt{'back'}.'</a></li>',
+                           '<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'
+                          ])
+                     .&Apache::loncommon::end_page());
                   return OK;
 	      }
 	  } else {
Index: loncom/interface/lonwishlist.pm
diff -u loncom/interface/lonwishlist.pm:1.17 loncom/interface/lonwishlist.pm:1.18
--- loncom/interface/lonwishlist.pm:1.17	Wed Apr 10 22:12:43 2013
+++ loncom/interface/lonwishlist.pm	Tue Jun 18 13:23:42 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility-routines for wishlist
 #
-# $Id: lonwishlist.pm,v 1.17 2013/04/10 22:12:43 raeburn Exp $
+# $Id: lonwishlist.pm,v 1.18 2013/06/18 13:23:42 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1786,25 +1786,28 @@
 
 # Returns the HTML-Markup for the page, shown when a link was set
 sub makePageSet {
-    # start_page 
-    my $startPage = &Apache::loncommon::start_page('Stored Links',undef,
-                                                   {'only_body' => 1});
+    my $title = 'Stored Links';
+
+    # start_page
+    my $output =
+        &Apache::loncommon::start_page($title,undef,
+                                       {'only_body' => 1})
+       .'<h1>'.&mt($title).'</h1>';
     
     # confirm success and offer link to wishlist
-    my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Link successfully saved!'));
-    $message = &Apache::loncommon::confirmwrapper($message);
-
-    my $inner .= '<br>'.$message.'<br/><br/>'.
-                 '<a href="javascript:;" onclick="opener.open('."'/adm/wishlist'".');window.close();">'.&mt('Go to Stored Links').'</a>'.(' ' x 3).
-                 '<a href="javascript:;" onclick="window.close();">'.&mt('Close this window').'</a>';
+    $output .=
+        &Apache::loncommon::confirmwrapper(
+            &Apache::lonhtmlcommon::confirm_success(
+                &mt('Link successfully saved!')))
+       .&Apache::lonhtmlcommon::actionbox(
+            ['<a href="javascript:;" onclick="opener.open('."'/adm/wishlist'".');window.close();">'.&mt('Go to Stored Links').'</a>',
+             '<a href="javascript:;" onclick="window.close();">'.&mt('Close this window').'</a>'
+            ]);
 
     # end_page 
-    my $endPage =  &Apache::loncommon::end_page();
-
-    # put all page-elements together
-    my $page = $startPage.$inner.$endPage;
+    $output .= &Apache::loncommon::end_page();
 
-    return $page;
+    return $output;
 }