scrivito_sdk 0.70.2 → 0.71.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5de0afc60411add6269bc489d22afd5688e32bde
-  data.tar.gz: 000332471e6c539c7676ea94772e56f05e1ec6ff
+  metadata.gz: c611fa81c9f2b51a64db9140e435110b44b03a11
+  data.tar.gz: 9743dcf7f7ba3ecc356ecb6ed87430b76ca3a7e2
 SHA512:
-  metadata.gz: d1cf605fa35b457c57822065292d577ad85aeafc1943d7611ae5d6d9c1e504b94b1df0baf554bdb397139d5bc96497c5547dc2e3e46bef8e207dfc45825570f5
-  data.tar.gz: ee692d8e479eb55db2dd9fe83df15b0f1c57259f70f451bc795efa5db6fdadf3f55575493c1e9653fce53e09f7e24db3b1f3c4d3d1301c09513769dbd73eac18
+  metadata.gz: 0d58ad5bfa71db40a3ca1048429cbad1165c631db9043c1b872662df64b6fc3435ad78524b6fb0bda00fcf1cf74989ca4aa0bbd5271f03be319d47e31adcc7c8
+  data.tar.gz: 5ac445953e2b5f2f40b3b66bbcb9f14f9b0ed25fedbdeab8e9fd876e7c9ab66eefb23ed5362dfb2c7d330b454608d0f85d8063dd3b9a46e1863a1760df2a2681

data/app/controllers/scrivito/binary_redirect_controller.rb

@@ -1,19 +1,22 @@
 module Scrivito
-  class BinaryRedirectController < ApplicationController
+  class BinaryRedirectController < ActionController::Base
     def to_binary
       binary = BinaryParamVerifier.verify(params[:encrypted_params])
       redirect_to BinaryRewrite.call(request, binary.url)
     rescue BinaryParamVerifier::InvalidSignature
       head :precondition_failed
-    rescue TransformationSourceError => e
-      case e.code
-      when 'binary.unprocessable.image.transform.source.type_invalid'
-        redirect_to view_context.image_path('scrivito/source_type_invalid.png')
-      when 'binary.unprocessable.image.transform.source.too_large'
-        redirect_to view_context.image_path('scrivito/source_too_large.png')
-      else
-        redirect_to view_context.image_path('scrivito/source_invalid.png')
+    rescue TransformationSourceError => error
+      case error.code
+      when /transform.source.type_invalid/ then render_error('source_type_invalid')
+      when /transform.source.too_large/ then render_error('source_too_large')
+      else render_error('source_invalid')
       end
     end
+
+    private
+
+    def render_error(error_name)
+      redirect_to view_context.image_path("scrivito/#{error_name}.png")
+    end
   end
 end

data/app/controllers/scrivito/blobs_controller.rb

@@ -6,8 +6,7 @@ class BlobsController < WebserviceController
   end
 
   def activate_upload
-    CmsRestApi.activate_upload(params.slice(:upload, :obj_id, :filename, :content_type))
-    render_empty_json
+    @blob = CmsRestApi.activate_upload(params.slice(:upload, :obj_id, :filename, :content_type))
   end
 end
 

data/app/controllers/scrivito/objs_controller.rb

@@ -104,6 +104,22 @@ module Scrivito
       render :obj
     end
 
+    def transfer_modifications
+      in_selected_workspace do
+        begin
+          obj = Obj.find_including_deleted(params[:id])
+          workspace = Workspace.find(params[:workspace_id])
+          authorize_workspace_access(:write, workspace) do
+            obj.transfer_modifications_to(workspace)
+          end
+        rescue TransferModificationsModifiedError
+          @error_reason = :modified
+        rescue TransferModificationsConflictError
+          @error_reason = :conflict
+        end
+      end
+    end
+
     def duplicate
       @obj = copy_obj(current_obj, current_obj.parent_path)
       render :obj

data/app/helpers/scrivito_helper.rb

@@ -33,6 +33,10 @@ module ScrivitoHelper
   # @param html_options [Hash] HTML options to be passed to +content_tag+.
   # @param editing_options [Hash] Additional editing options for widgets (e.g. +:inner_tag+)
   # @option editing_options [Symbol] :inner_tag Wraps widgets inside specified tag
+  # @option editing_options [String, Symbol] :editor Name of the JavaScript editor to be used for
+  #   this field. Normally, the name of the editor to be used for a field is determined by the
+  #   +scrivito.select_editor+ JavaScript API. The option +:editor+ should only be used if setting
+  #   the editor via the JavaScript API is not feasible.
   # @param block [Proc] Optional block to render inner HTML. If none given the value of attribute
   #   will be rendered instead. +block+ is not allowed for fields of type +widget+.
   #
@@ -63,7 +67,7 @@ module ScrivitoHelper
   def scrivito_tag(tag_name, obj_or_widget, field_name,
                    html_options = {}, editing_options = {}, &block)
     Scrivito::CmsFieldTag.new(self, tag_name, obj_or_widget, editing_options.merge(
-      widget_template_name: @scrivito_default_widget_template || :show,
+      widget_render_context: @scrivito_widget_render_context,
       field_name: field_name.to_s
     )).render(html_options, &block)
   end
@@ -196,7 +200,7 @@ module ScrivitoHelper
       when String then h(value)
       when Time then h(l(value))
       when Scrivito::BasicWidget
-        render(template: value.to_show_view_path, locals: {widget: value})
+        render(template: value.show_view_path, locals: {widget: value})
       else value
     end
   end

data/app/views/cms/index.html.erb

@@ -1,3 +1,3 @@
 <% if scrivito_user %>
-  Missing Ruby model class for "<%= @obj.obj_class_name %>".
+  Missing Ruby model class for "<%= @obj.obj_class %>".
 <% end %>

data/app/views/scrivito/blobs/activate_upload.json.jbuilder

@@ -0,0 +1 @@
+json.merge! @blob

data/app/views/scrivito/objs/obj.json.jbuilder

@@ -1 +1 @@
-json.extract! @obj, :id, :obj_class_name
+json.extract! @obj, :id, :obj_class

data/app/views/scrivito/objs/transfer_modifications.json.jbuilder

@@ -0,0 +1,6 @@
+if @error_reason
+  json.status :error
+  json.reason @error_reason
+else
+  json.status :success
+end

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Mon Nov  2 23:30:50 2015
+## Certificate data from Mozilla as of: Tue Oct 13 08:13:13 2015
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.25.
-## SHA1: 6d7d2f0a4fae587e7431be191a081ac1257d300a
+## SHA1: ed3c0bbfb7912bcc00cd2033b0cb85c98d10559c
 ##
 
 
@@ -1527,6 +1527,29 @@ vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
 oKfN5XozNmr6mis=
 -----END CERTIFICATE-----
 
+TURKTRUST Certificate Services Provider Root 1
+==============================================
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
+MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
+MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
+U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
+TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
+aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
+yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
+Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
+8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
+W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
+BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
+sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
+q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
+nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
+-----END CERTIFICATE-----
+
 TURKTRUST Certificate Services Provider Root 2
 ==============================================
 -----BEGIN CERTIFICATE-----
@@ -2042,6 +2065,33 @@ RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU
 Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ==
 -----END CERTIFICATE-----
 
+TC TrustCenter Class 2 CA II
+============================
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
+IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
+MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
+c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
+AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
+IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
+xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
+Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
+SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
+7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
+Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
+cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
+SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
+dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
+KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
+TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
+JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
+vQ==
+-----END CERTIFICATE-----
+
 TC TrustCenter Class 3 CA II
 ============================
 -----BEGIN CERTIFICATE-----
@@ -2069,6 +2119,29 @@ IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal
 5A==
 -----END CERTIFICATE-----
 
+TC TrustCenter Universal CA I
+=============================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
+IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
+MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
+VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
+JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
+qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
+xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
+ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
+gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
+BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
+1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
+vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
+ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
+ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
+7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
+-----END CERTIFICATE-----
+
 Deutsche Telekom Root CA 2
 ==========================
 -----BEGIN CERTIFICATE-----
@@ -2236,6 +2309,26 @@ fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
 wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
 -----END CERTIFICATE-----
 
+Buypass Class 3 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
+MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
+ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
+n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
+AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
+1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
+pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
+EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
+htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
+el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
 EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
 ==========================================================================
 -----BEGIN CERTIFICATE-----
@@ -3737,6 +3830,39 @@ UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
 7+ZtsH8tZ/3zbBt1RqPlShfppNcL
 -----END CERTIFICATE-----
 
+SG TRUST SERVICES RACINE
+========================
+-----BEGIN CERTIFICATE-----
+MIIGGTCCBAGgAwIBAgIIPtVRGeZNzn4wDQYJKoZIhvcNAQELBQAwajEhMB8GA1UEAxMYU0cgVFJV
+U1QgU0VSVklDRVMgUkFDSU5FMRwwGgYDVQQLExMwMDAyIDQzNTI1Mjg5NTAwMDIyMRowGAYDVQQK
+ExFTRyBUUlVTVCBTRVJWSUNFUzELMAkGA1UEBhMCRlIwHhcNMTAwOTA2MTI1MzQyWhcNMzAwOTA1
+MTI1MzQyWjBqMSEwHwYDVQQDExhTRyBUUlVTVCBTRVJWSUNFUyBSQUNJTkUxHDAaBgNVBAsTEzAw
+MDIgNDM1MjUyODk1MDAwMjIxGjAYBgNVBAoTEVNHIFRSVVNUIFNFUlZJQ0VTMQswCQYDVQQGEwJG
+UjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANqoVgLsfJXwTukK0rcHoyKLULO5Lhk9
+V9sZqtIr5M5C4myh5F0lHjMdtkXRtPpZilZwyW0IdmlwmubHnAgwE/7m0ZJoYT5MEfJu8rF7V1ZL
+Cb3cD9lxDOiaN94iEByZXtaxFwfTpDktwhpz/cpLKQfCeSnIyCauLMT8I8hL4oZWDyj9tocbaF85
+ZEX9aINsdSQePHWZYfrSFPipS7HYfad40hNiZbXWvn5qA7y1svxkMMPQwpk9maTTzdGxxFOHe0wT
+E2Z/v9VlU2j5XB7ltP82mUWjn2LAfxGCAVTeD2WlOa6dSEyJoxA74OaD9bDaLB56HFwfAKzMq6dg
+ZLPGxXvHVUZ0PJCBDkqOWZ1UsEixUkw7mO6r2jS3U81J2i/rlb4MVxH2lkwEeVyZ1eXkvm/qR+5R
+S+8iJq612BGqQ7t4vwt+tN3PdB0lqYljseI0gcSINTjiAg0PE8nVKoIV8IrEQzJW5FMdHay2z32b
+ll0eZOl0c8RW5BZKUm2SOdPhTQ4/YrnerbUdZbldUv5dCamctKQM2S9FdqXPjmqanqqwEaHrYcbr
+Px78ZrQSnUZ/MhaJvnFFr5Eh2f2Tv7QCkUL/SR/tixVo3R+OrJvdggWcRGkWZBdWX0EPSk8ED2VQ
+hpOX7EW/XcIc3M/E2DrmeAXQxVVVqV7+qzohu+VyFPcLAgMBAAGjgcIwgb8wHQYDVR0OBBYEFCkg
+y/HDD9oGjhOTh/5fYBopu/O2MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUKSDL8cMP2gaO
+E5OH/l9gGim787YwEQYDVR0gBAowCDAGBgRVHSAAMEkGA1UdHwRCMEAwPqA8oDqGOGh0dHA6Ly9j
+cmwuc2d0cnVzdHNlcnZpY2VzLmNvbS9yYWNpbmUtR3JvdXBlU0cvTGF0ZXN0Q1JMMA4GA1UdDwEB
+/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEATEZn4ERQ9cW2urJRCiUTHbfHiC4fuStkoMuTiFJZ
+qmD1zClSF/8E5ze0MRFGfisebKeLPEeaXvSqXZA7RT2fSsmKe47A7j55i5KjyJRKuCgRa6YlX129
+x8j7g09VMeZc8BN8471/Kiw3N5RJr4QfFCeiWBCPCjk3GhIgQY8Z9qkfGe2yNLKtfTNEi18KB0Py
+dkVFLa3kjQ4A/QQIqudr+xe9sAhWDjUqcvCz5006Tw3c82ASszhkjNv54SaNL+9O6CRHPjY0imkP
+KGuLh8a9hSb50+tpIVZgkdb34GLCqHGuLt5mI7VSRqakSDcsfwEWVxH3Jw0O5Q/WkEXhHj8h3NL8
+FhgTPk1qsiZqQF4leP049KxYejcbmEAEx47J1MRnYbGYrvDNDty5r2WDewoEij9hqvddQYbmxkzC
+TzpcVuooO6dEz8hKZPVyYC3jQ7hK4HU8MuSqFtcRucFF2ZtmY2blIrc07rrVdC8lZPOBVMt33lfU
+k+OsBzE6PlwDg1dTx/D+aNglUE0SyObhlY1nqzyTPxcCujjXnvcwpT09RAEzGpqfjtCf8e4wiHPv
+riQZupdzFcHscQyEZLV77LxpPqRtCRY2yko5isune8YdfucziMm+MG2chZUh6Uc7Bn6B4upG5nBY
+gOao8p0LadEziVkw82TTC/bOKwn7fRB2LhA=
+-----END CERTIFICATE-----
+
 ACCVRAIZ1
 =========
 -----BEGIN CERTIFICATE-----
@@ -4551,82 +4677,3 @@ PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
 kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
 ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
 -----END CERTIFICATE-----
-
-TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5
-=========================================================
------BEGIN CERTIFICATE-----
-MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN
-BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
-bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1Qg
-RWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAw
-ODA3MDFaFw0yMzA0MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0w
-SwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnE
-n2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRp
-ZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApCUZ4WWe60ghUEoI5RHwWrom/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537
-jVJp45wnEFPzpALFp/kRGml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1m
-ep5Fimh34khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z5UNP
-9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0hO8EuPbJbKoCPrZV
-4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QIDAQABo0IwQDAdBgNVHQ4EFgQUVpkH
-HtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBAJ5FdnsXSDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPo
-BP5yCccLqh0lVX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq
-URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nfpeYVhDfwwvJl
-lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8
-B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU=
------END CERTIFICATE-----
-
-TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6
-=========================================================
------BEGIN CERTIFICATE-----
-MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G
-A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
-acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5
-MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL
-BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf
-aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm
-aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a
-2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED
-wnS3/faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb
-HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV
-+DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT
-9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
-9w0BAQsFAAOCAQEAb1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R
-fdCaqaXKGDsCQC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy
-o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW
-hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1
-O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw==
------END CERTIFICATE-----
-
-Certinomis - Root CA
-====================
------BEGIN CERTIFICATE-----
-MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
-LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
-EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
-ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
-P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
-d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
-z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
-8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
-RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
-6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
-FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
-PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
-i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
-YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
-6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
-AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
-WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
-Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
-lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
-y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
-Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
-DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
-I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
-cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
-hkIGuUE=
------END CERTIFICATE-----

data/config/precedence_routes.rb

@@ -26,6 +26,7 @@ Scrivito::SdkEngine.routes.draw do
       put :destroy_widget
       put :revert_widget
       put :restore_widget
+      put :transfer_modifications
     end
   end
 

data/lib/assets/javascripts/scrivito_ui.js

