-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into NG1659-monthview-activedate
- Loading branch information
Showing
16 changed files
with
1,172 additions
and
1,052 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 18.13.0 | ||
| 20.13.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
app/views/components/contextualactionpanel/test-propagate-compact.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
|
|
||
| <div class="row"> | ||
| <div class="six columns"> | ||
|
|
||
| <button type="button" class="btn-secondary contextual-action-panel-trigger" data-options='{ fullsize: "responsive", modalSettings: {propagateStyle: "true", compactPanel: "true"} }'> | ||
| Contextual Action Panel | ||
| </button> | ||
| <div class="contextual-action-panel"> | ||
| <div class="toolbar"> | ||
| <div class="title">Company Information</div> | ||
| <div class="buttonset"> | ||
| <button class="btn" type="button"> | ||
| <svg class="icon" focusable="false" aria-hidden="true" role="presentation"> | ||
| <use href="#icon-save"></use> | ||
| </svg> | ||
| <span>Save</span> | ||
| </button> | ||
| <div class="separator"></div> | ||
| <button name="close" class="btn" type="button"> | ||
| <svg class="icon icon-close" focusable="false" aria-hidden="true" role="presentation"> | ||
| <use href="#icon-close"></use> | ||
| </svg> | ||
| <span>Close</span> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| <div class="row" style="width:660px; height:350px"> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <div class="full-height full-width"> | ||
| <div id="datagrid" class="datagrid"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <script> | ||
| $('body').one('initialized', function () { | ||
| var grid, | ||
| columns = [], | ||
| data = []; | ||
|
|
||
| var url = '{{basepath}}api/compressors?pageNum=1&pageSize=100'; | ||
| $.getJSON(url, function (res) { | ||
| data = res.data; | ||
|
|
||
| // Define Columns for the Grid. | ||
| columns.push({ id: 'productName', name: 'Product Name', field: 'productName', formatter: Soho.Formatters.Hyperlink, href: 'http://www.google.com', target: '_blank' }); | ||
| columns.push({ id: 'quantity', name: 'Quantity', field: 'quantity', editor: Soho.Editors.Input }); | ||
|
|
||
| // Init and get the api for the grid | ||
| $('#datagrid').datagrid({ | ||
| columns: columns, | ||
| dataset: data, | ||
| paging: true, | ||
| pagesize: 50, | ||
| editable: true, | ||
| frozenColumns: { | ||
| left: ['productName'] | ||
| }, | ||
| toolbar: { title: 'Compressors', actions: true, rowHeight: true, results: true, personalize: true, exportToExcel: true } | ||
| }); | ||
| }); | ||
| }); | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.