-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop'
- Loading branch information
Showing
35 changed files
with
1,471 additions
and
704 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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| { | ||
| "_links": { | ||
| "self": { | ||
| "href": "http://husky.lo:7878/admin/api/datagrid?pageSize=4&sortBy=content1&sortOrder=desc" | ||
| } | ||
| }, | ||
| "_embedded": { | ||
| "items": [ | ||
| { | ||
| "id": 1, | ||
| "status": 0, | ||
| "task": "Unpublish", | ||
| "schedule": "2014-02-19T22:04:40+0100", | ||
| "created": "Manually", | ||
| "creator": "Donald Duck" | ||
| }, | ||
| { | ||
| "id": 2, | ||
| "status": 0, | ||
| "task": "Unpublish", | ||
| "schedule": "2015-02-19T22:04:40+0100", | ||
| "created": "Manually", | ||
| "creator": "Mickey Mouse" | ||
| }, | ||
| { | ||
| "id": 3, | ||
| "status": 1, | ||
| "task": "Publish", | ||
| "schedule": "2016-02-19T22:04:40+0100", | ||
| "created": "From event", | ||
| "creator": "Dagobert Duck" | ||
| }, | ||
| { | ||
| "id": 4, | ||
| "status": 2, | ||
| "task": "Send message", | ||
| "schedule": "2014-05-19T22:04:40+0100", | ||
| "created": "From event", | ||
| "creator": "Donald Duck" | ||
| }, | ||
| { | ||
| "id": 5, | ||
| "status": 0, | ||
| "task": "Publish", | ||
| "schedule": "2016-03-19T22:04:40+0100", | ||
| "created": "Manually", | ||
| "creator": "Trick Duck" | ||
| } | ||
| ] | ||
| }, | ||
| "total": 5, | ||
| "pages": 1, | ||
| "page": 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
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,69 @@ | ||
| <!doctype html> | ||
| <!--[if lt IE 7]> | ||
| <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]--> | ||
| <!--[if IE 7]> | ||
| <html class="no-js lt-ie9 lt-ie8"> <![endif]--> | ||
| <!--[if IE 8]> | ||
| <html class="no-js lt-ie9"> <![endif]--> | ||
| <!--[if gt IE 8]><!--> | ||
| <html class="no-js"> <!--<![endif]--> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> | ||
| <title>Datagrid demo</title> | ||
| <meta name="description" content=""> | ||
| <meta name="viewport" content="width=device-width"> | ||
| <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> | ||
| <link rel="stylesheet" href="../../../dist/husky.css"> | ||
|
|
||
| <style type="text/css"> | ||
| #content { | ||
| max-width: 1200px; | ||
| margin: 0 0; | ||
| padding: 0 50px; | ||
| } | ||
|
|
||
| h1 { | ||
| padding: 20px 0 30px; | ||
| } | ||
|
|
||
| body { | ||
| overflow: auto; | ||
| } | ||
|
|
||
| .task-state { | ||
| width: 30px; | ||
| text-align: center; | ||
| margin-left: 10px; | ||
| } | ||
|
|
||
| .task-state.fa-check-circle { | ||
| color: green; | ||
| } | ||
|
|
||
| .task-state.fa-exclamation-triangle { | ||
| color: yellow; | ||
| } | ||
|
|
||
| .task-state.fa-ban { | ||
| color: red; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div class="page"> | ||
| <div id="content" class="grid"> | ||
| <h2 class="divider m-top-30">datagrid | default</h2> | ||
| <div id="datagrid-default" class="grid-row"></div> | ||
|
|
||
| <h2 class="divider m-top-30">datagrid | styled with datagrid-table-view-light.scss</h2> | ||
| <div id="datagrid-light" class="grid-row"></div> | ||
| </div> | ||
|
|
||
| <script src="../../../bower_components/jquery/jquery.js"></script> | ||
| <script src="../../../bower_components/requirejs/require.js"></script> | ||
| <script src="../../js/defaults.js"></script> | ||
| <script src="script.js"></script> | ||
| </div> | ||
| </body> | ||
| </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,90 @@ | ||
| require.config({ | ||
| baseUrl: '../../../' | ||
| }); | ||
|
|
||
| require(['lib/husky'], function(Husky) { | ||
| 'use strict'; | ||
|
|
||
| var app = new Husky({debug: {enable: true}}), | ||
| matchings = [ | ||
| { | ||
| name: 'id', | ||
| translation: 'id', | ||
| disabled: true | ||
| }, | ||
| { | ||
| name: 'status', | ||
| translation: 'status' | ||
| }, | ||
| { | ||
| name: 'task', | ||
| translation: 'name', | ||
| sortable: true | ||
| }, | ||
| { | ||
| name: 'schedule', | ||
| translation: 'schedule', | ||
| type: 'date', | ||
| sortable: true | ||
| }, | ||
| { | ||
| name: 'created', | ||
| translation: 'created' | ||
| }, | ||
| { | ||
| name: 'creator', | ||
| translation: 'creator', | ||
| } | ||
| ], | ||
| contentFilter = { | ||
| status: function(content, argument, recordId) { | ||
| var iconString = 'fa-question'; | ||
| switch(content) { | ||
| case 0: | ||
| iconString = 'fa-check-circle'; | ||
| break; | ||
| case 1: | ||
| iconString = 'fa-exclamation-triangle'; | ||
| break; | ||
| case 2: | ||
| iconString = 'fa-ban'; | ||
| break; | ||
| } | ||
| return '<span class="' + iconString + ' task-state"/>'; | ||
| } | ||
| }; | ||
|
|
||
| app.start([ | ||
| { | ||
| name: 'datagrid@husky', | ||
| options: { | ||
| el: '#datagrid-default', | ||
| url: 'http://husky.lo:7878/admin/api/datagrid/tasks', | ||
| contentFilters: contentFilter, | ||
| viewOptions: { | ||
| table: { | ||
| selectItem: false | ||
| } | ||
| }, | ||
| pagination: false, | ||
| matchings: matchings | ||
| } | ||
| }, | ||
| { | ||
| name: 'datagrid@husky', | ||
| options: { | ||
| el: '#datagrid-light', | ||
| url: 'http://husky.lo:7878/admin/api/datagrid/tasks', | ||
| contentFilters: contentFilter, | ||
| viewOptions: { | ||
| table: { | ||
| selectItem: false, | ||
| cssClass: 'light' | ||
| } | ||
| }, | ||
| pagination: false, | ||
| matchings: matchings | ||
| } | ||
| }, | ||
| ]); | ||
| }); |
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,37 @@ | ||
| <!doctype html> | ||
| <!--[if lt IE 7]> | ||
| <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]--> | ||
| <!--[if IE 7]> | ||
| <html class="no-js lt-ie9 lt-ie8"> <![endif]--> | ||
| <!--[if IE 8]> | ||
| <html class="no-js lt-ie9"> <![endif]--> | ||
| <!--[if gt IE 8]><!--> | ||
| <html class="no-js"> <!--<![endif]--> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> | ||
| <title>Autocomplete Demo</title> | ||
| <meta name="description" content=""> | ||
| <meta name="viewport" content="width=device-width"> | ||
| <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> | ||
| <link rel="stylesheet" href="../../dist/husky.min.css"> | ||
| <style> | ||
| .container { | ||
| width: 800px; | ||
| margin: 30px auto; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div class="container"> | ||
| <div class="grid"> | ||
| <div class="grid-row"> | ||
| <a href="#" data-badge="10">I have a notification</a> | ||
| </div> | ||
| <div class="grid-row"> | ||
| <a href="#">I havent one</a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </body> | ||
| </html> |
Oops, something went wrong.