[MERGE] style improvement by ahu
bzr revid: al@openerp.com-20111230105341-d26r8iaczoq1xx34
This commit is contained in:
Antony Lesuisse
commit
c1ffe4385f
|
|
@ -14,6 +14,7 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio
|
|||
|
||||
.openerp .view-manager-main-content {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
padding: 0 8px 8px 8px;
|
||||
}
|
||||
|
||||
|
|
@ -744,11 +745,14 @@ label.error {
|
|||
.openerp .oe_search-view-filters-management, .openerp .oe_search-view-custom-filter-btn {
|
||||
float:right;
|
||||
}
|
||||
|
||||
.openerp .searchview_extended_add_proposition {
|
||||
text-decoration: none;
|
||||
}
|
||||
.openerp .searchview_extended_add_proposition span {
|
||||
font-size: 0.9em;
|
||||
background: url(/web/static/src/img/icons/gtk-add.png) repeat-y;
|
||||
padding-left: 18px;
|
||||
color:#9A0404;
|
||||
}
|
||||
|
||||
.openerp .searchview_extended_delete_group {
|
||||
|
|
@ -919,6 +923,9 @@ label.error {
|
|||
font-weight: bold;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.openerp tfoot .oe-list-pager {
|
||||
padding:0 6px 8px 0;
|
||||
}
|
||||
.openerp .oe_button.oe_button_pager,
|
||||
.openerp .oe_button.oe_button_pager:disabled {
|
||||
padding: 0 3px 0 3px;
|
||||
|
|
@ -1086,6 +1093,7 @@ label.error {
|
|||
}
|
||||
.openerp .oe_form_buttons, .openerp .oe_list_buttons {
|
||||
float: left;
|
||||
margin-bottom:5px;
|
||||
}
|
||||
.openerp .oe_form_pager, .openerp .oe_list_pager {
|
||||
float: right;
|
||||
|
|
@ -1215,7 +1223,20 @@ label.error {
|
|||
min-height:100px;
|
||||
}
|
||||
/* Inputs */
|
||||
.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms textarea {
|
||||
.openerp tr[id^="oe-editable-row"] input { /* editable list input */
|
||||
font-size: 110%;
|
||||
height: 22px;
|
||||
}
|
||||
.openerp tr[id^="oe-editable-row"] select {
|
||||
margin-bottom:1px;
|
||||
}
|
||||
.openerp .searchview_extended_prop_value input.field_char {
|
||||
height: 22px;
|
||||
margin-bottom: 6px;
|
||||
padding-top: 1px;
|
||||
}
|
||||
|
||||
.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms textarea, .openerp tr[id^="oe-editable-row"] input, .searchview_extended_prop_value input.field_char {
|
||||
-moz-box-sizing: border-box;
|
||||
-webkit-box-sizing: border-box;
|
||||
-ms-box-sizing: border-box;
|
||||
|
|
@ -1410,6 +1431,10 @@ label.error {
|
|||
background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
|
||||
}
|
||||
|
||||
.openerp tfoot.ui-widget-header .oe-list-footer { /* adding some space to the footer */
|
||||
padding: 4px 0 5px 0;
|
||||
}
|
||||
|
||||
/* Sidebar */
|
||||
.openerp .view-manager-main-table {
|
||||
margin: 0;
|
||||
|
|
@ -1468,13 +1493,16 @@ label.error {
|
|||
background: #fff;
|
||||
margin: 0.25em 0;
|
||||
font-size: 85%;
|
||||
color: #4C4C4C;
|
||||
color: #9A0404;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
}
|
||||
.openerp .oe-view-manager-logs ul {
|
||||
margin: 0;
|
||||
padding: 0 10px;
|
||||
padding: 5px 10px;
|
||||
list-style: none;
|
||||
}
|
||||
.openerp .oe-view-manager-logs li:before {
|
||||
|
|
@ -1699,11 +1727,17 @@ label.error {
|
|||
margin-bottom: -4px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.openerp .oe-m2o input {
|
||||
.openerp .oe-m2o input, .openerp tr[id^="oe-editable-row"] input.field_many2one {
|
||||
border-right: none;
|
||||
margin-right: 0px !important;
|
||||
padding-bottom: 2px !important;
|
||||
}
|
||||
.openerp tr[id^="oe-editable-row"] input.field_many2one {
|
||||
padding-top: 1px;
|
||||
}
|
||||
.openerp tr[id^="oe-editable-row"] input.field_many2one, .openerp tr[id^="oe-editable-row"] button {
|
||||
margin-top: 2px;
|
||||
}
|
||||
.openerp .oe-m2o-disabled-cm {
|
||||
color: grey;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -529,10 +529,11 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
|
|||
$res_logs.removeClass('oe-folded');
|
||||
return false;
|
||||
}).delegate('a.oe-remove-everything', 'click', function () {
|
||||
$res_logs.removeClass('oe-has-more')
|
||||
.find('ul').empty();
|
||||
$res_logs.removeClass('oe-has-more').find('ul').empty();
|
||||
$res_logs.css('display','none');
|
||||
return false;
|
||||
});
|
||||
$res_logs.css('display','none');
|
||||
|
||||
return manager_ready;
|
||||
},
|
||||
|
|
@ -586,9 +587,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
|
|||
return $.when(this._super(view_type, no_store)).then(function () {
|
||||
self.shortcut_check(self.views[view_type]);
|
||||
|
||||
self.$element.find('.oe-view-manager-logs:first')
|
||||
.addClass('oe-folded').removeClass('oe-has-more')
|
||||
.find('ul').empty();
|
||||
self.$element.find('.oe-view-manager-logs:first').addClass('oe-folded').removeClass('oe-has-more').css('display','none').find('ul').empty();
|
||||
|
||||
var controller = self.views[self.active_view].controller,
|
||||
fvg = controller.fields_view,
|
||||
|
|
@ -682,11 +681,10 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
|
|||
* @param {Array<Object>} log_records
|
||||
*/
|
||||
do_display_log: function (log_records) {
|
||||
var self = this,
|
||||
cutoff = 3,
|
||||
$logs = this.$element.find('.oe-view-manager-logs:first')
|
||||
.addClass('oe-folded'),
|
||||
$logs_list = $logs.find('ul').empty();
|
||||
var self = this;
|
||||
var cutoff = 3;
|
||||
var $logs = this.$element.find('.oe-view-manager-logs:first').addClass('oe-folded').css('display', 'block');
|
||||
var $logs_list = $logs.find('ul').empty();
|
||||
$logs.toggleClass('oe-has-more', log_records.length > cutoff);
|
||||
_(log_records.reverse()).each(function (record) {
|
||||
$(_.str.sprintf('<li><a href="#">%s</a></li>', record.name))
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
<tr>
|
||||
<td colspan="2">
|
||||
<div id="oe_footer" class="oe_footer">
|
||||
<p class="oe_footer_powered">Powered by <a href="http://www.openerp.com">openerp.com</a>.</p>
|
||||
<p class="oe_footer_powered">Powered by <a href="http://www.openerp.com/">OpenERP</a></p>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -413,40 +413,43 @@
|
|||
<t t-name="ViewManager">
|
||||
<table class="view-manager-main-table" cellpadding="0" cellspacing="0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="view-manager-main-content">
|
||||
<div class="oe-view-manager-header">
|
||||
<h2 class="oe_view_title" t-if="self.flags.display_title !== false">
|
||||
<span class="oe_view_title_text"><t t-esc="self.display_title()"/></span>
|
||||
</h2>
|
||||
<div class="oe_vm_switch">
|
||||
<t t-if="views.length != 1" t-foreach="views" t-as="view">
|
||||
<tr>
|
||||
<td rowspan="2" class="view-manager-main-sidebar" height="100%">
|
||||
<t t-foreach="views" t-as="view">
|
||||
<div t-attf-id="#{prefix}_sidebar_#{view.view_type}" class="sidebar-main-div closed-sidebar" style="display: none"/>
|
||||
</t>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="view-manager-main-content">
|
||||
<div class="oe-view-manager-header">
|
||||
<h2 class="oe_view_title" t-if="self.flags.display_title !== false">
|
||||
<span class="oe_view_title_text"><t t-esc="self.display_title()"/></span>
|
||||
</h2>
|
||||
<div class="oe_vm_switch">
|
||||
<t t-if="views.length != 1" t-foreach="views" t-as="view">
|
||||
|
||||
<button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.view_type">
|
||||
<span><t t-esc="view.label || view.view_type"/></span>
|
||||
</button>
|
||||
</t>
|
||||
<button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.view_type">
|
||||
<span><t t-esc="view.label || view.view_type"/></span>
|
||||
</button>
|
||||
</t>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-id="#{prefix}_search" t-opentag="true"/>
|
||||
<t t-foreach="views" t-as="view">
|
||||
<div t-attf-id="#{prefix}_view_#{view.view_type}"/>
|
||||
</t>
|
||||
</td>
|
||||
<td class="view-manager-main-sidebar" height="100%">
|
||||
<t t-foreach="views" t-as="view">
|
||||
<div t-attf-id="#{prefix}_sidebar_#{view.view_type}" class="sidebar-main-div closed-sidebar" style="display: none"/>
|
||||
</t>
|
||||
</td>
|
||||
</tr>
|
||||
<div t-attf-id="#{prefix}_search" t-opentag="true"/>
|
||||
<t t-foreach="views" t-as="view">
|
||||
<div t-attf-id="#{prefix}_view_#{view.view_type}"/>
|
||||
</t>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</t>
|
||||
|
||||
<t t-extend="ViewManager" t-name="ViewManagerAction">
|
||||
<t t-jquery=".view-manager-main-table tbody" t-operation="prepend">
|
||||
<tr>
|
||||
<td class="oe_view_manager_menu_tips" colspan="2">
|
||||
<t t-jquery=".view-manager-main-sidebar" t-operation="before">
|
||||
<td class="oe_view_manager_menu_tips">
|
||||
<blockquote t-if="self.action.help and !self.flags.low_profile
|
||||
and !(self.action.id in self.session.hidden_menutips)">
|
||||
<p><t t-esc="self.action.help"/></p>
|
||||
|
|
@ -456,7 +459,6 @@
|
|||
</div>
|
||||
</blockquote>
|
||||
</td>
|
||||
</tr>
|
||||
</t>
|
||||
<t t-jquery="h2.oe_view_title" t-operation="prepend">
|
||||
<a t-if="self.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
|
||||
|
|
|
|||
|
|
@ -378,4 +378,39 @@
|
|||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.openerp .oe_welcome_message {
|
||||
display:none;
|
||||
}
|
||||
.openerp .oe_initial_welcome_message {
|
||||
width:30%;
|
||||
text-align:center;
|
||||
margin:10px 35% 0 35%;
|
||||
padding: 5px 10px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
background: #eeeded;
|
||||
box-shadow: 0 1px 0 #fff;
|
||||
-moz-box-shadow: 0 1px 0 #fff;
|
||||
-webkit-box-shadow: 0 1px 0 #fff;
|
||||
color: #8c8c8c;
|
||||
font-size: 90%;
|
||||
text-transform: uppercase;
|
||||
font-weight: bold;
|
||||
text-shadow: #fff 0 1px 0;
|
||||
}
|
||||
|
||||
.openerp .oe_initial_welcome_message ul{
|
||||
padding:10px 0 0 0;
|
||||
margin:0;
|
||||
list-style-type: none;
|
||||
padding: 7px 0 5px 5px;
|
||||
background-position: 0 50%;
|
||||
background-repeat: no-repeat;
|
||||
cursor: pointer;
|
||||
}
|
||||
.openerp .oe_initial_welcome_message ul a, .openerp .initial_welcome_message ul a:hover, .openerp .initial_welcome_message ul a:active, .openerp .initial_welcome_message ul a:focus {
|
||||
color:#222;
|
||||
text-decoration:none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,19 +105,22 @@
|
|||
</t>
|
||||
|
||||
<t t-name="web_dashboard.ApplicationTiles">
|
||||
<div class="oe_applications_tiles">
|
||||
<h1>Welcome to OpenERP</h1>
|
||||
<div>
|
||||
<div class="oe_applications_tiles">
|
||||
<h1 class="oe_welcome_message">Welcome to OpenERP</h1>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
|
||||
<div t-name="web_dashboard.ApplicationInstaller">
|
||||
<ul>
|
||||
<li>Remember to bookmark this page.</li>
|
||||
<li>Remember your login: <t t-esc="widget.session.username"/></li>
|
||||
<li>Choose the first OpenERP Application you want to install..</li>
|
||||
</ul>
|
||||
<h3>Please choose the first application to install.</h3>
|
||||
<div class="oe_initial_welcome_message">
|
||||
<ul>
|
||||
<li>Remember to bookmark
|
||||
<a class="oe_welcome_url" t-att-href="widget.session.origin">This url</a>
|
||||
</li>
|
||||
<li>Your login: <t t-esc="widget.session.username"/></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="oe_installer" />
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -6,3 +6,30 @@
|
|||
.openerp .oe_diagram_buttons {
|
||||
float: left;
|
||||
}
|
||||
|
||||
/*.openerp .dhx_canvas_text {
|
||||
padding:30px 0 0 10px;
|
||||
-webkit-transform: rotate(60deg);
|
||||
-moz-transform: rotate(60deg);
|
||||
-o-transform: rotate(60deg);
|
||||
-ms-transform: rotate(60deg);
|
||||
transform: rotate(60deg);
|
||||
}
|
||||
|
||||
.openerp .dhx_canvas_text.dhx_axis_item_y, .openerp .dhx_canvas_text.dhx_axis_title_x {
|
||||
padding: 0px;
|
||||
-webkit-transform: rotate(0deg);
|
||||
-moz-transform: rotate(0deg);
|
||||
-o-transform: rotate(0deg);
|
||||
-ms-transform: rotate(0deg);
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
|
||||
.openerp .dhx_canvas_text.dhx_axis_title_y {
|
||||
padding: 0;
|
||||
-webkit-transform: rotate(270deg);
|
||||
-moz-transform: rotate(270deg);
|
||||
-o-transform: rotate(270deg);
|
||||
-ms-transform: rotate(270deg);
|
||||
transform: rotate(270deg);
|
||||
} */
|
||||
|
|
|
|||
Loading…
Reference in New Issue