# HG changeset patch # User veltr # Date 1380643211 -7200 # Node ID b94ffa99bfe5f5ebca57f630b3cf2290d50f5e9e # Parent a2845e7dafd922a098ea85d3b142acc5a8dc8447 Changed fr text strings diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/static/jocondelab/css/front-common.css --- a/src/jocondelab/static/jocondelab/css/front-common.css Mon Sep 30 14:27:18 2013 +0200 +++ b/src/jocondelab/static/jocondelab/css/front-common.css Tue Oct 01 18:00:11 2013 +0200 @@ -138,7 +138,11 @@ } footer { - padding: 40px 0 20px; text-align: right; + padding: 40px 0 20px; text-align: right; font-size: 16px; +} + +footer img { + vertical-align: middle; margin: 0 10px; } input { @@ -499,11 +503,7 @@ } @media screen and (max-width: 540px) { - - .header-widgets { - width: 100%; - } - + .language-menu-link { display: table-cell; } diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/static/jocondelab/css/front-geo.css --- a/src/jocondelab/static/jocondelab/css/front-geo.css Mon Sep 30 14:27:18 2013 +0200 +++ b/src/jocondelab/static/jocondelab/css/front-geo.css Tue Oct 01 18:00:11 2013 +0200 @@ -16,3 +16,14 @@ border: none; margin: 10px; border-radius: 4px; } +@media screen and (max-height: 520px) { + .map-container { + height: 300px; + } +} + +@media screen and (max-height: 360px) { + .map-container { + height: 200px; + } +} diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/static/jocondelab/css/front-home.css --- a/src/jocondelab/static/jocondelab/css/front-home.css Mon Sep 30 14:27:18 2013 +0200 +++ b/src/jocondelab/static/jocondelab/css/front-home.css Tue Oct 01 18:00:11 2013 +0200 @@ -7,24 +7,14 @@ } .module-item { - width: 25%; height: 120px; float: left; - background: -webkit-linear-gradient(to right bottom, #ffffff 0%, #f0f0f0 100%); + float: left; + background: linear-gradient(to right bottom, #ffffff 0%, #f0f0f0 100%); background: -moz-linear-gradient(to right bottom, #ffffff 0%, #f0f0f0 100%); -} - -@media screen and (max-width: 760px) and (min-width: 400px){ - .module-item { - width: 50%; - } -} - -@media screen and (max-width: 400px) { - .module-item { - width: 100%; - } + background: -webkit-linear-gradient(to right bottom, #ffffff 0%, #f0f0f0 100%); } .module-item:hover { + background: linear-gradient(to right bottom, #f0f0f0 0%, #ffffff 100%); background: -webkit-linear-gradient(to right bottom, #f0f0f0 0%, #ffffff 100%); background: -moz-linear-gradient(to right bottom, #f0f0f0 0%, #ffffff 100%); } diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/static/jocondelab/css/front-notice.css --- a/src/jocondelab/static/jocondelab/css/front-notice.css Mon Sep 30 14:27:18 2013 +0200 +++ b/src/jocondelab/static/jocondelab/css/front-notice.css Tue Oct 01 18:00:11 2013 +0200 @@ -10,6 +10,18 @@ max-width: 100%; max-height: 420px; } +.describe-mode .notice-images { + float: none; margin: 15px 0; text-align: center; width: 100%; +} + +.describe-mode .notice-images li { + margin: 0; box-shadow: 0 0 3px #999999; display: inline-block; max-width: 100%; +} + +.describe-mode .notice-images img { + max-height: 500px; +} + .notice-colright-wrapper { float: right; width: 67%; margin-top: 10px; } @@ -28,7 +40,7 @@ } .notice-datasheet { - font-size: 13px; + font-size: 13px; line-height: 1.2 em; } .datasheet-title { @@ -48,7 +60,7 @@ } .notice-datasheet th, .notice-datasheet td { - line-height: 1.2em; padding-top: 8px; + padding-top: 10px; } .notice-term { diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/static/jocondelab/js/front-home.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jocondelab/static/jocondelab/js/front-home.js Tue Oct 01 18:00:11 2013 +0200 @@ -0,0 +1,20 @@ +$(function() { + var $items = $(".module-item"); + + function resizeMenuItems() { + var baseWidth = $(".main").width(), + h = 0, + n = Math.min($items.length, Math.floor(baseWidth/150)), + w = Math.floor(baseWidth/n); + console.log(n,w); + $items.css("width", w + "px"); + $items.each(function() { + var $this = $(this); + h = Math.max(h, $this.find("h3").outerHeight(true) + $this.find("p").outerHeight(true)); + }); + $items.css("height", h + "px"); + } + + $(window).resize(resizeMenuItems); + resizeMenuItems(); +}); diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/static/jocondelab/lib/jquery.ui.touch-punch.min.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jocondelab/static/jocondelab/lib/jquery.ui.touch-punch.min.js Tue Oct 01 18:00:11 2013 +0200 @@ -0,0 +1,11 @@ +/* + * jQuery UI Touch Punch 0.2.2 + * + * Copyright 2011, Dave Furfero + * Dual licensed under the MIT or GPL Version 2 licenses. + * + * Depends: + * jquery.ui.widget.js + * jquery.ui.mouse.js + */ +(function(b){b.support.touch="ontouchend" in document;if(!b.support.touch){return;}var c=b.ui.mouse.prototype,e=c._mouseInit,a;function d(g,h){if(g.originalEvent.touches.length>1){return;}g.preventDefault();var i=g.originalEvent.changedTouches[0],f=document.createEvent("MouseEvents");f.initMouseEvent(h,true,true,window,1,i.screenX,i.screenY,i.clientX,i.clientY,false,false,false,false,0,null);g.target.dispatchEvent(f);}c._touchStart=function(g){var f=this;if(a||!f._mouseCapture(g.originalEvent.changedTouches[0])){return;}a=true;f._touchMoved=false;d(g,"mouseover");d(g,"mousemove");d(g,"mousedown");};c._touchMove=function(f){if(!a){return;}this._touchMoved=true;d(f,"mousemove");};c._touchEnd=function(f){if(!a){return;}d(f,"mouseup");d(f,"mouseout");if(!this._touchMoved){d(f,"click");}a=false;};c._mouseInit=function(){var f=this;f.element.bind("touchstart",b.proxy(f,"_touchStart")).bind("touchmove",b.proxy(f,"_touchMove")).bind("touchend",b.proxy(f,"_touchEnd"));e.call(f);};})(jQuery); \ No newline at end of file diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/templates/jocondelab/front_base.html --- a/src/jocondelab/templates/jocondelab/front_base.html Mon Sep 30 14:27:18 2013 +0200 +++ b/src/jocondelab/templates/jocondelab/front_base.html Tue Oct 01 18:00:11 2013 +0200 @@ -5,7 +5,7 @@ {% block head %} - + {% block title %}JocondeLab{% endblock %} @@ -14,6 +14,7 @@ + {% endblock %} @@ -82,20 +83,32 @@
@@ -106,7 +119,15 @@ diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/templates/jocondelab/front_describe.html --- a/src/jocondelab/templates/jocondelab/front_describe.html Mon Sep 30 14:27:18 2013 +0200 +++ b/src/jocondelab/templates/jocondelab/front_describe.html Tue Oct 01 18:00:11 2013 +0200 @@ -1,17 +1,22 @@ {% extends "jocondelab/front_notice.html" %} {% load i18n %} -{% block title %}JocondeLab » {% trans "Contribuer à l'iconographie" %}{% endblock %} - -{% block breadcrumbs %}{% trans "Contibuer à l'iconographie" %}{% endblock %} +{% block title %}JocondeLab » {% trans "Contribuer" %}{% endblock %} -{% block contribution %} +{% block breadcrumbs %}{% trans "Contribuer" %}{% endblock %} +{% block main %} +
+ {% block images %}{{block.super}}{% endblock %} + {% block contribution %}
-

