[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm printout.pl /localize/localize de.pm es.pm ko.pm pt.pm zh.pm

Thu Jan 28 14:37:54 EST 2016

damieng		Thu Jan 28 19:37:54 2016 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm printout.pl 
    /loncom/localize/localize	de.pm es.pm ko.pm pt.pm zh.pm 
  Log:
  in the last printing page, added a link back to the resource when not authoring, and a link to change options
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.647 loncom/interface/lonprintout.pm:1.648

--- loncom/interface/lonprintout.pm:1.647	Thu Jun  4 13:02:22 2015
+++ loncom/interface/lonprintout.pm	Thu Jan 28 19:37:42 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.647 2015/06/04 13:02:22 raeburn Exp $
+# $Id: lonprintout.pm,v 1.648 2016/01/28 19:37:42 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3438,13 +3438,16 @@
 	#}
     }
 
-    # Set URLback if this is a construction space print so we can provide
-    # a link to the resource being edited.
-    #
+    # Set URLback so we can provide a link back to the resource and to change options.
+    # (Since the browser back button does not currently work with https,
+    # the back link is useful even when there is an easy-to-miss LON-CAPA back button.)
 
     my $URLback=''; #link to original document
     if ($helper->{'VARS'}->{'construction'} eq '1') {
 	$URLback=$helper->{'VARS'}->{'filename'};
+    } elsif ($helper->{VARS}{'symb'}) {
+        my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
+        $URLback = &Apache::lonnet::clutter($url);
     }
     #
     # Final adjustment of the font size:
