# HG changeset patch # User rougeronj # Date 1418208847 -3600 # Node ID f174999faf36a97280a592adf8147467042813b1 # Parent 78ca9191e2ee391cda9f45cd44e23ed8fcdb1345# Parent 93c33daf6e56570ad60bf6ea93f1fc8dadbdd010 Merge with 93c33daf6e56570ad60bf6ea93f1fc8dadbdd010 diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/css/common.css --- a/src/hdalab/static/hdalab/css/common.css Thu Dec 04 17:44:27 2014 +0100 +++ b/src/hdalab/static/hdalab/css/common.css Wed Dec 10 11:54:07 2014 +0100 @@ -57,7 +57,7 @@ margin: 0; } #content { - margin: 30px auto 80px; + margin: 30px auto 30px; min-height: 400px; } /* ========================================================================== @@ -85,7 +85,6 @@ */ h1 { font-size: 2em; - margin: 0.67em 0; } /** * Address styling not present in IE 8/9, Safari 5, and Chrome. diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/css/facettes.css --- a/src/hdalab/static/hdalab/css/facettes.css Thu Dec 04 17:44:27 2014 +0100 +++ b/src/hdalab/static/hdalab/css/facettes.css Wed Dec 10 11:54:07 2014 +0100 @@ -14,7 +14,7 @@ float: left; width: 473px; border: 1px solid #b0b0b0; - background: linear-gradient(to bottom, rgba(153,153,153,1) 0px,rgba(255,255,255,1) 100px); + background: linear-gradient(to bottom, rgba(148,151,150,1) 0px,rgba(255,255,255,1) 100px); cursor: pointer; cursor: hand; border-top-left-radius: 4px; @@ -40,7 +40,7 @@ border: 1px solid #b0b0b0; padding: 8px 4px; border-top-style: none; - background: linear-gradient(to bottom, rgba(153, 153, 153, 0.5) 0px, rgba(255, 255, 255, 0) 100px) repeat scroll 0 0 rgba(0, 0, 0, 0); + background: linear-gradient(to bottom, rgba(148,151,150, 0.5) 0px, rgba(255, 255, 255, 0) 100px) repeat scroll 0 0 rgba(0, 0, 0, 0); border-bottom-left-radius: 4px; border-bottom-right-radius: 4px } @@ -228,7 +228,7 @@ } #filters li.filperiod { - color: #ffffff; background: #e07000; + color: #ffffff; background: rgb(146, 132, 36); } span.spyr { @@ -252,7 +252,7 @@ } .leaflet-container { - background: linear-gradient(to bottom, rgba(153,153,153,1) 0%,rgba(244,244,244,1) 50%,rgba(153,153,153,1) 100%); + background: linear-gradient(to bottom, rgba(187,224,234,1) 0%,rgba(255, 255, 255,0.90) 50%,rgba(187,224,234,1) 100%); } #tagcloud { @@ -298,6 +298,12 @@ .disc-label { float: left; font-size: 13px; width: 100px; text-align: right; margin-right: 5px; line-height: 13px; } +.disc-label a{ + color: #467a87; +} +.disc-label a:hover{ + color: #000000; +} .disc-bar { float: left; height: 14px; margin: 2px 0; cursor: pointer; cursor: hand; @@ -338,8 +344,15 @@ .content-item p { font-size: 12px; margin: 3px 0; } +.mind-map-icon, +.mind-map-icon-white{ + width: 16px; height: 16px; display: inline-block; text-indent:-9999px; +} .mind-map-icon{ - width: 16px; height: 16px; background: url(../img/mind_map_icon.png) no-repeat; display: inline-block; text-indent:-9999px; + background: url(../img/mind_map_icon.png) no-repeat; +} +.mind-map-icon-white{ + background: url(../img/mind_map_icon_white.png) no-repeat; } .content-annotation ul { @@ -450,7 +463,15 @@ /* COMPLETION */ #tagsearch { - width: 100%; font-size: 16px; font-weight: bold; border-style: none; border-bottom: 1px solid #000; + background:url("../img/search-icon.png") no-repeat scroll right 5px center #fff; + width: 96%; + margin-left:2%; + font-size: 16px; + font-weight: bold; + border-style: none; + border-bottom: 1px solid #000; + color:rgb(200,200,200); + border-radius:2px; } #tagsearch.waiting { diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/css/footer.css --- a/src/hdalab/static/hdalab/css/footer.css Thu Dec 04 17:44:27 2014 +0100 +++ b/src/hdalab/static/hdalab/css/footer.css Wed Dec 10 11:54:07 2014 +0100 @@ -6,6 +6,9 @@ color: #fff; background-color: #7cb0bd; } +#footer .nav .row { + width: 22%; +} #footer .nav ul { float: left; padding: 6px 0; diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/css/head.css --- a/src/hdalab/static/hdalab/css/head.css Thu Dec 04 17:44:27 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,104 +0,0 @@ -#header { - background: url(../img/bg-header.jpg) center top no-repeat; - border-bottom: 1px solid #4f5451; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5); -} -#header .top { - padding-bottom: 2px; - background-color: rgba(255, 255, 255, 0.3); -} -#header #logo { - padding: 20px 0 15px; -} -#header #logo img { - display: block; -} -#header nav { - padding: 15px 0; - background-color: #f8f8f8; - position: relative; - font-weight: 300; - font-family: 'FranklinGothic', Arial, Helvetica, sans-serif; - text-transform: uppercase; - background-color: rgba(248, 248, 248, 0.7); - -webkit-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3); -} -#header nav:after { - content: ""; - width: 100%; - height: 2px; - top: 100%; - display: block; - left: 0; - position: absolute; - background-color: rgba(248, 248, 248, 0.5); -} -#header nav .profile { - float: right; -} -#menu { - float: left; - margin-top: 3px; -} -#menu:before, -#menu:after { - content: " "; - display: table; -} -#menu:after { - clear: both; -} -#menu li { - float: left; - color: #2d2b25; -} -#menu li:before { - content: "/"; - float: left; - margin-top: 2px; -} -#menu li:first-child:before { - content: ""; -} -#menu li:first-child a { - padding-left: 0; -} -#menu li.actif a { - font-weight: normal; -} -#menu a { - color: inherit; - padding: 0 8px; - font-size: 14.6px; - font-size: 1.46rem; -} -#subhead{ - margin:30px auto; - width: 810px; - font-family: "FranklinGothic",Arial,Helvetica,sans-serif; - font-weight: 300; - text-transform: uppercase; - position: relative; - -} -#subhead h3 { - font-weight: normal; - color: #2d2b25; - font-size: 13px; - font-size: 1.3rem; -} -#subhead h3:before { - content: "/"; - font-weight: bold; - margin-right: 3px; - position: relative; -} -.bg-wrap { - background-color: rgba(0, 0, 0, 0.15); - border-radius: 2px; - padding: 10px 10px; -} diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/css/header.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/static/hdalab/css/header.css Wed Dec 10 11:54:07 2014 +0100 @@ -0,0 +1,116 @@ +#header { + background: url(../img/bg-header.jpg) center top no-repeat; + border-bottom: 1px solid #4f5451; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5); +} +#header .top { + padding-bottom: 2px; + background-color: rgba(255, 255, 255, 0.3); +} +#header #logo { + padding: 20px 0 15px; +} +#header #logo img { + display: block; +} +#header nav { + padding: 15px 0; + background-color: #f8f8f8; + position: relative; + font-weight: 300; + font-family: 'FranklinGothic', Arial, Helvetica, sans-serif; + text-transform: uppercase; + background-color: rgba(248, 248, 248, 0.7); + -webkit-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3); +} +#header nav:after { + content: ""; + width: 100%; + height: 2px; + top: 100%; + display: block; + left: 0; + position: absolute; + background-color: rgba(248, 248, 248, 0.5); +} +#header nav .profile { + float: right; +} +#menu { + float: left; + margin-top: 3px; +} +#menu:before, +#menu:after { + content: " "; + display: table; +} +#menu:after { + clear: both; +} +#menu li { + float: left; + color: #2d2b25; +} +#menu li:before { + content: "/"; + float: left; + margin-top: 2px; +} +#menu li:first-child:before { + content: ""; +} +#menu li:first-child a { + padding-left: 0; +} +#menu li.actif a { + font-weight: normal; +} +#menu a { + color: inherit; + padding: 0 8px; + font-size: 14.6px; + font-size: 1.46rem; +} +#subhead{ + margin:30px auto; + width: 810px; + font-family: "FranklinGothic",Arial,Helvetica,sans-serif; + font-weight: 300; + text-transform: uppercase; + position: relative; + +} +#subhead h3 { + font-weight: normal; + color: #2d2b25; + font-size: 13px; + font-size: 1.3rem; +} +#subhead h3:before { + content: "/"; + font-weight: bold; + margin-right: 3px; + position: relative; +} +.bloc h3 { + font-size: 15px; + margin-bottom: 7px; +} +#header .bloc{ + padding: 6px 8px 2px; + background-color: rgba(255, 255, 255, 0.9); + border-radius: 5px; +} +#header .bg-wrap { + background-color: rgba(0, 0, 0, 0.15); + border-radius: 5px; + padding: 10px 10px; +} +#menu li.external a { + color: #7cb0bd; +} diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/css/index.css --- a/src/hdalab/static/hdalab/css/index.css Thu Dec 04 17:44:27 2014 +0100 +++ b/src/hdalab/static/hdalab/css/index.css Wed Dec 10 11:54:07 2014 +0100 @@ -72,13 +72,4 @@ .description { font-size: 14px; font-size: 1.4pm; -} -.bloc h3 { - font-size: 15px; - margin-bottom: 7px; -} -.bloc{ - padding: 6px 8px 2px; - background-color: rgba(255, 255, 255, 0.9); - border-radius: 5px; -} +} \ No newline at end of file diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/css/login.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/static/hdalab/css/login.css Wed Dec 10 11:54:07 2014 +0100 @@ -0,0 +1,94 @@ +.register{ + width: 500px; + padding: 10px; + background-color: rgb(230, 230, 230); + border-radius: 2px; + margin: auto; +} +.register p { + color: #4f5451; + font-size: 14px; + font-size: 1.4rem; + margin: 10px 30px; + clear: right; +} +.register label{ + font-size: 14px; + font-size: 1.4rem; + line-height: 3.4; +} +.register .error input, .register .error select { + border: 2px red solid; +} +.register input[type="text"], +.register input[type="password"], +.register input[type="email"] { +/* background-color: rgba(255, 255, 255, 0.90); */ + border:0; + box-sizing: border-box; + color: #4f5451; + font-size: 12px; + font-size: 1.2rem; + font-weight: 300; + height: 50px; + padding: 0 20px; + width: 100%; + border-radius: 2px; +} +.register input[type="text"]:focus, +.register input[type="password"]:focus, +.register input[type="email"]:focus { + background-color: rgba(255, 255, 255, 1); + border:1px solid #7cb0bd; +} +.register input[type="submit"] { + content: " "; + height: 30px; + border: 0; + color: #fff; + font-size: 14px; + font-size: 1.4rem; + font-weight: 300; + background-color: #7cb0bd; + border-radius: 2px; + transition: background-color 0.3s ease; + cursor:pointer; + margin: 10px 0; +/* float: right; */ +} +.register input[type="submit"]:hover { + background-color: #4f5451; +} + +.register h1:before{ + content: "/ "; +} + +.register h1{ + margin: 10px 19px; +} + +.register .btn-submit{ + text-align: right; +} + +.btn-previous{ + margin-right:10px; +} + +/* MODAL POPUP */ + +.ui-dialog { + border:none; + border-radius:0px; + box-shadow: 5px 5px 5px 0px rgba(0,0,0,0.5); +} + +.ui-dialog-titlebar-close, +.ui-dialog-titlebar{ + display:none; +} + +.ui-dialog .ui-dialog-content { + padding:0; +} \ No newline at end of file diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/img/footer.png Binary file src/hdalab/static/hdalab/img/footer.png has changed diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/img/mind_map_icon_white.png Binary file src/hdalab/static/hdalab/img/mind_map_icon_white.png has changed diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/img/search-icon.png Binary file src/hdalab/static/hdalab/img/search-icon.png has changed diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/static/hdalab/js/gomina.js --- a/src/hdalab/static/hdalab/js/gomina.js Thu Dec 04 17:44:27 2014 +0100 +++ b/src/hdalab/static/hdalab/js/gomina.js Wed Dec 10 11:54:07 2014 +0100 @@ -20,9 +20,9 @@ heatGamma: 2, displayedDates: [ -5000, 0, 500, 1000, 1200, 1400, 1600, 1700, 1750, 1800, 1850, 1900, 1950, 2010 ], mappingLibrary: 'leaflet', - gradientStart: [ 255, 255, 240 ], - gradientEnd: [ 255, 160, 30 ], - zeroColor: [ 230, 230, 235 ], + gradientStart: [ 252, 246, 210 ], + gradientEnd: [ 146, 132, 36 ], + zeroColor: [ 220, 220 ,220 ], languageCode: 'fr' } @@ -310,7 +310,7 @@ + '>' + _t.translated_label + '' - + ' placeholder' + + ' placeholder' + ''; }).join('') /*+ '

