diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 35421729c01..aecd91e06aa 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -94,6 +94,7 @@ Dashboard for CRM will include: 'base_partner_merge_view.xml', 'sales_team_view.xml', + 'views/crm.xml', ], 'demo': [ 'crm_demo.xml', @@ -114,6 +115,7 @@ Dashboard for CRM will include: 'test/crm_lead_unlink.yml', 'test/crm_lead_find_stage.yml', ], + 'css': ['static/src/css/crm.css'], 'installable': True, 'application': True, 'auto_install': False, diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 0dd740b47c8..7cb77627848 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -301,7 +301,7 @@
- + - @@ -310,7 +310,7 @@
-
+
oe_kanban_text_red : diff --git a/addons/crm/sales_team_view.xml b/addons/crm/sales_team_view.xml index fddd37b69ae..27100dfb95c 100644 --- a/addons/crm/sales_team_view.xml +++ b/addons/crm/sales_team_view.xml @@ -98,17 +98,17 @@
-
-
- Leads - +
+ -
- Opportunities - +
+ Opportunities + Planned Revenue per Month
Click to see a detailed analysis of opportunities.
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css new file mode 100644 index 00000000000..615c10031cb --- /dev/null +++ b/addons/crm/static/src/css/crm.css @@ -0,0 +1,4 @@ +@charset "utf-8"; +.openerp .oe_margin_top_8 { + margin-top: 8px; +} \ No newline at end of file diff --git a/addons/crm/views/crm.xml b/addons/crm/views/crm.xml new file mode 100644 index 00000000000..bdff3333846 --- /dev/null +++ b/addons/crm/views/crm.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 734954ee8b0..04cdb3f5491 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -119,10 +119,10 @@
- - + + - - @@ -355,7 +352,7 @@
- +
@@ -366,7 +363,7 @@ - + and other(s) @@ -374,7 +371,7 @@ - + and other(s) diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css index 4ac3a0340fa..a189264bdac 100644 --- a/addons/gamification/static/src/css/gamification.css +++ b/addons/gamification/static/src/css/gamification.css @@ -3,21 +3,6 @@ width: 230px; min-height: 200px; } -.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { - width: 250px; - min-height: 150px; -} -.openerp .oe_kanban_badge_avatars { - margin-top: 8px; -} -.openerp .oe_kanban_badge_avatars img { - width: 30px; - height: 30px; - padding-left: 0; - margin-top: 3px; - border-radius: 2px; - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -} .openerp .oe_kanban_goal .oe_goal_state_block { width: 200px; height: 130px; @@ -35,11 +20,19 @@ .openerp .oe_kanban_goal .oe_goal_state_block, .openerp .oe_kanban_goal p { text-align: center; } -.openerp .oe_kanban_content .oe_goal_gauge:first-child { - margin: auto; + +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { + width: 250px; + min-height: 150px; } -.openerp .oe_kanban_content .oe_goal_gauge svg { - margin-top: -20px; +.openerp .oe_kanban_badge_avatars { + width: 30px; +} +.openerp .oe_margin_top_8 { + margin-top: 8px; +} +.openerp .oe_margin_top_16 { + margin-top: 16px; } .openerp .oe_no_overflow { overflow: hidden; @@ -187,4 +180,4 @@ .openerp .oe_mail_wall .oe_cell { display: table-cell; vertical-align: middle; -} +} \ No newline at end of file diff --git a/addons/gamification/static/src/css/gamification.sass b/addons/gamification/static/src/css/gamification.sass index 3bb6b570e66..0795f5b798a 100644 --- a/addons/gamification/static/src/css/gamification.sass +++ b/addons/gamification/static/src/css/gamification.sass @@ -18,7 +18,10 @@ margin-top: 3px border-radius: 2px -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) - + .oe_margin_top_8 + margin-top: 8px + .oe_margin_top_16 + margin-top: 16px .oe_kanban_goal .oe_goal_state_block width: 200px diff --git a/addons/gamification/views/badge.xml b/addons/gamification/views/badge.xml index 0dde08086fc..386a1e19974 100644 --- a/addons/gamification/views/badge.xml +++ b/addons/gamification/views/badge.xml @@ -32,8 +32,8 @@ - - + + Badge Form gamification.badge @@ -113,7 +113,7 @@
-
+
@@ -132,18 +132,18 @@
Can not grant
-

+

granted,
this month

-
+ @@ -172,7 +172,7 @@
-
+

diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml index 75515c42183..0ed695b3535 100644 --- a/addons/gamification/views/challenge.xml +++ b/addons/gamification/views/challenge.xml @@ -153,11 +153,9 @@

-
- - - -
+ + +
diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml index aac04eff859..b41b4e72638 100644 --- a/addons/gamification/views/goal.xml +++ b/addons/gamification/views/goal.xml @@ -36,8 +36,8 @@ - - + + Goal Form gamification.goal @@ -153,7 +153,7 @@

-
+
@@ -178,7 +178,7 @@
-

+

From diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 38804617615..d9a80b065ab 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -45,8 +45,8 @@ - @@ -75,8 +75,8 @@ - @@ -159,11 +159,11 @@ -

-
- +
+
+
-
+

()

@@ -192,9 +192,6 @@
- diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css index be21ca7e7a6..04be64a2d37 100644 --- a/addons/hr/static/src/css/hr.css +++ b/addons/hr/static/src/css/hr.css @@ -1,18 +1,10 @@ -.oe_employee_vignette { - padding: 8px 8px; - min-height: 100px; -} - -.oe_employee_image, .oe_employee_details { - display: inline-block; - vertical-align: top; +.oe_employee_details{ + min-height: 168px !important; + max-width: 336px; } .oe_employee_image { width: 100px; - height: 100px; - text-align: center; - overflow: hidden; -moz-border-radius: 3px; -webkit-border-radius: 3px; -o-border-radius: 3px; @@ -23,53 +15,10 @@ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + margin-top: 5px; + margin-left: -3px; } -.oe_employee_picture { - width: 100px; - height: auto; - clip: rect(10px, 100px, 110px, 0px); -} - -.oe_employee_picture_wide { - height: 100px; - width: auto; - clip: rect(0px, 115px, 100px, 15px); -} - -.oe_employee_details { - width: 210px; - font-size: 13px; - padding: 2px 5px; - color: #4c4c4c; - min-height: 120px; -} - -.oe_employee_details h4 { - margin: 0; - font-size: 13px; -} - -.oe_employee_details h4 a { - color: #4c4c4c; -} - -.oe_employee_details h4 a:hover { - text-decoration: underline; -} - -.oe_employee_details ul { - margin: 3px 0 5px; - padding: 0; - list-style: none; -} - -.oe_employee_details li { - margin: 2px 0; - padding: 0; -} - -.openerp .oe_employee_vignette .oe_followers { - width: auto; +.openerp .oe_employee_details .oe_followers { float: none; } \ No newline at end of file diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 78c463f296c..e9820fa6eb8 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -624,7 +624,7 @@ - + diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 5c56386ceb7..82acc5a7895 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -264,7 +264,7 @@ -
+
i
-



Mobile:
-
-
oe_kanban_text_red : -
-
+
-
@@ -446,16 +440,16 @@
- + - +
-
- +
+
-
+
() @@ -467,29 +461,33 @@
-
- - Applications - -
- - Documents - Document - + -
- - Hired Employees - +
+
+ + Hired Employees + +
diff --git a/addons/hr_recruitment/static/src/css/job_position.css b/addons/hr_recruitment/static/src/css/job_position.css index ea90bd6ec94..7349c5024c6 100644 --- a/addons/hr_recruitment/static/src/css/job_position.css +++ b/addons/hr_recruitment/static/src/css/job_position.css @@ -1,77 +1,34 @@ -.openerp .oe_kanban_job { - width: 355px; - min-height: 165px !important; -} -.openerp .oe_job_alias { - margin: 3px; -} -.openerp .oe_job_detail { - height: 70px; - width: 308px; -} -.openerp .oe_job { - font-size: 112%; - position: inline; - margin: 3px 3px; - color: #4c4c4c; - height: 18px; -} -.openerp img.oe_job_avatar { - position: absolute; - width: 24px; - height: 24px; - margin-left: 295px; - margin-top: -5px; -} -.openerp .oe_launch_recruitment { - float: left; - position: absolute; - bottom: 3px; - left: 10px; -} -.openerp div.oe_applications { - position: absolute; - margin-top: 16px; - font-size: 14px; -} -.openerp .oe_applications > a > span:hover { - margin: 4px 0; - text-decoration: underline; -} -.openerp .oe_name { - font-size: 14px; - font-weight: bold; +.openerp .oe_kanban_job{ + width: 355px; + min-height: 220px !important; } .openerp .oe_manager_name { - width: 135px; - font-size: 11px; - color: gray; + font-size: 11px; } -.openerp .oe_job_justgage { - float: right; - margin-top: -40px; - margin-right: -58px; - width: 200px; - height: 130px; +.openerp .oe_gray { + color: gray; } -.openerp .oe_department { - width: 289px; +.openerp .oe_link_hover:hover{ + text-decoration: underline; } -.openerp .oe_start_recruitment { - padding-top: 10px; +.openerp .oe_applicant_kanaban { + width: 276px; } -.openerp .oe_start_recruitment p { - font-size: 14px; - color: gray; - padding-left: 50px; +.openerp .oe_margin_top_4 { + margin-top: 4px; } -.openerp .oe_start_recruitment img { - margin-top: -22px; - width: 32px; - height: 34px; - float: left; - padding-left: 12px; +.openerp .oe_job_head { + margin-bottom: -4px; + font-size: 15px; } -.openerp .oe_job_messages { - margin-top: 40px !important; +.openerp .oe_job_font { + font-size: 15px; +} + +.openerp .oe_job_avatar { + width: 24px; +} + +.openerp .oe_applications { + margin-top: 30px; } diff --git a/addons/hr_recruitment/static/src/css/job_position.sass b/addons/hr_recruitment/static/src/css/job_position.sass index 67504dee6de..0c7ee9d6fad 100644 --- a/addons/hr_recruitment/static/src/css/job_position.sass +++ b/addons/hr_recruitment/static/src/css/job_position.sass @@ -1,62 +1,21 @@ .openerp .oe_kanban_job width: 355px - min-height: 165px !important - .oe_job_alias - margin: 3px - .oe_job_detail - height: 70px - width: 308px - .oe_job - font-size: 112% - position: inline - margin: 3px 3px - color: #4c4c4c - height: 18px - img.oe_job_avatar - position: absolute - width: 24px - height: 24px - margin-left: 295px - margin-top: -5px - .oe_launch_recruitment - float: left - position: absolute - bottom: 3px - left: 10px - div.oe_applications - position: absolute - margin-top: 16px - font-size: 14px - .oe_applications > a > span:hover - margin: 4px 0 - text-decoration: underline - .oe_name - font-size: 14px - font-weight: bold + min-height: 220px !important .oe_manager_name - width: 135px font-size: 11px + .oe_gray color: gray - .oe_job_justgage - float: right - margin-top: -40px - margin-right: -58px - width: 200px - height: 130px - .oe_department - width: 289px - .oe_start_recruitment - padding-top: 10px - p - font-size: 14px - color: gray - padding-left: 50px - img - margin-top: -22px - width: 32px - height: 34px - float: left - padding-left: 12px - .oe_job_messages - margin-top: 40px !important + .oe_applicant_kanaban + width: 276px + .oe_margin_top_4 + margin-top: 4px + .oe_job_head + margin-bottom: -4px + font-size: 15px + oe_job_font + font-size: 15px + .oe_job_avatar + width: 24px + oe_applications + margin-top: 30px diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css index cc91e8acf58..6c75f7a4c77 100644 --- a/addons/mass_mailing/static/src/css/mass_mailing.css +++ b/addons/mass_mailing/static/src/css/mass_mailing.css @@ -2,12 +2,13 @@ width: 280px; min-height: 141px; } - -.openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign .oe_kanban_header_right { - float: right; -} - .openerp .oe_kanban_view .oe_kanban_mass_mailing { width: 280px; min-height: 141px; } +.openerp .oe_margin_top_8 { + margin-top: 8px; +} +.openerp .oe_margin_bottom_8 { + margin-bottom: 8px; +} diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml index 5a7fca3a2aa..9464e3d7fea 100644 --- a/addons/mass_mailing/views/mass_mailing.xml +++ b/addons/mass_mailing/views/mass_mailing.xml @@ -651,12 +651,12 @@
-

+ t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> +

-

Mailings

+

Mailings

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index fb50dfda73c..5cff3245cb1 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -266,12 +266,14 @@
  • -
    -

    -
    - +
    +
    +

    +
    + +
    - -
    + -