merge etherpad with pad module

bzr revid: tta@openerp.com-20120427104800-901vmhsz4o76q9va

5 files changed, 50 insertions, 1 deletions

diff --git a/addons/.bzrignore b/addons/.bzrignore
index 8d98f9debde..5fee3e96f5d 100644
--- a/addons/.bzrignore
+++ b/addons/.bzrignore
@@ -1 +1,5 @@
 .*
+pad/__init__.pyc
+pad/ir_attachment.pyc
+pad/res_company.pyc
+web_etherpad
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index e427aa38d13..7454f2038d3 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -21,7 +21,7 @@ Lets the company customize which Pad installation should be used to link to new
     'auto_install': False,
     'web': True,
     'certificate' : '001183545978470526509',
-    'js': ['static/src/js/*.js'],
+    'js': 'static/src/js/*.js',
     'qweb' : [
         "static/src/xml/*.xml",
     ],
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
new file mode 100644
index 00000000000..8b66293d0d1
--- /dev/null
+++ b/addons/pad/static/src/css/etherpad.css
@@ -0,0 +1,32 @@
+.etherpad_head{
+    width: 99.7%;
+    display: block;
+    border-radius: 3px 3px 0px 0px;
+    background: -webkit-linear-gradient( #F7F7F7, #F1F1F1 80%);
+    text-transform:capitalize;
+    padding-left:3px;
+    cursor:pointer;
+}
+.etherpad_zoom_head{
+    position: fixed;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 15px; 
+}
+.etherpad_zoom{
+    position: fixed;
+    left: 0px;
+    top: 15px;
+    width: 100%;
+    height: 98% !important;
+    z-index:10001 !important;
+    background-color:white;
+}
+.etherpad_default{  
+    width: 100%;
+    height: 217px;
+}
+.etherpad_body{
+    overflow:hidden;
+}
diff --git a/addons/pad/static/src/js/web_etherpad.js b/addons/pad/static/src/js/web_etherpad.js
new file mode 100755
index 00000000000..7978a920328
--- /dev/null
+++ b/addons/pad/static/src/js/web_etherpad.js
@@ -0,0 +1,4 @@
+openerp.web_etherpad = function (instance) {
+    
+   
+}
diff --git a/addons/pad/static/src/xml/etherpad.xml b/addons/pad/static/src/xml/etherpad.xml
new file mode 100755
index 00000000000..d3b33a3add4
--- /dev/null
+++ b/addons/pad/static/src/xml/etherpad.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+
+
+
+
+</templates>