[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm

[raeburn]

raeburn		Sat Oct 29 02:54:04 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - For 2.11
    - Modify changes in rev. 1.369.2.56 backport of 1.436, so countdown timer 
      is displayed in a composite page.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.61 loncom/interface/lonmenu.pm:1.369.2.62
--- loncom/interface/lonmenu.pm:1.369.2.61	Thu Oct 27 21:46:38 2016
+++ loncom/interface/lonmenu.pm	Sat Oct 29 02:54:04 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.61 2016/10/27 21:46:38 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.62 2016/10/29 02:54:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1031,12 +1031,6 @@
 	    my $addremote=0;
 	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
             if ($addremote) {
-
-                &Apache::lonhtmlcommon::clear_breadcrumb_tools();
-
-                &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                    'navigation', @inlineremote[21,23]);
-
                 my $countdown;
                 if ($env{'request.filename'} =~ /\.page$/) {
                     my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools();
@@ -1046,6 +1040,12 @@
                 } else {
                     $countdown = &countdown_timer();
                 }
+
+                &Apache::lonhtmlcommon::clear_breadcrumb_tools();
+
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                    'navigation', @inlineremote[21,23]);
+
                 if (&hidden_button_check() eq 'yes') {
                     if ($countdown) {
                         &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);