From 74fb948c343949a1b19b099ac2d44a009d4f9cea Mon Sep 17 00:00:00 2001 From: vcherednichenko86 Date: Wed, 6 Jul 2016 15:29:54 +0300 Subject: [PATCH 1/4] Add speaker info box, #18 --- .../Controller/EventController.php | 1 + .../views/Component/_speakers.html.twig | 65 ++++++++++++++++++- .../Resources/views/layout.html.twig | 8 +++ 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/Event/EventBundle/Controller/EventController.php b/src/Event/EventBundle/Controller/EventController.php index da77d7e..ccdb778 100644 --- a/src/Event/EventBundle/Controller/EventController.php +++ b/src/Event/EventBundle/Controller/EventController.php @@ -27,6 +27,7 @@ public function speakersAction() $form = $this->callForPaper(); return $this->render('EventEventBundle:Component:_speakers.html.twig', [ + 'currentEvent' => $this->getEvent(), 'speakers' => $this->getEvent()->getSpeakers(), 'form' => $form->createView(), ]); diff --git a/src/Event/EventBundle/Resources/views/Component/_speakers.html.twig b/src/Event/EventBundle/Resources/views/Component/_speakers.html.twig index 18cc2cd..4917e57 100644 --- a/src/Event/EventBundle/Resources/views/Component/_speakers.html.twig +++ b/src/Event/EventBundle/Resources/views/Component/_speakers.html.twig @@ -6,10 +6,71 @@
{% for speaker in speakers %}
- + -

{{ speaker.fullName }}

+

{{ speaker.fullName }}

+
+ {% endfor %}
diff --git a/src/Event/EventBundle/Resources/views/layout.html.twig b/src/Event/EventBundle/Resources/views/layout.html.twig index 169e392..46e57b9 100644 --- a/src/Event/EventBundle/Resources/views/layout.html.twig +++ b/src/Event/EventBundle/Resources/views/layout.html.twig @@ -75,6 +75,14 @@ $('#callForPaper').modal('show'); }); + $('.speaker-modal').on('click', function(e) { + e.preventDefault(); + var $that = $(this), + speakerId = $that.attr('data-id'); + + $('#speaker-modal-' + speakerId).modal('show'); + }); + $('.send-request').on('click', function(e) { $(this).html("{{ 'Sending'|trans }}" + "...").prop('disabled', 'disabled'); From 2b2eb8959239d2999f826cc4df21b4fdd5ca6d78 Mon Sep 17 00:00:00 2001 From: vcherednichenko86 Date: Wed, 6 Jul 2016 15:36:56 +0300 Subject: [PATCH 2/4] Updates, #18 --- .../EventBundle/Resources/views/layout.html.twig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Event/EventBundle/Resources/views/layout.html.twig b/src/Event/EventBundle/Resources/views/layout.html.twig index 46e57b9..5c8bfa0 100644 --- a/src/Event/EventBundle/Resources/views/layout.html.twig +++ b/src/Event/EventBundle/Resources/views/layout.html.twig @@ -75,13 +75,13 @@ $('#callForPaper').modal('show'); }); - $('.speaker-modal').on('click', function(e) { - e.preventDefault(); - var $that = $(this), - speakerId = $that.attr('data-id'); - - $('#speaker-modal-' + speakerId).modal('show'); - }); +// $('.speaker-modal').on('click', function(e) { +// e.preventDefault(); +// var $that = $(this), +// speakerId = $that.attr('data-id'); +// +// $('#speaker-modal-' + speakerId).modal('show'); +// }); $('.send-request').on('click', function(e) { $(this).html("{{ 'Sending'|trans }}" + "...").prop('disabled', 'disabled'); From 8a913855d9019bfb4ca540c4e64ef748696447b7 Mon Sep 17 00:00:00 2001 From: vcherednichenko86 Date: Wed, 6 Jul 2016 16:23:56 +0300 Subject: [PATCH 3/4] Remove commented code, #18 --- src/Event/EventBundle/Resources/views/layout.html.twig | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Event/EventBundle/Resources/views/layout.html.twig b/src/Event/EventBundle/Resources/views/layout.html.twig index 5c8bfa0..169e392 100644 --- a/src/Event/EventBundle/Resources/views/layout.html.twig +++ b/src/Event/EventBundle/Resources/views/layout.html.twig @@ -75,14 +75,6 @@ $('#callForPaper').modal('show'); }); -// $('.speaker-modal').on('click', function(e) { -// e.preventDefault(); -// var $that = $(this), -// speakerId = $that.attr('data-id'); -// -// $('#speaker-modal-' + speakerId).modal('show'); -// }); - $('.send-request').on('click', function(e) { $(this).html("{{ 'Sending'|trans }}" + "...").prop('disabled', 'disabled'); From 0f4f4c829cece553d55d1e84d6c9966c5b8b5b05 Mon Sep 17 00:00:00 2001 From: vcherednichenko86 Date: Wed, 6 Jul 2016 16:45:54 +0300 Subject: [PATCH 4/4] Fix by comments, #18 --- .../views/Component/_speakers.html.twig | 62 +------------------ .../views/Event/_speaker-modal.html.twig | 61 ++++++++++++++++++ 2 files changed, 62 insertions(+), 61 deletions(-) create mode 100644 src/Event/EventBundle/Resources/views/Event/_speaker-modal.html.twig diff --git a/src/Event/EventBundle/Resources/views/Component/_speakers.html.twig b/src/Event/EventBundle/Resources/views/Component/_speakers.html.twig index 4917e57..ae20f7e 100644 --- a/src/Event/EventBundle/Resources/views/Component/_speakers.html.twig +++ b/src/Event/EventBundle/Resources/views/Component/_speakers.html.twig @@ -11,67 +11,7 @@

{{ speaker.fullName }}

- + {% include 'EventEventBundle:Event:_speaker-modal.html.twig' %} {% endfor %} {% endif %} diff --git a/src/Event/EventBundle/Resources/views/Event/_speaker-modal.html.twig b/src/Event/EventBundle/Resources/views/Event/_speaker-modal.html.twig new file mode 100644 index 0000000..2c38c05 --- /dev/null +++ b/src/Event/EventBundle/Resources/views/Event/_speaker-modal.html.twig @@ -0,0 +1,61 @@ +