Browse Source

Ajout des onglets de navigation Le réseau / Mon réseau

bastien 13 years ago
parent
commit
ba3d51dc10

+ 13 - 0
src/Muzich/CoreBundle/Resources/views/Menu/containerMenu.html.twig View File

1
+
2
+<ul id="top-tabs">
3
+  <li {% if active == 'public' %} class="active" {% endif %}>
4
+    <a href="{{ path('home') }}">
5
+      Le réseau
6
+    </a>
7
+  </li>
8
+  <li {% if active == 'private' %} class="active" {% endif %}>
9
+    <a href="{{ path('mynetwork_index') }}">
10
+      Mon réseau
11
+    </a>
12
+  </li>
13
+</ul>

+ 1 - 1
src/Muzich/HomeBundle/Resources/views/Home/index.html.twig View File

3
 {% block title %}Réseau{% endblock %}
3
 {% block title %}Réseau{% endblock %}
4
 
4
 
5
 {% block content %}
5
 {% block content %}
6
-    
6
+
7
   {% include "MuzichCoreBundle:SearchElement:form.html.twig" %}
7
   {% include "MuzichCoreBundle:SearchElement:form.html.twig" %}
8
 
8
 
9
   {% render "MuzichCoreBundle:Search:doSearchElements" with { 'search': search_object } %}
9
   {% render "MuzichCoreBundle:Search:doSearchElements" with { 'search': search_object } %}

+ 4 - 0
src/Muzich/HomeBundle/Resources/views/layout.html.twig View File

5
 {% endblock %}
5
 {% endblock %}
6
 
6
 
7
 {% block main_content %}
7
 {% block main_content %}
8
+  
9
+    {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'public' } %}
10
+  
8
     {% block content %}{% endblock %}
11
     {% block content %}{% endblock %}
12
+  
9
 {% endblock %}
13
 {% endblock %}

+ 2 - 2
src/Muzich/MynetworkBundle/Resources/views/Mynetwork/search.html.twig View File

32
       <ul>
32
       <ul>
33
       {% for user in results.users %} 
33
       {% for user in results.users %} 
34
         <li>
34
         <li>
35
-          {{ user.username }}
35
+          <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
36
         </li>
36
         </li>
37
       {% endfor %}
37
       {% endfor %}
38
       </ul>
38
       </ul>
46
       <ul>
46
       <ul>
47
       {% for group in results.groups %} 
47
       {% for group in results.groups %} 
48
         <li>
48
         <li>
49
-          {{ group.name }}
49
+          <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
50
         </li>
50
         </li>
51
       {% endfor %}
51
       {% endfor %}
52
       </ul>
52
       </ul>

+ 5 - 1
src/Muzich/MynetworkBundle/Resources/views/layout.html.twig View File

5
 {% endblock %}
5
 {% endblock %}
6
 
6
 
7
 {% block main_content %}
7
 {% block main_content %}
8
-    {% block content %}{% endblock %}
8
+  
9
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 'active': 'private' } %}
10
+  
11
+  {% block content %}{% endblock %}
12
+  
9
 {% endblock %}
13
 {% endblock %}

+ 43 - 0
web/bundles/muzichcore/css/main.css View File

13
   border-radius: 7px;
13
   border-radius: 7px;
14
   -moz-border-radius: 7px;
14
   -moz-border-radius: 7px;
15
   -webkit-border-radius: 7px;
15
   -webkit-border-radius: 7px;
16
+  
17
+  -webkit-box-shadow: #666 0px 2px 3px;
18
+  -moz-box-shadow: #666 0px 2px 3px;
19
+  box-shadow: #666 0px 2px 3px;
16
 }
20
 }
17
 
21
 
18
 #container h1
22
 #container h1
31
 #container h4
35
 #container h4
32
 {
36
 {
33
   
37
   
38
+}
39
+
40
+#container #top-tabs
41
+{
42
+  float: left;
43
+  list-style: none outside none;
44
+  margin: -36px 16px 0 -6px;
45
+  padding: 0;
46
+}
47
+
48
+#container #top-tabs li
49
+{
50
+  float: left;
51
+  margin-left: 0px;
52
+  
53
+  padding-top: 3px;
54
+  padding-left: 5px;
55
+  padding-right: 5px;
56
+  padding-bottom: 3px;
57
+  
58
+  background-color: #e9e9e9;
59
+  
60
+  border-top: 1px solid #d5d5d5;
61
+  border-left: 1px solid #d5d5d5;
62
+  border-right: 1px solid #d5d5d5;
63
+  border-radius: 5px 5px 0px 0px;
64
+  -moz-border-radius: 5px 5px 0px 0px;
65
+  -webkit-border-radius: 5px 5px 0px 0px;
66
+  
67
+}
68
+
69
+#container #top-tabs li.active
70
+{
71
+  background-color: white;
72
+}
73
+
74
+#container #top-tabs li a
75
+{
76
+  text-decoration: none;
34
 }
77
 }