Skip to content

Commit 9b3ae10

Browse files
Merge pull request patternfly#19 from erundle/master
Removing the view folders and putting each component in its own folder
2 parents 23c8e47 + c4f0a7a commit 9b3ae10

12 files changed

+19
-19
lines changed

dist/angular-patternfly.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ angular.module('patternfly.form').directive('pfFormButtons', function () {
135135
return {
136136
replace: true,
137137
require: '^form',
138-
templateUrl: 'form/views/form-buttons.html',
138+
templateUrl: 'form/form-buttons/form-buttons.html',
139139
scope: {
140140
pfHandleCancel: '&pfOnCancel',
141141
pfHandleSave: '&pfOnSave',
@@ -233,7 +233,7 @@ angular.module('patternfly.form').directive('pfFormGroup', function () {
233233
transclude: true,
234234
replace: true,
235235
require: '^form',
236-
templateUrl: 'form/views/form-group.html',
236+
templateUrl: 'form/form-group/form-group.html',
237237
scope: {
238238
'pfLabel': '@',
239239
'pfField': '@',
@@ -252,7 +252,7 @@ angular.module('patternfly.form').directive('pfFormGroup', function () {
252252
if (!iAttrs.pfInputClass) {
253253
iAttrs.pfInputClass = 'col-sm-5';
254254
}
255-
255+
256256
if (!scope.pfField) {
257257
scope.pfField = input.attr('id');
258258
}
@@ -530,7 +530,7 @@ angular.module('patternfly.notification', []).provider('Notifications', function
530530
'pfNotificationIndex': '='
531531
},
532532
restrict: 'E',
533-
templateUrl: 'notification/views/notification.html'
533+
templateUrl: 'notification/notification.html'
534534
};
535535
})
536536
/**
@@ -597,7 +597,7 @@ angular.module('patternfly.notification', []).provider('Notifications', function
597597
.directive('pfNotificationList', function () {
598598
return {
599599
restrict: 'E',
600-
templateUrl: 'notification/views/notification-list.html'
600+
templateUrl: 'notification/notification-list.html'
601601
};
602602
});
603603
;'use strict';
@@ -864,25 +864,25 @@ angular.module('patternfly.validation', []).directive('pfValidation', function($
864864
});;angular.module('patternfly.form').run(['$templateCache', function($templateCache) {
865865
'use strict';
866866

867-
$templateCache.put('form/views/form-buttons.html',
867+
$templateCache.put('form/form-buttons/form-buttons.html',
868868
"<div class=form-group><div class=\"{{ pfButtonContainerClass }}\"><div class=\"control-group buttons\"><button class=\"btn btn-default\" type=button ng-click=pfHandleCancel() ng-disabled=pfWorking translate>Cancel</button> <button class=\"btn btn-primary\" ng-click=\"pfHandleSave(); pfWorking = true\" ng-disabled=\"isInvalid() || pfWorking\"><i class=\"icon-spinner icon-spin\" ng-show=pfWorking></i> <span ng-show=pfWorking translate>Saving...</span> <span ng-hide=pfWorking translate>Save</span></button></div></div></div>"
869869
);
870870

871871

872-
$templateCache.put('form/views/form-group.html',
872+
$templateCache.put('form/form-group/form-group.html',
873873
"<div class=form-group ng-class=\"{ 'has-error' : hasErrors() }\"><label for=\"{{ pfField }}\" class=\"control-label {{ pfLabelClass }}\">{{ pfLabel }}</label><div class=\"{{ pfInputClass }}\"><span ng-transclude></span> <span class=help-block ng-show=error.messages><ul><li ng-repeat=\"message in error.messages\">{{ message }}</li></ul></span></div></div>"
874874
);
875875

876876
}]);
877877
;angular.module('patternfly.notification').run(['$templateCache', function($templateCache) {
878878
'use strict';
879879

880-
$templateCache.put('notification/views/notification-list.html',
880+
$templateCache.put('notification/notification-list.html',
881881
"<div data-ng-show=\"notifications.data.length > 0\"><div ng-repeat=\"notification in notifications.data\"><pf-notification pf-notification-type=notification.type pf-notification-header=notification.header pf-notification-message=notification.message pf-notification-persistent=notification.isPersistent pf-notification-index=$index></pf-notification></div></div>"
882882
);
883883

884884

885-
$templateCache.put('notification/views/notification.html',
885+
$templateCache.put('notification/notification.html',
886886
"<div class=\"alert alert-{{pfNotificationType}}\"><button ng-show=pfNotificationPersistent type=button class=close ng-click=$parent.notifications.remove($index)><span aria-hidden=true>&times;</span><span class=sr-only>Close</span></button> <span class=\"pficon pficon-ok\" ng-show=\"pfNotificationType == 'success'\"></span> <span class=\"pficon pficon-info\" ng-show=\"pfNotificationType == 'info'\"></span> <span class=pficon-layered ng-show=\"pfNotificationType == 'danger'\"><span class=\"pficon pficon-error-octagon\"></span> <span class=\"pficon pficon-error-exclamation\"></span></span> <span class=pficon-layered ng-show=\"pfNotificationType == 'warning'\"><span class=\"pficon pficon-warning-triangle\"></span> <span class=\"pficon pficon-warning-exclamation\"></span></span> <strong>{{pfNotificationHeader}}</strong> {{pfNotificationMessage}}</div>"
887887
);
888888

dist/angular-patternfly.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/form/form-buttons.directive.js renamed to src/form/form-buttons/form-buttons.directive.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ angular.module('patternfly.form').directive('pfFormButtons', function () {
5757
return {
5858
replace: true,
5959
require: '^form',
60-
templateUrl: 'form/views/form-buttons.html',
60+
templateUrl: 'form/form-buttons/form-buttons.html',
6161
scope: {
6262
pfHandleCancel: '&pfOnCancel',
6363
pfHandleSave: '&pfOnSave',

src/form/form-group.directive.js renamed to src/form/form-group/form-group.directive.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ angular.module('patternfly.form').directive('pfFormGroup', function () {
6868
transclude: true,
6969
replace: true,
7070
require: '^form',
71-
templateUrl: 'form/views/form-group.html',
71+
templateUrl: 'form/form-group/form-group.html',
7272
scope: {
7373
'pfLabel': '@',
7474
'pfField': '@',
@@ -87,7 +87,7 @@ angular.module('patternfly.form').directive('pfFormGroup', function () {
8787
if (!iAttrs.pfInputClass) {
8888
iAttrs.pfInputClass = 'col-sm-5';
8989
}
90-
90+
9191
if (!scope.pfField) {
9292
scope.pfField = input.attr('id');
9393
}
File renamed without changes.

src/notification/notification.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ angular.module('patternfly.notification', []).provider('Notifications', function
252252
'pfNotificationIndex': '='
253253
},
254254
restrict: 'E',
255-
templateUrl: 'notification/views/notification.html'
255+
templateUrl: 'notification/notification.html'
256256
};
257257
})
258258
/**
@@ -319,6 +319,6 @@ angular.module('patternfly.notification', []).provider('Notifications', function
319319
.directive('pfNotificationList', function () {
320320
return {
321321
restrict: 'E',
322-
templateUrl: 'notification/views/notification-list.html'
322+
templateUrl: 'notification/notification-list.html'
323323
};
324324
});

test/form/form-buttons.directive.spec.js renamed to test/form/form-buttons/form-buttons.directive.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ describe('Directive: pfFormButtons', function() {
33

44
beforeEach(module(
55
'patternfly.form',
6-
'form/views/form-buttons.html'
6+
'form/form-buttons/form-buttons.html'
77
));
88

99
beforeEach(inject(function(_$compile_, _$rootScope_) {

test/form/form-group.directive.spec.js renamed to test/form/form-group/form-group.directive.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ describe('Directive: pfFormGroup', function() {
33

44
beforeEach(module(
55
'patternfly.form',
6-
'form/views/form-group.html'
6+
'form/form-group/form-group.html'
77
));
88

99
beforeEach(inject(function(_$compile_, _$rootScope_) {

test/notification/notification.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ describe('pf-notification', function () {
44

55
beforeEach(module(
66
'patternfly.notification',
7-
'notification/views/notification.html',
8-
'notification/views/notification-list.html'
7+
'notification/notification.html',
8+
'notification/notification-list.html'
99
));
1010

1111
beforeEach(inject(function (_$rootScope_, _$compile_, _$timeout_, _Notifications_) {

0 commit comments

Comments
 (0)