Merge branch 'template-cleanup' of opi/coin into master

coin/members/templates/members/contact.html

@@ -7,17 +7,27 @@
         <div class="panel">
             <h3>Courriel</h3>
             <p>
-              <a href="mailto:{{ branding.email }}">{{ branding.email }}</a> (questions générales)<br />
-              <a href="mailto:{{ branding.administrative_email }}">{{ branding.administrative_email }}</a> (questions administratives)<br />
-              <a href="mailto:{{ branding.support_email }}">{{ branding.support_email }}</a> (support technique)
+                <a href="mailto:{{ branding.email }}">{{ branding.email }}</a> (questions générales)<br />
+                {% if branding.administrative_email %}
+                <a href="mailto:{{ branding.administrative_email }}">{{ branding.administrative_email }}</a> (questions administratives)<br />
+                {% endif %}
+                {% if branding.support_email %}
+                <a href="mailto:{{ branding.support_email }}">{{ branding.support_email }}</a> (support technique)
+                {% endif %}
             </p>
-            {% if branding.lists_url %}
+        </div>
+        {% if branding.lists_url %}
+        <div class="panel">
             <h3>Listes de discussion</h3>
             <p>Gérer ses abonnements aux listes de discussion et diffusion : <a href="{{ branding.lists_url }}">{{ branding.lists_url }}</a></p>
-            {% endif %}
+        </div>
+        {% endif %}
+        {% if branding.main_chat_verbose %}
+        <div class="panel">
             <h3>IRC</h3>
             <p><a href="{{ branding.chatroom_set.first.url }}">{{ branding.main_chat_verbose }}</a></p>
         </div>
+        {% endif %}
     </div>
 </div>
 {% endblock %}

coin/members/templates/members/detail.html

@@ -9,45 +9,69 @@
 <div class="row">
     <div class="large-6 columns">
         <div class="panel">
-            <h3>Me joindre</h3>
-            <table class="full-width">
+            <h3>Mes coordonnées</h3>
+            <table id="personnal-info" class="full-width no-border no-background">
+            {% if user.type == 'natural_person' %}
+                {% if user.first_name %}
                 <tr>
-                  {% if user.type == 'natural_person' %}
-                    <td class="center"><span class="label">Prénom - Nom</span></td>
-                    <td>{{user.first_name}} {{user.last_name}}
-                      {% if user.nickname %}
-                      ({{ user.nickname }})
-                      {% endif %}
-                    </td>
-                  {% else %}
-                    <td class="center"><span class="label">Nom de la structure</span></td>
+                    <td>Prénom</td>
+                    <td>{{user.first_name}}</td>
+                </tr>
+                {% endif %}
+                {% if user.last_name %}
+                <tr>
+                    <td>Nom</td>
+                    <td>{{user.last_name}}</td>
+                </tr>
+                {% endif %}
+                {% if user.nickname %}
+                <tr>
+                    <td>Pseudo</td>
+                    <td>{{ user.nickname }}</td>
+                </tr>
+                {% endif %}
+            {% else %}
+                <tr>
+                    <td>Nom de la structure</td>
                     <td>{{ user.organization_name }}</td>
-                  {% endif %}
                 </tr>
+            {% endif %}
+
+            {% if user.address %}
                 <tr>
-                    <td class="center"><span class="label">Adresse</span></td>
+                    <td>Adresse</td>
                     <td>{{user.address}}<br />{{user.postal_code}} {{user.city}}</td>
                 </tr>
+            {% endif %}
+
+            {% if user.email %}
                 <tr>
-                    <td class="center"><span class="label">Email</span></td>
+                    <td>Email</td>
                     <td>{{user.email}}</td>
                 </tr>
+            {% endif %}
+
+            {% if user.home_phone_number %}
                 <tr>
-                    <td class="center"><span class="label">Téléphone fixe</span></td>
+                    <td>Téléphone fixe</td>
                     <td>{{user.home_phone_number}}</td>
                 </tr>
+            {% endif %}
+
+            {% if user.mobile_phone_number %}
                 <tr>
