Revision: 10000

Yeah !!!!


Le 12/04/2011 15:57, texens@users.sourceforge.net a écrit :
Revision: 10000
          http://limesurvey.svn.sourceforge.net/limesurvey/?rev=10000&view=rev
Author:   texens
Date:     2011-04-12 13:57:44 +0000 (Tue, 12 Apr 2011)

Log Message:
-----------
Fixed Issue #05022: "Save and exit" on file upload is misleading as it take "save and resume", "next" or "submit" to be recorded with the response
Dev replaced string "save and exit" by "return to survey"

Modified Paths:
--------------
    source/limesurvey/scripts/modaldialog.js
    source/limesurvey/scripts/uploader.js

Modified: source/limesurvey/scripts/modaldialog.js
===================================================================
--- source/limesurvey/scripts/modaldialog.js	2011-04-12 11:34:54 UTC (rev 9999)
+++ source/limesurvey/scripts/modaldialog.js	2011-04-12 13:57:44 UTC (rev 10000)
@@ -48,7 +48,7 @@
                     background: 'black'
                 },
                 buttons: {
-                    'Save and exit': function() {
+                    'Return to Survey': function() {
                         var pass = document.getElementById('uploader').contentDocument.defaultView.saveAndExit(fieldname, show_title, show_comment, pos);
                         if (pass) {
                             $(this).dialog('destroy');
@@ -79,7 +79,7 @@
                     background: 'black'
                 },
                 buttons: {
-                    'Save and exit': function() {
+                    'Return to Survey': function() {
                         var pass = document.getElementById('uploader').contentDocument.defaultView.saveAndExit(fieldname, show_title, show_comment, pos);
                         if (pass) {
                             $(this).dialog('destroy');

Modified: source/limesurvey/scripts/uploader.js
===================================================================
--- source/limesurvey/scripts/uploader.js	2011-04-12 11:34:54 UTC (rev 9999)
+++ source/limesurvey/scripts/uploader.js	2011-04-12 13:57:44 UTC (rev 10000)
@@ -167,12 +167,12 @@
                 if (filecount < minfiles)
                     $('#uploadstatus').html('Please upload '+ (minfiles - filecount) + ' more files.');
                 else if (filecount < maxfiles)
-                    $('#uploadstatus').html('If you wish, you may upload '+ (maxfiles - filecount) + ' more files; else you may Save and exit');
+                    $('#uploadstatus').html('If you wish, you may upload '+ (maxfiles - filecount) + ' more files; else you may return back to survey');
                 else
-                    $('#uploadstatus').html('The maximum number of files have been uploaded. You may save and exit');
+                    $('#uploadstatus').html('The maximum number of files have been uploaded. You may return back to survey');
 
                 if (filecount >= maxfiles)
-                    $('#notice').html('<p class="success">Maximum number of files have been uploaded. You may Save and Exit !</p>');
+                    $('#notice').html('<p class="success">Maximum number of files have been uploaded. You may return back to survey !</p>');
             }
         }
     });
@@ -291,7 +291,7 @@
             if (filecount < minfiles)
                 $('#uploadstatus').html('Please upload '+ (minfiles - filecount) + ' more files.');
             else
-                $('#uploadstatus').html('If you wish, you may upload '+ (maxfiles - filecount) + ' more files; else you may Save and exit');
+                $('#uploadstatus').html('If you wish, you may upload '+ (maxfiles - filecount) + ' more files; else you may return back to survey');
         }
     }
     file_index = $("#"+fieldname+"_file_index_"+count).val();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Forrester Wave Report - Recovery time is now measured in hours and minutes
not days. Key insights are discussed in the 2010 Forrester Wave Report as
part of an in-depth evaluation of disaster recovery service providers.
Forrester found the best-in-class provider in terms of services and vision.
Read this report now!  http://p.sf.net/sfu/ibm-webcastpromo
_______________________________________________
Limesurvey-subversion mailing list
Limesurvey-subversion@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/limesurvey-subversion