From b5924b9b9b19730a8b67998d1369dea607b1ed55 Mon Sep 17 00:00:00 2001
From: vcherednichenko86 <vcherednichenko86@gmail.com>
Date: Fri, 8 Jul 2016 10:24:16 +0300
Subject: [PATCH 1/2] Add speech info box, #19, Add sponsor info box, #20

---
 .../Entity/Repository/EventRepository.php     |  8 +++-
 .../views/Component/_schedule.html.twig       |  5 ++-
 .../views/Component/_sponsors.html.twig       |  5 ++-
 .../views/Event/_speech-modal.html.twig       | 37 ++++++++++++++++++
 .../views/Event/_sponsor-modal.html.twig      | 39 +++++++++++++++++++
 5 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 src/Event/EventBundle/Resources/views/Event/_speech-modal.html.twig
 create mode 100644 src/Event/EventBundle/Resources/views/Event/_sponsor-modal.html.twig

diff --git a/src/Event/EventBundle/Entity/Repository/EventRepository.php b/src/Event/EventBundle/Entity/Repository/EventRepository.php
index 89de591..a65b93e 100644
--- a/src/Event/EventBundle/Entity/Repository/EventRepository.php
+++ b/src/Event/EventBundle/Entity/Repository/EventRepository.php
@@ -24,7 +24,13 @@ public function getProgram($host)
         $qb = $this->createQueryBuilder('e');
 
         return $qb
-            ->select('p.startDate, p.link, p.endDate, p.title, s.language as speech_language, s.title as speech_title, sp.homepage as speaker_homepage, sp.firstName as speaker_firsName, sp.lastName as speaker_lastName, sp.id as speaker_id, ' . $qb->expr()->concat($qb->expr()->concat('sp.firstName', $qb->expr()->literal(' ')), 'sp.lastName') . ' as speaker_fullName')
+            ->select(
+                'p.startDate, p.link, p.endDate, p.title,
+                s.id as speech_id, s.language as speech_language, s.title as speech_title, s.description as speech_description,
+                sp.firstName as speaker_firsName, sp.lastName as speaker_lastName, sp.id as speaker_id, sp.photo as speaker_photo,
+                sp.company as speaker_company, sp.position as speaker_position, sp.homepage as speaker_homepage,
+                '.$qb->expr()->concat($qb->expr()->concat('sp.firstName', $qb->expr()->literal(' ')), 'sp.lastName').' as speaker_fullName'
+            )
             ->leftJoin('e.program', 'p')
             ->leftJoin('p.speech', 's')
             ->leftJoin('s.speaker', 'sp')
diff --git a/src/Event/EventBundle/Resources/views/Component/_schedule.html.twig b/src/Event/EventBundle/Resources/views/Component/_schedule.html.twig
index 7c1d3ce..a1fdbac 100644
--- a/src/Event/EventBundle/Resources/views/Component/_schedule.html.twig
+++ b/src/Event/EventBundle/Resources/views/Component/_schedule.html.twig
@@ -23,11 +23,14 @@
                     {% endif %}
                 {% else %}
                     <small>{{ entry.speech_language|default('en'|trans) }}:&nbsp;</small>
-                    {{ entry.speech_title }}
+                    <a href="#speech-{{ entry.speech_id }}" role="button" data-toggle="modal">
+                        {{ entry.speech_title }}
+                    </a>
                     <br />
                     <span class="speech-speaker">
                         <a href="#{{ entry.speaker_firsName }}-{{ entry.speaker_lastName }}-{{ entry.speaker_id }}" role="button" data-toggle="modal">{{ entry.speaker_fullName }}</a></span>
                 {% endif %}
+                {% include 'EventEventBundle:Event:_speech-modal.html.twig' %}
             </td>
         </tr>
         {% set date = entry.startDate|date('d') %}
diff --git a/src/Event/EventBundle/Resources/views/Component/_sponsors.html.twig b/src/Event/EventBundle/Resources/views/Component/_sponsors.html.twig
index 35533f4..4987622 100644
--- a/src/Event/EventBundle/Resources/views/Component/_sponsors.html.twig
+++ b/src/Event/EventBundle/Resources/views/Component/_sponsors.html.twig
@@ -2,13 +2,14 @@
     <div class="row">
         {% for sponsor in sponsors %}
             <div class="col-lg-2 ta-center">
-                <a href="{{ sponsor.homepage }}">
+                <a href="#company-{{ sponsor.id }}" role="button" data-toggle="modal">
                     <span id="face-wrapper">
                         <img class="img-circle face" data-src="holder.js/140x140/text:{{ sponsor.company }}" src="{{ sponsor.logo ?: '' }}" height="140" width="140" />
                     </span>
                 </a>
