Merge pull request #68 from pilot/fix-master-bugs

possibility to delete speech
pilot · Sep 12, 2017 · fbfbef5 · fbfbef5
2 parents 20d77f4 + 96e6e04
commit fbfbef5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/Event/EventBundle/Resources/public/css/allstyle.css b/src/Event/EventBundle/Resources/public/css/allstyle.css
@@ -1289,12 +1289,13 @@ footer .footer_text {
 
 .wrap_modal {
     position: fixed;
-    top: 0;
+    top: 5%;
     left: 50%;
     right: 0;
     bottom: 0;
     margin-left: -330px;
     width: 100%;
+    height: 80%;
     max-width: 660px;
     z-index: 20;
     background: #fff;

diff --git a/src/Event/EventBundle/Resources/views/Backend/Speech/index.html.twig b/src/Event/EventBundle/Resources/views/Backend/Speech/index.html.twig
@@ -28,6 +28,8 @@
         </thead>
     </table>
 </section>
+    {% include 'EventEventBundle:Backend:_confirm_modal.html.twig'
+        with {'title': 'Confirm action', 'body': 'Do you really want to delete this speech?'} %}
 {% endblock %}
 
 {% block data_tables_js %}

diff --git a/src/Event/EventBundle/Resources/views/layout.html.twig b/src/Event/EventBundle/Resources/views/layout.html.twig
@@ -14,7 +14,7 @@
         <div class="event-place-wrap">
             <h2>Where will it be?</h2>
             <p>
-                <i class="ico_map_pin_min"></i> <strong>{{ event.venue }}, {{ event.country ~ ' ' ~ event.city }}</strong>
+                <i class="ico_map_pin_min"></i> <strong>{{ event.venue }}, {{ event.country ~ ' ' ~ event.city }} /</strong>
                 <i class="ico_group"></i> <strong>{{ event.startDate|date }}</strong>
             </p>
         </div>