From b6e81c22d785fc1d4666efdc3eff35fe8ec29504 Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Mon, 29 Aug 2011 16:14:10 +0530
Subject: [PATCH] [FIX] New Edge option.background grid.

bzr revid: vda@tinyerp.com-20110829104410-n52wx91krno7gb63
---
 .../base_diagram/static/src/css/base_diagram.css |   4 ++++
 addons/base_diagram/static/src/img/grid.jpg      | Bin 0 -> 4530 bytes
 addons/base_diagram/static/src/js/diagram.js     |   8 +++++++-
 .../base_diagram/static/src/xml/base_diagram.xml |   6 ++++--
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 addons/base_diagram/static/src/img/grid.jpg

diff --git a/addons/base_diagram/static/src/css/base_diagram.css b/addons/base_diagram/static/src/css/base_diagram.css
index 19939b8c337..70b575e6e47 100644
--- a/addons/base_diagram/static/src/css/base_diagram.css
+++ b/addons/base_diagram/static/src/css/base_diagram.css
@@ -4,6 +4,10 @@
     -webkit-border-radius: 8px;
 }
 
+.openerp .show_grid {
+	background: url("/base_diagram/static/src/img/grid.jpg") repeat;
+}
+
 .openerp .oe_diagram_pager {
 	text-align: right;
     white-space: nowrap;
diff --git a/addons/base_diagram/static/src/img/grid.jpg b/addons/base_diagram/static/src/img/grid.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5254207b96407a79195cd541dfb145417e8bdb30
GIT binary patch
literal 4530
zcmd^?dpMM7AIG1G2{~*-GY+AQk&Ht%MkQgDnar?xnHi_h%AwHYoWsj&lUEvtG7O2R
zF?Q#`$Z0mmEhQ1kAeutikVBNAmdd=dZ@cY|>#g_NKfCsRuIKsZzV7?}{hr_R{rtX<
zXi)S7SdYizumA`I0_?;WAbJYGFfoAv0PxK>01^NIS@A6%qDR1f04yafEiDBWKfqw{
zS{Vgd8S(f^US3WC@|ChO<SPh71*WO0vOxn1fvD-IX=rI}+O$bU6^?*wBQ&))Y5%$j
zNW4^Lt&EbatdjNy$Oi4dJVe(4h%Ar<T$TdCfi)126a*x?1*rd;!mnBUF{GqHYh}e#
z==A_dYR#IpvS9FU)1Wm{(f~w7M|r~z(<2dZU9_`Lc4ZZKA2FPdupxwH^@vxguHFs+
z#LL7J8j%0a{P`#dNN0zQlSlw4NP)y5NkIT>;H}9O`EYJ<k?<Q5SGW=<0$yM>1McGW
z97ABJSl<aNGp>!_$v3ffi(ZJik_g92(gtjZSJWOyx1Fb(y<T%}Q+0Q0Wul9^T6W!?
zHN0JcG=8OYLpP^lziSzxWakA(ronVdUqr0m@s%k7$7|x<q6iQaQuaOOT%2g^(P|oY
zwsdtmqh7^7OL)|pUgWlPF9V|96xBCr`K>@{DOymW(O^R7NB7kIFvyPIf7Ncx@P3~k
z_PB*+pk+aFNZw=D41Fwld+|RA1B%S?`8yBa_v+o?{hx%)p<h@+Wc9@EHfka=9o^C5
zlGb@DwW(Z1ScK$R{Dc(&%jY^u6epzcHLmB}n*OaNY(02=pMNlSv2#RGbvO1AsTC(j
zOVgf19n|@e82;Rlk{a6;)yr;*NBc*525^yfu`M%+{6?dv?|X`EJW1U9h4~)Y%Z@0l
z23N{ft2pWq_OP(>S#d{+`GkW04a&R?*`1oE&^-0=@ajQbMbuRqUAXzkwqV<L6O>ek
z@~Gjuf~WKe*+)UwSQ4?>?j5h6?DuZgK-HU=x<Z4=_s{3MRn7_#qZ^|Rm?T|enWJj;
z7mEDS%{<qpT3Ag<Mn^0Zrl>q=jor*EYsaJ<jzT?#_2j*qiPfKH-gGF_JJxtdEltp4
zZ9dBJZCD5q0nB&o?ZcsH4kl(XZP00CFRAG7^lAp+2?XtLnKx-r<E=>h&7(%+l_O@q
zYs2js(Fti%KUJH1{Lt4j4u^tRaH8`}IHKz7(Cl9INT|z!km#IqB>utWUFf$^R~qCJ
z5_!ccr`?Y#_zrYr0?DgWnYthZTj>lU!fDTg7R{j)O(rYQ#@Ss4a?~tyiLQqk@N%i@
zN;?Kjrjbb=urbd8%kk6~v-4R~^<qh*^e`rEaC?M|oaK%@8{(?nYc4IE2z-q!UO%I3
zj$c5xhnn3fCbnHbZXd(g<JVE|>`pT;i|!&bKVYQq3(Li&;oj1;2&h#HD=^+lvut#0
zA3In0OMi{O2(Zw`iND!iLphIasI~CdHICgetdnuF>BIF?kwsU@GVu*BTr&_7{9B*z
zG2Ilg>n5ff!s`!n-sgX$t)VkJmE5mczizbLt2z03*Y_$@>*Ai)Y7V<^w65o|2VzBl
zW#a3SRa)bv|1{y-ZcPiAS&-}iXxo6r0Rm(3^f8OEk)X!F&&i#0s3H0a+|+0AXWYzV
z-T3Cw#=t$Mfyv8BMc2p&cI9I4%~DkiVV1*wh5Ju1$L_mA^|!b%R<b*@QaIoB$Q&JV
z7^>?bf1(k60)t%-pTkY#rdj;B8#P+<bG6>+EcL51VT{)&AkBxvywRVfVeQFfl~1*)
z^k*G?#r#<6_Wn?f%`<P=0+a~2bPlmXDyZ&}tX&VJV8H8O_5;Psb9o8uR}4u`>!4}}
z;>JT#(h7CS?9uWQFNTv-yUzG#=vRkk%)h0)Vyvo=okN-1n^<a?Vtq-TjVEyxkWEic
zU@C`}cZq<$f05Kec59I6jd86rTj#_L;e#l#5=t!VDq5o*;T1Vmaad8^OI4jip=yUV
zY+9(0-<=qFR9peb=Q!X|5HELcw~v*AD^)(IGsn&U4e8_I>U=s|Wzr!RXUqg(CgGgm
zEGyQz?JfcLq<tEn1iDaOO{-olX^vr@DID<H!x^}Vb;aBc8fBO}IrEbkRZ8&gU@f67
zK8;&n?q2}A59);p*bl~so_wD92t36r(>B*mNjc8fB#E_$NZOZRKyBBn1=h576FVOj
z!rG#rkB9)LC89(WY{4@}wr?j?Eu3Cj3dZ?qVhSHvj92fBk^NjhB-%3Tr`ZqOE6IS?
z4l<i@*2%u|4z(TB;^^RipA<xXslWGW@-I8Q?Tk4nC!f3_myd@Z#Z#D$r6_j<?=s+4
z*HO;3UH*RW4fle*kQCvmQV+wnGVhkmrBS+MY0gUkPO>tbLj}>NbSC60MF9R~^_e%=
z1aO#hM7NsbY3Q>gLA4%CJ)tiPX>ih9*?seF++=$FI>w|ENp9hLdqi#@Ag^jpFg+3a
zJ2QJp!HpuI=%=@<%$IMLB>A0IX<tIxLG$#H4~RC4Yh5Mta(3--;=RM~S$7!59d+D)
zc0nEujp_DBeO5S}swrdrgpC&yC_mh?kj`{&QpDN@+^oEv{qP!gDWNrn9~saqw+OZj
z6=a4OWfTvgJU0fd{}DM}H;3-`n6sX!Sn2b*eY}QFeErH-Ki4YaXTlej&R_F0#2M)=
zF7<PsT`zkglF7B6L`gHXT6kv)P1@cYwsdbAQeS|!dc2Tpr?IRVLWB?d3EJl28`8%H
zWLgy360cT)fc58Zy?S@{qnqMbCQ0@tW^%`X*K~ffhDm4!k3%{CXR}4z-yO`oM4EnD
zVo3klEX;*BBqwP^v$GAI6LI5qH%Zrzovxl`NQQ@#qz=LO#wYOq(TGaAVE4b*y9w9t
z-!Z-}U4pHLe$$3oCI+KSpXPGh16pf<$W|VkD&f9JlD|W-PX8P1gi)=e0|wqH6@)Ce
zD;<>F9H`#;Fj$1!+(kIiE2=-(Xpr}v(gj{W>B<RGSH$qK%;7l$ZH`#dx{}rsx2kR6
zMzG_>M_9l8Hag@<d7fQ#h)pU{A`)vZvy4usR$pw3e;`QyfRTe=R4y`k1A6ZXD?Z#U
zL`K>c`|I9IMts`Hs77Boyxe~}>qunRbALQSMQ_yR+GHUMf0^Z+L#5$jl8kKJE4kCu
z6_yCt&Zk)^{jt2)gT^40HH8};%x^MqT~J`zCiykm?b0%(L6Oc>XV$j$m{h}^=u&H$
zsP;sn2)Gb@mSzBNr@mBewnvvbo+`)lkq^A<VEPWjDMY#r${VpUGruE;y^dypGa%-r
z!f!zfG-m6zO%)3j4G2$0{qc5HevRNcYL^+y1LJXb0Dfz-fKN;Ox+BMKi~X(BVZGvS
WuGByeNqr^lmQ?MFC%jA)J^T;N+H+X|

literal 0
HcmV?d00001

diff --git a/addons/base_diagram/static/src/js/diagram.js b/addons/base_diagram/static/src/js/diagram.js
index c5da54b49d2..4f193015fae 100644
--- a/addons/base_diagram/static/src/js/diagram.js
+++ b/addons/base_diagram/static/src/js/diagram.js
@@ -104,7 +104,13 @@ openerp.base_diagram.DiagramView = openerp.base.View.extend({
 		
 		this.do_update_pager();
 		
-		this.$element.find('.oe_diagram_button_new').click(function(){self.add_edit_node()})
+		// New Node,Edge
+		this.$element.find('#new_node.oe_diagram_button_new').click(function(){self.add_edit_node(null, self.node)})
+		this.$element.find('#new_edge.oe_diagram_button_new').click(function(){self.add_edit_node(null, self.connector)})
+		
+		this.$element.find('#toggle_grid').click(function() {
+			self.$element.find('.diagram').toggleClass('show_grid')
+		});
 		
         if(this.id) {
         	self.get_diagram_info();
diff --git a/addons/base_diagram/static/src/xml/base_diagram.xml b/addons/base_diagram/static/src/xml/base_diagram.xml
index 247eba2c301..70209e06aff 100644
--- a/addons/base_diagram/static/src/xml/base_diagram.xml
+++ b/addons/base_diagram/static/src/xml/base_diagram.xml
@@ -3,7 +3,9 @@
     	<div class="oe_diagram_header" t-att-id="element_id + '_header'">
 	    	<h2 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h2>
 			<div class="oe_diagram_buttons">
-				<button type="button" class="oe_diagram_button_new">New Node</button>
+				<button type="button" id="new_node" class="oe_diagram_button_new">New Node</button>
+				<button type="button" id="new_edge" class="oe_diagram_button_new">New Edge</button>
+				<label>Show Grid:</label><input type="checkbox" id="toggle_grid" checked="checked"/>
 			</div>
 	        <div class="oe_diagram_pager">
 	            <button type="button" data-pager-action="first">First</button>
@@ -15,6 +17,6 @@
 	            <button type="button" data-pager-action="last">Last</button>
 	        </div>
 		</div>
-    	<div id="dia-canvas" class="diagram" style="overflow: auto;"></div>
+    	<div id="dia-canvas" class="diagram show_grid" style="overflow: auto;"></div>
     </t>
 </template>
\ No newline at end of file