odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Small layout improvements 

bzr revid: fp@tinyerp.com-20131105080743-jy5ee76500dhh923
This commit is contained in:
Fabien Pinckaers 2013-11-05 09:07:43 +01:00
parent 8cc6f4d3dd
commit 843e16e57e
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/website/static/src/css/editor.css
View File

@ -114,7 +114,7 @@ table.editorbar-panel td.selected {
.oe_translate_or {
color: white;
padding: 0 0.2em;
padding: 0 0 0 1em;
}
.oe_translate_examples li {

2
addons/website/static/src/css/editor.sass
View File

@ -108,7 +108,7 @@ table.editorbar-panel
// ---- TRANSLATIONS ---- {{{
.oe_translate_or
color: white
padding: 0 0.2em
padding: 0 0 0 1em
.oe_translate_examples li
margin: 10px
padding: 4px

18
addons/website/static/src/xml/website.editor.xml
View File

@ -39,22 +39,22 @@
<form>
<ul class="list-group">
<li class="list-group-item form-group active">
<h3 class="list-group-item-heading">
<h4 class="list-group-item-heading">
<label for="link-existing" class="control-label">
Existing page
</label>
</h3>
</h4>
<select class="existing form-control url-source"
id="link-existing">
<option/>
</select>
</li>
<li class="list-group-item form-group">
<h3 class="list-group-item-heading">
<h4 class="list-group-item-heading">
<label for="link-new" class="control-label">
New page
</label>
</h3>
</h4>
<input type="text" class="form-control pages url-source"
id="link-new" placeholder="Page Name"/>
</li>
@ -65,20 +65,20 @@
Open in new window
</label>
</div>
<h3 class="list-group-item-heading">
<h4 class="list-group-item-heading">
<label for="link-external" class="control-label">
External Website
URL
</label>
</h3>
</h4>
<input type="text" class="form-control url url-source"
id="link-external" placeholder="http://openerp.com"/>
</li>
<li class="list-group-item form-group">
<h3 class="list-group-item-heading">
<h4 class="list-group-item-heading">
<label for="link-email" class="control-label">
Email Address
</label>
</h3>
</h4>
<input type="email" class="form-control email-address url-source"
id="link-email" placeholder="you@yourwebsite.com"/>
</li>

2
addons/website/static/src/xml/website.seo.xml
View File

@ -32,7 +32,7 @@
<!-- filled in JS -->
</section>
<section>
<h3 class="page-header">2. Reference Your Page <small>using above suggestions</small></h3>
<h3 class="page-header">2. Reference Your Page <small>using above suggested keywords</small></h3>
<div class="form-horizontal mt16" role="form">
<div class="form-group">
<label for="seo_page_title" class="col-lg-2 control-label">Title</label>

4
addons/website/static/src/xml/website.translator.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<templates id="template" xml:space="preserve">
<t t-name="website.TranslatorAdditionalButtons">
<strong class="oe_translate_or">or</strong>
<a class="btn btn-default" data-action="edit_master" href="#">Edit Master</a>
<span class="oe_translate_or">or</span>
<a class="btn btn-link" data-action="edit_master" href="#">Edit Master</a>
</t>
<t t-name="website.TranslatorDialog">
<div class="modal fade oe_website_translator" tabindex="-1" role="dialog">

3
addons/website/views/website_templates.xml
View File

@ -138,7 +138,8 @@
<span class="caret"></span>
</a>
<ul class="dropdown-menu js_usermenu" role="menu">
<li><a href="/web" role="menuitem">Go to backend</a></li>
<li><a href="/web" role="menuitem">Administration</a></li>
<li class="divider"/>
<li><a t-attf-href="/web/session/logout?redirect=#{ url_for('') }" role="menuitem">Logout</a></li>
</ul>
</li>