From 7852820d5adf1c7987397189b26c813e3348bb97 Mon Sep 17 00:00:00 2001 From: gyartom <42946477+gyartom@users.noreply.github.com> Date: Sun, 9 Jun 2019 22:17:48 +0200 Subject: [PATCH] new version --- .../pages/dashboard/timeline/TimelineCtrl.js | 2 +- .../pages/dashboard/timeline/timeline.html | 201 ++++---- src/app/pages/pages.module.js | 35 +- src/app/pages/profile/profile.html | 451 ++++++++++-------- 4 files changed, 357 insertions(+), 332 deletions(-) diff --git a/src/app/pages/dashboard/timeline/TimelineCtrl.js b/src/app/pages/dashboard/timeline/TimelineCtrl.js index 334cca1..e5477f6 100644 --- a/src/app/pages/dashboard/timeline/TimelineCtrl.js +++ b/src/app/pages/dashboard/timeline/TimelineCtrl.js @@ -5,7 +5,7 @@ (function () { 'use strict'; - angular.module('BlurAdmin.pages.components.timeline') + angular.module('BlurAdmin.pages.dashboard.timeline') .controller('TimelineCtrl', TimelineCtrl); /** @ngInject */ diff --git a/src/app/pages/dashboard/timeline/timeline.html b/src/app/pages/dashboard/timeline/timeline.html index cafb8e1..0c56baa 100644 --- a/src/app/pages/dashboard/timeline/timeline.html +++ b/src/app/pages/dashboard/timeline/timeline.html @@ -1,101 +1,102 @@ - -
-
-
-
-
-
- -
-
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 -
-
-
+ +
+
+ +
+
+
+
+ +
+
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/pages.module.js b/src/app/pages/pages.module.js index a5e9d11..9aa4e81 100644 --- a/src/app/pages/pages.module.js +++ b/src/app/pages/pages.module.js @@ -23,26 +23,7 @@ function routeConfig($urlRouterProvider, baSidebarServiceProvider) { $urlRouterProvider.otherwise('/dashboard'); - baSidebarServiceProvider.addStaticItem({ - title: 'Pages', - icon: 'ion-document', - subMenu: [{ - title: 'Sign In', - fixedHref: 'auth.html', - blank: true - }, { - title: 'Sign Up', - fixedHref: 'reg.html', - blank: true - }, { - title: 'User Profile', - stateRef: 'profile' - }, { - title: '404 Page', - fixedHref: '404.html', - blank: true - }] - }); + baSidebarServiceProvider.addStaticItem({ title: 'Szervezetek', icon: 'ion-ios-more', @@ -57,6 +38,20 @@ }] }] }); + baSidebarServiceProvider.addStaticItem({ + title: 'Túrák', + icon: 'ion-ios-more', + subMenu: [{ + title: 'Túra 1', + disabled: true + }, { + title: 'Menu Level 1.2', + subMenu: [{ + title: 'Menu Level 1.2.1', + disabled: true + }] + }] + }); } })(); diff --git a/src/app/pages/profile/profile.html b/src/app/pages/profile/profile.html index c9b5d5a..0b8f653 100644 --- a/src/app/pages/profile/profile.html +++ b/src/app/pages/profile/profile.html @@ -1,211 +1,240 @@ -
-
-
Your profile is 70% Complete
-
-
-
-
- -

General Information

- -
-
-
- - -
-
-
- -
- - Change Profile Picture - -
-
-
-
-
-
- -
-
-
- - -
- -
-
-
- - -
- -
-
-
-
-
- - -
- -
-
- -
- - -
- -
-
-
-
- -

Change Password

- -
-
-
- - -
- -
-
-
-
-
- - -
- -
-
-
-
- -

Contact Information

- -
-
-
- - -
- -
-
-
- - -
- -
-
-
-
-
- - -
- -
-
-
- - -
- -
-
-
-
- -

Social Profiles

- - - -

Send Email Notifications

- -
-
-
- - -
- -
-
-
- - -
- -
-
-
- - -
- -
-
-
-
-
- - -
- -
-
-
- - -
- -
-
- -
- - -
- -
-
-
-
- -
-
+
+
+
Profil adataid 70%-a van kitöltve
+
+
+
+
+ +

Általános információk

+ +
+
+
+ + +
+
+
+ +
+ + Profil kép megváltoztatása + +
+
+
+
+
+
+ +
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
+ +
+ + +
+ +
+
+
+
+ +

Jelszó változtatás

+ +
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
+
+
+ +

Elérhetőségek

+ +
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+
+ +

Közösségi oldalaim

+ + + +

Értesítés email-ben

+ +
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+ +
+ + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + +
IdNévBecenévEmail címJogosultság
{{::user.id}}{{::user.name}}{{::user.nickName}}{{::user.email}} + {{::'COMMON.ROLE.' + user.role | translate}} + + + Részletek + +
+
+