@@ -26058,8 +26058,18 @@ the specific language governing permissions and limitations under the Apache Lic
   this.ScrivitoHandlebarsTemplates["alert_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, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing;
+  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, helperMissing=helpers.helperMissing;
 
+function program1(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n  <div class=\"scrivito_modal_body\">\n    ";
+  if (stack1 = helpers.body) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.body; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n  </div>\n  ";
+  return buffer;
+  }
 
   buffer += "<div class=\"scrivito_alert_dialog scrivito_modal_prompt scrivito_center_dialog scrivito_";
   if (stack1 = helpers.color) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
@@ -26073,7 +26083,10 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   if (stack1 = helpers.message) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.message; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "</h3>\n  </div>\n  <div class=\"scrivito_modal_footer\">\n    <a href=\"#\" class=\"scrivito_button scrivito_close\">";
+    + "</h3>\n  </div>\n  ";
+  stack1 = helpers['if'].call(depth0, depth0.body, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n  <div class=\"scrivito_modal_footer\">\n    <a href=\"#\" class=\"scrivito_button scrivito_close\">";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "ok", options) : helperMissing.call(depth0, "translate", "ok", options)))
     + "</a>\n  </div>\n</div>\n";
@@ -26102,7 +26115,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   this.ScrivitoHandlebarsTemplates["changes_dialog/content"] = 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, stack2, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing, self=this;
+  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing, self=this;
 
 function program1(depth0,data) {
   
@@ -26119,45 +26132,45 @@ function program1(depth0,data) {
 
 function program3(depth0,data) {
   
-  var buffer = "", stack1, stack2;
-  buffer += "\n    <table class=\"scrivito_changes_table\">\n      ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.objs),stack1 == null || stack1 === false ? stack1 : stack1.length), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n\n      <tbody>\n        ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.objs),stack1 == null || stack1 === false ? stack1 : stack1.length), {hash:{},inverse:self.program(9, program9, data),fn:self.program(6, program6, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n      </tbody>\n    </table>\n  ";
+  var buffer = "", stack1;
+  buffer += "\n      <table class=\"scrivito_changes_table\">\n        ";
+  stack1 = helpers['if'].call(depth0, depth0.objs, {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n\n        <tbody>\n          ";
+  stack1 = helpers['if'].call(depth0, depth0.objs, {hash:{},inverse:self.program(9, program9, data),fn:self.program(6, program6, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n        </tbody>\n      </table>\n    ";
   return buffer;
   }
 function program4(depth0,data) {
   
   var buffer = "", stack1, options;
-  buffer += "\n        <thead>\n          <tr>\n            <th>\n              <span data-scrivito-sort-by=\"_modification\">\n                ";
+  buffer += "\n          <thead>\n            <tr>\n              <th>\n                <span data-scrivito-sort-by=\"_modification\">\n                  ";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.modification", options) : helperMissing.call(depth0, "translate", "changes_dialog.modification", options)))
-    + "\n              </span>\n            </th>\n            <th><span>";
+    + "\n                </span>\n              </th>\n              <th><span>";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.rights", options) : helperMissing.call(depth0, "translate", "changes_dialog.rights", options)))
-    + "</span></th>\n            <th><span>";
+    + "</span></th>\n              <th><span>";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.description_for_editor", options) : helperMissing.call(depth0, "translate", "changes_dialog.description_for_editor", options)))
-    + "</span></th>\n            <th>\n              <span data-scrivito-sort-by=\"_obj_class_name\">\n                ";
+    + "</span></th>\n              <th>\n                <span data-scrivito-sort-by=\"_obj_class\">\n                  ";
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.obj_class_name", options) : helperMissing.call(depth0, "translate", "changes_dialog.obj_class_name", options)))
-    + "\n              </span>\n            </th>\n            <th>\n              <span data-scrivito-sort-by=\"_last_changed\">\n                ";
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.obj_class", options) : helperMissing.call(depth0, "translate", "changes_dialog.obj_class", options)))
+    + "\n                </span>\n              </th>\n              <th>\n                <span data-scrivito-sort-by=\"_last_changed\">\n                  ";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.last_changed", options) : helperMissing.call(depth0, "translate", "changes_dialog.last_changed", options)))
-    + "\n              </span>\n            </th>\n          </tr>\n        </thead>\n      ";
+    + "\n                </span>\n              </th>\n            </tr>\n          </thead>\n        ";
   return buffer;
   }
 
 function program6(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "\n          ";
+  buffer += "\n            ";
   stack1 = helpers.each.call(depth0, depth0.objs, {hash:{},inverse:self.noop,fn:self.program(7, program7, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
+  buffer += "\n          ";
   return buffer;
   }
 function program7(depth0,data) {
@@ -26170,17 +26183,17 @@ function program7(depth0,data) {
 function program9(depth0,data) {
   
   var buffer = "", stack1, options;
-  buffer += "\n          <tr>\n            <td class=\"scrivito_empty_result\" colspan=\"5\">";
+  buffer += "\n            <tr>\n              <td class=\"scrivito_empty_result\" colspan=\"5\">";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.empty", options) : helperMissing.call(depth0, "translate", "changes_dialog.empty", options)))
-    + "</td>\n          </tr>\n        ";
+    + "</td>\n            </tr>\n          ";
   return buffer;
   }
 
 function program11(depth0,data) {
   
   
-  return "\n    <tr><td colspan=\"5\"><i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i></td></tr>\n  ";
+  return "\n      <tr><td colspan=\"5\"><i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i></td></tr>\n    ";
   }
 
 function program13(depth0,data) {
@@ -26193,20 +26206,36 @@ function program13(depth0,data) {
   return buffer;
   }
 
-  buffer += "<div class=\"scrivito_modal_header\">\n  <h3>\n    <i class=\"scrivito_icon\">&#xf080;</i> ";
+function program15(depth0,data) {
+  
+  var buffer = "", stack1, options;
+  buffer += "\n    <a href=\"#\" class=\"scrivito_button scrivito_left scrivito_transfer_changes\">\n      ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.open_transfer_dialog", options) : helperMissing.call(depth0, "translate", "changes_dialog.open_transfer_dialog", options)))
+    + "\n    </a>\n  ";
+  return buffer;
+  }
+
+  buffer += "<div class=\"scrivito_changes_dialog_content scrivito_auto_height\">\n  <div class=\"scrivito_modal_header\">\n    <h3>\n      <i class=\"scrivito_icon\">&#xf080;</i> ";
   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    ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.objs),stack1 == null || stack1 === false ? stack1 : stack1.length), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n  </h3>\n</div>\n\n<div class=\"scrivito_modal_body scrivito_auto_height\">\n  ";
-  stack2 = helpers['if'].call(depth0, depth0.is_loaded, {hash:{},inverse:self.program(11, program11, data),fn:self.program(3, program3, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n\n  ";
-  stack2 = helpers['if'].call(depth0, depth0.has_more, {hash:{},inverse:self.noop,fn:self.program(13, program13, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n</div>\n";
+    + "\n      ";
+  stack1 = helpers['if'].call(depth0, depth0.objs, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n    </h3>\n  </div>\n\n  <div class=\"scrivito_modal_body scrivito_auto_height\">\n    ";
+  stack1 = helpers['if'].call(depth0, depth0.is_loaded, {hash:{},inverse:self.program(11, program11, data),fn:self.program(3, program3, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n\n    ";
+  stack1 = helpers['if'].call(depth0, depth0.has_more, {hash:{},inverse:self.noop,fn:self.program(13, program13, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n  </div>\n</div>\n\n<div class=\"scrivito_modal_footer\">\n  ";
+  stack1 = helpers['if'].call(depth0, depth0.objs, {hash:{},inverse:self.noop,fn:self.program(15, program15, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n  <a href=\"#\" class=\"scrivito_button scrivito_cancel scrivito_green\">";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "done", options) : helperMissing.call(depth0, "translate", "done", options)))
+    + "</a>\n</div>\n";
   return buffer;
   });
   return this.ScrivitoHandlebarsTemplates["changes_dialog/content"];
@@ -26281,8 +26310,8 @@ function program7(depth0,data) {
   else { stack1 = depth0.description_for_editor; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
     + "</span>\n  <td><span class=\"scrivito_obj_class\">";
-  if (stack1 = helpers.obj_class_name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.obj_class_name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  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.is_deleted, {hash:{},inverse:self.noop,fn:self.program(7, program7, data),data:data});
@@ -26326,7 +26355,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
 
 
-  buffer += "<div class=\"scrivito_obj_class_thumbnail scrivito_editing_widget_preview\"\n    data-scrivito-private-obj-class-name=\"";
+  buffer += "<div class=\"scrivito_obj_class_thumbnail scrivito_editing_widget_preview\"\n    data-scrivito-private-obj-class=\"";
   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)
@@ -26551,7 +26580,7 @@ function program1(depth0,data) {
   this.ScrivitoHandlebarsTemplates["editable_workspace_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, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, self=this, functionType="function";
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing, self=this;
 
 function program1(depth0,data) {
   
@@ -26561,144 +26590,28 @@ function program1(depth0,data) {
 
 function program3(depth0,data) {
   
-  var buffer = "", stack1;
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.can_create, {hash:{},inverse:self.program(6, program6, data),fn:self.program(4, program4, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n      ";
-  return buffer;
-  }
-function program4(depth0,data) {
-  
-  var buffer = "", stack1, options;
-  buffer += "\n          ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "editable_ws_dialog.title.select_or_create", options) : helperMissing.call(depth0, "translate", "editable_ws_dialog.title.select_or_create", options)))
-    + "\n        ";
-  return buffer;
-  }
-
-function program6(depth0,data) {
-  
-  var buffer = "", stack1, options;
-  buffer += "\n          ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "editable_ws_dialog.title.select", options) : helperMissing.call(depth0, "translate", "editable_ws_dialog.title.select", options)))
-    + "\n        ";
-  return buffer;
-  }
-
-function program8(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.can_create, {hash:{},inverse:self.program(11, program11, data),fn:self.program(9, program9, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n      ";
-  return buffer;
-  }
-function program9(depth0,data) {
-  
-  var buffer = "", stack1, options;
-  buffer += "\n          ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "editable_ws_dialog.title.create", options) : helperMissing.call(depth0, "translate", "editable_ws_dialog.title.create", options)))
-    + "\n        ";
-  return buffer;
-  }
-
-function program11(depth0,data) {
-  
-  var buffer = "", stack1, options;
-  buffer += "\n          ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "editable_ws_dialog.title.forbidden", options) : helperMissing.call(depth0, "translate", "editable_ws_dialog.title.forbidden", options)))
-    + "\n        ";
-  return buffer;
-  }
-
-function program13(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.can_create, {hash:{},inverse:self.program(16, program16, data),fn:self.program(14, program14, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n      ";
-  return buffer;
-  }
-function program14(depth0,data) {
-  
-  var buffer = "", stack1, options;
-  buffer += "\n          ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "editable_ws_dialog.description.select_or_create", options) : helperMissing.call(depth0, "translate", "editable_ws_dialog.description.select_or_create", options)))
-    + "\n        ";
-  return buffer;
-  }
-
-function program16(depth0,data) {
-  
-  var buffer = "", stack1, options;
-  buffer += "\n          ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "editable_ws_dialog.description.select", options) : helperMissing.call(depth0, "translate", "editable_ws_dialog.description.select", options)))
-    + "\n        ";
-  return buffer;
-  }
-
-function program18(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.can_create, {hash:{},inverse:self.program(21, program21, data),fn:self.program(19, program19, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n      ";
-  return buffer;
-  }
-function program19(depth0,data) {
-  
-  var buffer = "", stack1, options;
-  buffer += "\n          ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "editable_ws_dialog.description.create", options) : helperMissing.call(depth0, "translate", "editable_ws_dialog.description.create", options)))
-    + "\n        ";
-  return buffer;
-  }
-
-function program21(depth0,data) {
-  
-  var buffer = "", stack1, options;
-  buffer += "\n          ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "editable_ws_dialog.description.forbidden", options) : helperMissing.call(depth0, "translate", "editable_ws_dialog.description.forbidden", options)))
-    + "\n        ";
-  return buffer;
-  }
-
-function program23(depth0,data) {
-  
   var buffer = "", stack1, stack2, options;
   buffer += "\n    <div class=\"scrivito_input_list_of_ws\">\n      <label for=\"scrivito_list_of_ws\">";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "editable_ws_dialog.choose_existing", options) : helperMissing.call(depth0, "translate", "editable_ws_dialog.choose_existing", options)))
     + "</label>\n      <select id=\"scrivito_list_of_ws\">\n        ";
-  stack2 = helpers.each.call(depth0, depth0.workspaces, {hash:{},inverse:self.noop,fn:self.program(24, program24, data),data:data});
+  stack2 = helpers.each.call(depth0, depth0.workspaces, {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
   buffer += "\n      </select>\n    </div>\n    ";
   return buffer;
   }
-function program24(depth0,data) {
+function program4(depth0,data) {
   
   var buffer = "", stack1, stack2;
   buffer += "\n        <option value=\""
     + escapeExpression(((stack1 = depth0.id),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
     + "\">\n          ";
-  stack2 = helpers['if'].call(depth0, depth0.title, {hash:{},inverse:self.program(27, program27, data),fn:self.program(25, program25, data),data:data});
+  stack2 = helpers['if'].call(depth0, depth0.title, {hash:{},inverse:self.program(7, program7, data),fn:self.program(5, program5, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
   buffer += "\n        </option>\n        ";
   return buffer;
   }
-function program25(depth0,data) {
+function program5(depth0,data) {
   
   var buffer = "", stack1;
   buffer += "\n            "
@@ -26707,7 +26620,7 @@ function program25(depth0,data) {
   return buffer;
   }
 
-function program27(depth0,data) {
+function program7(depth0,data) {
   
   var buffer = "", stack1, options;
   buffer += "\n            ";
@@ -26717,11 +26630,11 @@ function program27(depth0,data) {
   return buffer;
   }
 
-function program29(depth0,data) {
+function program9(depth0,data) {
   
   var buffer = "", stack1, options;
   buffer += "\n      <div class=\"scrivito_input_new_ws_name\">\n        <label for=\"scrivito_new_ws_name\">\n          ";
-  stack1 = helpers['if'].call(depth0, depth0.workspaces, {hash:{},inverse:self.program(32, program32, data),fn:self.program(30, program30, data),data:data});
+  stack1 = helpers['if'].call(depth0, depth0.workspaces, {hash:{},inverse:self.program(12, program12, data),fn:self.program(10, program10, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n        </label>\n        <input type=\"text\" id=\"scrivito_new_ws_name\" value=\"\"\n            placeholder=\"";
   options = {hash:{},data:data};
@@ -26729,7 +26642,7 @@ function program29(depth0,data) {
     + "\">\n      </div>\n    ";
   return buffer;
   }
-function program30(depth0,data) {
+function program10(depth0,data) {
   
   var buffer = "", stack1, options;
   buffer += "\n            ";
@@ -26739,7 +26652,7 @@ function program30(depth0,data) {
   return buffer;
   }
 
-function program32(depth0,data) {
+function program12(depth0,data) {
   
   var buffer = "", stack1, options;
   buffer += "\n            ";
@@ -26749,7 +26662,7 @@ function program32(depth0,data) {
   return buffer;
   }
 
-function program34(depth0,data) {
+function program14(depth0,data) {
   
   var buffer = "", stack1, options;
   buffer += "\n      <a href=\"#\" class=\"scrivito_button scrivito_cancel\">";
@@ -26762,7 +26675,7 @@ function program34(depth0,data) {
   return buffer;
   }
 
-function program36(depth0,data) {
+function program16(depth0,data) {
   
   var buffer = "", stack1, options;
   buffer += "\n      <a href=\"#\" class=\"scrivito_button scrivito_cancel\">";
@@ -26776,19 +26689,21 @@ function program36(depth0,data) {
   stack1 = helpers['if'].call(depth0, depth0.can_select_or_create, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\">\n  <div class=\"scrivito_modal_header\">\n    <i class=\"scrivito_icon\">&#xf011;</i>\n    <h3 class=\"scrivito_title\">\n      ";
-  stack1 = helpers['if'].call(depth0, depth0.can_select, {hash:{},inverse:self.program(8, program8, data),fn:self.program(3, program3, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    </h3>\n  </div>\n  <div class=\"scrivito_modal_body\">\n    <div class=\"scrivito_description\">\n      ";
-  stack1 = helpers['if'].call(depth0, depth0.can_select, {hash:{},inverse:self.program(18, program18, data),fn:self.program(13, program13, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    </div>\n    <div>\n      &nbsp;\n    </div>\n    ";
-  stack1 = helpers['if'].call(depth0, depth0.workspaces, {hash:{},inverse:self.noop,fn:self.program(23, program23, data),data:data});
+  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    </h3>\n  </div>\n  <div class=\"scrivito_modal_body\">\n    <div class=\"scrivito_description\">\n      ";
+  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\n    </div>\n    <div>\n      &nbsp;\n    </div>\n    ";
+  stack1 = helpers['if'].call(depth0, depth0.workspaces, {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n    ";
-  stack1 = helpers['if'].call(depth0, depth0.can_create, {hash:{},inverse:self.noop,fn:self.program(29, program29, data),data:data});
+  stack1 = helpers['if'].call(depth0, depth0.can_create, {hash:{},inverse:self.noop,fn:self.program(9, program9, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n  </div>\n  <div class=\"scrivito_modal_footer\">\n    ";
-  stack1 = helpers['if'].call(depth0, depth0.can_select_or_create, {hash:{},inverse:self.program(36, program36, data),fn:self.program(34, program34, data),data:data});
+  stack1 = helpers['if'].call(depth0, depth0.can_select_or_create, {hash:{},inverse:self.program(16, program16, data),fn:self.program(14, program14, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n  </div>\n</div>\n";
   return buffer;
@@ -26938,26 +26853,10 @@ function program1(depth0,data) {
   this.ScrivitoHandlebarsTemplates["menu"] = 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;
+  var buffer = "", stack1, functionType="function", self=this;
 
 function program1(depth0,data) {
   
-  var buffer = "", stack1;
-  buffer += "scrivito_";
-  if (stack1 = helpers.align) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.align; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1);
-  return buffer;
-  }
-
-function program3(depth0,data) {
-  
-  
-  return "scrivito_right";
-  }
-
-function program5(depth0,data) {
-  
   var buffer = "", stack1, stack2;
   buffer += "\n      ";
   stack2 = ((stack1 = depth0.render),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
@@ -26966,11 +26865,8 @@ function program5(depth0,data) {
   return buffer;
   }
 
-  buffer += "<div class=\"scrivito_editing_marker_menu\">\n  <ul class=\"scrivito_menu_box ";
-  stack1 = helpers['if'].call(depth0, depth0.align, {hash:{},inverse:self.program(3, program3, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">\n    ";
-  stack1 = helpers.each.call(depth0, depth0.menu_items, {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
+  buffer += "<div class=\"scrivito_editing_marker_menu\">\n  <ul class=\"scrivito_menu_box\">\n    ";
+  stack1 = helpers.each.call(depth0, depth0.menu_items, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n    <li class=\"scrivito_menu_box_overlay\"></li>\n  </ul>\n</div>\n";
   return buffer;
@@ -26985,7 +26881,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   
 
 
-  return "<div class=\"scrivito_topbar\">\n  <div class=\"scrivito_first_level\">\n    <div id=\"scrivito_menu_bar_toggle\" class=\"scrivito_viewmodes_wrapper\"></div>\n    <div class=\"scrivito_button_bar scrivito_app scrivito_no_hover\"><span class=\"scrivito_logo\"></span></div>\n    <div id=\"scrivito_workspace_select\" class=\"scrivito_button_bar\"></div>\n    <div id=\"scrivito_current_page_menu\" class=\"scrivito_button_bar scrivito_right\"></div>\n    <div id=\"scrivito_menu_bar_device_toggle\"></div>\n    <div id=\"scrivito_menu_bar_browse_content\"></div>\n    <div id=\"scrivito_menu_bar_conflict_indicator\"></div>\n    <div id=\"scrivito_current_page_restriction\"></div>\n    <div id=\"scrivito_menu_bar_warning\"></div>\n    <div id=\"scrivito_menu_bar_saving_indicator\"></div>\n  </div>\n</div>\n";
+  return "<div class=\"scrivito_topbar\">\n  <div class=\"scrivito_first_level\">\n    <div id=\"scrivito_menu_bar_display_mode_toggle\" class=\"scrivito_viewmodes_wrapper\"></div>\n    <div class=\"scrivito_button_bar scrivito_app scrivito_no_hover\"><span class=\"scrivito_logo\"></span></div>\n    <div id=\"scrivito_workspace_select\" class=\"scrivito_button_bar\"></div>\n    <div id=\"scrivito_current_page_menu\" class=\"scrivito_button_bar scrivito_right\"></div>\n    <div id=\"scrivito_menu_bar_device_toggle\"></div>\n    <div id=\"scrivito_menu_bar_browse_content\"></div>\n    <div id=\"scrivito_menu_bar_conflict_indicator\"></div>\n    <div id=\"scrivito_current_page_restriction\"></div>\n    <div id=\"scrivito_menu_bar_warning\"></div>\n    <div id=\"scrivito_menu_bar_saving_indicator\"></div>\n  </div>\n</div>\n";
   });
   return this.ScrivitoHandlebarsTemplates["menu_bar"];
 }).call(this);
@@ -27077,7 +26973,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 }).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
-  this.ScrivitoHandlebarsTemplates["menu_bar_toggle"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.ScrivitoHandlebarsTemplates["menu_bar_display_mode_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, stack2, functionType="function", escapeExpression=this.escapeExpression;
@@ -27106,7 +27002,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
     + " <i class=\"scrivito_icon\">&#xf025;</i>\n    </span>\n  </div>\n</div>\n";
   return buffer;
   });
-  return this.ScrivitoHandlebarsTemplates["menu_bar_toggle"];
+  return this.ScrivitoHandlebarsTemplates["menu_bar_display_mode_toggle"];
 }).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
@@ -27509,14 +27405,222 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
 
 
-  buffer += "<h1>";
-  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)
-    + "</h1>\n";
+  buffer += "<h1>";
+  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)
+    + "</h1>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["title"];
+}).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["transfer_changes_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=\"scrivito_changes_overview scrivito_modal_large scrivito_adjust_dialog scrivito_green\n    scrivito_multi_select_active\">\n  <div class=\"scrivito_modal_header\">\n    <h3>\n      <i class=\"scrivito_icon\">&#xf02d;</i>\n      ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "transfer_changes_dialog.title", options) : helperMissing.call(depth0, "translate", "transfer_changes_dialog.title", options)))
+    + "\n    </h3>\n  </div>\n\n  <div class=\"scrivito_modal_body scrivito_auto_height\"></div>\n\n  <div class=\"scrivito_modal_footer\">\n    <a href=\"#\" class=\"scrivito_button scrivito_left scrivito_green scrivito_confirm\n        scrivito_disabled\">\n      ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "transfer_changes_dialog.select_transfer_target", options) : helperMissing.call(depth0, "translate", "transfer_changes_dialog.select_transfer_target", options)))
+    + "\n    </a>\n    <a href=\"#\" class=\"scrivito_button scrivito_cancel\">\n      ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "transfer_changes_dialog.back", options) : helperMissing.call(depth0, "translate", "transfer_changes_dialog.back", options)))
+    + "\n    </a>\n  </div>\n</div>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["transfer_changes_dialog"];
+}).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["transfer_changes_dialog/body"] = 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, stack2, options, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing, self=this;
+
+function program1(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n      <tr title=\"";
+  if (stack1 = helpers.tooltip) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.tooltip; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\"\n          ";
+  stack1 = helpers.unless.call(depth0, depth0.has_conflict, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n          class=\"";
+  stack1 = helpers['if'].call(depth0, depth0.has_conflict, {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n                 ";
+  stack1 = helpers['if'].call(depth0, depth0.is_selected, {hash:{},inverse:self.noop,fn:self.program(6, program6, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\">\n        <td class=\"scrivito_item_select\"><span class=\"scrivito_item_checkbox\"></span></td>\n        <td>\n          <span class=\"scrivito_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)
+    + "\n              ";
+  stack1 = helpers['if'].call(depth0, depth0.has_conflict, {hash:{},inverse:self.noop,fn:self.program(8, program8, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\"></span>\n        </td>\n\n        <td>\n          ";
+  stack1 = helpers['if'].call(depth0, depth0.has_restriction, {hash:{},inverse:self.program(12, program12, data),fn:self.program(10, program10, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n        </td>\n\n        <td><span class=\"scrivito_title\">";
+  if (stack1 = helpers.description_for_editor) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.description_for_editor; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</span></td>\n        <td><span class=\"scrivito_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.is_deleted, {hash:{},inverse:self.noop,fn:self.program(14, program14, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n        </td>\n      </tr>\n    ";
+  return buffer;
+  }
+function program2(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "data-scrivito-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)
+    + "\"";
+  return buffer;
+  }
+
+function program4(depth0,data) {
+  
+  
+  return "scrivito_disabled";
+  }
+
+function program6(depth0,data) {
+  
+  
+  return "scrivito_active";
+  }
+
+function program8(depth0,data) {
+  
+  
+  return "conflict";
+  }
+
+function program10(depth0,data) {
+  
+  var buffer = "", stack1, stack2, options;
+  buffer += "\n            <span class=\"scrivito_restriction\"\n              title=\"";
+  options = {hash:{},data:data};
+  stack2 = ((stack1 = helpers.array_to_title),stack1 ? stack1.call(depth0, depth0.restriction_messages, options) : helperMissing.call(depth0, "array_to_title", depth0.restriction_messages, options));
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\"></span>\n          ";
+  return buffer;
+  }
+
+function program12(depth0,data) {
+  
+  
+  return "\n            <span></span>\n          ";
+  }
+
+function program14(depth0,data) {
+  
+  var buffer = "", stack1, options;
+  buffer += "\n            <span>\n              <time datetime=\"";
+  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)
+    + "\" title=\"";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.localize_date),stack1 ? stack1.call(depth0, depth0.last_changed, options) : helperMissing.call(depth0, "localize_date", depth0.last_changed, options)))
+    + "\">\n                ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.localize_date_relative),stack1 ? stack1.call(depth0, depth0.last_changed, options) : helperMissing.call(depth0, "localize_date_relative", depth0.last_changed, options)))
+    + "\n              </time>\n            </span>\n          ";
+  return buffer;
+  }
+
+  buffer += "<table class=\"scrivito_changes_table\">\n  <thead>\n    <tr>\n      <th class=\"scrivito_item_select\"><span></span></th>\n      <th><span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "transfer_changes_dialog.modification", options) : helperMissing.call(depth0, "translate", "transfer_changes_dialog.modification", options)))
+    + "</span></th>\n      <th><span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "transfer_changes_dialog.rights", options) : helperMissing.call(depth0, "translate", "transfer_changes_dialog.rights", options)))
+    + "</span></th>\n      <th><span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "transfer_changes_dialog.description_for_editor", options) : helperMissing.call(depth0, "translate", "transfer_changes_dialog.description_for_editor", options)))
+    + "</span></th>\n      <th><span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "transfer_changes_dialog.obj_class", options) : helperMissing.call(depth0, "translate", "transfer_changes_dialog.obj_class", options)))
+    + "</span></th>\n      <th><span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "transfer_changes_dialog.last_changed", options) : helperMissing.call(depth0, "translate", "transfer_changes_dialog.last_changed", options)))
+    + "</span></th>\n    </tr>\n  </thead>\n\n  <tbody>\n    ";
+  stack2 = helpers.each.call(depth0, depth0.objs, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n  </tbody>\n</table>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["transfer_changes_dialog/body"];
+}).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["transfer_errors_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, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing, self=this;
+
+function program1(depth0,data) {
+  
+  var buffer = "", stack1, stack2, options;
+  buffer += "\n  <p>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "transfer_errors_dialog.modified", options) : helperMissing.call(depth0, "translate", "transfer_errors_dialog.modified", options)))
+    + "</p>\n  <ul>\n    ";
+  stack2 = helpers.each.call(depth0, depth0.modified, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n  </ul>\n";
+  return buffer;
+  }
+function program2(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "<li>";
+  if (stack1 = helpers.description_for_editor) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.description_for_editor; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</li>";
+  return buffer;
+  }
+
+function program4(depth0,data) {
+  
+  var buffer = "", stack1, stack2, options;
+  buffer += "\n  <p>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "transfer_errors_dialog.conflicting", options) : helperMissing.call(depth0, "translate", "transfer_errors_dialog.conflicting", options)))
+    + "</p>\n  <ul>\n    ";
+  stack2 = helpers.each.call(depth0, depth0.conflicting, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n  </ul>\n";
+  return buffer;
+  }
+
+  stack1 = helpers['if'].call(depth0, depth0.modified, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n\n";
+  stack1 = helpers['if'].call(depth0, depth0.conflicting, {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n";
   return buffer;
   });
-  return this.ScrivitoHandlebarsTemplates["title"];
+  return this.ScrivitoHandlebarsTemplates["transfer_errors_dialog"];
 }).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
@@ -27784,19 +27888,29 @@ $.i18n().load({
   'menu_item.spinner.loading': 'Laden...',
 
   'choose_obj_class_dialog.add_child_page.title': 'Seitenvorlage auswählen',
+  'choose_obj_class_dialog.create_page.title': 'Seitenvorlage auswählen',
   'choose_obj_class_dialog.create_widget.title': 'Widget auswählen',
   'choose_obj_class_dialog.last_used': 'Zuletzt verwendet',
   'choose_obj_class_dialog.popular': 'Oft verwendet',
   'choose_obj_class_dialog.all': 'Alle',
 
-  'editable_ws_dialog.title.select_or_create': 'Arbeitskopie wählen',
-  'editable_ws_dialog.title.select': 'Arbeitskopie auswählen',
-  'editable_ws_dialog.title.create': 'Arbeitskopie anlegen',
-  'editable_ws_dialog.title.forbidden': 'Keine Arbeitskopie verfügbar',
-  'editable_ws_dialog.description.select_or_create': 'Wählen Sie eine Arbeitskopie aus oder legen Sie eine neue an, um Inhalte zu ändern. Veröffentlichen Sie die Arbeitskopie nach Abschluss der Bearbeitung, oder lassen Sie sie veröffentlichen.',
-  'editable_ws_dialog.description.select': 'Wählen Sie eine Arbeitskopie aus, um Inhalte zu ändern. Veröffentlichen Sie die Arbeitskopie nach Abschluss der Bearbeitung, oder lassen Sie sie veröffentlichen.',
-  'editable_ws_dialog.description.create': 'Legen Sie eine neue Arbeitskopie an, um Inhalte zu ändern. Veröffentlichen Sie die Arbeitskopie nach Abschluss der Bearbeitung, oder lassen Sie sie veröffentlichen.',
-  'editable_ws_dialog.description.forbidden': 'Es gibt keine Arbeitskopie, in der Sie Inhalte ändern könnten. Auch wurde es Ihnen nicht ermöglicht, Arbeitskopien anzulegen.',
+  'editable_ws_dialog.view_mode.title.select_or_create': 'Arbeitskopie wählen',
+  'editable_ws_dialog.view_mode.title.select': 'Arbeitskopie auswählen',
+  'editable_ws_dialog.view_mode.title.create': 'Arbeitskopie anlegen',
+  'editable_ws_dialog.view_mode.title.forbidden': 'Keine Arbeitskopie verfügbar',
+  'editable_ws_dialog.view_mode.description.select_or_create': 'Wählen Sie eine Arbeitskopie aus oder legen Sie eine neue an, um Inhalte zu ändern. Veröffentlichen Sie die Arbeitskopie nach Abschluss der Bearbeitung, oder lassen Sie sie veröffentlichen.',
+  'editable_ws_dialog.view_mode.description.select': 'Wählen Sie eine Arbeitskopie aus, um Inhalte zu ändern. Veröffentlichen Sie die Arbeitskopie nach Abschluss der Bearbeitung, oder lassen Sie sie veröffentlichen.',
+  'editable_ws_dialog.view_mode.description.create': 'Legen Sie eine neue Arbeitskopie an, um Inhalte zu ändern. Veröffentlichen Sie die Arbeitskopie nach Abschluss der Bearbeitung, oder lassen Sie sie veröffentlichen.',
+  'editable_ws_dialog.view_mode.description.forbidden': 'Es gibt keine Arbeitskopie, in der Sie Inhalte ändern könnten. Auch wurde es Ihnen nicht ermöglicht, Arbeitskopien anzulegen.',
+
+  'editable_ws_dialog.transfer_changes.title.select_or_create': 'Ziel-Arbeitskopie auswählen',
+  'editable_ws_dialog.transfer_changes.title.select': 'Ziel-Arbeitskopie auswählen',
+  'editable_ws_dialog.transfer_changes.title.create': 'Ziel-Arbeitskopie anlegen',
+  'editable_ws_dialog.transfer_changes.title.forbidden': 'Keine Arbeitskopie verfügbar',
+  'editable_ws_dialog.transfer_changes.description.select_or_create': 'Die Änderungen können in eine bestehende oder in eine neue Arbeitskopie verschoben werden.',
+  'editable_ws_dialog.transfer_changes.description.select': 'Die Änderungen werden in die ausgewählte Arbeitskopie verschoben.',
+  'editable_ws_dialog.transfer_changes.description.create': 'Bitte erstellen Sie die Ziel-Arbeitskopie',
+  'editable_ws_dialog.transfer_changes.description.forbidden': 'Sie sind nicht dazu berechtigt, Änderungen in eine bestehende Arbeitskopie zu verschieben.',
   'editable_ws_dialog.choose_existing': 'Wählen Sie eine bestehende Arbeitskopie aus:',
   'editable_ws_dialog.create_new': 'Legen Sie eine neue Arbeitskopie an:',
   'editable_ws_dialog.or_create_new': 'Oder legen Sie eine neue an:',
@@ -27805,11 +27919,6 @@ $.i18n().load({
 
   'resource_dialog.title': 'Eigenschaften der Ressource "$1"',
 
-  'resource_dialog.commands.revert_obj.title': 'Änderungen an Ressource verwerfen',
-  'resource_dialog.commands.revert_obj.new_obj': 'Dies ist eine neue Ressource. Um die Erstellung dieser Ressource rückgängig zu machen, löschen Sie sie bitte.',
-  'resource_dialog.commands.revert_obj.not_modified_obj': 'Diese Ressource wurde nicht geändert. Daher gibt es nichts zu verwerfen.',
-  'resource_dialog.commands.revert_obj.dialog.title': 'Wirklich Änderungen an dieser Ressource verwerfen?',
-
   'resource_dialog.commands.restore_obj.title': 'Ressource wiederherstellen',
 
   'resource_dialog.commands.mark_resolved_obj.title': 'Parallele Änderungen an der Ressource überschreiben',
@@ -27862,13 +27971,28 @@ $.i18n().load({
   'changes_dialog.modification': 'Änderung',
   'changes_dialog.rights': 'Veröffentlichen erlaubt',
   'changes_dialog.description_for_editor': 'Titel',
-  'changes_dialog.obj_class_name': 'Typ',
+  'changes_dialog.obj_class': 'Typ',
   'changes_dialog.last_changed': 'Letzte Änderung',
+  'changes_dialog.open_transfer_dialog': 'Änderungen verschieben',
+
+  'transfer_changes_dialog.title': 'Inhalte mit zu verschiebenden Änderungen auswählen',
+  'transfer_changes_dialog.select_transfer_target': 'Ziel-Arbeitskopie auswählen',
+  'transfer_changes_dialog.back': 'Zurück',
+  'transfer_changes_dialog.modification': 'Änderung',
+  'transfer_changes_dialog.rights': 'Veröffentlichen erlaubt',
+  'transfer_changes_dialog.description_for_editor': 'Titel',
+  'transfer_changes_dialog.obj_class': 'Typ',
+  'transfer_changes_dialog.last_changed': 'Letzte Änderung',
+
+  'transfer_errors_dialog.title': 'Fehler beim Verschieben von Änderungen',
+  'transfer_errors_dialog.modified': 'Einige der Änderungen konnten nicht verschoben werden, weil die betreffenden Inhalte auch in der Ziel-Arbeitskopie modifiziert wurden.',
+  'transfer_errors_dialog.conflicting': 'Einige der Änderungen wurden nicht verschoben, weil die betreffenden Inhalte in der Ziel-Arbeitskopie nicht aktuell sind. Die Änderungen auf diese Inhalte anzuwenden, würde zu einem Konflikt führen. Bitte stellen Sie sicher, dass beide Arbeitskopien aktualisiert wurden und konfliktfrei sind.',
 
   'current_page_link_dialog.title': 'Diese Seite teilen',
   'current_page_link_dialog.description': 'Mit dieser URL können Sie die aktuelle Seite als Teil dieser Arbeitskopie teilen. Die Empfänger müssen angemeldet sein und Zugriff auf die Arbeitskopie haben.',
 
   'commands.current_page_link.title': 'Diese Seite teilen',
+  'commands.current_page_link.is_deleted': 'Eine gelöschte Seite kann nicht geteilt werden, weil sie in der Vorschau nicht zugänglich ist',
 
   'commands.create_workspace.forbidden': 'Eine Arbeitskopie kann aufgrund fehlender Benutzerrechte nicht angelegt werden.',
   'commands.create_workspace.title': 'Arbeitskopie anlegen',
@@ -27916,13 +28040,17 @@ $.i18n().load({
 
   'commands.revert_obj.title': 'Änderungen an Seite verwerfen',
   'commands.revert_obj.published_workspace': 'Die veröffentlichten Inhalte können nicht direkt geändert werden. Daher gibt es nichts zu verwerfen.',
-  'commands.revert_obj.new_obj': 'Dies ist eine neue Seite. Um die Erstellung dieser Seite rückgängig zu machen, löschen Sie sie bitte.',
-  'commands.revert_obj.not_modified_obj': 'Diese Seite wurde nicht geändert. Daher gibt es nichts zu verwerfen.',
-  'commands.revert_obj.is_binary': 'Verwerfen von Änderungen ist nicht verfügbar für binäre Daten.',
+  'commands.revert_obj.is_new': 'Dies ist eine neue Seite. Um die Erstellung dieser Seite rückgängig zu machen, löschen Sie sie bitte.',
+  'commands.revert_obj.unmodified': 'Diese Seite wurde nicht geändert. Daher gibt es nichts zu verwerfen.',
   'commands.revert_obj.dialog.title': 'Wirklich Änderungen an dieser Seite verwerfen?',
   'commands.revert_obj.dialog.description': 'Verworfene Änderungen können nicht wiederhergestellt werden.',
   'commands.revert_obj.dialog.confirm': 'Verwerfen',
 
+  'commands.revert_resource.title': 'Änderungen an Ressource verwerfen',
+  'commands.revert_resource.is_new': 'Dies ist eine neue Ressource. Um die Erstellung dieser Ressource rückgängig zu machen, löschen Sie sie bitte.',
+  'commands.revert_resource.unmodified': 'Diese Ressource wurde nicht geändert. Daher gibt es nichts zu verwerfen.',
+  'commands.revert_resource.dialog.title': 'Wirklich Änderungen an dieser Ressource verwerfen?',
+
   'commands.revert_widget.content_title': 'Änderungen am Inhalt verwerfen',
   'commands.revert_widget.widget_title': 'Änderungen am Widget verwerfen',
   'commands.revert_widget.is_new': 'Dies ist ein neues Widget. Um die Erstellung dieses Widgets rückgängig zu machen, löschen Sie es bitte.',
@@ -27944,8 +28072,11 @@ $.i18n().load({
   'commands.duplicate_obj.published_workspace': 'Die veröffentlichten Inhalte können nicht direkt geändert werden.',
   'commands.duplicate_obj.has_children': 'Seiten mit Unterseiten können noch nicht dupliziert werden.',
 
-  'commands.add_subpage.title': 'Neue Seite anlegen',
-  'commands.add_subpage.tooltip': 'Seite unterhalb $1 anlegen',
+  'commands.create_page.title': 'Neue Seite',
+  'commands.create_page.published_workspace': 'Die veröffentlichten Inhalte können nicht direkt geändert werden.',
+
+  'commands.add_subpage.title': 'Seite hinzufügen',
+  'commands.add_subpage.tooltip': 'Seite zu "$1" hinzufügen',
 
   'commands.copy_page_from_clipboard.title': 'Markierte Seite hierher kopieren',
   'commands.copy_page_from_clipboard.paste_forbidden': 'Aufgrund ihres Typs kann die Seite hier nicht eingefügt werden. Nur Seiten der folgenden Typen können hierher verschoben oder kopiert werden: $1',
@@ -28046,19 +28177,29 @@ $.i18n().load({
   'menu_item.spinner.loading': 'Loading...',
 
   'choose_obj_class_dialog.add_child_page.title': 'Select Page Type',
+  'choose_obj_class_dialog.create_page.title': 'Select Page Type',
   'choose_obj_class_dialog.create_widget.title': 'Select Widget',
   'choose_obj_class_dialog.last_used': 'Last used',
   'choose_obj_class_dialog.popular': 'Often used',
   'choose_obj_class_dialog.all': 'All',
 
-  'editable_ws_dialog.title.select_or_create': 'Choose a working copy',
-  'editable_ws_dialog.title.select': 'Select a working copy',
-  'editable_ws_dialog.title.create': 'Create a working copy',
-  'editable_ws_dialog.title.forbidden': 'No working copy available',
-  'editable_ws_dialog.description.select_or_create': 'To alter content, select or create a working copy first. When you finished editing, publish the working copy or have it published.',
-  'editable_ws_dialog.description.select': 'To alter content, select a working copy first. When you finished editing, publish the working copy or have it published.',
-  'editable_ws_dialog.description.create': 'To alter content, create a working copy first. When you finished editing, publish the working copy or have it published.',
-  'editable_ws_dialog.description.forbidden': 'There is no working copy you could use to alter content. Also, creating working copies has not been enabled for you.',
+  'editable_ws_dialog.view_mode.title.select_or_create': 'Choose a working copy',
+  'editable_ws_dialog.view_mode.title.select': 'Select a working copy',
+  'editable_ws_dialog.view_mode.title.create': 'Create a working copy',
+  'editable_ws_dialog.view_mode.title.forbidden': 'No working copy available',
+  'editable_ws_dialog.view_mode.description.select_or_create': 'To alter content, select or create a working copy first. When you finished editing, publish the working copy or have it published.',
+  'editable_ws_dialog.view_mode.description.select': 'To alter content, select a working copy first. When you finished editing, publish the working copy or have it published.',
+  'editable_ws_dialog.view_mode.description.create': 'To alter content, create a working copy first. When you finished editing, publish the working copy or have it published.',
+  'editable_ws_dialog.view_mode.description.forbidden': 'There is no working copy you could use to alter content. Also, creating working copies has not been enabled for you.',
+
+  'editable_ws_dialog.transfer_changes.title.select_or_create': 'Select target working copy',
+  'editable_ws_dialog.transfer_changes.title.select': 'Select target working copy',
+  'editable_ws_dialog.transfer_changes.title.create': 'Create target working copy',
+  'editable_ws_dialog.transfer_changes.title.forbidden': 'No working copy available',
+  'editable_ws_dialog.transfer_changes.description.select_or_create': 'The changes can be moved to an existing working copy or to a new one.',
+  'editable_ws_dialog.transfer_changes.description.select': 'The changes will be moved to the selected working copy.',
+  'editable_ws_dialog.transfer_changes.description.create': 'Please create the target working copy',
+  'editable_ws_dialog.transfer_changes.description.forbidden': 'You are not permitted to move changes to one of the available working copies.',
   'editable_ws_dialog.choose_existing': 'Select an existing working copy:',
   'editable_ws_dialog.create_new': 'Create a new working copy:',
   'editable_ws_dialog.or_create_new': 'Or, create a new one:',
@@ -28067,11 +28208,6 @@ $.i18n().load({
 
   'resource_dialog.title': 'Properties of resource "$1"',
 
-  'resource_dialog.commands.revert_obj.title': 'Discard changes to resource',
-  'resource_dialog.commands.revert_obj.new_obj': 'This is a new resource. To discard the creation of this resource, please delete it.',
-  'resource_dialog.commands.revert_obj.not_modified_obj': 'This resource has not been modified. Therefore, nothing can be discarded.',
-  'resource_dialog.commands.revert_obj.dialog.title': 'Really discard changes to this resource?',
-
   'resource_dialog.commands.restore_obj.title': 'Restore resource',
 
   'resource_dialog.commands.mark_resolved_obj.title': 'Override concurrent changes to resource',
@@ -28124,13 +28260,28 @@ $.i18n().load({
   'changes_dialog.modification': 'Change',
   'changes_dialog.rights': 'Publishing permitted',
   'changes_dialog.description_for_editor': 'Title',
-  'changes_dialog.obj_class_name': 'Type',
+  'changes_dialog.obj_class': 'Type',
   'changes_dialog.last_changed': 'Last change',
+  'changes_dialog.open_transfer_dialog': 'Move changes',
+
+  'transfer_changes_dialog.title': 'Select content changes to be moved',
+  'transfer_changes_dialog.select_transfer_target': 'Select target working copy',
+  'transfer_changes_dialog.back': 'Back',
+  'transfer_changes_dialog.modification': 'Change',
+  'transfer_changes_dialog.rights': 'Publishing permitted',
+  'transfer_changes_dialog.description_for_editor': 'Title',
+  'transfer_changes_dialog.obj_class': 'Type',
+  'transfer_changes_dialog.last_changed': 'Last change',
+
+  'transfer_errors_dialog.title': 'Errors while moving content changes',
+  'transfer_errors_dialog.modified': 'Some of the changes could not be moved because the content concerned has also been modified in the target working copy.',
+  'transfer_errors_dialog.conflicting': 'Some of the changes have not been moved because the respective content in the target working copy is outdated and applying changes to it would cause a conflict. Please make sure that both working copies have been updated and are free of conflicts.',
 
   'current_page_link_dialog.title': 'Share this page',
   'current_page_link_dialog.description': 'Using the URL below, you can share the current page as part of this working copy. The recipients need to be logged in and have access to the working copy.',
 
   'commands.current_page_link.title': 'Share this page',
+  'commands.current_page_link.is_deleted': 'A deleted page cannot be shared because it is inaccessible in preview mode',
 
   'commands.create_workspace.forbidden': 'You can not create a workspace due to missing user permissions.',
   'commands.create_workspace.title': 'Create working copy',
@@ -28178,13 +28329,17 @@ $.i18n().load({
 
   'commands.revert_obj.title': 'Discard changes to page',
   'commands.revert_obj.published_workspace': 'Since this is the published content, nothing has been modified. Therefore, nothing can be discarded.',
-  'commands.revert_obj.new_obj': 'This is a new page. To discard the creation of this page, please delete it.',
-  'commands.revert_obj.is_binary': 'Discarding changes is not available for binary content.',
-  'commands.revert_obj.not_modified_obj': 'This page has not been modified. Therefore, nothing can be discarded.',
+  'commands.revert_obj.is_new': 'This is a new page. To discard the creation of this page, please delete it.',
+  'commands.revert_obj.unmodified': 'This page has not been modified. Therefore, nothing can be discarded.',
   'commands.revert_obj.dialog.title': 'Really discard changes to this page?',
   'commands.revert_obj.dialog.description': 'Discarded changes cannot be restored.',
   'commands.revert_obj.dialog.confirm': 'Discard',
 
+  'commands.revert_resource.title': 'Discard changes to resource',
+  'commands.revert_resource.is_new': 'This is a new resource. To discard the creation of this resource, please delete it.',
+  'commands.revert_resource.dialog.title': 'Really discard changes to this resource?',
+  'commands.revert_resource.dialog.confirm': 'Discard',
+
   'commands.revert_widget.content_title': 'Discard changes to content',
   'commands.revert_widget.widget_title': 'Discard changes to widget',
   'commands.revert_widget.is_new': 'This is a new widget. To discard the creation of this widget, please delete it.',
@@ -28206,8 +28361,11 @@ $.i18n().load({
   'commands.duplicate_obj.published_workspace': 'Since this is the published content, nothing can be modified.',
   'commands.duplicate_obj.has_children': 'Pages with subpages cannot be duplicated yet.',
 
-  'commands.add_subpage.title': 'Create new page',
-  'commands.add_subpage.tooltip': 'Create page underneath $1',
+  'commands.create_page.title': 'Create page',
+  'commands.create_page.published_workspace': 'Since this is the published content, nothing can be modified.',
+
+  'commands.add_subpage.title': 'Add page',
+  'commands.add_subpage.tooltip': 'Add page to "$1"',
 
   'commands.copy_page_from_clipboard.title': 'Copy marked page here',
   'commands.copy_page_from_clipboard.paste_forbidden': 'Due to its type, the page cannot be moved or copied here. Only pages of the following types can be inserted here: $1',
@@ -28362,7 +28520,7 @@ var scrivito = {};
           obj.is_edited() ||
           obj.is_new() && !scrivito.editing_context.is_deleted_mode() ||
           obj.is_deleted() && scrivito.editing_context.is_deleted_mode())) {
-        scrivito.resource_dialog.open(obj);
+        return scrivito.resource_dialog.open(obj);
       } else {
         var url = scrivito.root_path();
         var params = {};
@@ -28383,7 +28541,7 @@ var scrivito = {};
         url += obj.id();
         if (!_.isEmpty(params)) { url += '?'+$.param(params); }
 
-        scrivito.with_saving_overlay(scrivito.redirect_to(url));
+        return scrivito.with_saving_overlay(scrivito.redirect_to(url));
       }
     },
 
@@ -28496,9 +28654,7 @@ var scrivito = {};
 
     on: function(event, callback) {
       if (event === 'load') {
-        scrivito.gui.on('open', function() {
-          callback();
-        });
+        scrivito.gui.on('open', function() { callback(); });
 
         if (scrivito.gui.is_started()) {
           scrivito.run_new_event(function() {
@@ -28506,15 +28662,7 @@ var scrivito = {};
           });
         }
       } else if (event === 'content') {
-        scrivito.gui.on('content', function(dom_element) {
-          callback(dom_element);
-        });
-
-        if (scrivito.gui.is_started()) {
-          scrivito.run_new_event(function() {
-            callback(window.document);
-          });
-        }
+        scrivito.gui.on('content', function(dom_element) { callback(dom_element); });
       } else {
         $.error('Unknown event "' + event + '"');
       }
@@ -28670,6 +28818,10 @@ var scrivito = {};
       scrivito.browse_content = browse_content;
     },
 
+    register_select_content: function (select_content) {
+      scrivito.select_content = select_content;
+    },
+
     ui_config: function() {
       return scrivito.dom_config.read($('body'), ui_config_attr_name);
     },
@@ -28709,13 +28861,14 @@ var scrivito = {};
       scrivito.menu_bar_saving_indicator.init();
       scrivito.menu_bar_device_toggle.init();
       scrivito.menu_bar_warning.init();
-      scrivito.menu_bar_toggle.init();
+      scrivito.menu_bar_display_mode_toggle.init();
       scrivito.current_page_menu.init();
       scrivito.menu_bar_browse_content.init();
       scrivito.menu_bar_conflict_indicator.init();
       scrivito.current_page_restriction.init();
       scrivito.workspace_select.init();
       scrivito.menu_bar.init();
+      scrivito.editor_selection.init();
 
       scrivito.child_list_commands.init();
       scrivito.current_page_commands.init();
@@ -28726,7 +28879,7 @@ var scrivito = {};
       scrivito.widgetlist_field_menu.init();
       scrivito.widget_marker.init();
 
-      scrivito.dynamic_menus.init();
+      scrivito.context_menu.init();
       scrivito.external_links.init();
 
       scrivito.widget_reloading.init();
@@ -28913,31 +29066,9 @@ var scrivito = {};
   var is_started = false;
   var callbacks = {};
 
-  // The callback has to be function that takes no arguments
-  var log_exception_in_callback = function(event_name, callback) {
-    if (scrivito.gui.sandbox_callbacks) {
-      try {
-        callback();
-      } catch(exception) {
-        var text = "'"+event_name+"' callback threw exception: ";
-        scrivito.log_error(text, exception);
-      }
-    } else {
-      callback();
-    }
-  };
-
-  var run_open_callbacks = function() {
-    if (callbacks.open) {
-      _.each(callbacks.open, function(callback) {
-        log_exception_in_callback('open', callback);
-      });
-    }
-
-    if (scrivito.editing_context.is_editing_mode() && callbacks.editing) {
-      _.each(callbacks.editing, function(callback) {
-        log_exception_in_callback('editing', callback);
-      });
+  var run_callbacks = function(name, dom_element) {
+    if (callbacks[name]) {
+      _.each(callbacks[name], function(callback) { callback(dom_element); });
     }
   };
 
@@ -28951,8 +29082,8 @@ var scrivito = {};
         });
 
         $('body').append('<div id="scrivito_editing"></div>');
-        run_open_callbacks();
-        scrivito.gui.run_content_callbacks(window.document);
+        run_callbacks('open');
+        run_callbacks('content', window.document); // For test purpose only.
 
         is_started = true;
       },
@@ -28963,19 +29094,20 @@ var scrivito = {};
       },
 
       new_content: function(dom_element) {
-        scrivito.gui.run_content_callbacks(dom_element);
-
         if (dom_element) {
-          var cms_document = scrivito.cms_document.from($(dom_element));
-          cms_document.notify_new_content(dom_element);
+          run_callbacks('content', dom_element);
+          var promises = scrivito.cms_document.from($(dom_element)).notify_new_content(dom_element);
+          if (promises.length) {
+            $.when.apply(null, promises)
+              .then(function() { run_callbacks('editors', dom_element); });
+          } else {
+            run_callbacks('editors', dom_element);
+          }
         }
       },
 
       new_document: function(document) {
-        _.each(callbacks.document, function(callback) {
-          callback(document);
-        });
-
+        _.each(callbacks.document, function(callback) { callback(document); });
         document.window().notify_new_document(document);
       },
 
@@ -28983,30 +29115,14 @@ var scrivito = {};
         if (callbacks[event_name] === undefined) {
           callbacks[event_name] = [];
         }
-
         callbacks[event_name].push(callback);
       },
 
-      run_content_callbacks: function(dom_element) {
-        if (callbacks.content) {
-          _.each(callbacks.content, function(callback) {
-            if (dom_element) {
-              log_exception_in_callback('content', function() {
-                callback(dom_element);
-              });
-            }
-          });
-        }
-      },
-
       // For testing purpose only.
       reset_callbacks: function() {
         callbacks = {};
       },
 
-      // For testing purpose only.
-      sandbox_callbacks: true,
-
       is_started: function() {
         return is_started;
       }
@@ -29532,6 +29648,12 @@ var scrivito = {};
         });
       },
 
+      // For test purpose only.
+      simulate_changes: function() {
+        scrivito.write_monitor.start_write();
+        scrivito.write_monitor.end_write();
+      },
+
       // For test purpose only.
       reset_callbacks: function() {
         callbacks = {};
@@ -29657,7 +29779,7 @@ var scrivito = {};
           ].concat(commands);
 
           device_toggle.on('click', function() {
-            scrivito.static_menus.toggle(device_toggle, commands);
+            scrivito.context_menu.toggle(device_toggle, commands, {css_class: 'device_toggle'});
             return false;
           });
         });
@@ -29695,7 +29817,7 @@ var scrivito = {};
 }());
 (function() {
   _.extend(scrivito, {
-    menu_bar_toggle: {
+    menu_bar_display_mode_toggle: {
       init: function() {
         scrivito.menu_bar.register_item_renderer(function(menu_bar) {
           var comparing_mode = scrivito.editing_context.comparing_mode();
@@ -29703,7 +29825,7 @@ var scrivito = {};
           var switch_to_editing_mode_command = scrivito.switch_mode_command('editing');
           var switch_to_comparing_mode_command = scrivito.switch_mode_command(comparing_mode);
 
-          var template = scrivito.template.render('menu_bar_toggle', {
+          var template = scrivito.template.render('menu_bar_display_mode_toggle', {
             mode: scrivito.editing_context.display_mode,
             comparing_mode: comparing_mode,
             switch_to_view_mode_command: switch_to_view_mode_command,
@@ -29711,25 +29833,25 @@ var scrivito = {};
             switch_to_comparing_mode_command: switch_to_comparing_mode_command
           });
 
-          var menu_bar_toggle = menu_bar.find('#scrivito_menu_bar_toggle').html(template);
+          var menu_bar_display_mode_toggle = menu_bar.find('#scrivito_menu_bar_display_mode_toggle').html(template);
 
           _.each([
             switch_to_view_mode_command,
             switch_to_editing_mode_command,
             switch_to_comparing_mode_command
           ], function(command) {
-            menu_bar_toggle.find('.'+command.dom_id()).on('click', function() {
+            menu_bar_display_mode_toggle.find('.'+command.dom_id()).on('click', function() {
               command.execute();
               return false;
             });
           });
 
-          menu_bar_toggle.find('.scrivito_comparing_mode_toggle').on('click', function() {
-            scrivito.static_menus.toggle($(this), [
+          menu_bar_display_mode_toggle.find('.scrivito_comparing_mode_toggle').on('click', function() {
+            scrivito.context_menu.toggle($(this), [
               scrivito.switch_mode_command('diff'),
               scrivito.switch_mode_command('added'),
               scrivito.switch_mode_command('deleted')
-            ], {align: 'left'});
+            ]);
             return false;
           });
         });
@@ -29743,7 +29865,8 @@ var scrivito = {};
       create: function(dom_element, obj, commands) {
         dom_element.append(scrivito.template.render('obj_menu', {obj: obj}));
         dom_element.on('click', function() {
-          scrivito.static_menus.toggle(dom_element, _.isFunction(commands) ? commands() : commands);
+          commands = _.isFunction(commands) ? commands() : commands;
+          scrivito.context_menu.toggle(dom_element, commands, {css_class: 'obj_menu'});
           return false;
         });
       }
@@ -29798,7 +29921,9 @@ var scrivito = {};
               .appendTo(menu_bar.find('#scrivito_menu_bar_conflict_indicator'));
             target.show();
             target.find('.scrivito_icon').addClass('scrivito_'+color);
-            target.on('click', function() { scrivito.static_menus.toggle(target, commands); });
+            target.on('click', function() {
+              scrivito.context_menu.toggle(target, commands, {css_class: 'conflict_indicator'});
+            });
           };
 
           current_page = scrivito.application_document().page();
@@ -29943,12 +30068,9 @@ var scrivito = {};
             var spinner = workspace_list.find('.scrivito_spinning');
             if (spinner.length && !spinner.attr('data-scrivito-private-loading')) {
               spinner.attr('data-scrivito-private-loading', true);
-              scrivito.workspace.editable().then(function(workspaces) {
-                var commands = _(workspaces).reject(function(workspace) {
-                  return workspace.id() === selected_workspace.id();
-                }).map(function(workspace) {
-                  return scrivito.select_workspace_command(workspace);
-                });
+              selected_workspace.other_editable().then(function(workspaces) {
+                var commands = _.map(workspaces,
+                  function(workspace) { return scrivito.select_workspace_command(workspace); });
 
                 workspace_list.replaceWith(scrivito.template.render(
                   'workspace_select/other_workspaces', {
@@ -29971,22 +30093,17 @@ var scrivito = {};
   });
 }());
 (function() {
-  var dialog;
+  var dialog, promise, transferred;
 
   _.extend(scrivito, {
     changes_dialog: {
       open: function() {
-        var promise = $.Deferred();
+        promise = $.Deferred();
+        transferred = [];
         dialog = $(scrivito.template.render('changes_dialog')).appendTo($('#scrivito_editing'));
-        open_batch(scrivito.obj_changes());
 
-        var close = function() {
-          scrivito.dialog.close_without_transition(dialog);
-          promise.resolve();
-          return false;
-        };
+        open_batch(scrivito.obj_changes());
 
-        dialog.find('.scrivito_cancel').on('click', close);
         scrivito.dialog.open_and_adjust_without_transition(dialog);
         return scrivito.with_dialog_behaviour(dialog, promise, {escape: close});
       }
@@ -30004,20 +30121,20 @@ var scrivito = {};
   };
 
   var render = function(chainable_search, result, objs, next) {
-    var view = dialog.find('.scrivito_changes_dialog_content');
-    view.html(scrivito.template.render('changes_dialog/content', {
+    dialog.html(scrivito.template.render('changes_dialog/content', {
       title: scrivito.t('changes_dialog.title', scrivito.editing_context.selected_workspace.title()),
       is_loaded: !!result,
       total: result && result.total,
       objs: objs,
       has_more: !!next
     }));
-    scrivito.update_auto_height_for(view);
 
-    view.find('[data-scrivito-sort-by="'+chainable_search.query().order+'"]')
+    scrivito.update_auto_height_for(dialog.find('.scrivito_changes_dialog_content'));
+
+    dialog.find('[data-scrivito-sort-by="'+chainable_search.query().order+'"]')
       .addClass('scrivito_'+(chainable_search.query().reverse_order ? 'sort_down' : 'sort_up'));
 
-    view.find('[data-scrivito-sort-by]').on('click', function() {
+    dialog.find('[data-scrivito-sort-by]').on('click', function() {
       var sortable = $(this);
       var chainable_search = scrivito.obj_changes();
       chainable_search.order(sortable.attr('data-scrivito-sort-by'));
@@ -30026,23 +30143,155 @@ var scrivito = {};
       return false;
     });
 
-    view.find('[data-scrivito-obj-id]').on('click', function() {
+    dialog.find('[data-scrivito-obj-id]').on('click', function() {
       var obj_id = $(this).attr('data-scrivito-obj-id');
-      scrivito.open_obj(_.find(objs, function(obj) { return obj.id() === obj_id; }));
+      scrivito.write_monitor.track_changes(function() {
+        return scrivito.open_obj(_.find(objs, function(obj) { return obj.id() === obj_id; }));
+      }, function() { open_batch(chainable_search.clone()); });
       return false;
     });
 
-    view.find('.scrivito_load_more').on('click', function() {
+    dialog.find('.scrivito_load_more').on('click', function() {
       open_batch(next, objs);
       return false;
     });
+
+    dialog.find('.scrivito_transfer_changes').on('click', function() {
+      scrivito.transfer_changes_dialog.open(objs).then(function(transferred_objs) {
+        transferred = transferred.concat(_.invoke(transferred_objs, 'id'));
+        if (transferred_objs.length) { open_batch(chainable_search.clone()); }
+      });
+      return false;
+    });
+
+    dialog.find('.scrivito_cancel').on('click', close);
+  };
+
+  var close = function() {
+    scrivito.dialog.close_without_transition(dialog);
+    promise.resolve(transferred);
+    return false;
   };
 }());
+(function() {
+  _.extend(scrivito, {
+    transfer_changes: function(objs) {
+      var fetch_workspaces = scrivito.editing_context.selected_workspace.other_editable();
+      return scrivito.with_saving_overlay(fetch_workspaces).then(function(workspaces) {
+        var select_workspace = scrivito.editable_workspace_dialog(workspaces, 'transfer_changes');
+        return select_workspace.then(function(workspace_id) {
+          var transfer_modifications = scrivito.obj.transfer_modifications(objs, workspace_id);
+          return scrivito.with_saving_overlay(transfer_modifications).then(function(errors) {
+            if (errors.length) { scrivito.transfer_errors_dialog.open(errors); }
+            return errors;
+          });
+        });
+      });
+    }
+  });
+})();
+(function() {
+  var dialog, objs, transferred, promise;
+
+  _.extend(scrivito, {
+    transfer_changes_dialog: {
+      open: function(original_objs) {
+        promise = $.Deferred();
+        objs = _.map(original_objs, function(obj) { return _.extend({}, obj); });
+        transferred = [];
+
+        dialog = $(scrivito.template.render('transfer_changes_dialog'));
+        dialog.appendTo($('#scrivito_editing'));
+        render();
+
+        dialog.find('.scrivito_confirm').on('click', function() {
+          transfer_changes();
+          return false;
+        });
+
+        dialog.find('.scrivito_cancel').on('click', close);
+
+        scrivito.dialog.open_and_adjust_without_transition(dialog);
+        return scrivito.with_dialog_behaviour(dialog, promise, {escape: close});
+      }
+    }
+  });
+
+  var render = function() {
+    var body = dialog.find('.scrivito_modal_body');
+    body.html(scrivito.template.render('transfer_changes_dialog/body', {objs: objs}));
+    scrivito.update_auto_height_for(body);
+
+    dialog.find('[data-scrivito-obj-id]').on('click', function() {
+      toggle($(this));
+      return false;
+    });
+  };
+
+  var toggle = function(dom_element) {
+    dom_element.toggleClass('scrivito_active');
+    var confirm_button = dialog.find('.scrivito_confirm');
+    if (dialog.find('.scrivito_active').length) {
+      confirm_button.removeClass('scrivito_disabled');
+    } else {
+      confirm_button.addClass('scrivito_disabled');
+    }
+  };
+
+  var transfer_changes = function() {
+    _.each(objs, function(obj) {
+      obj.is_selected = dialog.find('[data-scrivito-obj-id='+obj.id()+']').is('.scrivito_active');
+    });
+
+    var selected_objs = _.where(objs, {is_selected: true});
+    if (selected_objs.length) {
+      scrivito.transfer_changes(selected_objs).then(function(errors) {
+        if (errors.length) {
+          var transferred_objs = _.filter(objs, function(obj) {
+            return obj.is_selected && !_.any(errors, function(error) {
+              return error.obj.id() === obj.id();
+            });
+          });
+          transferred = transferred.concat(transferred_objs);
+          objs = _.difference(objs, transferred_objs);
+          render();
+        } else {
+          transferred = transferred.concat(selected_objs);
+          close();
+        }
+      });
+    }
+  };
+
+  var close = function() {
+    scrivito.dialog.close_without_transition(dialog);
+    promise.resolve(transferred);
+    return false;
+  };
+})();
+(function() {
+  _.extend(scrivito, {
+    transfer_errors_dialog: {
+      open: function(errors) {
+        scrivito.alert_dialog.open(scrivito.t('transfer_errors_dialog.title'), {
+          body: scrivito.template.render('transfer_errors_dialog', {
+            modified: _.pluck(_.where(errors, {reason: 'modified'}), 'obj'),
+            conflicting: _.pluck(_.where(errors, {reason: 'conflict'}), 'obj')
+          })
+        });
+      }
+    }
+  });
+})();
 (function() {
   _.extend(scrivito, {
     current_page_link_dialog: function() {
       var workspace_id = scrivito.editing_context.selected_workspace.id();
-      var current_page_link = scrivito.editing_context.location({workspace_id: workspace_id});
+      var current_page_link = scrivito.editing_context.location({
+        workspace_id: workspace_id,
+        display_mode: "view"
+      });
+
       var view = $(scrivito.template.render('current_page_link_dialog',
           { current_page_link: current_page_link }));
       var deferred = $.Deferred();
@@ -30112,6 +30361,72 @@ var scrivito = {};
     return scrivito.storage.get(scrivito.obj_class_selection.storage_key) || [];
   };
 }());
+(function() {
+  var editors = {};
+
+  _.extend(scrivito, {
+    editor_selection: {
+      init: function() {
+        scrivito.gui.on('editors', function(content) {
+          if (scrivito.in_editable_view()) {
+            _.each($(content).find('[data-scrivito-field-type]').addBack(), function(element) {
+              scrivito.editor_selection.activate(element);
+            });
+          }
+        });
+      },
+
+      define: function(name, editor) {
+        editors[name] = editor;
+      },
+
+      activate: function(element) {
+        var selected_editor, is_disabled;
+        var editor_name = $(element).attr('data-scrivito-private-editor');
+
+        if (editor_name && can_edit(editor_name, element)) {
+          selected_editor = editors[editor_name];
+        } else {
+          if (scrivito.select_editor) {
+            scrivito.select_editor(element, {
+              use: function(editor_name) {
+                if (!selected_editor && can_edit(editor_name, element)) {
+                  selected_editor = editors[editor_name];
+                }
+              },
+              disable: function() {
+                if (!selected_editor) { is_disabled = true; }
+              }
+            });
+
+            if (is_disabled) { return; }
+          }
+
+          if (!selected_editor && can_edit('default', element)) {
+            selected_editor = editors['default'];
+          }
+        }
+
+        if (selected_editor) {
+          scrivito.run_new_event(function() { selected_editor.activate(element); });
+        }
+      },
+
+      // For test purpose only.
+      reset: function() { editors = {}; }
+    }
+  });
+
+  var can_edit = function(editor_name, element) {
+    var editor = editors[editor_name];
+    if (!editor) { return false; }
+    if (!editor.can_edit) { return true; }
+    try { return editor.can_edit(element); } catch(error) {
+      scrivito.log_error(error);
+      return false;
+    }
+  };
+}());
 (function() {
   var expando = "scrivito_cms_element";
 
@@ -30138,18 +30453,6 @@ var scrivito = {};
 
           set_menu: function(menu) {
             dom_element.data('scrivito-menu', menu);
-          },
-
-          enrich_obj_classes_with_recent_and_popular: function(obj_classes_markup) {
-            var sorted_all = _.pluck(obj_classes_markup, 'name').sort();
-            var popular = _.intersection(scrivito.popular_obj_classes, sorted_all);
-            var recent = scrivito.obj_class_selection.recent(sorted_all);
-
-            return {
-              all: format_obj_classes(sorted_all, obj_classes_markup),
-              popular: format_obj_classes(popular, obj_classes_markup),
-              recent: format_obj_classes(recent, obj_classes_markup)
-            };
           }
         };
 
@@ -30195,17 +30498,6 @@ var scrivito = {};
       }
     }
   });
-
-  var format_obj_classes = function(obj_classes, obj_classes_markup) {
-    return _.map(obj_classes, function(obj_class) {
-      return {
-        name: obj_class,
-        markup: _.find(obj_classes_markup, function(obj_class_markup) {
-          return obj_class_markup.name === obj_class;
-        }).markup
-      };
-    });
-  };
 }());
 (function() {
   _.extend(scrivito, {
@@ -30216,7 +30508,7 @@ var scrivito = {};
           scrivito.write_monitor.start_write();
           return upload_to_s3(uploaded_binary, permission).then(function(blob) {
             return activate_upload(obj_id, blob, binary.filename, binary.content_type)
-              .then(function() { return blob; });
+              .then(function(blob) { return blob; });
           }).always(function() { scrivito.write_monitor.end_write(); });
         });
       },
@@ -30294,10 +30586,7 @@ var scrivito = {};
             },
 
             fetch_page_class_selection: function() {
-              var request_path = 'objs/page_class_selection?' + $.param({parent_path: that.path()});
-              return scrivito.ajax('GET', request_path).then(function(obj_classes_markup) {
-                return that.enrich_obj_classes_with_recent_and_popular(obj_classes_markup);
-              });
+              return scrivito.obj.fetch_page_class_selection({parent_path: that.path()});
             },
 
             allowed_classes: function() {
@@ -30307,7 +30596,6 @@ var scrivito = {};
 
             create_child: function(obj_class) {
               var id = scrivito.random_id();
-              scrivito.obj_class_selection.store(obj_class);
               return scrivito.obj.create({
                 _id: id,
                 _path: that.path() + '/' + id,
@@ -30343,11 +30631,11 @@ var scrivito = {};
               }
             },
 
-            is_valid_child_class: function(obj_class_name) {
+            is_valid_child_class: function(obj_class) {
               var allowed_classes = that.allowed_classes();
 
               if (allowed_classes) {
-                return _.contains(allowed_classes, obj_class_name);
+                return _.contains(allowed_classes, obj_class);
               } else {
                 return true;
               }
@@ -30428,8 +30716,8 @@ var scrivito = {};
       install_public_api: function() {
         local_$().fn.scrivito = scrivito.jquery_plugin;
 
-        // @api public
         browser_window.scrivito = _.extend({}, additional_public_api, {
+          // @api public
           on: local_on_function,
           trigger: scrivito.trigger,
           create_obj: scrivito.create_obj,
@@ -30441,7 +30729,10 @@ var scrivito = {};
           default_obj_class_for_content_type: scrivito.default_obj_class_for_content_type,
           upload_binary: scrivito.blob.upload_binary,
           page_menu: function() { return scrivito.page_menu(that); },
-          // @api beta
+          define_editor: scrivito.editor_selection.define,
+          select_editor: function(select_editor) { scrivito.select_editor = select_editor; },
+
+          // @api protected
           dialog: function(content, options) {
             var iframe = that.window().iframe();
             return scrivito.custom_dialog(iframe, browser_document, content, options);
@@ -30451,8 +30742,7 @@ var scrivito = {};
         // @api public
         public_getter_setter(browser_window.scrivito, [
           'menu_order',
-          'popular_obj_classes',
-          'select_content' // @api beta
+          'popular_obj_classes'
         ]);
       },
 
@@ -30477,12 +30767,12 @@ var scrivito = {};
       },
 
       notify_new_content: function(content) {
-        if (!connected) { return; }
-
-        _.each(content_callbacks, function(callback) {
+        return connected && _.map(content_callbacks, function(callback) {
+          var promise = $.Deferred();
           scrivito.run_new_event(function() {
-            callback.apply(this, [content]);
+            try { callback.apply(this, [content]); } finally { promise.resolve(); }
           });
+          return promise;
         });
       },
 
@@ -30643,7 +30933,7 @@ var scrivito = {};
           obj: function() {
             return scrivito.obj.create_instance({
               id: that.dom_element().attr('data-scrivito-private-field-obj-id'),
-              obj_class_name: that.dom_element().attr('data-scrivito-field-obj-class')
+              obj_class: that.dom_element().attr('data-scrivito-field-obj-class')
             });
           },
 
@@ -30954,74 +31244,23 @@ var scrivito = {};
 
           return that;
         }
-      },
-      all: function() {
-        return _.map($('[data-scrivito-field-type="html"]'), function(dom_element) {
-          return scrivito.cms_element.from_dom_element($(dom_element));
-        });
-      }
-    }
-  });
-
-  scrivito.cms_element.definitions.push(scrivito.html_field_element);
-}());
-(function() {
-  var is_file = function(object) {
-    return object &&
-      _.isFunction(object.slice) &&
-      _.isDate(object.lastModifiedDate) &&
-      _.isString(object.name);
-  };
-
-  var convert_attrs = function(obj_id, attrs) {
-    var collected_promises = _.map(attrs, function(value, field_name) {
-      if (is_file(value)) {
-        return scrivito.blob.create(obj_id, {file: value}).then(function(blob) {
-          return [field_name, blob];
-        });
-      } else if (value && value.is_uploaded_binary) {
-        return scrivito.blob.create(obj_id, value).then(function(blob) {
-          return [field_name, blob];
-        });
-      }
-      return $.Deferred().resolve([field_name, scrivito.obj.serialize_value(value)]);
-    });
-
-    return $.when.apply(this, collected_promises).then(function() {
-      return _.object(arguments);
-    });
-  };
-
-  var convert_widget_pool = function(obj_id, widget_pool) {
-    if (widget_pool) {
-      var conversion_promises = _.map(widget_pool, function(attrs, widget_id) {
-        return convert_attrs(obj_id, attrs).then(function(converted_attrs) {
-          return [widget_id, converted_attrs];
-        });
-      });
-
-      return $.when.apply(this, conversion_promises).then(function() {
-        return _.object(arguments);
-      });
-    } else {
-      return $.Deferred().resolve(widget_pool);
-    }
-  };
-
-  var prepare_attrs = function(obj_id, attrs) {
-    return convert_widget_pool(obj_id, attrs._widget_pool).then(function(widget_pool) {
-      return convert_attrs(obj_id, attrs).then(function(converted_attrs) {
-        converted_attrs._widget_pool = widget_pool;
-        return converted_attrs;
-      });
-    });
-  };
+      },
+      all: function() {
+        return _.map($('[data-scrivito-field-type="html"]'), function(dom_element) {
+          return scrivito.cms_element.from_dom_element($(dom_element));
+        });
+      }
+    }
+  });
 
+  scrivito.cms_element.definitions.push(scrivito.html_field_element);
+}());
+(function() {
   _.extend(scrivito, {
     obj: {
       serialize_value: function(value) {
         if (_.isDate(value)) {
-          return moment.utc(value).toISOString();
+          return serialize_date(value);
         } else {
           return value;
         }
@@ -31033,8 +31272,8 @@ var scrivito = {};
             return params.id;
           },
 
-          obj_class_name: function() {
-            return params.obj_class_name;
+          obj_class: function() {
+            return params.obj_class;
           },
 
           description_for_editor: function() {
@@ -31091,6 +31330,10 @@ var scrivito = {};
             return params.last_changed;
           },
 
+          parent_path: function() {
+            return params.parent_path;
+          },
+
           save: function(attrs) {
             return prepare_attrs(that.id(), attrs).then(function(prepared_attrs) {
               return scrivito.ajax('PUT', 'objs/'+that.id(), {data: {obj: prepared_attrs}});
@@ -31158,6 +31401,11 @@ var scrivito = {};
             });
           },
 
+          transfer_modifications_to: function(workspace_id) {
+            return scrivito.ajax('PUT', 'objs/'+that.id()+'/transfer_modifications',
+              {data: {workspace_id: workspace_id}});
+          },
+
           reload: function() {
             return scrivito.ajax('GET', 'objs/'+that.id()).then(function(data) {
               params.has_conflict = data.has_conflict;
@@ -31187,15 +31435,108 @@ var scrivito = {};
         return that;
       },
 
+      fetch_class_selection: function(path, params) {
+        if (params) { path += '?'+$.param(params); }
+        return scrivito.ajax('GET', path).then(function(selection) {
+          var names = _.pluck(selection, 'name');
+          var recent = scrivito.obj_class_selection.recent(names);
+          var popular = _.intersection(scrivito.popular_obj_classes, names);
+          return {
+            all: _.sortBy(selection, 'name'),
+            recent: _.map(recent, function(name) { return _.findWhere(selection, {name: name}); }),
+            popular: _.map(popular, function(name) { return _.findWhere(selection, {name: name}); })
+          };
+        });
+      },
+
+      fetch_page_class_selection: function(params) {
+        return scrivito.obj.fetch_class_selection('objs/page_class_selection', params);
+      },
+
       create: function(attrs) {
         return prepare_attrs(scrivito.random_id(), attrs).then(function(prepared_attrs) {
           return scrivito.ajax('POST', 'objs', {data: {obj: prepared_attrs}}).then(function(data) {
+            scrivito.obj_class_selection.store(prepared_attrs._obj_class);
             return scrivito.obj.create_instance(data);
           });
         });
+      },
+
+      transfer_modifications: function(objs, workspace_id) {
+        return $.when.apply(null, _.map(objs, function(obj) {
+          return obj.transfer_modifications_to(workspace_id).then(function(result) {
+            if (result.status !== 'success') { return {obj: obj, reason: result.reason}; }
+          });
+        })).then(function() { return $.Deferred().resolve(_.compact(arguments)); });
       }
     }
   });
+
+  var is_file = function(object) {
+    return object &&
+      _.isFunction(object.slice) &&
+      _.isDate(object.lastModifiedDate) &&
+      _.isString(object.name);
+  };
+
+  var format_date_number = function(number) {
+    var string = number.toString();
+    return string.length === 1 ? '0' + string : string;
+  };
+
+  var serialize_date = function(date) {
+    return date.getUTCFullYear().toString() +
+      '-' + format_date_number(date.getUTCMonth() + 1) + // Month numbers are starting at 0.
+      '-' + format_date_number(date.getUTCDate()) +
+      'T' + format_date_number(date.getUTCHours()) +
+      ':' + format_date_number(date.getUTCMinutes()) +
+      ':' + format_date_number(date.getUTCSeconds()) +
+      'Z';
+  };
+
+  var convert_attrs = function(obj_id, attrs) {
+    var collected_promises = _.map(attrs, function(value, field_name) {
+      if (is_file(value)) {
+        return scrivito.blob.create(obj_id, {file: value}).then(function(blob) {
+          return [field_name, blob];
+        });
+      } else if (value && value.is_uploaded_binary) {
+        return scrivito.blob.create(obj_id, value).then(function(blob) {
+          return [field_name, blob];
+        });
+      }
+      return $.Deferred().resolve([field_name, scrivito.obj.serialize_value(value)]);
+    });
+
+    return $.when.apply(this, collected_promises).then(function() {
+      return _.object(arguments);
+    });
+  };
+
+  var convert_widget_pool = function(obj_id, widget_pool) {
+    if (widget_pool) {
+      var conversion_promises = _.map(widget_pool, function(attrs, widget_id) {
+        return convert_attrs(obj_id, attrs).then(function(converted_attrs) {
+          return [widget_id, converted_attrs];
+        });
+      });
+
+      return $.when.apply(this, conversion_promises).then(function() {
+        return _.object(arguments);
+      });
+    } else {
+      return $.Deferred().resolve(widget_pool);
+    }
+  };
+
+  var prepare_attrs = function(obj_id, attrs) {
+    return convert_widget_pool(obj_id, attrs._widget_pool).then(function(widget_pool) {
+      return convert_attrs(obj_id, attrs).then(function(converted_attrs) {
+        converted_attrs._widget_pool = widget_pool;
+        return converted_attrs;
+      });
+    });
+  };
 }());
 (function() {
   _.extend(scrivito, {
@@ -31245,13 +31586,20 @@ var scrivito = {};
   _.extend(scrivito, {
     chainable_search: {
       create_instance: function(build_query) {
-        var query = build_query || {predicates: []};
+        var query = build_query || { predicates: [] };
 
         var add_predicate = function(field, operator, value, boost, negate) {
+          var serialized_value;
+          if (_.isArray(value)) {
+            serialized_value = _.map(value, scrivito.obj.serialize_value);
+          } else {
+            serialized_value = scrivito.obj.serialize_value(value);
+          }
+
           var new_query = {
             field:    field,
             operator: operator,
-            value:    serialize_values(value)
+            value:    serialized_value
           };
 
           if (negate) {
@@ -31376,34 +31724,6 @@ var scrivito = {};
 
   });
 
-  var serialize_values = function(values) {
-    if (!_.isArray(values)) {
-      values = [values];
-    }
-
-    return _.map(values, function(value) {
-      return [type_of_value(value), convert_value(value)];
-    });
-  };
-
-  var convert_value = function(value) {
-    var serialized_value = scrivito.obj.serialize_value(value);
-
-    if (serialized_value === null) {
-      return serialized_value;
-    } else {
-      return String(serialized_value);
-    }
-  };
-
-  var type_of_value = function(value) {
-    if (_.isDate(value)) {
-      return 'date';
-    } else {
-      return 'string';
-    }
-  };
-
 }());
 
 (function() {
@@ -31729,15 +32049,9 @@ var scrivito = {};
 
             fetch_widget_class_selection: function() {
               var params = {field_name: that.field_name()};
-              if (that.widget()) {
-                params.widget_id = that.widget().id();
-              }
-              var request_path = 'objs/' + that.obj().id() + '/widget_class_selection?' +
-                  $.param(params);
-
-              return scrivito.ajax('GET', request_path).then(function(obj_classes_markup) {
-                return that.enrich_obj_classes_with_recent_and_popular(obj_classes_markup);
-              });
+              if (that.widget()) { params.widget_id = that.widget().id(); }
+              return scrivito.obj.fetch_class_selection(
+                'objs/'+that.obj().id()+'/widget_class_selection', params);
             },
 
             allowed_classes: function() {
@@ -31882,7 +32196,8 @@ var scrivito = {};
           },
 
           check_and_publish: function() {
-            return check_and_publish(0);
+            var maximum_check_duration_in_ms = 20000;
+            return check_and_publish(Date.now() + maximum_check_duration_in_ms);
           },
 
           publish: function(certificates) {
@@ -31926,27 +32241,35 @@ var scrivito = {};
 
           is_accessible: function() {
             return data.id === 'published' || data.is_accessible;
+          },
+
+          other_editable: function() {
+            return scrivito.workspace.editable().then(function(workspaces) {
+              return _.reject(workspaces, function(workspace) {
+                return workspace.id() === that.id();
+              });
+            });
           }
         };
 
-        var check_and_publish = function(number_of_retries) {
-          return rebase_outdated().then(function() {
+        var check_and_publish = function(retry_until_in_ms) {
+          if (that.is_outdated()) {
+            return that.rebase().then(function() {
+              return that.check_and_publish();
+            });
+          } else {
             return that.check().then(function(certificates) {
               if (certificates) {
                 return that.publish(certificates).then(null, function(error) {
-                  return handle_check_and_publish_error(error, number_of_retries);
+                  return handle_check_and_publish_error(error, retry_until_in_ms);
                 });
               } else {
                 return $.Deferred().reject({type: 'check_failed'});
               }
             }, function(error) {
-              return handle_check_and_publish_error(error, number_of_retries);
+              return handle_check_and_publish_error(error, retry_until_in_ms);
             });
-          });
-        };
-
-        var rebase_outdated = function() {
-          return that.is_outdated() ? that.rebase() : $.Deferred().resolve();
+          }
         };
 
         var check = function(offset) {
@@ -31970,17 +32293,21 @@ var scrivito = {};
           }
         };
 
-        var handle_check_and_publish_error = function(error, number_of_retries) {
+        var handle_check_and_publish_error = function(error, retry_until_in_ms) {
           if (error.code === 'precondition_not_verifiable.workspace.publish.content_state_id') {
             // Another workspace has been published since last check.
             that.mark_as_outdated();
-            return check_and_publish(number_of_retries);
+            return that.check_and_publish();
           } else if (error.code === 'precondition_not_met.workspace.publish.content_state_id') {
             // The workspace has been changed since last check.
-            if (number_of_retries === 2) {
+            if (Date.now() > retry_until_in_ms) {
+              // retried check_and_publish for too long.
               return $.Deferred().reject({type: 'outdated_certificates'});
             } else {
-              return check_and_publish(number_of_retries + 1);
+              // retry again
+              return scrivito.wait(1).then(function() {
+                return check_and_publish(retry_until_in_ms);
+              });
             }
           } else {
             scrivito.display_ajax_error(error);
@@ -32341,7 +32668,9 @@ var scrivito = {};
       remove_all: function() {
         $('.scrivito_saving_overlay').remove();
         view = null;
-      }
+      },
+
+      is_present: function() { return !!view; }
     }
   });
 
@@ -32655,7 +32984,7 @@ var scrivito = {};
         view.on('click', '.scrivito_obj_class_thumbnail', function(e) {
           e.preventDefault();
           scrivito.dialog.close_without_transition(view);
-          deferred.resolve($(this).attr('data-scrivito-private-obj-class-name'));
+          deferred.resolve($(this).attr('data-scrivito-private-obj-class'));
         });
       });
 
@@ -32725,121 +33054,105 @@ var scrivito = {};
   });
 }());
 (function() {
-  _.extend(scrivito, {
-    menus: {
-      open: function(dom_element, commands, options) {
-        var menu = $(scrivito.template.render('menu', _.extend(options || {}, {
-          menu_items: _.map(scrivito.pattern_sort(commands, scrivito.menu_order), function(command) {
-            return scrivito.menu_item.create_instance(command);
-          })
-        })));
-
-        menu.find('.scrivito_menu_box_overlay').on('click', function() {
-          menu.data('scrivito-menu-close')();
-          return false;
-        });
-
-        dom_element.data('scrivito-menu-dom', menu);
-
-        menu.data('scrivito-menu-close', function() {
-          dom_element.removeData('scrivito-menu-dom');
-          menu.fadeOut(500, function() { menu.remove(); });
-        });
-
-        _.each(commands, function(command) {
-          if (command.dom_id) {
-            menu.on('click', '.'+command.dom_id(), function() {
-              if (command.is_enabled()) {
-                menu.data('scrivito-menu-close')();
-              }
-              command.execute();
-              return false;
-            });
-          }
-        });
-
-        return menu;
-      },
+  var menu;
 
-      toggle: function(dom_element, open) {
-        var menu = dom_element.data('scrivito-menu-dom');
-        if (menu) {
-          menu.data('scrivito-menu-close')();
-        } else {
-          open();
-        }
-      }
-    }
-  });
-}());
-(function() {
   _.extend(scrivito, {
-    dynamic_menus: {
+    context_menu: {
       init: function() {
         scrivito.gui.on('document', function(cms_document) {
           var browser_window = $(cms_document.browser_window());
-          var dom_element = cms_document.dom_element();
           _.each(['resize', 'scroll', 'load'], function(event) {
-            browser_window.on(event, function() { scrivito.dynamic_menus.update_positions(); });
+            browser_window.on(event, function() { scrivito.context_menu.update_position(); });
           });
         });
       },
 
-      open: function(dom_element, commands, options) {
-        var menu = scrivito.menus.open(dom_element, commands, options);
-
-        var anchor = (options || {}).anchor;
-        if (anchor) {
-          menu.addClass('scrivito_precise_offset');
+      toggle: function(dom_element, commands, options) {
+        if (menu) {
+          close();
+        } else {
+          open(dom_element, commands, options || {});
         }
-
-        menu.data('scrivito-menu-update-position', function() {
-          var offset = scrivito.cms_document.offset(dom_element);
-          if (anchor) {
-            offset.left += anchor.x * dom_element.width();
-            offset.top += anchor.y * dom_element.height();
-          }
-          menu.offset(offset);
-        });
-
-        menu.appendTo($('#scrivito_editing'));
-        menu.data('scrivito-menu-update-position')(); // Bugfix IE: can't set offset before append.
-        menu.find('.scrivito_menu_box').fadeIn(500);
       },
 
-      toggle: function(dom_element, commands, options) {
-        scrivito.menus.toggle(dom_element, function() {
-          scrivito.dynamic_menus.open(dom_element, commands, options);
-        });
-      },
+      update_position: function() { if (menu) { menu.update_position(); } },
 
-      update_positions: function() {
-        _.each($('.scrivito_editing_marker_menu'), function(menu) {
-          var update_position = $(menu).data('scrivito-menu-update-position');
-          if (update_position) {
-            update_position();
-          }
-        });
-      }
+      close: function() { if (menu) { close(); } }
     }
   });
-}());
-(function() {
-  _.extend(scrivito, {
-    static_menus: {
-      open: function(dom_element, commands, options) {
-        var menu = scrivito.menus.open(dom_element, commands, options);
-        menu.appendTo(dom_element);
-        menu.find('.scrivito_menu_box').fadeIn(500);
-      },
 
-      toggle: function(dom_element, commands, options) {
-        scrivito.menus.toggle(dom_element, function() {
-          scrivito.static_menus.open(dom_element, commands, options);
+  var open = function(dom_element, commands, options) {
+    menu = render(commands);
+    setup_commands(commands);
+    setup_update(dom_element, options.anchor);
+    setup_close(dom_element);
+    show(dom_element, options.css_class);
+  };
+
+  var close = function() {
+    menu.remove();
+    menu = null;
+    return false;
+  };
+
+  var render = function(commands) {
+    return $(scrivito.template.render('menu', {
+      menu_items: _.map(scrivito.pattern_sort(commands, scrivito.menu_order), function(command) {
+        return scrivito.menu_item.create_instance(command);
+      })
+    }));
+  };
+
+  var setup_commands = function(commands) {
+    _.each(commands, function(command) {
+      if (command.dom_id) {
+        menu.on('click', '.'+command.dom_id(), function() {
+          if (command.is_enabled()) { close(); }
+          command.execute();
+          return false;
         });
       }
+    });
+  };
+
+  var setup_update = function(dom_element, anchor) {
+    menu.update_position = function() {
+      var offset = scrivito.cms_document.offset(dom_element);
+      if (anchor) {
+        offset.left += anchor.x * dom_element.width();
+        offset.top += anchor.y * dom_element.height();
+      }
+      menu.offset(offset);
+    };
+
+    if (anchor) { menu.addClass('scrivito_precise_offset'); }
+  };
+
+  var setup_close = function(dom_element) {
+    menu.find('.scrivito_menu_box_overlay').on('click', close);
+  };
+
+  var show = function(dom_element, css_class) {
+    var box = menu.find('.scrivito_menu_box');
+
+    if (css_class) { box.addClass('scrivito_'+css_class); }
+
+    menu.appendTo($('#scrivito_editing'));
+    menu.update_position(); // Bugfix IE: can't set offset before append.
+
+    var viewport = $(scrivito.application_window.browser_window());
+
+    if (dom_element.offset().left + box.width() > viewport.scrollLeft() + viewport.width()) {
+      box.addClass('scrivito_left');
     }
-  });
+
+    if (dom_element.offset().top + box.height() > viewport.scrollTop() + viewport.height() &&
+       (dom_element.offset().top - viewport.scrollTop()) > box.height()) {
+      box.addClass('scrivito_top');
+    }
+
+    box.fadeIn(500);
+  };
 }());
 (function() {
   var callbacks = [];
@@ -32860,7 +33173,7 @@ var scrivito = {};
         if (!scrivito.editing_context.is_view_mode()) {
           root_element.find('.scrivito_editing_marker').remove();
           _.each(callbacks, function(callback) { callback(builder, root_element); });
-          scrivito.dynamic_menus.update_positions();
+          scrivito.context_menu.update_position();
         }
       },
 
@@ -32941,7 +33254,7 @@ var scrivito = {};
         if (scrivito.is_development_mode) {
           warn_overlapping(marker.get(0));
         }
-        scrivito.dynamic_menus.toggle(marker, cms_element.menu());
+        scrivito.context_menu.toggle(marker, cms_element.menu());
         return false;
       });
 
@@ -32999,9 +33312,9 @@ var scrivito = {};
       },
 
       open: function(obj, return_to) {
-        var title = scrivito.t('resource_dialog.title', obj.obj_class_name());
+        var title = scrivito.t('resource_dialog.title', obj.obj_class());
         return scrivito.details_dialog.open(obj.details_src(), title, obj, [
-          scrivito.revert_obj_command(obj, 'resource_dialog.commands.revert_obj'),
+          scrivito.revert_resource_command(obj),
           scrivito.restore_obj_command(obj, 'resource_dialog.commands.restore_obj'),
           scrivito.mark_resolved_obj_command(obj, 'resource_dialog.commands.mark_resolved_obj'),
           scrivito.delete_obj_command(obj, 'resource_dialog.commands.delete_obj',
@@ -33292,8 +33605,8 @@ var scrivito = {};
         },
 
         disabled: function() {
-          var obj_class_name = scrivito.obj_clipboard.obj().obj_class_name();
-          if (!child_list_element.is_valid_child_class(obj_class_name)) {
+          var obj_class = scrivito.obj_clipboard.obj().obj_class();
+          if (!child_list_element.is_valid_child_class(obj_class)) {
             return scrivito.t('commands.copy_page_from_clipboard.paste_forbidden',
                 child_list_element.allowed_classes().join(', '));
           }
@@ -33364,6 +33677,36 @@ var scrivito = {};
     }
   });
 }());
+(function() {
+  _.extend(scrivito, {
+    create_page_command: function() {
+      return scrivito.command.create_instance({
+        id: 'scrivito.sdk.create_page',
+        title: scrivito.t('commands.create_page.title'),
+        icon: '&#xf022;',
+
+        present: function() { return !scrivito.editing_context.is_deleted_mode(); },
+
+        disabled: function() {
+          if (!scrivito.editing_context.selected_workspace.is_editable()) {
+            return scrivito.t('commands.create_page.published_workspace');
+          }
+        },
+
+        execute: function() {
+          var class_selection = scrivito.obj.fetch_page_class_selection();
+          var choose_obj_class = scrivito.choose_obj_class_dialog(class_selection, 'create_page');
+          return choose_obj_class.then(function(obj_class) {
+            var create_page = scrivito.obj.create({_obj_class: obj_class});
+            return scrivito.with_saving_overlay(create_page).then(function(page) {
+              return scrivito.application_window.redirect_to('/' + page.id());
+            });
+          });
+        }
+      });
+    }
+  });
+}());
 (function() {
   _.extend(scrivito, {
     create_widget_command: function(cms_element, position) {
@@ -33443,6 +33786,12 @@ var scrivito = {};
         id: 'scrivito.sdk.current_page_link',
         icon: 'scrivito_icon_link',
         title: scrivito.t('commands.current_page_link.title'),
+
+        disabled: function() {
+          if (scrivito.application_document().page().is_deleted()) {
+            return scrivito.t('commands.current_page_link.is_deleted');
+          }
+        },
         execute: function() { scrivito.current_page_link_dialog(); }
       });
     }
@@ -33639,8 +33988,8 @@ var scrivito = {};
         },
 
         disabled: function() {
-          var obj_class_name = scrivito.obj_clipboard.obj().obj_class_name();
-          if (!child_list_element.is_valid_child_class(obj_class_name)) {
+          var obj_class = scrivito.obj_clipboard.obj().obj_class();
+          if (!child_list_element.is_valid_child_class(obj_class)) {
             return scrivito.t('commands.move_page_from_clipboard.paste_forbidden',
                 child_list_element.allowed_classes().join(', '));
           }
@@ -33684,7 +34033,7 @@ var scrivito = {};
           }
           return scrivito.write_monitor.track_changes(function() {
             return scrivito.details_dialog.open(obj.details_src(),
-              scrivito.t(title_locale, obj.obj_class_name()));
+              scrivito.t(title_locale, obj.obj_class()));
           }, function() {
             scrivito.application_window.redirect_to('/' + obj.id());
           });
@@ -33866,45 +34215,71 @@ var scrivito = {};
 }());
 (function() {
   _.extend(scrivito, {
-    revert_obj_command: function(obj, translations_namespace) {
-      if (!translations_namespace) {
-        translations_namespace = 'commands.revert_obj';
-      }
-
+    revert_obj_command: function(obj) {
       return scrivito.command.create_instance({
         id: 'scrivito.sdk.revert_obj',
-        title: scrivito.t(translations_namespace + '.title'),
+        title: scrivito.t('commands.revert_obj.title'),
         icon: '&#xf032;',
 
         present: function() {
           return scrivito.editing_context.selected_workspace.is_editable() &&
-              obj && !obj.is_deleted();
+            obj && !obj.is_deleted();
         },
 
         disabled: function() {
-          if (!obj.modification()) {
-            return scrivito.t(translations_namespace + '.not_modified_obj');
-          }
-          if (obj.is_new()) {
-            return scrivito.t(translations_namespace + '.new_obj');
-          }
+          if (!obj.modification()) { return scrivito.t('commands.revert_obj.unmodified'); }
+          if (obj.is_new()) { return scrivito.t('commands.revert_obj.is_new'); }
         },
 
-        update: function() {
-          return obj.reload();
-        },
+        update: function() { return obj.reload(); },
 
         execute: function() {
           return scrivito.confirmation_dialog({
-            title: scrivito.t(translations_namespace + '.dialog.title'),
+            title: scrivito.t('commands.revert_obj.dialog.title'),
             description: scrivito.t('commands.revert_obj.dialog.description'),
             icon: '&#xf032;',
             color: 'red',
             confirm_button_text: scrivito.t('commands.revert_obj.dialog.confirm'),
             confirm_button_color: 'red'
+          }).then(function() {
+            return scrivito.with_saving_overlay(obj.revert())
+              .then(function() { scrivito.application_window.reload(); });
+          });
+        }
+      });
+    }
+  });
+}());
+(function() {
+  _.extend(scrivito, {
+    revert_resource_command: function(obj) {
+      return scrivito.command.create_instance({
+        id: 'scrivito.sdk.revert_resource',
+        title: scrivito.t('commands.revert_resource.title'),
+        icon: '&#xf032;',
+
+        present: function() {
+          return scrivito.editing_context.selected_workspace.is_editable() && !obj.is_deleted();
+        },
+
+        disabled: function() {
+          if (obj.is_new()) { return scrivito.t('commands.revert_resource.is_new'); }
+        },
+
+        update: function() { return obj.reload(); },
+
+        execute: function() {
+          return scrivito.confirmation_dialog({
+            title: scrivito.t('commands.revert_resource.dialog.title'),
+            description: scrivito.t('commands.revert_resource.dialog.description'),
+            icon: '&#xf032;',
+            color: 'red',
+            confirm_button_text: scrivito.t('commands.revert_resource.dialog.confirm'),
+            confirm_button_color: 'red'
           }).then(function() {
             return scrivito.with_saving_overlay(obj.revert()).then(function() {
               scrivito.application_window.reload();
+              scrivito.cms_window.from($('iframe[name=scrivito_details_dialog]')).reload();
             });
           });
         }
@@ -34097,7 +34472,7 @@ var scrivito = {};
         execute: function() {
           if (mode !== 'view' && !scrivito.editing_context.selected_workspace.is_editable()) {
             scrivito.with_saving_overlay(scrivito.workspace.editable()).then(function(workspaces) {
-              scrivito.editable_workspace_dialog(workspaces).then(function(workspace_id) {
+              scrivito.editable_workspace_dialog(workspaces, 'view_mode').then(function(workspace_id) {
                 redirect_to(mode, workspace_id);
               });
             });
@@ -34159,7 +34534,16 @@ var scrivito = {};
         icon: '&#xf080;',
 
         execute: function() {
-          scrivito.changes_dialog.open();
+          scrivito.changes_dialog.open().then(function(transferred_obj_ids) {
+            var page = scrivito.application_document().page();
+            if (transferred_obj_ids.length) {
+              if (_.contains(transferred_obj_ids, page.id()) && page.is_new()) {
+                scrivito.redirect_to(page.parent_path() || '/');
+              } else {
+                scrivito.reload();
+              }
+            }
+          });
         }
       });
     }
@@ -34222,6 +34606,7 @@ var scrivito = {};
           var current_page = cms_document.page();
           if (current_page) {
             cms_document.set_menu([
+              scrivito.create_page_command(),
               scrivito.obj_details_command(current_page),
               scrivito.current_page_link_command(),
               create_command_separator(1),
@@ -34347,7 +34732,7 @@ var scrivito = {};
         x: relative_offset.left / container.width(),
         y: relative_offset.top / container.height()
       };
-      scrivito.dynamic_menus.toggle(container, widgetlist_field_element.menu(), {anchor: anchor});
+      scrivito.context_menu.toggle(container, widgetlist_field_element.menu(), {anchor: anchor});
 
       return false;
     });
@@ -34721,22 +35106,18 @@ var scrivito = {};
 (function() {
   _.extend(scrivito, {
     hotkeys: {
-      add_actions_while: function(promise, key_map) {
-        var key_actions = {
-          13: key_map.enter,   // enter key
-          27: key_map.escape   // escape key
-        };
+      add: function(promise, key_map) {
+        var key_actions = {13: key_map.enter, 27: key_map.escape};
 
-        $(document).on('keyup.scrivito_hotkeys_add_actions_while', function(e) {
+        $(document).on('keyup.scrivito_hotkeys', function(e) {
+          if (scrivito.saving_overlay.is_present()) { return; }
           if (key_actions[e.keyCode]) {
             e.preventDefault();
             key_actions[e.keyCode](e);
           }
         });
 
-        return promise.always(function() {
-          $(document).off('keyup.scrivito_hotkeys_add_actions_while');
-        });
+        return promise.always(function() { $(document).off('keyup.scrivito_hotkeys'); });
       }
     }
   });
@@ -34744,22 +35125,25 @@ var scrivito = {};
 (function() {
   _.extend(scrivito, {
     with_dialog_behaviour: function(dom_element, promise, key_map) {
-      return scrivito.with_dialog_overlay(dom_element,
-          scrivito.hotkeys.add_actions_while(promise, key_map));
+      return scrivito.with_dialog_overlay(dom_element, scrivito.hotkeys.add(promise, key_map));
     }
   });
 }());
 (function() {
   _.extend(scrivito, {
-    editable_workspace_dialog: function(workspaces) {
+    editable_workspace_dialog: function(workspaces, locale_path) {
       var can_select = workspaces.length;
       var can_create = scrivito.user_permissions.can('create_workspace');
 
+      var locale_prefix = 'editable_ws_dialog.' + locale_path;
+
       var view = $(scrivito.template.render('editable_workspace_dialog', {
         workspaces: workspaces,
         can_select: can_select,
         can_create: can_create,
-        can_select_or_create: can_select || can_create
+        can_select_or_create: can_select || can_create,
+        title: translate_prefix(locale_prefix + '.title', can_select, can_create),
+        description: translate_prefix(locale_prefix + '.description', can_select, can_create)
       }));
 
       $('#scrivito_editing').append(view);
@@ -34830,6 +35214,18 @@ var scrivito = {};
       });
     }
   });
+
+  var translate_prefix = function(prefix, can_select, can_create) {
+    if (can_select && can_create) {
+      return scrivito.t(prefix + '.select_or_create');
+    } else if (can_select) {
+      return scrivito.t(prefix + '.select');
+    } else if (can_create) {
+      return scrivito.t(prefix + '.create');
+    } else {
+      return scrivito.t(prefix + '.forbidden');
+    }
+  };
 }());
 (function() {
   _.extend(scrivito, {
@@ -34978,7 +35374,7 @@ var scrivito = {};
 
     obj: function() {
       var data = stored_data();
-      return scrivito.obj.create_instance({id: data.id, obj_class_name: data.obj_class_name});
+      return scrivito.obj.create_instance({id: data.id, obj_class: data.obj_class});
     },
 
     clear: function() {
@@ -34989,7 +35385,7 @@ var scrivito = {};
   var storage_key = 'obj_clipboard';
 
   var store_obj = function(obj) {
-    var data = {id: obj.id(), obj_class_name: obj.obj_class_name()};
+    var data = {id: obj.id(), obj_class: obj.obj_class()};
     scrivito.storage.set(storage_key, data);
   };
 
@@ -35013,7 +35409,7 @@ var scrivito = {};
       var data = stored_data();
       var obj = scrivito.obj.create_instance({
         id: data.obj_id,
-        obj_class_name: data.obj_class_name
+        obj_class: data.obj_class
       });
       return scrivito.widget.create_instance(obj, data.id, data.widget_class_name);
     },
@@ -35034,7 +35430,7 @@ var scrivito = {};
       id: widget.id(),
       widget_class_name: widget.widget_class_name(),
       obj_id: widget.obj().id(),
-      obj_class_name: widget.obj().obj_class_name(),
+      obj_class: widget.obj().obj_class(),
       workspace_id: scrivito.editing_context.selected_workspace.id()
     };
     scrivito.storage.set(storage_key, data);
@@ -35119,6 +35515,8 @@ var scrivito = {};
 
 
 
+
+