Merge branch 'master' into feature/campaign

2015-03-03 18:01:45 +02:00
parent 6aa012891d 53049cf1f4
commit 2d74cddf86
2 changed files with 3 additions and 2 deletions
@@ -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}}
@@ -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
            };
        },