Skip to content

Commit d48fc96

Browse files
c0brac0bra
committed
Merge pull request #4060 from JLLeitschuh/templateFixup
Makes AllTemplates Multiline
2 parents 287d86d + a687105 commit d48fc96

30 files changed

+267
-111
lines changed

‎src/features/edit/templates/cellEditor.html

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<div>
2-
<form name="inputForm">
3-
<input type="INPUT_TYPE" ng-class="'colt' + col.uid" ui-grid-editor ng-model="MODEL_COL_FIELD" />
4-
</form>
2+
<form
3+
name="inputForm">
4+
<input
5+
type="INPUT_TYPE"
6+
ng-class="'colt' + col.uid"
7+
ui-grid-editor
8+
ng-model="MODEL_COL_FIELD" />
9+
</form>
510
</div>

‎src/features/edit/templates/dropdownEditor.html

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<div>
2-
<form name="inputForm">
3-
<select ng-class="'colt' + col.uid" ui-grid-edit-dropdown ng-model="MODEL_COL_FIELD" ng-options="field[editDropdownIdLabel] as field[editDropdownValueLabel] CUSTOM_FILTERS for field in editDropdownOptionsArray"></select>
2+
<form
3+
name="inputForm">
4+
<select
5+
ng-class="'colt' + col.uid"
6+
ui-grid-edit-dropdown
7+
ng-model="MODEL_COL_FIELD"
8+
ng-options="field[editDropdownIdLabel] as field[editDropdownValueLabel] CUSTOM_FILTERS for field in editDropdownOptionsArray">
9+
</select>
410
</form>
511
</div>

‎src/features/edit/templates/fileChooserEditor.html

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<div>
2-
<form name="inputForm">
3-
<input ng-class="'colt' + col.uid" ui-grid-edit-file-chooser type="file" id="files" name="files[]" ng-model="MODEL_COL_FIELD"/>
2+
<form
3+
name="inputForm">
4+
<input
5+
ng-class="'colt' + col.uid"
6+
ui-grid-edit-file-chooser
7+
type="file"
8+
id="files"
9+
name="files[]"
10+
ng-model="MODEL_COL_FIELD"/>
411
</form>
512
</div>

‎src/features/expandable/templates/expandableRow.html

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
<div ui-grid-expandable-row ng-if="expandableRow.shouldRenderExpand()" class="expandableRow"
2-
style="float:left; margin-top: 1px; margin-bottom: 1px"
3-
ng-style="{width: (grid.renderContainers.body.getCanvasWidth()) + 'px'
4-
, height: grid.options.expandableRowHeight + 'px'}"></div>
1+
<div
2+
ui-grid-expandable-row
3+
ng-if="expandableRow.shouldRenderExpand()"
4+
class="expandableRow"
5+
style="float:left; margin-top: 1px; margin-bottom: 1px"
6+
ng-style="{width: (grid.renderContainers.body.getCanvasWidth()) + 'px', height: grid.options.expandableRowHeight + 'px'}">
7+
</div>

‎src/features/expandable/templates/expandableRowHeader.html

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<div class="ui-grid-row-header-cell ui-grid-expandable-buttons-cell">
2-
<div class="ui-grid-cell-contents">
3-
<i ng-class="{ 'ui-grid-icon-plus-squared' : !row.isExpanded, 'ui-grid-icon-minus-squared' : row.isExpanded }"
4-
ng-click="grid.api.expandable.toggleRowExpansion(row.entity)"></i>
5-
</div>
6-
</div>
1+
<div
2+
class="ui-grid-row-header-cell ui-grid-expandable-buttons-cell">
3+
<div
4+
class="ui-grid-cell-contents">
5+
<i
6+
ng-class="{ 'ui-grid-icon-plus-squared' : !row.isExpanded, 'ui-grid-icon-minus-squared' : row.isExpanded }"
7+
ng-click="grid.api.expandable.toggleRowExpansion(row.entity)">
8+
</i>
9+
</div>
10+
</div>

