From 07d7f19efa95b1da69aa8c1cf76c799df775070a Mon Sep 17 00:00:00 2001
From: Kaushal Prajappati <kaushal@techreceptives.com>
Date: Fri, 19 Jan 2018 17:26:32 +0530
Subject: [PATCH] a[IMP]menu snippet

---
 addons/website/controllers/main.py            |   3 +-
 addons/website/models/website.py              |   2 +-
 .../static/src/img/blocks/menu-icon.png       | Bin 0 -> 3853 bytes
 .../static/src/js/editor/snippets.options.js  |  65 +++++++++++++++---
 addons/website/views/snippets.xml             |  11 ++-
 addons/website/views/website_templates.xml    |  22 ++----
 addons/website/views/website_views.xml        |   1 +
 7 files changed, 71 insertions(+), 33 deletions(-)
 create mode 100644 addons/website/static/src/img/blocks/menu-icon.png

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index c8c5fa41..9878dedf 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -82,8 +82,7 @@ class Website(Home):
 
     @http.route(['/website/menu/render'], type='json', auth="user", website=True)
     def menu_render(self, **kwargs):
-        menu = request.env['website.menu'].browse(
-            int(kwargs['menu_id']))
+        menu = request.env['website.menu'].browse(int(kwargs['menu_id']))
         value = {
             'menu': menu,
         }
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index ca60c906..4ccce166 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -90,7 +90,7 @@ class Website(models.Model):
     def _compute_menu(self):
         Menu = self.env['website.menu']
         for website in self:
-            website.menu_id = Menu.search([('parent_id', '=', False), ('website_id', '=', website.id)], order='id', limit=1).id
+            website.menu_id = Menu.search([('parent_id', '=', False), ('website_id', '=', website.id), ('menu_view', '!=', False)], order='id', limit=1).id
 
     # cf. Wizard hack in website_views.xml
     def noop(self, *args, **kwargs):
