diff --git a/app/Resources/views/main_template.html.twig b/app/Resources/views/main_template.html.twig deleted file mode 100644 index 325bf0e..0000000 --- a/app/Resources/views/main_template.html.twig +++ /dev/null @@ -1,197 +0,0 @@ -{# vim: ft=htmljinja -#} - - - - Kék Rózsák{% block title %}{% endblock %} - - - -{% stylesheets 'bundles/kekrozsakfront/css/*' filter='cssrewrite' output='css/kekrozsak.css' %} - -{% endstylesheets %} -{% block additional_css %}{% endblock %} - - - - - - -{% block additional_js %}{% endblock %} - - - -
-
-{% if app.user %} -{% include ':Box:UserProfile.html.twig' %} -{% include ':Box:Events.html.twig' %} - -{% else %} -{% include ':Box:Login.html.twig' %} -{% endif %} -{# - -#} -
-
-
-
- - -
-
-
-{% block content %}{% endblock %} -
-
-
-

Hírek

-{% for news in recentNews %} -
-

{{ news.title }}

-

{{ news.text|raw }}

-{% if app.user %} -

{{ news.createdBy|userdataspan }}

-{% endif %} -

{{ news.createdAt|date('Y-m-d H:i') }}

-
-{% endfor %} -
-
{# div#content-wrapper #} -
{# div#wrapper #} -
-
-
-
-
- -{% block bottomscripts %}{% endblock %} - - - diff --git a/src/KekRozsak/AdminBundle/Resources/views/Default/groupJoinRequests.html.twig b/src/KekRozsak/AdminBundle/Resources/views/Default/groupJoinRequests.html.twig index 0476779..401d606 100644 --- a/src/KekRozsak/AdminBundle/Resources/views/Default/groupJoinRequests.html.twig +++ b/src/KekRozsak/AdminBundle/Resources/views/Default/groupJoinRequests.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Csoport jelentkezők {% endblock %} {% block content %}

Csoport jelentkezők

diff --git a/src/KekRozsak/AdminBundle/Resources/views/Default/manageRegs.html.twig b/src/KekRozsak/AdminBundle/Resources/views/Default/manageRegs.html.twig index 90951e7..c79f0e0 100644 --- a/src/KekRozsak/AdminBundle/Resources/views/Default/manageRegs.html.twig +++ b/src/KekRozsak/AdminBundle/Resources/views/Default/manageRegs.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Jelentkezők{% endblock %} {% block content %}

Jelentkezők

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Article/view.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Article/view.html.twig index d59da78..333d0c5 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Article/view.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Article/view.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title%} - {{ article.title }}{% endblock title %} {% block content %} {{ article.text|raw }} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Book/list.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Book/list.html.twig index da1068d..7874195 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Book/list.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Book/list.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Könyvtár{% endblock %} {% block content %}

Könyvtár

diff --git a/app/Resources/views/Box/Events.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Box/Events.html.twig similarity index 100% rename from app/Resources/views/Box/Events.html.twig rename to src/KekRozsak/FrontBundle/Resources/views/Box/Events.html.twig diff --git a/app/Resources/views/Box/Login.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Box/Login.html.twig similarity index 100% rename from app/Resources/views/Box/Login.html.twig rename to src/KekRozsak/FrontBundle/Resources/views/Box/Login.html.twig diff --git a/app/Resources/views/Box/UserProfile.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Box/UserProfile.html.twig similarity index 100% rename from app/Resources/views/Box/UserProfile.html.twig rename to src/KekRozsak/FrontBundle/Resources/views/Box/UserProfile.html.twig diff --git a/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig new file mode 100644 index 0000000..9d8fd37 --- /dev/null +++ b/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig @@ -0,0 +1,200 @@ +{# vim: ft=htmljinja +#} + + + + Kék Rózsák{% block title %}{% endblock %} + + + +{% stylesheets 'bundles/kekrozsakfront/css/*' filter='cssrewrite' output='css/kekrozsak.css' %} + +{% endstylesheets %} +{% block additional_css %}{% endblock %} + + + + + + +{% block additional_js %}{% endblock %} + + + +
+
+{% if app.user %} +{% include 'KekRozsakFrontBundle:Box:UserProfile.html.twig' %} +{% include 'KekRozsakFrontBundle:Box:Events.html.twig' %} + +{% else %} +{% include 'KekRozsakFrontBundle:Box:Login.html.twig' %} +{% endif %} +{# + +#} +
+
+
+
+ + +
+
+
+{% block content %}{% endblock %} +
+
+
+

Hírek

+{% for news in recentNews %} +
+

{{ news.title }}

+

{{ news.text|raw }}

+{% if app.user %} +

{{ news.createdBy|userdataspan }}

+{% endif %} +

{{ news.createdAt|date('Y-m-d H:i') }}

+
+{% endfor %} +
+
{# div#content-wrapper #} +
{# div#wrapper #} +
+
+
+
+
+ +{% block bottomscripts %}{% endblock %} + + + diff --git a/src/KekRozsak/FrontBundle/Resources/views/Default/userprofile.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Default/userprofile.html.twig index 9054154..24af558 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Default/userprofile.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Default/userprofile.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% form_theme form 'KekRozsakFrontBundle:Form:user_form.html.twig' %} {% block title %} - Profil szerkesztése{% endblock %} {% block content %} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Document/create.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Document/create.html.twig index ff1aebf..ad586c0 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Document/create.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Document/create.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Dokumentum létrehozása{% endblock %} {% block content %}

Új dokumentum létrehozása

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Document/edit.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Document/edit.html.twig index a02bd1f..e8aaa90 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Document/edit.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Document/edit.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Dokumentum szerkesztése - {{ document.title }}{% endblock %} {% block content %}

Dokumentum szerkesztése - {{ document.title }}

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig index 1d3a600..b51d14a 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Dokumentum - {{ document.title }}{% endblock %} {% block content %}

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Event/list.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Event/list.html.twig index c77e5be..2190b0e 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Event/list.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Event/list.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Események - {{ day|date('Y-m-d') }}{% endblock %} {% block content %}

Események - {{ day|date('Y-m-d') }}

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Event/view.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Event/view.html.twig index 268962c..7bd96d1 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Event/view.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Event/view.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Esemény - {{ event.title }}{% endblock %} {% block content %}

Esemény - {{ event.title }}

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig index e9d0073..dce4e3b 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Fórum - {{ topicGroup.title }} - {{ topic.title }}{% endblock %} {% block content %}

Fórum - {{ topicGroup.title }} - {{ topic.title }}

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig index dc0ec2f..8fd0bc2 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Fórum{% endblock %} {% block content %}

Fórum

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig index 96c4b33..e658969 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Fórum - {{ topicGroup.title }}{% endblock %} {% block content %}

Fórum - {{ topicGroup.title }}

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/create.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/create.html.twig index 66c7246..df6ef18 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/create.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/create.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Csoport létrehozása{% endblock %} {% block content %}

Csoport létrehozása

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/documents.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/documents.html.twig index d3552a8..ede8d36 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/documents.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/documents.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - {{ group.name }}{% endblock %} {% block additional_css %} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/join.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/join.html.twig index c73618a..12fb5df 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/join.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/join.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Csoportok{% endblock title %} {% block content %}

Jelentkezés

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig index 7db4cfa..48c8af2 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Csoportok{% endblock %} {% block content %}

Csoportok

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/members.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/members.html.twig index 308e476..77d2520 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/members.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/members.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - {{ group.name }}{% endblock %} {% block additional_css %} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/view.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/view.html.twig index 3165613..f68ac5e 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/view.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/view.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - {{ group.name }}{% endblock %} {% block additional_css %} diff --git a/src/KekRozsak/SecurityBundle/Resources/views/Default/login.html.twig b/src/KekRozsak/SecurityBundle/Resources/views/Default/login.html.twig index ff8a126..986bb65 100644 --- a/src/KekRozsak/SecurityBundle/Resources/views/Default/login.html.twig +++ b/src/KekRozsak/SecurityBundle/Resources/views/Default/login.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %}- Bejelentkezés{% endblock %} {% block content %} {% if error %} diff --git a/src/KekRozsak/SecurityBundle/Resources/views/Default/regSuccess.html.twig b/src/KekRozsak/SecurityBundle/Resources/views/Default/regSuccess.html.twig index 797d4b6..dba36a0 100644 --- a/src/KekRozsak/SecurityBundle/Resources/views/Default/regSuccess.html.twig +++ b/src/KekRozsak/SecurityBundle/Resources/views/Default/regSuccess.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% block title %} - Sikeres regisztráció{% endblock %} {% block content %} A regisztrációd sikeres volt. A Vének hamarosan kapcsolatba lépnek Veled, és elbírálják jelentkezésedet. Kérünk, addig légy türelemmel! diff --git a/src/KekRozsak/SecurityBundle/Resources/views/Default/registration.html.twig b/src/KekRozsak/SecurityBundle/Resources/views/Default/registration.html.twig index 50236b3..6b151a6 100644 --- a/src/KekRozsak/SecurityBundle/Resources/views/Default/registration.html.twig +++ b/src/KekRozsak/SecurityBundle/Resources/views/Default/registration.html.twig @@ -1,6 +1,6 @@ {# vim: ft=htmljinja: #} -{% extends '::main_template.html.twig' %} +{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %} {% form_theme form 'KekRozsakFrontBundle:Form:user_form.html.twig' %} {% block title %} - Regisztráció {% endblock %} {% block content %}