The SSH host key has changed on 8 April, 2022 to this one: SHA256:573uTBSeh74kvOo0HJXi5ijdzRm8me27suzNEDlGyrQ

Merge branch 'master' of github.com:w00d5t0ck/kekrozsak

master
Polonkai Gergely 10 years ago
commit e0f5d7ee75
  1. 1
      app/AppKernel.php
  2. 14
      app/Resources/TwigBundle/views/Exception/error404.html.twig
  3. 8
      app/config/config.yml
  4. 3
      app/config/routing.yml
  5. 1
      composer.json
  6. BIN
      src/KekRozsak/FrontBundle/Resources/public/images/penta-blue-24.png
  7. BIN
      src/KekRozsak/FrontBundle/Resources/public/images/penta-yellow-24.png
  8. 6
      src/KekRozsak/FrontBundle/Resources/public/js/forum.js
  9. 2
      src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig
  10. 4
      src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig
  11. 4
      src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig
  12. 4
      src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig

@ -24,6 +24,7 @@ class AppKernel extends Kernel
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
new Io\TcpdfBundle\IoTcpdfBundle(),
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
new Jmikola\JsAssetsHelperBundle\JmikolaJsAssetsHelperBundle(),
// Own bundles
new KekRozsak\FrontBundle\KekRozsakFrontBundle(),
new KekRozsak\SecurityBundle\KekRozsakSecurityBundle(),

@ -0,0 +1,14 @@
{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %}
{% block content %}
<h3>A keresett oldal nem létezik</h3>
<p>
{% spaceless %}
A keresett oldal nem létezik. Válassz valamit a menüből
{% if app.user %}
vagy kattints a bal felső sarokban a nevedre a további lehetőségekért
{% endif %}
!
{% endspaceless %}
</p>
{% endblock content %}

@ -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% }
@ -17,7 +20,10 @@ framework:
form: true
csrf_protection: true
validation: { enable_annotations: true }
templating: { engines: ['twig'] } #assets_version: SomeVersionScheme
templating:
engines: ['twig']
packages:
KekRozsakFrontBundle: ~
default_locale: %locale%
trust_proxy_headers: false # Should Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP)
session: ~

@ -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

@ -27,6 +27,7 @@
"doctrine/doctrine-migrations-bundle": "dev-master",
"egeloen/ckeditor-bundle": "dev-master",
"friendsofsymfony/jsrouting-bundle": "dev-master",
"jmikola/js-assets-helper-bundle": "dev-master",
"gergelypolonkai/tcpdfbundle": "dev-master"
},
"scripts": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

@ -24,7 +24,8 @@ function favouriteOn()
type: 'GET',
url: url
}).done(function() {
elem.html('[Kedvenc ikon]');
elem.find('img').attr('alt', '[Kedvenc]');
elem.find('img').attr('src', AssetsHelper.getURL('bundles/kekrozsakfront/images/penta-yellow-24.png'));
elem.removeClass('favourite-topic-button');
elem.addClass('unfavourite-topic-button');
elem.attr('id', 'unfavourite-topic-button-' + topicSlug);
@ -58,7 +59,8 @@ function favouriteOff()
type: 'GET',
url: url
}).done(function() {
elem.html('[Nem kedvenc ikon]');
elem.find('img').attr('alt', '[Nem kedvenc]');
elem.find('img').attr('src', AssetsHelper.getUrl('/bundles/kekrozsakfront/images/penta-blue-24.png'));
elem.removeClass('unfavourite-topic-button');
elem.addClass('favourite-topic-button');
elem.attr('id', 'favourite-topic-button-' + topicSlug);

@ -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/asset_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 %}

@ -5,9 +5,9 @@
{% block content %}
<h3>
{% if app.user.userData and app.user.userData.isFavouriteForumTopic(topic) %}
<span class="gomb unfavourite-topic-button topicgroup-{{ topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}">[Kedvenc ikon]</span>
<span class="unfavourite-topic-button topicgroup-{{ topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-yellow-24.png') }}" alt="[Kedvenc]" /></span>
{% else %}
<span class="gomb favourite-topic-button topicgroup-{{ topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}">[Nem kedvenc ikon]</span>
<span class="favourite-topic-button topicgroup-{{ topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-blue-24.png') }}" alt="[Nem kedvenc]" /></span>
{% endif %}
<a href="{{ path('KekRozsakFrontBundle_forumTopicGroupList') }}">Fórum</a> -
<a href="{{ path('KekRozsakFrontBundle_forumTopicList', {slug: topicGroup.slug}) }}">{{ topicGroup.title }}</a> -

@ -39,9 +39,9 @@
<td>
[ikon]
{% if app.user.userData and app.user.userData.isFavouriteForumTopic(topic) %}
<span class="gomb unfavourite-topic-button topicgroup-{{ topic.topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}">[Kedvenc ikon]</span>
<span class="unfavourite-topic-button topicgroup-{{ topic.topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-yellow-24.png') }}" alt="[Kedvenc]" /></span>
{% else %}
<span class="gomb favourite-topic-button topicgroup-{{ topic.topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}">[Nem kedvenc ikon]</span>
<span class="favourite-topic-button topicgroup-{{ topic.topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-blue-24.png') }}" alt="[Nem kedvenc]" /></span>
{% endif %}
</td>
<td><a href="{{ path('KekRozsakFrontBundle_forumPostList', {topicGroupSlug: topicGroup.slug, topicSlug: topic.slug}) }}">{{ topic.title }}</a></td>

@ -29,9 +29,9 @@
<td>
[ikon]
{% if app.user.userData and app.user.userData.isFavouriteForumTopic(topic) %}
<span class="gomb unfavourite-topic-button topicgroup-{{ topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}">[Kedvenc ikon]</span>
<span class="unfavourite-topic-button topicgroup-{{ topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-yellow-24.png') }}" alt="[Kedvenc]" /></span>
{% else %}
<span class="gomb favourite-topic-button topicgroup-{{ topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}">[Nem kedvenc ikon]</span>
<span class="favourite-topic-button topicgroup-{{ topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-blue-24.png') }}" alt="[Nem kedvenc]" /></span>
{% endif %}
</td>
<td><a href="{{ path('KekRozsakFrontBundle_forumPostList', { topicGroupSlug: topicGroup.slug, topicSlug: topic.slug }) }}">{{ topic.title }}</a></td>

Loading…
Cancel
Save