Browse Source

Evolution #90: suivre/ne plus suivre pour groupes

bastien 13 years ago
parent
commit
88a3ea3584

+ 2 - 1
app/Resources/translations/groups.fr.yml View File

8
 group:
8
 group:
9
   edit:                         Modifier ce groupe
9
   edit:                         Modifier ce groupe
10
   follow:                       Suivre
10
   follow:                       Suivre
11
+  following:                    Suivi
11
   notfollow:                    Ne plus suivre
12
   notfollow:                    Ne plus suivre
12
   remove:
13
   remove:
13
-    link:                       Supprimer le groupe
14
+    link:                       Supprimer le groupe

+ 6 - 6
src/Muzich/HomeBundle/Resources/views/Show/showGroup.html.twig View File

4
 
4
 
5
 {% block content %}
5
 {% block content %}
6
 
6
 
7
-  <span class="follow_link following">
8
-  
7
+  <div class="show_options">
8
+    
9
     {% if his_group %}
9
     {% if his_group %}
10
       <a href="{{ path('group_edit', { 'slug': group.slug }) }}" >
10
       <a href="{{ path('group_edit', { 'slug': group.slug }) }}" >
11
         {{ 'group.edit'|trans({}, 'groups') }}
11
         {{ 'group.edit'|trans({}, 'groups') }}
12
       </a> |
12
       </a> |
13
     {% endif %}
13
     {% endif %}
14
-
14
+      
15
     <a href="{{ path('follow', { 'type': 'group', 'id': group.id, 'token': user.personalHash }) }}" 
15
     <a href="{{ path('follow', { 'type': 'group', 'id': group.id, 'token': user.personalHash }) }}" 
16
-       class="{% if following %}following{% else %}notfollowing{% endif %}">
16
+       class="follow_link button {% if following %}following{% else %}notfollowing{% endif %}">
17
       {% if following %}
17
       {% if following %}
18
-        {{ 'group.notfollow'|trans({}, 'groups') }}
18
+        {{ 'group.following'|trans({}, 'groups') }}
19
       {% else %}
19
       {% else %}
20
         {{ 'group.follow'|trans({}, 'groups') }}
20
         {{ 'group.follow'|trans({}, 'groups') }}
21
       {% endif %}
21
       {% endif %}
22
     </a>
22
     </a>
23
     
23
     
24
-  </span>
24
+  </div>
25
     
25
     
26
   <h2>{{ group.name }}</h2>
26
   <h2>{{ group.name }}</h2>
27
   
27