Sfoglia il codice sorgente

Activities section code reformatted.

Iñigo Valentin 9 anni fa
parent
commit
59ebbd1a7e
5 ha cambiato i file con 532 aggiunte e 342 eliminazioni
  1. 269 172
      www/actividades/actividad.php
  2. 260 170
      www/actividades/index.php
  3. 1 0
      www/lang/lang_en.php
  4. 1 0
      www/lang/lang_es.php
  5. 1 0
      www/lang/lang_eu.php

+ 269 - 172
www/actividades/actividad.php

@@ -1,232 +1,329 @@
 <?php
     session_start();
-    $http_host = $_SERVER['HTTP_HOST'];
+    $http_host = $_SERVER["HTTP_HOST"];
     include("../functions.php");
     $con = startdb();
     $proto = getProtocol();
+    $server = "$proto$http_host";
     
     //Language
     $lang = selectLanguage();
-    include("../lang/lang_" . $lang . ".php");
+    include("../lang/lang_$lang.php");
     
-    $cur_section = $lng['section_activities'];
+    $cur_section = $lng["section_activities"];
     
     // Get current activity id. Redirect if inexistent or invisible
-    $perm = mysqli_real_escape_string($con, $_GET['perm']);
+    $perm = mysqli_real_escape_string($con, $_GET["perm"]);
     $q = mysqli_query($con, "SELECT id, permalink, title_$lang AS title, text_$lang AS text, after_$lang AS after, price, inscription, people, max_people, user, date, DATE_FORMAT(date, '%Y-%m-%d %T') AS cdate, DATE_FORMAT(date, '%Y-%m-%d') AS isodate, DATE_FORMAT(date,'%b %d, %Y') as fdate, dtime, comments, city FROM activity WHERE permalink = '$perm' AND visible = 1;");
     if (mysqli_num_rows($q) == 0){
-        header("Location: $proto$http_host/actividades/");
+        header("Location: $server/actividades/");
         exit(-1);
     }
     $r = mysqli_fetch_array($q);
-    $id = $r['id'];
+    $id = $r["id"];
 ?>
 <!DOCTYPE html>
 <html>
     <head>
         <meta content="text/html; charset=windows-1252" http-equiv="content-type"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
-        <title><?php echo $r["title"] . " - Gasteizko Margolariak"; ?></title>
-        <link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
+        <title><?=$r["title"]?> - Gasteizko Margolariak</title>
+        <link rel="shortcut icon" href="<?=$server?>/img/logo/favicon.ico">
         <!-- CSS files -->
         <style>
-            <?php 
-                include("../css/ui.css"); 
-                include("../css/actividades.css");
-            ?>
+<?php 
+            include("../css/ui.css"); 
+            include("../css/actividades.css");
+?>
         </style>
         <!-- CSS for mobile version -->
         <style media="(max-width : 990px)">
-            <?php 
-                include("../css/m/ui.css"); 
-                include("../css/m/actividades.css");
-            ?>
+<?php 
+            include("../css/m/ui.css"); 
+            include("../css/m/actividades.css");
+?>
         </style>
         <!-- Script files -->
         <script type="text/javascript">
-            <?php
-                include("../script/ui.js");
-                include("../script/actividades.js");
-            ?>
+<?php
+            include("../script/ui.js");
+            include("../script/actividades.js");
+?>
         </script>
         <!-- Meta tags -->
-        <link rel="canonical" href="<?php echo "$proto$http_host/actividades/" . $r['permalink']; ?>"/>
-        <link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
-        <link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
-        <meta name="description" content="<?php echo strip_tags($r["text"]);?>"/>
-        <meta property="og:title" content="<?php echo $r["title"] . " - Gasteizko Margolariak"; ?>"/>
-        <meta property="og:url" content="<?php echo "$proto$http_host/actividades/" . $r['permalink']; ?>"/>
-        <meta property="og:description" content="<?php echo strip_tags($r["text"]);?>"/>
-        <?php
-            $q_i = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $id ORDER BY idx;");
-            if (mysqli_num_rows($q_i) == 0)
-                $img = "$proto$http_host/img/logo/cover.png";
-            else{
-                $r_i = mysqli_fetch_array($q_i);
-                $img = "$proto$http_host/img/actividades/preview/" . $r_i['image'];
-            }
-        ?>
-        <meta property="og:image" content="<?php echo $img;?>"/>
+        <link rel="canonical" href="<?=$server?>/actividades/<?=$r["permalink"]?>"/>
+        <link rel="author" href="<?=$server?>"/>
+        <link rel="publisher" href="<?=$server?>"/>
+        <meta name="description" content="<?=strip_tags($r["text"])?>"/>
+        <meta property="og:title" content="<?=$r["title"]?> - Gasteizko Margolariak"/>
+        <meta property="og:url" content="<?=$server?>/actividades/<?=$r["permalink"]?>"/>
+        <meta property="og:description" content="<?=strip_tags($r["text"])?>?>"/>
+<?php
+        $q_i = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $id ORDER BY idx;");
+        if (mysqli_num_rows($q_i) == 0){
+            $img = "$server/img/logo/cover.png";
+        }
+        else{
+            $r_i = mysqli_fetch_array($q_i);
+            $img = "$server/img/actividades/preview/" . $r_i["image"];
+        }
+?>
+        <meta property="og:image" content="<?=$img?>"/>
         <meta property="og:site_name" content="Gasteizko Margolariak"/>
         <meta property="og:type" content="article"/>
-        <meta property="og:locale" content="<?php echo $lang;?>"/>
+        <meta property="og:locale" content="<?=$lang?>"/>
         <meta property="article:section" content=""/>
         <!--     TODO: Review time format     -->
-        <meta property="article:published-time" content="<?php echo $r['dtime'];?>"/>
-        <meta property="article:modified-time" content="<?php echo $r['dtime'];?>"/>
+        <meta property="article:published-time" content="<?=$r["dtime"]?>"/>
+        <meta property="article:modified-time" content="<?=$r["dtime"]?>"/>
         <meta property="article:author" content="Gasteizko Margolariak"/>
