merge etherpad with pad module
bzr revid: tta@openerp.com-20120427104800-901vmhsz4o76q9va
This commit is contained in:
parent
39cc226e37
commit
28b6a7b887
|
@ -1 +1,5 @@
|
|||
.*
|
||||
pad/__init__.pyc
|
||||
pad/ir_attachment.pyc
|
||||
pad/res_company.pyc
|
||||
web_etherpad
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
|
|
|
@ -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;
|
||||
}
|
|
@ -0,0 +1,4 @@
|
|||
openerp.web_etherpad = function (instance) {
|
||||
|
||||
|
||||
}
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- vim:fdl=1:
|
||||
-->
|
||||
<templates id="template" xml:space="preserve">
|
||||
|
||||
|
||||
|
||||
|
||||
</templates>
|
Loading…
Reference in New Issue