infopark_cloud_connector 6.9.2.1.125136549 → 6.9.3.1.36404185

data/lib/assets/javascripts/infopark_editing.js

@@ -12989,50 +12989,22 @@ function program1(depth0,data) {
   });
   return this.InfoparkHandlebarsTemplates["confirmation_dialog"];
 }).call(this);
-(function() {
-  this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
-  this.InfoparkHandlebarsTemplates["deactivate_menu_bar_item"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
-helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-
-
-  buffer += "<i class=\"ip_icon\" title=\"";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.deactivate_editing", options) : helperMissing.call(depth0, "translate", "menu_bar.deactivate_editing", options)))
-    + "\">&#xF03E;</i>\n";
-  return buffer;
-  });
-  return this.InfoparkHandlebarsTemplates["deactivate_menu_bar_item"];
-}).call(this);
-(function() {
-  this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
-  this.InfoparkHandlebarsTemplates["delete_current_page_item"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
-helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-
-
-  buffer += "<i class=\"ip_icon\">&#xF018;</i>\n<span class=\"ip_button_label\">";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.delete_current_page", options) : helperMissing.call(depth0, "translate", "menu_bar.delete_current_page", options)))
-    + "</span>\n";
-  return buffer;
-  });
-  return this.InfoparkHandlebarsTemplates["delete_current_page_item"];
-}).call(this);
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["edit_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   this.compilerInfo = [2,'>= 1.0.0-rc.3'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, stack2, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, functionType="function";
+  var buffer = "", stack1, stack2, options, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
 
 
-  buffer += "<div class=\"ip_edit_dialog ip_modal_big ip_adjust_dialog\">\n\n  <div class=\"ip_modal_header\">\n    <h3><i class=\"ip_icon\">&#xF030;</i>";
+  buffer += "<div class=\"ip_edit_dialog ip_modal_big ip_adjust_dialog\">\n\n  <div class=\"ip_modal_header\">\n    <h3><i class=\"ip_icon\">";
+  if (stack1 = helpers.icon) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "</i>";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "edit_dialog.title", depth0.title, options) : helperMissing.call(depth0, "translate", "edit_dialog.title", depth0.title, options)))
-    + "</h3>\n  </div>\n\n  <div class=\"ip_modal_body ip_auto_height\">";
+    + "</h3>\n    <div class=\"ip_edit_dialog_saving_indicator\"></div>\n  </div>\n\n  <div class=\"ip_modal_body ip_edit_dialog_markup ip_auto_height\">";
   if (stack2 = helpers.markup) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
   else { stack2 = depth0.markup; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
   if(stack2 || stack2 === 0) { buffer += stack2; }
@@ -13151,10 +13123,53 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   
 
 
-  return "<div class=\"ip_topbar\">\n  <div class=\"ip_first_level\">\n    <div class=\"ip_button_bar ip_app ip_no_hover\">\n      <span class=\"ip_logo\"></span>\n      <span class=\"ip_product_name\">CMS</span>\n    </div>\n\n    <div id=\"ip_select_workspace\" class=\"ip_button_bar\"></div>\n    <div id=\"ip_deactivate_editing\" class=\"ip_button_bar ip_right\"></div>\n    <div id=\"ip_delete_current_page\" class=\"ip_button_bar ip_right ip_red\"></div>\n  </div>\n</div>\n";
+  return "<div class=\"ip_topbar\">\n  <div class=\"ip_first_level\">\n    <div class=\"ip_button_bar ip_app ip_no_hover\">\n      <span class=\"ip_logo\"></span>\n      <span class=\"ip_product_name\">CMS</span>\n    </div>\n\n    <div id=\"ip_select_workspace\" class=\"ip_button_bar\"></div>\n    <div id=\"ip_menu_bar_dropdown\" class=\"ip_button_bar ip_right\"></div>\n    <div id=\"ip_menu_bar_saving_indicator\"></div>\n  </div>\n</div>\n";
   });
   return this.InfoparkHandlebarsTemplates["menu_bar"];
 }).call(this);
