infopark_cloud_connector 7.0.2 → 7.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjJjMWIxMWM5ZDliZGZlZTNlNjg0OWNjOTVlNjkwMjg3NzZjNDgxZQ==
+    OWYzMmRjMTE3YWVjMTlmMTA0ODE4MzAzMjlhYWM1NGNlYzJjZGJjMA==
   data.tar.gz: !binary |-
-    OGE3MDQ0YjUwNDJjMjEwNjYyNzIzY2VkNDBlYzAzMjcyOGZhZTk5NA==
+    ZWFmOWViMGQwMWU0ZjVmNTk5MDhhMThjNGVmZjFhYmM0NWI3MTk1NQ==
 SHA512:
   metadata.gz: !binary |-
-    MTI5NGNiMTJjMDZjMWQ5NzVlMzU4MWQzOTEwZjY1ZGFjMDE3YjgyMDIwZmQy
-    MGY2YTNlZTI1MjFjYmNlZGYwMjc2N2NkODNkYzUwYWRiZWM5OWZiNDNhMzIy
-    NjUxZjdmMjM3NDM2ZDBkMjYyYmEzNDk1MTZlODUwMjU1NjRkYTE=
+    NTEwNTBiNjRlZWZmNDJiNTYwNWNjODE2MjM2ZTI1NzhmNWE3ZDEyOGYwYThh
+    NDI0OTY0MDY2MTY0ZmI5MDgwMmU1YTQ2YTFkOWQxODQyNTYzNTAxNDVjYzg3
+    YzIyYzA1Zjk5YmNlOGVhYTgwZjczNjI0MzVjMmY0NmFmZmI2M2E=
   data.tar.gz: !binary |-
-    ZmNmNDM5ZTAzYTY5OWMyZTJlMmE0MTNkNGMxODJlMTlkOWExOTJhMTIwYjQ3
-    ZThhYmUxMWI4ZGZlMzk0YzI1NGI0MjNjOWMxNzg4ODJhOWU3ZDBlYjRiYjc1
-    ZDExNzFiMTc4YTA5OTZlZjY0NGI4M2M5ODAxMmQxN2Q2NDRjMmE=
+    MGJlOWRkNmZhZDg0MmQ1ZDNjYjI4MTNmODVmMWVlMDY4ODgxYjM0MWU3NWJi
+    ZDFmZTE4YzdlY2E1NGE3YmE4Yjg1ODEyZDc2NTJkM2M1NzBlZDRhNWMyYTFl
+    ODkyNTc5M2RhMTU5ODJiYTRlZWM4YmRmY2I2ZTA1MWM2ZmU0YWI=

data/app/controllers/rails_connector/objs_controller.rb

@@ -1,7 +1,7 @@
 module RailsConnector
 
   class ObjsController < WebserviceController
