Skip to content

Commit 0ce5a7a

Browse files
authored
Merge pull request #12 from Wtower/v0-2-0
Version 0.2.0
2 parents 4e2f0ea + 34ed9aa commit 0ce5a7a

File tree

21 files changed

+1044
-26
lines changed

21 files changed

+1044
-26
lines changed

.gitignore

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1+
# Node.js
12
node_modules
2-
coverage
3-
.idea/
43
npm-debug.log
4+
5+
# Coverage
6+
coverage/
7+
8+
# IDE
9+
.idea/
10+
11+
# Gulp build intermediate files
12+
build/css/gentelella.*.css
13+
build/partials.js
14+
# .min files do not count in github language
15+
# https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml#L56

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,17 @@ Use:
9797

9898
npm install -S ng-gentelella
9999

100-
Then include the `node_modules/ng-gentelella/gentelella` js files in your html or build system (eg gulp).
100+
### Static files
101101

102-
Also make the above folder public or have a build system copy its html files in order for the templates to
103-
be available for Angular. Expose them as `/static/gentelella`:
102+
Built files are conveniently provided under the `build/` directory. These include all gentelella and ng-gentelella
103+
css and js files.
104104

105-
```
106-
app.use('/static/ng-gentelella', express.static(path.join(__dirname, 'node_modules', 'ng-gentelella', 'gentelella')));
107-
```
105+
Otherwise, include the `node_modules/ng-gentelella/gentelella` js files in your html or build system (eg gulp).
106+
It is recommended that you include the templates path `node_modules/*ng-gentelella/gentelella/**/*.html` using
107+
[some html2js module]
108+
(http://stackoverflow.com/questions/21103724/angular-directive-templateurl-relative-to-js-file/41140644#41140644).
109+
Alternatively you can expose the template files as `/ng-gentelella` with
110+
`app.use('/ng-gentelella', express.static(path.join(__dirname, 'node_modules', 'ng-gentelella')));`.
108111

109112
### Develop
110113

build/css/style.min.css

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/js/index.min.js

Lines changed: 318 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gentelella/form-field-checkbox/form-field-checkbox.component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
angular
88
.module('formFieldCheckbox')
99
.component('formFieldCheckbox', {
10-
templateUrl: 'static/ng-gentelella/form-field-checkbox/form-field-checkbox.template.html',
10+
templateUrl: 'ng-gentelella/gentelella/form-field-checkbox/form-field-checkbox.template.html',
1111
bindings: {
1212
fieldId: '@',
1313
fieldLabel: '@',

gentelella/form-field-image/form-field-image.component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
angular
88
.module('formFieldImage')
99
.component('formFieldImage', {
10-
templateUrl: 'static/ng-gentelella/form-field-image/form-field-image.template.html',
10+
templateUrl: 'ng-gentelella/gentelella/form-field-image/form-field-image.template.html',
1111
bindings: {
1212
fieldId: '@',
1313
fieldLabel: '@',

gentelella/form-field-select/form-field-select.component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
angular
99
.module('formFieldSelect')
1010
.component('formFieldSelect', {
11-
templateUrl: 'static/ng-gentelella/form-field-select/form-field-select.template.html',
11+
templateUrl: 'ng-gentelella/gentelella/form-field-select/form-field-select.template.html',
1212
bindings: {
1313
fieldId: '@',
1414
fieldLabel: '@',

gentelella/form-field-text/form-field-text.component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
angular
88
.module('formFieldText')
99
.component('formFieldText', {
10-
templateUrl: 'static/ng-gentelella/form-field-text/form-field-text.template.html',
10+
templateUrl: 'ng-gentelella/gentelella/form-field-text/form-field-text.template.html',
1111
bindings: {
1212
fieldId: '@',
1313
fieldType: '@',

gentelella/ga-dashboard-counter/ga-dashboard-counter.component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
angular
66
.module('gaDashboardCounter')
77
.component('gaDashboardCounter', {
8-
templateUrl: 'static/ng-gentelella/ga-dashboard-counter/ga-dashboard-counter.template.html',
8+
templateUrl: 'ng-gentelella/gentelella/ga-dashboard-counter/ga-dashboard-counter.template.html',
99
bindings: {
1010
counterIcon: '@',
1111
counterVar: '<',

gentelella/ga-dashboard-graph-flot/ga-dashboard-graph-flot.component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
angular
66
.module('gaDashboardGraphFlot')
77
.component('gaDashboardGraphFlot', {
8-
templateUrl: 'static/ng-gentelella/ga-dashboard-graph-flot/ga-dashboard-graph-flot.template.html',
8+
templateUrl: 'ng-gentelella/gentelella/ga-dashboard-graph-flot/ga-dashboard-graph-flot.template.html',
99
bindings: {
1010
graphTitle: '@',
1111
graphSubTitle: '@',

0 commit comments

Comments
 (0)