Skip to content

Step mt m #2

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

Step mt m #2

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
19690db
Used Fixtires
ButenkoD Nov 21, 2013
830da92
ManyToMany added
ButenkoD Nov 27, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
/bin/
/composer.phar
/.idea/
*~
2 changes: 1 addition & 1 deletion .gitignore~
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
/vendor/
/bin/
/composer.phar
/.idea/*
/.idea/
2 changes: 2 additions & 0 deletions app/AppKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public function registerBundles()
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new Acme\StoreBundle\AcmeStoreBundle(),
new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
);

if (in_array($this->getEnvironment(), array('dev', 'test'))) {
Expand Down
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 %}HomeWork6{% endblock %}</title>
{% block stylesheets %}{% endblock %}
<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
</head>
Expand Down
9 changes: 9 additions & 0 deletions app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ 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

# Doctrine Configuration
doctrine:
dbal:
Expand Down
4 changes: 4 additions & 0 deletions app/config/routing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
acme_store:
resource: "@AcmeStoreBundle/Resources/config/routing.yml"
prefix: /

4 changes: 3 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
"sensio/distribution-bundle": "2.3.*",
"sensio/framework-extra-bundle": "2.3.*",
"sensio/generator-bundle": "2.3.*",
"incenteev/composer-parameter-handler": "~2.0"
"incenteev/composer-parameter-handler": "~2.0",
"doctrine/doctrine-fixtures-bundle": "dev-master",
"twbs/bootstrap": "3.0.*@dev"
},
"scripts": {
"post-install-cmd": [
Expand Down
165 changes: 161 additions & 4 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions src/Acme/StoreBundle/AcmeStoreBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

namespace Acme\StoreBundle;

use Symfony\Component\HttpKernel\Bundle\Bundle;

class AcmeStoreBundle extends Bundle
{
}
Loading