-                    <td class="center"><span class="label">Téléphone mobile</span></td>
+                    <td>Téléphone mobile</td>
                     <td>{{user.mobile_phone_number}}</td>
                 </tr>
+            {% endif %}
             </table>
         </div>
     </div>
 
     <div class="large-6 columns">
         <div class="panel">
-            <h3>Je suis membre de l'association {{ branding.shortname|capfirst }}</h3>
-            <p>et ma cotisation est :
+            <h3>Membre de {{ branding.shortname|capfirst }}</h3>
+            <p>Ma cotisation est :
                 {% if user.is_paid_up %}
                     <span class="label success">à jour !</span>
                 {% else %}
@@ -62,19 +86,24 @@
                 {% endif %}
             </p>
 
-            <a href="{{ membership_info_url }}" target="_blank" class="button small radius expand"><i class="fa fa-heart"></i>
- Renouveler ma cotisation</a>
+            <a href="{{ membership_info_url }}" target="_blank" class="button small radius expand">
+                <i class="fa fa-heart"></i> Renouveler ma cotisation
+            </a>
         </div>
-        <!--<div class="pa nel">
-            <h3>Infos additionnelles</h3>
-            <span class="label">Clé ssh</span> coin.pub
-        </div>-->
+
     </div>
 
 </div>
 <div class="row">
     <div class="large-12 columns">
-        <p>Pour modifier vos informations personnelles et vos coordonnées, veuillez en faire la demande par email à <a href="mailto:{{ branding.administrative_email }}">{{ branding.administrative_email }}</a></p>
+        <p>
+            Pour modifier vos informations personnelles et vos coordonnées, veuillez en faire la demande
+            {% if branding.administrative_email %}
+             par email à <a href="mailto:{{ branding.administrative_email }}">{{ branding.administrative_email }}</a>.
+            {% else %}
+             à l'association.
+            {% endif%}
+        </p>
     </div>
 </div>
 

coin/members/templates/members/index.html

@@ -9,24 +9,40 @@
 
 <div class="row">
     <div class="large-6 columns">
-        <h3>Alertes</h3>
-        <div class="panel">Ici les news de santé des serveurs, etc.</div>
+        <div class="panel">
+            <h3>Alertes</h3>
+            <p>Ici les news de santé des serveurs, etc.</p>
+        </div>
     </div>
     <div class="large-6 columns">
-        <h3>Stats</h3>
-        <div class="panel">Use MOAR bandwidth !</div>
+        <div class="panel">
+            <h3>Stats</h3>
+            <p>Use MOAR bandwidth !</p>
+        </div>
     </div>
     {% if has_isp_feed %}
     <div class="large-6 columns">
-        <h3>News {{ branding.shortname|capfirst }}</h3>
-        <div class="panel" id="feed_isp"><i class="fa fa-spinner fa-spin"></i>
- Chargement en cours</div>
+        <div class="panel">
+            <h3>News {{ branding.shortname|capfirst }}</h3>
+            <div id="feed_isp">
+            <p>
+                <i class="fa fa-spinner fa-spin"></i>
+                Chargement en cours
+            </p>
+            </div>
+        </div>
     </div>
     {% endif %}
     <div class="large-6 columns">
-        <h3>News de la FFDN</h3>
-        <div class="panel" id="feed_ffdn"><i class="fa fa-spinner fa-spin"></i>
- Chargement en cours</div>
+        <div class="panel">
+            <h3>News de la FFDN</h3>
+            <div id="feed_ffdn">
+            <p>
+                <i class="fa fa-spinner fa-spin"></i>
+                Chargement en cours
+            </p>
+            </div>
+        </div>
     </div>
 </div>
 
