Merge lp:~nataliabidart/locolander/add-media into lp:locolander

[Natalia Bidart]

- Added css stylesheets plus some more templates.

[Matias Bordese (matiasb)]

Looks good.

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-06-21 21:42:24 +0000
@@ -0,0 +1,1 @@
+locolander.db

=== modified file 'README'
--- README	2013-06-21 01:48:40 +0000
+++ README	2013-06-21 21:42:24 +0000
@@ -2,7 +2,7 @@
 LocoLander
 ==========
 
-.. image:: doc/img/locolander.png
+.. image:: locolander/locolanderweb/media/locolander.png
 
 
 To Do

=== removed directory 'doc'
=== removed directory 'doc/img'
=== modified file 'locolander/locolander/settings.py'
--- locolander/locolander/settings.py	2013-06-21 15:34:22 +0000
+++ locolander/locolander/settings.py	2013-06-21 21:42:24 +0000
@@ -1,5 +1,12 @@
 # Django settings for locolander project.
 
+import os
+
+from django.core.urlresolvers import reverse
+
+
+PROJECT_DIR = os.path.abspath(os.path.dirname(__file__))
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -156,6 +163,8 @@
     }
 }
 
+LOGIN_URL = reverse('login')
+LOGIN_REDIRECT_URL = reverse('home')
 
 try:
     from local_setting import *

=== added directory 'locolander/locolanderweb/static/css'
=== added file 'locolander/locolanderweb/static/css/reset.css'
--- locolander/locolanderweb/static/css/reset.css	1970-01-01 00:00:00 +0000
+++ locolander/locolanderweb/static/css/reset.css	2013-06-21 21:42:24 +0000
@@ -0,0 +1,47 @@
+/**
+ * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
+ * http://cssreset.com
+ */
+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;
+}

=== added file 'locolander/locolanderweb/static/css/style.css'
--- locolander/locolanderweb/static/css/style.css	1970-01-01 00:00:00 +0000
+++ locolander/locolanderweb/static/css/style.css	2013-06-21 21:42:24 +0000
@@ -0,0 +1,70 @@
+/* Remove the following once the reset.css is enabled */
+* {
+    margin: 0;
+    padding: 0;
+}
+
+ol, ul {
+    list-style: none;
+}
+
+/* end remove */
+
+#header,
+#content,
+#footer {
+    padding: 10px;
+}
+
+#header {
+    background: #BCBCBC;
+}
+
+#nav {
+    float: right;
+    padding: 5px;
+}
+
+#nav li {
+    display: inline;
+    padding: 5px;
+}
+
+a {
+    color: black;
+    text-decoration: none;
+}
+
+.errorlist {
+    color: red;
+    float: right;
+    padding: 5px;
+}
+
+#messages .message {
+    padding: 10px;
+    margin: 10px;
+    font-size: larger;
+}
+
+#messages .message.info,
+#messages .message.success {
+    background: #66cc66;
+    border: solid green 1px;
+}
+
+#messages .message.warning {
+    background: #ffff88;
+    border: solid #ffff00 1px;
+}
+
+#messages .message.error {
+    background: #FF4545;
+    border: solid red 1px;
+}
+
+.actions {
+    padding: 10px;
+    margin-top: 10px;
+    border-top: dotted grey 1px;
+}

=== added directory 'locolander/locolanderweb/static/images'
=== renamed file 'doc/img/locolander.png' => 'locolander/locolanderweb/static/images/locolander.png'
=== modified file 'locolander/locolanderweb/templates/base.html'
--- locolander/locolanderweb/templates/base.html	2013-06-21 15:34:22 +0000
+++ locolander/locolanderweb/templates/base.html	2013-06-21 21:42:24 +0000
@@ -1,13 +1,41 @@
+{% load staticfiles %}
+
 <html>
     <head>
     <title>{% block html-title %}Loco Lander{% endblock html-title %}</title>
+    {% comment %}
+    <link rel="stylesheet" href="{% static 'css/reset.css' %}" />
+    {% endcomment %}
+    <link rel="stylesheet" href="{% static 'css/style.css' %}" />
     {% block head-extra %}{% endblock head-extra %}
     </head>
 
     <body>
+    <div id="header">
+        <a href="{% url 'home'%}">
+            <img src="{% static 'images/locolander.png' %}" width="50px" />
+        </a>
+        <ul id="nav">
+            {% if user.is_authenticated %}
+            <li><a href="{% url 'project-list' %}">Your projects</a></li>
+            <li><a href="{% url 'logout' %}">Logout</a></li>
+            {% else %}
+            <li><a href="{% url 'login' %}">Login</a></li>
+            {% endif %}
+        </div>
+    </div>
 
     <div id="content">
-    {% block content %}{% endblock content %}
+        <div id="messages">
+            {% if messages %}
+            <ul>
+            {% for message in messages %}
+                <li class="message {{ message.tags }}">{{ message }}</li>
+            {% endfor %}
+            </ul>
+            {% endif %}
+        </div>
+        {% block content %}{% endblock content %}
     </div>
 
     <div id="footer">