'+gettext("Annotations")+'

+
- {% if form.errors %} -

{% trans "Sorry, that's not a valid username or password." %}

- {% endif %} -
- {% csrf_token %} - - {{form.as_p}} - -
-

 

-

{% trans "Still not a user ? Create an account" %} -

{% trans "Forgot password ?" %} +

{% trans "Identifiants" %}

+ {% if form.errors %} +

{% trans "Sorry, that's not a valid username or password." %}

+ {% endif %} +
+ {% csrf_token %} + +

+ + {{form.username}} +

+

+ + {{form.password}} +

+
+

{% trans "Cancel" %}

+
+
+

{% trans "Forgot password ?" %}

+

{% trans "Still not a user ? Create an account" %}

- diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/templates/base.html --- a/src/hdalab/templates/base.html Thu Dec 04 17:44:27 2014 +0100 +++ b/src/hdalab/templates/base.html Wed Dec 10 11:54:07 2014 +0100 @@ -14,7 +14,7 @@ {% block css_import %} - + {% endblock %} @@ -24,9 +24,6 @@ {% block header %} -
- -
+
+
+

{% trans "Rechercher un mot-cle" %}

+
+
+
+ +
+
+ +
+
+

{% trans "Nuage de mots-cles" %}

@@ -102,19 +115,6 @@
-
-
-

{% trans "Rechercher un tag" %}

-
-
-
- -
-
- -
-
-
{% trans "translation_info" %}
diff -r 93c33daf6e56 -r f174999faf36 src/hdalab/templates/index.html --- a/src/hdalab/templates/index.html Thu Dec 04 17:44:27 2014 +0100 +++ b/src/hdalab/templates/index.html Wed Dec 10 11:54:07 2014 +0100 @@ -13,7 +13,6 @@