Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: alvivi/leetelo
base: a8f4dfe26f
...
head fork: alvivi/leetelo
compare: fccfc76069
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 13 files changed
  • 0 commit comments
  • 1 contributor
View
4 html/base.html
@@ -8,12 +8,12 @@
<link rel="stylesheet" type="text/css" href="/static/cupertino/jquery-ui-1.8.16.custom.css"/>
<script type="text/javascript" src="/static/jquery.js"></script>
<script type="text/javascript" src="/static/jquery-ui.js"></script>
+ <script type="text/javascript" src="/static/jquery.validate.js"></script>
+ <script type="text/javascript" src="/static/jquery.tablesorter.js"></script>
<script type="text/javascript" src="/static/bootstrap-alerts.js"></script>
<script type="text/javascript" src="/static/bootstrap-modal.js"></script>
<script type="text/javascript" src="/static/bootstrap-twipsy.js"></script>
<script type="text/javascript" src="/static/bootstrap-popover.js"></script>
- <script type="text/javascript" src="/static/jquery.validate.js"></script>
- <script type="text/javascript" src="/static/jquery.tablesorter.js"></script>
<script type="text/javascript" src="/static/base.js"></script>
View
2  html/profile.html
@@ -6,7 +6,7 @@
<div class="row">
<div class="span">
- <img class="avatar" src='/img?user={{user}}' alt="Avatar del usuario">
+ <img class="avatar" src='/img?user={{user.email}}' alt="Avatar del usuario">
</div>
<div class="span5">
<address>
View
2  html/profileAccount.html
@@ -13,7 +13,7 @@
<p></p>
{% if error %}
<div class="row">
- <div class="alert-message block-message error"><p>El tamanyo de la imagen no puede ser mayor de 10 KB.</p></div>
+ <div class="alert-message block-message error"><p>El tamaño de la imagen no puede ser mayor de 10 KB.</p></div>
</div>
{% endif %}
</form>
View
6 html/profileClubContent.html
@@ -27,8 +27,6 @@ <h5 class="clubtitle">Club {{selectedClub.name}}</h5>
</div>
-
-<p></p>
<div class="row">
<div class="span6">
<h5 class="clubtitle2">Eventos</h5>
@@ -38,7 +36,7 @@ <h5 class="clubtitle2">Comentarios</h5>
{% for c in comments %}
<blockquote>
<p>{{c.comment.text}}</p>
- <small>{{c.comment.user.nickname}} ({{c.comment.date}})</small>
+ <small> <img class="avatar-tiny" src='/img?user={{c.comment.user.email}}' alt="Avatar del usuario"> {{c.comment.user.nickname}} ({{c.comment.date}})</small>
</blockquote>
{% endfor %}
<a id="newcomment" href="#">Añade un nuevo comentario...</a>
@@ -74,7 +72,7 @@ <h5 class="clubtitle2">Participantes</h6>
<tbody>
{% for participation in participations %}
<tr>
- <td style="vertical-align:middle"><img class="avatar-small" src='/img?user={{participation.user}}' alt="Avatar del usuario"></td>
+ <td style="vertical-align:middle"><img class="avatar-small" src='/img?user={{participation.user.email}}' alt="Avatar del usuario"></td>
<td style="vertical-align:middle">{{participation.user.nickname}}</td>
<td style="vertical-align:middle">
{% ifequal participation.state 'Solicitud Aceptada' %}
View
4 html/profileDisabledClubContent.html
@@ -43,7 +43,7 @@ <h5 class="clubtitle2">Comentarios</h5>
{% for c in comments %}
<blockquote>
<p>{{c.comment.text}}</p>
- <small>{{c.comment.user.nickname}} ({{c.comment.date}})</small>
+ <small> <img class="avatar-tiny" src='/img?user={{c.comment.user.email}}' alt="Avatar del usuario"> {{c.comment.user.nickname}} ({{c.comment.date}})</small>
</blockquote>
{% endfor %}
</div>
@@ -62,7 +62,7 @@ <h5 class="clubtitle2">Participantes</h6>
<tbody>
{% for participation in participations %}
<tr>
- <td style="vertical-align:middle"><img class="avatar-small" src='/img?user={{participation.user}}' alt="Avatar del usuario"></td>
+ <td style="vertical-align:middle"><img class="avatar-small" src='/img?user={{participation.user.email}}' alt="Avatar del usuario"></td>
<td style="vertical-align:middle">{{participation.user.nickname}}</td>
<td style="vertical-align:middle">
{% ifequal participation.state 'Solicitud Aceptada' %}
View
7 static/base.css
@@ -55,6 +55,13 @@ thead th {
margin-left: 0px;
}
+.avatar-tiny {
+ width: 15px;
+ height: 15px;
+ margin-top: 0px;
+ margin-left: 0px;
+}
+
.book-cover {
width: 90px;
height: 110px;
View
BIN  static/img/avatar.jpg
Deleted file not rendered
View
BIN  static/img/billy.jpg
Deleted file not rendered
View
BIN  static/img/gato.jpg
Deleted file not rendered
View
BIN  static/img/homb.jpg
Deleted file not rendered
View
BIN  static/img/hombrecito.jpg
Deleted file not rendered
View
BIN  static/img/pinguino.jpg
Deleted file not rendered
View
24 tools/restart_db.py
@@ -2,13 +2,24 @@
from google.appengine.ext import db
from google.appengine.api import users
from models import *
+import urllib
+
+
testUser = users.User(email='test@example.com')
nilsenUser = users.User(email='nilsen@example.com')
billyUser = users.User(email='billy@gates.com')
userUser = users.User(email='user@example.com')
lolUser = users.User(email='lol@example.com')
-patryUser = users.User(email='patriciapons89@gmail.com')
+patryUser = users.User(email='patriciapons89@gmail.com')
+
+db.delete(UserAvatar.all().fetch(512))
+UserAvatar(user=testUser, avatar=db.Blob(urllib.urlopen("http://s3.ryanparman.com/images/blue-avatar.jpg").read())).put()
+UserAvatar(user=nilsenUser, avatar=db.Blob(urllib.urlopen("http://lh3.ggpht.com/-xZQnCl3y_nA/TrUEXriz-SI/AAAAAAAAFKk/ObneIl5PWqk/bloggerPlus.jpg").read())).put()
+UserAvatar(user=patryUser, avatar=db.Blob(urllib.urlopen("http://media.comicvine.com/uploads/4/48211/907038-mafalda_icon.jpg").read())).put()
+UserAvatar(user=billyUser, avatar=db.Blob(urllib.urlopen("http://revistafortuna.com.mx/contenido/wp-content/uploads/2011/04/bill-gates-motor.jpg").read())).put()
+UserAvatar(user=userUser , avatar=db.Blob(urllib.urlopen("http://safopage.files.wordpress.com/2010/04/user.png").read())).put()
+UserAvatar(user=lolUser, avatar=db.Blob(urllib.urlopen("http://images.mirror.co.uk/upl/m4/oct2009/0/9/image-1-for-olympic-history-gallery-553113648.jpg").read())).put()
db.delete(Book.all().fetch(512))
@@ -148,4 +159,13 @@
Club_User(user=testUser,club=club6,state=u'Invitado').put()
Club_User(user=nilsenUser,club=club7,state=u'Propietario').put()
-Club_User(user=testUser,club=club7,state=u'Invitacion Aceptada').put()
+Club_User(user=testUser,club=club7,state=u'Invitacion Aceptada').put()
+
+db.delete(Comment.all().fetch(512))
+comment1 = Comment(user=patryUser, text=u'OseAaA, EsTa SuuuuupeR WeNnNoooOooO!!!').put()
+comment2 = Comment(user=nilsenUser, text=u'De mayor quiero se como él.').put()
+
+db.delete(ClubComment.all().fetch(512))
+ClubComment(club=club1, comment=comment1).put()
+ClubComment(club=club1, comment=comment2).put()
+

No commit comments for this range

Something went wrong with that request. Please try again.