[MERGE]:set css and code improved.

bzr revid: apa@tinyerp.com-20120424125157-tf3s7vepv391eghx

addons/project/project.py

@@ -222,35 +222,19 @@ class project(osv.osv):
         """
         if context is None:
             context = {}
-        value = {}
-        data_obj = self.pool.get('ir.model.data')
-        for project in self.browse(cr, uid, ids, context=context):
-            # Get Task views
-            tree_view = data_obj.get_object_reference(cr, uid, 'project', 'view_task_tree2')
-            form_view = data_obj.get_object_reference(cr, uid, 'project', 'view_task_form2')
-            calander_view = data_obj.get_object_reference(cr, uid, 'project', 'view_task_calendar')
-            search_view = data_obj.get_object_reference(cr, uid, 'project', 'view_task_search_form')
-            kanban_view = data_obj.get_object_reference(cr, uid, 'project', 'view_task_kanban')
-            context.update({
-                #'search_default_user_id': uid,
-                'search_default_project_id':project.id,
-                #'search_default_open':1,
-            })
-            value = {
-                'name': _('Task'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'form,tree',
-                'res_model': 'project.task',
-                'view_id': False,
-                'domain':[('project_id','in',ids)],
-                'context': context,
-                'views': [(kanban_view and kanban_view[1] or False, 'kanban'),(tree_view and tree_view[1] or False, 'tree'),(calander_view and calander_view[1] or False, 'calendar'),(form_view and form_view[1] or False, 'form')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': search_view and search_view[1] or False,
-                'nodestroy': True
-            }
-        return value
+        if ids:
+            context = dict(context, search_default_project_id=ids[0])
+        return {
+            'name': _('Task'),
+            'context': context,
+            'view_type': 'form',
+            'view_mode': 'kanban,tree,calendar,form',
+            'res_model': 'project.task',
+            'view_id': False,
+            'domain':[('project_id','in',ids)],
+            'type': 'ir.actions.act_window',
+            'nodestroy': True
+        }
     
     def _get_type_common(self, cr, uid, context):
         ids = self.pool.get('project.task.type').search(cr, uid, [('project_default','=',1)], context=context)

addons/project/project_view.xml

@@ -182,7 +182,7 @@
                         <t t-name="kanban-box">
                             <div class="project_vignettes">
                                 <li t-attf-class="#{kanban_color(record.color.raw_value)} oe_project_kanban_vignette" id="oe_project_kanban_vignette">
-                                    <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="i">B</span></a>
+                                    <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="oe_i">B</span></a>
                                     <ul class="dropdown-menu">
                                       <li ><a type="edit" >Edit...</a></li>
                                       <li ><a type="delete">Delete</a></li>
@@ -201,10 +201,11 @@
                                     <div id="list">
                                         <a id="1">
                                             <t t-if="record.task.raw_value">
-                                                <button name="open_tasks" id = "open_tasks" class="oe_project_buttons" type="object"><div class="fontsize"><t t-if="record.open_task.value &lt;= 1"> Task</t><t t-if="record.open_task.value &gt; 1"> Tasks</t>(<t t-esc="record.open_task.value"/>)</div></button>
+                                                <button name="open_tasks" id = "open_tasks" class="oe_project_buttons" type="object"><t t-if="record.open_task.value &lt;= 1"> Task</t><t t-if="record.open_task.value &gt; 1"> Tasks</t>(<t t-esc="record.open_task.value"/>)</button>
                                             </t>
                                         </a>
                                     </div>
+                                    <br/>
                                     <button class="click_button" type="object">
                                         <table class="project_fields">
                                             <tr id="deadline" t-if="record.date.raw_value">
@@ -222,8 +223,7 @@
                                                 </td>
                                             </tr>
                                         </table>
-                                        <t t-if="record.members.raw_value.length &lt;=8"><br/><br/><br/></t>
-                                        <t t-if="record.members.raw_value.length &gt;8 and record.members.raw_value.length &lt;= 16"><br/></t>
+                                        <br/>
                                         <t t-foreach="record.members.raw_value" t-as="member">
                                             <img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-id="member" class="project_avatar"/>
                                         </t>

addons/project/static/src/css/project.css

@@ -1,15 +1,8 @@
-@font-face {
-  font-family: "mnmliconsRegular";
-  src: url("../font/mnmliconsv21-webfont.eot") format("eot");
-  src: url("../font/mnmliconsv21-webfont.woff") format("woff");
-  src: url("../font/mnmliconsv21-webfont.ttf") format("truetype");
-  src: url("../font/mnmliconsv21-webfont.svg") format("svg") active;
-  font-weight: normal;
-  font-style: normal; }
-  
 .project_fields {
-  font-family:Helvetica;
-  font-size: 12px;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  font-size: 11px;
+  padding-left: 0px;
   }
 .project_fields td {
     border: none;
@@ -19,14 +12,13 @@
     border-right: 1px solid #dddddd;
     vertical-align: top;
     margin-right: 8px; }
- 
-.project_vignettes {
-  margin: 4px; }
+    
   .project_vignettes li {
     float: left; }
   .project_vignettes .project_avatar {
-    width: 28px;
-    height: 28px; }
+    width: 30px;
+    height: 30px;
+    padding-left: 0px; }
   .project_vignettes .project_fields {
     width: 100%; }
     .project_vignettes .project_fields th {
@@ -35,22 +27,17 @@
       color: #888888; }
   .project_vignettes h4 a {
     color: #4c4c4c; }
-
-.project_vignettes > li {
-  height: 205px;
-  width: 250px;
-  padding: 8px;
-  margin: 4px; }
   .project_vignettes > li h4 {
-    margin-bottom: 2px; }
+    margin-bottom: 2px;
+    padding-left: 2px; }
     
 .oe_project_buttons {
-    display: inline-block;
-    padding: 0px 0px;
-    font-size: 13px;
-    background-color: transparent;
-    border: hidden;
-    color: #8A89BA;
+    padding: 2px 2px !important;
+    background: none !important; 
+    background-color: transparent !important;
+    border: hidden !important;
+    color: #8A89BA !important;
+    
 
 }
 
@@ -65,21 +52,22 @@
   border-radius: 4px;
   -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); }
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); 
+  }
 
-.i {
-  font-family: "mnmliconsRegular" !important;
-  font-size: 21px;
-  font-weight: 300 !important; }
   
 .click_button {
-    display: inline-block;
-    background-color: transparent;
-    min-height: 175px;
+    background: none !important;
+    background-color: transparent !important;
+    border: hidden !important;
+    min-height: 155px;
     min-width: 265px;
     border: hidden;
-    margin-left: -7px !important;
+    /*margin-left: 6px !important;*/
+    margin-top: 3px !important;
     text-align:  left;
+    vertical-align:  super;
+    font-size: 11px;
     -webkit-box-align:  baseline;
 }
 
@@ -121,8 +109,9 @@ a.oe_project_kanban_action {
    }
   a.oe_project_kanban_action:hover {
     text-decoration: none; }
-  a.oe_project_kanban_action .i {
+  a.oe_project_kanban_action .oe_i {
     color: #4c4c4c; }
+    
 .square {
   display: inline-block;
   width: 18px;
@@ -130,6 +119,9 @@ a.oe_project_kanban_action {
   border:1px solid grey;
  }
 
+.oe_kanban_color_0 {
+    background: white;
+}
 .oe_kanban_color_1 {
     background: #B1DCFE;
 }
@@ -160,7 +152,7 @@ a.oe_project_kanban_action {
   a.oe_project_kanban_action:hover {
     text-decoration: none;
     }
-  a.oe_project_kanban_action .i {
+  a.oe_project_kanban_action .eo_i {
     color: #4c4c4c; }
 
 
@@ -175,7 +167,9 @@ a.oe_project_kanban_action {
   display: inline-block;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
-  border-radius: 4px; }
+  border-radius: 4px; 
+
+}
   .oe_project_kanban_vignette:last-child {
     margin-bottom: 0; }
   .oe_project_kanban_vignette:hover {

addons/project_issue/project_issue.py

@@ -544,34 +544,19 @@ class project(osv.osv):
         """
         if context is None:
             context = {}
