From f19b43ceededdeede38d209a881bc8cab99ef431 Mon Sep 17 00:00:00 2001 From: Vladimir Lugovsky Date: Mon, 21 Dec 2015 22:13:38 +0300 Subject: [PATCH] feat(tabs): Tabs page --- bower.json | 6 ++-- src/app/app.js | 1 + src/app/pages/pages.module.js | 1 + src/app/pages/tabs/tabs.html | 32 +++++++++++++++++++ src/app/pages/tabs/tabs.module.js | 20 ++++++++++++ .../theme/components/sidebar/SidebarCtrl.js | 4 +++ 6 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 src/app/pages/tabs/tabs.html create mode 100644 src/app/pages/tabs/tabs.module.js diff --git a/bower.json b/bower.json index d144d59..2b1390a 100644 --- a/bower.json +++ b/bower.json @@ -46,7 +46,8 @@ "angular-ui-router": "~0.2.15", "angular-chart.js": "~0.8.8", "angular-chartist.js": "~3.3.12", - "angular-morris-chart": "~1.1.0" + "angular-morris-chart": "~1.1.0", + "angular-bootstrap": "~0.14.3" }, "overrides": { "amcharts": { @@ -79,8 +80,5 @@ "font-awesome": { "main": "css/font-awesome.css" } - }, - "devDependencies": { - "angular-ui-router": "~0.2.15" } } diff --git a/src/app/app.js b/src/app/app.js index 5b617e9..3359917 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -1,6 +1,7 @@ 'use strict'; angular.module('BlurAdmin', [ + 'ui.bootstrap', 'ui.sortable', 'ui.router', 'ngTouch', diff --git a/src/app/pages/pages.module.js b/src/app/pages/pages.module.js index ab3ef78..c663688 100644 --- a/src/app/pages/pages.module.js +++ b/src/app/pages/pages.module.js @@ -22,6 +22,7 @@ 'BlurAdmin.pages.profile', 'BlurAdmin.pages.progressBars', 'BlurAdmin.pages.tables', + 'BlurAdmin.pages.tabs', 'BlurAdmin.pages.typography' ]) .config(routeConfig); diff --git a/src/app/pages/tabs/tabs.html b/src/app/pages/tabs/tabs.html new file mode 100644 index 0000000..023d204 --- /dev/null +++ b/src/app/pages/tabs/tabs.html @@ -0,0 +1,32 @@ +
+
+
+ + + +

+ Take up one idea. Make that one idea your life--think of it, dream of it, live on that idea. Let the brain, muscles, nerves, every part of your body, be full of that idea, and just leave every other idea alone. This is the way to success. +

+

+ People who succeed have momentum. The more they succeed, the more they want to succeed, and the more they find a way to succeed. Similarly, when someone is failing, the tendency is to get on a downward spiral that can even become a self-fulfilling prophecy. +

+

+ You can't connect the dots looking forward; you can only connect them looking backwards. So you have to trust that the dots will somehow connect in your future. You have to trust in something--your gut, destiny, life, karma, whatever. This approach has never let me down, and it has made all the difference in my life. +

+
+ + Hellooooo + + + + Alert! + + I've got an HTML heading, and a select callback. Pretty cool! + +
+
+ +
+
+
+
\ No newline at end of file diff --git a/src/app/pages/tabs/tabs.module.js b/src/app/pages/tabs/tabs.module.js new file mode 100644 index 0000000..7f9e78e --- /dev/null +++ b/src/app/pages/tabs/tabs.module.js @@ -0,0 +1,20 @@ +/** + * @author v.lugovsky + * created on 21.12.2015 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.tabs', []) + .config(routeConfig); + + /** @ngInject */ + function routeConfig($stateProvider) { + $stateProvider + .state('tabs', { + url: '/tabs', + templateUrl: 'app/pages/tabs/tabs.html' + }); + } + +})(); diff --git a/src/app/theme/components/sidebar/SidebarCtrl.js b/src/app/theme/components/sidebar/SidebarCtrl.js index f4a3efa..fedcd77 100644 --- a/src/app/theme/components/sidebar/SidebarCtrl.js +++ b/src/app/theme/components/sidebar/SidebarCtrl.js @@ -92,6 +92,10 @@ { title: 'Notifications', root: '#/notifications' + }, + { + title: 'Tabs and Accordions', + root: '#/tabs' } ] },