--- a/sbin/sync/sync_hdabo Sun Mar 11 23:00:08 2012 +0100
+++ b/sbin/sync/sync_hdabo Mon Mar 12 01:07:56 2012 +0100
@@ -29,5 +29,5 @@
rm -fr ~/tmp/hdabo_V$1;
fi
-ssh iri@web.iri.centrepompidou.fr "export PYTHONPATH=/iridata/www/exp/hdabo && source /srv/virtualenv/hdabo/bin/activate && cd /iridata/www/exp/hdabo/hdabo && python manage.py collectstatic --noinput"
+ssh iri@web.iri.centrepompidou.fr "export PYTHONPATH=/iridata/www/exp/hdabo && source /iridata/virtualenv/hdabo/bin/activate && cd /iridata/www/exp/hdabo/hdabo && python manage.py collectstatic --noinput"
ssh iri@web.iri.centrepompidou.fr sudo apache2ctl restart
--- a/sbin/sync/sync_hdalab Sun Mar 11 23:00:08 2012 +0100
+++ b/sbin/sync/sync_hdalab Mon Mar 12 01:07:56 2012 +0100
@@ -26,5 +26,5 @@
rm -fr ~/tmp/hdalab_V$1;
fi
-ssh iri@web.iri.centrepompidou.fr "export PYTHONPATH=/iridata/www/iri-research/hdalab && source /srv/virtualenv/hdalab/bin/activate && cd /iridata/www/iri-research/hdalab/hdalab && django-admin.py collectstatic --noinput"
+ssh iri@web.iri.centrepompidou.fr "export PYTHONPATH=/iridata/www/iri-research/hdalab && source /iridata/virtualenv/hdalab/bin/activate && cd /iridata/www/iri-research/hdalab/hdalab && django-admin.py collectstatic --noinput"
ssh iri@web.iri.centrepompidou.fr sudo apache2ctl restart
Binary file virtualenv/res/src/uwsgi-1.0.4.tar.gz has changed
--- a/web/hdalab/settings.py Sun Mar 11 23:00:08 2012 +0100
+++ b/web/hdalab/settings.py Mon Mar 12 01:07:56 2012 +0100
@@ -39,8 +39,8 @@
LANGUAGES = (
('fr', ugettext('French')),
('en', ugettext('English')),
- ('de', ugettext('German')),
- ('es', ugettext('Spanish')),
+# ('de', ugettext('German')),
+# ('es', ugettext('Spanish')),
)
SITE_ID = 1
--- a/web/hdalab/static/hdalab/css/facettes.css Sun Mar 11 23:00:08 2012 +0100
+++ b/web/hdalab/static/hdalab/css/facettes.css Mon Mar 12 01:07:56 2012 +0100
@@ -35,13 +35,26 @@
}
+#titleleft {
+ float: left;
+}
+
+#titleright {
+ float: right;
+}
+
+#langselect {
+ float: right;
+}
+
+
#apartager {
- float: right; font-size: 14px;
+ float: right; font-size: 14px; clear: right;
}
#vues {
- float: right; text-align: right; width: 475px; margin: 2px 0;
+ float: right; text-align: right; width: 475px; margin: 2px 0; clear: right;
}
#vuestitre {
--- a/web/hdalab/static/hdalab/js/gomina.js Sun Mar 11 23:00:08 2012 +0100
+++ b/web/hdalab/static/hdalab/js/gomina.js Mon Mar 12 01:07:56 2012 +0100
@@ -286,7 +286,7 @@
+ '); return false;">[x]</a></li>';
}).join("");
}
- $("#filters").html(_htmFilters);
+ $("#filters").html(_htmFilters).hide();
debouncedGetUpdates();
}
@@ -404,6 +404,7 @@
$(this).text(data.tagtranslations[txt]);
}
});
+ $("#filters").show();
if (gomNs.dhmPaper) {
--- a/web/hdalab/templates/facettes.html Sun Mar 11 23:00:08 2012 +0100
+++ b/web/hdalab/templates/facettes.html Mon Mar 12 01:07:56 2012 +0100
@@ -38,41 +38,44 @@
{% block facettes_actif %}actif{% endblock %}
{% block main_content %}
- <h2 id="hdatitle">{% trans "Recherche par facettes" %} : <span id="sessionname"></span></h2>
- <div id='langselect'>
- <form action="{% url django.views.i18n.set_language %}" method="post" id="lang_form">
- {% csrf_token %}
- <!--input name="next" type="hidden" value="" /-->
- <select name="language">
- {% get_language_info_list for LANGUAGES as languages %}
- {% for language in languages %}
- <option value="{{ language.code }}" {% if language.code == LANGUAGE_CODE %}selected="selected"{% endif %}>{{ language.name_local }} ({{ language.code }})</option>
- {% endfor %}
- </select>
- <input type="submit" value="Go" />
- </form>
+ <div id="titleleft">
+ <h2 id="hdatitle">{% trans "Recherche par facettes" %} : <span id="sessionname"></span></h2>
</div>
- <div id="apartager"><a href="#">{% trans "Partager la session" %}</a></div>
- <div id="partageurls">
- <ul>
- <li class="actif" id="partagero"><a href="#">{% trans "En lecture seule" %}</a></li>
- <li id="partagerw"><a href="#">{% trans "En lecture-ecriture" %}</a></li>
+ <div id="titleright">
+ <div id='langselect'>
+ <form action="{% url django.views.i18n.set_language %}" method="post" id="lang_form">
+ {% csrf_token %}
+ <!--input name="next" type="hidden" value="" /-->
+ <select name="language" onchange="this.form.submit()">
+ {% get_language_info_list for LANGUAGES as languages %}
+ {% for language in languages %}
+ <option value="{{ language.code }}" {% if language.code == LANGUAGE_CODE %}selected="selected"{% endif %}>{{ language.name_local }} ({{ language.code }})</option>
+ {% endfor %}
+ </select>
+ </form>
+ </div>
+ <div id="apartager"><a href="#">{% trans "Partager la session" %}</a></div>
+ <div id="partageurls">
+ <ul>
+ <li class="actif" id="partagero"><a href="#">{% trans "En lecture seule" %}</a></li>
+ <li id="partagerw"><a href="#">{% trans "En lecture-ecriture" %}</a></li>
+ </ul>
+ <div id="zc-partageligne">
+ <label id="zc-partagelabel">{% trans "Copier le lien" %} : </label>
+ <input id="zc-partageinput" onfocus="select();" />
+ </div>
+ </div>
+ <div id="vues">
+ <h4 id="vuestitre">{% trans "Mes vues :"%}</h4>
+ <ul id="ongletsvues">
+ </ul>
+ <span id="nouvellevue"><a href="#">+</a></span>
+ </div>
+ <ul id="plusdevues">
+ <li id="nouv_resrech"><a href="#">{% trans "Creer une vue sur des resultats de recherche" %}</a></li>
+ <li id="nouv_liste"><a href="#">{% trans "Creer une liste de notices" %}</a></li>
</ul>
- <div id="zc-partageligne">
- <label id="zc-partagelabel">{% trans "Copier le lien" %} : </label>
- <input id="zc-partageinput" onfocus="select();" />
- </div>
</div>
- <div id="vues">
- <h4 id="vuestitre">{% trans "Mes vues :"%}</h4>
- <ul id="ongletsvues">
- </ul>
- <span id="nouvellevue"><a href="#">+</a></span>
- </div>
- <ul id="plusdevues">
- <li id="nouv_resrech"><a href="#">{% trans "Creer une vue sur des resultats de recherche" %}</a></li>
- <li id="nouv_liste"><a href="#">{% trans "Creer une liste de notices" %}</a></li>
- </ul>
<div id="waitcontainer">
<div id="waiting"></div>
</div>