Merge lp:~openerp-dev/openobject-addons/saas-3-bug-1275507-psa into lp:~openerp/openobject-addons/saas-3

[Paramjit Singh Sahota(OpenERP)]

Hello,

Fixed the issue "[Trunk] Website: Create a free website with OpenERP link not displayed when logged in as admin".

Thankz You.

[lp:~openerp-dev/openobject-addons/saas-3-bug-1275507-psa]

9087. By Niko (OpenERP) on 2014-02-28

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

Unmerged revisions

9109. By Paramjit Singh Sahota(OpenERP) on 2014-02-07

[FIX][Trunk] Website: Create a free website with OpenERP link not displayed when logged in as admin

=== modified file 'website/views/website_templates.xml'
--- website/views/website_templates.xml	2014-02-04 15:36:16 +0000
+++ website/views/website_templates.xml	2014-02-07 06:07:05 +0000
@@ -188,7 +188,7 @@
                         </div>
                     </div>
                     <div class="container mt16 mb8">
-                        <div class="pull-right" t-ignore="true" t-if="not editable">
+                        <div class="pull-right" t-ignore="true">
                             Create a <a href="http://openerp.com/apps/website">free website</a> with
                             <a class="label label-danger" href="https://openerp.com/apps/website">OpenERP</a>
                         </div>