Commit f50fb8fb8ce6c67f5a64476f42ace7591f575d1a
1 parent
395512f0
Exists in
master
and in
38 other branches
Improve navbar with contextual actions
Showing
6 changed files
with
48 additions
and
22 deletions
Show diff stats
src/app/components/navbar/navbar.html
src/app/components/navbar/navbar.scss
| 1 | .navbar { | 1 | .navbar { |
| 2 | 2 | ||
| 3 | .container-fluid { | 3 | .container-fluid { |
| 4 | - padding: 0 12%; | 4 | + padding-right: 12%; |
| 5 | + padding-left: 12%; | ||
| 5 | @media (max-width: 978px) { | 6 | @media (max-width: 978px) { |
| 6 | - padding: 0 2%; | 7 | + padding-right: 2%; |
| 8 | + padding-left: 2%; | ||
| 7 | } | 9 | } |
| 8 | 10 | ||
| 9 | .navbar-brand { | 11 | .navbar-brand { |
| 10 | - padding: 9px 15px; | ||
| 11 | - | ||
| 12 | .noosfero-logo img { | 12 | .noosfero-logo img { |
| 13 | height: 35px; | 13 | height: 35px; |
| 14 | } | 14 | } |
| @@ -26,10 +26,6 @@ | @@ -26,10 +26,6 @@ | ||
| 26 | font-size: 1.7em; | 26 | font-size: 1.7em; |
| 27 | } | 27 | } |
| 28 | } | 28 | } |
| 29 | - | ||
| 30 | - .profile-menu a { | ||
| 31 | - padding: 10px 15px; | ||
| 32 | - } | ||
| 33 | } | 29 | } |
| 34 | } | 30 | } |
| 35 | } | 31 | } |
src/app/components/noosfero-blocks/main-block/main-block.html
src/app/index.route.js
| @@ -20,27 +20,46 @@ | @@ -20,27 +20,46 @@ | ||
| 20 | }) | 20 | }) |
| 21 | .state('main.profile', { | 21 | .state('main.profile', { |
| 22 | url: '/:profile', | 22 | url: '/:profile', |
| 23 | - templateUrl: 'app/profile/profile.html', | ||
| 24 | - controller: 'ProfileController', | ||
| 25 | - controllerAs: 'vm', | ||
| 26 | - abstract: true | 23 | + abstract: true, |
| 24 | + views: { | ||
| 25 | + 'content': { | ||
| 26 | + templateUrl: 'app/profile/profile.html', | ||
| 27 | + controller: 'ProfileController', | ||
| 28 | + controllerAs: 'vm' | ||
| 29 | + } | ||
| 30 | + } | ||
| 27 | }) | 31 | }) |
| 28 | .state('main.profile.home', { | 32 | .state('main.profile.home', { |
| 29 | url: '', | 33 | url: '', |
| 30 | - controller: 'ProfileHomeController', | ||
| 31 | - controllerAs: 'vm' | 34 | + views: { |
| 35 | + 'mainBlockContent': { | ||
| 36 | + controller: 'ProfileHomeController', | ||
| 37 | + controllerAs: 'vm' | ||
| 38 | + } | ||
| 39 | + } | ||
| 32 | }) | 40 | }) |
| 33 | .state('main.profile.info', { | 41 | .state('main.profile.info', { |
| 34 | url: '^/profile/:profile', | 42 | url: '^/profile/:profile', |
| 35 | - templateUrl: 'app/profile-info/profile-info.html', | ||
| 36 | - controller: 'ProfileInfoController', | ||
| 37 | - controllerAs: 'vm' | 43 | + views: { |
| 44 | + 'mainBlockContent': { | ||
| 45 | + templateUrl: 'app/profile-info/profile-info.html', | ||
| 46 | + controller: 'ProfileInfoController', | ||
| 47 | + controllerAs: 'vm' | ||
| 48 | + } | ||
| 49 | + } | ||
| 38 | }) | 50 | }) |
| 39 | .state('main.profile.page', { | 51 | .state('main.profile.page', { |
| 40 | url: '/{page:any}', | 52 | url: '/{page:any}', |
| 41 | - templateUrl: 'app/content-viewer/page.html', | ||
| 42 | - controller: 'ContentViewerController', | ||
| 43 | - controllerAs: 'vm' | 53 | + views: { |
| 54 | + 'actions@main': { | ||
| 55 | + templateUrl: 'app/content-viewer/navbar-actions.html' | ||
| 56 | + }, | ||
| 57 | + 'mainBlockContent': { | ||
| 58 | + templateUrl: 'app/content-viewer/page.html', | ||
| 59 | + controller: 'ContentViewerController', | ||
| 60 | + controllerAs: 'vm' | ||
| 61 | + } | ||
| 62 | + } | ||
| 44 | }) | 63 | }) |
| 45 | .state('main.profile.settings', { | 64 | .state('main.profile.settings', { |
| 46 | url: '^/myprofile/:profile' | 65 | url: '^/myprofile/:profile' |
src/app/main/main.html