Browse Source

Modifs de templates

bastien 13 years ago
parent
commit
db682c0a6e

+ 31 - 31
app/config/routing_dev.yml View File

@@ -1,31 +1,31 @@
1
-_welcome:
2
-    pattern:  /dev
3
-    defaults: { _controller: AcmeDemoBundle:Welcome:index }
4
-
5
-_demo_secured:
6
-    resource: "@AcmeDemoBundle/Controller/SecuredController.php"
7
-    type:     annotation
8
-
9
-_demo:
10
-    resource: "@AcmeDemoBundle/Controller/DemoController.php"
11
-    type:     annotation
12
-    prefix:   /demo
13
-
14
-_assetic:
15
-    resource: .
16
-    type:     assetic
17
-
18
-_wdt:
19
-    resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
20
-    prefix:   /_wdt
21
-
22
-_profiler:
23
-    resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
24
-    prefix:   /_profiler
25
-
26
-_configurator:
27
-    resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
28
-    prefix:   /_configurator
29
-
30
-_main:
31
-    resource: routing.yml
1
+#_welcome:
2
+#    pattern:  /dev
3
+#    defaults: { _controller: AcmeDemoBundle:Welcome:index }
4
+#
5
+#_demo_secured:
6
+#    resource: "@AcmeDemoBundle/Controller/SecuredController.php"
7
+#    type:     annotation
8
+#
9
+#_demo:
10
+#    resource: "@AcmeDemoBundle/Controller/DemoController.php"
11
+#    type:     annotation
12
+#    prefix:   /demo
13
+#
14
+#_assetic:
15
+#    resource: .
16
+#    type:     assetic
17
+#
18
+#_wdt:
19
+#    resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
20
+#    prefix:   /_wdt
21
+#
22
+#_profiler:
23
+#    resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
24
+#    prefix:   /_profiler
25
+#
26
+#_configurator:
27
+#    resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
28
+#    prefix:   /_configurator
29
+#
30
+#_main:
31
+#    resource: routing.yml

File diff suppressed because it is too large
+ 87 - 57277
app/logs/dev.log


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

@@ -22,7 +22,7 @@
22 22
     {% include "MuzichUserBundle::connexion.html.twig" %}
23 23
   </div>
24 24
   
25
-  {% block content %}{% endblock %}
25
+  {% block main_content %}{% endblock %}
26 26
   
27 27
 </body>
28 28
 </html>

+ 8 - 6
src/Muzich/IndexBundle/Resources/views/Index/index.html.twig View File

@@ -1,15 +1,17 @@
1
-{% extends "MuzichCoreBundle::layout.html.twig" %}
1
+{% extends "MuzichIndexBundle::layout.html.twig" %}
2 2
 
3 3
 {% block title %}Hello{% endblock %}
4 4
 
5 5
 {% block content %}
6
-    <h1>Hello</h1>
7 6
     
8
-    <img src="/favicon.ico" />
9
-    
10
-    {% include "MuzichUserBundle:Security:login.html.twig" %}
11
-    {% include "MuzichUserBundle:Registration:register.html.twig" %}
7
+  <div class="hello">
8
+
9
+    <div class="login_box">
10
+      {% include "MuzichUserBundle:Security:login.html.twig" %}
11
+      {% include "MuzichUserBundle:Registration:register.html.twig" %}
12
+    </div>
12 13
     
14
+  </div>
13 15
     
14 16
     
15 17
 {% endblock %}

+ 9 - 0
src/Muzich/IndexBundle/Resources/views/layout.html.twig View File

@@ -0,0 +1,9 @@
1
+{% extends 'MuzichCoreBundle::layout.html.twig' %}
2
+
3
+{% block css %}
4
+	<link href="{{ asset('bundles/muzichindex/css/index.css') }}" rel="stylesheet" media="screen" type="text/css" />
5
+{% endblock %}
6
+
7
+{% block main_content %}
8
+    {% block content %}{% endblock %}
9
+{% endblock %}

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

@@ -0,0 +1,15 @@
1
+
2
+.hello
3
+{
4
+  background-color: #f4f4f4;
5
+  padding: 30px;
6
+}
7
+
8
+.hello .login_box
9
+{
10
+  width: 640px;
11
+  margin-left: auto;
12
+  margin-right: auto;
13
+  background-color: #e3f6fd;
14
+  padding: 20px;
15
+}