‎src/features/expandable/templates/expandableScrollFiller.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<div ng-if="expandableRow.shouldRenderFiller()"
2-
ng-class="{scrollFiller:true, scrollFillerClass:(colContainer.name === 'body')}"
3-
ng-style="{ width: (grid.getViewportWidth()) + 'px',
4-
height: grid.options.expandableRowHeight + 2 + 'px', 'margin-left': grid.options.rowHeader.rowHeaderWidth + 'px' }"
5-
>
6-
<i class="ui-grid-icon-spin5 ui-grid-animate-spin" ng-style=
7-
"{ 'margin-top': ( grid.options.expandableRowHeight/2 - 5) + 'px',
8-
'margin-left' : ((grid.getViewportWidth() - grid.options.rowHeader.rowHeaderWidth)/2 - 5) + 'px' }">
9-
</i></div>
1+
<div
2+
ng-if="expandableRow.shouldRenderFiller()"
3+
ng-class="{scrollFiller:true, scrollFillerClass:(colContainer.name === 'body')}"
4+
ng-style="{ width: (grid.getViewportWidth()) + 'px', height: grid.options.expandableRowHeight + 2 + 'px', 'margin-left': grid.options.rowHeader.rowHeaderWidth + 'px' }">
5+
<i
6+
class="ui-grid-icon-spin5 ui-grid-animate-spin"
7+
ng-style="{'margin-top': ( grid.options.expandableRowHeight/2 - 5) + 'px', 'margin-left' : ((grid.getViewportWidth() - grid.options.rowHeader.rowHeaderWidth)/2 - 5) + 'px'}">
8+
</i>
9+
</div>

‎src/features/expandable/templates/expandableTopRowHeader.html

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<div class="ui-grid-row-header-cell ui-grid-expandable-buttons-cell">
2-
<div class="ui-grid-cell-contents">
3-
<i ng-class="{ 'ui-grid-icon-plus-squared' : !grid.expandable.expandedAll, 'ui-grid-icon-minus-squared' : grid.expandable.expandedAll }"
4-
ng-click="grid.api.expandable.toggleAllRows()"></i>
5-
</div>
6-
</div>
1+
<div
2+
class="ui-grid-row-header-cell ui-grid-expandable-buttons-cell">
3+
<div
4+
class="ui-grid-cell-contents">
5+
<i
6+
ng-class="{ 'ui-grid-icon-plus-squared' : !grid.expandable.expandedAll, 'ui-grid-icon-minus-squared' : grid.expandable.expandedAll }"
7+
ng-click="grid.api.expandable.toggleAllRows()">
8+
</i>
9+
</div>
10+
</div>

‎src/features/exporter/templates/csvLink.html

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
<span class="ui-grid-exporter-csv-link-span">
2-
<a href="data:text/csv;charset=UTF-8,CSV_CONTENT" download="FILE_NAME">
3-
LINK_LABEL
4-
</a>
1+
<span
2+
class="ui-grid-exporter-csv-link-span">
3+
<a
4+
href="data:text/csv;charset=UTF-8,CSV_CONTENT"
5+
download="FILE_NAME">
6+
LINK_LABEL
7+
</a>
58
</span>

‎src/features/importer/templates/importerMenuItem.html

+10-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
<li class="ui-grid-menu-item"><form><input class="ui-grid-importer-file-chooser" type="file" id="files" name="files[]" /></form></li>
1+
<li
2+
class="ui-grid-menu-item">
3+
<form>
4+
<input
5+
class="ui-grid-importer-file-chooser"
6+
type="file"
7+
id="files"
8+
name="files[]"/>
9+
</form>
10+
</li>

‎src/features/pagination/templates/pagination.html

