+
+
+
+ +
No blog post yet.
+ ++ Click on "Content" on the top menu to write your first blog post. +
+
-
+
-
-
- 
-
-
-
-
- - OpenERP's Point of Sale introduces a super clean - interface with no installation required that runs - online and offline on modern hardwares. -
- It's full integration with the company inventory - and accounting, gives you real time statistics - without the hassle of integrating several applications. -
-+ Emails are broken. +
+ Emails make me waste my time. But I need them. + Given the importance that emails have in our lives, + it's incredible it's still one of the only software + areas that did not evolve in the past 20 years! +
+ Reading my inbox is the most unproductive task I do + on a daily basis. I have to spend one full hour a + day to process my emails. All the junk flows in the + same inbox; spams, information that doesn't matter, + quoted answers of quoted answers, etc. At the end + of the hour, only 10 emails actually requested an + answer from me. With a good tool, I could have done + my job in 10 minutes! +
-
+
-
-
-
- - Linked with Project Management -
-Infinitely flexible. Incredibly easy to use.
-
-
- - OpenERP's collaborative and realtime project - management helps your team get work done. Keep - track of everything, from the big picture to the - minute details, from the customer contract to the - billing. -
- Organize projects around your own processes. Work - on tasks and issues using the kanban view, schedule - tasks using the gantt chart and control deadlines - in the calendar view. Every project may have it's - own stages allowing teams to optimize their job. -
-+ At OpenERP, we build tools to bring productivity to + enterprises. As emails and information flows are one of + the biggest wastes of time in companies, we have to fix + this. +
+ To disrupt emails, you need more than just another user + interface. We need to rethink the whole communication flow. +
+The Communication Mechanism of OpenERP
++ Here are the ideas behing the OpenERP communication tools: +
+-
+
-
+ Get Things Done: your inbox is a
+ todo list. You should be able to process (not only
+ read) the inbox and easily mark messages for future
+ actions. Every inbox should be empty after having
+ been processed; no more overload of information.
+
+ - + Keep control of what you want to receive or don't want + to receive. People should never receive spam. You + should follow/unfollow any kind of information in one + click. +
-
+ Productivity is key: our smart user
+ interface does not require you to click on every mail
+ to read a thread. Reading a full thread, replying,
+ attaching documents is super fast.
+
+ -
+ A mix of push & pull: Today, people
+ are victims of what others decide to push to them.
+ OpenERP differentiates:
+
-
+
- + Messages "for information": + you can pull them when you need some specific + information; they are not required to be read + every day.You receive only what you decided + to follow.This accounts for 90% of your daily + emails.Use the "Inbox" menu for these. +
- + Messages "for action": they + require your immediate attention and you need + to process them all. This accounts for 10% + of your daily emails. Use the "To: me" menu + for these. + +
- + Focus on the Content: Everything is + stripped to emphasize on the real message. No more + welcome introductions, greetings, signatures and legal + notes.We standardize the layout of each message. + (signatures are on the profile of a contact, not in + every message) +
- + Folders and mailing lists are great tools but too + complex in traditional email clients. In OpenERP, a + group of contacts that share a discussion can be + created with one click. Every group should have it's + own email address. + +
-
-
-
-
-
- Work with the hardware you already have...
-
- 
-
-
-
-
- - No installation required -
-- OpenERP's Point of Sale introduces a super clean - interface with no installation required that runs - online and offline on modern hardware. Laptops, - tablets, industrial POS, it runs on everything. -
- -
-
-
-
-
-
-
-
-
-
-
- - New Features Launched -
-- OpenERP's Point of Sale introduces a super clean - interface with no installation required that runs - online and offline on modern hardware. Laptops, - tablets, industrial POS, it runs on everything. -
-
-
-
-
-
-
-
- Our Offers
-
-
-
-
-
-
-
- Beginner
-- Starter package -
-
-
-
-
- $450.00
-per month
- -
-
- Battery: 8 hours -
- Screen: 2.5 inch -
- Weight: 1.1 ounces -
- No support -
-
-
-
-
-
-
- Professional
-- Enterprise package -
-
-
-
-
- $590.00
-per month
- -
-
- Battery: 12 hours -
- Screen: 2.8 inch -
- Weight: 1.2 ounces -
- Limited support -
-
-
-
-
-
-
-
- Expert
-- The top of the top -
-
-
-
-
- $890.00
-per month
- -
-
- Battery: 20 hours -
- Screen: 2.8 inch -
- Weight: 1.2 ounces -
- Unlimited support -
.png)
-Here's a summary of its main features and benefits:
--
-
- 100% WEB based -
- available for any touchscreen device (ipod, ipad, any tablet)mobile (with portable devices) -
- no installation required -
- no synchronization needed, completely integrated -
- continue working even when your connection is down or if you close your browser, data won't be lost -
- fully web based with a clean interface smart interface -
You have different options to select your products. You can do it through the -barcode reader, just browse through the categories you have put in place (ie. -drinks, snacks, meals, etc.), or text search in case neither of the other -options work for you. For example, if you need to use the POS for your restaurant, -your employees can record multiple tickets at the same time without having to wait -to process one transaction at a time. In addition, you can facilitate payments, -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. -
-]]> -
- /website_blog/static/src/img/post2.jpg
+
+
+
-
+
]]>
-
-
diff --git a/addons/website_blog/doc/blog_blog.rst b/addons/website_blog/doc/blog_blog.rst
new file mode 100644
index 00000000000..8c5f80ab8e4
--- /dev/null
+++ b/addons/website_blog/doc/blog_blog.rst
@@ -0,0 +1,20 @@
+_blog_blog:
+
+blog.blog
+=========
+In ``blog.blog``, added field ``subtitle`` which Indicates the subtitle of blogs.
+ - ``subtitle``: fields.char('Blog Subtitle')
+
+mail.message
+============
+In ``mail.message``, added field ``discussion`` which Indicates the unique identification
+of paragraph on blog post.
+ - ``discussion``: fields.char('Discussion Unique Name')
+
+blog.post
+=========
+Fields
+++++++
+ - ``sub_title`` : contains the subtitle of every blog post.
+ - ``visits`` : Indicates the number of visits on evry blog post.
+ - ``ranking`` : Indicates the ranking on every blog post.
diff --git a/addons/website_blog/doc/changelog.rst b/addons/website_blog/doc/changelog.rst
index 8b6131b5806..42f2fd7e170 100644
--- a/addons/website_blog/doc/changelog.rst
+++ b/addons/website_blog/doc/changelog.rst
@@ -7,3 +7,29 @@ Changelog
----------------
- created ``website_blog`` menu, build on defunct document_page module.
+ - added new feature ``Inline Discussion`` , that will allow a user to comment
+ on every paragraph on blog post
+ - added new feature ``Select to Tweet``, that will alllow a user tweet a selected
+ text from blog to post , directly on twitter.
+
+
+
+WebsiteBlog(controller)
+=======================
+Methods
++++++++
+ - ``blog`` : remove routing related to date.
+ - ``blog_post`` : updated with , suggestion of next post to the user based on
+ cookie and number of views.
+ - ``discussion`` : added method , contains a detail of discussion on every paragraph,
+ if count is true it only return len of ids else return full detail.
+ def discussion(self, post_id=0, discussion=None, count=False, **post)
+ - ``post_discussion`` : added methodt, that allow to post discussion on any paragraph.
+ def post_discussion(self, blog_post_id=0, **post)
+ - ``change_bg`` : added method allow a user to change background image on blog
+ post from front-end.
+ def change_bg(self, post_id=0, image=None, **post)
+ - ``get_user`` : added method , that will return True if user is public else False.
+ def get_user(self, **post):
+ return [False if request.session.uid else True]
+
diff --git a/addons/website_blog/doc/controller.rst b/addons/website_blog/doc/controller.rst
new file mode 100644
index 00000000000..727368aab8c
--- /dev/null
+++ b/addons/website_blog/doc/controller.rst
@@ -0,0 +1,21 @@
+.. _controller:
+
+WebsiteBlog(controller)
+=======================
+Methods
++++++++
+ - ``blog`` : remove routing related to date.
+ - ``blog_post`` : updated with , suggestion of next post to the user based on
+ cookie and number of views.
+ - ``discussion`` : added method , contains a detail of discussion on every paragraph,
+ if count is true it only return len of ids else return full detail.
+ def discussion(self, post_id=0, discussion=None, count=False, **post)
+ - ``post_discussion`` : added methodt, that allow to post discussion on any paragraph.
+ def post_discussion(self, blog_post_id=0, **post)
+ - ``change_bg`` : added method allow a user to change background image on blog
+ post from front-end.
+ def change_bg(self, post_id=0, image=None, **post)
+ - ``get_user`` : added method , that will return True if user is public else False.
+ def get_user(self, **post):
+ return [False if request.session.uid else True]
+
diff --git a/addons/website_blog/models/__init__.py b/addons/website_blog/models/__init__.py
index fb5368a71c5..083e1ef6660 100644
--- a/addons/website_blog/models/__init__.py
+++ b/addons/website_blog/models/__init__.py
@@ -1 +1,2 @@
+import mail_message
import website_blog
diff --git a/addons/website_blog/models/mail_message.py b/addons/website_blog/models/mail_message.py
new file mode 100644
index 00000000000..e1b60f6ad20
--- /dev/null
+++ b/addons/website_blog/models/mail_message.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+from openerp.osv import osv, fields
+
+
+class MailMessage(osv.Model):
+ _inherit = 'mail.message'
+
+ _columns = {
+ 'path': fields.char(
+ 'Discussion Path', select=1,
+ help='Used to display messages in a paragraph-based chatter using a unique path;'),
+ }
diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py
index e132e4c5e15..031856fff10 100644
--- a/addons/website_blog/models/website_blog.py
+++ b/addons/website_blog/models/website_blog.py
@@ -1,32 +1,15 @@
# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-Today OpenERP SA ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see
+
+
+
+
+
+
+
+
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 1fd1d7adfa9..fa6c6af53c6 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -21,21 +21,17 @@
-
+
- 
-
-
-
-
- - We are proud to announce a new partnership with - the company OpenERP. Their open source application suite - will allow us to reach new markets, specifically in - the accounting area. -
- The full integration with the company inventory - and accounting, will give our customers real time statistics - without the hassle of integrating several applications. -
-
+ 
+
+
+
+
- + New Features Launched +
++ To add to an already comprehensive set of OpenERP + features, a website content management system (CMS + or WMS) has been developed and a beta release is + available from today, 31st January 2014. +
-
+
-
-
-
- - OpenERP Project Management -
-Infinitely flexible. Incredibly easy to use.
-
-
- - OpenERP's collaborative and realtime project - management helps your team get work done. Keep - track of everything, from the big picture to the - minute details, from the customer contract to the - billing. -
- Organize projects around your own processes. Work - on tasks and issues using the kanban view, schedule - tasks using the gantt chart and control deadlines - in the calendar view. Every project may have it's - own stages allowing teams to optimize their job. -
-+ OpenERP claims to be 'the Open Source software that makes + building your company's website and selling your products + online easy'. So how true is this statement? +
+ "OpenERP's latest launch will allow a business to go from + zero to trading online quicker than ever before,” Stuart + Mackintosh, MD of Open Source specialist and OpenERP + integration partner, OpusVL, explains. “The investment + required to have a fully automated business system is + dramatically reduced, enabling the small and medium + enterprise to compete at a level of functionality and + performance previously reserved for the big IT investors." +
++++ "Finally, the leading edge is being brought to the masses. + It will now be the turn of the big players to catch up to + the superior technologies of the SME." +
+
+ "This is another clever and highly disruptive move by + OpenERP,which will force other technology providers to + take another look at the value they are providing to ensure + that their 'solutions' can still compete." +
+ "OpenERP now competes on many fronts, with no real + competition out there to knock them off the top spot. + With the launch of their integrated CMS and Ecommerce + systems,it only elevates their position as one of the leading + lights in the open source revolution. It will be at least 5 + years before another ERP or CMS provider will be able to + compete at this level due to the technology currently + employed by most industry providers." +
+Adding to industry leading technology
++ Like many modern website editors, with OpenERP you can edit + content in-line, enabling you to see exactly what you are + changing and ensure your changes suit the context. +
+ However, unlike other web content management systems, it + fully integrates into the back-end database. This means + that when you edit a product description, image or price, + it updates the product database in real time, providing a + true self-service window into the business. +
+ This provides a single source of data for your company and + removes the need to create offline synchronisation between + website and product database. +
+ As it comes, there is a default website based on Bootstrap + 3, the latest industry standard for rapid development of + multi-device websites backed by Twitter, so can be directly + integrated with many web tools and works across all devices + by default. +
') and html.endswith('
'):
+ html = html[5:-6]
+ return html, mapping
+
+ def _postproces_content(self, cr, uid, id, content=None, context=None):
+ if content is None:
+ content = self.browse(cr, uid, id, context=context).content
+ if content is False:
+ return content
+ content, mapping = self.html_tag_nodes(content, attribute='data-chatter-id', tags=['p'], context=context)
+ for old_attribute, new_attribute in mapping:
+ if not old_attribute:
+ continue
+ msg_ids = self.pool['mail.message'].search(cr, SUPERUSER_ID, [('path', '=', old_attribute)], context=context)
+ self.pool['mail.message'].write(cr, SUPERUSER_ID, msg_ids, {'path': new_attribute}, context=context)
+ return content
+
def create_history(self, cr, uid, ids, vals, context=None):
for i in ids:
history = self.pool.get('blog.post.history')
@@ -163,12 +173,16 @@ class BlogPost(osv.Model):
def create(self, cr, uid, vals, context=None):
if context is None:
context = {}
+ if 'content' in vals:
+ vals['content'] = self._postproces_content(cr, uid, None, vals['content'], context=context)
create_context = dict(context, mail_create_nolog=True)
post_id = super(BlogPost, self).create(cr, uid, vals, context=create_context)
self.create_history(cr, uid, [post_id], vals, context)
return post_id
def write(self, cr, uid, ids, vals, context=None):
+ if 'content' in vals:
+ vals['content'] = self._postproces_content(cr, uid, None, vals['content'], context=context)
result = super(BlogPost, self).write(cr, uid, ids, vals, context)
self.create_history(cr, uid, ids, vals, context)
return result
@@ -183,10 +197,6 @@ class BlogPost(osv.Model):
})
return super(BlogPost, self).copy(cr, uid, id, default=default, context=context)
- def img(self, cr, uid, ids, field='image_small', context=None):
- post = self.browse(cr, SUPERUSER_ID, ids[0], context=context)
- return "/website/image?model=%s&field=%s&id=%s" % ('res.users', field, post.create_uid.id)
-
class BlogPostHistory(osv.Model):
_name = "blog.post.history"
@@ -215,5 +225,3 @@ class BlogPostHistory(osv.Model):
raise osv.except_osv(_('Warning!'), _('There are no changes in revisions.'))
diff = difflib.HtmlDiff()
return diff.make_table(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=True)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_blog/static/lib/contentshare.js b/addons/website_blog/static/lib/contentshare.js
new file mode 100644
index 00000000000..9bfda158703
--- /dev/null
+++ b/addons/website_blog/static/lib/contentshare.js
@@ -0,0 +1,63 @@
+(function(){
+ $.fn.share = function(options) {
+ var option = $.extend($.fn.share.defaults,options);
+ $.extend($.fn.share,{
+ init : function(shareable) {
+ var self = this;
+ $.fn.share.defaults.shareable = shareable;
+ $.fn.share.defaults.shareable.on('mouseup',function(){
+ self.popOver();
+ });
+ $.fn.share.defaults.shareable.on('mousedown',function(){
+ self.destroy();
+ });
+ },
+ getContent : function() {
+ var current_url = window.location.href
+ var selected_text = this.getSelection('string').substring(0,option.maxLength-(current_url.length+option.author_name.length+7));
+ var text = encodeURIComponent('\"'+selected_text+'\" '+'--@'+option.author_name+' '+current_url)
+ return '';
+ },
+ getSelection : function(share) {
+ if(window.getSelection){
+ return (share=='string')?String(window.getSelection().getRangeAt(0)).replace(/\s{2,}/g, ' '):window.getSelection().getRangeAt(0);
+ }
+ else if(document.selection){
+ return (share=='string')?document.selection.createRange().text.replace(/\s{2,}/g, ' '):document.selection.createRange();
+ }
+ },
+ popOver : function() {
+ this.destroy();
+ if(this.getSelection('string').length < option.minLength)
+ return;
+ var data = this.getContent();
+ var range = this.getSelection();
+ var newNode = document.createElement("mark");
+ range.surroundContents(newNode);
+ $('mark').addClass(option.className);
+ $('.'+option.className).popover({trigger:'manual', placement: option.placement, html: true
+ , content:function(){
+ return data;
+ }
+ });
+ $('.'+option.className).popover('show');
+ },
+ destroy : function(){
+ $('.'+option.className).popover('hide');
+ $('mark').contents().unwrap();
+ $('mark').remove();
+ }
+ });
+ $.fn.share.init(this);
+ };
+
+ $.fn.share.defaults = {
+ shareLink : "http://twitter.com/intent/tweet?text=",
+ minLength : 5,
+ maxLength : 140,
+ target : "blank",
+ className : "share",
+ placement : "top",
+ };
+
+}());
diff --git a/addons/website_blog/static/src/css/website_blog.css b/addons/website_blog/static/src/css/website_blog.css
index f7355ce783d..9097e3af31f 100644
--- a/addons/website_blog/static/src/css/website_blog.css
+++ b/addons/website_blog/static/src/css/website_blog.css
@@ -9,6 +9,12 @@
display: block;
}
+.read_width {
+ max-width: 700px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
.blog_content a.oe_mail_expand:after {
content: " →";
}
@@ -20,3 +26,127 @@ p.post-meta {
position: relative;
top: -5px;
}
+
+div#blog_angle_down a:hover {
+ text-decoration: none;
+}
+
+.cover {
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+ -o-background-size: cover;
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+ background-color: black;
+ color: white;
+ position: relative;
+}
+.cover .blog_title {
+ position: absolute;
+ text-align: center;
+ top: 20%;
+ left: 0;
+ right: 0;
+}
+.cover .blog_title h1 {
+ font-weight: bold;
+}
+
+.cover_footer {
+ min-height: 350px;
+ height: 65vh;
+ cursor: pointer;
+}
+
+/*Inline Discussion */
+.discussion {
+ padding: 5px 10px 10px;
+ position: absolute;
+ top: 0;
+ left: 0;
+ line-height: 16px;
+ font-size: 13px;
+ font-weight: bold;
+ font-family: sans-serif;
+ text-align: center;
+ z-index: 7;
+}
+.discussion > a {
+ opacity: 0;
+ display: block;
+ overflow: hidden;
+ width: 20px;
+ height: 17px;
+ color: white;
+ text-decoration: none;
+ cursor: pointer;
+ background: #bbbbbb;
+ -webkit-border-radius: 2px;
+ -moz-border-radius: 2px;
+ -ms-border-radius: 2px;
+ -o-border-radius: 2px;
+ border-radius: 2px;
+ -webkit-transition: all 0.5s;
+ -moz-transition: all 0.5s;
+ -o-transition: all 0.5s;
+ transition: all 0.5s;
+}
+.discussion > a.has-comments {
+ opacity: 0.6;
+}
+
+.discussion-contain:hover .discussion > a {
+ opacity: 1;
+}
+
+.discussion > a:after {
+ border-right: 7px solid transparent;
+ border-top: 7px solid #bbbbbb;
+ right: 19px;
+ top: 22px;
+ height: 0;
+ width: 0;
+ display: block;
+ content: " ";
+ position: absolute;
+ -webkit-transition: all 0.5s;
+ -moz-transition: all 0.5s;
+ -o-transition: all 0.5s;
+ transition: all 0.5s;
+}
+.discussion:hover > a, .discussion.hovered > a {
+ opacity: 1;
+ background: #57ad68;
+}
+.discussion:hover > a:after, .discussion.hovered > a:after {
+ border-top-color: #57ad68;
+}
+
+#discussions_wrapper {
+ position: absolute;
+ top: 0;
+ left: 0;
+}
+
+#discussions_overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0, 0, 0, 0.5);
+ z-index: 8;
+ display: none;
+}
+
+.discussion .popover-content {
+ max-height: 250px;
+ width: 250px;
+ overflow: auto;
+ font-weight: normal;
+}
+
+mark + .popover {
+ cursor: pointer;
+}
diff --git a/addons/website_blog/static/src/css/website_blog.sass b/addons/website_blog/static/src/css/website_blog.sass
index 4691dde83c2..6342c6b99a2 100644
--- a/addons/website_blog/static/src/css/website_blog.sass
+++ b/addons/website_blog/static/src/css/website_blog.sass
@@ -1,5 +1,4 @@
@charset "utf-8"
-
@import "compass/css3"
.css_website_mail
@@ -10,6 +9,11 @@
&:first-of-type
display: block
+.read_width
+ max-width: 700px
+ margin-left: auto
+ margin-right: auto
+
.blog_content
a.oe_mail_expand:after
content: " →"
@@ -20,3 +24,113 @@ p.post-meta
position: relative
top: -5px
+div#blog_angle_down
+ a:hover
+ text-decoration: none
+
+.cover
+ -webkit-background-size: cover
+ -moz-background-size: cover
+ -o-background-size: cover
+ background-size: cover
+ background-position: center
+ background-repeat: no-repeat
+ background-color: #000
+ color: #fff
+ position: relative
+ .blog_title
+ position: absolute
+ text-align: center
+ top: 20%
+ left: 0
+ right: 0
+ h1
+ font-weight: bold
+
+.cover_footer
+ min-height : 350px
+ height: 65vh
+ cursor: pointer
+
+/*Inline Discussion
+
+.discussion
+ padding: 5px 10px 10px
+ position: absolute
+ top: 0
+ left: 0
+ line-height: 16px
+ font-size: 13px
+ font-weight: bold
+ font-family: sans-serif
+ text-align: center
+ z-index: 7
+ > a
+ opacity: 0
+ display: block
+ overflow: hidden
+ width: 20px
+ height: 17px
+ color: white
+ text-decoration: none
+ cursor: pointer
+ background: #bbbbbb
+ -webkit-border-radius: 2px
+ -moz-border-radius: 2px
+ -ms-border-radius: 2px
+ -o-border-radius: 2px
+ border-radius: 2px
+ -webkit-transition: all 0.5s
+ -moz-transition: all 0.5s
+ -o-transition: all 0.5s
+ transition: all 0.5s
+ &.has-comments
+ opacity: .6
+
+.discussion-contain:hover .discussion > a
+ opacity: 1
+
+.discussion
+ > a:after
+ border-right: 7px solid transparent
+ border-top: 7px solid #bbbbbb
+ right: 19px
+ top: 22px
+ height: 0
+ width: 0
+ display: block
+ content: " "
+ position: absolute
+ -webkit-transition: all 0.5s
+ -moz-transition: all 0.5s
+ -o-transition: all 0.5s
+ transition: all 0.5s
+ &:hover > a, &.hovered > a
+ opacity: 1
+ background: #57AD68
+ &:hover > a:after, &.hovered > a:after
+ border-top-color: #57AD68
+
+#discussions_wrapper
+ position: absolute
+ top: 0
+ left: 0
+
+#discussions_overlay
+ position: fixed
+ top: 0
+ left: 0
+ right: 0
+ bottom: 0
+ background: rgba(0, 0, 0, 0.5)
+ z-index: 8
+ display: none
+
+.discussion .popover-content
+ max-height: 250px
+ width: 250px
+ overflow: auto
+ font-weight: normal
+
+mark + .popover
+ cursor: pointer
diff --git a/addons/website_blog/static/src/img/CMS_WMS_screens.jpg b/addons/website_blog/static/src/img/CMS_WMS_screens.jpg
new file mode 100644
index 00000000000..08fc4aafc41
Binary files /dev/null and b/addons/website_blog/static/src/img/CMS_WMS_screens.jpg differ
diff --git a/addons/website_blog/static/src/img/anonymous.png b/addons/website_blog/static/src/img/anonymous.png
new file mode 100644
index 00000000000..6461bf735f1
Binary files /dev/null and b/addons/website_blog/static/src/img/anonymous.png differ
diff --git a/addons/website_blog/static/src/img/mail-sc-00.png b/addons/website_blog/static/src/img/mail-sc-00.png
new file mode 100644
index 00000000000..dbb14b4da36
Binary files /dev/null and b/addons/website_blog/static/src/img/mail-sc-00.png differ
diff --git a/addons/website_blog/static/src/img/mail-sc-03.png b/addons/website_blog/static/src/img/mail-sc-03.png
new file mode 100644
index 00000000000..3011ef129b5
Binary files /dev/null and b/addons/website_blog/static/src/img/mail-sc-03.png differ
diff --git a/addons/website_blog/static/src/img/post1.jpg b/addons/website_blog/static/src/img/post1.jpg
new file mode 100644
index 00000000000..f3e3aa852a6
Binary files /dev/null and b/addons/website_blog/static/src/img/post1.jpg differ
diff --git a/addons/website_blog/static/src/img/post2.jpg b/addons/website_blog/static/src/img/post2.jpg
new file mode 100644
index 00000000000..8f6002a40db
Binary files /dev/null and b/addons/website_blog/static/src/img/post2.jpg differ
diff --git a/addons/website_blog/static/src/js/website_blog.editor.js b/addons/website_blog/static/src/js/website_blog.editor.js
index 1c5deef56f7..103b2bee1e7 100644
--- a/addons/website_blog/static/src/js/website_blog.editor.js
+++ b/addons/website_blog/static/src/js/website_blog.editor.js
@@ -27,7 +27,38 @@
}).then(function (cat_id) {
document.location = '/blogpost/new?blog_id=' + cat_id;
});
- }
+ },
}),
+ edit: function () {
+ $('.popover').remove();
+ this._super();
+ var vHeight = $(window).height();
+ $('body').on('click','#change_cover',_.bind(this.change_bg,{},vHeight));
+ $('body').on('click', '#clear_cover',_.bind(this.clean_bg,{},vHeight));
+ },
+ save : function() {
+ var res = this._super();
+ if ($('.cover').length) {
+ openerp.jsonRpc("/blogpost/change_background", 'call', {
+ 'post_id' : $('#blog_post_name').attr('data-oe-id'),
+ 'image' : $('.cover').css('background-image').replace(/url\(|\)|"|'/g,''),
+ });
+ }
+ return res;
+ },
+ clean_bg : function(vHeight) {
+ $('.js_fullheight').css({"background-image":'none', 'min-height': vHeight});
+ },
+ change_bg : function(vHeight) {
+ var self = this;
+ var editor = new website.editor.ImageDialog();
+ editor.on('start', self, function (o) {
+ o.url = $('.js_fullheight').length ? $('.js_fullheight').css('background-image').replace(/url\(|\)|"|'/g,'') : '';
+ });
+ editor.on('save', self, function (o) {
+ $('.js_fullheight').css({"background-image": o.url && o.url !== "" ? 'url(' + o.url + ')' : "", 'min-height': vHeight})
+ });
+ editor.appendTo('body');
+ },
});
})();
diff --git a/addons/website_blog/static/src/js/website_blog.inline.discussion.js b/addons/website_blog/static/src/js/website_blog.inline.discussion.js
new file mode 100644
index 00000000000..56851c3939c
--- /dev/null
+++ b/addons/website_blog/static/src/js/website_blog.inline.discussion.js
@@ -0,0 +1,199 @@
+// Inspired from https://github.com/tsi/inlineDisqussions
+(function () {
+
+ 'use strict';
+
+ var website = openerp.website,
+ qweb = openerp.qweb;
+ website.add_template_file('/website_blog/static/src/xml/website_blog.inline.discussion.xml');
+ website.blog_discussion = openerp.Class.extend({
+ init: function(options) {
+ var self = this ;
+ self.discus_identifier;
+ var defaults = {
+ position: 'right',
+ post_id: $('#blog_post_name').attr('data-blog-id'),
+ content : false,
+ public_user: false,
+ };
+ self.settings = $.extend({}, defaults, options);
+ self.do_render(self);
+ },
+ do_render: function(data) {
+ var self = this;
+ if ($('#discussions_wrapper').length === 0 && self.settings.content.length > 0) {
+ $('').insertAfter($('#blog_content'));
+ }
+ // Attach a discussion to each paragraph.
+ $(self.settings.content).each(function(i) {
+ self.discussion_handler(i, $(this));
+ });
+ // Hide the discussion.
+ $('html').click(function(event) {
+ if($(event.target).parents('#discussions_wrapper, .main-discussion-link-wrp').length === 0) {
+ self.hide_discussion();
+ }
+ if(!$(event.target).hasClass('discussion-link') && !$(event.target).parents('.popover').length){
+ if($('.move_discuss').length){
+ $('[enable_chatter_discuss=True]').removeClass('move_discuss');
+ $('[enable_chatter_discuss=True]').animate({
+ 'marginLeft': "+=40%"
+ });
+ $('#discussions_wrapper').animate({
+ 'marginLeft': "+=250px"
+ });
+ }
+ }
+ });
+ },
+ prepare_data : function(identifier, comment_count) {
+ var self = this;
+ return openerp.jsonRpc("/blogpost/get_discussion/", 'call', {
+ 'post_id': self.settings.post_id,
+ 'path': identifier,
+ 'count': comment_count, //if true only get length of total comment, display on discussion thread.
+ })
+ },
+ discussion_handler : function(i, node) {
+ var self = this;
+ var identifier = node.attr('data-chatter-id');
+ if (identifier) {
+ self.prepare_data(identifier, true).then( function (data) {
+ self.prepare_discuss_link(data, identifier, node);
+ });
+ }
+ },
+ prepare_discuss_link : function(data, identifier, node) {
+ var self = this;
+ var cls = data > 0 ? 'discussion-link has-comments' : 'discussion-link';
+ var a = $('')
+ .attr('data-discus-identifier', identifier)
+ .attr('data-discus-position', self.settings.position)
+ .text(data > 0 ? data : '+')
+ .attr('data-contentwrapper', '.mycontent')
+ .wrap('')
+ .parent()
+ .appendTo('#discussions_wrapper');
+ a.css({
+ 'top': node.offset().top,
+ 'left': self.settings.position == 'right' ? node.outerWidth() + node.offset().left: node.offset().left - a.outerWidth()
+ });
+ // node.attr('data-discus-identifier', identifier)
+ node.mouseover(function() {
+ a.addClass("hovered");
+ }).mouseout(function() {
+ a.removeClass("hovered");
+ });
+
+ a.delegate('a.discussion-link', "click", function(e) {
+ e.preventDefault();
+ if(!$('.move_discuss').length){
+ $('[enable_chatter_discuss=True]').addClass('move_discuss');
+ $('[enable_chatter_discuss=True]').animate({
+ 'marginLeft': "-=40%"
+ });
+ $('#discussions_wrapper').animate({
+ 'marginLeft': "-=250px"
+ });
+ }
+ if ($(this).is('.active')) {
+ e.stopPropagation();
+ self.hide_discussion();
+ }
+ else {
+ self.get_discussion($(this), function(source) {});
+ }
+ });
+ },
+ get_discussion : function(source, callback) {
+ var self = this;
+ var identifier = source.attr('data-discus-identifier');
+ self.hide_discussion();
+ self.discus_identifier = identifier;
+ var elt = $('a[data-discus-identifier="'+identifier+'"]');
+ elt.append(qweb.render("website.blog_discussion.popover", {'identifier': identifier , 'options': self.settings}));
+ var comment = '';
+ self.prepare_data(identifier,false).then(function(data){
+ _.each(data, function(res){
+ comment += qweb.render("website.blog_discussion.comment", {'res': res});
+ });
+ $('.discussion_history').html('- '+comment+'
+ ![]()
+
+
+
+
+
+
+
+
+ by
+
+
+
+
-
-
+
pull-right
@@ -93,55 +89,80 @@
-
-
-
+
+
-
-
+
-
-
-
- By
-
-
-
-
+
-
+
-
-
-
-
- - This page is great to improve your Search Engine Optimization; - You can review titles, keywords and descriptions of all blogs at once. -
- You should add a banner on the top as it is a frequent landing page for new visitors. - This box will not be visible to your visitors. -
-
+
+
+ This page is great to improve your Search Engine Optimization; + You can review titles, keywords and descriptions of all blogs at once. +
+ You should add a banner on the top as it is a frequent landing page for new visitors. + This box will not be visible to your visitors. +
+
-
-
-
-
-
- -
No blog post yet.
- -Click on "Content" on the top menu to write your first blog post.
-
+
+
+
+
+
+
+
+ pull-right
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
- on -
- -Read Next
+