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
f0826b1517 b662ce7b3c
commit
ffa2956cea
10 changed files with 111 additions and 12 deletions
Unified View Show Diff Stats
  1. 4 0
      app/config/routing.yml
  2. 1 1
      src/Muzich/CoreBundle/Resources/views/layout.html.twig
  3. 3 3
      src/Muzich/MynetworkBundle/Resources/views/Mynetwork/index.html.twig
  4. 2 2
      src/Muzich/MynetworkBundle/Resources/views/Mynetwork/search.html.twig
  5. 5 5
      src/Muzich/UserBundle/Controller/UserController.php
  6. 6 0
      src/Muzich/UserBundle/Resources/config/routing.yml
  7. 27 0
      src/Muzich/UserBundle/Resources/views/Account/topBar.html.twig
  8. 9 0
      src/Muzich/UserBundle/Resources/views/User/account.html.twig
  9. 1 1
      web/bundles/muzichcore/css/base.css
  10. 53 0
      web/bundles/muzichcore/css/main.css

+ 4 - 0
app/config/routing.yml View File

18 
 MuzichHomeBundle:
 18 
 MuzichHomeBundle:
19 
   resource: "@MuzichHomeBundle/Resources/config/routing.yml"
 19 
   resource: "@MuzichHomeBundle/Resources/config/routing.yml"
20 
   prefix: /
 20 
   prefix: /
21 
+
22 
+MuzichUserBundle:
23 
+  resource: "@MuzichUserBundle/Resources/config/routing.yml"
24 
+  prefix: /

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

20 
 </head>
 20 
 </head>
21 
 <body>
 21 
 <body>
22
22
23 
-  {% include "MuzichUserBundle::connexion.html.twig" %}
23 
+  {% include "MuzichUserBundle:Account:topBar.html.twig" %}
24
24
25 
   <div id="container">
 25 
   <div id="container">
26 
     {% block main_content %}{% endblock %}
 26 
     {% block main_content %}{% endblock %}

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

10
10
11 
   {% if followeds_users %}
 11 
   {% if followeds_users %}
12 
     <b>Utilisateurs</b>
 12 
     <b>Utilisateurs</b>
13 
-    <ul>
13 
+    <ul class="inline">
14 
     {% for user in followeds_users %}
14 
     {% for user in followeds_users %}
15 
       <li>
 15 
       <li>
16 
         <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
 16 
         <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
21
21
22 
   {% if followeds_groups %}
 22 
   {% if followeds_groups %}
23 
     <b>Groupes</b>
 23 
     <b>Groupes</b>
24 
-    <ul>
24 
+    <ul class="inline">
25 
     {% for group in followeds_groups %}
25 
     {% for group in followeds_groups %}
26 
       <li>
 26 
       <li>
27 
         <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
 27 
         <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
32
32
33 
   {% if followers_users %}
 33 
   {% if followers_users %}
34 
     <b>Vous êtes suivis par</b>
 34 
     <b>Vous êtes suivis par</b>
35 
-    <ul>
35 
+    <ul class="inline">
36 
     {% for user in followers_users %}
36 
     {% for user in followers_users %}
37 
       <li>
 37 
       <li>
38 
         <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
 38 
         <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>

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

27
27
28 
       <b>Utilisateurs</b>
 28 
       <b>Utilisateurs</b>
29
29
30 
-      <ul>
30 
+      <ul class="inline">
31 
       {% for user in results.users %}
31 
       {% for user in results.users %}
32 
         <li>
 32 
         <li>
33 
           <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
 33 
           <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
41
41
42 
       <b>Groupes</b>
 42 
       <b>Groupes</b>
43
43
44 
-      <ul>
44 
+      <ul class="inline">
45 
       {% for group in results.groups %}
45 
       {% for group in results.groups %}
46 
         <li>
 46 
         <li>
47 
           <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
 47 
           <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>

src/Muzich/UserBundle/Controller/DefaultController.php → src/Muzich/UserBundle/Controller/UserController.php View File

3 
 namespace Muzich\UserBundle\Controller;
 3 
 namespace Muzich\UserBundle\Controller;
