From a05d0bdb0acd95a59a7effe95890ef73406ea2c1 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 12 Jan 2016 16:49:09 +0300 Subject: [PATCH] refactor(timeline): enable & relocate to pages, change icons --- .../pages/dashboard/timeline/timeline.html | 43 -------- src/app/pages/pages.module.js | 3 +- .../{dashboard => }/timeline/TimelineCtrl.js | 4 +- src/app/pages/timeline/timeline.html | 101 ++++++++++++++++++ src/app/pages/timeline/timeline.module.js | 19 ++++ .../contentTop/contentTop.directive.js | 4 +- .../theme/components/sidebar/SidebarCtrl.js | 5 + src/sass/theme/dashboard/_timeline.scss | 23 ---- 8 files changed, 132 insertions(+), 70 deletions(-) delete mode 100644 src/app/pages/dashboard/timeline/timeline.html rename src/app/pages/{dashboard => }/timeline/TimelineCtrl.js (92%) create mode 100644 src/app/pages/timeline/timeline.html create mode 100644 src/app/pages/timeline/timeline.module.js diff --git a/src/app/pages/dashboard/timeline/timeline.html b/src/app/pages/dashboard/timeline/timeline.html deleted file mode 100644 index e415b07..0000000 --- a/src/app/pages/dashboard/timeline/timeline.html +++ /dev/null @@ -1,43 +0,0 @@ - -
-
-
- Picture -
- -
-
Title of section 1
- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi - placeat iure tempora laudantium ipsa ad debitis unde? Iste voluptatibus minus veritatis qui ut.

- Jan 14 -
-
- -
-
- Movie -
- -
-
Title of section 2
- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi - placeat iure tempora laudantium ipsa ad debitis unde?

- Jan 18 -
-
- -
-
- Location -
- -
-
Title of section 3
- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum.

