--- 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.
--- 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 {
--- 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;
--- 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;
-}
--- /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;
+}
--- 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
--- /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
Binary file src/hdalab/static/hdalab/img/footer.png has changed
Binary file src/hdalab/static/hdalab/img/mind_map_icon_white.png has changed
Binary file src/hdalab/static/hdalab/img/search-icon.png has changed
--- 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
+ '</a>'
- + ' <a class="mind-map-icon" href="' + gomNs.urls.renkan + '?label=' + _t.label + '" target="_blank">placeholder</a></h3>'
+ + ' <a class="mind-map-icon-white" href="' + gomNs.urls.renkan + '?label=' + _t.label + '" target="_blank">placeholder</a></h3>'
+ '</li>';
}).join('')
/*+ '</ul><h4>'+gettext("Annotations")+'</h4><div class="content-annotation" contentid="'
--- a/src/hdalab/templates/ajax_identification/ajax_login.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/ajax_identification/ajax_login.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,16 +1,28 @@
+{% load static %}
{% load i18n %}
+
+<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+
<div class="register">
- {% if form.errors %}
- <p class="error">{% trans "Sorry, that's not a valid username or password." %}</p>
- {% endif %}
- <form action="{% url 'ajax_login' %}" method='post' id="login-form">
- {% csrf_token %}
- <input type="hidden" name="next" value="{% url 'ajax_login_ok' %}" />
- {{form.as_p}}
- <button class="button" type="submit" value="login">{% trans "login" %}</button>
- </form>
- <p> </p>
- <p><a target="_blank" href="{% url 'registration_register' %}">{% trans "Still not a user ? Create an account" %}</a>
- <p><a target="_blank" href="{% url 'auth_password_reset' %}">{% trans "Forgot password ?" %}</a>
+ <h1>{% trans "Identifiants" %}</h1>
+ {% if form.errors %}
+ <p class="error">{% trans "Sorry, that's not a valid username or password." %}</p>
+ {% endif %}
+ <form action="{% url 'ajax_login' %}" method='post' id="login-form">
+ {% csrf_token %}
+ <input type="hidden" name="next" value="{% url 'ajax_login_ok' %}" />
+ <p>
+ <label for="username">{% trans "Nom d'utilisateur" %}</label>
+ {{form.username}}
+ </p>
+ <p>
+ <label for="password">{% trans "Mot de passe" %}</label>
+ {{form.password}}
+ </p>
+ <div class="btn-submit">
+ <p><a id="login-popup-close" class="btn-previous" href="#">{% trans "Cancel" %}</a><input type="submit" value="{% trans 'Login' %}" /></p>
+ </div>
+ </form>
+ <p class="champs"><a href="{% url 'auth_password_reset' %}" target="_blank">{% trans "Forgot password ?" %}</a></p>
+ <p class="champs"><a href="{% url 'registration_register' %}" target="_blank">{% trans "Still not a user ? Create an account" %}</a></p>
</div>
-
--- 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 %}
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/common.css' %}" />
- <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/head.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/header.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/footer.css' %}" />
{% endblock %}
@@ -24,9 +24,6 @@
</head>
<body>
{% block header %}
- <div id="topnav">
- <img src="{% static 'hdalab/img/topnav.jpg' %}" alt="" style="display:block;margin:0 auto;">
- </div>
<header id="header">
<div class="top">
@@ -43,6 +40,7 @@
<li class="{% block categories_actif %}{% endblock %}"><a href="{% url 'categories' %}">Catégories de Wikipedia</a></li>
<li class="{% block thesaurus_actif %}{% endblock %}"><a href="{% url 'thesaurus' %}">Thésaurus</a></li>
<li class="{% block renkans_actif %}{% endblock %}"><a href="{% url 'renkan_public_list' %}">Renkan</a></li>
+ <li class="external"><a href="http://www.histoiredesarts.culture.fr/" target="_blank">Histoire des Arts</a></li>
</ul>
<ul id="menu" class="profile">
@@ -50,7 +48,7 @@
<li class="{% block profile_actif %}{% endblock %}"><a href="{% url 'profile_home' %}">{{ user.username }}</a></li>
<li><a href="{% url 'logout' %}?next={% url 'home' %}">{% trans "Log out" %}</a></li>
{% else %}
- <li class="hello-user"><a href="{% url 'login' %}">{% trans "Log in" %}</a></li>
+ <li class="{% block login_actif %}{% endblock %}"><a href="{% url 'login' %}">{% trans "Log in" %}</a></li>
{% endif %}
</ul>
</div>
@@ -73,13 +71,10 @@
<div class="nav">
<div class="row">
<ul>
- <li><a href="#">Partenaires</a></li>
- <li><a href="#">Lettres infos</a></li>
- <li><a href="#">Data culture</a></li>
+ <li><a href="#">A Propos</a></li>
+ <li><a href="#">Crédits</a></li>
<li><a href="#">Mentions légales</a></li>
- <li><a href="#">Accessibilité</a></li>
- <li><a href="#">Plan du site</a></li>
- <li><a href="#">Open search</a></li>
+ <li><a href="#">Contact</a></li>
</ul>
</div>
</div>
--- a/src/hdalab/templates/categories.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/categories.html Wed Dec 10 11:54:07 2014 +0100
@@ -8,7 +8,6 @@
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/ui-lightness/jquery-ui-1.10.4.min.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/trees.css?refresh' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/cattree.css?refresh' %}" />
- <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/categories.css' %}" />
{% endblock %}
{% block js_import %}
--- a/src/hdalab/templates/facettes.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/facettes.html Wed Dec 10 11:54:07 2014 +0100
@@ -95,6 +95,19 @@
</div>
<div class="corpsbloc" id="map"></div>
</div>
+ <div class="bloc" id="bloc_taginfo">
+ <div class="barrebloc">
+ <h2>{% trans "Rechercher un mot-cle" %}</h2>
+ </div>
+ <div class="corpsbloc" id="taginfo">
+ <form id="tagform">
+ <input id="tagsearch" placeholder="{% trans 'Entrez un mot-cle' %}"/>
+ </form>
+ <div class="wpinfo">
+
+ </div>
+ </div>
+ </div>
<div class="bloc" id="bloc_tagcloud">
<div class="barrebloc">
<h2>{% trans "Nuage de mots-cles" %}</h2>
@@ -102,19 +115,6 @@
<div class="corpsbloc" id="tagcloud">
</div>
</div>
- <div class="bloc" id="bloc_taginfo">
- <div class="barrebloc">
- <h2>{% trans "Rechercher un tag" %}</h2>
- </div>
- <div class="corpsbloc" id="taginfo">
- <form id="tagform">
- <input id="tagsearch" placeholder="{% trans "Rechercher un tag" %}" />
- </form>
- <div class="wpinfo">
-
- </div>
- </div>
- </div>
<div class="bloc" id="bloc_translationinfo">
{% trans "translation_info" %}
</div>
--- 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 @@
<script type="text/javascript">
$(function() {
$(".bloc").mouseenter(function() {
- console.log("katapla!");
var _this = this;
$(".overlay-bloc").each(function() {
if (this.parentNode.parentNode == _this) {
@@ -138,6 +137,7 @@
<li>Coordination scientifique : <strong>Alexandre Monnin</strong></li>
<li>Outils de sémantisation : <strong>Thibaut Cavalié</strong></li>
<li>Interfaces de visualisation et d'annotation : <strong>Raphaël Velt</strong></li>
+ <li>Refonte de l'interface et front-office : <strong>Julien Rougeron</strong></li>
</ul>
</div>
</div>
--- a/src/hdalab/templates/registration/activate.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/activate.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,6 +1,14 @@
{% extends "base.html" %}
+{% load static %}
{% load i18n %}
+{% block title %}{% trans "Registration - Activated" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
{% block main_content %}
<div class="register">
{% if account %}
--- a/src/hdalab/templates/registration/activation_complete.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/activation_complete.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,6 +1,14 @@
{% extends "base.html" %}
+{% load static %}
{% load i18n %}
+{% block title %}{% trans "Registration - Complete" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
{% block main_content %}
<div class="register">
<p>{% trans "Your account is now activated." %}</p>
--- a/src/hdalab/templates/registration/login.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/login.html Wed Dec 10 11:54:07 2014 +0100
@@ -4,22 +4,35 @@
{% block title %}{% trans "Login" %}{% endblock %}
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
+{% block login_actif %}actif{% endblock %}
+
{% block main_content %}
<div class="register">
+ <h1>{% trans "Identifiants" %}</h1>
{% if form.errors %}
<p class="error">{% trans "Sorry, that's not a valid username or password." %}</p>
{% endif %}
<form action="" method='post' id="login-form">
{% csrf_token %}
<input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}{% url 'home' %}{% endif %}" />
- {{form.as_p}}
- <button class="button" type="submit" value="login">{% trans "login" %}</button>
+ <p>
+ <label for="username">{% trans "Nom d'utilisateur" %}</label>
+ {{form.username}}
+ </p>
+ <p>
+ <label for="password">{% trans "Mot de passe" %}</label>
+ {{form.password}}
+ </p>
+ <div class="btn-submit">
+ <p><input type="submit" value="{% trans 'Login' %}" /></p>
+ </div>
</form>
- <p> </p>
- <p><a href="{% url 'registration_register' %}">{% trans "Still not a user ? Create an account" %}</a>
- <p><a href="{% url 'auth_password_reset' %}">{% trans "Forgot password ?" %}</a>
- </div>
+ <p class="champs"><a href="{% url 'auth_password_reset' %}">{% trans "Forgot password ?" %}</a></p>
+ <p class="champs"><a href="{% url 'registration_register' %}">{% trans "Still not a user ? Create an account" %}</a></p>
+ </div>
{% endblock %}
-
-
-
--- a/src/hdalab/templates/registration/password_change_done.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/password_change_done.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,6 +1,14 @@
{% extends "base.html" %}
+{% load static %}
{% load i18n %}
+{% block title %}{% trans "Password change - Done" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
{% block main_content %}
<div class="register">
<p>{% trans "Password changed" %}</p>
--- a/src/hdalab/templates/registration/password_change_form.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/password_change_form.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,12 +1,30 @@
{% extends "base.html" %}
+{% load static %}
{% load i18n %}
+{% block title %}{% trans "Password change" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
{% block main_content %}
<div class="register">
+ <h1>{% trans "Changer le mot de passe" %}</h1>
<form method="post" action=".">
- {% csrf_token %}
- {{ form.as_p }}
- <input type="submit" value="{% trans 'Submit' %}" />
+ {% csrf_token %}
+ <p>
+ <label for="password1">{% trans "Nouveau mot de passe" %}</label>
+ {{form.password1}}
+ </p>
+ <p>
+ <label for="password2">{% trans "Nouveau mot de passe (Verification)" %}</label>
+ {{form.password2}}
+ </p>
+ <div class="btn-submit">
+ <p><a class="btn-previous" href="{% url 'login' %}">{% trans "Precedent" %}</a><input type="submit" value="{% trans 'Submit' %}" /></p>
+ </div>
</form>
</div>
{% endblock %}
--- a/src/hdalab/templates/registration/password_reset_complete.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/password_reset_complete.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,6 +1,14 @@
{% extends "base.html" %}
+{% load static %}
{% load i18n %}
+{% block title %}{% trans "Password Reset - Complete" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
{% block main_content %}
<div class="register">
<p>{% trans "Password reset successfully" %}</p>
--- a/src/hdalab/templates/registration/password_reset_confirm.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/password_reset_confirm.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,13 +1,23 @@
{% extends "base.html" %}
+{% load static %}
{% load i18n %}
+{% block title %}{% trans "Password reset - Confirm" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
{% block main_content %}
<div class="register">
{% if validlink %}
<form method="post" action=".">
{% csrf_token %}
{{ form.as_p }}
- <input type="submit" value="{% trans 'Submit' %}" />
+ <div class="btn-submit">
+ <p><input type="submit" value="{% trans 'Submit' %}" /></p>
+ </div>
</form>
{% else %}
<p>{% trans "Password reset failed" %}</p>
--- a/src/hdalab/templates/registration/password_reset_done.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/password_reset_done.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,6 +1,14 @@
{% extends "base.html" %}
+{% load static %}
{% load i18n %}
+{% block title %}{% trans "Password reset - Done" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
{% block main_content %}
<div class="register">
<p>{% trans "Email with password reset instructions has been sent." %}</p>
--- a/src/hdalab/templates/registration/password_reset_form.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/password_reset_form.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,12 +1,34 @@
{% extends "base.html" %}
+{% load static %}
{% load i18n %}
+{% block title %}{% trans "Password reset" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
+{% block login_actif %}actif{% endblock %}
+
{% block main_content %}
-<div class="register">
- <form method="post" action=".">
- {% csrf_token %}
- {{ form.as_p }}
- <input type="submit" value="{% trans 'Submit' %}" />
- </form>
-</div>
+ <div class="register">
+ <h1>{% trans "Recuperation du Mot de Passe" %}</h1>
+ {% if form.errors %}
+ <p class="error">{% trans "Sorry, that's not a valid username or password." %}</p>
+ {% endif %}
+ <form method="post" action="">
+ {% csrf_token %}
+ <p>
+ <label for="email">{% trans "Email du compte:" %}</label>
+ {{form.email}}
+ </p>
+ <div class="btn-submit">
+ <p><a class="btn-previous" href="{% url 'login' %}">{% trans "Precedent" %}</a><input type="submit" value="{% trans 'Submit' %}" /></p>
+ </div>
+ </form>
+ </div>
{% endblock %}
+
+
+
--- a/src/hdalab/templates/registration/registration_complete.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/registration_complete.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,6 +1,14 @@
{% extends "base.html" %}
+{% load static %}
{% load i18n %}
+{% block title %}{% trans "Registration - Complete" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
{% block main_content %}
<div class="register">
<p>{% trans "You are now registered. Activation email sent." %}</p>
--- a/src/hdalab/templates/registration/registration_form.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/registration/registration_form.html Wed Dec 10 11:54:07 2014 +0100
@@ -1,12 +1,47 @@
{% extends "base.html" %}
+{% load static %}
{% load i18n %}
+{% block title %}{% trans "Registration" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
+{% endblock %}
+
+{% block login_actif %}actif{% endblock %}
+
{% block main_content %}
<div class="register">
- <form method="post" action=".">
- {% csrf_token %}
- {{ form.as_p }}
- <input type="submit" value="{% trans 'Submit' %}" />
+ <h1>{% trans "Nouvel Utilisateur" %}</h1>
+ {% if form.errors %}
+ <p class="error">{% trans "Oups ! Il y a un problème dans les données du nouvel utilisateur" %}</p>
+ {% endif %}
+ <form action="" method='post'>
+ {% csrf_token %}
+ <input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}{% url 'home' %}{% endif %}" />
+ <p>
+ <label for="username">{% trans "Nom d'utilisateur" %}</label>
+ {{form.username}}
+ </p>
+ <p>
+ <label for="email">{% trans "E-mail" %}</label>
+ {{form.email}}
+ </p>
+ <p>
+ <label for="password1">{% trans "Mot de passe" %}</label>
+ {{form.password1}}
+ </p>
+ <p>
+ <label for="password2">{% trans "Mot de passe (Verification)" %}</label>
+ {{form.password2}}
+ </p>
+ <div class="btn-submit">
+ <p><a class="btn-previous" href="{% url 'login' %}">{% trans "Precedent" %}</a><input type="submit" value="{% trans 'Submit' %}" /></p>
+ </div>
</form>
</div>
{% endblock %}
+
+
+
--- a/src/hdalab/templates/renkan_edit.html Thu Dec 04 17:44:27 2014 +0100
+++ b/src/hdalab/templates/renkan_edit.html Wed Dec 10 11:54:07 2014 +0100
@@ -82,9 +82,14 @@
dialog = $( "#dialog-form" ).dialog({
autoOpen: false,
- height: 300,
- width: 350,
- modal: true
+ height: 398,
+ width: 520,
+ modal: true,
+ create: function (event, ui) {
+ $("#login-popup-close").click(function(){
+ dialog.dialog("close");
+ });
+ }
});
function manageLoginForm(e, form){