-    before_filter :load_object, only: [:edit, :update, :destroy,
+    before_filter :load_object, only: [:edit, :update, :destroy, :revert,
         :show_widget, :widget_class_selection, :create_widget, :edit_widget]
 
     def create
@@ -29,6 +29,12 @@ module RailsConnector
       render json: {}
     end
 
+    def revert
+      @obj.revert
+
+      render json: {}
+    end
+
     def copy
       render json: copy_obj(get_obj_attributes(params[:id]), params[:parent_path])
     end
@@ -95,53 +101,39 @@ module RailsConnector
       render json: {markup: markup}
     end
 
-    private
-
-    def load_object
-      @obj = Obj.find(params[:id])
-    end
-
-    def obj_params
-      params[:obj].tap do |p|
-        raise "Required parameter 'obj' is missing." unless p.present?
-        raise "Parameter 'obj' is not a hash." unless p.is_a?(Hash)
+    def search
+      query = MultiJson.decode(params[:query]).with_indifferent_access
+      search_builder = ObjSearchBuilder.new(query)
+      enumerator = search_builder.build
 
-        if @obj
-          convert_html_keys = p.keys.select do |key|
-            @obj.type_of_attribute(key.to_s) == 'html'
-          end
+      if params[:query_action] == 'size'
+        result = { total: enumerator.size }
+      else
+        batch = enumerator.load_batch
 
-          convert_html_keys.each { |key| p[key] = convert_html_links(p[key]) }
-
-          if widget_pool_params = p['_widget_pool']
-            convert_widget_pool_params(@obj, widget_pool_params)
-          end
-        end
+        result = {
+          total: enumerator.size,
+          hits: batch
+        }
       end
+
+      render json: result
+    rescue ObjSearchEnumerator::UnregisteredObjFormat => e
+      render json: { error: e.message }, status: :not_found
     end
 
-    def convert_widget_pool_params(obj, widget_pool_params)
-      widget_pool_params.each_pair do |widget_id, widget_params|
-        widget = obj.widget_from_pool(widget_id)
+    private
 
-        if widget_params.present?
-          widget_params.each_pair do |param_name, param_value|
-            if widget.type_of_attribute(param_name) == 'html'
-              widget_params[param_name] = convert_html_links(param_value)
-            end
-          end
-        end
-      end
+    def load_object
+      @obj = Obj.find(params[:id])
     end
 
-    def convert_html_links(html)
-      ContentConversion.convert_html_links(html, request.host, request.port)
+    def obj_params
+      ObjParamsParser.new(request.host, request.port).parse(@obj, params[:obj])
     end
 
     def copy_obj(attributes, target_path=nil)
-      copied_attributes = attributes.reject do |key, _|
-        %w{id _last_changed _permalink}.include?(key)
-      end
+      copied_attributes = attributes.except!('id', '_permalink')
       copied_attributes['_path'] = "#{target_path}/#{SecureRandom.hex(6)}"
 
       task_unaware_request(:post, "workspaces/#{Workspace.current.id}/objs", obj: copied_attributes)

data/app/helpers/rails_connector/cms_asset_helper.rb

@@ -22,7 +22,7 @@ module RailsConnector
     #     cms_image_tag @target, alt: 'Interesting picture', class: 'my_image'
     #
     # @overload cms_image_tag obj, linklist, tag_options={}, editing_options={}
-    #   @note If you do not specify an HTML +alt+ attribute, the helper method will use +obj+'s +display_title+.
+    #   @note If you do not specify an HTML +alt+ attribute, the helper method will use +display_title+ of the target object.
     #   Calculates HTML image tag for inplace editing.
     #
     #   @param [Obj] obj Obj with an attribute of type {LinkList}.

data/app/helpers/rails_connector/cms_tag_helper.rb

@@ -61,7 +61,7 @@ module RailsConnector
       end
 
       if field_type == 'widget'
-        rendered_widgets = obj_or_widget.widgets(field_name).map do |widget|
+        rendered_widgets = obj_or_widget[field_name].map do |widget|
           render_widget(widget, obj_or_widget, field_name, obj_or_widget)
         end
         inner_html = safe_join(rendered_widgets)

data/app/helpers/rails_connector/default_cms_routing_helper.rb

@@ -22,7 +22,6 @@ module RailsConnector
       cms_path_or_url(target, "url", options)
     end
 
-    LINK_TO_UNREACHABLE = "#__target_object_not_reachable"
     LINK_TO_EMPTY_LINKLIST = "#__empty_linklist"
     LINK_TO_EMPTY_BLOB = "#__empty_blob"
 
@@ -44,7 +43,6 @@ module RailsConnector
     end
 
     def cms_path_or_url_for_links(link, path_or_url, options = {})
-      return LINK_TO_UNREACHABLE if link.internal? && link.obj.nil?
       url = basic_url_or_path_for_link(link, path_or_url, options)
       url = url + "?#{link.query}" if link.query.present? && options.empty?
       url = url + "##{link.fragment}" if link.fragment.present?
@@ -83,7 +81,7 @@ module RailsConnector
       if link.internal?
         __send__("cms_#{path_or_url}", link.obj, options)
       else
-        url = link.external_url
+        url = link.url
         options.delete(:dont_resolve_blobs)
         url = merge_options(url, options) if options.any?
         url

data/app/helpers/rails_connector/display_helper.rb

@@ -58,7 +58,11 @@ module RailsConnector
     def convert_links(html, cms_path_options = {})
       if html
         html.gsub(%r{<?\bobjid:([a-f0-9]{16})\b>?}) do
-          cms_path(Obj.find($1), cms_path_options)
+          if obj = Obj.find_by_id($1)
+            cms_path(obj, cms_path_options)
+          else
+            "#__target_object_not_reachable"
+          end
         end
       end
     end

data/app/views/rails_connector/_editing_javascript.html.erb

@@ -2,7 +2,7 @@
 <%= javascript_tag do %>
   $(function() {
     infopark.i18n.set_locale("<%= I18n.locale %>");
-    infopark.editing.set_workspace(
+    infopark.gui.set_workspace(
       infopark.workspace.from_data({
         id: "<%= escape_javascript(RailsConnector::Workspace.current.id).html_safe %>",
         title: "<%= escape_javascript(RailsConnector::Workspace.current.title).html_safe %>"
@@ -12,7 +12,8 @@
     infopark.obj.current_page_obj_class_name = "<%= @obj.try(:obj_class) %>";
     infopark.obj.current_page_has_edit_view = <%= current_page_has_edit_view? %>;
     infopark.obj.current_page_has_children = <%= current_page_has_children? %>;
+    infopark.obj.current_page_modification = "<%= @obj.try(:modification) %>";
     infopark.admin_gui_base_url = "<%= RailsConnector::CmsRestApi.configuration.url %>";
-    infopark.editing.initialize();
+    infopark.gui.initialize();
   });
 <% end %>

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
-## /Network/Servers/xs2.infopark/Users/develop/dcc/tmp/Rails_Connector__Kris__dev__93/repos/cloud_connector/config/ca-bundle.crt -- Bundle of CA Root Certificates
+## /mnt/dcc/Cloud_Connector_57/repos/cloud_connector/config/ca-bundle.crt -- Bundle of CA Root Certificates
 ##
-## Converted at: Thu Nov 21 10:33:57 2013 UTC
+## Converted at: Thu Feb  6 11:12:41 2014 UTC
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/config/routes.rb

@@ -2,8 +2,11 @@ Rails.application.routes.draw do
   resources :objs, controller: 'rails_connector/objs', path: '__ipcms/objs',
       only: [:edit, :create, :update, :destroy] do
     get :page_class_selection, on: :collection
+    get :search, on: :collection
 
     member do
+      put :revert
+
       get :show_widget
       get :widget_class_selection
       post :create_widget

data/lib/assets/images/ip_logo.svg

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<svg version="1.2" baseProfile="tiny" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" width="562.486px" height="104.032px" viewBox="0 0 562.486 104.032" xml:space="preserve">
+<g>
+	<path fill="#CB061D" d="M0,0v99.705h153.578c7.758,0,14.104-6.254,14.104-13.925V13.837C167.682,6.257,161.247,0,153.578,0H0z"/>
+	<path fill="#FFFFFF" d="M116.201,34.556c5.196,0,8.547,4.232,8.547,9.345c0,5.026-3.352,9.262-8.375,9.345H99.539V65.5h17.894
+		c13.225-0.088,20.101-10.136,20.101-21.509c0-11.461-7.235-21.689-20.898-21.689h-7.312c-2.299,0-4.233,1.852-4.319,4.054v8.2
+		H116.201z M94.596,28.653c0-4.323-2.732-7.494-10.048-7.494c-5.377,0-9.879,1.671-9.879,7.932c0,4.323,2.471,7.493,9.879,7.493
+		C90.101,36.585,94.596,34.915,94.596,28.653 M77.229,50.869c0-2.29,2.029-4.059,4.319-4.141h9.346v33.233H77.229V50.869z"/>
+	<path fill="#FFFFFF" d="M223.729,43.585v36.876c0,4.739-2.591,7.105-7.981,7.105c-6.79,0-7.982-2.964-7.982-8.678V42.005
+		c0-4.337,2.39-7.091,5.986-7.091h3.594C221.539,34.915,223.729,37.868,223.729,43.585 M215.549,29.189
+		c-5.792,0-7.783-2.565-7.783-5.917c0-4.931,3.59-6.315,7.783-6.315c5.788,0,7.979,2.566,7.979,5.924
+		C223.528,27.809,219.942,29.189,215.549,29.189"/>
+	<path fill="#FFFFFF" d="M278.111,51.18v30.767c0,3.743-2.799,5.522-6.185,5.522h-2.197c-3.192,0-5.591-1.779-5.591-5.522V60.645
+		c0-9.076-2.995-13.61-8.581-13.61c-5.989,0-8.783,4.736-8.783,14.208v20.704c0,3.743-2.799,5.522-6.185,5.522h-2.198
+		c-3.395,0-5.591-1.975-5.591-6.114V42.303c0-3.747,2.196-5.718,6.99-5.718c3.987,0,7.181,1.38,9.778,1.38
+		c4.792,0,6.19-2.565,13.372-2.565C272.127,35.4,278.111,39.741,278.111,51.18"/>
+	<path fill="#FFFFFF" d="M304.934,52.663v27.799c0,4.54-2.202,6.909-7.393,6.909c-5.382,0-7.783-1.779-7.783-6.909V53.644
+		c0-9.464-7.58-7.696-7.58-12.628c0-3.348,2.791-4.13,5.783-6.696c1.201-0.989,1.201-2.768,2.798-8.29
+		c0.798-2.961,3.997-8.874,12.771-8.874h3.79c3.992,0,6.982,2.367,6.982,5.131c0,2.163,0.403,4.537-2.99,6.309
+		c-3.188,1.779-4.186,2.765-4.186,4.145c0,1.58,0.596,2.363,3.592,3.739c2.195,0.989,3.189,2.769,3.189,4.348
+		c0,3.547-4.986,4.729-6.588,5.914C305.931,47.727,304.934,49.893,304.934,52.663"/>
+	<path fill="#FFFFFF" d="M343.506,77.899c7.58,0,13.175-6.899,13.175-16.363c0-8.881-4.79-15.784-13.175-15.784
+		c-7.387,0-13.371,5.526-13.371,15.784C330.135,71,335.527,77.899,343.506,77.899 M342.907,88.357
+		c-15.167,0-26.946-9.275-26.946-26.625c0-18.545,13.378-26.625,27.35-26.625c12.773,0,27.544,6.902,27.544,26.429
+		C370.854,76.718,361.677,88.357,342.907,88.357"/>
+	<path fill="#FFFFFF" d="M399.977,78.592c10.975,0,11.779-13.807,11.779-17.756c0-8.873-3.998-15.972-11.383-15.972
+		c-6.788,0-11.98,6.309-11.98,16.962C388.393,71.685,393.188,78.592,399.977,78.592 M424.526,60.836
+		c0,16.968-7.591,27.023-21.363,27.023c-4.179,0-8.176-1.377-9.179-1.377c-3.191,0-5.386,1.771-5.386,7.885
+		c0,7.493-0.999,9.664-6.587,9.664c-5.192,0-6.586-2.171-6.586-6.704V42.502c0-3.75,1.997-5.721,6.189-5.721
+		c3.596,0,5.789,1.185,8.579,1.185c3.994,0,5.387-2.37,12.572-2.37C415.936,35.595,424.526,45.458,424.526,60.836"/>
+	<path fill="#FFFFFF" d="M448.988,78.388c5.192,0,10.383-4.729,10.383-9.859c0-2.561-1.4-4.728-4.997-4.728
+		c-4.192,0-12.569,2.757-12.569,8.286C441.805,75.432,444.602,78.388,448.988,78.388 M467.745,87.075
+		c-4.192,0-6.179-1.779-8.774-1.779c-4.597,0-7.788,3.159-14.571,3.159c-11.182,0-17.167-6.312-17.167-14.99
+		c0-8.874,7.191-15.58,23.353-17.744c6.587-0.793,8.58-3.362,8.58-5.528c0-3.944-3.192-6.509-6.982-6.509
+		c-7.581,0-6.985,6.509-15.369,6.509c-2.797,0-5.79-0.591-5.79-3.944c0-3.551,4.192-11.044,20.159-11.044
+		c13.966,0,22.356,3.152,22.356,17.352v29.587C473.539,86.088,471.146,87.075,467.745,87.075"/>
+	<path fill="#FFFFFF" d="M507.273,35.893c3.396,0,4.994,1.971,4.994,5.725c0,4.729-1.193,6.704-6.589,8.279
+		c-5.186,1.584-7.781,5.128-7.781,9.665v20.312c0,4.924-2,7.496-6.19,7.496h-3.998c-3.785,0-5.778-2.768-5.778-7.891V42.604
+		c0-4.935,1.598-7.692,7.582-7.692c6.189,0,8.58,2.167,10.98,2.167C503.48,37.078,504.284,35.893,507.273,35.893"/>
+	<path fill="#FFFFFF" d="M560.688,79.678c1.2,1.972,1.798,3.548,1.798,4.537c0,2.16-1.994,3.155-5.993,3.155
+		c-4.386,0-7.779-1.579-9.772-4.734l-5.192-8.483c-2-3.155-3.992-4.732-5.983-4.732c-3,0-6.192,2.562-6.192,9.863
+		c0,5.319-0.997,8.087-6.582,8.087c-5.399,0-6.996-2.17-6.996-6.71V25.635c0-4.141,1.805-6.308,6.788-6.308
+		c4.595,0,6.79,1.975,6.79,6.308c0,21.107-0.199,23.864,3.594,23.864c1.196,0,2.599-0.391,6.182-3.942c0,0,0.998-1.182,3.194-3.551
+		c2.197-2.167,3.593-3.351,4.195-3.551c1.598-0.986,3.993-1.381,7.186-1.381h1.396c2.991,0,4.396,0.99,4.396,2.765
+		c0,0.989-0.6,2.167-2.001,3.747l-6.983,7.889c-1.797,2.17-2.194,4.345-2.194,5.123c0,1.779,0.397,3.163,1.001,4.146L560.688,79.678
+		z"/>
+</g>
+</svg>

data/lib/assets/javascripts/infopark_editing.js

@@ -6679,6 +6679,100 @@ if (typeof module !== 'undefined' && module.exports) {
   });
 
 }).call(this);
+(function() {
+  this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
+  this.InfoparkHandlebarsTemplates["changes_list_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+
+
+  buffer += "<div class=\"ip_changes_overview ip_modal_big ip_adjust_dialog\" >\n\n  <div class=\"ip_modal_header\">\n    <h3>\n      <i class=\"ip_icon\">&#xF080;</i>\n      ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.title", options) : helperMissing.call(depth0, "translate", "changes_list.title", options)))
+    + "\n      <span id=\"ip_obj_count\" style=\"display:none;\">\n        (<span id=\"ip_loaded_obj_count\"></span> / <span id=\"ip_total_obj_count\"></span>)\n      </span>\n    </h3>\n  </div>\n  <div class=\"ip_modal_body ip_auto_height\">\n\n    <table class=\"ip_changes_table\">\n      <thead>\n        <tr>\n          <th><span class=\"ip_sortable\" data-ip-sort-by=\"modification\">";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.row.change", options) : helperMissing.call(depth0, "translate", "changes_list.row.change", options)))
+    + "</span></th>\n          <th><span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.row.title", options) : helperMissing.call(depth0, "translate", "changes_list.row.title", options)))
+    + "</span></th>\n          <th><span class=\"ip_sortable\" data-ip-sort-by=\"obj_class\">";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.row.type", options) : helperMissing.call(depth0, "translate", "changes_list.row.type", options)))
+    + "</span></th>\n          <th><span class=\"ip_sortable sort_down\" data-ip-sort-by=\"last_changed\">";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.row.last_changed", options) : helperMissing.call(depth0, "translate", "changes_list.row.last_changed", options)))
+    + "</span></th>\n        </tr>\n      </thead>\n      <tbody id=\"ip_changes_table_loaded\">\n      </tbody>\n      <tbody id=\"ip_changes_table_empty_result\" style=\"display:none;\">\n        <tr>\n          <td colspan=\"4\">\n            ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.empty_result", options) : helperMissing.call(depth0, "translate", "changes_list.empty_result", options)))
+    + "\n          </td>\n        </tr>\n      </tbody>\n      <tbody id=\"ip_changes_table_loading\">\n        <tr>\n          <td colspan=\"4\">\n            <i class=\"ip_icon ip_spinning\">&#xf023;</i>\n          </td>\n        </tr>\n      </tbody>\n\n    </table>\n\n    <span class=\"ip_load_more\" style=\"display: none;\">";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.more", options) : helperMissing.call(depth0, "translate", "changes_list.more", options)))
+    + "</span>\n\n  </div>\n  <div class=\"ip_modal_footer\">\n    <a class=\"ip_button ip_cancel\" href=\"#\">";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "cancel", options) : helperMissing.call(depth0, "translate", "cancel", options)))
+    + "</a>\n  </div>\n\n</div>\n";
+  return buffer;
+  });
+  return this.InfoparkHandlebarsTemplates["changes_list_dialog"];
+}).call(this);
+(function() {
+  this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
+  this.InfoparkHandlebarsTemplates["changes_list_row"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
+
+function program1(depth0,data) {
+  
+  
+  return "\n  <tr>\n";
+  }
+
+function program3(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n  <tr class=\"ip_link_to_obj\" data-obj-id=\"";
+  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\">\n";
+  return buffer;
+  }
+
+function program5(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n      <span><time>";
+  if (stack1 = helpers.last_changed) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.last_changed; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</time></span>\n    ";
+  return buffer;
+  }
+
+  stack1 = helpers['if'].call(depth0, depth0.deleted, {hash:{},inverse:self.program(3, program3, data),fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n\n  <td><span class=\"ip_changes_state ";
+  if (stack1 = helpers.modification) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.modification; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\"></span></td>\n  <td><span class=\"ip_title\">";
+  if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</span>\n  <td><span class=\"ip_obj_class\">";
+  if (stack1 = helpers.obj_class) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.obj_class; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</span></td>\n\n  <td>\n    ";
+  stack1 = helpers.unless.call(depth0, depth0.deleted, {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n  </td>\n</tr>\n";
+  return buffer;
+  });
+  return this.InfoparkHandlebarsTemplates["changes_list_row"];
+}).call(this);
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["choose_obj_class_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
@@ -6927,67 +7021,108 @@ 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_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 "<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_menu_bar_toggle\" class=\"ip_viewmodes_wrapper\"></div>\n    <div id=\"ip_select_workspace\" class=\"ip_button_bar\"></div>\n    <div id=\"ip_menu_bar_close\" class=\"ip_button_bar ip_right\"></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_close"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  
+
+
+  return "<i class=\"ip_icon\">&#xF01F;</i>\n";
+  });
+  return this.InfoparkHandlebarsTemplates["menu_bar_close"];
+}).call(this);
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["menu_bar_dropdown"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, self=this, functionType="function";
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this, helperMissing=helpers.helperMissing;
 
 function program1(depth0,data) {
   
-  var buffer = "", stack1, stack2, options;
+  
+  return "ip_changed";
+  }
+
+function program3(depth0,data) {
+  
+  var buffer = "", stack1;
   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});
