index improvement

diff --git a/project/templates/index.html b/project/templates/index.html
index 383b41b..3de56c1 100644 (file)
--- a/project/templates/index.html
+++ b/project/templates/index.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends "base.html" %}
 
 {% block title %}RH{% endblock %}
 {% block titre %}Ressources humaines{% endblock %}
@@ -16,7 +16,8 @@ Voici les modules actuellement disponibles :
 </p>
 <ul>
     <li><a href="{% url dae_index %}">Demande d'autorisation d'engagement (DAE)</a></li>
-    <li><a href="{% url admin:index %}">Système de gestion des ressources humaines (RH)</a></li>
+    <li><a href="{% url admin:app_list app_label="rh" %}">Gestion des personnels (RH)</a></li>
+    <li><a href="{% url admin:app_list app_label="recrutement" %}">Gestion des candidatures (Recrutement)</a></li>
 </ul>
 
 <h1>Vos droits d'accès</h1>

diff --git a/project/templates/menu.html b/project/templates/menu.html
index efe5a53..8f11945 100644 (file)
--- a/project/templates/menu.html
+++ b/project/templates/menu.html
@@ -5,7 +5,7 @@
     <a href="{% url index %}">Accueil</a>
   </li>
   <li class="{% menu_actif request '^dae$' %}">
-    <a href="{% url dae_index %}">DAE</a>
+    <a href="{% url dae_index %}">Demande d'autorisation d'engagement</a>
     <ul>
         {% if request.user|peut_ajouter %}
         <li class="{% menu_actif request '^poste$' %}">
@@ -28,7 +28,10 @@
         </li>
     </ul>
   </li>
-  <li class="{% menu_actif request '^admin$' %}">
-    <a href="{% url admin:index %}">RH</a>
+  <li>
+    <a href="{% url admin:app_list app_label="rh" %}">Gestion des personnels</a>
+  </li>
+  <li>
+    <a href="{% url admin:app_list app_label="recrutement" %}">Recrutement</a>
   </li>
 </ul>

diff --git a/project/urls.py b/project/urls.py
index 1fd37e0..3680123 100644 (file)
--- a/project/urls.py
+++ b/project/urls.py
@@ -14,7 +14,6 @@ urlpatterns = patterns(
     '',
     url(r'^$', 'project.views.index', name='index'),
     url(r'^admin_tools/', include('admin_tools.urls')),
-    url(r'^admin/recrutement/$', admin.site.app_index, {'app_label': 'recrutement'}),
     (r'^admin/', include(admin.site.urls)),
     url(r'^api/(?P<method>[a-z_-]+)/(?P<offre_id>\d+)/$', 'recrutement.api.api', 
             name='recrutement_api'),

diff --git a/project/views.py b/project/views.py
index 10efbef..5590c41 100644 (file)
--- a/project/views.py
+++ b/project/views.py
@@ -13,7 +13,6 @@ from django.shortcuts import redirect, render_to_response, get_object_or_404
 from project.dae.decorators import dae_groupe_requis
 from project.dae.decorators import redirect_interdiction
 
-@dae_groupe_requis
 def index(request):
     return render_to_response('index.html', {}, RequestContext(request))