diff --git a/app/Resources/views/Box/Events.html.twig b/app/Resources/views/Box/Events.html.twig index 80b3adc..b611451 100644 --- a/app/Resources/views/Box/Events.html.twig +++ b/app/Resources/views/Box/Events.html.twig @@ -37,21 +37,8 @@ (event.startDate = this day AND event.endDate is NULL) OR (event.startDate <= this day AND evend.endDate >= this day) #} - 0 %} class="program"{% endif %}> - {{ eventList[i].date|date('d') }} -{% if eventList[i].events|length > 0 %} - -{% endif %} + 0 %} class="program" rel="{{ path('KekRozsakFrontBundle_eventAjaxList', {date: eventList[i].date|date('Y-m-d'), _format: 'html'}) }}"{% endif %}> + {{ eventList[i].date|date('d') }} {% if cur is divisibleby(7) %} diff --git a/app/Resources/views/Box/UserProfile.html.twig b/app/Resources/views/Box/UserProfile.html.twig index 148c289..a164d67 100644 --- a/app/Resources/views/Box/UserProfile.html.twig +++ b/app/Resources/views/Box/UserProfile.html.twig @@ -6,7 +6,7 @@
[avatar] {{ app.user.displayName }}
- Jogosultság{% if app.user.roles|length > 1 %}ok{% endif %}
+ Jogosultság{% if app.user.roles|length > 1 %}ok{% endif %}
Csoportjaim
{% for group in app.user.groups %} diff --git a/app/Resources/views/main_template.html.twig b/app/Resources/views/main_template.html.twig index 592635b..5482f8d 100644 --- a/app/Resources/views/main_template.html.twig +++ b/app/Resources/views/main_template.html.twig @@ -6,12 +6,11 @@ Kék Rózsák{% block title %}{% endblock %} - + {% block additional_css %}{% endblock %} - - - + + {% block additional_js %}{% endblock %} @@ -62,7 +61,7 @@

{{ news.title }}

{{ news.text|raw }}

{% if app.user %} -

{{ news.createdBy.displayName }}

+

{{ news.createdBy|userdataspan }}

{% endif %}

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

@@ -87,10 +86,12 @@ $('#profil-box').show(); } }); - $('#jog-lista').tooltip({ - track: true, - delay: 0, - fade: 250 + $('#jog-lista').cluetip({ + splitTitle: '|', + showTitle: false + }); + $('.program').cluetip({ + cluezIndex: 1000 }); $('#esemeny-mutato').click(function() { if ($('#esemeny-box').is(':visible')) @@ -102,6 +103,11 @@ $('#esemeny-box').show(); } }); + $('.userdata').cluetip(); + $('.userdata-secret').cluetip({ + splitTitle: '|', + showTitle: false + }); {% else %} $('#login-mutato').click(function() { if ($('#login-box').is(':visible')) diff --git a/src/KekRozsak/FrontBundle/Controller/EventController.php b/src/KekRozsak/FrontBundle/Controller/EventController.php index af99e15..4bd9af1 100644 --- a/src/KekRozsak/FrontBundle/Controller/EventController.php +++ b/src/KekRozsak/FrontBundle/Controller/EventController.php @@ -59,7 +59,7 @@ class EventController extends Controller /** * @Route("/esemenyek/{date}", name="KekRozsakFrontBundle_eventList") * @Template() - * @ParamConverter("date", class="DateTime", options={"format": "Y-m-d"}) + * @ParamConverter("date", options={"format": "Y-m-d"}) */ public function listAction(\DateTime $date) { @@ -72,4 +72,21 @@ class EventController extends Controller 'events' => $events, ); } + + /** + * @Route("/esemenyek/{date}/ajax-lista.{_format}", name="KekRozsakFrontBundle_eventAjaxList", requirements={=_format": "html"}) + * @Template() + * @ParamConverter("date", options={"format": "Y-m-d"}) + */ + public function ajaxListAction(\DateTime $date) + { + $query = $this->getDoctrine()->getEntityManager()->createQuery('SELECT e FROM KekRozsakFrontBundle:Event e WHERE e.cancelled = FALSE AND ((e.startDate < :day AND e.endDate >= :day) OR e.startDate = :day)'); + $query->setParameter('day', $date, \Doctrine\DBAL\Types\Type::DATE); + $events = $query->getResult(); + + return array( + 'day' => $date, + 'events' => $events, + ); + } } diff --git a/src/KekRozsak/FrontBundle/Resources/views/Event/ajaxList.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Event/ajaxList.html.twig new file mode 100644 index 0000000..d27f8f5 --- /dev/null +++ b/src/KekRozsak/FrontBundle/Resources/views/Event/ajaxList.html.twig @@ -0,0 +1,16 @@ +{# vim: ft=htmljinja +#} + + + Események + + +{% if events|length > 0 %} + +{% endif %} + + diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig index 324f7ff..7db4cfa 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig @@ -20,17 +20,17 @@ {% for group in groups %} [ikon] - {{ group.name }} + {{ group.name }} {% if group.isMember(app.user) %} - [tag ikon] + [tag ikon] {% elseif group.isRequested(app.user) %} - [jelentkeztél ikon] + [jelentkeztél ikon] {% else %} {% if group.isOpen %} - [nyílt ikon] + [nyílt ikon] {% else %} - [zárt ikon] + [zárt ikon] {% endif %} {% endif %} @@ -43,15 +43,13 @@ {% endblock content %} {% block bottomscripts %} {% endblock bottomscripts %} diff --git a/web/css/jquery.tooltip.css b/web/css/jquery.tooltip.css deleted file mode 100644 index 77d0357..0000000 --- a/web/css/jquery.tooltip.css +++ /dev/null @@ -1,9 +0,0 @@ -#tooltip { - position: absolute; - z-index: 3000; - border: 1px solid #111; - background-color: #eee; - padding: 5px; - opacity: 0.85; -} -#tooltip h3, #tooltip div { margin: 0; } diff --git a/web/js/jquery.bgiframe.js b/web/js/jquery.bgiframe.js deleted file mode 100644 index 5d270f3..0000000 --- a/web/js/jquery.bgiframe.js +++ /dev/null @@ -1,104 +0,0 @@ -/* Copyright (c) 2006 Brandon Aaron (http://brandonaaron.net) - * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) - * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. - * - * $LastChangedDate: 2007-06-20 03:23:36 +0200 (Mi, 20 Jun 2007) $ - * $Rev: 2110 $ - * - * Version 2.1 - */ - -(function($){ - -/** - * The bgiframe is chainable and applies the iframe hack to get - * around zIndex issues in IE6. It will only apply itself in IE - * and adds a class to the iframe called 'bgiframe'. The iframe - * is appeneded as the first child of the matched element(s) - * with a tabIndex and zIndex of -1. - * - * By default the plugin will take borders, sized with pixel units, - * into account. If a different unit is used for the border's width, - * then you will need to use the top and left settings as explained below. - * - * NOTICE: This plugin has been reported to cause perfromance problems - * when used on elements that change properties (like width, height and - * opacity) a lot in IE6. Most of these problems have been caused by - * the expressions used to calculate the elements width, height and - * borders. Some have reported it is due to the opacity filter. All - * these settings can be changed if needed as explained below. - * - * @example $('div').bgiframe(); - * @before

Paragraph

- * @result