{% trans "Complétez l'iconographie" %}

+

{% trans "Décrivez le sujet de cette œuvre" %}

- {% trans 'Décrire une autre oeuvre' %} + {% trans 'Œuvre suivante' %}

+ {% endblock %} + {% block datasheet %}{{block.super}}{% endblock %} +
{% endblock %} diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/templates/jocondelab/front_home.html --- a/src/jocondelab/templates/jocondelab/front_home.html Mon Sep 30 14:27:18 2013 +0200 +++ b/src/jocondelab/templates/jocondelab/front_home.html Tue Oct 01 18:00:11 2013 +0200 @@ -1,6 +1,11 @@ {% extends "jocondelab/front_search.html" %} {% load i18n %} +{% block js_declaration %} +{{block.super}} + +{% endblock %} + {% block css_declaration %} {{block.super}} @@ -16,27 +21,27 @@ diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/templates/jocondelab/front_notice.html --- a/src/jocondelab/templates/jocondelab/front_notice.html Mon Sep 30 14:27:18 2013 +0200 +++ b/src/jocondelab/templates/jocondelab/front_notice.html Tue Oct 01 18:00:11 2013 +0200 @@ -37,10 +37,11 @@ {% block main %}
+ {% block datasheet %} {% if object.autr %} - + {% endif %} @@ -62,10 +63,16 @@ {% endif %} - {% if object.repr or object.srep %} + {% if object.repr %} - + + + {% endif %} + {% if object.srep %} + + + {% endif %} {% if object.peri or object.mill or object.epoq %} @@ -76,7 +83,7 @@ {% endif %} {% if object.tech %} - + {% endif %} @@ -100,7 +107,7 @@ {% endif %} {% if object.loca %} - + {% endif %} @@ -119,12 +126,13 @@
{% trans 'Auteur(s) :' %}{% trans 'Artiste(s) :' %} {% show_datasheet_row 'AUTR' %}
{% show_datasheet_row 'TITR' %}{% show_datasheet_row 'APPL' %}{% show_datasheet_row 'DENO' %}
{% trans 'Sujet représenté :' %}{% show_datasheet_row 'REPR' %}{% show_datasheet_row 'SREP' %}{% show_datasheet_row 'REPR' %}
{% trans 'Source :' %}{% show_datasheet_row 'SREP' %}
{% trans 'Matériaux / Techniques :' %}{% trans 'Techniques :' %} {% show_datasheet_row 'TECH' %}
{% trans 'Lieu de conservation :' %}{% trans 'Conservé à :' %} {% show_datasheet_row 'LOCA' %}

