Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:MexicanVC/Fogata

  • Loading branch information...
commit 688c27e29c9ac63a71b019932286b014bb388466 2 parents cb6a4a5 + b6c11e2
@DFectuoso DFectuoso authored
View
2  app.yaml
@@ -1,4 +1,4 @@
-application: sgfogata
+application: fogata
version: 5
runtime: python
api_version: 1
View
46 static/css/_mixins.scss
@@ -0,0 +1,46 @@
+@import "palette";
+
+@mixin box-shadow($value: 0px 1px 4px rgba(0,0,0,0.25)){
+ -moz-box-shadow: $value;
+ -webkit-box-shadow: $value;
+ box-shadow: $value;
+}
+
+@mixin round-corners($radius: 5px){
+ -webkit-border-radius: $radius;
+ -moz-border-radius: $radius;
+ -khtml-border-radius: $radius;
+ border-radius: $radius;
+}
+
+@mixin gradient($top: $brand, $mid: darken($brand,3), $bottom: darken($brand, 7)){
+ background: $top;
+ border: 1px solid $bottom;
+ background-image: linear-gradient(bottom, $bottom 17%, $mid 59%, $top 80%);
+ background-image: -o-linear-gradient(bottom, $bottom 17%, $mid 59%, $top 80%);
+ background-image: -moz-linear-gradient(bottom, $bottom 17%, $mid 59%, $top 80%);
+ background-image: -webkit-linear-gradient(bottom, $bottom 17%, $mid 59%, $top 80%);
+ background-image: -ms-linear-gradient(bottom, $bottom 17%, $mid 59%, $top 80%);
+ background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.17, $bottom), color-stop(0.59, $mid), color-stop(0.8, $top) );
+ /* For Internet Explorer 5.5 - 7 */
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{$top}, endColorstr=#{$bottom});
+ /* For Internet Explorer 8 */
+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#{$top}, endColorstr=#{$bottom})";
+}
+@mixin link_to_button($color: $brand){
+ display: block;
+ text-decoration: none;
+ color: white;
+ text-align: center;
+ padding: 1em;
+ text-shadow: 0px -1px 1px rgba(0,0,0,0.35);
+ font-weight: 800;
+ @include box-shadow(inset 0 1px 0 rgba(255,255,255,0.5));
+ @include round-corners;
+ @include gradient(lighten($color,5), $color, darken($color,5));
+ &:hover{
+ @include gradient($color, darken($color,5), darken($color,10));
+ text-decoration: none;
+ cursor: pointer;
+ }
+}
View
11 static/css/_palette.scss
@@ -0,0 +1,11 @@
+$bright_color: #783C97;
+$brand: $bright_color;
+
+$alert_color: #FF4E27;
+$light-color: #F2E9E1;
+$dark_gray: #111;
+$soft_gray: #666;
+$mid_gray: #4F4649;
+$soft_white: white;
+$soft-red: #FFB5C7;
+$dark-red: #FF0A47;
View
48 static/css/_reset.scss
@@ -0,0 +1,48 @@
+/* http://meyerweb.com/eric/tools/css/reset/
+ v2.0 | 20110126
+ License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+ display: block;
+}
+body {
+ line-height: 1;
+}
+ol, ul {
+ list-style: none;
+}
+blockquote, q {
+ quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content: '';
+ content: none;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
View
239 static/css/noticias.css
@@ -1,69 +1,132 @@
-* {
- padding: 0;
+/* http://meyerweb.com/eric/tools/css/reset/
+ v2.0 | 20110126
+ License: none (public domain)
+*/
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
margin: 0;
- font-family: Helvetica, Arial, sans-serif; }
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline; }
+
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+ display: block; }
body {
- background-color: white;
- align-text: center;
- font-size: 14px;
- line-height: 1.5em; }
+ line-height: 1; }
-img {
- border: 0; }
+ol, ul {
+ list-style: none; }
-#wrapper {
- width: 80%;
- margin: 30px auto; }
+blockquote, q {
+ quotes: none; }
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content: '';
+ content: none; }
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0; }
+
+body {
+ background-color: white;
+ font-family: "Open Sans", sans-serif;
+ font-size: 16px;
+ font-weight: 300;
+ line-height: 1.5em; }
a {
- color: #8ac649;
+ color: #783c97;
text-decoration: none; }
a:hover {
text-decoration: underline; }
-#header {
- background-color: #8ac649;
- height: 25px;
- line-height: 25px;
- position: relative;
- margin-bottom: 5px;
- padding: 0.3em; }
- #header #logo span.logotype {
- display: blog;
- width: 23px;
- height: 23px;
- float: left; }
- #header #menu a {
- color: #111111;
- font-size: 13px;
- text-transform: lowercase;
- line-height: 25px; }
- #header #menu #main_nav {
- float: left;
- margin-left: 24px; }
- #header #menu #main_nav span.sitename {
- padding-right: 5px;
- text-transform: none;
- font-weight: bold; }
- #header #menu #user_toolbar {
- float: right;
- padding: 0 10px; }
- #header #menu #user_toolbar .karma {
- font-size: 12px;
- padding: 0 5px;
- color: #1e1e1e; }
+h1 {
+ font-size: 2em;
+ font-weight: 700;
+ letter-spacing: -0.05em;
+ color: #4f4649; }
-#content {
- color: #666666; }
+#header-container {
+ margin-bottom: 0.5em;
+ overflow: hidden;
+ margin-top: 2em; }
+ #header-container #header {
+ line-height: 2em;
+ width: 960px;
+ margin-left: auto;
+ margin-right: auto; }
+ #header-container #header #logo {
+ display: block;
+ width: 290px;
+ height: 60px;
+ float: left;
+ margin-right: 1em; }
+ #header-container #header #powered_by {
+ padding-top: 1.7em;
+ float: left; }
+ #header-container #header #powered_by span {
+ margin-right: 0.5em;
+ float: left;
+ line-height: 1.8;
+ font-style: italic; }
+ #header-container #header #powered_by a {
+ display: block;
+ float: left;
+ height: 22px;
+ width: 118px; }
+ #header-container #header #powered_by img {
+ margin-top: 0.1em; }
+ #header-container #header #menu a {
+ color: #111111; }
+ #header-container #header #menu #user_toolbar {
+ float: right;
+ padding: 0 10px;
+ margin-top: 1.7em; }
+ #header-container #header #menu #user_toolbar .karma {
+ font-size: 12px;
+ padding: 0 5px;
+ color: #1e1e1e; }
+
+#main_nav {
+ width: 960px;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 1em;
+ background: #4f4649;
+ padding: 0.25em 0.5em;
+ box-sizing: border-box; }
+ #main_nav a {
+ color: #FFF;
+ margin-right: 2em; }
+ #main_nav a:hover {
+ text-decoration: none;
+ color: #666666; }
-#content-2 {
- color: #666666; }
+#wrapper {
+ width: 960px;
+ margin: 1em auto; }
-#indextanksearch {
- padding: 0 0 0 0px;
- display: inline; }
+#content {
+ color: #666666; }
.comment .comment-post {
padding: 0 0 0 11px; }
@@ -119,10 +182,11 @@ a:hover {
.noticia {
border-bottom: 1px solid #F2F2F2;
- padding: 0.2em 0 0.5em;
- margin: 1px 0 0; }
- .noticia:nth-child(even) {
- background: #F5F5F5; }
+ padding: 0.2em 0 0.8em;
+ margin: 1px 0 0;
+ /* &:nth-child(even){
+ background:#F5F5F5;
+ };*/ }
.noticia .order-number {
float: left;
width: 20px;
@@ -143,21 +207,27 @@ a:hover {
display: none; }
.noticia .post-title {
line-height: 1.8em;
- font-size: 1.1em; }
+ font-size: 1.3em;
+ font-weight: 400;
+ letter-spacing: -0.05em; }
.noticia .post-title a {
- color: #111111; }
+ color: #111111;
+ color: #000; }
.noticia .post-title a:visited {
color: #b3b3b3;
+ color: #000;
text-decoration: none; }
.noticia .post-title .post-netloc {
- font-size: 0.7em;
+ letter-spacing: 0;
+ font-size: 0.6em;
+ font-weight: 300;
font-family: Consolas,Courier,monospace; }
.noticia .post-info {
- font-size: 11px;
+ font-size: 0.8em;
line-height: 13px;
margin-left: 51px; }
.noticia .post-info a {
- color: #8ac649; }
+ color: #783c97; }
.noticia .post-votes {
min-width: 36px;
float: left; }
@@ -172,6 +242,48 @@ a:hover {
.submit input {
padding: 0.5em;
margin-bottom: 1em; }
+ .submit input[type="submit"] {
+ display: block;
+ text-decoration: none;
+ color: white;
+ text-align: center;
+ padding: 1em;
+ text-shadow: 0px -1px 1px rgba(0, 0, 0, 0.35);
+ font-weight: 800;
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5);
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ border-radius: 5px;
+ background: #8743a9;
+ border: 1px solid #693585;
+ background-image: linear-gradient(bottom, #693585 17%, #783c97 59%, #8743a9 80%);
+ background-image: -o-linear-gradient(bottom, #693585 17%, #783c97 59%, #8743a9 80%);
+ background-image: -moz-linear-gradient(bottom, #693585 17%, #783c97 59%, #8743a9 80%);
+ background-image: -webkit-linear-gradient(bottom, #693585 17%, #783c97 59%, #8743a9 80%);
+ background-image: -ms-linear-gradient(bottom, #693585 17%, #783c97 59%, #8743a9 80%);
+ background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.17, #693585), color-stop(0.59, #783c97), color-stop(0.8, #8743a9));
+ /* For Internet Explorer 5.5 - 7 */
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#8743a9, endColorstr=#693585);
+ /* For Internet Explorer 8 */
+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#8743a9, endColorstr=#693585)"; }
+ .submit input[type="submit"]:hover {
+ background: #783c97;
+ border: 1px solid #5b2d73;
+ background-image: linear-gradient(bottom, #5b2d73 17%, #693585 59%, #783c97 80%);
+ background-image: -o-linear-gradient(bottom, #5b2d73 17%, #693585 59%, #783c97 80%);
+ background-image: -moz-linear-gradient(bottom, #5b2d73 17%, #693585 59%, #783c97 80%);
+ background-image: -webkit-linear-gradient(bottom, #5b2d73 17%, #693585 59%, #783c97 80%);
+ background-image: -ms-linear-gradient(bottom, #5b2d73 17%, #693585 59%, #783c97 80%);
+ background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.17, #5b2d73), color-stop(0.59, #693585), color-stop(0.8, #783c97));
+ /* For Internet Explorer 5.5 - 7 */
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#783c97, endColorstr=#5b2d73);
+ /* For Internet Explorer 8 */
+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#783c97, endColorstr=#5b2d73)";
+ text-decoration: none;
+ cursor: pointer; }
.submit textarea {
padding: 0.5em;
width: 80%;
@@ -200,10 +312,7 @@ a:hover {
font-weight: bold; }
#footer {
- font-size: 12px;
- line-height: 17px;
text-align: center;
- background-color: #8ac649;
padding: 5px 0; }
#footer .disclamer {
line-height: 15px;
@@ -244,7 +353,7 @@ input, textarea {
font-weight: bold; }
.success {
- color: #8ac649;
+ color: #783c97;
font-weight: bold; }
input.fielderror, textarea.fielderror {
@@ -301,7 +410,7 @@ hr {
width: 12em; }
#login-box {
- border-right: 1px solid #8ac649; }
+ border-right: 1px solid #783c97; }
#login-box, #register-box {
float: left;
View
198 static/css/noticias.scss
@@ -1,101 +1,109 @@
-$bright-color: #8AC649;
-$alert-color: #FF4E27;
-$light-color: #F2E9E1;
-$dark-grey: #111;
-$soft-grey: #666;
-$soft-white: white;
-$soft-red: #FFB5C7;
-$dark-red: #FF0A47;
-
-*{
- padding:0;
- margin:0;
- font-family: Helvetica, Arial, sans-serif;
-}
+@import "reset", "palette", "mixins";
body{
- background-color:$soft-white;
- align-text:center;
- font-size: 14px;
+ background-color: $soft_white;
+ font-family: "Open Sans", sans-serif;
+ font-size: 16px;
+ font-weight: 300;
line-height:1.5em;
}
-img{
- border:0;
-}
-
-#wrapper{
- width:80%;
- margin: 30px auto;
-}
-
a{
- color: $bright-color;
+ color: $bright_color;
text-decoration:none;
}
a:hover{
text-decoration: underline;
}
-#header{
- background-color:$bright-color;
- height: 25px;
- line-height:25px;
- position:relative;
- margin-bottom:5px;
- padding: 0.3em;
-
- #logo{
- span.logotype{
- display:blog;
- width:23px;
- height:23px;
+h1{
+ font-size: 2em;
+ font-weight: 700;
+ letter-spacing: -0.05em;
+ color: $mid_gray;
+}
+
+#header-container{
+ margin-bottom:0.5em;
+ overflow: hidden;
+ margin-top: 2em;
+ #header{
+ line-height:2em;
+ width: 960px;
+ margin-left: auto;
+ margin-right: auto;
+ #logo{
+ display:block;
+ width:290px;
+ height:60px;
float:left;
+ margin-right: 1em;
}
- }
-
- #menu {
- a {
- color: $dark-grey;
- font-size:13px;
- text-transform:lowercase;
- line-height:25px;
+ #powered_by{
+ padding-top: 1.7em;
+ float: left;
+ span{
+ margin-right: 0.5em;
+ float: left;
+ line-height: 1.8;
+ font-style:italic;
+ }
+ a{
+ display: block;
+ float: left;
+ height: 22px;
+ width: 118px;
+ }
+ img{
+ margin-top: 0.1em;
+ }
}
+ #menu {
+ a {
+ color: $dark_gray;
+ }
- #main_nav{
- float:left;
- margin-left:24px;
- span.sitename{
- padding-right:5px;
- text-transform:none;
- font-weight:bold;
- }
- }
- #user_toolbar{
+ #user_toolbar{
float:right;
padding:0 10px;
-
+ margin-top: 1.7em;
.karma{
font-size:12px;
padding:0 5px;
- color:lighten($dark-grey,5%);
+ color:lighten($dark_gray,5%);
}
+ }
}
}
}
-#content{
- color: $soft-grey;
+#main_nav{
+ width: 960px;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 1em;
+ background: $mid_gray;
+ padding: 0.25em 0.5em;
+ box-sizing: border-box;
+ a{
+ color: #FFF;
+ margin-right: 2em;
+ &:hover{
+ text-decoration: none;
+ color: $soft_gray;
+ };
+ }
}
-#content-2{
- color: $soft-grey;
+#wrapper{
+ width: 960px;
+ margin: 1em auto;
}
-#indextanksearch {
- padding: 0 0 0 0px;
- display: inline;
+#content{
+ color: $soft_gray;
}
+
.comment{
.comment-post{
padding:0 0 0 11px;
@@ -125,7 +133,7 @@ a:hover{
}
}
.comment-message{
- color:$dark-grey;
+ color:$dark_gray;
padding-left:32px;
p {
margin-bottom: 1em;
@@ -146,7 +154,7 @@ a:hover{
padding: 5px 5px;
.message{
padding: 5px 20px 20px 20px;
- color: $dark-grey;
+ color: $dark_gray;
}
.noticia{
padding:1em 0;
@@ -172,12 +180,12 @@ a:hover{
.noticia{
border-bottom:1px solid #F2F2F2;
- padding: 0.2em 0 0.5em;
+ padding: 0.2em 0 0.8em;
margin: 1px 0 0;
- &:nth-child(even){
+/* &:nth-child(even){
background:#F5F5F5;
- };
+ };*/
.order-number{
float:left;
@@ -204,27 +212,33 @@ a:hover{
.post-title{
line-height:1.8em;
- font-size:1.1em;
+ font-size:1.3em;
+ font-weight: 400;
+ letter-spacing: -0.05em;
+
a{
- color:$dark-grey;
-
+ color:$dark_gray;
+ color: #000;
&:visited{
- color:lighten($soft-grey, 30%);
+ color:lighten($soft_gray, 30%);
+ color: #000;
text-decoration:none;
}
}
.post-netloc{
- font-size:0.7em;
+ letter-spacing: 0;
+ font-size:0.6em;
+ font-weight: 300;
font-family: Consolas,Courier,monospace;
}
}
.post-info{
- font-size:11px;
+ font-size:0.8em;
line-height:13px;
margin-left:51px;
a {
- color: $bright-color;
+ color: $bright_color;
}
}
@@ -236,7 +250,7 @@ a:hover{
}
.submit{
- color: $dark-grey;
+ color: $dark_gray;
padding: 15px;
hr{
margin-bottom: 2em;
@@ -248,6 +262,9 @@ a:hover{
padding: 0.5em;
margin-bottom:1em;
}
+ input[type="submit"]{
+ @include link_to_button;
+ }
textarea{
padding: 0.5em;
width:80%;
@@ -256,7 +273,7 @@ a:hover{
}
.profile{
- color: $dark-grey;
+ color: $dark_gray;
padding: 15px;
h1{
padding: 0;
@@ -285,23 +302,20 @@ a:hover{
}
#footer{
- font-size:12px;
- line-height:17px;
text-align:center;
- background-color:$bright-color;
padding: 5px 0;
.disclamer{
line-height:15px;
font-size:0.8em;
}
a{
- color:$dark-grey;
+ color:$dark_gray;
}
}
#guidelines{
padding: 0 20px;
- color:$dark-grey;
+ color:$dark_gray;
margin: 2em 0;
h3 {
padding: 5px 0px;
@@ -337,7 +351,7 @@ input, textarea {
}
.success{
- color:$bright-color;
+ color:$bright_color;
font-weight:bold;
}
@@ -348,7 +362,7 @@ input.fielderror, textarea.fielderror {
.leaderboard{
padding: 0 20px;
- color:$dark-grey;
+ color:$dark_gray;
margin: 2em 0;
.leader-user{
.position{
@@ -404,7 +418,7 @@ hr {
#login-register-boxes{
overflow:hidden;
- color:$dark-grey;
+ color:$dark_gray;
margin: 2em 0;
input{
padding: 0.5em;
@@ -414,7 +428,7 @@ hr {
}
#login-box{
- border-right:1px solid $bright-color;
+ border-right:1px solid $bright_color;
}
#login-box, #register-box {
@@ -426,7 +440,7 @@ hr {
#top-alert{
padding: 0.5em 0;
- background: $alert-color;
+ background: $alert_color;
text-align:center;
color: $light-color;
a{
@@ -436,7 +450,7 @@ hr {
}
#password_recovery, #new_password{
- color:$dark-grey;
+ color:$dark_gray;
margin: 2em 0;
padding: 0 20px;
}
View
BIN  static/images/logo-23px.png
Deleted file not rendered
View
BIN  static/images/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  static/images/logo_60px.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  static/images/logo_mexicanvc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
88 templates/base.html
@@ -17,7 +17,7 @@
<script type="text/javascript" src="/static/javascript/indextank/jquery.indextank.basic.js"></script>
<script type="text/javascript" src="/static/javascript/indextank/querybuilder.js"></script>
<link type="text/css" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.11/themes/south-street/jquery-ui.css" media="all" />
-
+ <link href='http://fonts.googleapis.com/css?family=Open+Sans:800,700,400,300,300italic' rel='stylesheet' type='text/css'>
<script type="text/javascript">
window._gaq = [['_setAccount','UA-2138729-21'],['_trackPageview'],['_trackPageLoadTime']];
(function(d, t) {
@@ -105,63 +105,59 @@
</head>
<body>
{% if not user %}
- <div id="top-alert"><a href="/login?utm_source=register">Regístrate</a> y se parte de esta comunidad, toma <a href="/login?utm_source=10segs">10 segundos!</a></div>
+ <!-- Register -->
+ <!-- <div id="top-alert"><a href="/login?utm_source=register">Regístrate</a> y se parte de esta comunidad, toma <a href="/login?utm_source=10segs">10 segundos!</a></div> -->
{% endif %}
- <div id="wrapper">
+ <div id="header-container">
<div id="header">
- <div id="logo">
- <a href="/" title="Noticias Hacker">
- <span class="logotype"><img src="/static/images/logo-23px.png"/></span>
- </a>
- </div>
- <div id="menu">
- <div id="main_nav">
- <a href="/" title="Noticias Hacker">
- <span class="sitename"> Noticias Hacker</a>
+ <div id="logo">
+ <a href="/" title="Ir al inicio">
+ <img src="/static/images/logo_60px.png"/>
</a>
- <a href="/nuevo">nuevo</a>
- {% if user %}
- | <a href="/conversaciones/{{user.nickname}}">conversaciones</a>
- {% endif %}
- | <a href="/agregar">Agregar contenido</a>
- | <form id="indextanksearch" action="/buscar"><input id="query" type="text" name="q"><input type="submit" value="buscar"/></form>
- </div>
+ </div>
+ <div id="powered_by">
+ <span>impulsado por</span>
+ <a href="http://mexican.vc" title="Mexican.VC">
+ <img src="/static/images/logo_mexicanvc.png">
+ </a>
+ </div>
+ <div id="menu">
<div id="user_toolbar">
- {% if user %}
- {% if user.has_notifications %}
- <a href="/inbox"><img src="/static/images/sobre_active.png"/></a>
- {% else %}
- <a href="/inbox"><img src="/static/images/sobre.png"/><a>
- {% endif %}
- <a href="/perfil/{{user.nickname}}">{{user.nickname}}</a><span class="karma">({{user.sum_votes}})</span> |
- <a href="/logout">Log out</a>
+ {% if user %}
+ {% if user.has_notifications %}
+ <a href="/inbox"><img src="/static/images/sobre_active.png"/></a>
{% else %}
- <a href="/login">Login</a> | <a href="/login">Registro</a>
+ <a href="/inbox"><img src="/static/images/sobre.png"/><a>
{% endif %}
+ <a href="/perfil/{{user.nickname}}">{{user.nickname}}</a><span class="karma">({{user.sum_votes}})</span> |
+ <a href="/logout">Log out</a>
+ {% else %}
+ <a href="/login">Login</a> | <a href="/login">Registro</a>
+ {% endif %}
</div>
</div>
</div>
+ </div>
+ <div id="main_nav">
+ <a href="/nuevo">Nuevo</a>
+ {% if user %}
+ <a href="/conversaciones/{{user.nickname}}">Conversaciones</a>
+ {% endif %}
+ <a href="/agregar">Agregar contenido</a>
+ </div>
+ <div id="wrapper">
<div id="content">
{% block content %}{% endblock %}
</div>
- <div id="content-2"></div>
- <div id="footer">
- <p>
- <a href="/rss">RSS</a> |
- <a href="/directrices">Directrices</a> |
- <a href="/preguntas-frecuentes">Preguntas frecuentes</a> |
- <a href="https://github.com/DFectuoso/Noticias-HAcker/issues">Comentarios y sugerencias</a> |
- <a href="https://github.com/DFectuoso/Noticias-HAcker">Código</a>
- </p>
- <p>
- <a href="/lideres">Líderes</a> |
- <a href="http://twitter.com/noticiash4cker">@noticiasH4cker</a> |
- <a href="javascript:(function(){ var title = document.getElementsByTagName('title')[0].innerHTML;var url = location.href;window.location = 'http://www.noticiashacker.com/agregar?title_bookmarklet='+encodeURIComponent(title)+'&url_bookmarklet='+encodeURIComponent(url); })();">NH Bookmarklet</a>
- </p>
- <p class="disclamer">
- NoticiasHacker es hecho en <a href="https://github.com/DFectuoso/Noticias-HAcker/blob/master/COMMITTERS">comunidad</a> y no esta asociado de ninguna manera a <a href="http://news.ycombinator.com">Hacker News</a>
- </p>
- </div>
+ </div>
+ <div id="footer">
+ <p>
+ <a href="/rss">RSS</a> |
+ <a href="/directrices">Directrices</a> |
+ <a href="/preguntas-frecuentes">Preguntas frecuentes</a> |
+ <a href="https://github.com/DFectuoso/Noticias-HAcker/issues">Comentarios y sugerencias</a> |
+ <a href="https://github.com/DFectuoso/Noticias-HAcker">Código</a>
+ </p>
</div>
<script type="text/javascript">
var _sf_async_config={uid:634,domain:"noticiashacker.com"};
Please sign in to comment.
Something went wrong with that request. Please try again.