+23-8
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717
ui-grid-one-bind-aria-label="aria.pageToFirst"
1818
ng-click="pageFirstPageClick()"
1919
ng-disabled="cantPageBackward()">
20-
<div class="first-triangle">
21-
<div class="first-bar"></div>
20+
<div
21+
class="first-triangle">
22+
<div
23+
class="first-bar">
24+
</div>
2225
</div>
2326
</button>
2427
<button
@@ -43,7 +46,11 @@
4346
<span
4447
class="ui-grid-pager-max-pages-number"
4548
ng-show="paginationApi.getTotalPages() > 0">
46-
<abbr ui-grid-one-bind-title="paginationOf">/</abbr> {{ paginationApi.getTotalPages() }}
49+
<abbr
50+
ui-grid-one-bind-title="paginationOf">
51+
/
52+
</abbr>
53+
{{ paginationApi.getTotalPages() }}
4754
</span>
4855
<button
4956
type="button"
@@ -88,11 +95,19 @@
8895
{{grid.options.paginationPageSize}}&nbsp;{{sizesLabel}}
8996
</span>
9097
</div>
91-
<div class="ui-grid-pager-count-container">
92-
<div class="ui-grid-pager-count">
93-
<span ng-show="grid.options.totalItems > 0">
94-
{{showingLow}} <abbr ui-grid-one-bind-title="paginationThrough">-</abbr> {{showingHigh}} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}}
95-
</span>
98+
<div
99+
class="ui-grid-pager-count-container">
100+
<div
101+
class="ui-grid-pager-count">
102+
<span
103+
ng-show="grid.options.totalItems > 0">
104+
{{showingLow}}
105+
<abbr
106+
ui-grid-one-bind-title="paginationThrough">
107+
-
108+
</abbr>
109+
{{showingHigh}} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}}
110+
</span>
96111
</div>
97112
</div>
98113
</div>

‎src/features/selection/templates/gridFooterSelectedItems.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
<span ng-if="grid.selection.selectedCount !== 0 && grid.options.enableFooterTotalSelected">({{"search.selectedItems" | t}} {{grid.selection.selectedCount}})</span>
1+
<span
2+
ng-if="grid.selection.selectedCount !== 0 && grid.options.enableFooterTotalSelected">
3+
({{"search.selectedItems" | t}} {{grid.selection.selectedCount}})
4+
</span>

‎src/features/selection/templates/selectionHeaderCell.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<div>
22
<!-- <div class="ui-grid-vertical-bar">&nbsp;</div> -->
3-
<div class="ui-grid-cell-contents" col-index="renderIndex">
4-
<ui-grid-selection-select-all-buttons ng-if="grid.options.enableSelectAll"></ui-grid-selection-select-all-buttons>
3+
<div
4+
class="ui-grid-cell-contents"
5+
col-index="renderIndex">
6+
<ui-grid-selection-select-all-buttons
7+
ng-if="grid.options.enableSelectAll">
8+
</ui-grid-selection-select-all-buttons>
59
</div>
610
</div>

‎src/features/selection/templates/selectionRowHeader.html

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
<div class="ui-grid-disable-selection">
2-
<div class="ui-grid-cell-contents">
3-
<ui-grid-selection-row-header-buttons></ui-grid-selection-row-header-buttons>
1+
<div
2+
class="ui-grid-disable-selection">
3+
<div
4+
class="ui-grid-cell-contents">
5+
<ui-grid-selection-row-header-buttons>
6+
</ui-grid-selection-row-header-buttons>
47
</div>
5-
</div>
8+
</div>

‎src/features/selection/templates/selectionRowHeaderButtons.html

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
<div class="ui-grid-selection-row-header-buttons ui-grid-icon-ok" ng-class="{'ui-grid-row-selected': row.isSelected}" ng-click="selectButtonClick(row, $event)">
1+
<div
2+
class="ui-grid-selection-row-header-buttons ui-grid-icon-ok"
3+
ng-class="{'ui-grid-row-selected': row.isSelected}"
4+
ng-click="selectButtonClick(row, $event)">
25
&nbsp;
3-
</div>
6+
</div>

‎src/features/selection/templates/selectionSelectAllButtons.html

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
<div class="ui-grid-selection-row-header-buttons ui-grid-icon-ok" ng-class="{'ui-grid-all-selected': grid.selection.selectAll}" ng-click="headerButtonClick($event)">
2-
</div>
1+
<div
2+
class="ui-grid-selection-row-header-buttons ui-grid-icon-ok"
3+
ng-class="{'ui-grid-all-selected': grid.selection.selectAll}"
4+
ng-click="headerButtonClick($event)">
5+
</div>