+  stack1 = helpers['if'].call(depth0, depth0.is_present, {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n\n    <li id=\"ip_save_current_page_to_clipboard\" class=\"";
-  if (stack1 = helpers.disable_with_children) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.disable_with_children; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\">\n      <span>\n        <i class=\"ip_icon\">&#xf017;</i>\n        ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar_dropdown.save_current_page_to_clipboard", options) : helperMissing.call(depth0, "translate", "menu_bar_dropdown.save_current_page_to_clipboard", options)))
-    + "\n      </span>\n    </li>\n\n    <li id=\"ip_duplicate_current_page\" class=\"";
-  if (stack2 = helpers.disable_with_children) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
-  else { stack2 = depth0.disable_with_children; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
-  buffer += escapeExpression(stack2)
-    + "\">\n      <span>\n        <i class=\"ip_icon\">&#xf015;</i>\n        ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar_dropdown.duplicate_current_page", options) : helperMissing.call(depth0, "translate", "menu_bar_dropdown.duplicate_current_page", options)))
-    + "\n      </span>\n    </li>\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  ";
+  buffer += "\n  ";
   return buffer;
   }
-function program2(depth0,data) {
+function program4(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>";
+  buffer += "\n      <li id=\"ip_";
+  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\" class=\"ip_menu_item ";
+  stack1 = helpers.unless.call(depth0, depth0.is_enabled, {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\" title=\"";
+  if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\">\n      <span><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, "menu_bar_dropdown.edit_current_page", options) : helperMissing.call(depth0, "translate", "menu_bar_dropdown.edit_current_page", options)))
+  buffer += escapeExpression(((stack1 = helpers.concat_translate),stack1 ? stack1.call(depth0, "menu_bar_dropdown.", depth0.name, options) : helperMissing.call(depth0, "concat_translate", "menu_bar_dropdown.", depth0.name, options)))
     + "</span>\n      </li>\n    ";
   return buffer;
   }
+function program5(depth0,data) {
+  
+  
+  return "disabled";
+  }
 
-  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});
+  buffer += "<i class=\"ip_icon ";
+  stack1 = helpers['if'].call(depth0, depth0.is_current_page_changed, {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";
+  buffer += "\">&#xf087;</i>\n\n<ul class=\"ip_menu_box ip_right\" style=\"display: none;\">\n  ";
+  stack1 = helpers.each.call(depth0, depth0.dropdown_items, {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n</ul>\n";
   return buffer;
   });
   return this.InfoparkHandlebarsTemplates["menu_bar_dropdown"];
 }).call(this);
+(function() {
+  this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
+  this.InfoparkHandlebarsTemplates["menu_bar_toggle"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing;
+
+
+  buffer += "<div class=\"ip_viewmodes ip_viewmode_";
+  if (stack1 = helpers.mode) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.mode; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "_active\">\n  <span class=\"ip_viewmode_pill\"></span>\n\n  <div class=\"ip_viewmode_view\">\n    <span class=\"ip_viewmode_icon\"></span>\n    <span class=\"ip_viewmode_label\">";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar_toggle.view", options) : helperMissing.call(depth0, "translate", "menu_bar_toggle.view", options)))
+    + "</span>\n  </div>\n\n  <div class=\"ip_viewmode_editing\">\n    <span class=\"ip_viewmode_icon\"></span>\n    <span class=\"ip_viewmode_label\">";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar_toggle.editing", options) : helperMissing.call(depth0, "translate", "menu_bar_toggle.editing", options)))
+    + "</span>\n  </div>\n</div>\n";
+  return buffer;
+  });
+  return this.InfoparkHandlebarsTemplates["menu_bar_toggle"];
+}).call(this);
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["overlay"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
@@ -7210,7 +7345,13 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 function program1(depth0,data) {
   
   var buffer = "", stack1, options;
-  buffer += "\n    <li class=\"ip_menu_separator\"></li>\n    <li class=\"ip_menu_item\">\n      <span id='ip-publish-current-ws'>\n        <i class=\"ip_icon\"\n          title=\"";
+  buffer += "\n    <li id=\"ip_changes_list_toggle\" class=\"ip_menu_item\">\n      <span>\n        <i class=\"ip_icon\" title=\"";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.menu_item", options) : helperMissing.call(depth0, "translate", "changes_list.menu_item", options)))
+    + "\">&#xF080;</i>\n        ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.menu_item", options) : helperMissing.call(depth0, "translate", "changes_list.menu_item", options)))
+    + "\n      </span>\n    </li>\n    <li class=\"ip_menu_separator\"></li>\n    <li class=\"ip_menu_item\">\n      <span id='ip-publish-current-ws'>\n        <i class=\"ip_icon\"\n          title=\"";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.publish_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.publish_working_copy", depth0.current_short_title, options)))
     + " \">\n          &#xF064;\n        </i>\n        ";
