From 0beebe2050174ebbc0bbd49ac6b560a6d878ce01 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Mon, 27 Jul 2015 19:22:41 -0400 Subject: [PATCH 1/8] chore(core): All Templates Multiline Makes all of the templates multiline to reduce the number of merge conflics. This also makes git blame easier to use as each tag change will be line dependent. --- src/templates/ui-grid/ui-grid-filter.html | 6 ++-- src/templates/ui-grid/ui-grid-footer.html | 26 +++++++++++++---- .../ui-grid/ui-grid-grid-footer.html | 10 ++++--- src/templates/ui-grid/ui-grid-header.html | 29 ++++++++++++++----- src/templates/ui-grid/ui-grid-row.html | 13 +++++---- src/templates/ui-grid/uiGridCell.html | 6 +++- src/templates/ui-grid/uiGridFooterCell.html | 10 +++++-- src/templates/ui-grid/uiGridHeaderCell.html | 12 ++++++-- src/templates/ui-grid/uiGridMenu.html | 15 +++++++--- .../ui-grid/uiGridRenderContainer.html | 14 ++++++--- src/templates/ui-grid/uiGridViewport.html | 21 ++++++++++---- 11 files changed, 116 insertions(+), 46 deletions(-) diff --git a/src/templates/ui-grid/ui-grid-filter.html b/src/templates/ui-grid/ui-grid-filter.html index 05f5ecbb22..13ab9dadb5 100644 --- a/src/templates/ui-grid/ui-grid-filter.html +++ b/src/templates/ui-grid/ui-grid-filter.html @@ -2,7 +2,8 @@ class="ui-grid-filter-container" ng-repeat="colFilter in col.filters" ng-class="{'ui-grid-filter-cancel-button-hidden' : colFilter.disableCancelFilterButton === true }"> -
+
-
+
- +
+ +
diff --git a/src/features/edit/templates/dropdownEditor.html b/src/features/edit/templates/dropdownEditor.html index d7d6745d73..7d8f8a5ae2 100644 --- a/src/features/edit/templates/dropdownEditor.html +++ b/src/features/edit/templates/dropdownEditor.html @@ -1,5 +1,11 @@
-
- + +
diff --git a/src/features/edit/templates/fileChooserEditor.html b/src/features/edit/templates/fileChooserEditor.html index c719529fbb..30da7b7ad7 100644 --- a/src/features/edit/templates/fileChooserEditor.html +++ b/src/features/edit/templates/fileChooserEditor.html @@ -1,5 +1,12 @@
-
- + +
From e25edc2bfb57ec9b8affd74e709e382ff6b7a775 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Mon, 27 Jul 2015 20:07:34 -0400 Subject: [PATCH 3/8] chore(expandable): All Templates Multiline Makes all of the templates multiline to reduce the number of merge conflics. This also makes git blame easier to use as each tag change will be line dependent. --- .../expandable/templates/expandableRow.html | 11 +++++++---- .../templates/expandableRowHeader.html | 16 ++++++++++------ .../templates/expandableScrollFiller.html | 18 +++++++++--------- .../templates/expandableTopRowHeader.html | 16 ++++++++++------ 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/features/expandable/templates/expandableRow.html b/src/features/expandable/templates/expandableRow.html index 63b303b9b0..827f057d1e 100644 --- a/src/features/expandable/templates/expandableRow.html +++ b/src/features/expandable/templates/expandableRow.html @@ -1,4 +1,7 @@ -
\ No newline at end of file +
+
diff --git a/src/features/expandable/templates/expandableRowHeader.html b/src/features/expandable/templates/expandableRowHeader.html index d9e37e7777..f5d294fdc7 100644 --- a/src/features/expandable/templates/expandableRowHeader.html +++ b/src/features/expandable/templates/expandableRowHeader.html @@ -1,6 +1,10 @@ -
-
- -
-
\ No newline at end of file +
+
+ + +
+
diff --git a/src/features/expandable/templates/expandableScrollFiller.html b/src/features/expandable/templates/expandableScrollFiller.html index e9cf544c7b..3fbd65a634 100644 --- a/src/features/expandable/templates/expandableScrollFiller.html +++ b/src/features/expandable/templates/expandableScrollFiller.html @@ -1,9 +1,9 @@ -
- -
\ No newline at end of file +
+ + +
diff --git a/src/features/expandable/templates/expandableTopRowHeader.html b/src/features/expandable/templates/expandableTopRowHeader.html index 0a7e14230b..ec63fe78db 100644 --- a/src/features/expandable/templates/expandableTopRowHeader.html +++ b/src/features/expandable/templates/expandableTopRowHeader.html @@ -1,6 +1,10 @@ -
-
- -
-
\ No newline at end of file +
+
+ + +
+
From e68e71efc1187c3d01ce597354e17fe76261a381 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Mon, 27 Jul 2015 20:07:58 -0400 Subject: [PATCH 4/8] core(exporter): All Templates Multiline Makes all of the templates multiline to reduce the number of merge conflics. This also makes git blame easier to use as each tag change will be line dependent. --- src/features/exporter/templates/csvLink.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/features/exporter/templates/csvLink.html b/src/features/exporter/templates/csvLink.html index 5eeba5cdf4..86c91346e0 100644 --- a/src/features/exporter/templates/csvLink.html +++ b/src/features/exporter/templates/csvLink.html @@ -1,5 +1,8 @@ - - - LINK_LABEL - + + + LINK_LABEL + From ea37e6a56ef6821a611845499d064b8a412669c8 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Mon, 27 Jul 2015 20:08:50 -0400 Subject: [PATCH 5/8] chore(importer): All Templates Multiline Makes all of the templates multiline to reduce the number of merge conflics. This also makes git blame easier to use as each tag change will be line dependent. --- src/features/importer/templates/importerMenuItem.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/features/importer/templates/importerMenuItem.html b/src/features/importer/templates/importerMenuItem.html index 292bbe653a..19509a7872 100644 --- a/src/features/importer/templates/importerMenuItem.html +++ b/src/features/importer/templates/importerMenuItem.html @@ -1 +1,10 @@ -
    • +
  • +
    + +
    +
    • From d7abb7a4abef1617dbf20bb3471126d7e1ee6a1d Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Mon, 27 Jul 2015 20:09:37 -0400 Subject: [PATCH 6/8] chore(pagination): All Templates Multiline Makes all of the templates multiline to reduce the number of merge conflics. This also makes git blame easier to use as each tag change will be line dependent. --- .../pagination/templates/pagination.html | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/src/features/pagination/templates/pagination.html b/src/features/pagination/templates/pagination.html index 675f6ac030..7064c274ed 100644 --- a/src/features/pagination/templates/pagination.html +++ b/src/features/pagination/templates/pagination.html @@ -17,8 +17,11 @@ ui-grid-one-bind-aria-label="aria.pageToFirst" ng-click="pageFirstPageClick()" ng-disabled="cantPageBackward()"> -
    -
    +
    +
    +
    -
    -
    - - {{showingLow}} - {{showingHigh}} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}} - +
    +
    + + {{showingLow}} + + - + + {{showingHigh}} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}} +
    From 8d8ddea69bc91d6b6984d6384de9f6297b7ad320 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Mon, 27 Jul 2015 20:10:10 -0400 Subject: [PATCH 7/8] chore(selection): All Templates Multiline Makes all of the templates multiline to reduce the number of merge conflics. This also makes git blame easier to use as each tag change will be line dependent. --- .../selection/templates/gridFooterSelectedItems.html | 5 ++++- .../selection/templates/selectionHeaderCell.html | 8 ++++++-- .../selection/templates/selectionRowHeader.html | 11 +++++++---- .../templates/selectionRowHeaderButtons.html | 7 +++++-- .../templates/selectionSelectAllButtons.html | 7 +++++-- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/features/selection/templates/gridFooterSelectedItems.html b/src/features/selection/templates/gridFooterSelectedItems.html index 22a49544ec..cba43a7553 100644 --- a/src/features/selection/templates/gridFooterSelectedItems.html +++ b/src/features/selection/templates/gridFooterSelectedItems.html @@ -1 +1,4 @@ -({{"search.selectedItems" | t}} {{grid.selection.selectedCount}}) \ No newline at end of file + + ({{"search.selectedItems" | t}} {{grid.selection.selectedCount}}) + diff --git a/src/features/selection/templates/selectionHeaderCell.html b/src/features/selection/templates/selectionHeaderCell.html index dde1783ae0..730154d4ef 100644 --- a/src/features/selection/templates/selectionHeaderCell.html +++ b/src/features/selection/templates/selectionHeaderCell.html @@ -1,6 +1,10 @@
    -
    - +
    + +
    diff --git a/src/features/selection/templates/selectionRowHeader.html b/src/features/selection/templates/selectionRowHeader.html index 4e49e4744d..d5ccbf04a6 100644 --- a/src/features/selection/templates/selectionRowHeader.html +++ b/src/features/selection/templates/selectionRowHeader.html @@ -1,5 +1,8 @@ -
    -
    - +
    +
    + +
    -
    \ No newline at end of file +
    diff --git a/src/features/selection/templates/selectionRowHeaderButtons.html b/src/features/selection/templates/selectionRowHeaderButtons.html index 2d9df4ca0c..ed1f8d5885 100644 --- a/src/features/selection/templates/selectionRowHeaderButtons.html +++ b/src/features/selection/templates/selectionRowHeaderButtons.html @@ -1,3 +1,6 @@ -
    +
      -
    \ No newline at end of file +
    diff --git a/src/features/selection/templates/selectionSelectAllButtons.html b/src/features/selection/templates/selectionSelectAllButtons.html index 7d57ef78cc..b4fab6566d 100644 --- a/src/features/selection/templates/selectionSelectAllButtons.html +++ b/src/features/selection/templates/selectionSelectAllButtons.html @@ -1,2 +1,5 @@ -
    -
    \ No newline at end of file +
    +
    From a687105154fc0fbaa60ce5d2d6bb5c12392097b8 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Mon, 27 Jul 2015 20:10:43 -0400 Subject: [PATCH 8/8] chore(tree-base): All Templates Multiline Makes all of the templates multiline to reduce the number of merge conflics. This also makes git blame easier to use as each tag change will be line dependent. --- .../templates/treeBaseExpandAllButtons.html | 7 +++++-- .../tree-base/templates/treeBaseHeaderCell.html | 7 +++++-- .../tree-base/templates/treeBaseRowHeader.html | 6 ++++-- .../templates/treeBaseRowHeaderButtons.html | 12 +++++++++--- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/features/tree-base/templates/treeBaseExpandAllButtons.html b/src/features/tree-base/templates/treeBaseExpandAllButtons.html index 14e9efbc2c..b43348beb6 100644 --- a/src/features/tree-base/templates/treeBaseExpandAllButtons.html +++ b/src/features/tree-base/templates/treeBaseExpandAllButtons.html @@ -1,2 +1,5 @@ -
    -
    \ No newline at end of file +
    +
    diff --git a/src/features/tree-base/templates/treeBaseHeaderCell.html b/src/features/tree-base/templates/treeBaseHeaderCell.html index 374bb7be06..4d564d3483 100644 --- a/src/features/tree-base/templates/treeBaseHeaderCell.html +++ b/src/features/tree-base/templates/treeBaseHeaderCell.html @@ -1,5 +1,8 @@
    -
    - +
    + +
    diff --git a/src/features/tree-base/templates/treeBaseRowHeader.html b/src/features/tree-base/templates/treeBaseRowHeader.html index d6bc931047..6fda8bd760 100644 --- a/src/features/tree-base/templates/treeBaseRowHeader.html +++ b/src/features/tree-base/templates/treeBaseRowHeader.html @@ -1,3 +1,5 @@ -
    - +
    + +
    diff --git a/src/features/tree-base/templates/treeBaseRowHeaderButtons.html b/src/features/tree-base/templates/treeBaseRowHeaderButtons.html index 8db33c5ed7..0185a60953 100644 --- a/src/features/tree-base/templates/treeBaseRowHeaderButtons.html +++ b/src/features/tree-base/templates/treeBaseRowHeaderButtons.html @@ -1,4 +1,10 @@ -
    - +
    + +   -
    \ No newline at end of file +