‎src/features/tree-base/templates/treeBaseExpandAllButtons.html

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
<div class="ui-grid-tree-base-row-header-buttons" ng-class="{'ui-grid-icon-minus-squared': grid.treeBase.numberLevels > 0 && grid.treeBase.expandAll, 'ui-grid-icon-plus-squared': grid.treeBase.numberLevels > 0 && !grid.treeBase.expandAll}" ng-click="headerButtonClick($event)">
2-
</div>
1+
<div
2+
class="ui-grid-tree-base-row-header-buttons"
3+
ng-class="{'ui-grid-icon-minus-squared': grid.treeBase.numberLevels > 0 && grid.treeBase.expandAll, 'ui-grid-icon-plus-squared': grid.treeBase.numberLevels > 0 && !grid.treeBase.expandAll}"
4+
ng-click="headerButtonClick($event)">
5+
</div>

‎src/features/tree-base/templates/treeBaseHeaderCell.html

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<div>
2-
<div class="ui-grid-cell-contents" col-index="renderIndex">
3-
<ui-grid-tree-base-expand-all-buttons ></ui-grid-tree-base-expand-all-buttons>
2+
<div
3+
class="ui-grid-cell-contents"
4+
col-index="renderIndex">
5+
<ui-grid-tree-base-expand-all-buttons>
6+
</ui-grid-tree-base-expand-all-buttons>
47
</div>
58
</div>

‎src/features/tree-base/templates/treeBaseRowHeader.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
<div class="ui-grid-cell-contents">
2-
<ui-grid-tree-base-row-header-buttons></ui-grid-tree-base-row-header-buttons>
1+
<div
2+
class="ui-grid-cell-contents">
3+
<ui-grid-tree-base-row-header-buttons>
4+
</ui-grid-tree-base-row-header-buttons>
35
</div>

‎src/features/tree-base/templates/treeBaseRowHeaderButtons.html

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
<div class="ui-grid-tree-base-row-header-buttons" ng-class="{'ui-grid-tree-base-header': row.treeLevel > -1 }" ng-click="treeButtonClick(row, $event)">
2-
<i ng-class="{'ui-grid-icon-minus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'expanded', 'ui-grid-icon-plus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'collapsed'}" ng-style="{'padding-left': grid.options.treeIndent * row.treeLevel + 'px'}"></i>
1+
<div
2+
class="ui-grid-tree-base-row-header-buttons"
3+
ng-class="{'ui-grid-tree-base-header': row.treeLevel > -1 }"
4+
ng-click="treeButtonClick(row, $event)">
5+
<i
6+
ng-class="{'ui-grid-icon-minus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'expanded', 'ui-grid-icon-plus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'collapsed'}"
7+
ng-style="{'padding-left': grid.options.treeIndent * row.treeLevel + 'px'}">
8+
</i>
39
&nbsp;
4-
</div>
10+
</div>

‎src/templates/ui-grid/ui-grid-filter.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
class="ui-grid-filter-container"
33
ng-repeat="colFilter in col.filters"
44
ng-class="{'ui-grid-filter-cancel-button-hidden' : colFilter.disableCancelFilterButton === true }">
5-
<div ng-if="colFilter.type !== 'select'">
5+
<div
6+
ng-if="colFilter.type !== 'select'">
67
<input
78
type="text"
89
class="ui-grid-filter-input ui-grid-filter-input-{{$index}}"
@@ -25,7 +26,8 @@
2526
</div>
2627
</div>
2728

28-
<div ng-if="colFilter.type === 'select'">
29+
<div
30+
ng-if="colFilter.type === 'select'">
2931
<select
3032
class="ui-grid-filter-select ui-grid-filter-input-{{$index}}"
3133
ng-model="colFilter.term"

‎src/templates/ui-grid/ui-grid-footer.html