-        <?php
-            $res_tag = mysqli_query($con, "SELECT tag FROM activity_tag WHERE activity = $id;");
-            $tag_string = "vitoria cuadrilla gasteizko margolariak ";
-            while ($row_tag = mysqli_fetch_array($res_tag))
-                $tag_string = $tag_string . " " . $row_tag['tag']
-        ?>
-        <meta property="article:tag" content="<?php echo $tag_string ?>"/>
+<?php
+        $res_tag = mysqli_query($con, "SELECT tag FROM activity_tag WHERE activity = $id;");
+        $tag_string = "vitoria cuadrilla gasteizko margolariak ";
+        while ($row_tag = mysqli_fetch_array($res_tag)){
+            $tag_string = $tag_string . " " . $row_tag["tag"];
+        }
+?>
+        <meta property="article:tag" content="<?=$tag_string?>"/>
         <meta name="twitter:card" content="summary"/>
-        <meta name="twitter:title" content="<?php echo $r["title"] . " - Gasteizko Margolariak";?>"/>
-        <meta name="twitter:description" content="<?php echo strip_tags($r["text"]);?>"/>
-        <meta name="twitter:image" content="<?php echo $img;?>"/>
-        <meta name="twitter:url" content="<?php echo "$proto$http_host/actividades/$r[permalink]"; ?>"/>
+        <meta name="twitter:title" content="<?=$r["title"]?> - Gasteizko Margolariak"/>
+        <meta name="twitter:description" content="<?=strip_tags($r["text"])?>"/>
+        <meta name="twitter:image" content="<?=$img?>"/>
+        <meta name="twitter:url" content="<?=$server?>/actividades/<?=$r["permalink"]?>"/>
         <meta name="robots" content="index follow"/>
     </head>
     <body>
-        <?php include("../header.php"); ?>
+<?php
+        include("../header.php");
+?>
         <div id="content">
-            <?php
-                //Check if it's a past activity or upcoming activity.
-                $c_date = new Datetime();
-                $a_date = date_create_from_format('Y-m-d H:i:s', $r['cdate']);
-                $future = false;
-                if (date_format($a_date, 'U') > date_format($c_date, 'U')){
-                    $future = true;    
-                }
-            ?>
+<?php
+            //Check if it's a past activity or upcoming activity.
+            $c_date = new Datetime();
+            $a_date = date_create_from_format('Y-m-d H:i:s', $r["cdate"]);
+            $future = false;
+            if (date_format($a_date, 'U') > date_format($c_date, 'U')){
+                $future = true;
+            }
+?>
             <div id="middle_column">
                 <div class="section">
-                    <h3 class='section_title' id="activity_title"><?php echo($r['title']); ?> - <?php echo(formatDate($r['date'], $lang, false)); ?></h3>
+                    <h3 class='section_title' id="activity_title"><?=$r["title"]?> - <?=formatDate($r["date"], $lang, false)?></h3>
                     <div class="entry" itemscope itemtype='http://schema.org/Event'>
