Multiple future activities shown in the home page.

www/css/index.css

@@ -146,12 +146,11 @@ div#upcoming_text{
 
 /* Contains the details of the upcoming activity */
 div#upcoming_details{
-    display:        inline-block;
-    vertical-align:    middle;
-    float:            right;
-    margin-right:    0;
-    text-align:        center;
-    padding-bottom:    2em;
+    display: inline-block;
+    vertical-align: middle;
+    text-align: center;
+    padding-bottom: 2em;
+    min-width: 24em;
 }
 
 

www/css/m/index.css

@@ -33,8 +33,10 @@ div#upcoming_text{
 
 /* Contains the details of the upcoming activity */
 div#upcoming_details{
-    display:    block;
-    float:        initial;
+    display:block;
+    float: initial;
+    width: 80%;
+    margin: 2em auto 2em auto;
 } 
 
 div#upcoming_details table{

www/index.php

@@ -394,124 +394,129 @@
 <?php
                 }
                 //Upcaming activity section
-                $q_activity = mysqli_query($con, "SELECT id, permalink, date, DATE_FORMAT(date, '%Y-%m-%d') AS isodate, title_$lang AS title, text_$lang AS text, price, inscription, people, max_people, city FROM activity WHERE visible = 1 AND date > now() ORDER BY date LIMIT 1;");
+                $q_activity = mysqli_query($con, "SELECT id, permalink, date, DATE_FORMAT(date, '%Y-%m-%d') AS isodate, title_$lang AS title, text_$lang AS text, price, inscription, people, max_people, city FROM activity WHERE visible = 1 AND date >= date(now()) ORDER BY date LIMIT 2;");
                 $upcoming_activity_shown = false;
                 if (mysqli_num_rows($q_activity) > 0){
                     $upcoming_activity_shown = true;
-                    $r_activity = mysqli_fetch_array($q_activity);
 ?>
                     <div class='section'>
                         <h3 class='section_title'><?=$lng['index_upcoming_activity']?></h3>
-                        <div class='entry' itemscope itemtype='http://schema.org/Event'>
-                            <meta itemprop='inLanguage' content='<?=$lang?>'/>
-                            <meta itemprop='name' content='<?=$r_activity['title']?>'/>
-                            <meta itemprop='description' content='<?=$r_activity['text']?>'/>
-                            <meta itemprop='startDate endDate' content='<?=$r_activity['isodate']?>'/>
-                            <span class='hidden' itemprop='location' itemscope itemtype='http://schema.org/Place'>
-                                <meta itemprop='address' itemprop='name' content='=<?=$r_activity[city]?>'/>
-                            </span>
-                            <meta itemprop='url' content='<?=$server?>/actividades/<?=$r_activity['permalink']?>'/>
-                            <div class='hidden' itemprop='organizer performer' itemscope itemtype='http://schema.org/Organization'>
-                                <meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>
-                                <meta itemprop='name' content='Gasteizko Margolariak'/>
-                                <meta itemprop='logo' content='<?=$server?>/img/logo/logo.png'/>
-                                <meta itemprop='foundingDate' content='2013-02-03'/>
-                                <meta itemprop='telephone' content='+34637140371'/>
-                            </div> <!-- .hidden -->
-                            <div id='upcoming_activity' class='table'>
-                                <div class='tr'>
-<?php
-                                    //If image, show it
-                                    $q_activity_image = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $r_activity[id] ORDER BY idx LIMIT 1;");
-                                    if (mysqli_num_rows($q_activity_image) > 0){
-                                        $r_activity_image = mysqli_fetch_array($q_activity_image);
+<?php
+                        while($r_activity = mysqli_fetch_array($q_activity)){
 ?>
-                                        <div class='td'>
-                                            <div id='upcoming_image'>
-                                               <a href='<?=$server?>/actividades/<?=$r_activity['permalink']?>'>
-                                                    <meta itemprop='image' content='<?=$server?>/img/actividades/<?=$r_activity_image['image']?>'/>
-                                                    <img src='<?=$server?>/img/actividades/miniature/<?=$r_activity_image['image']?>' alt='<?=$r_activity['title']?>'/>
-                                                </a>
-                                            </div> <!-- #upcoming_image -->
-                                        </div> <!-- .td-->
+                            <div class='entry' itemscope itemtype='http://schema.org/Event'>
+                                <meta itemprop='inLanguage' content='<?=$lang?>'/>
+                                <meta itemprop='name' content='<?=$r_activity['title']?>'/>
+                                <meta itemprop='description' content='<?=$r_activity['text']?>'/>
+                                <meta itemprop='startDate endDate' content='<?=$r_activity['isodate']?>'/>
+                                <span class='hidden' itemprop='location' itemscope itemtype='http://schema.org/Place'>
+                                    <meta itemprop='address' itemprop='name' content='=<?=$r_activity[city]?>'/>
+                                </span>
+                                <meta itemprop='url' content='<?=$server?>/actividades/<?=$r_activity['permalink']?>'/>
+                                <div class='hidden' itemprop='organizer performer' itemscope itemtype='http://schema.org/Organization'>
+                                    <meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>
+                                    <meta itemprop='name' content='Gasteizko Margolariak'/>
+                                    <meta itemprop='logo' content='<?=$server?>/img/logo/logo.png'/>
+                                    <meta itemprop='foundingDate' content='2013-02-03'/>
+                                    <meta itemprop='telephone' content='+34637140371'/>
+                                </div> <!-- .hidden -->
+                                <div id='upcoming_activity' class='table'>
+                                    <div class='tr'>
+<?php
+                                        //If image, show it
+                                        $q_activity_image = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $r_activity[id] ORDER BY idx LIMIT 1;");
+                                        if (mysqli_num_rows($q_activity_image) > 0){
+                                            $r_activity_image = mysqli_fetch_array($q_activity_image);
+?>
+                                            <div class='td'>
+                                                <div id='upcoming_image'>
+                                                    <a href='<?=$server?>/actividades/<?=$r_activity['permalink']?>'>
+                                                        <meta itemprop='image' content='<?=$server?>/img/actividades/<?=$r_activity_image['image']?>'/>
+                                                        <img src='<?=$server?>/img/actividades/miniature/<?=$r_activity_image['image']?>' alt='<?=$r_activity['title']?>'/>
+                                                    </a>
+                                                </div> <!-- #upcoming_image -->
+                                            </div> <!-- .td-->
 <?php
-                                    }
+                                        }
 ?>
-                                    <div class='td'>
-                                        <div id='upcoming_text'>
-                                            <h3 class='entry_title'>
-                                                <a itemprop='url' href='<?=$server?>/actividades/<?=$r_activity['permalink']?>'><?=$r_activity['title']?></a>
-                                            </h3>
-                                            <p class='mobile'><?=cutText($r_activity['text'], 250, $lng['index_read_more'], "$server/actividades/$r_activity[permalink]")?></p>
-                                            <p class='desktop'><?=cutText($r_activity['text'], 450, $lng['index_read_more'], "$server/actividades/$r_activity[permalink]")?></p>
-                                        </div> <!-- #upcoming_text -->
-                                    </div> <!-- .td -->
-                                    <div class='td'>
-                                        <div id='upcoming_details'>
-                                            <table>
-                                                <tr>
-                                                    <td><?=$lng['index_upcoming_activity_date']?></td>
-                                                    <td><?=formatDate($r_activity['date'], $lang, false)?></td>
-                                                </tr>
-                                                <tr>
-                                                    <td><?=$lng['index_upcoming_activity_price']?></td>
-<?php
-                                                    if ($r_activity['price'] == 0){
-?>
-                                                        <td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>
-                                                            <?=$lng['index_upcoming_activity_free']?>
-                                                            <meta itemprop='priceCurrency' content='EUR'/>
-                                                            <meta itemprop='price' content='0'/>
-                                                            <meta itemprop='availability' content='Sold Out'/>
-                                                            <meta itemprop='validfrom' content='<?=$r_activity['isodate']?>'/>
-                                                            <meta itemprop='url' content='<?=$server?>/actividades/<?=$r_activity['permalink']?>'/>
-                                                        </td>
+                                        <div class='td'>
+                                            <div id='upcoming_text'>
+                                                <h3 class='entry_title'>
+                                                    <a itemprop='url' href='<?=$server?>/actividades/<?=$r_activity['permalink']?>'><?=$r_activity['title']?></a>
+                                                </h3>
+                                                <p class='mobile'><?=cutText($r_activity['text'], 250, $lng['index_read_more'], "$server/actividades/$r_activity[permalink]")?></p>
+                                                <p class='desktop'><?=cutText($r_activity['text'], 450, $lng['index_read_more'], "$server/actividades/$r_activity[permalink]")?></p>
+                                            </div> <!-- #upcoming_text -->
+                                        </div> <!-- .td -->
+                                        <div class='td'>
+                                            <div id='upcoming_details'>
+                                                <table>
+                                                    <tr>
+                                                        <td><?=$lng['index_upcoming_activity_date']?></td>
+                                                        <td><?=formatDate($r_activity['date'], $lang, false)?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td><?=$lng['index_upcoming_activity_inscription']?>s</td>
+                                                        <td><?=$lng['index_upcoming_activity_price']?></td>
+<?php
+                                                        if ($r_activity['price'] == 0){
+?>
+                                                            <td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>
+                                                                <?=$lng['index_upcoming_activity_free']?>
+                                                                <meta itemprop='priceCurrency' content='EUR'/>
+                                                                <meta itemprop='price' content='0'/>
+                                                                <meta itemprop='availability' content='Sold Out'/>
+                                                                <meta itemprop='validfrom' content='<?=$r_activity['isodate']?>'/>
+                                                                <meta itemprop='url' content='<?=$server?>/actividades/<?=$r_activity['permalink']?>'/>
+                                                            </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td><?=$lng['index_upcoming_activity_inscription']?></td>
+<?php
+                                                            if ($r_activity['inscription'] == 1){
+?>
+                                                                <td><?=$lng['yes']?></td>
 <?php
-                                                        if ($r_activity['inscription'] == 1){
+                                                            }
+                                                            else{
 ?>
-                                                            <td><?=$lng['yes']?></td>
+                                                                <td><?=$lng['no']?></td>
 <?php
+                                                            }
                                                         }
                                                         else{
 ?>
-                                                            <td><?=$lng['no']?></td>
+                                                            <td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>
+                                                                <?=$r_activity['price']?> €
+                                                                    <meta itemprop='priceCurrency' content='EUR'/>
+                                                                    <meta itemprop='availability' content='Sold Out'/>
+                                                                    <meta itemprop='validfrom' content='<?=$r_activity['isodate']?>'/>
+                                                                    <meta itemprop='price' content='<?=$r_activity['price']?>'/>
+                                                            </td>
 <?php
                                                         }
-                                                    }
-                                                    else{
 ?>
-                                                        <td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>
-                                                            <?=$r_activity['price']?> €
-                                                                <meta itemprop='priceCurrency' content='EUR'/>
-                                                                <meta itemprop='availability' content='Sold Out'/>
-                                                                <meta itemprop='validfrom' content='<?=$r_activity['isodate']?>'/>
-                                                                <meta itemprop='price' content='<?=$r_activity['price']?>'/>
-                                                        </td>
+                                                    </tr>
 <?php
-                                                    }
+                                                    if ($r_activity['max_people'] > 0){
 ?>
-                                                </tr>
+                                                        <tr>
+                                                            <td><?=$lng['index_upcoming_activity_max_people']?></td>
+                                                            <td><?=$r_activity['max_people']?></td>
+                                                        </tr>
 <?php
-                                                if ($r_activity['max_people'] > 0){
+                                                    }
 ?>
-                                                    <tr>
-                                                        <td><?=$lng['index_upcoming_activity_max_people']?></td>
-                                                        <td><?=$r_activity['max_people']?></td>
-                                                    </tr>
+                                                </table>
+                                                <a href='<?=$server?>/actividades/<?=$r_activity['permalink']?>'><?=$lng['index_upcoming_activity_see']?></a>
+                                               <br/><br/>
+                                            </div> <!-- #upcoming_details -->
+                                        </div> <!-- .td -->
+                                    </div> <!-- .tr -->
+                                </div> <!-- .table -->
+                            </div> <!-- .entry -->
 <?php
-                                                }
+                        } // while($r_activity = mysqli_fetch_array($q_activity))
 ?>
-                                            </table>
-                                            <a href='<?=$server?>/actividades/<?=$r_activity['permalink']?>'><?=$lng['index_upcoming_activity_see']?></a>
-                                            <br/><br/>
-                                        </div> <!-- #upcoming_details -->
-                                    </div> <!-- .td -->
-                                </div> <!-- .tr -->
-                            </div> <!-- .table -->
-                        </div> <!-- .entry -->
                         <a class='go_to_section' href='<?=$server?>/actividades/'><?=$lng['index_upcoming_activity_see_all']?></a>
                         <br/>
                     </div> <!-- .section -->

www/lang/lang_en.php

@@ -32,7 +32,7 @@
     $lng['index_festivals_city_schedule'] = 'Programa de fiestas municipal';
     $lng['index_festivals_schedule_now'] = 'Ahora:';
     $lng['index_festivals_schedule_next'] = 'Siguiente:';
-    $lng['index_upcoming_activity'] = 'Upcoming activity';
+    $lng['index_upcoming_activity'] = 'Upcoming activities';
     $lng['index_upcoming_activity_see'] = 'See more';
     $lng['index_upcoming_activity_see_all'] = 'See all actvities';
     $lng['index_upcoming_activity_price'] = 'Price: ';

www/lang/lang_es.php

@@ -32,7 +32,7 @@
     $lng['index_festivals_city_schedule'] = 'Programa de fiestas municipal';
     $lng['index_festivals_schedule_now'] = 'Ahora:';
     $lng['index_festivals_schedule_next'] = 'Siguiente:';
-    $lng['index_upcoming_activity'] = 'Próxima actividad';
+    $lng['index_upcoming_activity'] = 'Próximas actividades';
     $lng['index_upcoming_activity_see'] = 'Ver detalles';
     $lng['index_upcoming_activity_see_all'] = 'Todas las actividades';
     $lng['index_upcoming_activity_price'] = 'Precio: ';

www/lang/lang_eu.php

@@ -32,7 +32,7 @@
     $lng['index_festivals_city_schedule'] = 'Jaiako programazioa';
     $lng['index_festivals_schedule_now'] = 'Orain:';
     $lng['index_festivals_schedule_next'] = 'Hurrengoa:';
-    $lng['index_upcoming_activity'] = 'Hurrengo ekitaldia';
+    $lng['index_upcoming_activity'] = 'Hurrengo ekitaldiak';
     $lng['index_upcoming_activity_see'] = 'Gehiago ikusi';
     $lng['index_upcoming_activity_see_all'] = 'Ekitalde gustiak';
     $lng['index_upcoming_activity_price'] = 'Prezioa: ';