The SSH host key has changed on 8 April, 2022 to this one: SHA256:573uTBSeh74kvOo0HJXi5ijdzRm8me27suzNEDlGyrQ
gergely
/
kekrozsak
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Undone parts of cfc8622a5f - JsAssetsHelperBundle is updated upstream

Browse Source
master
Gergely Polonkai 10 years ago
parent cfc8622a5f
commit fdee8d5bf1
6 changed files with 81 additions and 113 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/AppKernel.php
  2. 3
      app/config/config.yml
  3. 3
      app/config/routing.yml
  4. 2
      composer.json
  5. 182
      composer.lock
  6. 2
      src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig

2
app/AppKernel.php
Unescape View File

@ -24,7 +24,7 @@ class AppKernel extends Kernel
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
new Knp\Bundle\SnappyBundle\KnpSnappyBundle(),
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
new JMS\TwigJsBundle\JMSTwigJsBundle(),
new Jmikola\JsAssetsHelperBundle\JmikolaJsAssetsHelperBundle(),
// Own bundles
new KekRozsak\FrontBundle\KekRozsakFrontBundle(),
new KekRozsak\SecurityBundle\KekRozsakSecurityBundle(),

3
app/config/config.yml
Unescape View File

@ -8,6 +8,9 @@ jms_di_extra:
bundles: [ KekRozsakFrontBundle, KekRozsakSecurityBundle ]
directories: [ "%kernel.root_dir%/../src" ]
jmikola_js_assets_helper:
packages_to_expose: [ KekRozsakFrontBundle ]
framework:
#esi: ~
#translator: { fallback: %locale% }

3
app/config/routing.yml
Unescape View File

@ -1,6 +1,9 @@
fos_js_routing:
resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
jmikola_js_assets_helper_routing:
resource: "@JmikolaJsAssetsHelperBundle/Resources/config/routing/routing.xml"
KekRozsakAdminBundle:
resource: "@KekRozsakAdminBundle/Controller/"
type: annotation

2
composer.json
Unescape View File

@ -15,7 +15,7 @@
"doctrine/doctrine-migrations-bundle": "dev-master",
"egeloen/ckeditor-bundle": "dev-master",
"friendsofsymfony/jsrouting-bundle": "1.1.*",
"jms/twig-js-bundle": "dev-master",
"jmikola/js-assets-helper-bundle": "dev-master",
"knplabs/knp-snappy-bundle": "dev-master"
},
"minimum-stability": "dev",

182
composer.lock generated
Unescape View File