@@ -43,7 +59,7 @@
         }).done(function(html) {
             $('#feed_isp').html(html);
         }).fail(function() {
-            $('#feed_ffdn').html('Erreur lors du chargement du flux');
+            $('#feed_isp').html('Erreur lors du chargement du flux');
         });
         {% endif %}
         $.ajax({

coin/members/templates/members/registration/login.html

@@ -7,39 +7,39 @@
     <div class="medium-7 columns">
         <h2>Connexion</h2>
 
-        <form method="post" action="{% url 'members:django.contrib.auth.views.login' %}">
+        <form id="login-form" method="post" action="{% url 'members:django.contrib.auth.views.login' %}">
             {% csrf_token %}
             {% if form.errors %}
-        	<div class="alert-box alert">
+            <div class="alert-box alert">
                 {% if form.errors.items|length == 1 %}
                     {% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}
                 {% endif %}<br/>
                 {% for error in form.non_field_errors %}{{ error|escape }}{% endfor %}
             </div>
-        	{% endif %}
+            {% endif %}
 
-        	<table width="100%">
-            	<tr>
-            		<td>{{ form.username.label_tag }}</td>
-            		<td>{{ form.username }}
+            <table width="100%">
+                <tr>
+                    <td>{{ form.username.label_tag }}</td>
+                    <td>{{ form.username }}
                         {% if form.username.errors %}
-                            <span class="error">{% for error in form.username.errors %}{{ error|escape }}{% endfor %}</span>
+                        <span class="error">{% for error in form.username.errors %}{{ error|escape }}{% endfor %}</span>
                         {% endif %}
                     </td>
-            	</tr>
-            	<tr>
-            		<td>{{ form.password.label_tag }}
-                    <small><a href="{% url 'members:password_reset' %}" tabindex="100">Mot de passe oublié ?</a></small></td>
-            		<td>{{ form.password }}
+                </tr>
+                <tr>
+                    <td>{{ form.password.label_tag }}</td>
+                    <td>{{ form.password }}
                         {% if form.password.errors %}
-                            <span class="error">{% for error in form.password.errors %}{{ error|escape }}{% endfor %}</span>
+                        <span class="error">{% for error in form.password.errors %}{{ error|escape }}{% endfor %}</span>
                         {% endif %}
                     </td>
-            	</tr>
+                </tr>
         	</table>
         	<input type="submit" value="Coinnexion" class="button radius"/>
         	<input type="hidden" name="next" value="{{ next }}" />
-    	</form>
+            <a id="password-reset-link" href="{% url 'members:password_reset' %}" tabindex="100">Mot de passe oublié ?</a>
+        </form>
     </div>
     <div class="medium-5 columns">
         <div class="panel callout" id="newcomers">

coin/static/css/local.css

@@ -116,10 +116,79 @@ h2 {
 	/*border-bottom: 2px solid #0086A9;*/
 }
 
+
+/* panels */
+.panel {}
+.panel > h2,
+.panel > h3,
+.panel > h4,
+.panel > h5 {
+  border-bottom: 1px solid #d8d8d8;
+  margin-bottom: 1.25rem;
+  padding-bottom: 0.625rem;
+}
+.panel.callout > h2,
+.panel.callout > h3,
+.panel.callout > h4,
+.panel.callout > h5 {
+  border-color: #B5F0FF;
+}
+
+
 /* Tables */
 table.full-width {
     width:100%;
 }
+table.no-border {
+    border: none;
+}
+table.no-background {}
+table.no-background,
+table.no-background thead,
+table.no-background tfoot,
+table.no-background tr {
+    background: transparent;
+}
+
+
+/* Specific table: Member personnal info */
+#personnal-info {
+    border-collapse: collapse;
+}
+#personnal-info td {
+    vertical-align: top;
+}
+#personnal-info tr:last-child td {
+    border-bottom: none;
+}
+#personnal-info tr td:first-child {
+    text-align: right;
+    color: #666;
+    font-weight: bold;
+}
+
+/* login page */
+#login-form {}
+#login-form table td {
+    vertical-align: middle;
+}
+#login-form table input {
+    margin-bottom: 0;
+}
+#login-form label {
+    font-size: 1.2em;
+}
+
+#password-reset-link {
+    margin-left: 1em;
+}
+
+
+/* New comers panel on login page */
+#newcomers {
+    margin-top: 3.9375rem;  /* h1 margin top + bottom + font-size * line-height =  0.2rem + 0.5rem + 2.3125rem * 1.4 */
+}
+
 
 /* Footer */