From f50fb8fb8ce6c67f5a64476f42ace7591f575d1a Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Wed, 20 Jan 2016 10:17:01 -0300
Subject: [PATCH] Improve navbar with contextual actions

---
 src/app/components/navbar/navbar.html                         |  1 +
 src/app/components/navbar/navbar.scss                         | 12 ++++--------
 src/app/components/noosfero-blocks/main-block/main-block.html |  2 +-
 src/app/content-viewer/navbar-actions.html                    | 10 ++++++++++
 src/app/index.route.js                                        | 43 +++++++++++++++++++++++++++++++------------
 src/app/main/main.html                                        |  2 +-
 6 files changed, 48 insertions(+), 22 deletions(-)
 create mode 100644 src/app/content-viewer/navbar-actions.html

diff --git a/src/app/components/navbar/navbar.html b/src/app/components/navbar/navbar.html
index 963db90..0787c01 100644
--- a/src/app/components/navbar/navbar.html
+++ b/src/app/components/navbar/navbar.html
@@ -40,6 +40,7 @@
           </ul>
         </li>
       </ul>
+      <div ui-view="actions"></div>
     </div>
   </div>
 </nav>
diff --git a/src/app/components/navbar/navbar.scss b/src/app/components/navbar/navbar.scss
index 78d0251..5809fab 100644
--- a/src/app/components/navbar/navbar.scss
+++ b/src/app/components/navbar/navbar.scss
@@ -1,14 +1,14 @@
 .navbar {
 
   .container-fluid {
-    padding: 0 12%;
+    padding-right: 12%;
+    padding-left: 12%;
     @media (max-width: 978px) {
-      padding: 0 2%;
+      padding-right: 2%;
+      padding-left: 2%;
     }
 
     .navbar-brand {
-      padding: 9px 15px;
-
       .noosfero-logo img {
         height: 35px;
       }
@@ -26,10 +26,6 @@
           font-size: 1.7em;
         }
       }
-
-      .profile-menu a {
-        padding: 10px 15px;
-      }
     }
   }
 }
diff --git a/src/app/components/noosfero-blocks/main-block/main-block.html b/src/app/components/noosfero-blocks/main-block/main-block.html
index a26a173..129d0a2 100644
--- a/src/app/components/noosfero-blocks/main-block/main-block.html
+++ b/src/app/components/noosfero-blocks/main-block/main-block.html
@@ -1 +1 @@
-<div ui-view autoscroll></div>
+<div ui-view="mainBlockContent" autoscroll></div>
diff --git a/src/app/content-viewer/navbar-actions.html b/src/app/content-viewer/navbar-actions.html
new file mode 100644
index 0000000..2f7e2ba
--- /dev/null
+++ b/src/app/content-viewer/navbar-actions.html
@@ -0,0 +1,10 @@
+<ul class="nav navbar-nav navbar-right">
+  <li>
+    <a href="#" role="button">
+      <span class="fa-stack">
+        <i class="fa fa-file-o fa-stack-2x"></i>
+        <i class="fa fa-plus fa-stack-1x"></i>
+      </span> New Post
+    </a>
+  </li>
+</ul>
diff --git a/src/app/index.route.js b/src/app/index.route.js
index 2dc2f03..5973bb3 100644
--- a/src/app/index.route.js
+++ b/src/app/index.route.js
@@ -20,27 +20,46 @@
       })
       .state('main.profile', {
         url: '/:profile',
-        templateUrl: 'app/profile/profile.html',
-        controller: 'ProfileController',
-        controllerAs: 'vm',
-        abstract: true
+        abstract: true,
+        views: {
+          'content': {
+            templateUrl: 'app/profile/profile.html',
+            controller: 'ProfileController',
+            controllerAs: 'vm'
+          }
+        }
       })
       .state('main.profile.home', {
         url: '',
-        controller: 'ProfileHomeController',
-        controllerAs: 'vm'
+        views: {
+          'mainBlockContent': {
+            controller: 'ProfileHomeController',
+            controllerAs: 'vm'
+          }
+        }
       })
       .state('main.profile.info', {
         url: '^/profile/:profile',
-        templateUrl: 'app/profile-info/profile-info.html',
-        controller: 'ProfileInfoController',
-        controllerAs: 'vm'
+        views: {
+          'mainBlockContent': {
+            templateUrl: 'app/profile-info/profile-info.html',
+            controller: 'ProfileInfoController',
+            controllerAs: 'vm'
+          }
+        }
       })
       .state('main.profile.page', {
         url: '/{page:any}',
-        templateUrl: 'app/content-viewer/page.html',
-        controller: 'ContentViewerController',
-        controllerAs: 'vm'
+        views: {
+          'actions@main': {
+            templateUrl: 'app/content-viewer/navbar-actions.html'
+          },
+          'mainBlockContent': {
+            templateUrl: 'app/content-viewer/page.html',
+            controller: 'ContentViewerController',
+            controllerAs: 'vm'
+          }
+        }
       })
       .state('main.profile.settings', {
         url: '^/myprofile/:profile'
diff --git a/src/app/main/main.html b/src/app/main/main.html
index 8e2ff64..6a7ff04 100644
--- a/src/app/main/main.html
+++ b/src/app/main/main.html
@@ -1,2 +1,2 @@
 <acme-navbar></acme-navbar>
-<div ui-view></div>
+<div ui-view="content"></div>
--
libgit2 0.21.2