diff --git a/addons/document_page/document_page_demo.xml b/addons/document_page/document_page_demo.xml
index 8d7b4cc4eb4..a7b5989427f 100644
--- a/addons/document_page/document_page_demo.xml
+++ b/addons/document_page/document_page_demo.xml
@@ -4,11 +4,27 @@
+
+ OpenERP Features
+ 10
+ category
+
+Summary of the feature
+
+Long explanation
+
+Conclusion
+
+Additional ressources
+
+
+
+
OpenERP 6.1. Functional Demo
- 6
- ==OpenERP 6.1. Functional Demo==
-
+
+
+
The news is out, OpenERP's latest version 6.1. is here.
It's more user-friendly, even more business oriented and efficient to manage your company
@@ -25,12 +41,12 @@ We have also put together a functional demo that presents 6.1. Watch this video
[[Video:http://www.youtube.com/embed/7jES2jxKMso ]]
-
+
Personalise Dashboards
- 7
- ==Personalise your OpenERP dashboards==
+
+
You like OpenERP, but feel like you want to personalise it more? Now, OpenERP goes a step further and lets you customize your dashboard.
How? you will ask. Thanks to a new feature that allows you to customize your dashboard by adding new boards of any search view.
@@ -57,12 +73,12 @@ In less than a minute, the search view is visible on the dashboard
Of course, you are free to delete what you don't need or like, but just in case you change your mind there is a reset button to return to the default view.
-
+
Touchscreen Point of Sale
- ==The new OpenERP touchscreen Point of Sale==
-
+
+
The brand new OpenERP touchscreen point of sale available with 6.1 allows you to manage your shop sales very easily.
It's fully web based so that you don't have to install or deploy any software and all the sales shops can be easily consolidated.
It works in connected and disconnected modes so that you can continue to sell if you lose your internet connection.
@@ -90,8 +106,8 @@ You have different options to select your products. You can do it through the ba
If you need to use the POS for your restaurant, for example, your employees can record at the same time multiple tickets without having to wait to do one transaction at a time. Along, to facilitate payment, the application allows multiple payment methods.
The POS application is so simple and accessible to use that your shop or restaurant will never need any other tool to manage orders. Due to its smart and user-friendly interface you don't need any training to learn how to use it. Think of it as an out-of-the-box solution to boost your business' productivity.
-
-
-
+
+
+
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index fe890c0c6b8..c54be43d226 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -40,11 +40,8 @@
form
diff --git a/addons/document_page/static/src/css/document_page.css b/addons/document_page/static/src/css/document_page.css
index e1229802f12..723ff8d9b11 100644
--- a/addons/document_page/static/src/css/document_page.css
+++ b/addons/document_page/static/src/css/document_page.css
@@ -2,8 +2,9 @@
display: none;
}
-.oe_document_page li {
- padding: 2px 0 2px 4px;
+.oe_document_page ul, .oe_document_page li {
+ padding: 2px 8px;
+ margin: 2px 8px;
list-style-type: circle;
}
diff --git a/addons/document_page/static/src/js/document_page.js b/addons/document_page/static/src/js/document_page.js
index bb98fbcd031..555a39d7796 100644
--- a/addons/document_page/static/src/js/document_page.js
+++ b/addons/document_page/static/src/js/document_page.js
@@ -1,7 +1,7 @@
openerp.document_page = function (openerp) {
- openerp.web.form.widgets.add( 'text_wiki', 'openerp.web.form.FieldText');
-
- openerp.web.form.FieldText = openerp.web.form.FieldText.extend({
+ openerp.web.form.widgets.add('text_wiki', 'openerp.web.form.FieldTextWiki');
+
+ openerp.web.form.FieldTextWiki = openerp.web.form.FieldText.extend({
render_value: function() {
var show_value = openerp.web.format_value(this.get('value'), this, '');
if (!this.get("effective_readonly")) {
@@ -9,8 +9,8 @@ openerp.document_page = function (openerp) {
if (show_value && this.view.options.resize_textareas) {
this.do_resize(this.view.options.resize_textareas);
}
- }else{
- var wiki_value = wiky.process(show_value || '');
+ } else {
+ var wiki_value = wiky.process(show_value || '');
this.$element.html(wiki_value);
}
},
diff --git a/addons/document_page/static/src/lib/wiky/autogit.sh b/addons/document_page/static/src/lib/wiky/autogit.sh
deleted file mode 100755
index 79f59a51a8f..00000000000
--- a/addons/document_page/static/src/lib/wiky/autogit.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-git add --all
-git commit -a -m "prototype changed"
-git pull
-git mergetool
-git push
diff --git a/addons/document_page/static/src/lib/wiky/jquery-1.4.2.min.js b/addons/document_page/static/src/lib/wiky/jquery-1.4.2.min.js
deleted file mode 100755
index 8060d0e5041..00000000000
--- a/addons/document_page/static/src/lib/wiky/jquery-1.4.2.min.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.2
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Feb 13 22:33:48 2010 -0500
- */
-(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
-Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
-(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
-a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
-"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
-function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b