diff --git a/addons/website_version/static/src/img/GA/GA_Save.png b/addons/website_version/static/src/img/GA/GA_save.png similarity index 100% rename from addons/website_version/static/src/img/GA/GA_Save.png rename to addons/website_version/static/src/img/GA/GA_save.png diff --git a/addons/website_version/static/src/js/edit_version.js b/addons/website_version/static/src/js/edit_version.js index d5e49cf3ce9..f4efd964265 100644 --- a/addons/website_version/static/src/js/edit_version.js +++ b/addons/website_version/static/src/js/edit_version.js @@ -12,29 +12,33 @@ var self = this; this.$el.on('click', '#save_as_new_version', function() { - website.prompt({ - id: "editor_new_version", - window_title: _t("New version"), - input: "Version name" , - default :(moment().format('L')), - }).then(function (name) { - var context = website.get_context(); - openerp.jsonRpc( '/website_version/create_version', 'call', { 'name': name, 'version_id': 0 }).then(function (result) { - $('html').data('version_id', result); - - var wizard = $(openerp.qweb.render("website_version.message",{message:_.str.sprintf("You are actually working on %s version.", name)})); - wizard.appendTo($('body')).modal({"keyboard" :true}); - wizard.on('click','.o_confirm', function(){ - self.save(); + var wizardA = $(openerp.qweb.render("website_version.new_version",{'default_name': moment().format('L')})); + wizardA.appendTo($('body')).modal({"keyboard" :true}); + wizardA.on('click','.o_create', function(){ + wizardA.find('.o_message').remove(); + var version_name = wizardA.find('.o_version_name').val(); + if(version_name.length == 0){ + wizardA.find(".o_version_name").after("

*"+_t("This field is required")+"

"); + } + else{ + wizardA.modal("hide"); + openerp.jsonRpc( '/website_version/create_version', 'call', { 'name': version_name, 'version_id': 0}).then(function (result) { + $('html').data('version_id', result); + var wizard = $(openerp.qweb.render("website_version.dialogue",{message:_.str.sprintf("You are now working on version: %s.", version_name), + dialogue:_.str.sprintf("If you edit this page or others, all changes will be recorded in the version. It will not be visible by visitors until you publish the version.")})); + wizard.appendTo($('body')).modal({"keyboard" :true}); + wizard.on('click','.o_confirm', function(){ + self.save(); + }); + wizard.on('hidden.bs.modal', function () {$(this).remove();}); + }).fail(function(){ + var wizard = $(openerp.qweb.render("website_version.message",{message:_t("This name already exists.")})); + wizard.appendTo($('body')).modal({"keyboard" :true}); + wizard.on('hidden.bs.modal', function () {$(this).remove();}); }); - wizard.on('hidden.bs.modal', function () {$(this).remove();}); - }).fail(function(){ - var wizard = $(openerp.qweb.render("website_version.message",{message:_t("This name already exists.")})); - wizard.appendTo($('body')).modal({"keyboard" :true}); - wizard.on('hidden.bs.modal', function () {$(this).remove();}); - }); - + } }); + wizardA.on('hidden.bs.modal', function () {$(this).remove();}); }); this.$el.on('click', '#save_and_publish', function() { @@ -45,7 +49,7 @@ } else { - var wizard = $(openerp.qweb.render("website_version.delete_message",{message:_t("Are you sure you want to publish your modifications.")})); + var wizard = $(openerp.qweb.render("website_version.publish",{message:_t("Are you sure you want to publish your modifications.")})); wizard.appendTo($('body')).modal({"keyboard" :true}); wizard.on('click','.o_confirm', function(){ self.save(); diff --git a/addons/website_version/static/src/js/menu_version.js b/addons/website_version/static/src/js/menu_version.js index 2817f692c9b..9d30a393f58 100644 --- a/addons/website_version/static/src/js/menu_version.js +++ b/addons/website_version/static/src/js/menu_version.js @@ -41,27 +41,33 @@ duplicate_version: function(event) { var version_id = $('html').data('version_id'); - website.prompt({ - id: "editor_new_version", - window_title: _t("New version"), - input: "Version name" , - default :(moment().format('L')), - }).then(function (name) { - openerp.jsonRpc( '/website_version/create_version', 'call', { 'name': name, 'version_id': version_id}).then(function (result) { + var wizardA = $(openerp.qweb.render("website_version.new_version",{'default_name': moment().format('L')})); + wizardA.appendTo($('body')).modal({"keyboard" :true}); + wizardA.on('click','.o_create', function(){ + wizardA.find('.o_message').remove(); + var version_name = wizardA.find('.o_version_name').val(); + if(version_name.length == 0){ + wizardA.find(".o_version_name").after("

*"+_t("This field is required")+"

"); + } + else{ + wizardA.modal("hide"); + openerp.jsonRpc( '/website_version/create_version', 'call', { 'name': version_name, 'version_id': version_id}).then(function (result) { - var wizard = $(openerp.qweb.render("website_version.message",{message:_.str.sprintf("You are actually working on %s version.", name)})); - wizard.appendTo($('body')).modal({"keyboard" :true}); - wizard.on('click','.o_confirm', function(){ - window.location.href = '\?enable_editor'; + var wizard = $(openerp.qweb.render("website_version.dialogue",{message:_.str.sprintf("You are now working on version: %s.", version_name), + dialogue:_.str.sprintf("If you edit this page or others, all changes will be recorded in the version. It will not be visible by visitors until you publish the version.")})); + wizard.appendTo($('body')).modal({"keyboard" :true}); + wizard.on('click','.o_confirm', function(){ + window.location.href = '\?enable_editor'; + }); + wizard.on('hidden.bs.modal', function () {$(this).remove();}); + }).fail(function(){ + var wizard = $(openerp.qweb.render("website_version.message",{message:_t("This name already exists.")})); + wizard.appendTo($('body')).modal({"keyboard" :true}); + wizard.on('hidden.bs.modal', function () {$(this).remove();}); }); - wizard.on('hidden.bs.modal', function () {$(this).remove();}); - }).fail(function(){ - var wizard = $(openerp.qweb.render("website_version.message",{message:_t("This name already exists.")})); - wizard.appendTo($('body')).modal({"keyboard" :true}); - wizard.on('hidden.bs.modal', function () {$(this).remove();}); - - }); + } }); + wizardA.on('hidden.bs.modal', function () {$(this).remove();}); }, change_version: function(event) { @@ -104,9 +110,10 @@ publish_version: function(event) { var version_id = parseInt($('html').data('version_id')); - var name = $(event.currentTarget).parent().parent().parent().children().children(':first-child').text(); + var name = $('#version-menu-button').attr('data-version_name'); openerp.jsonRpc( '/website_version/diff_version', 'call', { 'version_id':version_id}).then(function (result) { - var wizardA = $(openerp.qweb.render("website_version.publish_message",{message:_.str.sprintf("Are you sure you want to publish the %s version ?", name), list:result})); + console.log(result); + var wizardA = $(openerp.qweb.render("website_version.publish_message",{message:_.str.sprintf("Publish Version %s", name), list:result})); wizardA.appendTo($('body')).modal({"keyboard" :true}); wizardA.on('click','.o_confirm', function(){ wizardA.find('.o_message').remove(); diff --git a/addons/website_version/static/src/xml/version_templates.xml b/addons/website_version/static/src/xml/version_templates.xml index d40b330be8e..03728f9f191 100644 --- a/addons/website_version/static/src/xml/version_templates.xml +++ b/addons/website_version/static/src/xml/version_templates.xml @@ -56,11 +56,12 @@
-

Launch A/B tests

+ +

Launch A/B Tests

-
+
@@ -110,7 +111,54 @@ - +
+

Odoo uses Google Analytics to track the performances of an A/B testing experiment comparing several versions.

+
+ +
+
+ +
+
+
    +
  • Go to https://www.google.com/analytics/ + and connect you. +

    +
    • +
  • + Click on "Admin". +

    +
    • +
  • + Click on "Tracking Code". +

    +
    • +
  • + Copy the "Tracking ID" and paste it in the field Google Analytics key. +

    +
    • +
  • + Click on "Admin" and click on "View Settings". +

    +
    • +
  • + Copy the "View ID" and paste it in the field View ID. +

    +
    • +
+
+
+
+
@@ -123,6 +171,59 @@
+
+
+ +
+
+
    +
  • Connect on your google account and go to https://console.developers.google.com
    • +
  • + Click on "Create Project" and enter a project name. +

    +

    +
    • +
  • In the menu on left side, select the sub menu APIs (from menu APIs and auth) and activate "Analytics API" by clicking on button "OFF". +
    When it's done, check that the button of "Calendar API" is well in green and with text "ON" +

    +

    +

    +
    • +
  • + In the menu on left side, select the sub menu 'Credentials' (from menu APIs and auth) and click on button 'Create New Client ID' +

    +

    +
    • +
  • Fill in the Name of application and check that the platform is well on 'Web Application'.
    +
    You should now configure the allowed pages on which you will be redirected. To do it, you need to complete the field "Redirect RI" + and set as value (your own domain followed by "/google_account/authentication") : +
    You can now click on 'Create Client ID' +

    +
    • +
  • Once done, you will have the both informations (Client ID and Client Secret) that you need to insert in the 2 fields below ! +

    +
    • +
+
+
+
+
@@ -136,13 +237,12 @@
-
-

You must configure your account.

-

To configure your account, you must have a google analytics account.

-
+
+

Odoo uses Google Analytics to track the performances of an A/B testing experiment comparing several versions.

+
@@ -157,10 +257,6 @@
-
-

You must configure your account.

-

To configure your account, you must have a google analytics account.

-
@@ -199,6 +295,7 @@
+

@@ -213,6 +310,7 @@
+

@@ -231,7 +329,8 @@
-

Diff between Master and

+ +

Version:

@@ -240,6 +339,9 @@
    • +

    List of pages that have been modified in version + compared to master. If you publish this version, all pages will be updated at once. +

    There is no difference with Master

    @@ -247,7 +349,7 @@
    - +
    @@ -258,6 +360,7 @@
    +

    @@ -269,19 +372,38 @@
    + + +
    +
    +
    +
    + +

    +
    +
    + + or + Cancel +
    +
    +
    +
    +
    +

    -

    When you publish a version, you erase some views in master. If you want to save the views that will be erased, you can save these views in a new version. Here is the list of master views which will be erased:

    +

    By publishing this version, you will overwrite the following master pages:

      -
      • +
    @@ -293,13 +415,13 @@
    @@ -312,5 +434,36 @@
    - + + +
    +
    +
    +
    + +

    New Version

    +
    +
    +

    + A version allows to modify several pages, without publishing the changes directly. + You can also launch A/B tests to analyse the performance of different versions. +

    +
    +
    + +
    + +
    +
    + +
    +
    +
    + + Cancel +
    +
    +
    +
    +     \ No newline at end of file diff --git a/addons/website_version/views/website_version_templates.xml b/addons/website_version/views/website_version_templates.xml index aac0c93b4a7..9212634ccf0 100644 --- a/addons/website_version/views/website_version_templates.xml +++ b/addons/website_version/views/website_version_templates.xml @@ -25,7 +25,7 @@
  • Duplicate Version
  • Publish Version
    • -
  • Diff with Master
    • +
  • List Modified Pages
    •
  • Launch A/B tests
    • diff --git a/addons/website_version/views/website_version_views.xml b/addons/website_version/views/website_version_views.xml index 1e255a50c44..5ad886dd71e 100644 --- a/addons/website_version/views/website_version_views.xml +++ b/addons/website_version/views/website_version_views.xml @@ -18,7 +18,7 @@