skobkin/copypaste2
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #4. BraincraftedBootstrapBundle removed. Some other dependencies removed too.

Browse source
This commit is contained in:
Alexey Skobkin 2016-12-19 01:37:27 +03:00
parent 7a53b1c927
commit 91628a49da
11 changed files with 1297 additions and 244 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -11,5 +11,3 @@
/vendor/ /vendor/
/bin/ /bin/
/composer.phar /composer.phar
npm-debug.log

15
README.md
View file

@ -1,19 +1,8 @@
[![Codeship Status for skobkin/copypaste2](https://app.codeship.com/projects/7e83eb30-a6de-0134-240b-6af82c0549e8/status?branch=master)](https://app.codeship.com/projects/191097) [![Codeship Status for skobkin/copypaste2](https://app.codeship.com/projects/7e83eb30-a6de-0134-240b-6af82c0549e8/status?branch=master)](https://app.codeship.com/projects/191097)
[![codecov](https://codecov.io/bb/skobkin/copypaste2/branch/master/graph/badge.svg?token=cRaWwcOWdB)](https://codecov.io/bb/skobkin/copypaste2) [![codecov](https://codecov.io/bb/skobkin/copypaste2/branch/master/graph/badge.svg?token=cRaWwcOWdB)](https://codecov.io/bb/skobkin/copypaste2)
```shell
npm install -g less
```
...
```shell
php app/console braincrafted:bootstrap:install
```
...
```shell ```shell
composer install
php app/console assets:install web --symlink
php app/console assetic:dump php app/console assetic:dump
``` ```

1
app/AppKernel.php
View file

@ -19,7 +19,6 @@ class AppKernel extends Kernel
new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(), new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new DT\Bundle\GeshiBundle\DTGeshiBundle(), new DT\Bundle\GeshiBundle\DTGeshiBundle(),
new Braincrafted\Bundle\BootstrapBundle\BraincraftedBootstrapBundle(),
new Skobkin\Bundle\CopyPasteBundle\SkobkinCopyPasteBundle(), new Skobkin\Bundle\CopyPasteBundle\SkobkinCopyPasteBundle(),
); );

11
app/Resources/views/layout.html.twig
View file

@ -6,10 +6,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" href="{{ asset('bundles/skobkincopypaste/images/favicon.ico') }}"> <link rel="icon" href="{{ asset('bundles/skobkincopypaste/images/favicon.ico') }}">
{%- block css -%} {%- block css -%}
<link href="{{ asset('bootstrap/css/bootstrap.css') }}" rel="stylesheet" media="screen"> <link href="https://yastatic.net/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" media="screen">
{%- endblock -%} {%- endblock -%}
{# HTML5 Shim and Respond.js add IE8 support of HTML5 elements and media queries #} {# HTML5 Shim and Respond.js add IE8 support of HTML5 elements and media queries #}
{% include 'BraincraftedBootstrapBundle::ie8-support.html.twig' %} <!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv-printshiv.min.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
{%- endblock -%} {%- endblock -%}
</head> </head>
<body> <body>
@ -36,9 +39,9 @@
</div> </div>
{% block javascript %} {% block javascript %}
<script src="{{ asset('bootstrap/js/jquery.js') }}"></script> <script src="https://yastatic.net/jquery/2.2.3/jquery.min.js"></script>
{# Include all JavaScripts, compiled by Assetic #} {# Include all JavaScripts, compiled by Assetic #}
<script src="{{ asset('bootstrap/js/bootstrap.js') }}"></script> <script src="https://yastatic.net/bootstrap/3.3.6/js/bootstrap.min.js"></script>
{% endblock %} {% endblock %}
{% endblock %} {% endblock %}
</body> </body>

21
app/config/config.yml
View file

@ -30,6 +30,7 @@ twig:
debug: "%kernel.debug%" debug: "%kernel.debug%"
strict_variables: "%kernel.debug%" strict_variables: "%kernel.debug%"
form_themes: form_themes:
- 'bootstrap_3_layout.html.twig'
- 'SkobkinCopyPasteBundle:Form:fields.html.twig' - 'SkobkinCopyPasteBundle:Form:fields.html.twig'
# Assetic Configuration # Assetic Configuration
@ -39,32 +40,12 @@ assetic:
bundles: [ ] bundles: [ ]
#java: /usr/bin/java #java: /usr/bin/java
filters: filters:
less:
node: "%nodejs_executable%"
node_paths: %nodejs_paths%
apply_to: "\.less$"
cssrewrite: ~ cssrewrite: ~
#closure: #closure:
# jar: "%kernel.root_dir%/Resources/java/compiler.jar" # jar: "%kernel.root_dir%/Resources/java/compiler.jar"
#yui_css: #yui_css:
# jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
braincrafted_bootstrap:
output_dir: bootstrap
assets_dir: %kernel.root_dir%/../vendor/twbs/bootstrap
jquery_path: %kernel.root_dir%/../vendor/components/jquery/jquery.js
less_filter: less
fonts_dir: %kernel.root_dir%/../web/bootstrap/fonts
auto_configure:
assetic: true
twig: true
knp_menu: true
knp_paginator: true
customize:
variables_file: ~
bootstrap_output: %kernel.root_dir%/Resources/less/bootstrap.less
bootstrap_template: BraincraftedBootstrapBundle:Bootstrap:bootstrap.less.twig
# Doctrine Configuration # Doctrine Configuration
doctrine: doctrine:
dbal: dbal:

6
app/config/config_test.yml
View file

@ -15,12 +15,6 @@ framework:
profiler: profiler:
collect: false collect: false
assetic:
filters:
less:
node: "%test_nodejs_executable%"
node_paths: %test_nodejs_paths%
web_profiler: web_profiler:
toolbar: false toolbar: false
intercept_redirects: false intercept_redirects: false

3
app/config/parameters.yml.dist
View file

@ -19,7 +19,4 @@ parameters:
# A secret key that's used to generate certain security-related tokens # A secret key that's used to generate certain security-related tokens
secret: ThisTokenIsNotSoSecretChangeIt secret: ThisTokenIsNotSoSecretChangeIt
# Other stuff
nodejs_executable: /usr/bin/node
nodejs_paths: [/usr/lib/node_modules/]

6
composer.json
View file

@ -22,13 +22,11 @@
"doctrine/doctrine-fixtures-bundle": "2.2.*", "doctrine/doctrine-fixtures-bundle": "2.2.*",
"theodordiaconu/geshi": "dev-master", "theodordiaconu/geshi": "dev-master",
"theodordiaconu/geshi-bundle" : "dev-master", "theodordiaconu/geshi-bundle" : "dev-master",
"braincrafted/bootstrap-bundle": "dev-master",
"twbs/bootstrap": "3.3.*@dev",
"components/jquery": "dev-master",
"doctrine/doctrine-migrations-bundle": "^1.0" "doctrine/doctrine-migrations-bundle": "^1.0"
}, },
"require-dev": { "require-dev": {
"sensio/generator-bundle": "~2.3" "sensio/generator-bundle": "~2.3",
"phpunit/phpunit": "^5.7"
}, },
"scripts": { "scripts": {
"post-root-package-install": [ "post-root-package-install": [

1474
composer.lock generated
View file

File diff suppressed because it is too large Load diff

1
src/Skobkin/Bundle/CopyPasteBundle/Form/CopypasteType.php
View file

@ -70,7 +70,6 @@ class CopypasteType extends AbstractType
'mapped' => false, 'mapped' => false,
'required' => true, 'required' => true,
]) ])
->add('actions', 'form_actions')
; ;
} }

1
src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Form/fields.html.twig
View file

@ -9,7 +9,6 @@
input.setAttribute('name', '{{ form.vars.full_name }}'); input.setAttribute('name', '{{ form.vars.full_name }}');
input.setAttribute('value', 'dumb_text'); input.setAttribute('value', 'dumb_text');
div.appendChild(input); div.appendChild(input);
console.log(div);
})(); })();
</script> </script>
{% endspaceless %} {% endspaceless %}