Skip to content

Commit 072f014

Browse files
ismcagdasismcagdas
committed
resolved #62
1 parent d6819f3 commit 072f014

File tree

821 files changed

+50670
-29701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

821 files changed

+50670
-29701
lines changed

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj‎

Lines changed: 65 additions & 77 deletions
Large diffs are not rendered by default.

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/app.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414

1515
//Configuration for Angular UI routing.
1616
app.config([
17-
'$stateProvider', '$urlRouterProvider',
18-
function($stateProvider, $urlRouterProvider) {
17+
'$stateProvider', '$urlRouterProvider', '$locationProvider',
18+
function ($stateProvider, $urlRouterProvider, $locationProvider) {
19+
$locationProvider.hashPrefix('');
1920
$urlRouterProvider.otherwise('/');
2021

2122
if (abp.auth.hasPermission('Pages.Users')) {

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/tenants/createModal.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(function () {
22
angular.module('app').controller('app.views.tenants.createModal', [
3-
'$scope', '$modalInstance', 'abp.services.app.tenant',
4-
function ($scope, $modalInstance, tenantService) {
3+
'$scope', '$uibModalInstance', 'abp.services.app.tenant',
4+
function ($scope, $uibModalInstance, tenantService) {
55
var vm = this;
66

77
vm.tenant = {
@@ -16,14 +16,14 @@
1616
tenantService.createTenant(vm.tenant)
1717
.then(function () {
1818
abp.notify.info(App.localize('SavedSuccessfully'));
19-
$modalInstance.close();
19+
$uibModalInstance.close();
2020
}).finally(function () {
2121
abp.ui.clearBusy();
2222
});
2323
};
2424

2525
vm.cancel = function () {
26-
$modalInstance.dismiss();
26+
$uibModalInstance.dismiss();
2727
};
2828
}
2929
]);

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/tenants/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(function() {
22
angular.module('app').controller('app.views.tenants.index', [
3-
'$scope', '$modal', 'abp.services.app.tenant',
4-
function ($scope, $modal, tenantService) {
3+
'$scope', '$uibModal', 'abp.services.app.tenant',
4+
function ($scope, $uibModal, tenantService) {
55
var vm = this;
66

77
vm.tenants = [];
@@ -13,7 +13,7 @@
1313
}
1414

1515
vm.openTenantCreationModal = function() {
16-
var modalInstance = $modal.open({
16+
var modalInstance = $uibModal.open({
1717
templateUrl: '/App/Main/views/tenants/createModal.cshtml',
1818
controller: 'app.views.tenants.createModal as vm',
1919
backdrop: 'static'

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/users/createModal.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(function () {
22
angular.module('app').controller('app.views.users.createModal', [
3-
'$scope', '$modalInstance', 'abp.services.app.user',
4-
function ($scope, $modalInstance, userService) {
3+
'$scope', '$uibModalInstance', 'abp.services.app.user',
4+
function ($scope, $uibModalInstance, userService) {
55
var vm = this;
66

77
vm.user = {
@@ -12,12 +12,12 @@
1212
userService.createUser(vm.user)
1313
.then(function () {
1414
abp.notify.info(App.localize('SavedSuccessfully'));
15-
$modalInstance.close();
15+
$uibModalInstance.close();
1616
});
1717
};
1818

1919
vm.cancel = function () {
20-
$modalInstance.dismiss();
20+
$uibModalInstance.dismiss({});
2121
};
2222
}
2323
]);

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/users/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(function() {
22
angular.module('app').controller('app.views.users.index', [
3-
'$scope', '$modal', 'abp.services.app.user',
4-
function ($scope, $modal, userService) {
3+
'$scope', '$uibModal', 'abp.services.app.user',
4+
function ($scope, $uibModal, userService) {
55
var vm = this;
66

77
vm.users = [];
@@ -13,7 +13,7 @@
1313
}
1414

1515
vm.openUserCreationModal = function() {
16-
var modalInstance = $modal.open({
16+
var modalInstance = $uibModal.open({
1717
templateUrl: '/App/Main/views/users/createModal.cshtml',
1818
controller: 'app.views.users.createModal as vm',
1919
backdrop: 'static'

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Content/ui-bootstrap-csp.css‎

Lines changed: 110 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,113 @@
33
.ng-animate.item:not(.left):not(.right) {
44
-webkit-transition: 0s ease-in-out left;
55
transition: 0s ease-in-out left
6-
}
6+
}
7+
.uib-datepicker .uib-title {
8+
width: 100%;
9+
}
10+
11+
.uib-day button, .uib-month button, .uib-year button {
12+
min-width: 100%;
13+
}
14+
15+
.uib-left, .uib-right {
16+
width: 100%
17+
}
18+
19+
.uib-position-measure {
20+
display: block !important;
21+
visibility: hidden !important;
22+
position: absolute !important;
23+
top: -9999px !important;
24+
left: -9999px !important;
25+
}
26+
27+
.uib-position-scrollbar-measure {
28+
position: absolute !important;
29+
top: -9999px !important;
30+
width: 50px !important;
31+
height: 50px !important;
32+
overflow: scroll !important;
33+
}
34+
35+
.uib-position-body-scrollbar-measure {
36+
overflow: scroll !important;
37+
}
38+
.uib-datepicker-popup.dropdown-menu {
39+
display: block;
40+
float: none;
41+
margin: 0;
42+
}
43+
44+
.uib-button-bar {
45+
padding: 10px 9px 2px;
46+
}
47+
48+
[uib-tooltip-popup].tooltip.top-left > .tooltip-arrow,
49+
[uib-tooltip-popup].tooltip.top-right > .tooltip-arrow,
50+
[uib-tooltip-popup].tooltip.bottom-left > .tooltip-arrow,
51+
[uib-tooltip-popup].tooltip.bottom-right > .tooltip-arrow,
52+
[uib-tooltip-popup].tooltip.left-top > .tooltip-arrow,
53+
[uib-tooltip-popup].tooltip.left-bottom > .tooltip-arrow,
54+
[uib-tooltip-popup].tooltip.right-top > .tooltip-arrow,
55+
[uib-tooltip-popup].tooltip.right-bottom > .tooltip-arrow,
56+
[uib-tooltip-html-popup].tooltip.top-left > .tooltip-arrow,
57+
[uib-tooltip-html-popup].tooltip.top-right > .tooltip-arrow,
58+
[uib-tooltip-html-popup].tooltip.bottom-left > .tooltip-arrow,
59+
[uib-tooltip-html-popup].tooltip.bottom-right > .tooltip-arrow,
60+
[uib-tooltip-html-popup].tooltip.left-top > .tooltip-arrow,
61+
[uib-tooltip-html-popup].tooltip.left-bottom > .tooltip-arrow,
62+
[uib-tooltip-html-popup].tooltip.right-top > .tooltip-arrow,
63+
[uib-tooltip-html-popup].tooltip.right-bottom > .tooltip-arrow,
64+
[uib-tooltip-template-popup].tooltip.top-left > .tooltip-arrow,
65+
[uib-tooltip-template-popup].tooltip.top-right > .tooltip-arrow,
66+
[uib-tooltip-template-popup].tooltip.bottom-left > .tooltip-arrow,
67+
[uib-tooltip-template-popup].tooltip.bottom-right > .tooltip-arrow,
68+
[uib-tooltip-template-popup].tooltip.left-top > .tooltip-arrow,
69+
[uib-tooltip-template-popup].tooltip.left-bottom > .tooltip-arrow,
70+
[uib-tooltip-template-popup].tooltip.right-top > .tooltip-arrow,
71+
[uib-tooltip-template-popup].tooltip.right-bottom > .tooltip-arrow,
72+
[uib-popover-popup].popover.top-left > .arrow,
73+
[uib-popover-popup].popover.top-right > .arrow,
74+
[uib-popover-popup].popover.bottom-left > .arrow,
75+
[uib-popover-popup].popover.bottom-right > .arrow,
76+
[uib-popover-popup].popover.left-top > .arrow,
77+
[uib-popover-popup].popover.left-bottom > .arrow,
78+
[uib-popover-popup].popover.right-top > .arrow,
79+
[uib-popover-popup].popover.right-bottom > .arrow,
80+
[uib-popover-html-popup].popover.top-left > .arrow,
81+
[uib-popover-html-popup].popover.top-right > .arrow,
82+
[uib-popover-html-popup].popover.bottom-left > .arrow,
83+
[uib-popover-html-popup].popover.bottom-right > .arrow,
84+
[uib-popover-html-popup].popover.left-top > .arrow,
85+
[uib-popover-html-popup].popover.left-bottom > .arrow,
86+
[uib-popover-html-popup].popover.right-top > .arrow,
87+
[uib-popover-html-popup].popover.right-bottom > .arrow,
88+
[uib-popover-template-popup].popover.top-left > .arrow,
89+
[uib-popover-template-popup].popover.top-right > .arrow,
90+
[uib-popover-template-popup].popover.bottom-left > .arrow,
91+
[uib-popover-template-popup].popover.bottom-right > .arrow,
92+
[uib-popover-template-popup].popover.left-top > .arrow,
93+
[uib-popover-template-popup].popover.left-bottom > .arrow,
94+
[uib-popover-template-popup].popover.right-top > .arrow,
95+
[uib-popover-template-popup].popover.right-bottom > .arrow {
96+
top: auto;
97+
bottom: auto;
98+
left: auto;
99+
right: auto;
100+
margin: 0;
101+
}
102+
103+
[uib-popover-popup].popover,
104+
[uib-popover-html-popup].popover,
105+
[uib-popover-template-popup].popover {
106+
display: block !important;
107+
}
108+
109+
.uib-time input {
110+
width: 50px;
111+
}
112+
113+
[uib-typeahead-popup].dropdown-menu {
114+
display: block;
115+
}

0 commit comments

Comments
 (0)