@@ -7309,13 +7450,29 @@ $.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.revert': 'Verwerfen',
+
+  'menu_bar_toggle.editing': 'Bearbeiten',
+  'menu_bar_toggle.view': 'Vorschau',
+  'menu_bar_toggle.hide': 'Ausblenden',
 
   'menu_bar_dropdown.edit_current_page': 'Seiteneigenschaften',
   'menu_bar_dropdown.delete_current_page': 'Diese Seite löschen',
+  'menu_bar_dropdown.delete_current_page.workspace_is_published': 'Die veröffentlichten Inhalte können nicht direkt geändert werden.',
+  'menu_bar_dropdown.delete_current_page.has_children': 'Seiten mit Unterseiten können noch nicht gelöscht werden.',
+  'menu_bar_dropdown.revert_current_page': 'Änderungen an dieser Seite verwerfen',
   'menu_bar_dropdown.save_current_page_to_clipboard': 'Diese Seite im Clipboard ablegen',
   'menu_bar_dropdown.duplicate_current_page': 'Diese Seite duplizieren',
   'menu_bar_dropdown.open_current_page_in_admin_gui': 'Im Admin-GUI öffnen',
   'menu_bar_dropdown.deactivate_editing': 'Direktbearbeitung deaktivieren',
+  'menu_bar_dropdown.save_current_page_to_clipboard.has_children': 'Seiten mit Unterseiten können noch nicht verschoben oder kopiert werden.',
+  'menu_bar_dropdown.duplicate_current_page.has_children': 'Seiten mit Unterseiten können noch nicht dupliziert werden.',
+  'menu_bar_dropdown.duplicate_current_page.workspace_is_published': 'Die veröffentlichten Inhalte können nicht direkt geändert werden.',
+  'menu_bar_dropdown.revert_current_page.workspace_is_published': 'Die veröffentlichten Inhalte können nicht direkt geändert werden. Daher gibt es nichts zu verwerfen.',
+  'menu_bar_dropdown.revert_current_page.workspace_is_rtc': 'Diese Seite ist Teil der "rtc"-Arbeitskopie, bei der Änderungen nicht verworfen werden können.',
+  'menu_bar_dropdown.revert_current_page.obj_is_new': 'Dies ist eine neue Seite. Um die Erstellung dieser Seite rückgängig zu machen, löschen Sie sie bitte.',
+  'menu_bar_dropdown.revert_current_page.obj_is_deleted': 'Diese Seite wurde gelöscht. Derzeit können gelöschte Seite nicht wiederhergestellt werden.',
+  'menu_bar_dropdown.revert_current_page.obj_is_unchanged': 'Diese Seite wurde nicht geändert. Daher gibt es nichts zu verwerfen.',
 
   'saving_indicator_item.saving': 'Wird gespeichert...',
   'saving_indicator_item.saved': 'Änderungen gespeichert',
