Merge branch 'feature-1716-ux-tweak'

ckan · Jan 26, 2012 · 2bd50d9 · 2bd50d9
2 parents 6c9705d + 95606b5
commit 2bd50d9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
@@ -492,7 +492,13 @@ CKAN.View.DatasetEditForm = Backbone.View.extend({
       var boundToUnload = false;
       return function() {
         if (!boundToUnload) {
-          CKAN.Utils.flashMessage(CKAN.Strings.youHaveUnsavedChanges,'notice');
+          var parentDiv = $('<div />').addClass('flash-messages');
+          var messageDiv = $('<div />').html(CKAN.Strings.youHaveUnsavedChanges).addClass('notice').hide();
+          parentDiv.append(messageDiv);
+          $('#unsaved-warning').append(parentDiv);
+          console.log($('#unsaved-warning'));
+          messageDiv.show(1200);
+
           boundToUnload = true;
           window.onbeforeunload = function () { 
             return CKAN.Strings.youHaveUnsavedChanges; 

diff --git a/ckan/templates/js_strings.html b/ckan/templates/js_strings.html
@@ -22,7 +22,7 @@
   CKAN.Strings.failedToSave = "${_('Failed to save, possibly due to invalid data ')}";
   CKAN.Strings.addDataset = "${_('Add Dataset')}";
   CKAN.Strings.addGroup = "${_('Add Group')}";
-  CKAN.Strings.youHaveUnsavedChanges = "${_('You have unsaved changes. Hit Save Changes at the bottom of the page to submit them.')}";
+  CKAN.Strings.youHaveUnsavedChanges = "${_('You have unsaved changes. Hit Save Changes below submit them.')}";
   CKAN.Strings.loading = "${_('Loading...')}";
   CKAN.Strings.noNameBrackets = "${_('(no name)')}";
   CKAN.Strings.deleteThisResourceQuestion = "${_('Delete the resource \'%name%\'?')}"

diff --git a/ckan/templates/package/new_package_form.html b/ckan/templates/package/new_package_form.html
@@ -200,6 +200,8 @@ <h3>Tags</h3>
   </dl>
 </fieldset>
 
+<div id="unsaved-warning"></div>
+
 <label for="log_message" class="edit-summary">Edit summary (briefly describe the changes you have made)</label>
 <textarea id="log_message" name="log_message" class="edit-summary short wide">${data.get('log_message', '')}</textarea>