Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 23:23:51 +00:00
Code Issues Actions Projects Releases Wiki Activity

move spacename to CLChillMain to ChillMain

Browse Source
This commit is contained in:
Julien Fastré
2014-10-17 08:27:31 +02:00
parent f44abb26fe
commit d9aa417e3c
27 changed files with 61 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/config/doctrine/Agent.orm.yml
View File

@@ -1,4 +1,4 @@
CL\Chill\MainBundle\Entity\Agent:
Chill\MainBundle\Entity\Agent:
type: entity
table: agents
id:

2
Resources/config/doctrine/Country.orm.yml
View File

@@ -1,4 +1,4 @@
CL\Chill\MainBundle\Entity\Country:
Chill\MainBundle\Entity\Country:
type: entity
table: null
fields:

26
Resources/config/routing.yml
View File

@@ -12,35 +12,13 @@ root:
cl_chill_main_homepage:
pattern: /hello
defaults: { _controller: CLChillMainBundle:Default:index }
defaults: { _controller: ChillMainBundle:Default:index }
chill_main_admin_central:
pattern: /admin
defaults: { _controller: CLChillMainBundle:Admin:index }
defaults: { _controller: ChillMainBundle:Admin:index }
options:
menus:
main:
order: 20
label: homepage
chill_main_dummy_0:
pattern: /dummy
defaults: { _controller: CLChillMainBundle:Default:index }
options:
menus:
dummy0:
order: 50
label: 'test dummy 0'
dummy1:
order: 50
label: test dummy 1
chill_main_dummy_1:
pattern: /dummy1
defaults: { _controller: CLChillMainBundle:Default:index }
options:
menus:
dummy0:
order: 51
label: 'test dummy 1'

6
Resources/config/services.yml
View File

@@ -1,15 +1,15 @@
parameters:
# cl_chill_main.example.class: CL\Chill\MainBundle\Example
# cl_chill_main.example.class: Chill\MainBundle\Example
services:
chill.main.menu_composer:
class: CL\Chill\MainBundle\Routing\MenuComposer
class: Chill\MainBundle\Routing\MenuComposer
#must be set in function to avoid circular reference with chill.main.twig.chill_menu
calls:
- [setContainer, ["@service_container"]]
chill.main.twig.chill_menu:
class: CL\Chill\MainBundle\Routing\MenuTwig
class: Chill\MainBundle\Routing\MenuTwig
arguments:
- "@chill.main.menu_composer"
calls:

4
Resources/views/Admin/index.html.twig
View File

@@ -1,11 +1,11 @@
{% extends "CLChillMainBundle::layout.html.twig" %}
{% extends "ChillMainBundle::layout.html.twig" %}
{% block title%}{{ header_title|trans }}{% endblock %}
{% block css %}
{% stylesheets output="css/all.css" filter="cssrewrite"
"bundles/clchillmain/css/admin.css"
"bundles/Chillmain/css/admin.css"
%}
<link rel="stylesheet" href="{{ asset_url }}"/>
{% endstylesheets %}

18
Resources/views/layout.html.twig
View File

@@ -5,21 +5,21 @@
<title>{{ installation.name }}{% block title %}{% endblock %}</title>
{% stylesheets output="css/all.css" filter="cssrewrite"
"bundles/clchillmain/css/gumby.css"
"bundles/clchillmain/css/chillmain.css"
"bundles/clchillmain/js/lib_jquery_ui_pickadate/jquery-ui-1.10.3.pickadate.css" %}
"bundles/Chillmain/css/gumby.css"
"bundles/Chillmain/css/chillmain.css"
"bundles/Chillmain/js/lib_jquery_ui_pickadate/jquery-ui-1.10.3.pickadate.css" %}
<link rel="stylesheet" href="{{ asset_url }}"/>
{% endstylesheets %}
{% block css%}<!-- nothing added to css -->{% endblock %}
{% javascripts output="js/libs.js"
"bundles/clchillmain/js/modernizr-2.6.2.min.js"
"bundles/clchillmain/js/jquery-2.0.2.min.js"
"bundles/clchillmain/js/gumby.js"
"bundles/clchillmain/js/gumby.init.js"
"bundles/clchillmain/js/ui/*.js"
"bundles/clchillmain/js/lib_jquery_ui_pickadate/jquery-ui-1.10.3.pickadate.js" %}
"bundles/Chillmain/js/modernizr-2.6.2.min.js"
"bundles/Chillmain/js/jquery-2.0.2.min.js"
"bundles/Chillmain/js/gumby.js"
"bundles/Chillmain/js/gumby.init.js"
"bundles/Chillmain/js/ui/*.js"
"bundles/Chillmain/js/lib_jquery_ui_pickadate/jquery-ui-1.10.3.pickadate.js" %}
<script src="{{ asset_url }}" type="text/javascript"></script>
{% endjavascripts %}