@@ -7328,6 +7485,15 @@ $.i18n().load({
   'widget_menus.edit_widget': 'Widget-Eigenschaften',
   'widget_menus.delete_widget': 'Widget löschen',
 
+  'changes_list.menu_item': 'Liste der Änderungen',
+  'changes_list.title': 'Änderungen',
+  'changes_list.empty_result': 'In dieser Arbeitskopie wurde nichts geändert.',
+  'changes_list.more': 'Mehr...',
+  'changes_list.row.change': 'Änderung',
+  'changes_list.row.title': 'Titel',
+  'changes_list.row.type': 'Typ',
+  'changes_list.row.last_changed': 'Letzte Änderung',
+
   'commands.delete_obj.confirm_title': 'Wirklich diese Seite löschen?',
   'commands.delete_obj.confirm_description': 'Eine gelöschte Seite kann nicht wiederhergestellt werden.',
   'commands.move_obj_into.confirm_title': 'Seite im Clipboard hierher verschieben?',
@@ -7335,17 +7501,17 @@ $.i18n().load({
   'commands.copy_obj_into.confirm_title': 'Seite im Clipboard hierher kopieren?',
   'commands.copy_obj_into.confirm_description': 'Eine Kopie der Seite im Clipboard wird hier eingefügt.',
   'commands.paste.not_allowed': 'Aufgrund ihres Typs kann die Seite hier nicht eingefügt werden.\n\nNur Seiten der folgenden Typen können hierher verschoben oder kopiert werden:\n\n$2',
-  'commands.save_obj.has_children': 'Seiten mit Unterseiten können noch nicht verschoben oder kopiert werden.',
   'commands.delete_widget.confirm_title': 'Wirklich dieses Widget löschen?',
   'commands.delete_widget.confirm_description': 'Ein gelöschtes Widget kann nicht wiederhergestellt werden.',
   'commands.duplicate_obj.button_text': 'Duplizieren',
   'commands.duplicate_obj.confirm_title': 'Diese Seite duplizieren?',
   'commands.duplicate_obj.confirm_description': 'Diese Seite wird sofort dupliziert.',
-  'commands.duplicate_obj.has_children': 'Seiten mit Unterseiten können noch nicht dupliziert werden.',
+  'commands.revert_obj.confirm_title': 'Wirklich Änderungen an dieser Seite verwerfen?',
+  'commands.revert_obj.confirm_description': 'Verworfene Änderungen können nicht wiederhergestellt werden.',
 
-  'image_upload.too_many_files': 'Nur eine Detei erlaubt.',
+  'image_upload.too_many_files': 'Nur eine Datei erlaubt.',
 
-  'warn_before_unloading': 'Sie haben ungespeicherte Änderungen! Sind Sie sicher, dass sie schließen wollen?'
+  'warn_before_unloading': 'Sie haben nicht gespeicherte Änderungen! Sind Sie sicher, dass sie schließen wollen?'
 }, 'de');
 $.i18n().load({
   'confirm': 'Confirm',
@@ -7394,13 +7560,29 @@ $.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.revert': 'Discard',
+
+  'menu_bar_toggle.editing': 'Edit',
+  'menu_bar_toggle.view': 'Preview',
+  'menu_bar_toggle.hide': 'Hide',
 
   'menu_bar_dropdown.edit_current_page': 'Page properties',
   'menu_bar_dropdown.delete_current_page': 'Delete this page',
+  'menu_bar_dropdown.delete_current_page.workspace_is_published': 'Since this is the published content, nothing can be modified.',
+  'menu_bar_dropdown.delete_current_page.has_children': 'Pages with subpages cannot be deleted yet.',
+  'menu_bar_dropdown.revert_current_page': 'Discard changes to this page',
   'menu_bar_dropdown.save_current_page_to_clipboard': 'Place this page on the clipboard',
   'menu_bar_dropdown.duplicate_current_page': 'Duplicate this page',
   'menu_bar_dropdown.open_current_page_in_admin_gui': 'Open in admin GUI',
   'menu_bar_dropdown.deactivate_editing': 'Deactivate in-place editing',
+  'menu_bar_dropdown.save_current_page_to_clipboard.has_children': 'Pages with subpages cannot be copied or moved yet.',
+  'menu_bar_dropdown.duplicate_current_page.has_children': 'Pages with subpages cannot be duplicated yet.',
+  'menu_bar_dropdown.duplicate_current_page.workspace_is_published': 'Since this is the published content, nothing can be modified.',
+  'menu_bar_dropdown.revert_current_page.workspace_is_published': 'Since this is the published content, nothing has been modified. Therefore, nothing can be discarded.',
+  'menu_bar_dropdown.revert_current_page.workspace_is_rtc': 'This page is part of the "rtc" working copy, for which discarding changes is not supported.',
+  'menu_bar_dropdown.revert_current_page.obj_is_new': 'This is a new page. To discard the creation of this page, please delete it.',
+  'menu_bar_dropdown.revert_current_page.obj_is_deleted': 'This page has been deleted. Currently, deleted pages cannot be restored.',
+  'menu_bar_dropdown.revert_current_page.obj_is_unchanged': 'This page has not been modified. Therefore, nothing can be discarded.',
 
   'saving_indicator_item.saving': 'Saving...',
   'saving_indicator_item.saved': 'Changes saved',
@@ -7413,20 +7595,29 @@ $.i18n().load({
   'widget_menus.edit_widget': 'Widget properties',
   'widget_menus.delete_widget': 'Delete widget',
 
+  'changes_list.menu_item': 'Changes List',
+  'changes_list.title': 'Changes',
+  'changes_list.empty_result': 'Nothing was changed in this working copy.',
+  'changes_list.more': 'More...',
+  'changes_list.row.change': 'Change',
+  'changes_list.row.title': 'Title',
+  'changes_list.row.type': 'Type',
+  'changes_list.row.last_changed': 'Last change',
+
   'commands.delete_obj.confirm_title': 'Really delete this page?',
   'commands.delete_obj.confirm_description': 'A deleted page cannot be restored.',
   'commands.move_obj_into.confirm_title': 'Move page on clipboard here?',
   'commands.move_obj_into.confirm_description': 'The page that has been placed on the clipboard will be moved here.',
   'commands.copy_obj_into.confirm_title': 'Copy page on clipboard here?',
   'commands.copy_obj_into.confirm_description': 'A copy of the page on the clipboard will be inserted here.',
-  'commands.save_obj.has_children': 'Pages with subpages cannot be copied or moved yet.',
   'commands.paste.not_allowed': 'Due to its type, the page cannot be moved or copied here.\n\nOnly pages of the following types can be inserted here:\n\n$2',
   'commands.delete_widget.confirm_title': 'Really delete this widget?',
   'commands.delete_widget.confirm_description': 'A deleted widget cannot be restored.',
   'commands.duplicate_obj.button_text': 'Duplicate',
   'commands.duplicate_obj.confirm_title': 'Duplicate the current page?',
   'commands.duplicate_obj.confirm_description': 'The current page will be duplicated immediately.',
-  'commands.duplicate_obj.has_children': 'Pages with subpages cannot be duplicated yet.',
+  'commands.revert_obj.confirm_title': 'Really discard changes to this page?',
+  'commands.revert_obj.confirm_description': 'Discarded changes cannot be restored.',
 
   'image_upload.too_many_files': 'Only one file allowed.',
 
@@ -7542,15 +7733,25 @@ var infopark = {
     return hex;
   },
 
+  deprecation_warning: function(subject, alternative) {
+    var message = 'DEPRECATION WARNING: "' + subject + '" is deprecated.';
+
+    if (alternative) {
+      message += ' Please use "' + alternative + '" instead.';
+    }
+
+    window.console.warn(message);
+  },
+
   on: function(event, callback) {
     if (event === 'editing') {
-      infopark.editing.on('activate', function() {
-        if (infopark.editing.workspace().is_editable()) {
+      infopark.gui.on('editing', function() {
+        if (infopark.gui.workspace().is_editable()) {
           callback();
         }
       });
     } else if (event === 'new_content') {
-      infopark.editing.on('new_content', function(dom_element) {
+      infopark.gui.on('new_content', function(dom_element) {
         if (dom_element) {
           callback(dom_element);
         }
@@ -7581,7 +7782,7 @@ var infopark = {
   trigger: function(event_name, dom_element) {
     if (event_name === 'new_content') {
       _.each($(dom_element), function(e) {
-        infopark.editing.new_content(e);
+        infopark.gui.new_content(e);
       });
     } else {
       $.error('Unknown event "' + event_name + '"');
@@ -7668,59 +7869,94 @@ var infopark = {
   };
 }());
 (function() {
-  var editing_active = false;
+  var state;
+  var state_storage_key = 'gui.state';
+  var callbacks = {};
+  var current_workspace;
 
-  var event_handlers = {};
+  var update_state = function(options) {
+    infopark.storage.set(state_storage_key, $.extend(state, options));
+  };
 
-  var current_workspace;
+  var load_state = function() {
+    state = infopark.storage.get(state_storage_key) || {is_open: false, mode: 'editing'};
+  };
 
-  var real_activate = function(options) {
-    if(!infopark.editing.is_active()) {
-      editing_active = true;
-      $.cookie('infopark_editing_active', 'true', { path: '/' });
-      _.each($(event_handlers.activate), function(handler) {
-        handler(options || {});
+  var is_editing_mode = function() {
+    return state.mode === 'editing';
+  };
+
+  var run_open_callbacks = function(options) {
+    if (callbacks.open) {
+      _.each(callbacks.open, function(callback) {
+        callback(options || {});
+      });
+    }
+
+    if (is_editing_mode() && callbacks.editing) {
+      _.each(callbacks.editing, function(callback) {
+        callback(options || {});
+      });
+    }
+  };
+
+  var run_new_content_callbacks = function(dom_element) {
+    if (is_editing_mode() && callbacks.new_content) {
+      _.each(callbacks.new_content, function(callback) {
+        if (dom_element) {
+          callback(dom_element);
+        }
       });
     }
   };
 
   $.extend(infopark, {
-    editing: {
+    gui: {
       initialize: function() {
-        if($.cookie('infopark_editing_active') === 'true') {
-          real_activate({on_initialize: true});
+        load_state();
+
+        if (state.is_open) {
+          run_open_callbacks({on_initialize: true});
         }
 
         $('body').append('<div id="ip-editing"></div>');
       },
 
-      activate: function() {
-        return real_activate();
+      open: function() {
+        if (!state.is_open) {
+          update_state({is_open: true});
+          run_open_callbacks();
+        }
       },
 
-      deactivate: function() {
-        editing_active = false;
-        $.removeCookie('infopark_editing_active', { path: '/' });
+      close: function() {
+        update_state({is_open: false});
         infopark.reload();
       },
 
+      set_mode: function(mode) {
+        update_state({mode: mode});
+        infopark.reload();
+      },
+
+      mode: function() {
+        return state.mode;
+      },
+
       new_content: function(dom_element) {
-        _.each($(event_handlers.new_content), function(handler) {
-          if (dom_element) {
-            handler(dom_element);
-          }
-        });
+        run_new_content_callbacks(dom_element);
       },
 
-      is_active: function() {
-        return editing_active;
+      is_open: function() {
+        return state.is_open;
       },
 
-      on: function(event_name, handler) {
-        if(event_handlers[event_name] === undefined) {
-          event_handlers[event_name] = [];
+      on: function(event_name, callback) {
+        if (callbacks[event_name] === undefined) {
+          callbacks[event_name] = [];
         }
-        event_handlers[event_name].push(handler);
+
+        callbacks[event_name].push(callback);
       },
 
       set_workspace: function(workspace) {
@@ -7732,8 +7968,29 @@ var infopark = {
       },
 
       // for testing purposes only
-      reset_event_handlers: function() {
-        event_handlers = {};
+      reset_callbacks: function() {
+        callbacks = {};
+      }
+    }
+  });
+}());
+// This module is only for backwards compatibility reasons.
+(function() {
+  $.extend(infopark, {
+    editing: {
+      activate: function() {
+        infopark.deprecation_warning('infopark.editing.activate', 'infopark.gui.open');
+        infopark.gui.open();
+      },
+
+      deactivate: function() {
+        infopark.deprecation_warning('infopark.editing.deactivate', 'infopark.gui.close');
+        infopark.gui.close();
+      },
+
+      is_active: function() {
+        infopark.deprecation_warning('infopark.editing.is_active', 'infopark.gui.is_open');
+        return infopark.gui.is_open();
       }
     }
   });
@@ -7895,7 +8152,7 @@ var infopark = {
       },
 
       init: function() {
-        infopark.editing.on('activate', function(options) {
+        infopark.gui.on('open', function(options) {
           add_menu_bar(options.on_initialize === true);
         });
       },
@@ -7929,64 +8186,211 @@ var infopark = {
 }());
 (function() {
   $.extend(infopark, {
-    menu_bar_dropdown: {
+    menu_bar_toggle: {
       init: function() {
         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,
-            disable_with_children: disable_with_children
+          var menu_bar_toggle = menu_bar.find('#ip_menu_bar_toggle')
+              .html(infopark.template.render('menu_bar_toggle', {mode: infopark.gui.mode()}));
+
+          define_mode(menu_bar_toggle, 'view', function() {
+            infopark.gui.set_mode('view');
+          });
+
+          define_mode(menu_bar_toggle, 'editing', function() {
+            infopark.gui.set_mode('editing');
           });
-          menu_bar.find('#ip_menu_bar_dropdown').html(view);
         });
       }
     }
   });
 
-  var on_click = function(element_id, callback) {
-    $(document).on('click.' + element_id, '#' + element_id, function(event) {
-      event.preventDefault();
-      callback();
-    });
+  var define_mode = function(menu_bar_toggle, mode, callback) {
+    var new_class = 'ip_viewmode_' + mode + '_active';
+    var view_modes = menu_bar_toggle.find('.ip_viewmodes');
+
+    if (!view_modes.hasClass(new_class)) {
+      menu_bar_toggle.find('.ip_viewmode_' + mode).click(function() {
+        view_modes
+          .removeClass('ip_viewmode_editing_active ip_viewmode_view_active ip_viewmode_hide_active')
+          .addClass(new_class);
+        callback();
+      });
+    }
   };
+}());
+(function() {
+  $.extend(infopark, {
+    menu_bar_dropdown: {
+      init: function() {
+        infopark.menu_bar.register_item_renderer(function(menu_bar) {
+          var view = infopark.template.render('menu_bar_dropdown', {
+            dropdown_items: dropdown_items,
+            is_current_page_changed: function() {
+              var current_page_modification = infopark.obj.current_page_modification;
+              return current_page_modification === 'new' || current_page_modification === 'edited';
+            }
+          });
 
-  on_click('ip_menu_bar_dropdown', function() {
-    var target = $('#ip_menu_bar_dropdown');
-    target.toggleClass('active');
-    target.find('.ip_menu_box').fadeToggle('50');
-  });
+          var menu_bar_dropdown = menu_bar.find('#ip_menu_bar_dropdown').html(view);
 
-  on_click('ip_edit_current_page', function() {
-    infopark.commands.edit_obj(infopark.obj.current_page());
-  });
+          menu_bar_dropdown.click(function() {
+            menu_bar_dropdown.toggleClass('active');
+            menu_bar_dropdown.find('.ip_menu_box').fadeToggle('50');
+            return false;
+          });
 
-  on_click('ip_delete_current_page', function() {
-    infopark.commands.delete_obj(infopark.obj.current_page());
+          _.each(dropdown_items, function(dropdown_item) {
+            menu_bar_dropdown.find('#ip_' + dropdown_item.name).click(function() {
+              return dropdown_item.is_enabled() ? dropdown_item.execute() : false;
+            });
+          });
+        });
+      }
+    }
   });
 
-  on_click('ip_save_current_page_to_clipboard', function() {
-    infopark.commands.save_obj_to_clipboard(infopark.obj.current_page());
-  });
+  var dropdown_items = [
+    {
+      name: 'edit_current_page',
+      icon: '&#xf03d;',
+      is_present: function() {
+        return infopark.obj.current_page_has_edit_view;
+      },
+      is_enabled: function() {
+        return infopark.obj.current_page_has_edit_view;
+      },
+      execute: function() {
+        infopark.commands.edit_obj(infopark.obj.current_page());
+      }
+    },
 
-  on_click('ip_duplicate_current_page', function() {
-    infopark.commands.duplicate_obj(infopark.obj.current_page());
-  });
+    {
+      name: 'save_current_page_to_clipboard',
+      icon: '&#xf017;',
+      title: function() {
+        if (infopark.obj.current_page_has_children) {
+          return infopark.i18n.translate(
+              'menu_bar_dropdown.save_current_page_to_clipboard.has_children');
+        }
+      },
+      is_present: true,
+      is_enabled: function() {
+        return !infopark.obj.current_page_has_children;
+      },
+      execute: function() {
+        infopark.commands.save_obj_to_clipboard(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);
-  });
+    {
+      name: 'duplicate_current_page',
+      icon: '&#xf015;',
+      title: function() {
+        if (!infopark.gui.workspace().is_editable()) {
+          return infopark.i18n.translate(
+              'menu_bar_dropdown.duplicate_current_page.workspace_is_published');
+        }
+        if (infopark.obj.current_page_has_children) {
+          return infopark.i18n.translate('menu_bar_dropdown.duplicate_current_page.has_children');
+        }
+      },
+      is_present: function() {
+        return infopark.obj.current_page_id;
+      },
+      is_enabled: function() {
+        return infopark.gui.workspace().is_editable() && !infopark.obj.current_page_has_children;
+      },
+      execute: function() {
+        infopark.commands.duplicate_obj(infopark.obj.current_page());
+      }
+    },
 
-  on_click('ip_deactivate_editing', function() {
-    infopark.editing.deactivate();
-  });
+    {
+      name: 'revert_current_page',
+      icon: '&#xf032;',
+      title: function() {
+        if (!infopark.gui.workspace().is_editable()) {
+          return infopark.i18n.translate(
+              'menu_bar_dropdown.revert_current_page.workspace_is_published');
+        }
+        if (infopark.gui.workspace().is_rtc()) {
+          return infopark.i18n.translate('menu_bar_dropdown.revert_current_page.workspace_is_rtc');
+        }
+        if (!infopark.obj.current_page_modification) {
+          return infopark.i18n.translate('menu_bar_dropdown.revert_current_page.obj_is_unchanged');
+        }
+        if (infopark.obj.current_page_modification === 'new') {
+          return infopark.i18n.translate('menu_bar_dropdown.revert_current_page.obj_is_new');
+        }
+        if (infopark.obj.current_page_modification === 'deleted') {
+          return infopark.i18n.translate('menu_bar_dropdown.revert_current_page.obj_is_deleted');
+        }
+      },
+      is_present: function() {
+        return infopark.obj.current_page_id;
+      },
+      is_enabled: function() {
+        return infopark.gui.workspace().is_editable() && !infopark.gui.workspace().is_rtc() &&
+            infopark.obj.current_page_modification === 'edited';
+      },
+      execute: function() {
+        infopark.commands.revert_obj(infopark.obj.current_page());
+      }
+    },
 
-  var disable_with_children = function() {
-    if (infopark.obj.current_page_has_children) {
-      return 'ip_menu_item disabled';
-    } else {
-      return 'ip_menu_item';
+    {
+      name: 'delete_current_page',
+      icon: '&#xf018;',
+      title: function() {
+        if (!infopark.gui.workspace().is_editable()) {
+          return infopark.i18n.translate(
+              'menu_bar_dropdown.delete_current_page.workspace_is_published');
+        }
+        if (infopark.obj.current_page_has_children) {
+          return infopark.i18n.translate('menu_bar_dropdown.delete_current_page.has_children');
+        }
+      },
+      is_present: function() {
+        return infopark.obj.current_page_id;
+      },
+      is_enabled: function() {
+        return infopark.gui.workspace().is_editable() && !infopark.obj.current_page_has_children;
+      },
+      execute: function() {
+        infopark.commands.delete_obj(infopark.obj.current_page());
+      }
+    },
+
+    {
+      name: 'open_current_page_in_admin_gui',
+      icon: '&#xf000;',
+      is_present: function() {
+        return infopark.obj.current_page_id;
+      },
+      is_enabled: function() {
+        return infopark.obj.current_page_id;
+      },
+      execute: function() {
+        infopark.commands.open_in_admin_gui(infopark.obj.current_page_id);
+      }
     }
-  };
+  ];
+}());
+(function() {
+  $.extend(infopark, {
+    menu_bar_close: {
+      init: function() {
+        infopark.menu_bar.register_item_renderer(function(menu_bar) {
+          var menu_bar_close = menu_bar.find('#ip_menu_bar_close').html(
+              infopark.template.render('menu_bar_close'));
+
+          menu_bar_close.on('click', function() {
+            infopark.gui.close();
+          });
+        });
+      }
+    }
+  });
 }());
 (function() {
   var t = infopark.i18n.translate;
@@ -8020,9 +8424,9 @@ var infopark = {
 
   var renderer = function(view) {
     var select_menu_view = $(infopark.template.render('workspace_select_menu_bar_item', {
-      current_workspace: infopark.editing.workspace(),
-      current_short_title: workspace_title_short(infopark.editing.workspace()),
-      current_long_title: workspace_title_long(infopark.editing.workspace())
+      current_workspace: infopark.gui.workspace(),
+      current_short_title: workspace_title_short(infopark.gui.workspace()),
+      current_long_title: workspace_title_long(infopark.gui.workspace())
     }));
 
     view.find('#ip_select_workspace').append(select_menu_view);
@@ -8049,7 +8453,7 @@ var infopark = {
             is_editable: ws.is_editable,
             long_title: workspace_title_long(ws),
             select_title: workspace_title_select(ws),
-            is_current_workspace: (ws.id() === infopark.editing.workspace().id())
+            is_current_workspace: (ws.id() === infopark.gui.workspace().id())
           };
         });
 
@@ -8095,11 +8499,11 @@ var infopark = {
       icon: '&#xF064;',
       confirm_button_text: t('menu_bar.publish'),
       title: t('menu_bar.publish_ws_confirmation', workspace_title_short(
-        infopark.editing.workspace())),
+        infopark.gui.workspace())),
       description: t('menu_bar.publish_ws_confirmation_desc')
     }).done(function() {
       infopark.with_saving_overlay(
-        infopark.editing.workspace().publish().then(function() {
+        infopark.gui.workspace().publish().then(function() {
           return infopark.redirect_to('?_rc-ws=published');
         })
       );
@@ -8110,13 +8514,13 @@ var infopark = {
     default_click_action(e);
     infopark.prompt_dialog({
       icon: '&#xF04F;',
-      title: t('menu_bar.rename_working_copy', infopark.editing.workspace().title()),
+      title: t('menu_bar.rename_working_copy', infopark.gui.workspace().title()),
       description: t('menu_bar.rename_working_copy_desc'),
-      value: infopark.editing.workspace().title(),
+      value: infopark.gui.workspace().title(),
       accept_button_text: t('menu_bar.rename')
     }).done(function(new_title) {
       infopark.with_saving_overlay(
-        infopark.editing.workspace().rename(new_title).then(function() {
+        infopark.gui.workspace().rename(new_title).then(function() {
           return infopark.reload();
         })
       );
@@ -8126,7 +8530,7 @@ var infopark = {
   $(document).on("click.ip-rebase-ws", "#ip-rebase-current-ws", function(e) {
     default_click_action(e);
     infopark.with_saving_overlay(
-      infopark.editing.workspace().rebase().then(function() {
+      infopark.gui.workspace().rebase().then(function() {
         return infopark.reload();
       })
     );
@@ -8139,17 +8543,22 @@ var infopark = {
       confirm_button_color: 'ip_red',
       confirm_button_text: t('menu_bar.delete'),
       title: t('menu_bar.delete_ws_confirmation', workspace_title_short(
-        infopark.editing.workspace())),
+        infopark.gui.workspace())),
       description: t('menu_bar.delete_ws_confirmation_desc')
     }).done(function() {
       infopark.with_saving_overlay(
-        infopark.editing.workspace().destroy().then(function(new_workspace) {
+        infopark.gui.workspace().destroy().then(function(new_workspace) {
           return infopark.redirect_to('?_rc-ws=published');
         })
       );
     });
   });
 
+  $(document).on('click', '#ip_changes_list_toggle', function(e) {
+    e.preventDefault();
+    infopark.changes_dialog.open();
+  });
+
   $.extend(infopark, {
     workspace_select: {
       init: function() {
@@ -8158,6 +8567,176 @@ var infopark = {
     }
   });
 }());
+(function() {
+  $.extend(infopark, {
+    changes_dialog: {
+      open: function() {
+        loaded_objs = [];
+        total_obj_count = 0;
+        batch = basic_batch();
+
+        view = $(infopark.template.render('changes_list_dialog'));
+
+        $('#ip-editing').append(view);
+        var next_loader = view.find('.ip_load_more');
+
+        target = view.find('#ip_changes_table_loaded');
+        var spinner = view.find('#ip_changes_table_loading');
+        var empty_result = view.find('#ip_changes_table_empty_result');
+
+        var obj_count = view.find('#ip_obj_count');
+
+        loaded_obj_count_ref = view.find('#ip_loaded_obj_count');
+        total_obj_count_ref = view.find('#ip_total_obj_count');
+
+        load_markup = function() {
+          loading_in_progress = true;
+          spinner.show();
+
+          batch.load_batch().then(function(data, next) {
+            loading_in_progress = false;
+
+            batch = next;
+            if (!batch) {
+              next_loader.hide();
+            } else {
+              next_loader.show();
+            }
+
+            if (data.total > 0) {
+              loaded_objs = loaded_objs.concat(data.hits);
+              total_obj_count = data.total;
+
+              render_objs(loaded_objs);
+            } else {
+              empty_result.show();
+            }
+
+            spinner.hide();
+
+            loaded_obj_count_ref.text(loaded_objs.length);
+            total_obj_count_ref.text(total_obj_count);
+            obj_count.show();
+
+            view.on('click.ip_link_to_obj', '.ip_link_to_obj', function(e) {
+              var obj_id = $(e.currentTarget).attr('data-obj-id');
+              infopark.change_location('/' + obj_id);
+              return false;
+            });
+          });
+        };
+
+        next_loader.on('click', load_markup);
+        load_markup();
+        activate_sorting();
+
+        var deferred = $.Deferred();
+
+        var cancel = function(e) {
+          e.preventDefault();
+          infopark.dialog.close(view);
+          deferred.resolve();
+        };
+
+        view.find('.ip_cancel').on('click', cancel);
+
+        infopark.transition(view, function() {
+          view.addClass('ip_show');
+        }).then(function() {
+          infopark.dialog.adjust(view);
+        });
+
+        return infopark.with_dialog_behaviour(deferred, {escape: cancel});
+      }
+    }
+  });
+
+  var batch;
+  var view;
+  var loaded_obj_count_ref;
+  var total_obj_count_ref;
+  var loaded_objs;
+  var total_obj_count;
+  var target;
+  var load_markup;
+  var loading_in_progress;
+
+  var basic_batch = function() {
+    return infopark.
+      obj_where('_modification', 'equals', ['new', 'edited', 'deleted']).
+      batch_size(100).
+      order('_last_changed').
+      reverse_order().
+      format('_changes_list').
+      include_deleted();
+  };
+
+  var render_objs = function(objs) {
+    var markup = _.map(objs, function(obj) {
+      return infopark.template.render('changes_list_row', obj);
+    });
+    target.html(markup);
+  };
+
+  var activate_sorting = function() {
+    var sortables = view.find('.ip_sortable');
+
+    view.on('click.ip_sortable', '.ip_sortable', function() {
+      if (loading_in_progress) {
+        return;
+      }
+
+      var sortable = $(this);
+      var sorting_by = {};
+      sorting_by.attribute = sortable.attr('data-ip-sort-by');
+
+      var order_was_asc = sortable.hasClass('sort_up');
+      if (order_was_asc) {
+        sorting_by.order = 'desc';
+      } else {
+        sorting_by.order = 'asc';
+      }
+      sortables.removeClass('sort_up').removeClass('sort_down');
+
+      var local_sort = function() {
+        var objs = _.sortBy(loaded_objs, sorting_by.attribute);
+
+        if (sorting_by.order === 'desc') {
+          objs = objs.reverse();
+        }
+
+        render_objs(objs);
+      };
+
+      var backend_sort = function() {
+        batch = basic_batch();
+        batch.order('_' + sorting_by.attribute);
+
+        if (sorting_by.order === 'asc') {
+          batch.reverse_order();
+        }
+
+        loaded_objs = [];
+        render_objs(loaded_objs);
+        load_markup();
+      };
+
+      if (loaded_objs.length === total_obj_count) {
+        local_sort();
+      } else {
+        backend_sort();
+      }
+
+      if (sorting_by.order === 'asc') {
+        sortable.addClass('sort_up');
+      } else {
+        sortable.addClass('sort_down');
+      }
+    });
+
+  };
+
+}());
 (function() {
 
   $.extend(infopark, {
@@ -8476,6 +9055,10 @@ $(function() {
             return infopark.ajax('DELETE', 'objs/' + that.id());
           },
 
+          revert: function() {
+            return infopark.ajax('PUT', 'objs/' + that.id() + '/revert');
+          },
+
           fetch_edit_markup: function() {
             return infopark.ajax('GET', 'objs/' +  that.id() + '/edit').then(function(data) {
               return data.markup;
@@ -8523,6 +9106,131 @@ $(function() {
     }
   });
 }());
+(function() {
+  $.extend(infopark, {
+    chainable_search: {
+      create_instance: function(build_query) {
+        // Private
+        var query = build_query || { predicates: [] };
+
+        var add_predicate = function(field, operator, value, boost, negate) {
+          var new_query = {
+            field:    field,
+            operator: operator,
+            value:    value
+          };
+
+          if (negate) {
+            new_query.negate = true;
+          }
+
+          if (boost) {
+            new_query.boost = boost;
+          }
+
+          query.predicates.push(new_query);
+          return that;
+        };
+
+        var execute_search = function(query, action) {
+          return infopark.ajax('GET', 'objs/search?' +
+              $.param({query: JSON.stringify(query), query_action: action}));
+        };
+
+        // Public
+        var that = {
+          query: function() {
+            return query;
+          },
+
+          and: function(field, operator, value, boost) {
+            add_predicate(field, operator, value, boost);
+            return that;
+          },
+
+          and_not: function(field, operator, value) {
+            add_predicate(field, operator, value, undefined, true);
+            return that;
+          },
+
+          offset: function(offset) {
+            query.offset = offset;
+            return that;
+          },
+
+          order: function(order) {
+            query.order = order;
+            return that;
+          },
+
+          reverse_order: function() {
+            if (query.reverse_order) {
+              delete query.reverse_order;
+            } else {
+              query.reverse_order = true;
+            }
+            return that;
+          },
+
+          batch_size: function(batch_size) {
+            query.batch_size = batch_size;
+            return that;
+          },
+
+          format: function(name) {
+            query.format = name;
+            return that;
+          },
+
+          include_deleted: function() {
+            query.include_deleted = true;
+            return that;
+          },
+
+          load_batch: function() {
+            var offset = query.offset || 0;
+            var next;
+
+            return execute_search(query).then(function(result) {
+              var batch_size = result.hits.length;
+              var total_matches = result.total;
+
+              if (total_matches > (batch_size + offset)) {
+                var next_offset = offset + batch_size;
+                var next_query = $.extend({}, query, {offset: next_offset});
+                next = infopark.chainable_search.create_instance(next_query);
+              } else {
+                next = undefined;
+              }
+
+              return $.Deferred().resolve(result, next);
+            });
+          },
+
+          size: function() {
+            return execute_search(query, 'size').then(function(result) {
+              return $.Deferred().resolve(result.total);
+            });
+          }
+
+        };
+
+        return that;
+      }
+    }
+
+  });
+
+}());
+
+(function() {
+  $.extend(infopark, {
+    obj_where: function(field, operator, value, boost) {
+      return infopark.chainable_search.create_instance().and(field, operator, value, boost);
+    }
+  });
+}());
+
 (function() {
   var field_types = [
     'binary',
@@ -8530,7 +9238,8 @@ $(function() {
     'linklist',
     'multienum',
     'reference',
-    'referencelist'
+    'referencelist',
+    'text'
   ];
 
   $.extend(infopark, {
@@ -8734,6 +9443,9 @@ $(function() {
           is_editable: function() {
             return that.id() !== 'published';
           },
+          is_rtc: function() {
+            return that.id() === 'rtc';
+          },
           publish: function() {
             if (that.is_editable()) {
               return infopark.ajax('PUT', 'workspaces/' + that.id() + '/publish');
@@ -8956,6 +9668,13 @@ $(function() {
 (function() {
   Handlebars.registerHelper('translate', infopark.i18n.translate);
 
+  Handlebars.registerHelper('concat_translate', function(key_prefix, key) {
+    // Temporary workaround.
+    // The `handlebars_assets` gem as of the version `0.15` bundles the version `1.2.2`
+    // of the Handlebars. Subexpressions are supported from the Handlebars version `1.3.0` on.
+    return infopark.i18n.translate(key_prefix + key);
+  });
+
   $.extend(infopark, {
     template: {
       load_templates_from_server: false,
@@ -9199,6 +9918,11 @@ $(function() {
         enter: confirm_action,
         escape: cancel_action
       });
+    },
+
+    // Test purpose only.
+    remove_all: function() {
+      $('.ip_confirmation_dialog').remove();
     }
   });
 }());
@@ -9386,7 +10110,7 @@ $(function() {
             spinner.hide();
             target.show();
 
-            infopark.editing.new_content(target.get(0));
+            infopark.gui.new_content(target.get(0));
           }, function() {
             close();
           });
@@ -9444,11 +10168,11 @@ $(function() {
         menu_define_callbacks = [];
       },
       init: function() {
-        infopark.editing.on('activate', function() {
+        infopark.gui.on('editing', function() {
           infopark.inplace_menus.refresh();
         });
 
-        infopark.editing.on('new_content', function() {
+        infopark.gui.on('new_content', function() {
           infopark.inplace_menus.refresh();
         });
       },
@@ -9609,13 +10333,23 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
         });
       },
 
+      revert_obj: function(obj) {
+        return infopark.confirmation_dialog({
+          icon: '&#xF032;',
+          confirm_button_color: 'ip_red',
+          confirm_button_text: infopark.i18n.translate('menu_bar.revert'),
+          title: infopark.i18n.translate('commands.revert_obj.confirm_title'),
+          description: infopark.i18n.translate('commands.revert_obj.confirm_description')
+        }).then(function() {
+          return infopark.with_saving_overlay(obj.revert().then(function() {
+            infopark.reload();
+          }));
+        });
+      },
+
       save_obj_to_clipboard: function(obj) {
-        if (!infopark.obj.current_page_has_children) {
-          infopark.clipboard.save_obj(obj);
-          infopark.inplace_menus.refresh();
-        } else {
-          infopark.alert(infopark.i18n.translate('commands.save_obj.has_children'));
-        }
+        infopark.clipboard.save_obj(obj);
+        infopark.inplace_menus.refresh();
       },
 
       move_obj_into: function(child_list_element) {
@@ -9630,7 +10364,6 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
             description: infopark.i18n.translate('commands.move_obj_into.confirm_description')
           }).then(function() {
             var obj = infopark.clipboard.obj();
-
             return infopark.with_saving_overlay(child_list_element.add_child(obj).then(function() {
               infopark.clipboard.clear();
               return infopark.reload();
@@ -9640,21 +10373,17 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
       },
 
       duplicate_obj: function(obj) {
-        if (!infopark.obj.current_page_has_children) {
-          return infopark.confirmation_dialog({
-            icon: '&#xF015;',
-            confirm_button_color: 'ip_green',
-            confirm_button_text: infopark.i18n.translate('commands.duplicate_obj.button_text'),
-            title: infopark.i18n.translate('commands.duplicate_obj.confirm_title'),
-            description: infopark.i18n.translate('commands.duplicate_obj.confirm_description')
-          }).then(function(){
-            return infopark.with_saving_overlay(obj.duplicate().then(function(dup_page) {
-              return infopark.redirect_to('/'+dup_page.id());
-            }));
-          });
-        } else {
-          infopark.alert(infopark.i18n.translate('commands.duplicate_obj.has_children'));
-        }
+        return infopark.confirmation_dialog({
+          icon: '&#xF015;',
+          confirm_button_color: 'ip_green',
+          confirm_button_text: infopark.i18n.translate('commands.duplicate_obj.button_text'),
+          title: infopark.i18n.translate('commands.duplicate_obj.confirm_title'),
+          description: infopark.i18n.translate('commands.duplicate_obj.confirm_description')
+        }).then(function(){
+          return infopark.with_saving_overlay(obj.duplicate().then(function(new_obj) {
+            return infopark.redirect_to('/' + new_obj.id());
+          }));
+        });
       },
 
       copy_obj_into: function(child_list_element) {
@@ -9692,7 +10421,7 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
                 } else {
                   widget_field_element.dom_element().append(dom_element);
                 }
-                infopark.editing.new_content(dom_element.get(0));
+                infopark.gui.new_content(dom_element.get(0));
               })
             ).then(function() {
               return widget_field_element.save().then(function() {
@@ -9736,6 +10465,10 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
           var widget = widget_element.widget();
           widget_element.dom_element().remove();
 
+          if(widget_field_element.widget_elements().length === 0){
+            infopark.inplace_menus.refresh();
+          }
+
           return widget_field_element.save().then(function() {
             return widget.destroy();
           });
@@ -9744,7 +10477,7 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
 
       open_in_admin_gui: function(obj_id) {
         window.open(
-          infopark.admin_gui_base_url + '#' + obj_id + ';dc;' + infopark.editing.workspace().id(),
+          infopark.admin_gui_base_url + '#' + obj_id + ';dc;' + infopark.gui.workspace().id(),
           'admin-gui', // New window has a name, so it can be identified in integration tests.
           'status=1,toolbar=1,location=1,menubar=1,scrollbars=1,resizable=1'
         );
@@ -9772,7 +10505,7 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
     widget_menus: {
       init: function() {
         infopark.inplace_menus.define(function(menu) {
-          if (infopark.editing.workspace().is_editable()) {
+          if (infopark.gui.workspace().is_editable()) {
             _.each(infopark.widget_field_element.all(), function(widget_field_element) {
               var widget_elements = widget_field_element.widget_elements();
 
@@ -9851,7 +10584,7 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
         widget_element.fetch_show_markup().then(function(show_markup) {
           var new_jquery_object = $(show_markup);
           jquery_object.replaceWith(new_jquery_object);
-          infopark.editing.new_content(new_jquery_object.get(0));
+          infopark.gui.new_content(new_jquery_object.get(0));
         })
       );
 
@@ -9863,8 +10596,8 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
   $.extend(infopark, {
     widget_sorting: {
       init: function() {
-        infopark.editing.on('activate', create);
-        infopark.editing.on('new_content', create);
+        infopark.gui.on('editing', create);
+        infopark.gui.on('new_content', create);
       },
 
       // Called when actual dragging started.
@@ -9889,7 +10622,7 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
   });
 
   var create = function() {
-    if (infopark.editing.workspace().is_editable()) {
+    if (infopark.gui.workspace().is_editable()) {
       _.each(infopark.widget_field_element.all(), function(widget_field_element) {
         var dom_element = widget_field_element.dom_element();
         if (!dom_element.data('ui-sortable')) {
@@ -9910,7 +10643,7 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
     child_list_menus: {
       init: function() {
         infopark.inplace_menus.define(function(menu) {
-          if (infopark.editing.workspace().is_editable()) {
+          if (infopark.gui.workspace().is_editable()) {
             _.each(infopark.child_list_element.all(), function(child_list_element) {
               menu.add_item(child_list_element.dom_element(), {
                 title: infopark.i18n.translate('child_list_menus.add_subpage'),
@@ -10077,7 +10810,7 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
         view.find(".ip_input_new_ws_name label, .ip_input_new_ws_name input").addClass("ip_disabled");
       });
 
-      view.on('focus click', '.ip_input_new_ws_name', function(e) {
+      view.on('focus click drop', '.ip_input_new_ws_name', function(e) {
         create_new_ws = true;
         view.find(".ip_confirm").html(infopark.i18n.translate('menu_bar.create'));
         view.find(".ip_disabled").removeClass("ip_disabled");
@@ -10123,8 +10856,8 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
     },
 
     init: function() {
-      infopark.editing.on('activate', function(options) {
-        if((options.on_initialize !== true) && !infopark.editing.workspace().is_editable()) {
+      infopark.gui.on('open', function(options) {
+        if((options.on_initialize !== true) && !infopark.gui.workspace().is_editable()) {
           infopark.editable_workspace_dialog.open();
         }
       });
@@ -10231,6 +10964,10 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
 
 
 
+
+
+
+
 
 
 
@@ -10238,7 +10975,9 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
 
 infopark.inplace_menus.init();
 infopark.menu_bar_saving_indicator.init();
+infopark.menu_bar_toggle.init();
 infopark.menu_bar_dropdown.init();
+infopark.menu_bar_close.init();
 infopark.workspace_select.init();
 infopark.menu_bar.init();
 infopark.widget_menus.init();