pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merged lp:~openerp-dev/openerp-web/trunk-improve-little-big-details

Browse Source 
bzr revid: pan@tinyerp.com-20121023101902-xszj0m9cvgci37ig
This commit is contained in:
Anand Patel (OpenERP)
2012-10-23 15:49:02 +05:30
parent 8351473832 2d0a401abb
commit 5ff01ba6bd
6 changed files with 86 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/i18n/it.po
+14 -14
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-07-02 09:06+0200\n"
"PO-Revision-Date: 2012-02-16 21:49+0000\n"
"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
"PO-Revision-Date: 2012-10-22 14:36+0000\n"
"Last-Translator: Marius Marolla <mariusmarolla@areablu.net>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-23 05:05+0000\n"
"X-Generator: Launchpad (build 16179)\n"
#. openerp-web
#: addons/web/static/src/js/chrome.js:176
@@ -129,56 +129,56 @@ msgstr "OpenERP - Unsupported/Community Version"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:619
msgid "less than a minute ago"
msgstr ""
msgstr "meno di un minuto fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:620
msgid "about a minute ago"
msgstr ""
msgstr "circa un minuto fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:621
#, python-format
msgid "%d minutes ago"
msgstr ""
msgstr "%d minuti fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:622
msgid "about an hour ago"
msgstr ""
msgstr "circa un'ora fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:623
#, python-format
msgid "%d hours ago"
msgstr ""
msgstr "%d ore fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:624
msgid "a day ago"
msgstr ""
msgstr "un giorno fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:625
#, python-format
msgid "%d days ago"
msgstr ""
msgstr "%d giorni fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:626
msgid "about a month ago"
msgstr ""
msgstr "circa un mese fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:627
#, python-format
msgid "%d months ago"
msgstr ""
msgstr "%d mesi fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:628
msgid "about a year ago"
msgstr ""
msgstr "circa un anno fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:629
addons/web/static/src/css/base.css
+14 -4
View File
@@ -394,6 +394,10 @@
.openerp .oe_image_medium > img {
max-width: 180px;
max-height: 180px; }
.openerp .oe_view_manager_current .accessactive:first-letter{
text-decoration:underline;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
font-weight:bold; }
.openerp .oe_button.oe_link {
border: none;
padding: 0;
@@ -2386,7 +2390,13 @@ div.ui-widget-overlay {
.ui-menu .ui-menu-item a.ui-state-hover, .ui-menu .ui-menu-item a.ui-state-active {
background: #7c7bad; }
.ui-corner-all {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; }
.ui-corner-all {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; }
.resolution table {
width: 100%;
line-height: 20px; }
.resolution table td {
valign: middle; }
addons/web/static/src/css/base.sass
+9
View File
@@ -434,6 +434,10 @@ $sheet-max-width: 860px
.oe_image_medium > img
max-width: 180px
max-height: 180px
.oe_view_manager_current .accessactive:first-letter
text-decoration: underline
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2)
font-weight: bold
.oe_button.oe_link
@include reset()
img
@@ -2314,5 +2318,10 @@ div.ui-widget-overlay
.ui-corner-all
@include radius(3px)
.resolution table
width: 100%
line-height: 20px
td
valign: middle
// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
addons/web/static/src/js/chrome.js
+15 -1
View File
@@ -987,7 +987,21 @@ instance.web.WebClient = instance.web.Client.extend({
start: function() {
var self = this;
return $.when(this._super()).pipe(function() {
self.$el.on('click', '.oe_logo', function() {
self.$el.on('contextmenu','.oe_logo',function(e) {
instance.web.dialog($(QWeb.render('Resolution')),{
title: "OpenERP Resolution" });
$(self.$el).click(function(){
$('.resolution').dialog('close');
})
$('.resolution a').click(function() {
self.$el.find('.oe_logo').css('width', $(this).attr('awidth')+"px");
self.$el.find('.oe_logo').css('height', $(this).attr('aheight')+"px");
self.$el.find('.oe_logo img').css('width', $(this).attr('imgw')+"px");
self.$el.find('.oe_logo img').css('height', $(this).attr('imgh')+"px");
})
})
self.$el.on('click', '.oe_logo', function(e) {
self.action_manager.do_action('home');
});
if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
addons/web/static/src/js/view_form.js
+11
View File
@@ -125,6 +125,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
self.check_actual_mode();
self.on("change:actual_mode", self, self.init_pager);
self.init_pager();
self.widgetAccesskey();
});
self.on("load_record", self, self.load_record);
this.on('view_loaded', self, self.load_form);
@@ -219,6 +220,16 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
return $.when();
},
widgetAccesskey:function(){
$(document).keydown(function(e){
if(e.keyCode === $.ui.keyCode.ALT) {
$("[accesskey]").addClass('accessactive');
}
e.stopPropagation();
}).keyup(function(e){
$("[accesskey]").removeClass('accessactive');
});
},
widgetFocused: function() {
// Clear click flag if used to focus a widget
this.__clicked_inside = false;
addons/web/static/src/xml/base.xml
+23 -2
View File
@@ -10,6 +10,27 @@
Loading...
</div>
</t>
<t t-name="Resolution">
<div class="resolution">
<table>
<tr>
<td colspan="2"><label>Resolution:</label></td>
</tr>
<tr>
<td><a awidth="150" aheight="60" imgw="100" imgh="30">150 x 60</a></td>
<td><a awidth="250" aheight="90" imgw="200" imgh="60">250 x 90</a></td>
</tr>
<tr>
<td><a awidth="290" aheight="90" imgw="225" imgh="60">290 x 90</a></td>
<td><a awidth="320" aheight="100" imgw="257" imgh="70">320 x 100</a></td>
</tr>
<tr>
<td></td>
<td style="float:right;"><a awidth="220" aheight="70" imgw="157" imgh="40">Original</a></td>
</tr>
</table>
</div>
</t>
<t t-name="Notification">
<div class="oe_notification" t-translation="off">
<div id="oe_notification_default">
@@ -404,7 +425,7 @@
</tr>
<tr>
<td class="oe_leftbar" valign="top">
<a class="oe_logo" href="#"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
<a class="oe_logo" href="#"><img onContextMenu="return false;" t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
<div class="oe_secondary_menus_container"/>
<div class="oe_footer">
Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a>
@@ -1090,7 +1111,7 @@
<div class="oe_form_field_image_controls oe_edit_only">
<t t-call="HiddenInputFile">
<t t-set="fileupload_id" t-value="widget.fileupload_id"/>
Edit
Edit
</t>
<div class="oe_form_binary_progress" style="display: none">
<img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>