Home Explore Help
Sign In
bux
/
muzich
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'feature/html' into unstable

bastien 13 years ago
parent
18eed440dd cf2f6ac71e
commit
f0826b1517
12 changed files with 127 additions and 30 deletions
Split View Show Diff Stats
  1. 13 0
      src/Muzich/CoreBundle/Resources/views/Menu/containerMenu.html.twig
  2. 4 4
      src/Muzich/CoreBundle/Resources/views/layout.html.twig
  3. 1 1
      src/Muzich/HomeBundle/Resources/views/Home/index.html.twig
  4. 1 1
      src/Muzich/HomeBundle/Resources/views/Show/showGroup.html.twig
  5. 1 1
      src/Muzich/HomeBundle/Resources/views/Show/showUser.html.twig
  6. 4 0
      src/Muzich/HomeBundle/Resources/views/layout.html.twig
  7. 3 5
      src/Muzich/MynetworkBundle/Resources/views/Mynetwork/index.html.twig
  8. 5 7
      src/Muzich/MynetworkBundle/Resources/views/Mynetwork/search.html.twig
  9. 5 1
      src/Muzich/MynetworkBundle/Resources/views/layout.html.twig
  10. 4 3
      web/bundles/muzichcore/css/base.css
  11. 78 0
      web/bundles/muzichcore/css/main.css
  12. 8 7
      web/bundles/mynetwork/css/mynetwork.css

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

@@ -0,0 +1,13 @@
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>

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

@@ -20,11 +20,11 @@
20 20 
 </head>
21 21 
 <body>
22 22
23 
-  <div id="connexion">
24 
-    {% include "MuzichUserBundle::connexion.html.twig" %}
25 
-  </div>
23 
+  {% include "MuzichUserBundle::connexion.html.twig" %}
26 24
27 
-  {% block main_content %}{% endblock %}
25 
+  <div id="container">
26 
+    {% block main_content %}{% endblock %}
27 
+  </div>
28 28
29 29 
 </body>
30 30 
 </html>

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

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

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

@@ -4,7 +4,7 @@
4 4
5 5 
 {% block content %}
6 6
7 
-  <b>{{ group.name }}</b>
7 
+  <h2>{{ group.name }}</h2>
8 8
9 9 
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
10 10

+ 1 - 1
src/Muzich/HomeBundle/Resources/views/Show/showUser.html.twig View File 

@@ -4,7 +4,7 @@
4 4
5 5 
 {% block content %}
6 6
7 
-  <b>{{ viewed_user.name }}</b>
7 
+  <h2>{{ viewed_user.name }}</h2>
8 8
9 9 
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
10 10

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

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

+ 3 - 5
src/Muzich/MynetworkBundle/Resources/views/Mynetwork/index.html.twig View File 

@@ -4,11 +4,9 @@
4 4
5 5 
 {% block content %}
6 6
7 
-  <p>
8 
-    <a href="{{ path('mynetwork_search') }}" >
9 
-      Rechercher
10 
-    </a>
11 
-  </p>
7 
+  <a class="link_navigation" href="{{ path('mynetwork_search') }}" >
8 
+    Rechercher
9 
+  </a>
12 10
13 11 
   {% if followeds_users %}
14 12 
     <b>Utilisateurs</b>

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

@@ -4,11 +4,9 @@
4 4
5 5 
 {% block content %}
6 6
7 
-  <p>
8 
-    <a href="{{ path('mynetwork_index') }}" >
9 
-      Retour
10 
-    </a>
11 
-  </p>
7 
+  <a class="link_navigation" href="{{ path('mynetwork_index') }}" >
8 
+    Retour
9 
+  </a>
12 10
13 11 
   <b>Rechercher des utilisateurs et des groupes</b>
14 12 
   
@@ -32,7 +30,7 @@
32 30 
       <ul>
33 31 
       {% for user in results.users %}
34 32 
         <li>
35 
-          {{ user.username }}
33 
+          <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
36 34 
         </li>
37 35 
       {% endfor %}
