resol conflits

diff --git a/auf_savoirs_en_partage/chercheurs/views.py b/auf_savoirs_en_partage/chercheurs/views.py
index ec7f6f1..c1d78a7 100644 (file)
--- a/auf_savoirs_en_partage/chercheurs/views.py
+++ b/auf_savoirs_en_partage/chercheurs/views.py
@@ -37,11 +37,20 @@ def inscription(request):
             Context (variables), 
             context_instance = RequestContext(request))
             
-def perso(request, ID):
+def perso(request, id):
     """Mock up de l'espace perso"""
-    chercheur = None   #Chercheur.objects.get(id=id)
+    chercheur = Chercheur.objects.get(id=id)
     variables = { 'chercheur': chercheur,
                 }
     return render_to_response ("chercheurs/perso.html", \
             Context (variables), 
             context_instance = RequestContext(request))
+            
+def retrieve(request, id):
+    """Fiche du chercheur"""
+    chercheur = Chercheur.objects.get(id=id)
+    variables = { 'chercheur': chercheur,
+                }
+    return render_to_response ("chercheurs/retrieve.html", \
+            Context (variables), 
+            context_instance = RequestContext(request))

diff --git a/auf_savoirs_en_partage/media/css/global.css b/auf_savoirs_en_partage/media/css/global.css
index dfe0885..6c17e7b 100644 (file)
--- a/auf_savoirs_en_partage/media/css/global.css
+++ b/auf_savoirs_en_partage/media/css/global.css
@@ -85,8 +85,9 @@ div.boite-recherche p a:hover { color:#97012c; text-decoration:none;}
 #contenu .demi-gauche img.top { height:9px; position:relative; top:-9px;}
 #contenu .demi-gauche img.bottom { height:9px;  position:relative; bottom:-9px;}
 
-#calendar-links { padding: 0 25px; }
-#calendar-links p { margin: 0px; }
+.contenu-wrapper { padding:0 0 0 25px; }
+
+
 
 ul a { text-decoration:none; }
 ul a:hover { text-decoration:underline; }

diff --git a/auf_savoirs_en_partage/savoirs/globals.py b/auf_savoirs_en_partage/savoirs/globals.py
index d6b144d..e14089d 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/globals.py
+++ b/auf_savoirs_en_partage/savoirs/globals.py
@@ -4,6 +4,7 @@
 configuration = {
     'max_actualite': 100,
     'accueil_actualite': 5,
+    'accueil_chercheur': 6,
     'nombre_par_page_actualite': 10,
     'resultats_par_page': 8, # pas changeable a cause de google
     'accueil_evenement': 10,

diff --git a/auf_savoirs_en_partage/savoirs/views.py b/auf_savoirs_en_partage/savoirs/views.py
index f6b58bb..bd81a92 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/views.py
+++ b/auf_savoirs_en_partage/savoirs/views.py
@@ -24,7 +24,7 @@ def index (request):
     articles = Actualite.objects.filter (visible = '1', date__gt = oldest)
     articles = articles[0:configuration['accueil_actualite']]
     events = evenements()[0:configuration['accueil_evenement']]
-    chercheurs = Chercheur.objects.all().order_by('?')[:5]
+    chercheurs = Chercheur.objects.all().order_by('?')[:configuration['accueil_chercheur']]
     return render_to_response ("savoirs/index.html", \
             Context ({"articles": articles,
                       "events": events,

diff --git a/auf_savoirs_en_partage/templates/chercheurs/inscription.html b/auf_savoirs_en_partage/templates/chercheurs/inscription.html
index aba7736..3558436 100644 (file)
--- a/auf_savoirs_en_partage/templates/chercheurs/inscription.html
+++ b/auf_savoirs_en_partage/templates/chercheurs/inscription.html
@@ -1,16 +1,26 @@
 {% extends "container_base.html" %}
 
 {% block contenu %}
+<h4>Inscription</h4>
+
+<div class="contenu-wrapper">
+<p>
+Pour vous inscrire au répertoire de chercheurs, vous devez avoir un compte AUF...
+</p>
+
 <form method="post">
-    <h2>Informations g&eacute;n&eacute;rales</h2>
+    <h5>Informations personnelles</h5>
     {% with personne_form as form %}
-      {% include "table_form.html" %}
+        {% include "table_form.html" %}
     {% endwith %}
+    
+    <h5>Informations académiques</h5>
     {% with chercheur_form as form %}
-      {% include "table_form.html" %}
+        {% include "table_form.html" %}
     {% endwith %}
-    <p class="Nav">
+    
+    <br />
     <input type="submit" name="Submit" value="Inscription" class="bouton" />
-    </p>
 </form>
+</div>
 {% endblock %}

diff --git a/auf_savoirs_en_partage/templates/chercheurs/retrieve.html b/auf_savoirs_en_partage/templates/chercheurs/retrieve.html
new file mode 100644 (file)
index 0000000..4eb5503
--- /dev/null
+++ b/auf_savoirs_en_partage/templates/chercheurs/retrieve.html
@@ -0,0 +1,10 @@
+{% extends "container_base.html" %}
+
+{% block contenu %}
+<h4>{{ chercheur }}</h4>
+
+<p>
+Voici la fiche chercheur de {{ chercheur }}.
+</p>
+
+{% endblock %}

diff --git a/auf_savoirs_en_partage/templates/render_field.html b/auf_savoirs_en_partage/templates/render_field.html
index 636d7b4..41bc76d 100644 (file)
--- a/auf_savoirs_en_partage/templates/render_field.html
+++ b/auf_savoirs_en_partage/templates/render_field.html
@@ -1,14 +1,13 @@
 <tr>
     {% if field.is_hidden %}
-    {{ field }}
-    {% else %}
-    <td{{ field.row_attrs }} class="required" style="width: 150px;">
-        {{ field.label_tag }}
-        {% if field.errors %}
-        {{ field.errors }}
-        {% endif %}
-        </td><td>
         {{ field }}
-    </td>
+    {% else %}
+        <td{{ field.row_attrs }} class="required" style="width: 150px;">
+            {{ field.label_tag }}
+            {% if field.errors %}
+                {{ field.errors }}
+            {% endif %}
+        </td>
+        <td>{{ field }}</td>
     {% endif %}
 </tr>

diff --git a/auf_savoirs_en_partage/templates/render_form.html b/auf_savoirs_en_partage/templates/render_form.html
index e242675..446621b 100644 (file)
--- a/auf_savoirs_en_partage/templates/render_form.html
+++ b/auf_savoirs_en_partage/templates/render_form.html
@@ -1,3 +1,3 @@
 {% for field in form %}
-{% include "render_field.html" %}
+    {% include "render_field.html" %}
 {% endfor %}

diff --git a/auf_savoirs_en_partage/templates/savoirs/index.html b/auf_savoirs_en_partage/templates/savoirs/index.html
index 62b91ed..b4bd601 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/index.html
+++ b/auf_savoirs_en_partage/templates/savoirs/index.html
@@ -31,7 +31,7 @@
         <ul class="liste-de-l-accueil">
         {% for chercheur in chercheurs %}
             <li class="clearfix">
-            <a href="" class="le-titre">{{ chercheur }}</a>
+            <a href="{% url chercheurs.views.retrieve chercheur.id %}" class="le-titre">{{ chercheur }}</a>
             <span class="la-date">Disciplines : {{ chercheur.discipline }}</span>
             </li>
         {% endfor %}

diff --git a/auf_savoirs_en_partage/templates/table_form.html b/auf_savoirs_en_partage/templates/table_form.html
index 6ff4fa3..51ec8c0 100644 (file)
--- a/auf_savoirs_en_partage/templates/table_form.html
+++ b/auf_savoirs_en_partage/templates/table_form.html
@@ -1,3 +1,3 @@
-<table class="DMAJ">
-  {% include "render_form.html" %}
+<table>
+    {% include "render_form.html" %}
 </table>

diff --git a/auf_savoirs_en_partage/urls.py b/auf_savoirs_en_partage/urls.py
index c30cee7..9e550ed 100644 (file)
--- a/auf_savoirs_en_partage/urls.py
+++ b/auf_savoirs_en_partage/urls.py
@@ -29,6 +29,7 @@ urlpatterns = patterns(
     (r'^json/get/$', 'savoirs.views.json_get'),
     (r'^json/set/$', 'savoirs.views.json_set'),
     
+    (r'^chercheurs/(?P<id>\d+)/$', 'chercheurs.views.retrieve'),
     (r'^chercheurs/inscription/$', 'chercheurs.views.inscription'),
     (r'^chercheurs/repertoire/$', 'chercheurs.views.repertoire'),
     (r'^espace/chercheur/(?P<id>\d+)/$', 'chercheurs.views.perso'),