@ -1,5 +1,5 @@
{
"hash": "510fddcafac964ac2285ff6c6af8a12d",
"hash": "3afc9bf2783182e2c00a2d9d03fee4f3",
"packages": [
{
"name": "doctrine/annotations",
@ -270,12 +270,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "65806f5998f3ac23b8b2f5c58acb1cd9881e8fd4"
"reference": "042cfa61d57bc4686f68a3021cd4a926f8348050"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/65806f5998f3ac23b8b2f5c58acb1cd9881e8fd4",
"reference": "65806f5998f3ac23b8b2f5c58acb1cd9881e8fd4",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/042cfa61d57bc4686f68a3021cd4a926f8348050",
"reference": "042cfa61d57bc4686f68a3021cd4a926f8348050",
"shasum": ""
},
"require": {
@ -289,7 +289,7 @@
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
},
"time": "2013-02-21 07:37:15",
"time": "2013-02-27 12:20:01",
"type": "library",
"extra": {
"branch-alias": {
@ -312,7 +312,7 @@
"homepage": "http://www.jwage.com/"
},
{
"name": "Christoph Dorn",
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": "http://www.instaclick.com"
},
@ -633,12 +633,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
"reference": "d5dd7d6f8a571e3a27a9bc52f9e532b97dc4d181"
"reference": "e5779a0756306c7ae34536b9adaf964c00465bb6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/d5dd7d6f8a571e3a27a9bc52f9e532b97dc4d181",
"reference": "d5dd7d6f8a571e3a27a9bc52f9e532b97dc4d181",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e5779a0756306c7ae34536b9adaf964c00465bb6",
"reference": "e5779a0756306c7ae34536b9adaf964c00465bb6",
"shasum": ""
},
"require": {
@ -650,7 +650,7 @@
"suggest": {
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
},
"time": "2013-02-26 05:59:04",
"time": "2013-02-27 11:47:02",
"bin": [
"bin/doctrine",
"bin/doctrine.php"
@ -844,6 +844,58 @@
"sql"
]
},
{
"name": "jmikola/js-assets-helper-bundle",
"version": "dev-master",
"target-dir": "Jmikola/JsAssetsHelperBundle",
"source": {
"type": "git",
"url": "https://github.com/jmikola/JmikolaJsAssetsHelperBundle.git",
"reference": "bd610e1973edffc9f41c5b3a09b0ad1c18d8a3f4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jmikola/JmikolaJsAssetsHelperBundle/zipball/bd610e1973edffc9f41c5b3a09b0ad1c18d8a3f4",
"reference": "bd610e1973edffc9f41c5b3a09b0ad1c18d8a3f4",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"symfony/dependency-injection": ">=2.0.5,<2.3-dev",
"symfony/framework-bundle": ">=2.0-dev,<2.3-dev",
"symfony/twig-bundle": ">=2.0-dev,<2.3-dev"
},
"time": "2013-02-26 21:17:29",
"type": "symfony-bundle",
"autoload": {
"psr-0": {
"Jmikola\\JsAssetsHelperBundle": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Christophe Coevoet",
"email": "stof@notk.org"
},
{
"name": "Jeremy Mikola",
"email": "jmikola@gmail.com",
"homepage": "http://jmikola.net"
}
],
"description": "Exposes the AssetsHelper service from Symfony2's templating component to JavaScript, allowing relative or absolute asset URI's to be generated client-side.",
"homepage": "https://github.com/jmikola/JmikolaJsAssetsHelperBundle",
"keywords": [
"AssetsHelper",
"JS",
"assets",
"javascript"
]
},
{
"name": "jms/aop-bundle",
"version": "dev-master",
@ -1164,98 +1216,6 @@
"security"
]
},
{
"name": "jms/twig-js",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/twig.js.git",
"reference": "0586824e00074a677477df4fa2b2147254a30395"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/twig.js/zipball/0586824e00074a677477df4fa2b2147254a30395",
"reference": "0586824e00074a677477df4fa2b2147254a30395",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"twig/twig": ">=1.8,<2.0-dev"
},
"time": "2013-01-18 11:00:09",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-0": {
"TwigJs": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache2"
],
"authors": [
{
"name": "Johannes M. Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
"description": "twig.js, flexible, secure, and high-performance templating engine for Javascript",
"keywords": [
"templating"
]
},
{
"name": "jms/twig-js-bundle",
"version": "dev-master",
"target-dir": "JMS/TwigJsBundle",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/JMSTwigJsBundle.git",
"reference": "7c0abe67b56ff4c91fb231d3848d61cfece95929"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/JMSTwigJsBundle/zipball/7c0abe67b56ff4c91fb231d3848d61cfece95929",
"reference": "7c0abe67b56ff4c91fb231d3848d61cfece95929",
"shasum": ""
},
"require": {
"jms/twig-js": "dev-master",
"php": ">=5.3.2",
"symfony/framework-bundle": "2.*,<2.3"
},
"time": "2012-11-19 13:05:40",
"type": "symfony-bundle",
"autoload": {
"psr-0": {
"JMS\\TwigJsBundle": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache2"
],
"authors": [
{
"name": "Johannes M. Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
"description": "Integrates twig.js into your Symfony2 application",
"homepage": "http://jmsyst.com/bundles/JMSTwigJsBundle",
"keywords": [
"templating"
]
},
{
"name": "knplabs/knp-snappy",
"version": "dev-master",
@ -1840,12 +1800,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony-standard.git",
"reference": "3054a8fc0ebeca49f371a776f60d80b72a2ac2d0"
"reference": "113df2586f5df50e1f33e7f6c0485547f3be13ad"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/symfony-standard/zipball/3054a8fc0ebeca49f371a776f60d80b72a2ac2d0",
"reference": "3054a8fc0ebeca49f371a776f60d80b72a2ac2d0",
"url": "https://api.github.com/repos/symfony/symfony-standard/zipball/113df2586f5df50e1f33e7f6c0485547f3be13ad",
"reference": "113df2586f5df50e1f33e7f6c0485547f3be13ad",
"shasum": ""
},
"require": {
@ -1863,7 +1823,7 @@
"symfony/symfony": "2.2.*",
"twig/extensions": "1.0.*"
},
"time": "2013-02-25 17:21:00",
"time": "2013-02-26 21:02:15",
"type": "library",
"extra": {
"symfony-app-dir": "app",
@ -1999,12 +1959,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
"reference": "287dbbe99d9256cb91fc614629360eefc61dddb4"
"reference": "9c46043e21ba28e323eb1b9acf7781badf96c6a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/symfony/zipball/287dbbe99d9256cb91fc614629360eefc61dddb4",
"reference": "287dbbe99d9256cb91fc614629360eefc61dddb4",
"url": "https://api.github.com/repos/symfony/symfony/zipball/9c46043e21ba28e323eb1b9acf7781badf96c6a8",
"reference": "9c46043e21ba28e323eb1b9acf7781badf96c6a8",
"shasum": ""
},
"require": {
@ -2056,7 +2016,7 @@
"monolog/monolog": ">=1.3,<2.0",
"propel/propel1": "1.6.*"
},
"time": "2013-02-26 09:42:13",
"time": "2013-02-26 16:36:32",
"type": "library",
"extra": {
"branch-alias": {
@ -2197,7 +2157,7 @@
"stability-flags": {
"doctrine/doctrine-migrations-bundle": 20,
"egeloen/ckeditor-bundle": 20,
"jms/twig-js-bundle": 20,
"jmikola/js-assets-helper-bundle": 20,
"knplabs/knp-snappy-bundle": 20
}
}

2
src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig
Unescape View File

@ -17,6 +17,8 @@
<script type="text/javascript" src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
<script type="text/javascript" src="{{ path('fos_js_routing_js', {callback: 'fos.Router.setData'}) }}"></script>
<script type="text/javascript" src="{{ asset('js/jquery-form/jquery.form.js') }}"></script>
<script type="text/javascript" src="{{ asset('bundles/jmikolajsassetshelper/js/assets_helper.js') }}"></script>
<script type="text/javascript" src="{{ path('jmikola_js_assets_helper_js') }}"></script>
{% javascripts 'bundles/kekrozsakfront/js/*' output='js/kekrozsak.js' %}
<script type="text/javascript" src="{{ asset_url }}"></script>
{% endjavascripts %}

Write Preview
Loading…
Cancel
Save