diff --git a/bower.json b/bower.json index d5ded8935..ac889b885 100644 --- a/bower.json +++ b/bower.json @@ -20,16 +20,16 @@ "amcharts": "~3.15.2", "amcharts-stock": "*", "ammap": "~3.14.5", - "angular": "~1.4.6", + "angular": "~1.4.8", "angular-route": "~1.4.6", "angular-slimscroll": "~1.1.5", "angular-smart-table": "~2.1.3", - "angular-toastr": "~1.5.0", + "angular-toastr": "~1.6.0", "angular-touch": "~1.4.6", "angular-ui-sortable": "~0.13.4", "animate.css": "~3.4.0", "bootstrap": "~3.3.5", - "bootstrap-select": "~1.7.3", + "bootstrap-select": "~1.9.3", "bootstrap-switch": "~3.3.2", "bootstrap-tagsinput": "~0.5.0", "font-awesome": "fontawesome#~4.4.0", @@ -77,7 +77,7 @@ "bootstrap": { "main": [ "dist/css/bootstrap.css", - "dist/js/bootstrap.js" + "js/dropdown.js" ] }, "slimScroll": { diff --git a/src/app/app.js b/src/app/app.js index 722953296..1646f8d62 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -11,6 +11,7 @@ angular.module('BlurAdmin', [ "xeditable", 'ui.slimscroll', 'ngJsTree', + 'angular-progress-button-styles', 'BlurAdmin.theme', 'BlurAdmin.pages', diff --git a/src/app/pages/components/mail/list/mailList.html b/src/app/pages/components/mail/list/mailList.html index 981fddb22..afaeb5797 100644 --- a/src/app/pages/components/mail/list/mailList.html +++ b/src/app/pages/components/mail/list/mailList.html @@ -1,16 +1,15 @@
-
+
-
- -
    +
    • Action
    • Another action
    • Something else here
      • @@ -22,29 +21,28 @@
      + class="side-message-navigation-item little-human shineHover {{m.tag}}"> - - + - -
      		+
      {{m.name.split(' ')[0] + ' ' + m.name.split(' ')[1][0]}}.
      {{m.tag}}
      		 +
      {{m.subject}}
      		+
      {{m.body | plainText}}
      		 diff --git a/src/app/pages/components/mail/mailMessages.js b/src/app/pages/components/mail/mailMessages.js index 90bb8f64d..c6af52cb5 100644 --- a/src/app/pages/components/mail/mailMessages.js +++ b/src/app/pages/components/mail/mailMessages.js @@ -176,6 +176,19 @@ "tag": "study", "labels": ['draft'] }, + { + "id": "8223xsdaa", + "name": "Andrey Hrabouski", + "subject": "Car rent", + "date": "2015-02-25T10:58:58", + "body": $sce.trustAsHtml("

      Hey Andrey.

      " + + "

      Cras tincidunt fermentum lectus, quis scelerisque lorem volutpat sed. Sed quis orci sed nisl sagittis viverra id at mauris. Nam venenatis mi nibh. Sed fringilla mattis vehic

      "), + "pic": "img/Andrey.png", + "email": "lakeishaphillips@mail.com", + "position": "Mobile Developer", + "tag": "family", + "labels": ['draft'] + }, { "id": "9391xdsff", "name": "Vlad Lugovsky", diff --git a/src/app/pages/components/tree/tree.html b/src/app/pages/components/tree/tree.html index 9faf2838d..3f1cde19a 100644 --- a/src/app/pages/components/tree/tree.html +++ b/src/app/pages/components/tree/tree.html @@ -16,12 +16,6 @@
      -
      -
      - - -
      -
      diff --git a/src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.html b/src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.html index 59af81b1b..bea1b22cc 100644 --- a/src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.html +++ b/src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.html @@ -1 +1 @@ -
      \ No newline at end of file +
      \ No newline at end of file diff --git a/src/app/pages/form/inputs/widgets/select/select.html b/src/app/pages/form/inputs/widgets/select/select.html index 9328985ff..2704b7e34 100644 --- a/src/app/pages/form/inputs/widgets/select/select.html +++ b/src/app/pages/form/inputs/widgets/select/select.html @@ -76,7 +76,7 @@
      - @@ -84,7 +84,7 @@
      - @@ -92,7 +92,7 @@
      - @@ -102,7 +102,7 @@
      - @@ -111,7 +111,7 @@
      - @@ -120,7 +120,7 @@
      - diff --git a/src/app/pages/form/inputs/widgets/select/selectpicker.directive.js b/src/app/pages/form/inputs/widgets/select/selectpicker.directive.js index d66ed559f..2aaa1ffab 100644 --- a/src/app/pages/form/inputs/widgets/select/selectpicker.directive.js +++ b/src/app/pages/form/inputs/widgets/select/selectpicker.directive.js @@ -9,14 +9,16 @@ .directive('selectpicker', selectpicker); /** @ngInject */ - function selectpicker() { + function selectpicker($timeout) { return { restrict: 'A', link: function( $scope, elem) { - $(elem).selectpicker(); + $timeout(function() { + $(elem).selectpicker(); + }, 0); } }; } - + })(); \ No newline at end of file diff --git a/src/app/pages/maps/leaflet/LeafletPageCtrl.js b/src/app/pages/maps/leaflet/LeafletPageCtrl.js index 9277c0ed5..768a9ad4b 100644 --- a/src/app/pages/maps/leaflet/LeafletPageCtrl.js +++ b/src/app/pages/maps/leaflet/LeafletPageCtrl.js @@ -12,9 +12,6 @@ function LeafletPageCtrl($timeout) { function initialize() { var map = L.map(document.getElementById('leaflet-map')).setView([51.505, -0.09], 13); - - L.Icon.Default.imagePath = 'img'; - L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' }).addTo(map); diff --git a/src/app/pages/profile/ProfileModalCtrl.js b/src/app/pages/profile/ProfileModalCtrl.js new file mode 100644 index 000000000..0391cc188 --- /dev/null +++ b/src/app/pages/profile/ProfileModalCtrl.js @@ -0,0 +1,19 @@ +/** + * @author a.demeshko + * created on 21.01.2016 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.profile') + .controller('ProfileModalCtrl', ProfileModalCtrl); + + /** @ngInject */ + function ProfileModalCtrl($scope, $uibModalInstance) { + $scope.link = ''; + $scope.ok = function () { + $uibModalInstance.close($scope.link); + }; + } + +})(); \ No newline at end of file diff --git a/src/app/pages/profile/ProfilePageCtrl.js b/src/app/pages/profile/ProfilePageCtrl.js index 8e117f17f..43f767e3c 100644 --- a/src/app/pages/profile/ProfilePageCtrl.js +++ b/src/app/pages/profile/ProfilePageCtrl.js @@ -6,10 +6,10 @@ 'use strict'; angular.module('BlurAdmin.pages.profile') - .controller('ProfilePageCtrl', ProfilePageCtrl); + .controller('ProfilePageCtrl', ProfilePageCtrl); /** @ngInject */ - function ProfilePageCtrl($scope, fileReader, $filter) { + function ProfilePageCtrl($scope, fileReader, $filter, $uibModal) { $scope.picture = $filter('profilePicture')('Nasta'); $scope.removePicture = function () { @@ -65,8 +65,14 @@ item.href = undefined; }; - $scope.showModal = function () { - $('#profileModal').modal('show'); + $scope.showModal = function (item) { + $uibModal.open({ + animation: false, + controller: 'ProfileModalCtrl', + templateUrl: 'app/pages/profile/profileModal.html' + }).result.then(function (link) { + item.href = link; + }); }; $scope.getFile = function () { diff --git a/src/app/pages/profile/profile.html b/src/app/pages/profile/profile.html index 06eeb3b17..acc2c5117 100644 --- a/src/app/pages/profile/profile.html +++ b/src/app/pages/profile/profile.html @@ -143,7 +143,7 @@

      Social Profiles

      - \ No newline at end of file diff --git a/src/app/pages/profile/profileModal.directive.js b/src/app/pages/profile/profileModal.directive.js deleted file mode 100644 index 291e5ba65..000000000 --- a/src/app/pages/profile/profileModal.directive.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @author v.lugovsky - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.profile') - .service('profileModal', profileModal); - - /** @ngInject */ - function profileModal() { - return { - restrict: 'EA', - replace: true, - link: function ($scope) { - $scope.link = ""; - $scope.bindProfile = function(){ - $scope.link = ""; - }; - }, - templateUrl: 'app/pages/profile/profileModal.html' - }; - } - -})(); diff --git a/src/app/pages/profile/profileModal.html b/src/app/pages/profile/profileModal.html index 33ba7aa58..306d189cd 100644 --- a/src/app/pages/profile/profileModal.html +++ b/src/app/pages/profile/profileModal.html @@ -1,23 +1,20 @@ -