38 36 
       </ul>
 
@@ -46,7 +44,7 @@
46 44 
       <ul>
47 45 
       {% for group in results.groups %}
48 46 
         <li>
49 
-          {{ group.name }}
47 
+          <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
50 48 
         </li>
51 49 
       {% endfor %}
52 50 
       </ul>

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

@@ -5,5 +5,9 @@
5 5 
 {% endblock %}
6 6
7 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 13 
 {% endblock %}

+ 4 - 3
web/bundles/muzichcore/css/base.css View File 

@@ -9,10 +9,11 @@ body {
9 9 
   padding: 1em; /* Remettre à zéro si nécessaire. */
10 10 
   /* Pensez à utiliser une collection de polices (2), par ex:
11 11 
   font-family: Arial, Helvetica, FreeSans, sans-serif; */
12 
-  font-size: .8em; /* À adapter pour la police choisie. (3) */
13 
-  line-height: 1.4; /* À adapter au design. (4) */
12 
+  /*font-size: .8em;*/ /* À adapter pour la police choisie. (3) */
14 13 
   color: black;
15 
-  background: white;
14 
+  background-color: #9AE4E8;
15 
+  font: 13.34px helvetica,arial,freesans,clean,sans-serif;
16 
+  line-height: 1.4;
16 17 
 }
17 18
18 19 
 /* Titres */

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

@@ -1 +1,79 @@
1 1
2 
+#container
3 
+{
4 
+  width: 640px;
5 
+  margin-top: 45px;
6 
+  margin-left: auto;
7 
+  margin-right: auto;
8 
+  margin-bottom: 45px;
9 
+
10 
+  padding: 10px;
11 
+  background-color: white;
12 
+  border: 0px solid #d5d5d5;
13 
+  border-radius: 7px;
14 
+  -moz-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;
20 
+}
21 
+
22 
+#container h1
23 
+{
24 
+
25 
+}
26 
+#container h2
27 
+{
28 
+  margin-top: 5px;
29 
+  margin-bottom: 5px;
30 
+
31 
+  text-shadow: 1px 1px 2px #666;
32 
+}
33 
+#container h3
34 
+{
35 
+
36 
+}
37 
+#container h4
38 
+{
39 
+
40 
+}
41 
+
42 
+#container #top-tabs
43 
+{
44 
+  float: left;
45 
+  list-style: none outside none;
46 
+  margin: -36px 16px 0 -6px;
47 
+  padding: 0;
48 
+}
49 
+
50 
+#container #top-tabs li
51 
+{
52 
+  float: left;
53 
+  margin-left: 0px;
54 
+
55 
+  padding-top: 3px;
56 
+  padding-left: 5px;
57 
+  padding-right: 5px;
58 
+  padding-bottom: 3px;
59 
+
60 
+  background-color: #e9e9e9;
61 
+
62 
+  border-top: 1px solid #d5d5d5;
63 
+  border-left: 1px solid #d5d5d5;
64 
+  border-right: 1px solid #d5d5d5;
65 
+  border-radius: 5px 5px 0px 0px;
66 
+  -moz-border-radius: 5px 5px 0px 0px;
67 
+  -webkit-border-radius: 5px 5px 0px 0px;
68 
+
69 
+}
70 
+
71 
+#container #top-tabs li.active
72 
+{
73 
+  background-color: white;
74 
+}
75 
+
76 
+#container #top-tabs li a
77 
+{
78 
+  text-decoration: none;
79 
+}

+ 8 - 7
web/bundles/mynetwork/css/mynetwork.css View File 

@@ -1,7 +1,8 @@
1 
-/*
2 
-    Document   : mynetwork
3 
-    Created on : 27 sept. 2011, 14:41:54
4 
-    Author     : bux
5 
-    Description:
6 
-        Purpose of the stylesheet follows.
7 
-*/
1 
+
2 
+#container .link_navigation
3 
+{
4 
+  float: right;
5 
+  font-weight: bold;
6 
+  text-decoration: none;
7 
+  color: black;
8 
+}