-                <h2><a href="{{ sponsor.homepage }}">{{ sponsor.company }}</a></h2>
+                <h2><a href="##company-{{ sponsor.id }}" role="button" data-toggle="modal">{{ sponsor.company }}</a></h2>
             </div>
+            {% include 'EventEventBundle:Event:_sponsor-modal.html.twig' %}
         {% endfor %}
     </div>
 {% endmacro %}
diff --git a/src/Event/EventBundle/Resources/views/Event/_speech-modal.html.twig b/src/Event/EventBundle/Resources/views/Event/_speech-modal.html.twig
new file mode 100644
index 0000000..b6edb0a
--- /dev/null
+++ b/src/Event/EventBundle/Resources/views/Event/_speech-modal.html.twig
@@ -0,0 +1,37 @@
+<div class="modal fade" id="speech-{{ entry.speech_id }}">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">{{ entry.speech_title }}&nbsp;<small>({{ entry.speech_language|default('en'|trans) }})</small></h4>
+            </div>
+            <div class="modal-body" id="speaker-info">
+                <div class="row">
+                    <div class="col-sm-12">
+                        <h4>Description</h4>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-12">
+                        <p>{{ entry.speech_description ? entry.speech_description : entry.speech_title }}</p>
+                    </div>
+                </div>
+                <hr>
+                <div class="row">
+                    <div class="col-sm-12">
+                        <h4>Speaker</h4>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-3 text-left">
+                        <img class="img-circle" data-src="holder.js/160x160/text:{{ entry.speaker_fullName }}" src="{{ entry.speaker_photo ?: '' }}" width="100" />
+                    </div>
+                    <div class="col-sm-9 text-left">
+                        <a href="{{ entry.speaker_homepage }}">{{ entry.speaker_fullName }}</a>
+                        <p><small>{{ entry.speaker_company }}&nbsp;({{ entry.speaker_position }})</small></p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/Event/EventBundle/Resources/views/Event/_sponsor-modal.html.twig b/src/Event/EventBundle/Resources/views/Event/_sponsor-modal.html.twig
new file mode 100644
index 0000000..dddb32c
--- /dev/null
+++ b/src/Event/EventBundle/Resources/views/Event/_sponsor-modal.html.twig
@@ -0,0 +1,39 @@
+<div class="modal fade" id="company-{{ sponsor.id }}">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">
+                    {{ sponsor.company }}
+                </h4>
+                {% if sponsor.homepage %}
+                    <small><a href="{{ sponsor.homepage }}">{{ sponsor.homepage }}</a></small>
+                {% endif %}
+            </div>
+            <div class="modal-body" id="speaker-info">
+                <div class="row">
+                    <div class="col-sm-12 ta-center">
+                        <a href="{{ sponsor.homepage }}">
+                            <span id="face-wrapper">
+                                <img class="img-circle face" data-src="holder.js/160x160/text:{{ sponsor.company }}" src="{{ sponsor.logo ?: '' }}" height="160" width="160" />
+                            </span>
+                        </a>
+                    </div>
+                </div>
+                {% if sponsor.description %}
+                    <hr>
+                    <div class="row">
+                        <div class="col-sm-12">
+                            <h4>Description</h4>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-12">
+                            <p>{{ sponsor.description|nl2br|raw }}</p>
+                        </div>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</div>

From 8dda1df904f96bf0700e5ba86a731ac361162b5d Mon Sep 17 00:00:00 2001
From: vcherednichenko86 <vcherednichenko86@gmail.com>
Date: Fri, 8 Jul 2016 10:48:43 +0300
Subject: [PATCH 2/2] Remove extra sharp, #20

---
 .../EventBundle/Resources/views/Component/_sponsors.html.twig   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Event/EventBundle/Resources/views/Component/_sponsors.html.twig b/src/Event/EventBundle/Resources/views/Component/_sponsors.html.twig
index 4987622..9f5727d 100644
--- a/src/Event/EventBundle/Resources/views/Component/_sponsors.html.twig
+++ b/src/Event/EventBundle/Resources/views/Component/_sponsors.html.twig
@@ -7,7 +7,7 @@
                         <img class="img-circle face" data-src="holder.js/140x140/text:{{ sponsor.company }}" src="{{ sponsor.logo ?: '' }}" height="140" width="140" />
                     </span>
                 </a>
-                <h2><a href="##company-{{ sponsor.id }}" role="button" data-toggle="modal">{{ sponsor.company }}</a></h2>
+                <h2><a href="#company-{{ sponsor.id }}" role="button" data-toggle="modal">{{ sponsor.company }}</a></h2>
             </div>
             {% include 'EventEventBundle:Event:_sponsor-modal.html.twig' %}
         {% endfor %}