--- a/src/hdalab/__init__.py Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/__init__.py Sat Mar 28 04:29:20 2015 +0100
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
-VERSION = (3, 0, 0, "rc", 9)
+VERSION = (3, 0, 0, "rc", 10)
def get_version():
--- a/src/hdalab/static/hdalab/css/additionnal_renkan.css Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/static/hdalab/css/additionnal_renkan.css Sat Mar 28 04:29:20 2015 +0100
@@ -146,5 +146,5 @@
border:none;
}
input.Rk-PadTitle{
- width: 162px;
+ width: 155px;
}
\ No newline at end of file
--- a/src/hdalab/static/hdalab/css/common.css Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/static/hdalab/css/common.css Sat Mar 28 04:29:20 2015 +0100
@@ -276,6 +276,7 @@
#content .all-title:after {
clear: both;
}
+
.all-title h1{
font-size: 20px;
font-size: 2rem;
@@ -285,12 +286,24 @@
text-transform: uppercase;
display: inline;
}
-.all-title h1:before {
+
+.all-title h2 {
+ font-weight: bold;
+ font-family: 'FranklinGothic', Arial, Helvetica, sans-serif;
+ letter-spacing: -0.04em;
+ text-transform: uppercase;
+ display: inline;
+ padding-left: 20px;
+}
+
+
+.all-title h1:before, .all-title h2:before {
content: "/";
font-weight: bold;
margin-right: 3px;
position: relative;
}
+
.description {
font-size: 14px;
}
--- a/src/hdalab/static/hdalab/css/profile.css Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/static/hdalab/css/profile.css Sat Mar 28 04:29:20 2015 +0100
@@ -25,6 +25,10 @@
float: left;
}
+.renkan_list_actions {
+ white-space: nowrap;
+}
+
.renkan-basic-action {
float: left;
margin-right: 5px;
--- a/src/hdalab/templates/a_propos.html Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/templates/a_propos.html Sat Mar 28 04:29:20 2015 +0100
@@ -19,6 +19,13 @@
<p>Parti d’une expérimentation en 2012, Histoire de arts’Lab donne aujourd’hui un accès complet aux 5 000 ressources du portail Histoire des arts du ministère de la Culture et de la Communication. Avec ses différents modules (géographique, temporel, thématique…), Histoire de arts’Lab offre autant de points d’entrée de recherche que de modes de représentation de l’histoire des arts.</p>
<br>
<p>Histoire des arts’Lab c’est aussi l’outil Renkan, qui permet de visualiser sur des cartes de connaissances, des parcours historiques dans une vingtaine de domaines artistiques ainsi que des parcours thématiques sur un artiste, une œuvre, un courant artistique, une technique… Renkan est également votre outil pour construire vos propres cartes et garder une trace de vos recherches en histoire des arts.</p>
+ <p>Le mot Renkan (連環) provient du japonais “Hyakugaku renkan (百学連環) (les cycles des cent sciences)” le titre d’une des premières encyclopédie japonaise moderne.</p>
+ <p>Le mot 連環 signifie “cycle” mais est composé de 2 kanji qui peuvent être traduits par (parmi d’autres sens):
+ <ul>
+ <li>連: “connecter” or “joindre”</li>
+ <li>環: “cercle”, “lien”, “anneau”</li>
+ </ul>
+ </p>
<br>
<h2>I. HISTOIRE DU PROJET</h2>
<br>
--- a/src/hdalab/templates/profile_home.html Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/templates/profile_home.html Sat Mar 28 04:29:20 2015 +0100
@@ -96,7 +96,7 @@
<td>{{ r.modification_date|date:"Y-m-d H:i" }}</td>
<td>{% thumbnail r.image 100x100 as thumb %}<img src="{{ thumb.url }}" width="{{ thumb.width }}" height="{{ thumb.height }}" /></td>
<td>{{ hr.state|state_to_str }}</td>
- <td>
+ <td class="renkan_list_actions">
{% if hr.state == 1 %}<a title="Edit renkan" href="{% url 'renkan_edit' %}?rk_id={{ r.rk_id }}" class="renkan-basic-action"><span class="ui-icon ui-icon-pencil"></span></a>
{% else %}<span class="ui-icon ui-icon-blank renkan-basic-action"></span>{% endif %}
<a title="View renkan" href="{% url 'renkan_view' %}?rk_id={{ r.rk_id }}" class="renkan-basic-action"><span class="ui-icon ui-icon-eye"></span></a>
--- a/src/hdalab/templates/renkan_edit.html Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/templates/renkan_edit.html Sat Mar 28 04:29:20 2015 +0100
@@ -43,6 +43,7 @@
show_addedge_button:false,
static_url : "{% static 'renkanmanager/lib/renkan/' %}",
allow_image_upload : false,
+ default_view: 1,
search: [
{
type: "HdaTags",
--- a/src/hdalab/templates/renkan_list.html Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/templates/renkan_list.html Sat Mar 28 04:29:20 2015 +0100
@@ -26,15 +26,15 @@
{% block main_content %}
<div class="all-title">
- <h1>{{ list_title }}</h1>
+ {% block main_content_title %}<h1>{% trans 'Public Renkans list' %}</h1> <h2><a href="{% url 'renkan_favorite_list' %}">{% trans 'Marked Renkans list' %}</a></h2>{% endblock %}
<div id="new_renkan">
- <form action="{% url 'renkan_new' %}" method="post">
- {% csrf_token %}
- <button id="new-renkan-button" title="{% trans 'Nouveau Renkan' %}" class="renkan-basic-action"><div id="new-renkan">{% trans 'Nouveau Renkan' %}</div></button>
- </form>
- <p>{% blocktrans %}Construisez votre carte de connaissances à partir des ressources Histoires des arts et Wikipedia.{% endblocktrans %}</p>
+ <form action="{% url 'renkan_new' %}" method="post">
+ {% csrf_token %}
+ <button id="new-renkan-button" title="{% trans 'Nouveau Renkan' %}" class="renkan-basic-action"><div id="new-renkan">{% trans 'Nouveau Renkan' %}</div></button>
+ </form>
+ <p>{% blocktrans %}Construisez votre carte de connaissances à partir des ressources Histoires des arts et Wikipedia.{% endblocktrans %}</p>
</div>
- </div>
+ </div>
<p class="inline">{% if page.has_previous %}<a href="?page={{ page.previous_page_number }}&sort={{ sort_param }}&order={{ order_param }}{{ filters }}" >{% trans 'Previous' %}</a>{% endif %}
{% if page.has_previous and page.has_next %} - {% endif %}{% if page.has_next %}<a href="?page={{ page.next_page_number }}&sort={{ sort_param }}&order={{ order_param }}{{ filters }}">{% trans 'Next' %}</a>{% endif %}</p>
@@ -75,7 +75,7 @@
<td>{{ r.owner.username }}</td>
<td>{{ r.modification_date|date:"Y-m-d H:i" }}</td>
<td>{% thumbnail r.image 100x100 as thumb %}<img src="{{ thumb.url }}" width="{{ thumb.width }}" height="{{ thumb.height }}" /></td>
- <td>
+ <td class="renkan_list_actions">
<a title="View renkan" href="{% url 'renkan_view' %}?rk_id={{ r.rk_id }}" class="renkan-basic-action"><span class="ui-icon ui-icon-eye"></span></a>
<form action="{% url 'renkan_copy' rk_id=r.rk_id %}" method="post">
{% csrf_token %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/renkan_list_favorite.html Sat Mar 28 04:29:20 2015 +0100
@@ -0,0 +1,4 @@
+{% extends "renkan_list.html" %}
+{% load i18n %}
+
+{% block main_content_title %}<h1>{% trans 'Marked Renkans list' %}</h1> <h2><a href="{% url 'renkan_public_list' %}">{% trans 'Public Renkans list' %}</a></h2>{% endblock %}
\ No newline at end of file
--- a/src/hdalab/templates/renkan_view.html Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/templates/renkan_view.html Sat Mar 28 04:29:20 2015 +0100
@@ -31,7 +31,8 @@
editor_mode: false,
show_bins: false,
show_export_button: false,
- language: "fr"
+ language: "fr",
+ default_view: 1
});
Rkns.jsonIO(_renkan, {
url: "{% url 'renkan_get_put' %}" + window.location.search
--- a/src/hdalab/templates/renkan_view_full.html Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/templates/renkan_view_full.html Sat Mar 28 04:29:20 2015 +0100
@@ -36,6 +36,7 @@
show_export_button: false,
show_top_bar: false,
show_minimap: false,
+ show_zoom: false,
language: "fr"
});
Rkns.jsonIO(_renkan, {
--- a/src/hdalab/views/profile.py Fri Mar 27 17:49:42 2015 +0100
+++ b/src/hdalab/views/profile.py Sat Mar 28 04:29:20 2015 +0100
@@ -125,19 +125,17 @@
def get_context_data(self, **kwargs):
context = super(RenkanPublicList, self).get_context_data(**kwargs)
- context['list_title'] = _('Public Renkans list')
#Liste des renkans publics
return self.update_context(context, HdalabRenkan.objects.select_related("renkan", "renkan__owner").filter(state=HdalabRenkan.PUBLISHED) )
class RenkanFavoriteList(BaseRenkanList):
- template_name = "renkan_list.html"
+ template_name = "renkan_list_favorite.html"
def get_context_data(self, **kwargs):
- context = super(BaseRenkanList, self).get_context_data(**kwargs)
+ context = super(RenkanFavoriteList, self).get_context_data(**kwargs)
context['hide_favorite'] = True
- context['list_title'] = _('Marked Renkans list')
return self.update_context(context, HdalabRenkan.objects.select_related("renkan", "renkan__owner").filter(state=HdalabRenkan.PUBLISHED, favorite=True) )
--- a/src/requirement.txt Fri Mar 27 17:49:42 2015 +0100
+++ b/src/requirement.txt Sat Mar 28 04:29:20 2015 +0100
@@ -1,1 +1,1 @@
-renkanmanager (==0.8.6)
+renkanmanager (==0.8.7)