4
4
5 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 5 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
6 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
7 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 6 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
8
7
9 
-class DefaultController extends Controller
8 
+class UserController extends Controller
10 
 {
 9 
 {
11 
     /**
 10 
     /**
12 
-     * @Route("/hello/{name}")
13 
      * @Template()
 11 
      * @Template()
14 
      */
 12 
      */
15 
-    public function indexAction($name)
13 
+    public function accountAction()
16 
     {
 14 
     {
17 
-        return array('name' => $name);
15 
+        return array(
16 
+
17 
+        );
18 
     }
 18 
     }
19 
 }
 19 
 }

+ 6 - 0
src/Muzich/UserBundle/Resources/config/routing.yml View File

1 
+
2 
+
3 
+my_account:
4 
+   pattern:  /account
5 
+   defaults: { _controller: MuzichUserBundle:User:account }
6 
+

+ 27 - 0
src/Muzich/UserBundle/Resources/views/Account/topBar.html.twig View File

1 
+
2 
+{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
3 
+<div id="top_bar">
4 
+
5 
+  {#<ul>
6 
+    <li>
7 
+      <a href="{{ path('my_account') }}" >
8 
+        Mon compte
9 
+      </a>
10 
+    </li>
11 
+    <li>
12 
+      <a href="{{ path('fos_user_security_logout') }}" >
13 
+        Déconnexion
14 
+      </a>
15 
+    </li>
16 
+  </ul>#}
17 
+
18 
+  <a href="{{ path('my_account') }}" >
19 
+    Mon compte
20 
+  </a>
21 
+
22 
+  <a href="{{ path('fos_user_security_logout') }}" >
23 
+    Déconnexion
24 
+  </a>
25 
+
26 
+</div>
27 
+{% endif %}

+ 9 - 0
src/Muzich/UserBundle/Resources/views/User/account.html.twig View File

1 
+{% extends "MuzichHomeBundle::layout.html.twig" %}
2 
+
3 
+{% block title %}Mon compte{% endblock %}
4 
+
5 
+{% block content %}
6 
+
7 
+
8 
+
9 
+{% endblock %}

+ 1 - 1
web/bundles/muzichcore/css/base.css View File

6 
 }
 6 
 }
7 
 body {
 7 
 body {
8 
   margin: 0;
 8 
   margin: 0;
9 
-  padding: 1em; /* Remettre à zéro si nécessaire. */
9 
+  padding: 0; /* Remettre à zéro si nécessaire. */
10 
   /* Pensez à utiliser une collection de polices (2), par ex:
 10 
   /* Pensez à utiliser une collection de polices (2), par ex:
11 
   font-family: Arial, Helvetica, FreeSans, sans-serif; */
 11 
   font-family: Arial, Helvetica, FreeSans, sans-serif; */
12 
   /*font-size: .8em;*/ /* À adapter pour la police choisie. (3) */
 12 
   /*font-size: .8em;*/ /* À adapter pour la police choisie. (3) */

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

76 
 #container #top-tabs li a
 76 
 #container #top-tabs li a
77 
 {
 77 
 {
78 
   text-decoration: none;
 78 
   text-decoration: none;
79 
+}
80 
+
81 
+#top_bar
82 
+{
83 
+  width: 220px;
84 
+  background-color: white;
85 
+  padding: 0px;
86 
+
87 
+  margin-left: auto;
88 
+  margin-right: auto;
89 
+
90 
+  border-radius: 0px 0px 4px 4px;
91 
+  -moz-border-radius: 0px 0px 4px 4px;
92 
+  -webkit-border-radius: 0px 0px 4px 4px;
93 
+
94 
+	text-align: center;
95 
+}
96 
+
97 
+#top_bar a
98 
+{
99 
+  text-decoration: none;
100 
+  color: black;
101 
+  padding-left: 3px; padding-right: 3px;
102 
+}
103 
+
104 
+/*#top_bar ul
105 
+{
106 
+  text-align: center;
107 
+  margin-top: -5px;
108 
+}
109 
+
110 
+#top_bar ul li
111 
+{
112 
+  display: inline;
113 
+  float: left;
114 
+  list-style: none;
115 
+  padding-left: 6px;
116 
+}
117 
+
118 
+#top_bar ul li a
119 
+{
120 
+  text-decoration: none;
121 
+  color: black;
122 
+}*/
123 
+
124 
+ul.inline
125 
+{
126 
+
127 
+}
128 
+
129 
+ul.inline li
130 
+{
131 
+  display: inline;
79 
 }
 132 
 }