-                        <?php
-                            echo "<meta itemprop='url' href='$proto$http_host/actividades/$r[permalink]'/>\n";
-                            echo "<meta itemprop='inLanguage' content='$lang'/>\n";
-                            echo "<meta itemprop='name' content='$r[title]'/>\n";
-                            echo "<meta itemprop='description' content='$r[text]'/>\n";
-                            echo "<meta itemprop='startDate endDate' content='$r[isodate]'/>\n";
-                            echo "<meta itemprop='location' content='$r[city]'/>\n";
-                            echo "<div class='hidden' itemprop='organizer' itemscope itemtype='http://schema.org/Organization'>\n";
-                            echo "<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n";
-                            echo "<meta itemprop='name' content='Gasteizko Margolariak'/>\n";
-                            echo "<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n";
-                            echo "<meta itemprop='foundingDate' content='03-02-2013'/>\n";
-                            echo "<meta itemprop='telephone' content='+34637140371'/>\n";
-                            echo "<meta itemprop='url' content='$proto$http_host'/>\n";
-                            echo "</div>\n";
-                        
-                            if (mysqli_num_rows($q_i) > 0){
-                                echo "<meta itemprop='image' content='$proto$http_host/img/actividades/$r_i[image]'/>\n";
-                                echo "<div id='activity_image'><img src='$proto$http_host/img/actividades/preview/$r_i[image]'/></div>\n";
-                            }
-                            echo "<div id='activity_description'><p>\n";
-                            if ($future == false && strlen($r['after']) > 0){
-                                echo $r['after'];
-                            }
-                            else{
-                                echo $r['text'];
-                            }
-                            echo "</p></div></br>\n";
-                            if ($future){
-                                echo("<div itemscope itemtype='http://schema.org/Offer' id='activity_details'><table id='activity_details'>\n");
-                                echo("<tr><td class='field_name'>$lng[activities_date]</td><td>" . formatDate($r['date'], $lang, false) . "</td></tr>\n");
-                                echo("<tr><td class='field_name'>$lng[activities_city]</td><td>$r[city]</td></tr>\n");
-                                echo "<meta itemprop='priceCurrency' content='EUR'/><meta itemprop='price' content='$r[price]'/>\n";
-                                if ($r['price'] == 0){
-                                    echo "<tr><td class='field_name'>$lng[activities_price]</td><td>$lng[activities_price_0]</td></tr>\n";
+                        <meta itemprop='url' href='<?=$server?>/actividades/<?=$r["permalink"]?>'/>
+                        <meta itemprop='inLanguage' content='$<?=lang?>'/>
+                        <meta itemprop='name' content='<?=$r["title"]?>'/>
+                        <meta itemprop='description' content='<?=$r["text"]?>'/>
+                        <meta itemprop='startDate endDate' content='<?$r["isodate"]?>'/>
+                        <meta itemprop='location' content='<?=$r["city"]?>'/>
+                        <div class='hidden' itemprop='organizer' 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='03-02-2013'/>
+                            <meta itemprop='telephone' content='+34637140371'/>
+                            <meta itemprop='url' content='<?=$server?>'/>
+                        </div>
+<?php
+                        if (mysqli_num_rows($q_i) > 0){
+?>
+                            <meta itemprop='image' content='</=$server?>/img/actividades/<?=$r_i["image"]?>'/>
+                            <div id='activity_image'>
+                                <img src='<?=$server?>/img/actividades/preview/<?=$r_i["image"]?>'/>
+                            </div>
+<?php
+                        }
+?>
+                        <div id='activity_description'>
+                            <p>
+<?php
+                                if ($future == false && strlen($r["after"]) > 0){
+?>
+                                    <?=$r["after"]?>
+<?php
                                 }
                                 else{
-                                    echo "<tr><td class='field_name'>$lng[activities_price]</td><td>$r[price]€</td></tr>\n";
-                                    if ($r['max_people'] != 0){
-                                        echo "<tr><td class='field_name'>$lng[activities_maxpeople]</td><td>$r[max_people]</td></tr>\n";
-                                    }
-                                    /*if ($r['inscription'] == 1){
-                                        echo "<tr><td class='field_name'>$lng[activities_inscription]</td><td>$lng[yes]</td></tr>\n";
+?>
+                                    <?=$r["text"]?>
+<?php
+                                }
+?>
+                            </p>
+                        </div> <!-- .activity_description -->
+                        <br/>
+<?php
+                        if ($future){
+?>
+                            <div itemscope itemtype='http://schema.org/Offer' id='activity_details'>
+                                <table id='activity_details'>
+                                    <tr>
+                                        <td class='field_name'><?=$lng["activities_date"]?></td>
+                                        <td><?=formatDate($r["date"], $lang, false)?></td>
+                                    </tr>
+                                    <tr>
+                                        <td class='field_name'><?=$lng["activities_city"]?></td>
+                                        <td><?=$r["city"]?></td>
+                                    </tr>
+                                    <meta itemprop='priceCurrency' content='EUR'/>
+                                    <meta itemprop='price' content='<$r["price"]?>'/>
+<?php
+                                    if ($r["price"] == 0){
+?>
+                                        <tr>
+                                            <td class='field_name'><?=$lng["activities_price"]?></td>
+                                            <td><?=$lng["activities_price_0"]?></td>
+                                        </tr>
+<?php
                                     }
                                     else{
-                                        echo "<tr><td class='field_name'>$lng[activities_inscription]</td><td>$lng[no]</td></tr>\n";
-                                    }*/
-                                }
-                                echo "</table></div>\n";
-                                echo("</div><br/><div class='entry'>\n");
-                                $q_it = mysqli_query($con, "SELECT activity_itinerary.name_$lang AS name, description_$lang AS description, place.name_$lang AS place_name, place.address_$lang AS place_address, DATE_FORMAT(start, '%H:%i') AS start, DATE_FORMAT(end, '%H:%i') AS end, DATE_FORMAT(start, '%Y-%m-%d') AS isostart, DATE_FORMAT(end, '%Y-%m-%d') AS isoend FROM activity_itinerary, place WHERE place.id = activity_itinerary.place AND activity = $r[id] ORDER BY start;");
-                                if (mysqli_num_rows($q_it) > 0){
-                                    echo "<div id='activity_itinerary'><h3 class='entry_title'>Itinerario</h3>\n";
-                                    echo "<table id='activity_itinerary'>\n";
-                                    echo "<tr class='th'><th>$lng[activities_when]</th><th>$lng[activities_what]</th></tr>\n";
-                                    while ($r_it = mysqli_fetch_array($q_it)){
-                                        echo "<tr>\n";
-                                        echo "<div class='hidden' itemprop='subEvent' itemscope itemtype='http://schema.org/Event'>\n";
-                                        echo "<meta itemprop='inLanguage' content='$lang'/>\n";
-                                        echo "<meta itemprop='name' content='$r_it[name]'/>\n";
-                                        echo "<meta itemprop='description' content='$r_it[description]'/>\n";
-                                        echo "<meta itemprop='startDate' content='$r_it[isostart]'/>\n";
-                                        echo "<meta itemprop='location' content='$r_it[place_name]'/>\n";
-                                        if (strlen($r_it['end']) > 0){
-                                            echo "<meta itemprop='endDate' content='$r_it[place_end]'/>\n";
-                                        }
-                                        echo "</div>\n";
-                                        if (strlen($r_it['end']) > 0){
-                                            echo "<td>$r_it[start] - $r_it[end]</td>";
-                                        }
-                                        else{
-                                            echo "<td class='time'>$r_it[start]</td>";
-                                        }
-                                        echo "<td><h5>$r_it[name]</h5><p class='description'>$r_it[description]</p><br/>\n";
-                                        if ($r_it['place_name'] == $r_it['place_address']){
-                                            echo "$r_it[place_name]</td>\n";
-                                        }
-                                        else{
-                                            echo "$r_it[place_name]<span class='address'>($r_it[place_address])</span></td>\n";
+?>
+                                        <tr>
+                                            <td class='field_name'><?=$lng["activities_price"]?></td>
+                                            <td><?=$r["price"]?>€</td>
+                                        </tr>
+<?php
+                                        if ($r["max_people"] != 0){
+?>
+                                            <tr>
+                                                <td class='field_name'><?=$lng["activities_maxpeople"]?></td>
+                                                <td><?=$r["max_people"]?></td>
+                                            </tr>
+<?php
                                         }
-                                        echo "</tr>\n";
                                     }
-                                    echo "</table></div>";
-                                }
-                            }
-                        ?>
-                    </div>
-                </div>
-            </div>
+?>
+                                </table> <!-- activity_details -->
+                            </div> <!-- activity_details -->
+<?php
+                        
+?>
+                            </div> <!-- .entry -->
+                            <br/>
+                            <div class='entry'>
+<?php
+                                $q_it = mysqli_query($con, "SELECT activity_itinerary.name_$lang AS name, description_$lang AS description, place.name_$lang AS place_name, place.address_$lang AS place_address, DATE_FORMAT(start, '%H:%i') AS start, DATE_FORMAT(end, '%H:%i') AS end, DATE_FORMAT(start, '%Y-%m-%d') AS isostart, DATE_FORMAT(end, '%Y-%m-%d') AS isoend FROM activity_itinerary, place WHERE place.id = activity_itinerary.place AND activity = $r[id] ORDER BY start;");
+                                if (mysqli_num_rows($q_it) > 0){
+?>
+                                    <div id='activity_itinerary'>
+                                        <!-- TODO: Routes -->
+                                        <h3 class='entry_title'><?=$lng["activity_itinerary"]?></h3>
+                                        <table id='activity_itinerary'>
+                                            <tr class='th'>
+                                                <th><?=$lng["activities_when"]?></th>
+                                                <th><?=$lng["activities_what"]?></th>
+                                            </tr>
+<?php
+                                            while ($r_it = mysqli_fetch_array($q_it)){
+?>
+                                                <tr>
+                                                    <div class='hidden' itemprop='subEvent' itemscope itemtype='http://schema.org/Event'>
+                                                        <meta itemprop='inLanguage' content='<?=$lang?>'/>
+                                                        <meta itemprop='name' content='<?=$r_it["name"]?>'/>
+                                                        <meta itemprop='description' content='<?=$r_it["description"]?>'/>
+                                                        <meta itemprop='startDate' content='<?=$r_it["isostart"]?>'/>
+                                                        <meta itemprop='location' content='<?=$r_it["place_name"]?>'/>
+<?php
+                                                        if (strlen($r_it["end"]) > 0){
+?>
+                                                            <meta itemprop='endDate' content='<?=$r_it["place_end"]?>'/>
+<?php
+                                                        }
+?>
+                                                    </div>
+<?php
+                                                    if (strlen($r_it["end"]) > 0){
+?>
+                                                        <td><?=$r_it["start"]?> - <?=$r_it["end"]?></td>
+<?php
+                                                    }
+                                                    else{
+?>
+                                                        <td class='time'><?=$r_it["start"]?></td>
+<?php
+                                                    }
+?>
+                                                    <td>
+                                                        <h5><?=$r_it["name"]?></h5>
+                                                        <p class='description'><?=$r_it["description"]?></p>
+                                                        <br/>
+<?php
+                                                        if ($r_it["place_name"] == $r_it["place_address"]){
+?>
+                                                            <?=$r_it["place_name"]?>
+<?php
+                                                        }
+                                                        else{
+?>
+                                                            <?=$r_it["place_name"]?>
+                                                            <span class='address'>(<?=$r_it["place_address"]?>)</span>
+<?php
+                                                        }
+?>
+                                                    </td>
+                                                </tr>
+<?php
+                                            } // while ($r_it = mysqli_fetch_array($q_it))
+?>
+                                        </table> <!-- #activity_itinerary -->
+                                    </div> <!-- #activity_itinerary -->
+<?php
+                                } // if (mysqli_num_rows($q_it) > 0)
+?>
+                            </div> <!-- .entry -->
+<?php                    
+                        } //  if ($future)
+?>                    
+                    </div> <!-- .section -->
+                </div> <!-- .entry -->
+            </div> <!-- #middle_column -->
             <div id="right_column">
                 <div id="archive" class="section desktop">
-                    <h3 class="section_title"><?php echo $lng['activities_archive']; ?></h3>
+                    <h3 class="section_title"><?=$lng["activities_archive"] ?></h3>
                     <div class='entry'>
-                        <?php
-                            $res_year = mysqli_query($con, "SELECT year(date) AS year FROM activity WHERE visible = 1 GROUP BY year(date) ORDER BY year DESC;");
-                            while($row_year = mysqli_fetch_array($res_year)){
-                                echo "<div class='year pointer' onClick=\"toggleElement('year_$row_year[year]');\">";
-                                echo("<img class='slid' id='slid_year_$row_year[year]' src='$proto$http_host/img/misc/slid-right.png' alt=' '/><span class='fake_a'>$row_year[year]</span>");
-                                echo "</div>\n";
-                                echo "<div class='list_year pointer' id='list_year_$row_year[year]'>\n";
+<?php
+                        $res_year = mysqli_query($con, "SELECT year(date) AS year FROM activity WHERE visible = 1 GROUP BY year(date) ORDER BY year DESC;");
+                        while($row_year = mysqli_fetch_array($res_year)){
+?>
+                            <div class='year pointer' onClick='toggleElement("year_<?=$row_year["year"]?>");'>
+                                <img class='slid' id='slid_year_<?=$row_year["year"]?>' src='<?=$server?>/img/misc/slid-right.png' alt='<?=$row_year["year"]?>'/>
+                                <span class='fake_a'><?=$row_year["year"]?></span>
+                            </div>
+                            <div class='list_year pointer' id='list_year_<?=$row_year["year"]?>'>
+<?php
                                 $res_month = mysqli_query($con, "SELECT month(date) AS month FROM activity WHERE visible = 1 AND year(date) = $row_year[year] GROUP BY month(date) ORDER BY month DESC;");
                                 while($row_month = mysqli_fetch_array($res_month)){
-                                    echo "<div class='month pointer' onClick=\"toggleElement('month_$row_year[year]_$row_month[month]');\">";
-                                    echo("<img class='slid' id='slid_month_$row_year[year]_$row_month[month]' src='$proto$http_host/img/misc/slid-right.png' alt=' '/><span class='fake_a'>" . $lng['months'][$row_month['month'] - 1] . "</span>");
-                                    echo "</div>\n";
-                                    echo "<ul id='list_month_$row_year[year]_$row_month[month]' class='activity_list'>\n";
+?>                                
+                                    <div class='month pointer' onClick='toggleElement("month_<?=$row_year["year"]?>_<?=$row_month["month"]?>");'>
+                                        <img class='slid' id='slid_month_<?=$row_year["year"]?>_<?=$row_month["month"]?>' src='<?=$server?>/img/misc/slid-right.png' alt='<?=$row_year["year"]?>_<?=$row_month["month"]?>'/>
+                                        <span class='fake_a'><?=$lng["months"][$row_month["month"] - 1]?></span>
+                                    </div>
+                                    <ul id='list_month_<?=$row_year["year"]?>_<?=$row_month["month"]?>' class='activity_list'>
+<?php
                                     $res_title = mysqli_query($con, "SELECT id, permalink, title_$lang AS title FROM activity WHERE visible = 1 AND year(date) = $row_year[year] AND month(date) = '$row_month[month]' ORDER BY date DESC;");
-                                    while($row_title = mysqli_fetch_array($res_title))
-                                        echo "<li><a href='$proto$http_host/actividades/" . $row_title['permalink']  . "'>$row_title[title]</a></li>\n";
-                                    echo "</ul>\n";
+                                    while($row_title = mysqli_fetch_array($res_title)){
+?>
+                                        <li>
+                                            <a href='<?=$server?>/actividades/<?=$row_title["permalink"]?>'><?=$row_title["title"]?></a>
+                                        </li>
+<?php
+                                    }
+?>
+                                    </ul>
+<?php
                                 }
-                                echo "</div>\n";
-                            }
-                        ?>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <?php
-            include("../footer.php");
-            $ad = ad($con, $lang, $lng); 
-            stats($ad, $ad_static, "actividades", "$id");
-        ?>
+?>
+                            </div> <!-- #list_year_<?=$row_year["year"]?> -->
+<?php
+                        }
+?>
+                    </div> <!-- .entry -->
+                </div> <!-- #archive -->
+            </div> <!-- #right_column -->
+        </div> <!-- #content -->
+<?php
+        include("../footer.php");
+        $ad = ad($con, $lang, $lng); 
+        stats($ad, $ad_static, "actividades", "$id");
+?>
     </body>
 </html>

+ 260 - 170
www/actividades/index.php

@@ -1,15 +1,16 @@
 <?php
     session_start();
-    $http_host = $_SERVER['HTTP_HOST'];
+    $http_host = $_SERVER["HTTP_HOST"];
     include("../functions.php");
     $con = startdb();
     $proto = getProtocol();
-    
+    $server = "$proto$http_host";
+
     //Language
     $lang = selectLanguage();
-    include("../lang/lang_" . $lang . ".php");
-    
-    $cur_section = $lng['section_activities'];
+    include("../lang/lang_$lang.php");
+
+    $cur_section = $lng["section_activities"];
 ?>
 <!DOCTYPE html>
 <html>
@@ -17,195 +18,284 @@
         <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
         <meta charset="utf-8"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
-        <title><?php echo $lng['activities_title'];?> - Gasteizko Margolariak</title>
-        <link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
+        <title><?=$lng["activities_title"]?> - Gasteizko Margolariak</title>
+        <link rel="shortcut icon" href="<?php echo "$server/img/logo/favicon.ico";?>">
         <!-- CSS files -->
         <style>
-            <?php 
-                include("../css/ui.css"); 
-                include("../css/actividades.css");
-            ?>
+<?php 
+            include("../css/ui.css"); 
+            include("../css/actividades.css");
+?>
         </style>
         <!-- CSS for mobile version -->
         <style media="(max-width : 990px)">
-            <?php 
-                include("../css/m/ui.css"); 
-                include("../css/m/actividades.css");
-            ?>
+<?php 
+            include("../css/m/ui.css"); 
+            include("../css/m/actividades.css");
+?>
         </style>
         <!-- Script files -->
         <script type="text/javascript">
-            <?php
-                include("../script/ui.js");
-                include("../script/actividades.js");
-            ?>
+<?php
+            include("../script/ui.js");
+            include("../script/actividades.js");
+?>
         </script>
         <!-- Meta tags -->
-        <link rel="canonical" href="<?php echo "$proto$http_host/actividades/"; ?>"/>
-        <link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
-        <link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
-        <meta name="description" content="<?php echo $lng['activities_description'];?>"/>
-        <meta property="og:title" content="<?php echo $lng['activities_title'];?> - Gasteizko Margolariak"/>
-        <meta property="og:url" content="<?php echo "$proto$http_host/activities/"; ?>"/>
-        <meta property="og:description" content="<?php echo $lng['activities_description'];?>"/>
-        <meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
-        <meta property="og:site_name" content="<?php echo $lng['index_title'];?>"/>
+        <link rel="canonical" href="<?=$server?>/actividades/"/>
+        <link rel="author" href="<?=$server?>"/>
+        <link rel="publisher" href="<?=$server?>"/>
+        <meta name="description" content="<?=$lng["activities_description"]?>"/>
+        <meta property="og:title" content="<?=$lng["activities_title"]?> - Gasteizko Margolariak"/>
+        <meta property="og:url" content="<?=$server?>/activities/"/>
+        <meta property="og:description" content="<?=$lng["activities_description"]?>"/>
+        <meta property="og:image" content="<?=$server?>/img/logo/logo.png"/>
+        <meta property="og:site_name" content="<?=$lng["index_title"]?>"/>
         <meta property="og:type" content="website"/>
-        <meta property="og:locale" content="<?php echo $lang; ?>"/>
+        <meta property="og:locale" content="<?=$lang?>"/>
         <meta name="twitter:card" content="summary"/>
-        <meta name="twitter:title" content="<?php echo $lng['activities_title'];?> - Gasteizko Margolariak"/>
-        <meta name="twitter:description" content="<?php echo $lng['activities_description'];?>"/>
-        <meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
-        <meta name="twitter:url" content="<?php echo"$proto$http_host"; ?>"/>
+        <meta name="twitter:title" content="<?=$lng["activities_title"]?> - Gasteizko Margolariak"/>
+        <meta name="twitter:description" content="<?=$lng["activities_description"]?>"/>
+        <meta name="twitter:image" content="<?=$server?>/img/logo/logo.png"/>
+        <meta name="twitter:url" content="<?=$server?>"/>
         <meta name="robots" content="index follow"/>
     </head>
     <body>
-        <?php include("../header.php"); ?>
+<?php
+        include("../header.php")
+?>
         <div id="content">
-        <?php
-            //Upcoming activities
-            echo "<div class='section'>\n";
-            echo "<h3 class='section_title'>$lng[activities_upcoming]</h3>\n";
-            $q_upcoming = 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, user, dtime, comments, city FROM activity WHERE visible = 1 AND date > now() ORDER BY date;");
-            if (mysqli_num_rows($q_upcoming) > 0){
-                while ($r_activity = mysqli_fetch_array($q_upcoming)){
-                    echo "<div class='entry' itemscope itemtype='http://schema.org/Event'>\n";
-                    echo "<meta itemprop='inLanguage' content='$lang'/>\n";
-                    echo "<meta itemprop='name' content='$r_activity[title]'/>\n";
-                    echo "<meta itemprop='description' content='$r_activity[text]'/>\n";
-                    echo "<meta itemprop='startDate endDate' content='$r_activity[isodate]'/>\n";
-                    echo("<span class='hidden' itemprop='location' itemscope itemtype='http://schema.org/Place'><meta itemprop='address' itemprop='name' content='$r_activity[city]'/><meta itemprop='name' content='$r_activity[city]'/></span>\n");
-                    echo "<div class='hidden' itemprop='organizer' itemscope itemtype='http://schema.org/Organization'>\n";
-                    echo "<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n";
-                    echo "<meta itemprop='name' content='Gasteizko Margolariak'/>\n";
-                    echo "<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n";
-                    echo "<meta itemprop='foundingDate' content='03-02-2013'/>\n";
-                    echo "<meta itemprop='telephone' content='+34637140371'/>\n";
-                    echo "<meta itemprop='url' content='$proto$http_host'/>\n";
-                    echo "</div>\n";
-                    echo "<div id='upcoming_text'>\n";
-                    echo "<h3 class='entry_title'><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a><span class='title_date'> - " . formatDate($r_activity['date'], $lang, false) . "</span></h3>\n";
-                    //Table with details
-                    echo "<table class='future_details'><tr>\n";
-                    //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);
-                        echo "<td><div id='upcoming_image'>\n";
-                        echo "<a href='$proto$http_host/actividades/$r_activity[permalink]'>\n";
-                        echo "<meta itemprop='image' content='$proto$http_host/img/actividades/view/$r_activity_image[image]'/>\n";
-                        echo "<img src='$proto$http_host/img/actividades/preview/$r_activity_image[image]' alt='$r_activity[title]'/>\n";
-                        echo "</a>\n";
-                        echo "</div></td>\n";
-                    }
-                    echo("<td>\n<table class='future_data'>\n");
-                    echo("<tr><td class='title'>$lng[activities_city]</td><td>$r_activity[city]</td></tr>\n");
-                    if ($r_activity['price'] == 0){
-                        echo "<tr><td class='title'>$lng[activities_price]</td><td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>\n";
-                        echo "<meta itemprop='priceCurrency' content='EUR'/><meta itemprop='price' content='0'/>\n";
-                        echo "$lng[activities_price_0]</td></tr>\n";
-                    }
-                    else{
-                        echo "<tr><td class='title'>$lng[activities_price]</td><td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>\n";
-                        echo "<meta itemprop='priceCurrency' content='EUR'/><meta itemprop='price' content='$r_activity[price]'/>\n";
-                        echo("$r_activity[price]€</td></tr>\n");
-                    }
-                    if ($r_activity['max_people'] != 0){
-                        echo "<tr><td>$lng[activities_maxpeople]</td><td>$r_activity[max_people]</td></tr>\n";
-                    }
-                    //Show link to schedule (if any)
-                    $q_itinerary = mysqli_query($con, "SELECT id FROM activity_itinerary WHERE activity = $r_activity[id];");
-                    if (mysqli_num_rows($q_itinerary) > 0){
-                        echo "<tr><td></td><td><a href='$proto$http_host/actividades/$r_activity[permalink]'>$lng[activities_see_itinerary]</a></td></tr>\n";
-                    }
-                    echo "</table>";
-                    echo "</td></tr></table>\n";
-                    echo "<p>". cutText($r_activity['text'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_activity[permalink]") . "</p>\n";
-                    echo "</div>\n";
-                    echo "</div>\n"; //Entry
-                }
 
-            }
-            else{ //No upcoming activities
-                echo("<div class='entry'><h3 class='entry_title'>\n$lng[activities_no_upcoming]\n</h3></div>\n");
-            }
-            echo "</div>\n";
-                
-            //Past activities TODO: Meta
+            <div class='section'>
+                <h3 class='section_title'><?=$lng["activities_upcoming"]?></h3>
+<?php
+                $q_upcoming = 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, user, dtime, comments, city FROM activity WHERE visible = 1 AND date > now() ORDER BY date;");
+                if (mysqli_num_rows($q_upcoming) > 0){
+                    while ($r_activity = mysqli_fetch_array($q_upcoming)){
+?>
+                        <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"]?>'/>
+                                <meta itemprop='name' content='<?=$r_activity["city"]?>'/>
+                            </span>
+                            <div class='hidden' itemprop='organizer' 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='03-02-2013'/>
+                                <meta itemprop='telephone' content='+34637140371'/>
+                                <meta itemprop='url' content='<?=$server?>'/>
+                            </div>
+                            <div id='upcoming_text'>
+                                <h3 class='entry_title'>
+                                    <a itemprop='url' href=<?=$server?>/actividades/<?=$r_activity["permalink"]?>'><?=$r_activity["title"]?></a>
+                                    <span class='title_date'> - <?=formatDate($r_activity["date"], $lang, false)?></span>
+                                </h3>
+                                <table class='future_details'>
+                                    <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);
+?>                                            
+                                            <td>
+                                                <div id='upcoming_image'>
+                                                    <a href='<?=$server?>/actividades/<?=$r_activity["permalink"]?>'>
+                                                        <meta itemprop='image' content='<?=$server?>/img/actividades/view/<?=$r_activity_image["image"]?>'/>
+                                                        <img src='<?=$server?>/img/actividades/preview/<?=$r_activity_image["image"]?>' alt='<?=$r_activity["title"]?>'/>
+                                                    </a>
+                                                </div>
+                                            </td>
+<?php
+                                        }
+?>
+                                        <td>
+                                            <table class='future_data'>
+                                                <tr>
+                                                    <td class='title'><?=$lng["activities_city"]?></td>
+                                                    <td><?=$r_activity["city"]?></td>
+                                                </tr>
+<?php
+                                                if ($r_activity["price"] == 0){
+?>
+                                                    <tr>
+                                                        <td class='title'><?=$lng["activities_price"]?></td>
+                                                        <td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>
+                                                            <meta itemprop='priceCurrency' content='EUR'/>
+                                                            <meta itemprop='price' content='0'/>
+                                                            <?=$lng["activities_price_0"]?>
+                                                        </td>
+                                                    </tr>
+<?php
+                                                }
+                                                else{
+?>
+                                                    <tr>
+                                                        <td class='title'><?=$lng["activities_price"]?></td>
+                                                        <td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>
+                                                            <meta itemprop='priceCurrency' content='EUR'/>
+                                                            <meta itemprop='price' content='<?=$r_activity["price"]?>'/>
+                                                            <?=$r_activity["price"]?>€
+                                                        </td>
+                                                    </tr>
+<?php
+                                                }
+                                                if ($r_activity["max_people"] != 0){
+?>
+                                                    <tr>
+                                                        <td><?=$lng["activities_maxpeople"]?></td>
+                                                        <td><?=$r_activity["max_people"]?></td>
+                                                    </tr>
+<?php
+                                                }
+                                                //Show link to schedule (if any)
+                                                $q_itinerary = mysqli_query($con, "SELECT id FROM activity_itinerary WHERE activity = $r_activity[id];");
+                                                if (mysqli_num_rows($q_itinerary) > 0){
+?>
+                                                    <tr>
+                                                        <td></td>
+                                                        <td>
+                                                            <a href='<?=$server?>/actividades/<?$r_activity["permalink"]?>'><?=$lng["activities_see_itinerary"]?></a>
+                                                        </td>
+                                                    </tr>
+<?php
+                                                }
+?>
+                                            </table> <!-- #future_data -->
+                                        </td>
+                                    </tr>
+                                </table> <!-- #future_details -->
+                                <p><?=cutText($r_activity["text"], 300, "$lng[index_read_more]", "$server/actividades/$r_activity[permalink]")?></p>
+                            </div> <!-- #upcoming_text -->
+                        </div> <!-- .entry -->
+<?php
+                    } //while ($r_activity = mysqli_fetch_array($q_upcoming))
+                } //if (mysqli_num_rows($q_upcoming) > 0)
+                else{ //No upcoming activities
+?>
+                    <div class='entry'>
+                        <h3 class='entry_title'><?=$lng["activities_no_upcoming"]?></h3>
+                    </div>
+<?php
+                }
+?>
+            </div> <!-- .section -->
+<?php
             if ($r_activity == null){
                 $next_activity_id = -1;
             }
             else{
-                $next_activity_id = $r_activity['id'];
+                $next_activity_id = $r_activity["id"];
             }
             $q_past = mysqli_query($con, "SELECT id, permalink, date, DATE_FORMAT(date, '%Y-%m-%d') AS isodate, title_$lang AS title, after_$lang AS text, text_$lang AS alt_text, price, inscription, people, max_people, user, dtime, comments, city FROM activity WHERE id != $next_activity_id AND visible = 1 AND date < now() ORDER BY date DESC;");
             if (mysqli_num_rows($q_past) > 0){
-                echo "<br/><br/><div class='section'>\n";
-                echo "<h3 class='section_title'>$lng[activities_past]</h3>\n";
-                $i = 0;
-                while ($r_past = mysqli_fetch_array($q_past)){
-                    echo("<div class='entry past_activity' itemscope itemtype='http://schema.org/Event'>\n");
-                    echo("<meta itemprop='inLanguage' content='$lang'/>\n");
-                    echo("<meta itemprop='name' content='$r_past[title]'/>\n");
-                    echo("<meta itemprop='startDate endDate' content='$r_past[isodate]'/>\n");
-                    echo("<span class='hidden' itemprop='location' itemscope itemtype='http://schema.org/Place'><meta itemprop='address' itemprop='name' content='$r_past[city]'/><meta itemprop='name' content='$r_past[city]'/></span>\n");
-                    echo("<div class='hidden' itemprop='organizer' itemscope itemtype='http://schema.org/Organization'>\n");
-                    echo("<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n");
-                    echo("<meta itemprop='name' content='Gasteizko Margolariak'/>\n");
-                    echo("<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n");
-                    echo("<meta itemprop='foundingDate' content='03-02-2013'/>\n");
-                    echo("<meta itemprop='telephone' content='+34637140371'/>\n");
-                    echo("<meta itemprop='url' content='$proto$http_host'/>\n");
-                    echo("</div>\n");
-                    $q_activity_image = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $r_past[id] ORDER BY idx LIMIT 1;");
-                    if ($i == 0 && mysqli_num_rows($q_upcoming) == 0){
-                        echo("<h3 class='entry_title'>");
-                        echo("<img id='slid_past_activity_$r_past[id]' class='slid' src='/img/misc/slid-down.png' onclick=\"showPastActivity('$r_past[id]')\"/>&nbsp;&nbsp;\n");
-                        echo("<a itemprop='url' href='$proto$http_host/actividades/$r_past[permalink]'>$r_past[title]</a>\n");
-                        echo("<span class='title_date'> - " . formatDate($r_past['date'], $lang, false) . "</span>\n");
-                        echo("</h3>\n");
-                        echo("<div class='past_activity_details past_activity_details_first' id='past_activity_details_$r_past[id]'>\n");
-                    }
-                    else{
-                        echo("<h3 class='entry_title'>");
-                        echo("<img id='slid_past_activity_$r_past[id]' class='slid' src='/img/misc/slid-right.png' onclick=\"showPastActivity('$r_past[id]')\"/>&nbsp;&nbsp;");
-                        echo("<a itemprop='url' href='$proto$http_host/actividades/$r_past[permalink]'>$r_past[title]</a>");
-                        echo("<span class='title_date'> - " . formatDate($r_past['date'], $lang, false) . "</span>");
-                        echo("</h3>\n");
-                        echo("<div class='past_activity_details' id='past_activity_details_$r_past[id]'>\n");
-                    }
-                    $i ++;
-                    echo "<table class='past_activity'><tr>\n";
-                    if (mysqli_num_rows($q_activity_image) > 0){
-                        $r_activity_image = mysqli_fetch_array($q_activity_image);
-                        echo "<td><div class='past_image'>\n";
-                        echo "<a href='$proto$http_host/actividades/$r_past[permalink]'>\n";
-                        echo("<meta itemprop='image' content='$proto$http_host/img/actividades/view/$r_activity_image[image]'/>\n");
-                        echo "<img src='$proto$http_host/img/actividades/miniature/$r_activity_image[image]' alt='$r_past[title]'/>\n"; 
-                        echo "</a>\n";
-                        echo "</div></td>\n";
-                    }
-                    echo "<td><div class='past_text'>\n";
-                    if (strlen($r_past['text']) > 0){
-                        echo("<meta itemprop='description' content='$r_past[text]'/>\n");
-                        echo "<p>". cutText($r_past['text'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_past[permalink]") . "</p>\n";
-                    }
-                    else{
-                        echo("<meta itemprop='description' content='$r_past[alt_text]'/>\n");
-                        echo "<p>". cutText($r_past['alt_text'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_past[permalink]") . "</p>\n";
-                    }
-                    echo "</div></td></tr></table>\n";
-                    echo "</div>\n"; //past_activity_details
-                    echo "</div>\n"; //past_activity
-                }
-                echo "</div>\n";
+?>
+                <br/><br/>
+                <div class='section'>
+                    <h3 class='section_title'><?=$lng["activities_past"]?></h3>
+<?php
+                    $i = 0;
+                    while ($r_past = mysqli_fetch_array($q_past)){
+?>
+                        <div class='entry past_activity' itemscope itemtype='http://schema.org/Event'>
+                            <meta itemprop='inLanguage' content='<?=$lang?>'/>
+                            <meta itemprop='name' content='<?=$r_past["title"]?>'/>
+                            <meta itemprop='startDate endDate' content='<?=$r_past["isodate"]?>'/>
+                            <span class='hidden' itemprop='location' itemscope itemtype='http://schema.org/Place'>
+                                <meta itemprop='address' itemprop='name' content='<?=$r_past["city"]?>'/>
+                                <meta itemprop='name' content='<?=$r_past["city"]?>'/>
+                            </span>
+                            <div class='hidden' itemprop='organizer' 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='03-02-2013'/>
+                                <meta itemprop='telephone' content='+34637140371'/>
+                                <meta itemprop='url' content='<?=$server?>'/>
+                            </div>
+<?php
+                            $q_activity_image = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $r_past[id] ORDER BY idx LIMIT 1;");
+                            if ($i == 0 && mysqli_num_rows($q_upcoming) == 0){
+                                $past_class = "past_activity_details past_activity_details_first";
+?>
+                                <h3 class='entry_title'>
+                                    <img id='slid_past_activity_<?=$r_past["id"]?>' class='slid' src='<?=$server?>/img/misc/slid-down.png' onclick='showPastActivity("<?=$r_past["id"]?>")'/>
+                                    &nbsp;&nbsp;
+                                    <a itemprop='url' href='<?=$server?>/actividades/<?=$r_past["permalink"]?>'><?=$r_past["title"]?></a>
+                                    <span class='title_date'> - <?=formatDate($r_past["date"], $lang, false)?></span>
+                                </h3>
+<?php
+                            }
+                            else{
+                                $past_class = "past_activity_details";
+?>
+                                <h3 class='entry_title'>
+                                    <img id='slid_past_activity_<?=$r_past["id"]?>' class='slid' src='<?=$server?>/img/misc/slid-right.png' onclick='showPastActivity("<?=$r_past["id"]?>");'/>
+                                    &nbsp;&nbsp;
+                                    <a itemprop='url' href='<?=$server?>/actividades/<?=$r_past["permalink"]?>'><?=$r_past["title"]?></a>
+                                    <span class='title_date'> - <?=formatDate($r_past["date"], $lang, false)?></span>
+                                </h3>
+<?php
+                            }
+                            $i ++;
+?>
+                            <div class='<?=$past_class?>' id='past_activity_details_$r_past[id]'>
+                                <table class='past_activity'>
+                                    <tr>
+<?php
+                                        if (mysqli_num_rows($q_activity_image) > 0){
+                                            $r_activity_image = mysqli_fetch_array($q_activity_image);
+?>
+                                            <td>
+                                                <div class='past_image'>
+                                                    <a href='<?=$server?>/actividades/<?=$r_past["permalink"]?>'>
+                                                        <meta itemprop='image' content='<?=$server?>/img/actividades/view/<?=$r_activity_image["image"]?>'/>
+                                                        <img src='<?=$server?>/img/actividades/miniature/<?=$r_activity_image["image"]?>' alt='<?=$r_past["title"]?>'/>
+                                                    </a>
+                                                </div>
+                                            </td>
+<?php
+                                        }
+?>
+                                        <td>
+                                            <div class='past_text'>
+<?php
+                                                if (strlen($r_past["text"]) > 0){
+?>
+                                                    <meta itemprop='description' content='<?=$r_past["text"]?>'/>
+                                                    <p><?=cutText($r_past["text"], 300, "$lng[index_read_more]", "$server/actividades/$r_past[permalink]")?></p>
+<?php
+                                                }
+                                                else{
+?>
+                                                    <meta itemprop='description' content='<?=$r_past["alt_text"]?>'/>
+                                                    <p><?=cutText($r_past["alt_text"], 300, "$lng[index_read_more]", "$server/actividades/$r_past[permalink]")?>"</p>
+<?php
+                                                }
+?>
+                                            </div> <!-- .past_text -->
+                                        </td>
+                                    </tr>
+                                </table> <!-- .past_activity -->
+                            </div> <!-- #past_activity_details -->
+                        </div> <!-- .past_activity -->
+<?php
+                    } // while ($r_past = mysqli_fetch_array($q_past))
+?>
+                </div> <!-- .section -->
+<?php
             }
-        ?>
-        </div>
-        <?php
-            include("../footer.php");
-            $ad = ad($con, $lang, $lng); 
-            stats($ad, $ad_static, "actividades", "$r_activity[id]");
-        ?>
+?>
+        </div> <!-- #content -->
+<?php
+        include("../footer.php");
+        $ad = ad($con, $lang, $lng); 
+        stats($ad, $ad_static, "actividades", "");
+?>
     </body>
 </html>

+ 1 - 0
www/lang/lang_en.php

@@ -113,6 +113,7 @@
     $lng['activities_maxpeople'] = 'Max. people';
     $lng['activities_inscription'] = 'Inscription requiered';
     $lng['activities_see_itinerary'] = 'Check out the itinerary';
+    $lng['activities_itinerary'] = 'Itinerary';
     $lng['activities_'] = '';
 
     

+ 1 - 0
www/lang/lang_es.php

@@ -113,6 +113,7 @@
     $lng['activities_maxpeople'] = 'Plazas';
     $lng['activities_inscription'] = 'Requiere inscripci&oacute;n';
     $lng['activities_see_itinerary'] = 'Ver el itinerario';
+    $lng['activities_itinerary'] = 'Itinerario';
     $lng['activities_'] = '';
 
 

+ 1 - 0
www/lang/lang_eu.php

@@ -107,6 +107,7 @@
     $lng['activities_maxpeople'] = 'Plazak';
     $lng['activities_inscription'] = 'Izen ematea beharrezkoa';
     $lng['activities_see_itinerary'] = 'Programazioa ikusi';
+    $lng['activities_itinerary'] = 'Itinerario';
     $lng['activities_'] = '';
 
     // /lablanca/programa.php