-        value = {}
-        data_obj = self.pool.get('ir.model.data')
-        for project in self.browse(cr, uid, ids, context=context):
-            # Get Task views
-            tree_view = data_obj.get_object_reference(cr, uid, 'project_issue', 'project_issue_tree_view')
-            form_view = data_obj.get_object_reference(cr, uid, 'project_issue', 'project_issue_form_view')
-            calander_view = data_obj.get_object_reference(cr, uid, 'project_issue', 'project_issue_calendar_view')
-            search_view = data_obj.get_object_reference(cr, uid, 'project_issue', 'view_project_issue_filter')
-            kanban_view = data_obj.get_object_reference(cr, uid, 'project_issue', 'project_issue_kanban_view')
-            context.update({
-                #'search_default_user_id': uid,
-                'search_default_project_id':project.id
-            })
-            value = {
-                'name': _('Issue'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'form,tree',
-                'res_model': 'project.issue',
-                'view_id': False,
-                'domain':[('project_id','in',ids)],
-                'context': context,
-                'views': [(kanban_view and kanban_view[1] or False, 'kanban'),(tree_view and tree_view[1] or False, 'tree'),(calander_view and calander_view[1] or False, 'calendar'),(form_view and form_view[1] or False, 'form')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': search_view and search_view[1] or False,
-                'nodestroy': True
-            }
-        return value
+        if ids:
+            context = dict(context, search_default_project_id=ids[0])
+        return {
+            'name': _('Issue'),
+            'view_type': 'form',
+            'view_mode': 'kanban,tree,calendar,form',
+            'res_model': 'project.issue',
+            'view_id': False,
+            'domain':[('project_id','in',ids)],
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'nodestroy': True
+        }
 
     def _check_escalation(self, cr, uid, ids, context=None):
         project_obj = self.browse(cr, uid, ids[0], context=context)

addons/project_long_term/project_long_term.py

@@ -242,34 +242,19 @@ class project(osv.osv):
         """
         if context is None:
             context = {}
-        value = {}
-        data_obj = self.pool.get('ir.model.data')
-        for project in self.browse(cr, uid, ids, context=context):
-            # Get Task views
-            tree_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_list')
-            form_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_form')
-            calander_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_calendar')
-            search_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_search')
-            context.update({
-                #'search_default_user_id': uid,
-                'search_default_project_id':project.id,
-                #'search_default_open':1,
-            })
-            value = {
+        if ids:
+            context = dict(context, search_default_project_id=ids[0])
+        return {
                 'name': _('Phase'),
-                'context': context,
                 'view_type': 'form',
-                'view_mode': 'form,tree',
+                'view_mode': 'tree,calendar,form',
                 'res_model': 'project.phase',
                 'view_id': False,
                 'domain':[('project_id','in',ids)],
                 'context': context,
-                'views': [(tree_view and tree_view[1] or False, 'tree'),(calander_view and calander_view[1] or False, 'calendar'),(form_view and form_view[1] or False, 'form')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': search_view and search_view[1] or False,
                 'nodestroy': True
             }
-        return value
     
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}

addons/project_timesheet/project_timesheet.py

@@ -85,30 +85,19 @@ class project_project(osv.osv):
         """
         if context is None:
             context = {}
-        value = {}
-        data_obj = self.pool.get('ir.model.data')
-
-        for project in self.browse(cr, uid, ids, context=context):
-            # Get Timesheet views
-            tree_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_tree_inherit_account_id')
-            form_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_form_inherit_account_id')
-            search_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_search_account_inherit')
-            context.update({
-                'search_default_account_id':project.analytic_account_id.id,
-            })
-            value = {
+        if ids:
+            project = self.browse(cr, uid, ids[0], context=context)
+            context = dict(context, search_default_account_id=project.analytic_account_id.id)
+        return {
                 'name': _('Bill Tasks Works'),
                 'context': context,
                 'view_type': 'form',
-                'view_mode': 'form,tree',
+                'view_mode': 'tree,form',
                 'res_model': 'account.analytic.line',
                 'view_id': False,
-                'views': [(tree_view and tree_view[1] or False, 'tree'),(form_view and form_view[1] or False, 'form')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': search_view and search_view[1] or False,
                 'nodestroy': True
             }
-        return value
 
 project_project()