- Feb 18 -
-
-
\ No newline at end of file diff --git a/src/app/pages/pages.module.js b/src/app/pages/pages.module.js index 326453b..4edb1a8 100644 --- a/src/app/pages/pages.module.js +++ b/src/app/pages/pages.module.js @@ -26,7 +26,8 @@ 'BlurAdmin.pages.tables', 'BlurAdmin.pages.tree', 'BlurAdmin.pages.tabs', - 'BlurAdmin.pages.typography' + 'BlurAdmin.pages.typography', + 'BlurAdmin.pages.timeline' ]) .config(routeConfig); diff --git a/src/app/pages/dashboard/timeline/TimelineCtrl.js b/src/app/pages/timeline/TimelineCtrl.js similarity index 92% rename from src/app/pages/dashboard/timeline/TimelineCtrl.js rename to src/app/pages/timeline/TimelineCtrl.js index c55eb6a..4729b93 100644 --- a/src/app/pages/dashboard/timeline/TimelineCtrl.js +++ b/src/app/pages/timeline/TimelineCtrl.js @@ -5,8 +5,8 @@ (function () { 'use strict'; - angular.module('BlurAdmin.pages.dashboard') - .service('TimelineCtrl', TimelineCtrl); + angular.module('BlurAdmin.pages.timeline') + .controller('TimelineCtrl', TimelineCtrl); /** @ngInject */ function TimelineCtrl() { diff --git a/src/app/pages/timeline/timeline.html b/src/app/pages/timeline/timeline.html new file mode 100644 index 0000000..6203d51 --- /dev/null +++ b/src/app/pages/timeline/timeline.html @@ -0,0 +1,101 @@ + +
+
+
+
+
+
+ +
+
Title of section 1
+ +

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi + placeat iure tempora laudantium ipsa ad debitis unde? Iste voluptatibus minus veritatis qui ut.

+ Jan 14 +
+
+ +
+
+
+
+ +
+
Title of section 2
+ +

Donec dapibus at leo eget volutpat. Praesent dolor tellus, ultricies venenatis molestie eu, luctus eget nibh. + Curabitur ullamcorper eleifend nisl.

+ Jan 18 +
+
+ +
+
+
+
+ +
+
Title of section 3
+ +

Phasellus auctor tellus eget lacinia condimentum. Cum sociis natoque penatibus et magnis dis parturient + montes.

+ Feb 18 +
+
+ +
+
+
+
+ +
+
Title of section 4
+ +

Morbi fringilla in massa ac posuere. Fusce non sagittis massa, id accumsan odio. Nullam eget tempor est. + Etiam eu felis eu purus aliquam tristique id quis nisl. Nam eros nibh, consequat sed pulvinar eu, ultrices + ornare ligula. Aenean interdum sed nunc sed hendrerit.

+ Feb 20 +
+
+
+
+
+
+ +
+
Title of section 5
+ +

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur eget mattis + metus. Nullam egestas eros metus, quis fringilla urna accumsan sed. Aliquam ultrices at arcu vitae + tincidunt.

+ Feb 21 +
+
+
+
+
+
+ +
+
Title of section 6
+ +

Praesent bibendum ante mattis augue consectetur, ut commodo turpis consequat. Donec ligula eros, porta in + iaculis vel, semper ac sem. Integer at mauris lorem.

+ Feb 23 +
+
+
+
+
+
+ +
+
Title of section 7
+ +

Vivamus ut laoreet erat, vitae eleifend eros. Sed varius id tellus non lobortis. Sed dolor ante, cursus non + scelerisque sed, euismod id eros.

+ Feb 24 +
+
+
+
\ No newline at end of file diff --git a/src/app/pages/timeline/timeline.module.js b/src/app/pages/timeline/timeline.module.js new file mode 100644 index 0000000..5fa61f5 --- /dev/null +++ b/src/app/pages/timeline/timeline.module.js @@ -0,0 +1,19 @@ +/** + * @author a.demeshko + * created on 1/12/16 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.timeline', []) + .config(routeConfig); + + /** @ngInject */ + function routeConfig($stateProvider) { + $stateProvider + .state('timeline', { + url: '/timeline', + templateUrl: 'app/pages/timeline/timeline.html' + }); + } +})(); \ No newline at end of file diff --git a/src/app/theme/components/contentTop/contentTop.directive.js b/src/app/theme/components/contentTop/contentTop.directive.js index 3a05287..546c745 100644 --- a/src/app/theme/components/contentTop/contentTop.directive.js +++ b/src/app/theme/components/contentTop/contentTop.directive.js @@ -44,7 +44,9 @@ '/maps/leaflet': 'Leaflet Map', '/maps/line': 'Line Map', '/maps/bubble': 'Bubble Map', - '/panels': 'Panels' + '/panels': 'Panels', + '/timeline': 'Timeline', + }; $scope.$watch(function () { diff --git a/src/app/theme/components/sidebar/SidebarCtrl.js b/src/app/theme/components/sidebar/SidebarCtrl.js index 6d007d1..0251117 100644 --- a/src/app/theme/components/sidebar/SidebarCtrl.js +++ b/src/app/theme/components/sidebar/SidebarCtrl.js @@ -151,6 +151,11 @@ } ] }, + { + title: 'Timeline', + icon: 'ion-ios-pulse', + root: '#/timeline' + }, { title: 'User Profile', icon: 'ion-person', diff --git a/src/sass/theme/dashboard/_timeline.scss b/src/sass/theme/dashboard/_timeline.scss index f2650c4..c2cbeac 100644 --- a/src/sass/theme/dashboard/_timeline.scss +++ b/src/sass/theme/dashboard/_timeline.scss @@ -38,29 +38,6 @@ width: 40px; height: 40px; border-radius: 50%; - - img { - display: block; - width: 24px; - height: 24px; - position: relative; - left: 50%; - top: 50%; - margin-left: -12px; - margin-top: -12px; - } - - &.cd-picture { - background: $success; - } - - &.cd-movie { - background: $danger; - } - - &.cd-location { - background: $primary; - } } @media only screen and (min-width: $resXL) {