Skip to content

Step2 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ButenkoD wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Step2 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c339f21
bootstrap and components installed
ButenkoD Nov 19, 2013
de5fc91
Added bootstrap, controller, actions
ButenkoD Nov 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Resources/views/base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8" />
<title>{% block title %}Welcome!{% endblock %}</title>
<title>{% block title %}HomeWork5{% endblock %}</title>
{% block stylesheets %}{% endblock %}
<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
</head>
Expand Down
17 changes: 16 additions & 1 deletion app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ twig:
assetic:
debug: %kernel.debug%
use_controller: false
bundles: [ ]
bundles: [ AcmeDemoBundle ]
#java: /usr/bin/java
filters:
cssrewrite: ~
Expand All @@ -39,6 +39,21 @@ assetic:
#yui_css:
# jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar

assets:
css:
inputs:
- %kernel.root_dir%/../vendor/twbs/bootstrap/dist/css/bootstrap.css
- %kernel.root_dir%/../vendor/twbs/bootstrap/dist/css/bootstrap-theme.min.css
filters:
- cssrewrite
output: mystyle.css
js:
inputs:
- %kernel.root_dir%/../components/jquery/jquery.min.js
- %kernel.root_dir%/../vendor/twbs/bootstrap/dist/js/bootstrap.min.js
output: myjs.js


# Doctrine Configuration
doctrine:
dbal:
Expand Down
3 changes: 3 additions & 0 deletions app/config/routing_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ _main:
# AcmeDemoBundle routes (to be removed)
_acme_demo:
resource: "@AcmeDemoBundle/Resources/config/routing.yml"

_home_work:
resource: "@AcmeDemoBundle/Resources/config/myrouting.yml"
Loading