=== modified file 'locolander/locolanderweb/templates/locolanderweb/home.html'
--- locolander/locolanderweb/templates/locolanderweb/home.html	2013-06-21 20:34:15 +0000
+++ locolander/locolanderweb/templates/locolanderweb/home.html	2013-06-21 21:42:24 +0000
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-<h1>Welcome!</h1>
+<h1>Welcome {{ user.username }}!</h1>
 
 {% include "locolanderweb/project/_list.html" %}
 

=== modified file 'locolander/locolanderweb/templates/locolanderweb/project/_list.html'
--- locolander/locolanderweb/templates/locolanderweb/project/_list.html	2013-06-21 20:28:55 +0000
+++ locolander/locolanderweb/templates/locolanderweb/project/_list.html	2013-06-21 21:42:24 +0000
@@ -1,17 +1,19 @@
 <div id="projects">
 {% if projects %}
-    <h3>Your projects:</h3>
-    <table>
+    <h2>Your projects:</h2>
+    <table class="project-list">
     {% for p in projects %}
         <tr>
             <th>{{ p.name }}</th>
-            <td>{{ p.url }}</td>
+            <td><a href="{{ p.url }}">{{ p.url }}</a></td>
         </tr>
     {% endfor %}
     </table>
 {% else %}
-    <h3>No projects.</h3>
+    <h2>Currently you have no projects.</h2>
 {% endif %}
 
-<a href="{% url 'project-add' %}">Add a new project</a>
+    <div class="actions">
+        <a href="{% url 'project-add' %}">Add a new project</a>
+    </div>
 </div>

=== modified file 'locolander/locolanderweb/templates/locolanderweb/project/add.html'
--- locolander/locolanderweb/templates/locolanderweb/project/add.html	2013-06-21 15:34:22 +0000
+++ locolander/locolanderweb/templates/locolanderweb/project/add.html	2013-06-21 21:42:24 +0000
@@ -6,16 +6,14 @@
 <div id="project-create">
 
 <form action="." method="POST">
+    {% csrf_token %}
     <table>
     {{ form.as_table }}
-    <tr>
-        <td />
-        <td class="text-left">
-            <input type="submit" name="create" value="Add" />
-        </td>
     </table>
+    <div class="actions">
+        <input type="submit" name="create" value="Add" />
+    </div>
 </form>
 
 </div>
-
 {% endblock content %}

=== added directory 'locolander/locolanderweb/templates/registration'
=== added file 'locolander/locolanderweb/templates/registration/logged_out.html'
--- locolander/locolanderweb/templates/registration/logged_out.html	1970-01-01 00:00:00 +0000
+++ locolander/locolanderweb/templates/registration/logged_out.html	2013-06-21 21:42:24 +0000
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1>You've been logged out.</h1>
+<p><a href="{% url 'login' %}">Login back again</a></p>
+{% endblock content %}

=== added file 'locolander/locolanderweb/templates/registration/login.html'
--- locolander/locolanderweb/templates/registration/login.html	1970-01-01 00:00:00 +0000
+++ locolander/locolanderweb/templates/registration/login.html	2013-06-21 21:42:24 +0000
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+
+{% block content %}
+<form action="." method="POST">
+    {% csrf_token %}
+    <table id="login">
+    {{ form.as_table }}
+    </table>
+    <div class="actions">
+        <input type="submit" name="login" value="Login">
+    </div>
+    <input type="hidden" name="next" value="{{ next }}" />
+</form>
+{% endblock content %}

=== modified file 'locolander/locolanderweb/urls.py'
--- locolander/locolanderweb/urls.py	2013-06-21 15:34:22 +0000
+++ locolander/locolanderweb/urls.py	2013-06-21 21:42:24 +0000
@@ -1,7 +1,12 @@
 from django.conf.urls import patterns, include, url
 
-
 urlpatterns = patterns(
+    'django.contrib.auth.views',
+    url(r'^login/$', 'login', name='login'),
+    url(r'^logout/$', 'logout_then_login', name='logout'),
+)
+
+urlpatterns += patterns(
     'locolanderweb.views',
     url(r'^$', 'home', name='home'),
     url(r'^projects/$', 'project_list', name='project-list'),

=== modified file 'locolander/locolanderweb/views.py'
--- locolander/locolanderweb/views.py	2013-06-21 20:34:15 +0000
+++ locolander/locolanderweb/views.py	2013-06-21 21:42:24 +0000
@@ -31,7 +31,7 @@
             messages.success(request, 'Project %s added.' % project.name)
             return HttpResponseRedirect(reverse('project-list'))
 
-        messages.warning(request, 'Errors!')
+        messages.error(request, 'Please correct the errors below.')
     else:
         form = ProjectForm(owner=request.user)