more homepage work

DemocracyOS · Apr 26, 2013 · 14fbf05 · 14fbf05
1 parent 5028a8d
commit 14fbf05
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 28 deletions.
diff --git a/Makefile b/Makefile
@@ -3,13 +3,16 @@
 # 
 
 run: install
+	@echo "Starting application..."
 	@NODE_PATH=lib \
 		node app.js
 
 install:
+	@echo "Install dependencies..."
 	@npm install
 
 clean:
+	@echo "Removing 'node_modules' path..."
 	@rm -rf node_modules
 
 .PHONY: clean
diff --git a/lib/auth/strategy.js b/lib/auth/strategy.js
@@ -86,7 +86,7 @@ function AuthStrategy (app) {
         citizen.email = profile.emails[0].value;
         citizen.emails = profile.emails.map( function(email) { return email.value; } );
         citizen.profiles.facebook = profile;
-        citizen.avatar = profile.imageUrl || 'http://gravatar.com/avatar/'.concat(utils.md5(citizen.email)) || '';
+        citizen.avatar = profile.imageUrl || 'http://gravatar.com/avatar/'.concat(utils.md5(citizen.email)).concat('?d=mm&size=200') || '';
 
         citizen.save(function(err) {
           console.log(citizen);

diff --git a/lib/homepage/views/index.jade b/lib/homepage/views/index.jade
@@ -1,17 +1,15 @@
 extends layout
 
 block content
-	.hero-unit
-		h1 Partido de la red
+	.hero-unit.welcome
+		h1 Democracia en Red
 		p
-		p
-			| Este software tiene el objetivo de abrir el ancho de banda de la democracia bajo la siguiente premisa:
-		p: em No alcanza con votar cada dos años si podemos expresarnos todos los días usando la red.
+		p ... is an online space for deliberation and voting on political proposals. The software aims to stimulate better arguments and come to better rulings.
 
 		p: a.btn.btn-primary.btn-large(href='#') Participa »
 
 	.row.box-homepage-list
-		- for(var i=0; i< 10; ++i){
+		- for(var i=0; i< 12; ++i){
 			.span3.box-homepage
 				h5(style="background-color:#aa3")= "#sofware"
 				.box-content

diff --git a/lib/views/layout.jade b/lib/views/layout.jade
@@ -51,22 +51,34 @@ html(lang='en')
   body(class=bodyClasses)
     // Start of `Page Content`
     #wrap
-      header.navbar.navbar-inverse.navbar-fixed-top
-        .navbar-inner
-          .container
+      header.navbar.navbar-fixed-top
+        .container
+          .navbar-inner
             button.btn.btn-navbar(type='button', data-toggle='collapse', data-target='.nav-collapse')
               span.icon-bar
               span.icon-bar
               span.icon-bar
-            a.brand(href='#') Partido De La Red
+            h1#logo
+              a(href='/') Democracia en Red
+            a.brand.hidden-desktop(href='/') Democracia en Red
+
             .nav-collapse.collapse
-              ul#navigation.nav
+              ul.nav#navigation
                 li.active
-                  a(href='#') Explore
+                  nav
+                    a.votaciones(href='#')
+                      i
+                      | Explore
                 li
-                  a(href='http://wiki.partidodelared.org') Docs
+                  nav
+                    a.how-it-works(href='http://wiki.partidodelared.org', target="_blank")
+                      i
+                      | Docs
                 li
-                  a(href='http://wiki.partidodelared.org') Help
+                  nav
+                    a.how-it-works(href='http://github.com/DemocraciaEnRed/app', target="_blank")
+                      i
+                      | Contribute
 
               ul.nav.pull-right
                 - if (locals.citizen)
@@ -91,14 +103,15 @@ html(lang='en')
                       li.divider
                       li: a(href=url('/logout')) Logout
                 - else
-                  a.nav(id="fb-login-button", href="/auth/facebook", class="sb sb-small sb-facebook")
-                    i
-                    | Log in
+                  li.login: nav
+                    a.nav(href="/auth/facebook", class="sb sb-small sb-facebook")
+                      i
+                      | Log in
 
       .container
         block content
 
-      #push
+      .push-down
 
     footer
       | Copyright © 2009-2013 Partido De La Red.

diff --git a/public/css/main.css b/public/css/main.css
@@ -17,7 +17,7 @@ body {
 }
 
 /* Set the fixed height of the footer here */
-#push,
+.push-down,
 footer {
   height: 60px;
 }
@@ -43,6 +43,46 @@ footer {
 ----------------------------------------------------- */
 /* Not required for template or sticky footer.  */
 
-#fb-login-button {
-  margin: 5px 0px;
+/* Facebook Login */
+.navbar .nav li.login nav {
+  padding:10px 15px 0px 15px;
+}
+
+/* Brand */
+.navbar a.brand {
+  margin: 10px 15px 10px 0px;
+  text-decoration: none;
+  text-transform: uppercase;
+  font-size: 20px;
+  font-weight: bold;
+  color: #fff !important;
+  padding: 10px 0 10px 0;
+  opacity: 0.9;
+  margin-right: 30px;
+  display: inline-block;
+}
+
+/* Responsive button */
+.navbar button.btn.btn-navbar {
+  margin: 14px 15px 0px 0px;
+  padding-bottom:9px;
+}
+
+/* User dropdown responsive */
+.navbar .nav-collapse:not(.in) ul.nav.pull-right  {
+  padding:5px 10px;
+}
+
+.navbar .nav>li>a {
+  color: #fff !important;
+  text-shadow:none !important;
+}
+.navbar .nav>li>a:hover {
+  color: #333 !important;
+}
+
+.navbar .nav li.dropdown.open>.dropdown-toggle,
+.navbar .nav li.dropdown.active>.dropdown-toggle,
+.navbar .nav li.dropdown.open.active>.dropdown-toggle {
+  background:none !important;
 }
diff --git a/public/css/v1.css b/public/css/v1.css
@@ -99,7 +99,7 @@ p a:hover {
 a:hover {
   text-decoration: none;
 }
-/*header {
+header {
   background: #00f;
   background-image: -webkit-linear-gradient(#68a0b6 3.3%, #44798d);
   background-image: -moz-linear-gradient(#68a0b6 3.3%, #44798d);
@@ -117,14 +117,15 @@ header h1#logo a {
   width: 52px;
   height: 49px;
   margin: 5px 0;
-  background: url("../../images/logo.png?rand");
+  background: url("../images/logo.png?rand");
   display: block;
   text-indent: -1000em;
 }
-header .container .span9 {
+/*header .container .span9 {*/
+header .navbar-inner {
   background-color: #78c0d6;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
+  border-top-left-radius: 4px !important;
+  border-top-right-radius: 4px !important;
   background-image: -webkit-linear-gradient(#78c0d6 3.3%, #52adc7);
   background-image: -moz-linear-gradient(#78c0d6 3.3%, #52adc7);
   background-image: -o-linear-gradient(#78c0d6 3.3%, #52adc7);
@@ -133,6 +134,7 @@ header nav {
   display: inline-block;
 }
 header nav a,
+header .navbar .nav>li>a,
 header nav a:visited {
   text-decoration: none;
   text-transform: uppercase;
@@ -264,7 +266,7 @@ header .user-options .options-dropdown a:last-child {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border: 0;
-}*/
+}
 h3.block-title {
   font-weight: bold;
   font-size: 14px;
@@ -446,6 +448,7 @@ i.icon {
 .banner .issue-content p.issue-content-description {
   margin-bottom: 20px;
 }
+/* Ugly bug */
 /*a.nav {
   top: 64px;
   background: #fff url("../../images/arrow-left.png") center no-repeat;