+(function() {
+  this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
+  this.InfoparkHandlebarsTemplates["menu_bar_dropdown"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, self=this;
+
+function program1(depth0,data) {
+  
+  var buffer = "", stack1, options;
+  buffer += "\n    ";
+  stack1 = helpers['if'].call(depth0, depth0.current_page_has_edit_view, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n\n    <li id=\"ip_delete_current_page\" class=\"ip_menu_item\">\n    <span><i class=\"ip_icon\">&#xF018;</i>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar_dropdown.delete_current_page", options) : helperMissing.call(depth0, "translate", "menu_bar_dropdown.delete_current_page", options)))
+    + "</span>\n    </li>\n\n    <li id=\"ip_open_current_page_in_admin_gui\" class=\"ip_menu_item\">\n    <span><i class=\"ip_icon\">&#xF000;</i>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar_dropdown.open_current_page_in_admin_gui", options) : helperMissing.call(depth0, "translate", "menu_bar_dropdown.open_current_page_in_admin_gui", options)))
+    + "</span>\n    </li>\n  ";
+  return buffer;
+  }
+function program2(depth0,data) {
+  
+  var buffer = "", stack1, options;
+  buffer += "\n      <li id=\"ip_edit_current_page\" class=\"ip_menu_item\">\n      <span><i class=\"ip_icon\">&#xF03D;</i>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar_dropdown.edit_current_page", options) : helperMissing.call(depth0, "translate", "menu_bar_dropdown.edit_current_page", options)))
+    + "</span>\n      </li>\n    ";
+  return buffer;
+  }
+
+  buffer += "<i class=\"ip_icon\">&#xF03B;</i>\n\n<ul class=\"ip_menu_box ip_right\" style=\"display: none;\">\n  ";
+  stack1 = helpers['if'].call(depth0, depth0.has_current_page, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n\n  <li id=\"ip_deactivate_editing\" class=\"ip_menu_item\">\n  <span><i class=\"ip_icon\">&#xF06C;</i>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar_dropdown.deactivate_editing", options) : helperMissing.call(depth0, "translate", "menu_bar_dropdown.deactivate_editing", options)))
+    + "</span>\n  </li>\n</ul>\n";
+  return buffer;
+  });
+  return this.InfoparkHandlebarsTemplates["menu_bar_dropdown"];
+}).call(this);
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["overlay"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
@@ -13217,6 +13232,25 @@ function program1(depth0,data) {
   });
   return this.InfoparkHandlebarsTemplates["prompt_dialog"];
 }).call(this);