+20-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
1-
<div class="ui-grid-footer-panel ui-grid-footer-aggregates-row"> <!-- tfooter -->
2-
<div class="ui-grid-footer ui-grid-footer-viewport">
3-
<div class="ui-grid-footer-canvas">
4-
<div class="ui-grid-footer-cell-wrapper" ng-style="colContainer.headerCellWrapperStyle()">
5-
<div role="row" class="ui-grid-footer-cell-row">
6-
<div role="gridcell" ng-repeat="col in colContainer.renderedColumns track by col.uid" ui-grid-footer-cell col="col" render-index="$index" class="ui-grid-footer-cell ui-grid-clearfix"></div>
1+
<div
2+
class="ui-grid-footer-panel ui-grid-footer-aggregates-row"> <!-- tfooter -->
3+
<div
4+
class="ui-grid-footer ui-grid-footer-viewport">
5+
<div
6+
class="ui-grid-footer-canvas">
7+
<div
8+
class="ui-grid-footer-cell-wrapper"
9+
ng-style="colContainer.headerCellWrapperStyle()">
10+
<div
11+
role="row"
12+
class="ui-grid-footer-cell-row">
13+
<div
14+
ui-grid-footer-cell
15+
role="gridcell"
16+
ng-repeat="col in colContainer.renderedColumns track by col.uid"
17+
col="col"
18+
render-index="$index"
19+
class="ui-grid-footer-cell ui-grid-clearfix">
20+
</div>
721
</div>
822
</div>
923
</div>

‎src/templates/ui-grid/ui-grid-grid-footer.html

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<div class="ui-grid-footer-info ui-grid-grid-footer">
2-
<span>{{'search.totalItems' | t}} {{grid.rows.length}}</span>
3-
<span ng-if="grid.renderContainers.body.visibleRowCache.length !== grid.rows.length"
4-
class="ngLabel">({{"search.showingItems" | t}} {{grid.renderContainers.body.visibleRowCache.length}})
5-
</span>
2+
<span>{{'search.totalItems' | t}} {{grid.rows.length}}</span>
3+
<span
4+
ng-if="grid.renderContainers.body.visibleRowCache.length !== grid.rows.length"
5+
class="ngLabel">
6+
({{"search.showingItems" | t}} {{grid.renderContainers.body.visibleRowCache.length}})
7+
</span>
68
</div>

‎src/templates/ui-grid/ui-grid-header.html

+22-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
1-
<div role="rowgroup" class="ui-grid-header"> <!-- theader -->
2-
<div class="ui-grid-top-panel">
3-
<div class="ui-grid-header-viewport">
4-
<div class="ui-grid-header-canvas">
5-
<div class="ui-grid-header-cell-wrapper" ng-style="colContainer.headerCellWrapperStyle()">
6-
<div role="row" class="ui-grid-header-cell-row">
7-
<div class="ui-grid-header-cell ui-grid-clearfix" ng-repeat="col in colContainer.renderedColumns track by col.uid" ui-grid-header-cell col="col" render-index="$index"></div>
1+
<div
2+
role="rowgroup"
3+
class="ui-grid-header"> <!-- theader -->
4+
<div
5+
class="ui-grid-top-panel">
6+
<div
7+
class="ui-grid-header-viewport">
8+
<div
9+
class="ui-grid-header-canvas">
10+
<div
11+
class="ui-grid-header-cell-wrapper"
12+
ng-style="colContainer.headerCellWrapperStyle()">
13+
<div
14+
role="row"
15+
class="ui-grid-header-cell-row">
16+
<div
17+
class="ui-grid-header-cell ui-grid-clearfix"
18+
ng-repeat="col in colContainer.renderedColumns track by col.uid"
19+
ui-grid-header-cell
20+
col="col"
21+
render-index="$index">
22+
</div>
823
</div>
924
</div>
1025
</div>

‎src/templates/ui-grid/ui-grid-row.html

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<div
2-
ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns track by col.uid"
3-
ui-grid-one-bind-id-grid="rowRenderIndex + '-' + col.uid + '-cell'"
4-
class="ui-grid-cell"
5-
ng-class="{ 'ui-grid-row-header-cell': col.isRowHeader }"
6-
role="{{col.isRowHeader ? 'rowheader' : 'gridcell'}}"
7-
ui-grid-cell></div>
2+
ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns track by col.uid"
3+
ui-grid-one-bind-id-grid="rowRenderIndex + '-' + col.uid + '-cell'"
4+
class="ui-grid-cell"
5+
ng-class="{ 'ui-grid-row-header-cell': col.isRowHeader }"
6+
role="{{col.isRowHeader ? 'rowheader' : 'gridcell'}}"
7+
ui-grid-cell>
8+
</div>

0 commit comments

Comments
 (0)