summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Leray <alexandre@alexandreleray.com>2010-11-03 14:25:10 (GMT)
committer Alexandre Leray <alexandre@alexandreleray.com>2010-11-03 14:25:10 (GMT)
commit4664cc06df00a53ebe7409058bccadb73c0d8a4b (patch)
tree745b1583659b7aacc0a372b636add6d318705126
parentfbf4c4e2d92db0ec637b091cbe009a37ff66de99 (diff)
working on wording and links to user page
-rwxr-xr-xbrainch/templates/brainch/base.html2
-rw-r--r--brainch/templates/brainch/inc/clone_list.html4
-rw-r--r--brainch/templates/brainch/index.html25
-rwxr-xr-xbrainch/templates/brainch/user-index.html8
-rwxr-xr-xbrainch/templates/brainch/view.html2
-rwxr-xr-xbrainch/views/misc/index.py2
-rw-r--r--mysite/static/css/brainch.css25
7 files changed, 46 insertions, 22 deletions
diff --git a/brainch/templates/brainch/base.html b/brainch/templates/brainch/base.html
index cba1e0e..a1ea258 100755
--- a/brainch/templates/brainch/base.html
+++ b/brainch/templates/brainch/base.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="fr-FR" xml:lang="fr-FR">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Brainch {% block extratitle %}{% endblock extratitle %}</title>
diff --git a/brainch/templates/brainch/inc/clone_list.html b/brainch/templates/brainch/inc/clone_list.html
index 95278aa..a589f8c 100644
--- a/brainch/templates/brainch/inc/clone_list.html
+++ b/brainch/templates/brainch/inc/clone_list.html
@@ -1,11 +1,11 @@
{% if clone_list %}
- <dt>Personal copies</dt>
+ <dt>Other copies</dt>
<dd>
<ul>
{% for clone in clone_list %}
<li>
{% with clone.user as user %}
- <a href="{{ user.get_absolute_url }}">{{ user }}</a> /
+ <a href="/{{ user }}">{{ user }}</a>'s
{% endwith %}
<a href="{{ clone.get_absolute_url }}">{{ clone.name }}</a></li>
{% endfor %}
diff --git a/brainch/templates/brainch/index.html b/brainch/templates/brainch/index.html
index f70e5da..80da45a 100644
--- a/brainch/templates/brainch/index.html
+++ b/brainch/templates/brainch/index.html
@@ -20,15 +20,16 @@
<h2>Texts in Process</h1>
{% for repo in repo_list %}
<div class="repo_list_entry">
- <h3><a href="{{ repo.get_absolute_url }}">{{ repo.name }} by {{ repo.user }}</a></h3>
- <div>{{ repo.get_description|truncatewords:30 }}</div>
- <dl>
+ <h3><a href="{{ repo.get_absolute_url }}">{{ repo.name }}</a></h3>
+ <p class='author'>by <a href='/{{ repo.user }}'>{{ repo.user }}</a></p>
+ <p>{{ repo.get_description|truncatewords:30 }}</p>
{% if repo.origin %}
- <dt>cloned from</dt>
- <dd><a href="{{ repo.origin.get_absolute_url }}">{{ repo.origin.user }}/{{ repo.origin }}</a></dd>
+ <p class='origin'>
+ cloned from
+ <a href="/{{ repo.origin.user }}">{{ repo.origin.user }}</a>'s <a href="{{ repo.origin.get_absolute_url }}">"{{ repo.origin }}"</a>
+ </p>
{% endif %}
{#{% clone_list repo %}#}
- </dl>
</div>
{% endfor %}
</div>
@@ -38,10 +39,20 @@
{% include "brainch/inc/action_list.html" %}
</div>
<div class="column column20">
- <h2>Brainch news</h2>
+ <h2>Brainch Activity</h2>
<dl>
<dt>06/11/2010</dt>
<dd>Brainch presentation at Make Art, Poitiers<sup>FR</sup></p>
+ <dt>11/2010</dt>
+ <dd>Second version of Brainch online</p>
+ <dt>07/2010</dt>
+ <dd>Brainch informal presentation at Constant, Brussels<sup>BE</sup></p>
+ <dt>04/2010</dt>
+ <dd>Brainch presentation at Breizh Entropy Congress, Rennes<sup>FR</sup></p>
+ <dt>03/2010</dt>
+ <dd>Brainch small presentation at Lux, Valence<sup>FR</sup></p>
+ <dt>02/2010</dt>
+ <dd>First version of Brainch online.</p>
</dl>
</div>
{% endblock main %}
diff --git a/brainch/templates/brainch/user-index.html b/brainch/templates/brainch/user-index.html
index cba0dda..f922b84 100755
--- a/brainch/templates/brainch/user-index.html
+++ b/brainch/templates/brainch/user-index.html
@@ -11,7 +11,7 @@
{% block sidebar %}
{% ifequal user.username username %}
<h2>Your tools</h2>
- <p><a href="{% url brainch-create username %}">Create a new text</a>.</p>
+ <p><a href="{% url brainch-create username %}">Create a new text</a></p>
{% endifequal %}
{% endblock %}
@@ -26,8 +26,10 @@
<div>{{ repo.get_description|truncatewords:30 }}</div>
<dl>
{% if repo.origin %}
- <dt>cloned from</dt>
- <dd><a href="{{ repo.origin.get_absolute_url }}">{{ repo.origin.user }}/{{ repo.origin }}</a></dd>
+ <p class='origin'>
+ cloned from
+ <a href="/{{ repo.origin.user }}">{{ repo.origin.user }}</a>'s <a href="{{ repo.origin.get_absolute_url }}">"{{ repo.origin }}"</a>
+ </p>
{% endif %}
<dt>Licence</dt>
<dd class="commit-author">Free Art Licence 1.3</dd>
diff --git a/brainch/templates/brainch/view.html b/brainch/templates/brainch/view.html
index b73bc88..12dcddd 100755
--- a/brainch/templates/brainch/view.html
+++ b/brainch/templates/brainch/view.html
@@ -41,7 +41,7 @@
<div id="description">
<h2>About this text</h2>
{% if repo.origin %}
- <p id="origin">Based on <a href="../../{{ repo.origin.user }}/{{ repo.origin.slug }}">{{ repo.origin.user }}/{{ repo.origin.name }}</a></p>
+ <p class="origin">Cloned from <br /><a href="/{{ repo.origin.user }}">{{ repo.origin.user }}'s</a> <a href="{{ repo.origin.get_absolute_url }}">"{{ repo.origin.name }}"</a></p>
{% endif %}
{{ repo.get_description }}
<h2>License</h2>
diff --git a/brainch/views/misc/index.py b/brainch/views/misc/index.py
index a3110bd..4b80b95 100755
--- a/brainch/views/misc/index.py
+++ b/brainch/views/misc/index.py
@@ -25,7 +25,7 @@ def index(request):
Index page for Brainch.
"""
# Gets back all the repo owned by the user
- repo_list = Repository.objects.filter(origin__isnull=True)
+ repo_list = Repository.objects.all()
# Gets back the user's actions.
action_list = UserAction.objects.all()[:15]
diff --git a/mysite/static/css/brainch.css b/mysite/static/css/brainch.css
index 135d243..7506b32 100644
--- a/mysite/static/css/brainch.css
+++ b/mysite/static/css/brainch.css
@@ -116,6 +116,19 @@ div#main ul {
margin-bottom: 18px;
}
+div#text {
+ border-top: 3px solid black;
+ padding-top: 3px;
+ margin-top: 30px;
+}
+div#text h2 {
+ border-top-width: 0;
+ border-bottom: 3px solid black;
+ display: inline-block;
+ margin-top: 18px;
+ margin-bottom: 15px;
+}
+
li ul {
margin-left: 1em;
}
@@ -145,15 +158,10 @@ ul#authors-list li {
padding-top: 0;
}
-p#origin {
+p.origin {
color: SlateGray;
+ font-style: italic;
}
-p#origin {
- font-size: 13px;
- line-height: 18px;
- font-weight: bold;
-}
-
div#view-text h1,
div#view-text h2 {
margin-bottom: 18px;
@@ -278,5 +286,8 @@ dl.commit {
div.repo_list_entry {
margin-bottom: 1em;
}
+div.repo_list_entry p {
+ margin-bottom: 0;
+}