FIX

web_dashboard_tile/static/src/css/tile.css

@@ -1,17 +1,10 @@
-.openerp .oe_kanban_view .oe_dashbaord_tile{
+.openerp .oe_kanban_view .oe_dashboard_tile {
     width: 150px;
     height: 150px;
     border: 0;
     border-radius: 0;
 }
 
-<<<<<<< HEAD
-.openerp .oe_kanban_view .oe_dashbaord_tile .tile_label,
-.openerp .oe_kanban_view .oe_dashbaord_tile .tile_count_without_computed_value,
-.openerp .oe_kanban_view .oe_dashbaord_tile .tile_count_with_computed_value,
-.openerp .oe_kanban_view .oe_dashbaord_tile .tile_computed_value {
-    width: 140px;
-=======
 /* Disable default kanban style */
 .openerp .oe_kanban_view .oe_dashboard_tile .oe_kanban_content div:first-child {
     margin-right: inherit!important;
@@ -20,44 +13,27 @@
 .openerp .oe_kanban_view .oe_dashboard_tile .tile_label,
 .openerp .oe_kanban_view .oe_dashboard_tile .tile_primary_value,
 .openerp .oe_kanban_view .oe_dashboard_tile .tile_secondary_value {
->>>>>>> 3ab676d... [IMP][8.0][web_dashboard_tile] Refactor (see changes in description) (#476)
     text-align: center;
     font-weight: bold;
 }
 
-<<<<<<< HEAD
-.openerp .oe_kanban_view .oe_dashbaord_tile .tile_label{
-=======
 .openerp .oe_kanban_view .oe_dashboard_tile .tile_label {
->>>>>>> 3ab676d... [IMP][8.0][web_dashboard_tile] Refactor (see changes in description) (#476)
     padding: 5px;
     font-size: 15px;
 }
 
-<<<<<<< HEAD
-.openerp .oe_kanban_view .oe_dashbaord_tile .tile_count_without_computed_value{
-    font-size: 52px;
-    font-weight: bold;
-=======
 .openerp .oe_kanban_view .oe_dashboard_tile .tile_primary_value{
     font-size: 54px;
->>>>>>> 3ab676d... [IMP][8.0][web_dashboard_tile] Refactor (see changes in description) (#476)
     position: absolute;
     left: 5px;
     right: 5px;
     bottom: 5px;
 }
 
-<<<<<<< HEAD
-.openerp .oe_kanban_view .oe_dashbaord_tile .tile_count_with_computed_value{
-    font-size: 38px;
-    font-weight: bold;
-=======
 .openerp .oe_kanban_view .oe_dashboard_tile .tile_secondary_value{
     display: none;
     font-size: 18px;
     font-style: italic;
->>>>>>> 3ab676d... [IMP][8.0][web_dashboard_tile] Refactor (see changes in description) (#476)
     position: absolute;
     left: 5px;
     right: 5px;
@@ -69,16 +45,6 @@
     bottom: 30px;
 }
 
-<<<<<<< HEAD
-.openerp .oe_kanban_view .oe_dashbaord_tile .tile_computed_value{
-    font-size: 18px;
-    font-weight: bold;
-    position: absolute;
-    right: 10px;
-    bottom: 5px;
-    font-style: italic;
-}
-=======
 .openerp .oe_kanban_view .oe_dashboard_tile .with_secondary .tile_secondary_value{
     display: block;
 }
@@ -90,5 +56,4 @@
 
 .openerp .oe_searchview_drawer .oe_opened .oe_dashboard_tile_form {
     display: block;
-}
->>>>>>> 3ab676d... [IMP][8.0][web_dashboard_tile] Refactor (see changes in description) (#476)
+}

web_dashboard_tile/static/src/js/custom_js.js

@@ -19,7 +19,7 @@
 //
 //#############################################################################
 
-openerp.web_dashboard_tile = function (instance)
+odoo.web_dashboard_tile = function (instance)
 {
 var QWeb = instance.web.qweb,
     _t =  instance.web._t,
@@ -35,13 +35,13 @@ _.mixin({
             var self = this;
             this.$('#add_dashboard_tile').on('click', this, function (){
               self.save_tile();
-            })
+            });
         },
         render_data: function(dashboard_choices){
             var selection = instance.web.qweb.render(
                 "SearchView.addtodashboard.selection", {
                     selections: dashboard_choices});
-            this.$("form input").before(selection)
+            this.$("form input").before(selection);
         },
         save_tile: function () {
             var self = this;
@@ -97,4 +97,4 @@ _.mixin({
 
         }
     });
-}
+};

web_dashboard_tile/static/src/xml/custom_xml.xml

@@ -2,11 +2,11 @@
 <templates id="template" xml:space="preserve">
     <t t-extend="SearchView.addtodashboard">
         <t t-jquery="form" t-operation="after">
-            <div>
+            <div class="oe_dashboard_tile_form">
                 <label for="dashboard_tile_new_name">Tile:</label>
                 <input id="dashboard_tile_new_name" />
                 <button id="add_dashboard_tile">Create</button>
             </div>
         </t>
     </t>
-</templates>
+</templates>