Index: loncom/interface/printout.pl
diff -u loncom/interface/printout.pl:1.160 loncom/interface/printout.pl:1.161
--- loncom/interface/printout.pl:1.160	Mon Mar  9 19:07:09 2015
+++ loncom/interface/printout.pl	Thu Jan 28 19:37:42 2016
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.160 2015/03/09 19:07:09 raeburn Exp $
+# $Id: printout.pl,v 1.161 2016/01/28 19:37:42 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -209,8 +209,10 @@
     @names_pack=split(/_ENDPERSON_/,$student_names);
 }
 if ($backref) {
-    print('<p>'.&mt("[_1]Return[_2] to editing resource.",
+    print('<p>'.&mt("[_1]Return[_2] to resource.",
 		    "<a href=\"$backref\"><b>","</b></a>").'</p>');
+    print('<p><a href="javascript:gopost(\'/adm/printout\',\''.$backref.'\');">'.
+        &mt("Change Printing Options").'</a></p>'."\n");
 }
 my $figfile = $texfile;
 $figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/;
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.611 loncom/localize/localize/de.pm:1.612
--- loncom/localize/localize/de.pm:1.611	Fri Apr 17 12:34:07 2015
+++ loncom/localize/localize/de.pm	Thu Jan 28 19:37:51 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.611 2015/04/17 12:34:07 droeschl Exp $
+# $Id: de.pm,v 1.612 2016/01/28 19:37:51 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4907,6 +4907,9 @@
    'Select Printing Options:'
 => 'Auswahl der Druckoptionen',
 
+   'Change Printing Options'
+=> 'Druckoptionen',
+
    'Select Problem(s) to print'
 => 'Auswahl von Aufgaben, die gedruckt werden sollen',
 
@@ -18039,7 +18042,7 @@
    'DragMath LaTeX Equation Editor'
 => 'DragMath-LaTeX-Formel-Editor',
 
-   '[_1]Return[_2] to editing resource.'
+   '[_1]Return[_2] to resource.'
 => '[_1]ZurÃ¼ck[_2] zur Ressource',
 
    'Counting pages for student: [_1]'
Index: loncom/localize/localize/es.pm
diff -u loncom/localize/localize/es.pm:1.89 loncom/localize/localize/es.pm:1.90
--- loncom/localize/localize/es.pm:1.89	Fri Apr 25 18:05:36 2014
+++ loncom/localize/localize/es.pm	Thu Jan 28 19:37:51 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Spanish Localization Lexicon
 #
-# $Id: es.pm,v 1.89 2014/04/25 18:05:36 bisitz Exp $
+# $Id: es.pm,v 1.90 2016/01/28 19:37:51 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4363,6 +4363,9 @@
    'Select Printing Options:'
 => 'Seleccionar opciones de impresiÃ³n:',
 
+   'Change Printing Options'
+=> 'Opciones de impresiÃ³n',
+
    'Select Problem(s) to print'
 => 'Seleccionar Problema(s) para imprimir',
 
@@ -15869,8 +15872,8 @@
    'DragMath LaTeX Equation Editor'
 => 'Editor de EcuaciÃ³n LaTeX DragMath',
 
-   '[_1]Return[_2] to editing resource.'
-=> '[_1]Volver[_2] a editar el recurso.',
+   '[_1]Return[_2] to resource.'
+=> '[_1]Volver[_2] al recurso.',
 
    'Counting pages for student: [_1]'
 => 'Contando pÃ¡ginas a estudiante [_1]',
Index: loncom/localize/localize/ko.pm
diff -u loncom/localize/localize/ko.pm:1.3 loncom/localize/localize/ko.pm:1.4
--- loncom/localize/localize/ko.pm:1.3	Sat May  9 23:30:32 2015
+++ loncom/localize/localize/ko.pm	Thu Jan 28 19:37:52 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: ko.pm,v 1.3 2015/05/09 23:30:32 raeburn Exp $
+# $Id: ko.pm,v 1.4 2016/01/28 19:37:52 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -17998,8 +17998,8 @@
    'DragMath LaTeX Equation Editor'
 => 'DragMath LaTeX Equation Editor',
 
-   '[_1]Return[_2] to editing resource.'
-=> '[_1]Return[_2] to editing resource.',
+   '[_1]Return[_2] to resource.'
+=> '[_1]Return[_2] to resource.',
 
    'Counting pages for student: [_1]'
 => 'Counting pages for student: [_1]',
Index: loncom/localize/localize/pt.pm
diff -u loncom/localize/localize/pt.pm:1.82 loncom/localize/localize/pt.pm:1.83
--- loncom/localize/localize/pt.pm:1.82	Fri Apr 25 18:05:36 2014
+++ loncom/localize/localize/pt.pm	Thu Jan 28 19:37:52 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Portuguese Localization Lexicon
 #
-# $Id: pt.pm,v 1.82 2014/04/25 18:05:36 bisitz Exp $
+# $Id: pt.pm,v 1.83 2016/01/28 19:37:52 damieng Exp $
 #
 # Copyright UNICAMP, Sao Paulo
 # Supported in part by Partnership in Global Learning
@@ -20703,8 +20703,8 @@
    '[_1]Official course[_2] in domain: [_3]'
 => '[_1]Official course[_2] in domain: [_3]',
 
-   '[_1]Return[_2] to editing resource.'
-=> '[_1]Return[_2] to editing resource.',
+   '[_1]Return[_2] to resource.'
+=> '[_1]Return[_2] to resource.',
 
    '[_1]Select Date[_2]'
 => '[_1]Select Date[_2]',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.127 loncom/localize/localize/zh.pm:1.128
--- loncom/localize/localize/zh.pm:1.127	Fri Apr 25 18:00:53 2014
+++ loncom/localize/localize/zh.pm	Thu Jan 28 19:37:52 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.127 2014/04/25 18:00:53 bisitz Exp $
+# $Id: zh.pm,v 1.128 2016/01/28 19:37:52 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -15728,8 +15728,8 @@
    'DragMath Latex Equation Editor'
 => 'DragMath Latex Equation Editor',
 
-   '[_1]Return[_2] to editing resource.'
-=> '[_1]Return[_2] to editing resource.',
+   '[_1]Return[_2] to resource.'
+=> '[_1]Return[_2] to resource.',
 
    'Counting pages for student: [_1]'
 => 'Counting pages for student: [_1]',


