Merge branch 'master-branding' into 'master'

[IMP] comment branding code of power by

See merge request flectra-hq/flectra!18
This commit is contained in:
FlectraHQ Admin 2018-01-30 11:24:49 +00:00
commit 5fab9ebbbe
11 changed files with 19 additions and 14 deletions

View File

@ -126,11 +126,11 @@ from ${object.company_id.name}.
</table> </table>
</td> </td>
</tr> </tr>
<tr> <!-- <tr>
<td align="center"> <td align="center">
Powered by <a target="_blank" href="https://www.flectra.com">Flectra</a>. Powered by <a target="_blank" href="https://www.flectra.com">Flectra</a>.
</td> </td>
</tr> </tr> -->
</tbody> </tbody>
</table> </table>
</div></field> </div></field>

View File

@ -78,9 +78,9 @@
</table> </table>
</td> </td>
</tr> </tr>
<tr> <!-- <tr>
<td align="center">Powered by <a href="https://www.flectra.com">Flectra</a>.</td> <td align="center">Powered by <a href="https://www.flectra.com">Flectra</a>.</td>
</tr> </tr> -->
</tbody> </tbody>
</table> </table>
</field> </field>

View File

@ -243,11 +243,12 @@
</table> </table>
</td> </td>
</tr> </tr>
<!--
<tr> <tr>
<td align="center"> <td align="center">
Powered by <a target="_blank" href="https://www.flectra.com">Flectra</a>. Powered by <a target="_blank" href="https://www.flectra.com">Flectra</a>.
</td> </td>
</tr> </tr> -->
</table> </table>
</td></tr> </td></tr>
</table> </table>

View File

@ -83,7 +83,7 @@
<body> <body>
<div class="main" style="opacity: 1;"> <div class="main" style="opacity: 1;">
<h1 class="channel_name"><t t-esc="channel.name"/></h1> <h1 class="channel_name"><t t-esc="channel.name"/></h1>
<div>Website Live Chat Powered by <strong>Flectra</strong>.</div> <!-- <div>Website Live Chat Powered by <strong>Flectra</strong>.</div> -->
</div> </div>
</body> </body>
</html> </html>

View File

@ -70,7 +70,7 @@
View <t t-esc="object._description.lower()"/> View <t t-esc="object._description.lower()"/>
</a> </a>
</p> </p>
<p style="color:#9E588B;">Powered by <a target="_blank" href="https://www.flectra.com">Flectra</a>.</p> <!-- <p style="color:#9E588B;">Powered by <a target="_blank" href="https://www.flectra.com">Flectra</a>.</p> -->
</template> </template>
<template id="message_activity_done"> <template id="message_activity_done">

View File

@ -144,11 +144,13 @@ from ${object.company_id.name}.
</table> </table>
</td> </td>
</tr> </tr>
<!--
<tr> <tr>
<td align="center"> <td align="center">
Powered by <a href="https://www.flectra.com">Flectra</a>. Powered by <a href="https://www.flectra.com">Flectra</a>.
</td> </td>
</tr> </tr>
-->
</tbody> </tbody>
</table> </table>
</body> </body>

View File

@ -129,11 +129,13 @@ from ${object.company_id.name}.
</table> </table>
</td> </td>
</tr> </tr>
<!--
<tr> <tr>
<td align="center"> <td align="center">
Powered by <a target="_blank" href="https://www.flectra.com">Flectra</a>. Powered by <a target="_blank" href="https://www.flectra.com">Flectra</a>.
</td> </td>
</tr> </tr>
-->
</tbody> </tbody>
</table> </table>
</body> </body>

View File

@ -399,7 +399,7 @@
<t t-if="not disable_database_manager"> <t t-if="not disable_database_manager">
<a class="" href="/web/database/manager">Manage Databases</a> | <a class="" href="/web/database/manager">Manage Databases</a> |
</t> </t>
<a href="https://www.flectra.com" target="_blank">Powered by <span>Flectra</span></a> <!-- <a href="https://www.flectra.com" target="_blank">Powered by <span>Flectra</span></a> -->
</div> </div>
</div> </div>
</div> </div>

View File

@ -708,10 +708,10 @@
<template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright"> <template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
<xpath expr="//footer" position="inside"> <xpath expr="//footer" position="inside">
<div class="container mt16 mb8"> <div class="container mt16 mb8">
<div class="pull-right" t-ignore="true" t-if="not editable"> <!-- <div class="pull-right" t-ignore="true" t-if="not editable">
Powered by <a target="_blank" class="label label-danger" href="http://www.flectra.com/page/website-builder">Flectra</a>. Powered by <a target="_blank" class="label label-danger" href="http://www.flectra.com/page/website-builder">Flectra</a>.
Try the <a target="_blank" href="http://www.flectra.com/page/website-builder">open source website builder</a>. Try the <a target="_blank" href="http://www.flectra.com/page/website-builder">open source website builder</a>.
</div> </div> -->
<div class="pull-left text-muted"> <div class="pull-left text-muted">
Copyright &amp;copy; <span t-field="res_company.name">Company name</span> Copyright &amp;copy; <span t-field="res_company.name">Company name</span>
</div> </div>

View File

@ -644,10 +644,10 @@
<template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright"> <template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
<xpath expr="//footer" position="inside"> <xpath expr="//footer" position="inside">
<div class="container mt16 mb8"> <div class="container mt16 mb8">
<div class="pull-right" t-ignore="true" t-if="not editable"> <!-- <div class="pull-right" t-ignore="true" t-if="not editable">
Powered by <a target="_blank" class="label label-danger" href="http://www.flectra.com/page/website-builder">Flectra</a>, Powered by <a target="_blank" class="label label-danger" href="http://www.flectra.com/page/website-builder">Flectra</a>,
an awesome <a target="_blank" href="http://www.flectra.com/page/crm">Open Source CRM</a>. an awesome <a target="_blank" href="http://www.flectra.com/page/crm">Open Source CRM</a>.
</div> </div> -->
<div class="pull-left text-muted"> <div class="pull-left text-muted">
Copyright &amp;copy; <span t-field="res_company.name">Company name</span> Copyright &amp;copy; <span t-field="res_company.name">Company name</span>
</div> </div>

View File

@ -1679,10 +1679,10 @@
<template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright"> <template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
<xpath expr="//footer" position="inside"> <xpath expr="//footer" position="inside">
<div class="container mt16 mb8"> <div class="container mt16 mb8">
<div class="pull-right" t-ignore="true" t-if="not editable"> <!-- <div class="pull-right" t-ignore="true" t-if="not editable">
Powered by <a target="_blank" class="label label-danger" href="http://www.flectra.com/page/website-builder">Flectra</a>, Powered by <a target="_blank" class="label label-danger" href="http://www.flectra.com/page/website-builder">Flectra</a>,
the #1 <a target="_blank" href="http://www.flectra.com/page/e-commerce">Open Source eCommerce</a>. the #1 <a target="_blank" href="http://www.flectra.com/page/e-commerce">Open Source eCommerce</a>.
</div> </div> -->
<div class="pull-left text-muted"> <div class="pull-left text-muted">
Copyright &amp;copy; <span t-field="res_company.name">Company name</span></div> Copyright &amp;copy; <span t-field="res_company.name">Company name</span></div>
</div> </div>