From 53049cf1f4c46524f6b167a932240c13f2de3843 Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Tue, 3 Mar 2015 17:36:43 +0200
Subject: [PATCH] merge layout improve

---
 frontend/client/res/templates/record/merge.tpl | 4 ++--
 frontend/client/src/views/record/merge.js      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/client/res/templates/record/merge.tpl b/frontend/client/res/templates/record/merge.tpl
index 986706054f..1364b9b192 100644
--- a/frontend/client/res/templates/record/merge.tpl
+++ b/frontend/client/res/templates/record/merge.tpl
@@ -3,12 +3,12 @@
     <table class="table table-bordered">
         <thead>
             <tr>
-                <th width="20%"></th>                
+                <th width="20%"></th>
                 {{#each models}}
                 <th width="5%">
                     <input type="radio" name="check-all" value="{{prop this 'id'}}" data-id="{{id}}" class="pull-right">
                 </th>
-                <th>
+                <th width="{{../width}}%">
                     <a href="#{{../scope}}/view/{{prop this 'id'}}">{{get this 'name'}}</a>
                 </th>
                 {{/each}}
diff --git a/frontend/client/src/views/record/merge.js b/frontend/client/src/views/record/merge.js
index 8ef426e776..4979bea379 100644
--- a/frontend/client/src/views/record/merge.js
+++ b/frontend/client/src/views/record/merge.js
@@ -47,6 +47,7 @@ Espo.define('Views.Record.Merge', 'View', function (Dep) {
                 rows: rows,
                 models: this.models,
                 scope: this.scope,
+                width: Math.round(((80 - this.models.length * 5) / this.models.length * 10)) / 10
             };
         },