+(function() {
+  this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
+  this.InfoparkHandlebarsTemplates["saving_indicator"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+
+
+  buffer += "<span class=\"ip_saving_indicator ip_saving_state_bar\">\n  <span class=\"ip_saving_in_progress\" style=\"display:none;\">\n    <i class=\"ip_icon ip_spinning\">&#xf023;</i>\n    <span class=\"ip_button_label\"><span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "saving_indicator_item.saving", options) : helperMissing.call(depth0, "translate", "saving_indicator_item.saving", options)))
+    + "</span></span>\n  </span>\n\n  <span class=\"ip_saving_done\">\n    <i class=\"ip_icon\">&#xf03F;</i>\n    <span class=\"ip_button_label\"><span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "saving_indicator_item.saved", options) : helperMissing.call(depth0, "translate", "saving_indicator_item.saved", options)))
+    + "</span></span>\n  </span>\n</div>\n";
+  return buffer;
+  });
+  return this.InfoparkHandlebarsTemplates["saving_indicator"];
+}).call(this);
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["saving_overlay"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
@@ -13413,6 +13447,7 @@ $.i18n().load({
   'accept': 'Übernehmen',
   'close': 'Schließen',
   'loading': 'Lade...',
+  'current_page': 'Aktuelle Seite',
 
   'choose_obj_class_dialog.add_child_page.title': 'Seitenvorlage auswählen',
   'choose_obj_class_dialog.add_widget.title': 'Widget auswählen',
@@ -13426,7 +13461,6 @@ $.i18n().load({
 
   'edit_dialog.title': '$1 bearbeiten',
 
-  'menu_bar.deactivate_editing': 'Direktbearbeitung deaktivieren',
   'menu_bar.working_copy': 'Arbeitskopie',
   'menu_bar.empty_workspace_title': '<leerer Titel>',
   'menu_bar.published_workspace_title': 'Veröffentlichte Inhalte',
@@ -13447,21 +13481,30 @@ $.i18n().load({
   'menu_bar.create_new_ws_confirmation': 'Arbeitskopie anlegen',
   'menu_bar.create_new_ws_confirmation_desc': 'Bitte geben Sie den Titel der neuen Arbeitskopie ein.',
   'menu_bar.create_new_ws_confirmation_placeholder': 'Neuer Titel',
-  'menu_bar.delete_current_page': 'Diese Seite löschen',
+
+  'menu_bar_dropdown.edit_current_page': 'Diese Seite bearbeiten',
+  'menu_bar_dropdown.delete_current_page': 'Diese Seite löschen',
+  'menu_bar_dropdown.open_current_page_in_admin_gui': 'Im Admin-GUI öffnen',
+  'menu_bar_dropdown.deactivate_editing': 'Direktbearbeitung deaktivieren',
+
+  'saving_indicator_item.saving': 'Wird gespeichert...',
+  'saving_indicator_item.saved': 'Alle Änderungen gespeichert',
 
   'child_list_menus.add_subpage': 'Neue Seite anlegen',
 
   'widget_menus.add_widget': 'Widget einfügen',
   'widget_menus.edit_widget': 'Widget bearbeiten',
   'widget_menus.delete_widget': 'Widget löschen',
-  'widget_menus.open_in_admin_gui': ' Im Admin-GUI öffnen',
+  'widget_menus.open_in_admin_gui': 'Im Admin-GUI öffnen',
 
   'commands.delete_obj.confirm_title': 'Wirklich diese Seite löschen?',
   'commands.delete_obj.confirm_description': 'Eine gelöschte Seite kann nicht wiederhergestellt werden.',
   'commands.delete_widget.confirm_title': 'Wirklich dieses Widget löschen?',
   'commands.delete_widget.confirm_description': 'Ein gelöschtes Widget kann nicht wiederhergestellt werden.',
 
-  'image_upload.too_many_files': 'Nur eine Detei erlaubt.'
+  'image_upload.too_many_files': 'Nur eine Detei erlaubt.',
+
+  'warn_before_unloading': 'Sie haben ungespeicherte Änderungen! Sind Sie sicher, dass sie schließen wollen?'
 }, 'de');
 $.i18n().load({
   'confirm': 'Confirm',
@@ -13472,6 +13515,7 @@ $.i18n().load({
   'accept': 'Accept',
   'close': 'Close',
   'load': 'Loading...',
+  'current_page': 'current page',
 
   'choose_obj_class_dialog.add_child_page.title': 'Select Page Type',
   'choose_obj_class_dialog.add_widget.title': 'Select Widget',
@@ -13485,7 +13529,6 @@ $.i18n().load({
 
   'edit_dialog.title': 'Edit $1',
 
-  'menu_bar.deactivate_editing': 'deactivate in-place editing',
   'menu_bar.working_copy': 'Working copy',
   'menu_bar.empty_workspace_title': '<empty title>',
   'menu_bar.published_workspace_title': 'Published content',
@@ -13506,7 +13549,14 @@ $.i18n().load({
   'menu_bar.create_new_ws_confirmation': 'Create a working copy',
   'menu_bar.create_new_ws_confirmation_desc': 'Please enter the title of the new working copy.',
   'menu_bar.create_new_ws_confirmation_placeholder': 'new title',
-  'menu_bar.delete_current_page': 'Delete this page',
+
+  'menu_bar_dropdown.edit_current_page': 'Edit this page',
+  'menu_bar_dropdown.delete_current_page': 'Delete this page',
+  'menu_bar_dropdown.open_current_page_in_admin_gui': 'Open in admin GUI',
+  'menu_bar_dropdown.deactivate_editing': 'Deactivate in-place editing',
+
+  'saving_indicator_item.saving': 'Saving...',
+  'saving_indicator_item.saved': 'All changes saved',
 
   'child_list_menus.add_subpage': 'Create new page',
 
@@ -13520,7 +13570,9 @@ $.i18n().load({
   'commands.delete_widget.confirm_title': 'Really delete this widget?',
   'commands.delete_widget.confirm_description': 'A deleted widget cannot be restored.',
 
-  'image_upload.too_many_files': 'Only one file allowed.'
+  'image_upload.too_many_files': 'Only one file allowed.',
+
+  'warn_before_unloading': 'You have unsaved changes. Are you sure you want to quit?'
 }, 'en');
 /*global alert:false */
 
@@ -13558,7 +13610,11 @@ var infopark = {
   },
 
   reload: function() {
-    infopark.reload_location();
+    if (infopark.write_monitor.is_writing()) {
+      infopark.write_monitor.on('end_write', function() { infopark.reload(); });
+    } else {
+      infopark.reload_location();
+    }
     return $.Deferred();
   },
 
@@ -13633,14 +13689,28 @@ var infopark = {
         }
       });
     } else if (event === 'new_content') {
-      infopark.editing.on('refresh', function(new_content) {
-        if (new_content) {
-          callback(new_content);
+      infopark.editing.on('refresh', function(dom_element) {
+        if (dom_element) {
+          callback(dom_element);
         }
       });
     } else {
       $.error('Unknown event "' + event + '"');
     }
+  },
+
+  create_obj: function(attributes) {
+    return infopark.obj.create(attributes).then(function(obj) {
+      return {id: obj.id()};
+    });
+  },
+
+  delete_obj: function(id) {
+    if (id) {
+      return infopark.obj.create_instance(id).destroy();
+    } else {
+      $.error("Can't delete without ID");
+    }
   }
 };
 (function() {
@@ -13669,25 +13739,51 @@ var infopark = {
   });
 }());
 (function() {
+  var assert_valid_dom_element = function(dom_element) {
+    if (dom_element.length > 0) {
+      if (dom_element.length === 1) {
+        return true;
+      } else {
+        $.error('Can not call "infopark" method on more than one tag');
+      }
+    }
+  };
+
+  var build_cms_field_element = function(dom_element) {
+    var cms_field_element = infopark.cms_element.from_dom_element(dom_element);
+    if (cms_field_element) {
+      return cms_field_element;
+    } else {
+      $.error('Can not call "infopark" method on a non-cms tag');
+    }
+  };
+
+  var save_content = function(dom_element, content) {
+    if (assert_valid_dom_element(dom_element)) {
+      if (content === undefined || content === null) {
+        $.error('Can not call "save" with no content');
+      } else {
+        var cms_field_element = build_cms_field_element(dom_element);
+        return cms_field_element.save(content).then(function() {
+          cms_field_element.set_original_content(content);
+        });
+      }
+    }
+  };
+
+  var get_original_content = function(dom_element) {
+    if (assert_valid_dom_element(dom_element)) {
+      return build_cms_field_element(dom_element).original_content();
+    } else {
+      $.error('Can not call "infopark" method on an empty element');
+    }
+  };
+
   $.fn.infopark = function(method, content) {
     if (method === 'save') {
-      var dom_element = $(this);
-      if (dom_element.length > 0) {
-        if (dom_element.length === 1) {
-          var cms_field_element = infopark.cms_element.from_dom_element(dom_element);
-          if (cms_field_element) {
-            if (content === undefined || content === null) {
-              $.error('Can not call "save" with no content');
-            } else {
-              return cms_field_element.save(content);
-            }
-          } else {
-            $.error('Can not call "save" on a non-cms tag');
-          }
-        } else {
-          $.error('Can not call "save" on more than one tag');
-        }
-      }
+      return save_content($(this), content);
+    } else if (method === 'content') {
+      return get_original_content($(this));
     } else {
       $.error('Unknown method "' + method + '"');
     }
@@ -13730,10 +13826,10 @@ var infopark = {
         infopark.reload();
       },
 
-      refresh: function(new_content) {
+      refresh: function(dom_element) {
         _.each($(event_handlers.refresh), function(handler) {
-          if (new_content) {
-            handler($(new_content));
+          if (dom_element) {
+            handler(dom_element);
           } else if (handler.length === 0) {
             handler();
           }
@@ -13812,13 +13908,81 @@ var infopark = {
 
   $.extend(infopark, {
     ajax: function(type, path, options) {
-      return single_ajax(type, path, options).then(function(result) {
+      var is_write_request = type === 'PUT' || type === 'POST' || type === 'DELETE';
+      if (is_write_request) {
+        infopark.write_monitor.start_write();
+      }
+
+      var ajax_promise = single_ajax(type, path, options).then(function(result) {
         if (result && result.task && _.size(result) === 1) {
           return handle_task(result.task);
         } else {
           return $.Deferred().resolve(result);
         }
       });
+
+      if (is_write_request) {
+        return ajax_promise.always(function() {
+          infopark.write_monitor.end_write();
+        });
+      } else {
+        return ajax_promise;
+      }
+    }
+  });
+}());
+(function() {
+  var callbacks = {};
+  var current_token = 0;
+  var counter = 0;
+
+  var run_callbacks = function(event_name) {
+    _.each(callbacks[event_name], function(callback) {
+      callback();
+    });
+  };
+
+  $.extend(infopark, {
+    write_monitor: {
+      on: function(event_name, callback) {
+        if (callbacks[event_name] === undefined) {
+          callbacks[event_name] = {};
+        }
+        current_token += 1;
+        callbacks[event_name][current_token] = callback;
+        return current_token;
+      },
+
+      off: function(token) {
+        _.each(callbacks, function(event_callbacks) {
+          delete event_callbacks[token];
+        });
+      },
+
+      is_writing: function() {
+        return counter > 0;
+      },
+
+      start_write: function() {
+        run_callbacks('start_write');
+        counter += 1;
+      },
+
+      end_write: function() {
+        counter -= 1;
+        run_callbacks('end_write');
+      },
+
+      // For test purpose only.
+      reset_callbacks: function() {
+        callbacks = {};
+        current_token = 0;
+      },
+
+      // For test purpose only.
+      reset_counter: function() {
+        counter = 0;
+      }
     }
   });
 }());
@@ -13874,17 +14038,11 @@ var infopark = {
   });
 }());
 (function() {
-  $(document).on("click.ip-deactivate-editing", "#ip_deactivate_editing", function(e) {
-    e.preventDefault();
-    infopark.editing.deactivate();
-  });
-
   $.extend(infopark, {
-    deactivate_menu_bar_item: {
+    menu_bar_saving_indicator: {
       init: function() {
         infopark.menu_bar.register_item_renderer(function(parent_view) {
-          var view = $(infopark.template.render('deactivate_menu_bar_item'));
-          parent_view.find('#ip_deactivate_editing').append(view);
+          infopark.saving_indicator.create(parent_view.find('#ip_menu_bar_saving_indicator'));
         });
       }
     }
@@ -13892,22 +14050,47 @@ var infopark = {
 }());
 (function() {
   $.extend(infopark, {
-    delete_current_page_item: {
+    menu_bar_dropdown: {
       init: function() {
-        infopark.menu_bar.register_item_renderer(function(target) {
-          if (infopark.obj.current_page()) {
-            target.find('#ip_delete_current_page').append(
-                $(infopark.template.render('delete_current_page_item')));
-          }
+        infopark.menu_bar.register_item_renderer(function(menu_bar) {
+          var view = infopark.template.render('menu_bar_dropdown', {
+            has_current_page: infopark.obj.current_page_id,
+            current_page_has_edit_view: infopark.obj.current_page_has_edit_view
+          });
+          menu_bar.find('#ip_menu_bar_dropdown').append(view);
         });
       }
     }
   });
 
-  $(document).on('click.ip-delete-current-page', '#ip_delete_current_page', function(e) {
-    e.preventDefault();
+  var on_click = function(element_id, callback) {
+    $(document).on('click.' + element_id, '#' + element_id, function(event) {
+      event.preventDefault();
+      callback();
+    });
+  };
+
+  on_click('ip_menu_bar_dropdown', function() {
+    var target = $('#ip_menu_bar_dropdown');
+    target.toggleClass('active');
+    target.find('.ip_menu_box').fadeToggle('50');
+  });
+
+  on_click('ip_edit_current_page', function() {
+    infopark.commands.edit_obj(infopark.obj.current_page());
+  });
+
+  on_click('ip_delete_current_page', function() {
     infopark.commands.delete_obj(infopark.obj.current_page());
   });
+
+  on_click('ip_open_current_page_in_admin_gui', function() {
+    infopark.commands.open_in_admin_gui(infopark.obj.current_page_id);
+  });
+
+  on_click('ip_deactivate_editing', function() {
+    infopark.editing.deactivate();
+  });
 }());
 (function() {
   var t = infopark.i18n.translate;
@@ -14070,7 +14253,10 @@ var infopark = {
     blob: {
       create: function(file) {
         return get_upload_permission().then(function(permission) {
-          return upload_to_s3(file, permission);
+          infopark.write_monitor.start_write();
+          return upload_to_s3(file, permission).always(function() {
+            infopark.write_monitor.end_write();
+          });
         });
       },
 
@@ -14113,7 +14299,8 @@ var infopark = {
             },
 
             fetch_page_class_selection: function() {
-              return infopark.ajax('GET', 'objs/page_class_selection');
+              return infopark.ajax('GET', 'objs/page_class_selection?' +
+                  $.param({parent_path: that.path()}));
             },
 
             create_child: function(obj_class) {
@@ -14174,6 +14361,10 @@ $(function() {
   });
 }());
 (function() {
+  var has_original_content = function(field_type) {
+    return _.contains(['string', 'text', 'html', 'enum', 'multienum'], field_type);
+  };
+
   $.extend(infopark, {
     cms_field_element: {
       create_instance: function(cms_element) {
@@ -14205,6 +14396,20 @@ $(function() {
             var changes = {};
             changes[that.field_name()] = content;
             return that.obj().save(changes);
+          },
+
+          original_content: function() {
+            if (has_original_content(that.field_type())) {
+              return JSON.parse(that.dom_element().attr('data-ip-field-original-content'));
+            } else {
+              $.error('Fields of type ' + that.field_type() + ' do not support original content');
+            }
+          },
+
+          set_original_content: function(content) {
+            if (has_original_content(that.field_type())) {
+              that.dom_element().attr('data-ip-field-original-content', JSON.stringify(content));
+            }
           }
 
         });
@@ -14219,10 +14424,7 @@ $(function() {
     date_field_element: {
       create_instance: function(cms_element) {
         if (cms_element.dom_element().attr('data-ip-field-type') === 'date') {
-          var cms_field_element = infopark.cms_field_element.create_instance(cms_element);
-          return $.extend({}, cms_field_element, {save: function(content) {
-            return cms_field_element.save(content instanceof Date ? format_date(content) : content);
-          }});
+          return infopark.cms_field_element.create_instance(cms_element);
         }
       },
 
@@ -14234,20 +14436,6 @@ $(function() {
     }
   });
 
-  var format_date = function(date) {
-    return date.getUTCFullYear().toString() +
-        format_number(date.getUTCMonth() + 1) + // Month numbers are starting at 0.
-        format_number(date.getUTCDate()) +
-        format_number(date.getUTCHours()) +
-        format_number(date.getUTCMinutes()) +
-        format_number(date.getUTCSeconds());
-  };
-
-  var format_number = function(number) {
-    var string = number.toString();
-    return string.length === 1 ? '0' + string : string;
-  };
-
   infopark.cms_element.definitions.push(infopark.date_field_element);
 }());
 (function() {
@@ -14316,6 +14504,39 @@ $(function() {
   infopark.cms_element.definitions.push(infopark.multienum_field_element);
 }());
 (function() {
+  var format_date = function(date) {
+    return date.getUTCFullYear().toString() +
+        format_date_number(date.getUTCMonth() + 1) + // Month numbers are starting at 0.
+        format_date_number(date.getUTCDate()) +
+        format_date_number(date.getUTCHours()) +
+        format_date_number(date.getUTCMinutes()) +
+        format_date_number(date.getUTCSeconds());
+  };
+
+  var format_date_number = function(number) {
+    var string = number.toString();
+    return string.length === 1 ? '0' + string : string;
+  };
+
+  var prepare_attributes = function(data) {
+    var attributes = {};
+    _.each(data, function(value, field_name) {
+      if (value instanceof Date) {
+        value = format_date(value);
+      }
+      attributes[field_name] = value;
+    });
+
+    if (attributes.blob) {
+      return infopark.blob.create(attributes.blob).then(function(blob_id) {
+        attributes.blob = blob_id;
+        return attributes;
+      });
+    } else {
+      return $.Deferred().resolve(attributes);
+    }
+  };
+
   $.extend(infopark, {
     obj: {
       create_instance: function(id, obj_class_name) {
@@ -14329,13 +14550,21 @@ $(function() {
           },
 
           save: function(data) {
-            return infopark.ajax('PUT', 'objs/' + that.id(), {data: {obj: data}}).then(
-              function(result) { return; }
-            );
+            return prepare_attributes(data).then(function(attributes) {
+              return infopark.ajax('PUT', 'objs/' + that.id(), {data: {obj: attributes}}).then(
+                function(result) { return; }
+              );
+            });
           },
 
           destroy: function() {
             return infopark.ajax('DELETE', 'objs/' + that.id());
+          },
+
+          fetch_edit_markup: function() {
+            return infopark.ajax('GET', 'objs/' +  that.id() + '/edit').then(function(data) {
+              return data.markup;
+            });
           }
         };
 
@@ -14343,11 +14572,11 @@ $(function() {
       },
 
       create: function(data) {
-        return infopark.ajax('POST', 'objs', {data: {obj: data}}).then(
-          function(new_data) {
+        return prepare_attributes(data).then(function(attributes) {
+          return infopark.ajax('POST', 'objs', {data: {obj: attributes}}).then(function(new_data) {
             return infopark.obj.create_instance(new_data.id, new_data._obj_class);
-          }
-        );
+          });
+        });
       },
 
       current_page_id: null,
@@ -14356,7 +14585,9 @@ $(function() {
         if (infopark.obj.current_page_id) {
           return infopark.obj.create_instance(infopark.obj.current_page_id);
         }
-      }
+      },
+
+      current_page_has_edit_view: false
     }
   });
 }());
@@ -14410,7 +14641,7 @@ $(function() {
             },
 
             fetch_edit_markup: function() {
-              return infopark.ajax('GET', 'objs/' +  that.obj().id() + '/edit').then(function(data) {
+              return infopark.ajax('GET', 'objs/' +  that.obj().id() + '/edit_widget').then(function(data) {
                 return data.markup;
               });
             },
@@ -14474,7 +14705,8 @@ $(function() {
             },
 
             fetch_widget_class_selection: function() {
-              return infopark.ajax('GET', 'objs/_/widget_class_selection');
+              return infopark.ajax('GET', 'objs/' + that.obj().id() + '/widget_class_selection?' +
+                  $.param({field_name: that.field_name()}));
             }
           });
 
@@ -14568,7 +14800,8 @@ $(function() {
     transition: function(target, trigger_fn) {
       var deferred = $.Deferred();
       if (!infopark.transition.immediate_mode) {
-        target.on('transitionend', deferred.resolve);
+        target.on('webkitTransitionEnd oTransitionEnd otransitionend transitionend msTransitionEnd',
+            function() { deferred.resolve(); });
         setTimeout(trigger_fn, 0);
       } else {
         trigger_fn();
@@ -14590,41 +14823,28 @@ $(function() {
     }
 
     var dom_element = editor.$element;
-    var item = infopark.cms_element.from_dom_element(dom_element);
 
-    item.save().done(function() {
-      dom_element.attr('data-ip-field-original-content', item.content());
+    dom_element.infopark('save', $.trim(dom_element.html())).done(function() {
       editor.destroy();
-    }).fail(function(error_message) {
+    }).fail(function() {
       editor.getBox().removeClass('ip_field_saving');
-      infopark.alert(error_message);
     });
   };
 
   var cancel_action = function(button_name, button_dom, button_object) {
     // restore old content
-    var item = this.$element;
-    this.set(item.attr('data-ip-field-original-content'));
-    item.removeData('ip-field-original-content');
-
+    this.set(this.$element.infopark('content') || '');
     this.destroy();
   };
 
   var redactor_options_for_type = function(type) {
     var default_options = {
-      lang: infopark.i18n.locale(),
       focus: true,
       convertDivs: false,
       linebreaks: true,
       buttonsCustom: {
-        saveButton: {
-          title: infopark.i18n.translate('save'),
-          callback: save_action
-        },
-        cancelButton: {
-          title: infopark.i18n.translate('cancel'),
-          callback: cancel_action
-        }
+        saveButton: {title: 'Save', callback: save_action},
+        cancelButton: {title: 'Cancel', callback: cancel_action}
       }
     };
     var special_options = {};
@@ -14658,47 +14878,40 @@ $(function() {
     return $.extend(default_options, special_options);
   };
 
-  var cms_fields = function() {
-    return $.merge(
-      infopark.string_field_element.all(),
-      infopark.html_field_element.all()
-    );
+  var cms_fields = function(content, field_type) {
+    return content.find('[data-ip-field-type="' + field_type + '"]');
   };
 
-  var add_onclick_redactor_handlers = function() {
-    if (infopark.editing.workspace().is_editable()) {
-      _.each(cms_fields(), function(cms_field) {
-        var redactor_options = redactor_options_for_type(cms_field.field_type());
-        var dom_item = cms_field.dom_element();
+  var add_onclick_redactor_handlers = function(content) {
+    _.each(['string', 'html'], function(field_type) {
+      _.each(cms_fields(content, field_type), function(cms_field) {
+        var dom_element = $(cms_field);
+        var redactor_options = redactor_options_for_type(field_type);
         if (redactor_options !== null) {
-          if(!($(dom_item).hasClass('ip_field_editable'))) {
-            $(dom_item).addClass('ip_field_editable');
-
-            $(dom_item).on('click.ip-editing', function(e) {
+          if(!dom_element.hasClass('ip_field_editable')) {
+            dom_element.addClass('ip_field_editable');
+            dom_element.on('click', function(e) {
               e.preventDefault();
-
-              infopark.inplace_menus.close_all_menus();
-
-              if($(dom_item).data('redactor') === undefined) {
-                $(dom_item).html($(dom_item).attr('data-ip-field-original-content'));
-                $(dom_item).redactor(redactor_options);
+              if(dom_element.data('redactor') === undefined) {
+                dom_element.html(dom_element.infopark('content') || '');
+                dom_element.redactor(redactor_options);
               }
             });
           }
         }
       });
-    }
+    });
   };
 
   $.extend(infopark, {
     redactor: {
       init: function() {
-        infopark.editing.on('activate', function() {
-          add_onclick_redactor_handlers();
+        infopark.on('editing', function() {
+          add_onclick_redactor_handlers($('body'));
         });
 
-        infopark.editing.on('refresh', function() {
-          add_onclick_redactor_handlers();
+        infopark.on('new_content', function(dom_element) {
+          add_onclick_redactor_handlers($(dom_element));
         });
       }
     }
@@ -14904,6 +15117,43 @@ $(function() {
 
   return infopark;
 }());
+(function() {
+  $.extend(infopark, {
+    saving_indicator: {
+      create: function(parent_view) {
+        var target_selector = '.ip_saving_indicator';
+        var saving_in_progress_selector = target_selector + ' .ip_saving_in_progress';
+        var saving_done_selector = target_selector + ' .ip_saving_done';
+
+        parent_view.append(infopark.template.render('saving_indicator'));
+
+        var start_write_token = infopark.write_monitor.on('start_write', function() {
+          parent_view.find(saving_in_progress_selector).show();
+          parent_view.find(saving_done_selector).hide();
+        });
+
+        var end_write_token = infopark.write_monitor.on('end_write', function() {
+          if (!infopark.write_monitor.is_writing()) {
+            parent_view.find(saving_in_progress_selector).hide();
+            parent_view.find(saving_done_selector).show();
+          }
+        });
+
+        return {
+          destroy: function() {
+            infopark.write_monitor.off(start_write_token);
+            infopark.write_monitor.off(end_write_token);
+            parent_view.find(target_selector).remove();
+          },
+
+          // Test purpose only.
+          start_write_token: start_write_token,
+          end_write_token: end_write_token
+        };
+      }
+    }
+  });
+}());
 (function() {
   $.extend(infopark, {
     with_element_overlay: function(dom_element, promise) {
@@ -15106,13 +15356,8 @@ $(function() {
       }));
 
       obj_classes_deferred.done(function(obj_class_selection) {
-        var obj_classes = _.map(obj_class_selection, function(markup, name) {
-          return {name: name, markup: markup};
-        });
-
-        var selection_view = infopark.template.render('choose_obj_class_list', {
-          obj_classes: obj_classes
-        });
+        var selection_view = infopark.template.render('choose_obj_class_list',
+            {obj_classes: obj_class_selection});
 
         selection_view = $($.trim(selection_view));
 
@@ -15148,15 +15393,20 @@ $(function() {
 (function() {
   $.extend(infopark, {
     edit_dialog: {
-      open: function(title, markup) {
+      open: function(title, markup, icon) {
         var deferred = $.Deferred();
 
-        var view = $(infopark.template.render('edit_dialog', {title: title, markup: markup}));
+        var view = $(infopark.template.render('edit_dialog',
+            {icon: icon || '&#xF030;', title: title, markup: markup}));
 
         $('#ip-editing').append(view);
 
+        var saving_indicator = infopark.saving_indicator.create(
+            view.find('.ip_edit_dialog_saving_indicator'));
+
         var cancel_action = function(e) {
           e.preventDefault();
+          saving_indicator.destroy();
           infopark.dialog.close(view);
           deferred.resolve();
         };
@@ -15165,12 +15415,11 @@ $(function() {
 
         infopark.transition(view, function() {
           view.addClass('ip_show');
+        }).then(function() {
+          infopark.dialog.adjust(view);
+          infopark.editing.refresh(view.find('.ip_edit_dialog_markup').get(0));
         });
 
-        infopark.dialog.adjust(view);
-
-        infopark.editing.refresh(markup);
-
         return infopark.with_dialog_behaviour(deferred, {escape: cancel_action});
       }
     }
@@ -15329,6 +15578,22 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
         );
       },
 
+      edit_obj: function(obj) {
+        return obj.fetch_edit_markup().then(function(markup) {
+          var has_changes = false;
+          var token = infopark.write_monitor.on('start_write', function() {
+            has_changes = true;
+          });
+          var title = infopark.i18n.translate('current_page');
+          return infopark.edit_dialog.open(title, markup, '&#xF03D;').then(function() {
+            infopark.write_monitor.off(token);
+            if (has_changes) {
+              return infopark.with_saving_overlay(infopark.reload());
+            }
+          });
+        });
+      },
+
       delete_obj: function(obj) {
         return infopark.confirmation_dialog({
           icon: '&#xF018;',
@@ -15347,20 +15612,21 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
         return infopark.choose_obj_class_dialog(
             widget_field_element.fetch_widget_class_selection(), 'add_widget').then(
           function(obj_class) {
-            var new_dom_element;
+            var dom_element;
             infopark.with_saving_overlay(
               widget_field_element.create_widget(obj_class).then(function(data) {
-                new_dom_element = $(data.markup);
+                dom_element = $(data.markup);
                 if (widget_element) {
-                  widget_element.dom_element().after(new_dom_element);
+                  widget_element.dom_element().after(dom_element);
                 } else {
-                  widget_field_element.dom_element().append(new_dom_element);
+                  widget_field_element.dom_element().append(dom_element);
                 }
-                infopark.editing.refresh(new_dom_element);
-                return widget_field_element.save();
+                infopark.editing.refresh(dom_element.get(0));
               })
             ).then(function() {
-              infopark.ensure_fully_visible_within(new_dom_element, $('body'), $(window).height());
+              return widget_field_element.save().then(function() {
+                infopark.ensure_fully_visible_within(dom_element, $('body'), $(window).height());
+              });
             });
           }
         );
@@ -15370,13 +15636,21 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
         var obj = widget_element.obj();
         var dom_element = widget_element.dom_element();
         return widget_element.fetch_edit_markup().then(function(edit_markup) {
+          var has_changes = false;
+          var token = infopark.write_monitor.on('start_write', function() {
+            has_changes = true;
+          });
           return infopark.edit_dialog.open(obj.obj_class_name(), edit_markup).then(function() {
-            return infopark.with_element_overlay(dom_element,
-              widget_element.fetch_show_markup().then(function(show_markup) {
-                dom_element.replaceWith(show_markup);
-                infopark.editing.refresh();
-              })
-            );
+            infopark.write_monitor.off(token);
+            if (has_changes) {
+              return infopark.with_element_overlay(dom_element,
+                widget_element.fetch_show_markup().then(function(show_markup) {
+                  var new_dom_element = $(show_markup);
+                  dom_element.replaceWith(new_dom_element);
+                  infopark.editing.refresh(new_dom_element.get(0));
+                })
+              );
+            }
           });
         });
       },
@@ -15389,14 +15663,11 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
           title: infopark.i18n.translate('commands.delete_widget.confirm_title'),
           description: infopark.i18n.translate('commands.delete_widget.confirm_description')
         }).then(function() {
-          var delete_widget = function() {
-            widget_element.dom_element().remove();
-            infopark.editing.refresh();
-            return widget_field_element.save().then(function() {
-              return widget_element.obj().destroy();
-            });
-          };
-          infopark.with_saving_overlay(delete_widget());
+          widget_element.dom_element().remove();
+          infopark.editing.refresh();
+          return widget_field_element.save().then(function() {
+            return widget_element.obj().destroy();
+          });
         });
       },
 
@@ -15497,7 +15768,7 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
       update: function(event, ui) {
         infopark.editing.refresh();
         var widget_field_element = infopark.cms_element.from_dom_element(ui.item).widget_field();
-        infopark.with_saving_overlay(widget_field_element.save());
+        widget_field_element.save();
       }
     }
   });
@@ -15576,7 +15847,6 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
     image_upload: {
       init: function() {
         infopark.editing.on('activate', activate);
-        infopark.editing.on('refresh', activate);
 
         // Disable DnD for all elements by default to prevent the user
         // from accidentally opening an image in browser.
@@ -15601,27 +15871,23 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
         var obj_id = dom_element.attr('data-ip-resource-source-obj-id');
         var field_name = dom_element.attr('data-ip-resource-source-field-name');
 
-        var create_resource_obj = function(blob_id) {
+        var create_image = function(file) {
           var obj_name = file.name.replace(/[^a-z0-9_.$\-]/ig, '-');
           var path = '_resources/' + infopark.random_hex() + '/' + obj_name;
-          return infopark.obj.create({ blob: blob_id, _path: path, _obj_class: 'Image' });
+          return infopark.obj.create({blob: file, _path: path, _obj_class: 'Image'});
         };
 
-        var link_resource_obj = function(resource_id) {
+        var link_image = function(resource_id) {
           var attributes = {};
           attributes[field_name] = [{obj_id: resource_id}];
           return infopark.obj.create_instance(obj_id).save(attributes);
         };
 
-        infopark.with_saving_overlay(
-          infopark.blob.create(file).then(function(blob_id) {
-            return create_resource_obj(blob_id).then(function(resource_data) {
-              return link_resource_obj(resource_data.id()).then(function() {
-                return infopark.reload();
-              });
-            });
-          })
-        );
+        infopark.with_saving_overlay(create_image(file).then(function(data) {
+          return link_image(data.id()).then(function() {
+            return infopark.reload();
+          });
+        }));
       }
 
     }
@@ -15730,6 +15996,18 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
     }
   });
 }());
+(function() {
+  $.extend(infopark, {
+    warn_before_unloading: function() {
+      if (infopark.write_monitor.is_writing()) {
+        return infopark.i18n.translate('warn_before_unloading');
+      }
+    }
+  });
+}());
+
+
+
 
 
 
@@ -15780,8 +16058,8 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
 
 infopark.redactor.init();
 infopark.inplace_menus.init();
-infopark.deactivate_menu_bar_item.init();
-infopark.delete_current_page_item.init();
+infopark.menu_bar_saving_indicator.init();
+infopark.menu_bar_dropdown.init();
 infopark.workspace_select.init();
 infopark.menu_bar.init();
 infopark.widget_menus.init();
@@ -15789,3 +16067,5 @@ infopark.widget_sorting.init();
 infopark.image_upload.init();
 infopark.child_list_menus.init();
 infopark.editable_workspace_dialog.init();
+
+window.onbeforeunload = infopark.warn_before_unloading;