--- a/web/hdalab/static/hdalab/css/thesaurus.css Fri Oct 26 16:14:25 2012 +0200
+++ b/web/hdalab/static/hdalab/css/thesaurus.css Thu Nov 15 16:46:33 2012 +0100
@@ -11,3 +11,15 @@
font-size: 14px; font-weight: bold;
margin: 10px 0;
}
+
+.explain {
+ font-size: 12px;
+}
+
+.explain p, li {
+ margin: 5px 0;
+}
+
+.explain ul {
+ margin-left: 16px;
+}
--- a/web/hdalab/static/hdalab/js/cattree.js Fri Oct 26 16:14:25 2012 +0200
+++ b/web/hdalab/static/hdalab/js/cattree.js Thu Nov 15 16:46:33 2012 +0100
@@ -6,7 +6,7 @@
})
$(".label-name").html(_label);
if (_data) {
- renderData($("#tree"), _data);
+ renderData($("#tree"), _data, 1);
$(".results").show();
$(".content-count").html($(".cattree a.content").length);
$(".category-count").html(Math.max(0, $("p.category").length - 1));
@@ -53,7 +53,7 @@
$("#catform").submit(function() {
gettree($("#catsearch").val());
});
- gettree("peinture");
+ gettree("cinéma");
$(".disciplist li").click(function() {
gettree($(this).text().trim());
});
--- a/web/hdalab/static/hdalab/js/thesaurus.js Fri Oct 26 16:14:25 2012 +0200
+++ b/web/hdalab/static/hdalab/js/thesaurus.js Thu Nov 15 16:46:33 2012 +0100
@@ -166,7 +166,12 @@
endpoints.fill_tree,
{ tree: JSON.stringify(_tree.tree) },
function(_data) {
- renderData(_el.find(".cattree"), _data);
+ renderData(_el.find(".cattree"), _data, 2);
+ _el.find("p.theme:contains('cité-jardin')")
+ .css("background-color","#ffff80")
+ .parent()
+ .parentsUntil(".cattree")
+ .removeClass("folded");
}
);
});
--- a/web/hdalab/static/hdalab/js/trees.js Fri Oct 26 16:14:25 2012 +0200
+++ b/web/hdalab/static/hdalab/js/trees.js Thu Nov 15 16:46:33 2012 +0100
@@ -14,8 +14,8 @@
}
}
-function renderTemplate(_data, _level, _scale) {
- _data.level = !!_level;
+function renderTemplate(_data, _level, _scale, _maxlevel) {
+ _data.isfolded = _level >= _maxlevel;
_(_data.tags).each(function(_tag) {
_(_tag.contents).each(function(_content, _key) {
_content.trimmed_description = _content.description.trim().replace(/(\n|\r|\r\n)/mg,' ').replace(/(^.{150,200})[\s].+$/m,'$1…');
@@ -30,7 +30,7 @@
_data.show_more = _data.contents && _data.contents.length > 5 ? _data.contents.length - 5 : 0;
_data.font_size = (10+Math.log(_data.counts.contents)*_scale);
var _dsurl = endpoints.datasheet.replace(/ID$/,'');
- var _prefix = '<li class="themeli {{#level}}folded {{/level}}"><p class="theme"><span style="font-size: {{font_size}}px">{{label}}</span> — {{#counts.themes}}{{counts.themes}} thème(s){{#counts.contents}}, {{/counts.contents}}{{/counts.themes}}{{#counts.contents}}{{counts.contents}} notice(s){{/counts.contents}}</p><ul>',
+ var _prefix = '<li class="themeli{{#isfolded}} folded{{/isfolded}}"><p class="theme"><span style="font-size: {{font_size}}px">{{label}}</span> — {{#counts.themes}}{{counts.themes}} thème(s){{#counts.contents}}, {{/counts.contents}}{{/counts.themes}}{{#counts.contents}}{{counts.contents}} notice(s){{/counts.contents}}</p><ul>',
_suffix = '{{#contents}}<li class="content{{#hidden}} hidden{{/hidden}}" id="content_{{id}}"><p class="title score_{{score}}"><a href="'
+ _dsurl
+ '{{hda_id}}">{{title}}</a></p><div class="foldedcontent"><div class="img-container"><img src="http://www.histoiredesarts.culture.fr/images/cached/images/{{hda_id}}.jpg" />'
@@ -40,17 +40,17 @@
_html = Mustache.to_html(_prefix, _data);
if (typeof _data.themes == "object" && typeof _data.themes.slice == "function") {
for (var _i = 0; _i < _data.themes.length; _i++) {
- _html += renderTemplate(_data.themes[_i], _level + 1, _scale);
+ _html += renderTemplate(_data.themes[_i], _level + 1, _scale, _maxlevel);
}
}
_html += Mustache.to_html(_suffix, _data);
return _html;
}
-function renderData(_selector, _data) {
+function renderData(_selector, _data, _maxlevel) {
countContentsAndThemes(_data);
var _scale = 8 / Math.max(1,Math.log(_data.counts.contents));
- _selector.html(renderTemplate(_data, 0, _scale));
+ _selector.html(renderTemplate(_data, 0, _scale, _maxlevel));
_selector.find("p.theme").click(function() {
$(this).parent().toggleClass("folded")
return false;
--- a/web/hdalab/templates/base.html Fri Oct 26 16:14:25 2012 +0200
+++ b/web/hdalab/templates/base.html Thu Nov 15 16:46:33 2012 +0100
@@ -28,10 +28,8 @@
<li>—</li>
<li>Navigation par :</li>
<li><a class="{% block facettes_actif %}{% endblock %}" href="{% url facettes %}">Facettes</a></li>
-<!--
<li><a class="{% block categories_actif %}{% endblock %}" href="{% url categories %}">Catégories de Wikipedia</a></li>
<li><a class="{% block thesaurus_actif %}{% endblock %}" href="{% url thesaurus %}">Thésaurus</a></li>
--->
</ul>
<h1>
<a href="{% url home %}">HdA Lab</a>
--- a/web/hdalab/templates/categories.html Fri Oct 26 16:14:25 2012 +0200
+++ b/web/hdalab/templates/categories.html Thu Nov 15 16:46:33 2012 +0100
@@ -5,8 +5,8 @@
{% block css_import %}
{{block.super}}
<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/ui-lightness/jquery-ui-1.8.16.custom.css" />
- <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/trees.css" />
- <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/cattree.css" />
+ <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/trees.css?refresh" />
+ <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/cattree.css?refresh" />
{% endblock %}
{% block js_import %}
@@ -22,8 +22,8 @@
datasheet: "{% url notice 'ID' %}"
};
</script>
- <script src="{{STATIC_URL}}hdalab/js/trees.js"></script>
- <script src="{{STATIC_URL}}hdalab/js/cattree.js"></script>
+ <script src="{{STATIC_URL}}hdalab/js/trees.js?refresh"></script>
+ <script src="{{STATIC_URL}}hdalab/js/cattree.js?refresh"></script>
{% endblock %}
{% block categories_actif %}actif{% endblock %}
--- a/web/hdalab/templates/facettes.html Fri Oct 26 16:14:25 2012 +0200
+++ b/web/hdalab/templates/facettes.html Thu Nov 15 16:46:33 2012 +0100
@@ -8,7 +8,7 @@
{{block.super}}
<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/lib/leaflet/leaflet.css" />
<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/ui-lightness/jquery-ui-1.8.16.custom.css" />
- <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/facettes.css" />
+ <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/facettes.css?refresh" />
{% endblock %}
{% block js_import %}
@@ -20,7 +20,7 @@
<script src="{{STATIC_URL}}hdalab/lib/ZeroClipboard.js"></script>
<script src="{% url jsi18n 'hdalab' %}"></script>
- <script src="{{STATIC_URL}}hdalab/js/gomina.js?v=121018"></script>
+ <script src="{{STATIC_URL}}hdalab/js/gomina.js?refresh"></script>
<script type="text/javascript">
gomNs.languageCode = '{{LANGUAGE_CODE}}';
--- a/web/hdalab/templates/index.html Fri Oct 26 16:14:25 2012 +0200
+++ b/web/hdalab/templates/index.html Thu Nov 15 16:46:33 2012 +0100
@@ -43,7 +43,7 @@
</div>
</div>
</div>
-<!--
+
<div class="separateur-applis"></div>
<div class="bloc-appli">
<h3>Catégories de Wikipedia</h3>
@@ -61,12 +61,16 @@
<h3>Navigation par thésaurus</h3>
<div class="fond-bloc" id="bloc-thesaurus">
<div class="overlay-bloc">
- <p></p>
+ <p>Cette interface présente deux extraits de thésaurus utilisés par le ministère de la Culture et de la Communication :</p>
+ <ul>
+ <li>La branche « Secteur urbain » du Thésaurus de l’architecture et de l’urbanisme (état 2010)</li>
+ <li>La branche « Architecture d’habitation » du Thésaurus iconographique Garnier (état 2012)</li>
+ </ul>
<p class="goto"><a href="{% url thesaurus %}">»</a></p>
</div>
</div>
</div>
--->
+
<div style="clear: both;"> </div>
</div>
<h3>À propos de HdA Lab</h3>
--- a/web/hdalab/templates/notice.html Fri Oct 26 16:14:25 2012 +0200
+++ b/web/hdalab/templates/notice.html Thu Nov 15 16:46:33 2012 +0100
@@ -4,23 +4,23 @@
{% block css_import %}
{{block.super}}
- <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/notice.css" />
+ <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/notice.css?refresh" />
{% endblock %}
{% block js_import %}
{{block.super}}
<script src="{{STATIC_URL}}hdalab/lib/underscore-min.js"></script>
- <script src="{{STATIC_URL}}hdalab/js/notice.js"></script>
+ <script src="{{STATIC_URL}}hdalab/js/notice.js?refresh"></script>
{% endblock %}
{% block main_content %}
<div class="main-datasheet">
- <h2>{{datasheet.title}}</h2>
+ <h2><a href="{{datasheet.url}}" target="_blank">{{datasheet.title}}</a></h2>
<h3><a href="{{datasheet.organisation.website}}" target="_blank">{{datasheet.organisation.name}}</a></h3>
<img src="http://histoiredesarts.culture.fr/images/cached/images/{{datasheet.hda_id}}.jpg" />
<p>{{datasheet.description}}</p>
<ul>
- <li>Visiter sur <a href="{{datasheet.url}}" target="_blank">{{domain}}</a></li>
+ <li>Accéder à cette ressource sur <a href="{{datasheet.url}}" target="_blank">{{domain}}</a></li>
<li>Plus d'informations sur <a href="http://histoiredesarts.culture.fr/notices/{{datasheet.hda_id}}/" target="_blank">histoiredesarts.culture.fr</a></li>
</ul>
</div>
--- a/web/hdalab/templates/thesaurus.html Fri Oct 26 16:14:25 2012 +0200
+++ b/web/hdalab/templates/thesaurus.html Thu Nov 15 16:46:33 2012 +0100
@@ -5,8 +5,8 @@
{% block css_import %}
{{block.super}}
<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/ui-lightness/jquery-ui-1.8.16.custom.css" />
- <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/trees.css" />
- <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/thesaurus.css" />
+ <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/trees.css?refresh" />
+ <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}hdalab/css/thesaurus.css?refresh" />
{% endblock %}
{% block js_import %}
@@ -20,13 +20,22 @@
datasheet: "{% url notice 'ID' %}"
};
</script>
- <script src="{{STATIC_URL}}hdalab/js/trees.js"></script>
- <script src="{{STATIC_URL}}hdalab/js/thesaurus.js"></script>
+ <script src="{{STATIC_URL}}hdalab/js/trees.js?refresh"></script>
+ <script src="{{STATIC_URL}}hdalab/js/thesaurus.js?refresh"></script>
{% endblock %}
{% block thesaurus_actif %}actif{% endblock %}
{% block main_content %}
+ <div class="explain">
+ <p>Cette interface présente deux extraits de thésaurus utilisés par le ministère de la Culture et de la Communication :</p>
+ <ul>
+ <li>La branche « Secteur urbain » du Thésaurus de l’architecture et de l’urbanisme (état 2010)</li>
+ <li>La branche « Architecture d’habitation » du Thésaurus iconographique Garnier (état 2012)</li>
+ </ul>
+ <p>Les mots-clés de ces branches ont été liés avec Wikipédia. Ils deviennent ainsi sémantiquement interopérables avec les tags d’HDA-Lab. Comme le montre l’interface, ce procédé permet d’organiser et de visualiser les tags et les ressources d'HDA-Lab en utilisant des thésaurus « métiers » externes. Dans cet extrait, le mot-clé « Cité jardin » est présenté, en vis-à-vis, dans deux univers sémantiques différents</p>
+ </div>
+
<div class="column leftcol">
<h3>Arborescence 1</h3>
<div class="cattree">