- {% trans 'Visiter sur le portail Joconde' %} + {% trans 'Cette œuvre sur le portail Joconde' %}

+ {% endblock %} -{% block contribution %} + {% block contribution %}
-

{% trans 'Contribution (Folksonomie)' %}

+

{% trans "Apportez d'autres informations à partir des vocabulaires de Wikipédia" %}

    {% for term in contributions %} @@ -132,10 +140,11 @@ {% endfor %}
-{% endblock %} + {% endblock %}
+ {% block images %} + {% endblock %} {% endblock %} diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/templates/jocondelab/front_termlist.html --- a/src/jocondelab/templates/jocondelab/front_termlist.html Mon Sep 30 14:27:18 2013 +0200 +++ b/src/jocondelab/templates/jocondelab/front_termlist.html Tue Oct 01 18:00:11 2013 +0200 @@ -11,9 +11,9 @@ {% endblock %} -{% block title %}JocondeLab » {% trans 'Liste des termes' %}{% endblock %} +{% block title %}JocondeLab » {% trans 'Index' %}{% endblock %} -{% block breadcrumbs %}{% trans 'Liste des termes' %}{% endblock %} +{% block breadcrumbs %}{% trans 'Index' %}{% endblock %} {% block main %} @@ -27,16 +27,16 @@ diff -r a2845e7dafd9 -r b94ffa99bfe5 src/jocondelab/templates/jocondelab/front_timeline.html --- a/src/jocondelab/templates/jocondelab/front_timeline.html Mon Sep 30 14:27:18 2013 +0200 +++ b/src/jocondelab/templates/jocondelab/front_timeline.html Tue Oct 01 18:00:11 2013 +0200 @@ -25,7 +25,7 @@ {% block main %} -

{% trans 'Rechercher par période nommée' %}

+

{% trans 'Recherche par période' %}

@@ -37,7 +37,7 @@
-

{% trans 'Rechercher par millésime' %}

+

{% trans 'Recherche par date' %}