diff --git a/addons/website/static/src/img/blocks/menu-icon.png b/addons/website/static/src/img/blocks/menu-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdd2200f190a15d264412ee323b5f8865f22ea2f
GIT binary patch
literal 3853
zcmV+o5AyJdP)<h;3K|Lk000e1NJLTq003kF002)20ssI2lI!>O00009a7bBm001r{
z001r{0eGc9b^rhhPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000CyNkl<Zc-rim&rjP(6vwAqjA<ixv1<j}3C<5G%a#-lNJuQFT&lfs*s2HqPt=}3
zMZ1EWIDjH0R$`kRNU)4SGCnvtu!kp&MvfCDPM|>EJB`Qoc;@5zzW2tSHxCaF1Z_O~
z4G|zLgoUsW7Q#YUhyY<BEQE!y5EjBh1PBXZAuNQ2u;$(t2CJGav)*V-+7QPr{Qcz%
zJv{jSBSCLAK9_U44&{2I(QKL1bi?=k<A484(2d={b|g_83)W@3ef0C^qz_nHT4G@(
zXn_zSi6Vv7GR-NwaUTT9x=~*L6blPwIGqgtT>Inw`*#yJ^!6=#`0eXI33^k^=NU<U
zmLzGKZv6h?L$YqjA3w&{zrkN&7!45?!a`UG3t=GwgoUsW*2`Y*jJD(B<EyJHwq|c{
zFO^CSUg<c_;o%`$v$eIgwzf9cGs|(D*!t`1Ym{Nsy4~(X_45cz(=;e_I-S9@K@hmE
zO9&AJK@fy_hovY=KA$Iqgkd<SL|T)}<z5Y}g=ub<B+0gIa8K!UI#z>{Bzc}Utc4&5
zOw;UkyD$x9S(YSeb#*n;nq^t-cAF5Q>$)h4tyatPJlA!3o>x^>*Y!*$!(M-JaRCq2
zb-hq1jCtyDVP&(~v$Hcmv$3(ko&s(1JfF#An$2eH?RR%~M@L6t7}6TobzRpr3}a_!
zhaE|;*Mkszb92L9ABLfA+qP{-;;iR+aJ`}^k%x{r^|%f`l}gF741)}UfYl%jNmbPm
zbBdDUd0x{rP1C4gtJP|3kY!1+R;$(e{r<C-AxvgakmERXF3_Z5#M?7X6Gkq}a-~w?
zI1cJhPftPGtyU`{M!0x=eVvNVvaD*gO8sU;jL$B0SXo&aOcZE2o6Qcp@$&K#3ftS;
zloTOkb8{04fNb#HutW-l0!(c}$o>8ObI-GumzP01G=ZQ=gDlG|g@^`y-={4^q|G|D
zai;c@!CIKU2~|~n-v=S2(`o8!=rCeo(Q;$>58Ym`H-0x>1}sHU48x!a#5fvc4dQ96
zEiNv;w&f0WB7h0>C<sFA>UvU*zn-L&T0Wn*ZQFHS%d#NG<#M?(@7>?upRey(G)1V@
zYLO@zYa+9gfc0OqGWsifwvKEzu&8^27{~McV2Z>V$8j|Otk>%^hee&;;39vbpz$a&
z<Ty^2Wyl!D)L^Mp0@rRBhUa;a&<R6|ETIx)f4=V@92}HNC0OWmI-Ox_fTx4Srt)Jh
zyNbnPyWNIcU`aUa6Hv0qplKSc0e#;e5paJEtYWc9J&_o<xoL1RRw|YA^K(c$A|?nz
zf-N+x?e6ZLoSd*<z<Hi8m&^1GC9q$=i>BZ2-`?J`?q-G=Ll6WIKxWb`ZaI4LXo#@T
z5EjBhSO^PYAuKe6g|HA7!a`UG3k_i*EQE!y5EjBhLs$q4VIi!SZ2u1cWZT@yL3g;Y
P00000NkvXXu0mjfc11AY

literal 0
HcmV?d00001

diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js
index c8188872..887041c4 100644
--- a/addons/website/static/src/js/editor/snippets.options.js
+++ b/addons/website/static/src/js/editor/snippets.options.js
@@ -5,6 +5,7 @@ var core = require('web.core');
 var Dialog = require('web.Dialog');
 var widgets = require('web_editor.widget');
 var options = require('web_editor.snippets.options');
+var sAnimation = require('website.content.snippets.animation');
 var ajax = require('web.ajax');
 
 var _t = core._t;
@@ -937,21 +938,63 @@ options.registry.gallery_img = options.Class.extend({
     },
 });
 options.registry.js_menu = options.Class.extend({
+    onBuilt: function(){
+        var self = this;
+        this._super.apply(this, arguments);
+        if (!self.$target.data('snippet-view')) {
+            this.$target.data("snippet-view", new sAnimation.registry.js_menu(this.$target));
+        }
+    },
+
+    cleanForSave:function(){
+        if(this.$target.data('menu_template') && this.$target.data('menu_id')){
+            this._super.apply(this, arguments);
+            this.$target.empty();
+        }
+    },
     selected_menu: function (type,value){
-        if(type != true)
-            return
+        if (type != true) return;
         var menu = eval(value);
-        var section=this.$target.find('.menu_view');
-        section.empty();
-        console.info(section)
-        ajax.jsonRpc('/website/menu/render', 'call', {'template': menu[1], 'menu_id':menu[0]}
+        this.$target.attr("data-menu_template", menu[1]);
+        this.$target.attr("data-menu_id", menu[0]);
+        this.$target.data("snippet-view").redraw(true);
+    },
+});
+
+sAnimation.registry.js_menu = sAnimation.Class.extend({
+    selector: ".s_menu",
+
+    start: function() {
+        if(this.$target.data('menu_template') && this.$target.data('menu_id')){
+            this.redraw();
+        }
+    },
+
+    destroy: function () {
+        this.clean();
+        this._super.apply(this, arguments);
+    },
+
+    redraw: function(debug) {
+        this.clean(debug);
+        this.build(debug);
+    },
+
+    clean: function(debug) {
+        if(this.$target.data('menu_template') && this.$target.data('menu_id')){
+            this.$target.empty();
+        }
+    },
+    build: function(){
+        var self = this;
+        ajax.jsonRpc('/website/menu/render', 'call', {'template': this.$target.data('menu_template'), 'menu_id':this.$target.data('menu_id')}
         ).then(function (result) {
-            $(result).appendTo(section);
+            $(result).appendTo(self.$target);
         }).fail(function () {
-                self.$('.o_website_links_code_error').show();
-                self.$('.o_website_links_code_error').html(
-                "<div>ServerError</div><p>We are not able to render template.</p>");
-            }) ;
+            self.$('.o_website_links_code_error').show();
+            self.$('.o_website_links_code_error').html(
+            "<div>ServerError</div><p>We are not able to render template.</p>");
+        }) ;
     },
 });
 });
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 294705a0..f4fdb56f 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -17,8 +17,10 @@
 <template id="s_menu" name="Menu Snippets">
     <section class="s_menu">
         <div class="container">
-            <div class="row menu_view">
-            <h2 style="color: rgb(193, 191, 177);text-align: center;">Select Top Menu From Option</h2>
+            <div class="row">
+                <div class="menu_view">
+                <h2 style="color: rgb(193, 191, 177);text-align: center;">Select Top Menu From Option</h2>
+                </div>
             </div>
         </div>
     </section>
@@ -693,7 +695,7 @@
                 <div class="o_panel_body">
                     <t t-snippet="website.s_title" t-thumbnail="/website/static/src/img/blocks/block_title.png"/>
                     <t t-snippet="website.s_cover" t-thumbnail="/website/static/src/img/blocks/block_banner.png"/>
-                    <t t-snippet="website.s_menu" t-thumbnail="/website/static/src/img/blocks/block_menu.png"/>
+                    <t t-snippet="website.s_menu" t-thumbnail="/website/static/src/img/blocks/menu-icon.png"/>
                     <t t-snippet="website.s_text_image" t-thumbnail="/website/static/src/img/blocks/block_text_image.png"/>
                     <t t-snippet="website.s_image_text" t-thumbnail="/website/static/src/img/blocks/block_image_text.png"/>
                     <t t-snippet="website.s_big_message" t-thumbnail="/website/static/src/img/blocks/block_jumbotron.png"/>
@@ -774,6 +776,9 @@
                          t-att-data-view="menu.menu_view.key"><a
                             href="#"><span t-esc="menu.name"/></a></li>
                 </t>
+                <li t-if="not top_menu">
+                    <a href="#">None</a>
+                </li>
             </ul>
         </li>
     </div>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index cff9c389..10669eaf 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -114,16 +114,6 @@
         </t>
         <t t-set="x_icon" t-value="'/web/image/website/%s/favicon/' % website.id"/>
     </xpath>
-    <xpath expr="//header" position="before">
-        <pre-header>
-            <div id="pre-header" class="oe_structure oe_empty"/>
-        </pre-header>
-    </xpath>
-    <xpath expr="//footer" position="after">
-        <post-footer>
-            <div id="post-footer" class="oe_structure oe_empty"/>
-        </post-footer>
-    </xpath>
     <xpath expr="//t[@t-set='head_website']" position="replace">
         <t t-set="head_website">
             <meta t-if="main_object and 'website_indexed' in main_object
@@ -217,12 +207,12 @@
 <template id="menu_snippets" name="Menu View">
     <nav>
         <div class="container">
-        <div class="navbar-header"/>
-        <ul id="nav_menu" class="nav navbar-nav navbar-right">
-            <t t-foreach="menu.child_id" t-as="submenu">
-                <t t-call="website.recursive_menu_snippets"/>
-            </t>
-        </ul>
+            <div class="navbar-header"/>
+            <ul id="nav_menu" class="nav navbar-nav navbar-right">
+                <t t-foreach="menu.child_id" t-as="submenu">
+                    <t t-call="website.recursive_menu_snippets"/>
+                </t>
+            </ul>
         </div>
     </nav>
 </template>
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index da41c716..8fef97d2 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -188,6 +188,7 @@
                             <field name="website_id" options="{'no_create': True}"/>
                             <field name="new_window"/>
                             <field name="parent_id"/>
+                            <field name="menu_view"/>
                         </group>
                     </sheet>
                 </form>