ソースを参照

Merge branch 'master' into Internal

Iñigo Valentin 9 年 前
コミット
9902f1e8fa
9 ファイル変更524 行追加372 行削除
  1. 62 47
      www/ayuda/index.php
  2. 19 2
      www/css/ayuda.css
  3. 7 36
      www/css/index.css
  4. 13 0
      www/css/m/ayuda.css
  5. 2 0
      www/footer.php
  6. 380 251
      www/index.php
  7. 12 11
      www/lang/lang_en.php
  8. 6 4
      www/lang/lang_es.php
  9. 23 21
      www/lang/lang_eu.php

+ 62 - 47
www/ayuda/index.php

@@ -4,12 +4,13 @@
     include("../functions.php");
     $con = startdb();
     $proto = getProtocol();
-    
+    $server = "$proto$http_host";
+
     //Language
     $lang = selectLanguage();
     include("../lang/lang_" . $lang . ".php");
     
-    $cur_section = $lng['section_us'];
+    $cur_section = $lng['section_help'];
 ?>
 <!DOCTYPE html>
 <html>
@@ -17,8 +18,8 @@
         <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['footer_help'];?> - Gasteizko Margolariak</title>
-        <link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
+        <title><?=$lng['footer_help']?> - Gasteizko Margolariak</title>
+        <link rel="shortcut icon" href="<?="$server/img/logo/favicon.ico";?>">
         <!-- CSS files -->
         <style>
             <?php 
@@ -40,72 +41,86 @@
             ?>
         </script>
         <!-- Meta tags -->
-        <link rel="canonical" href="<?php echo "$proto$http_host/us/"; ?>"/>
-        <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['us_description'];?>"/>
-        <meta property="og:title" content="<?php echo $lng['us_title'];?> - Gasteizko Margolariak"/>
-        <meta property="og:url" content="<?php echo "$proto$http_host"; ?>"/>
-        <meta property="og:description" content="<?php echo $lng['us_description'];?>"/>
-        <meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
-        <meta property="og:site_name" content="<?php echo $lng['us_title'];?>"/>
+        <link rel="canonical" href="<?=$server?>/us/"/>
+        <link rel="author" href="<?=$server?>"/>
+        <link rel="publisher" href="<?=$server?>"/>
+        <meta name="description" content="<?=$lng['us_description']?>"/>
+        <meta property="og:title" content="<?=$lng['us_title']?> - Gasteizko Margolariak"/>
+        <meta property="og:url" content="<?=$server?>"/>
+        <meta property="og:description" content="<?=$lng['us_description']?>"/>
+        <meta property="og:image" content="<?=$server?>/img/logo/logo.png"/>
+        <meta property="og:site_name" content="<?=$lng['us_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['us_title'];?> - Gasteizko Margolariak"/>
-        <meta name="twitter:description" content="<?php echo $lng['us_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['us_title']?> - Gasteizko Margolariak"/>
+        <meta name="twitter:description" content="<?=$lng['us_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"); ?>
+		<div id="shortcouts_container">
+			<div class="section" id="shortcouts">
+				<h3 class='section_title'><?=$lng['help_shortcouts']?></h3>
+				<div class="entry">
+					<ul>
+						<li><a href="#section_association"><?=$lng['help_contact_title']?></a></li>
+						<li><a href="#section_license"><?=$lng['help_license_title']?></a></li>
+						<li><a href="#section_privacy"><?=$lng['help_privacy_title']?></a></li>
+						<li><a href="#section_cookie"><?=$lng['help_cookie_title']?></a></li>
+						<li><a href="#section_ads"><?=$lng['help_ad_title']?></a></li>
+					</ul>
+				</div> <!-- .entry -->
+			 </div> <!-- .section -->
+		</div> <!-- #shortcouts_container -->
         <div id="content">
             <div class="content_row">
                 <div class="content_cell">
                     <div class="section" id="section_association">
-                        <h3 class='section_title'><?php echo $lng['help_contact_title']; ?></h3>
+                        <h3 class='section_title'><?=$lng['help_contact_title']?></h3>
                         <div class="entry">
                             <table id="association">
                                 <tr>
-                                    <td class="name"><?php echo $lng['help_contact_register']; ?></td>
-                                    <td class="value"><?php echo $lng['help_contact_register_value']; ?></td>
+                                    <td class="name"><?=$lng['help_contact_register']?></td>
+                                    <td class="value"><?=$lng['help_contact_register_value']?></td>
                                 </tr>
                                 <tr>
-                                    <td class="name"><?php echo $lng['help_contact_date_constitution']; ?></td>
-                                    <td class="value"><?php echo $lng['help_contact_date_constitution_value']; ?></td>
+                                    <td class="name"><?=$lng['help_contact_date_constitution']?></td>
+                                    <td class="value"><?=$lng['help_contact_date_constitution_value']?></td>
                                 </tr>
                                 <tr>
-                                    <td class="name"><?php echo $lng['help_contact_date_inscription']; ?></td>
-                                    <td class="value"><?php echo $lng['help_contact_date_inscription_value']; ?></td>
+                                    <td class="name"><?=$lng['help_contact_date_inscription']?></td>
+                                    <td class="value"><?=$lng['help_contact_date_inscription_value']?></td>
                                 </tr>
                                 <tr>
-                                    <td class="name"><?php echo $lng['help_contact_city']; ?></td>
-                                    <td class="value"><?php echo $lng['help_contact_city_value']; ?></td>
+                                    <td class="name"><?=$lng['help_contact_city']?></td>
+                                    <td class="value"><?=$lng['help_contact_city_value']?></td>
                                 </tr>
                                 <tr>
-                                    <td class="name"><?php echo $lng['help_contact_territory']; ?></td>
-                                    <td class="value"><?php echo $lng['help_contact_territory_value']; ?></td>
+                                    <td class="name"><?=$lng['help_contact_territory']?></td>
+                                    <td class="value"><?=$lng['help_contact_territory_value']?></td>
                                 </tr>
                                 <tr>
-                                    <td class="name"><?php echo $lng['help_contact_country']; ?></td>
-                                    <td class="value"><?php echo $lng['help_contact_country_value']; ?></td>
+                                    <td class="name"><?=$lng['help_contact_country']?></td>
+                                    <td class="value"><?=$lng['help_contact_country_value']?></td>
                                 </tr>
                                 <tr>
-                                    <td class="name"><?php echo $lng['help_contact_clasification']; ?></td>
-                                    <td class="value"><?php echo $lng['help_contact_clasification_value']; ?></td>
+                                    <td class="name"><?=$lng['help_contact_clasification']?></td>
+                                    <td class="value"><?=$lng['help_contact_clasification_value']?></td>
                                 </tr>
                                 <tr>
-                                    <td class="name"><?php echo $lng['help_contact_objectives']; ?></td>
-                                    <td class="value"><?php echo $lng['help_contact_objectives_value']; ?></td>
+                                    <td class="name"><?=$lng['help_contact_objectives']?></td>
+                                    <td class="value"><?=$lng['help_contact_objectives_value']?></td>
                                 </tr>
                                 <tr>
-                                    <td class="name"><?php echo $lng['help_contact_phone']; ?></td>
-                                    <td class="value"><?php echo $lng['help_contact_phone_value']; ?></td>
+                                    <td class="name"><?=$lng['help_contact_phone']?></td>
+                                    <td class="value"><?=$lng['help_contact_phone_value']; ?></td>
                                 </tr>
                                 <tr>
-                                    <td class="name"><?php echo $lng['help_contact_email']; ?></td>
-                                    <td class="value"><?php echo $lng['help_contact_email_value']; ?></td>
+                                    <td class="name"><?=$lng['help_contact_email']?></td>
+                                    <td class="value"><?=$lng['help_contact_email_value']?></td>
                                 </tr>
                             </table>
                         </div>
@@ -113,9 +128,9 @@
                 </div>
                 <div class="content_cell">
                     <div class="section" id="section_license">
-                        <h3 class='section_title'><?php echo $lng['help_license_title']; ?></h3>
+                        <h3 class='section_title'><?=$lng['help_license_title']?></h3>
                         <div class="entry">
-                            <?php echo $lng['help_license']; ?>
+                            <?=$lng['help_license']?>
                         </div>
                     </div>
                 </div>
@@ -123,17 +138,17 @@
             <div class="content_row">
                 <div class="content_cell">
                     <div class="section" id="section_privacy">
-                        <h3 class="section_title"><?php echo $lng['help_privacy_title']; ?></h3>
+                        <h3 class="section_title"><?=$lng['help_privacy_title']?></h3>
                         <div class="entry">
-                            <?php echo $lng['help_privacy']; ?>
+                            <?=$lng['help_privacy']; ?>
                         </div>
                     </div>
                 </div>
                 <div class="content_cell">
                     <div class="section" id="section_cookie">
-                        <h3 class='section_title'><?php echo $lng['help_cookie_title']; ?></h3>
+                        <h3 class='section_title'><?=$lng['help_cookie_title']?></h3>
                         <div class="entry">
-                            <?php echo $lng['help_cookie']; ?>
+                            <?=$lng['help_cookie']; ?>
                         </div>
                     </div>
                 </div>
@@ -141,9 +156,9 @@
             <div class="content_row">
                 <div class="content_cell">
                     <div class="section" id="section_ads">
-                        <h3 class="section_title"><?php echo $lng['help_ad_title']; ?></h3>
+                        <h3 class="section_title"><?=$lng['help_ad_title']?></h3>
                         <div class="entry">
-                            <?php echo $lng['help_ad']; ?>
+                            <?=$lng['help_ad']?>
                         </div>
                     </div>
                 </div>

+ 19 - 2
www/css/ayuda.css

@@ -12,12 +12,29 @@ div#content div.content_row div.content_cell{
     display:    table-cell;
 }
 
+div#shortcouts_container{
+    width: 100%;
+    text-align: center;
+}
+
+div#shortcouts_container div#shortcouts{
+    width: 70%;
+    margin: auto;
+}
+
+div#shortcouts_container div#shortcouts
+
+
 div#content div.content_row div.content_cell div.section{
     width:    100%;
 }
 
-div.section div.entry{
-    min-height:    16em;
+div#content div.section div.entry{
+	padding: 1.5em;
+}
+
+div#content div.section div.entry ul li{
+	margin-top: 1em;
 }
 
 div.section div.entry table#association{

+ 7 - 36
www/css/index.css

@@ -1,44 +1,15 @@
-/* Location section */
-
-/* Festival section */
-/*div#festivals{
-    width:    100%;
-}
-
-table.festival_section_table tr{
-    width:    100%;
-    height:    100%;
-}
-
-table.festival_section_table tr td{
-    min-width:        50%;
-    height:            100%;
-    vertical-align:    top;
-    padding-bottom: 1em;
-}
-
-table.festival_section_table tr td div.entry{
-    height:    95%;
-}
-
-table.festival_section_table tr td div#festivals_summary{
-     min-height:        15em;
-}
-
-table.festival_section_table tr td div#festivals_summary img{*/
 div#festivals div#festivals_summary img{
-    display:        inline-block;
-    max-width:        40%;
-    max-height:        15em;
-    vertical-align:    top;
-    wfloat:            left;
-    margin-right:    2em;
+    display: inline-block;
+    max-width: 40%;
+    max-height: 15em;
+    vertical-align: top;
     border: 0.1em solid black;
-    margin:    0.5em;
+    margin: 0.5em;
 }
 
 div#festivals span#festivals_summary_text{
     display:    inline-block;
+    width: 60%;
 }
 
 div#festivals div#festivals_schedule_table{
@@ -209,13 +180,13 @@ div#us p{
 }
 
 div#us div{
-    position:    absolute;
     top:        4em;
     right:        3em;
     text-align:    center;
 }
 
 div#us div img{
+    position: absolute;
     opacity:    0.4;
     max-height:    100px;
     max-width:    100px;

+ 13 - 0
www/css/m/ayuda.css

@@ -1,3 +1,16 @@
+div#shortcouts_container{
+    width: 95%;
+    margin: auto auto 2em auto;
+}
+
+div#shortcouts_container div#shortcouts{
+    width: 100%;
+}
+
+div#shortcouts_container div#shortcouts li{
+    margin: 0.3em auto 0.3em auto;
+}
+
 div#content{
     display:    block;
 }

+ 2 - 0
www/footer.php

@@ -48,6 +48,8 @@
                 <img class='lang' alt='Euskara' src='/img/lang/eu.gif' onClick='changeLanguage("eu", "<?php echo $http_host; ?>");'/>
                 <br class='desktop'/>
                 <a title="Google Play" href="https://play.google.com/store/apps/details?id=com.ivalentin.margolariak"><img class='app' alt="<?php echo $lng['footer_app_google']; ?>" src='/img/app/android.gif' /></a>
+								<br class='desktop'/>
+                <a title="App Store" href="https://itunes.apple.com/us/app/gasteizko-margolariak/id1227846624"><img class='app' alt="<?php echo $lng['footer_app_apple']; ?>" src='/img/app/ios.gif' /></a>
             </div>
         </div>
     </div>

+ 380 - 251
www/index.php

@@ -1,16 +1,15 @@
 <?php
     session_start();
-    #$proto = $_SERVER['SERVER_PROTOCOL'];
-    #$proto = strtolower(substr($_SERVER["SERVER_PROTOCOL"],0,strpos( $_SERVER["SERVER_PROTOCOL"],'/'))).'://';
     $http_host = $_SERVER['HTTP_HOST'];
     include("functions.php");
     $proto = getProtocol();
     $con = startdb();
-    
+    $server = "$server";
+
     //Language
     $lang = selectLanguage();
     include("lang/lang_" . $lang . ".php");
-    
+
     $cur_section = $lng['section_home'];
 ?>
 <!DOCTYPE html>
@@ -18,51 +17,51 @@
     <head>
         <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['index_title'];?></title>
-        <link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1"/>
+        <title><?=$lng['index_title']?></title>
+        <link rel="shortcut icon" href="<?=$server?>/img/logo/favicon.ico"/>
         <!-- CSS files -->
         <style>
-<?php 
-                include("css/ui.css"); 
-                include("css/index.css");
+<?php
+            include("css/ui.css");
+            include("css/index.css");
 ?>
         </style>
         <!-- CSS for mobile version -->
         <style media="(max-width : 990px)">
-<?php 
-                include("css/m/ui.css"); 
-                include("css/m/index.css");
+<?php
+            include("css/m/ui.css");
+            include("css/m/index.css");
 ?>
         </style>
         <!-- Script files -->
         <script type="text/javascript">
-<?php include("script/ui.js"); ?>
+            <?php include("script/ui.js"); ?>
         </script>
         <!-- Meta tags -->
-        <link rel="canonical" href="<?php echo "$proto$http_host"; ?>"/>
-        <link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
-        <link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
+        <link rel="canonical" href="<?=$server?>"/>
+        <link rel="author" href="<?=$server?>"/>
+        <link rel="publisher" href="<?=$server?>"/>
         <meta name="description" content="<?php echo $lng['index_us_content'];?>"/>
         <meta property="og:title" content="<?php echo $lng['index_title'];?>"/>
-        <meta property="og:url" content="<?php echo "$proto$http_host"; ?>"/>
-        <meta property="og:description" content="<?php echo $lng['index_us_content'];?>"/>
-        <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'];?>"/>
+        <meta property="og:url" content="<?=$server?>"/>
+        <meta property="og:description" content="<?=$lng['index_us_content']?>"/>
+        <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 name="twitter:card" content="summary"/>
-        <meta name="twitter:title" content="<?php echo $lng['index_title'];?>"/>
-        <meta name="twitter:description" content="<?php echo $lng['index_us_content'];?>"/>
-        <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['index_title']?>"/>
+        <meta name="twitter:description" content="<?=$lng['index_us_content']?>"/>
+        <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        
+<?php
                 //Location section
                 $q_location = mysqli_query($con, "SELECT lat, lon FROM location WHERE action = 'report' AND dtime > NOW() - INTERVAL 30 MINUTE ORDER BY dtime DESC LIMIT 1;");
                 if (mysqli_num_rows($q_location) > 0){
@@ -95,21 +94,31 @@
                         <h3 class='section_title'><?=$lng['index_festivals_header']?> <?=$year?></h3>
                         <div class='entry' id='festivals_summary'>
 <?php
-                    
                             //Summary
                             $q_festivals = mysqli_query($con, "SELECT text_$lang AS text, summary_$lang AS summary, img FROM festival WHERE year = $year;");
                             if(mysqli_num_rows($q_festivals)){
                                 $r_festivals = mysqli_fetch_array($q_festivals);
                                 if ($r_festivals['img'] != ''){
-                                    echo("<meta itemprop='image' content='$proto$http_host/img/fiestas/$r_festivals[img]'/>\n");
-                                    echo("<img id='festivals_image' alt=' ' src='$proto$http_host/img/fiestas/$r_festivals[img]'/>\n");
+?>
+                                    <meta itemprop='image' content='<?=$server?>/img/fiestas/<?=$r_festivals['img']?>'/>
+                                    <img id='festivals_image' alt='<?=$lng['index_festivals_header'] . ' ' . $year?>' src='<?=$server?>/img/fiestas/<?=$r_festivals['img']?>'/>
+<?php
                                 }
                                 if ($r_festivals['summary'] != ''){
-                                    echo "<span class='entry_title' id='festivals_summary_text'><br/>$r_festivals[summary]</span>\n";
-                                    echo "<br/><br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='$proto$http_host/lablanca/'>$lng[index_festivals_link]</a>\n";
+?>
+                                    <br/><span class='entry_title' id='festivals_summary_text'><?=$r_festivals['summary']?></span>
+                                    <br/><br/><br/>
+                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='<?=$server?>/lablanca/'><?=$lng['index_festivals_link']?></a>
+<?php
                                 }
                                 else{
-                                    echo "<span id='festivals_summary_text'><br/>" . cutText($r_festivals['text'], 300, "$lng[index_read_more]", "$proto$http_host/lablanca/") . "</span>\n";
+?>
+                                    <span id='festivals_summary_text'>
+                                        <br/>
+                                        <span class='mobile'><?=cutText($r_festivals['text'], 300, "$lng[index_read_more]", "$server/lablanca/")?></span>
+                                        <span class='desktop'><?=cutText($r_festivals['text'], 500, "$lng[index_read_more]", "$server/lablanca/")?></span>
+                                    </span>
+<?php
                                 }
                             }
 ?>
@@ -121,11 +130,11 @@
                                     //GM schedule
                                     $q_sch_curr = mysqli_query($con, "SELECT festival_event.id AS id, gm, title_$lang AS title, description_$lang AS description, host, place, date_format(start, '%H:%i') AS st, date_format(end, '%H:%i') AS end, DATE_FORMAT(start, '%Y-%m-%dT%H:%i:00') AS isostart, DATE_FORMAT(end, '%Y-%m-%dT%H:%i:00') AS isoend, place.name_$lang AS place, address_$lang AS address, lat, lon FROM festival_event, place WHERE place.id = festival_event.place AND gm = 1 AND start > NOW() - INTERVAL 45 MINUTE AND start < NOW() + INTERVAL 30 MINUTE ORDER BY start LIMIT 1;");
                                     $q_sch_next = mysqli_query($con, "SELECT festival_event.id AS id, gm, title_$lang AS title, description_$lang AS description, host, place, date_format(start, '%H:%i') AS st, date_format(end, '%H:%i') AS end, DATE_FORMAT(start, '%Y-%m-%dT%H:%i:00') AS isostart, DATE_FORMAT(end, '%Y-%m-%dT%H:%i:00') AS isoend, place.name_$lang AS place, address_$lang AS address, lat, lon FROM festival_event, place WHERE place.id = festival_event.place AND gm = 1 AND start > NOW() AND start < NOW() + INTERVAL 240 MINUTE ORDER BY start LIMIT 1;");
-
                                     if (mysqli_num_rows($q_sch_curr) > 0 || mysqli_num_rows($q_sch_next) > 0){
-                                        echo("<div class='entry festival_schedule' id='festivals_gm'>\n");
-                                        echo("<h3 class='entry_title'>$lng[index_festivals_gm_schedule]</h3>\n");
-                                        
+?>
+                                        <div class='entry festival_schedule' id='festivals_gm'>
+                                            <h3 class='entry_title'><?=$lng['index_festivals_gm_schedule']?></h3>
+<?php
                                         if (mysqli_num_rows($q_sch_curr) > 0){
                                             $r_sch_curr = mysqli_fetch_array($q_sch_curr);
 ?>
@@ -139,32 +148,41 @@
                                                 </span>
 <?php
                                                 if (strlen($r_sch_curr['isoend']) > 0){
-                                                    echo("<meta itemprop='endDate' content='$r_sch_curr[isoend]'/>\n");
+?>
+                                                    <meta itemprop='endDate' content='<?=$r_sch_curr['isoend']?>'/>
+<?php
                                                 }
 ?>
                                                 <div class='schedule_content'>
                                                     <span class='title'><?=$r_sch_curr['title']?></span>
 <?php
                                                     if (strlen($r_sch_curr["description"]) > 0 && $r_sch_curr["description"] != $r_sch_curr["title"]){
-                                                        echo("<br/><p class='description'>$r_sch_curr[description]</p>\n");
-                                                        echo("<meta itemprop='description' content='$r_sch_curr[description]'/>\n");
+?>
+                                                        <br/><p class='description'><?=$r_sch_curr['description']?></p>
+                                                        <meta itemprop='description' content='<?=$r_sch_curr['description']?>'/>
+<?php
                                                     }
 ?>
                                                     <table class='location'>
                                                         <tr>
                                                             <td>
-                                                                <a target='_blank' href='http://maps.google.com/maps?q=<?=$r_sch_curr[lat]?>,<?=$r_sch_curr[lon]?>+(My+Point)&z=14&ll=<?=$r_sch_curr[lat]?>,<?=$r_sch_curr[lon]?>'>
-                                                                    <img alt=' ' src='<?=$proto?><?=$http_host?>/img/misc/pinpoint.png'/>
+                                                                <a target='_blank' href='http://maps.google.com/maps?q=<?=$r_sch_curr[lat]?>,<?=$r_sch_curr[lon]?>+Gasteizko+Margolariak)&z=14&ll=<?=$r_sch_curr[lat]?>,<?=$r_sch_curr[lon]?>'>
+                                                                    <img alt='<?=$r_sch_curr['title']?>'' src='<?=$proto?><?=$http_host?>/img/misc/pinpoint.png'/>
                                                                 </a>
                                                             </td>
                                                             <td>
 <?php
                                                                 //If name and address are the same, show only name
                                                                 if ($r_sch_curr['place'] == $r_sch_curr['address']){
-                                                                    echo("$r_sch_curr[place]\n");
+?>
+                                                                    <?=$r_sch_curr['place']?>
+<?php
                                                                 }
                                                                 else{
-                                                                    echo("$r_sch_curr[place] <br/><span class='address'> $r_sch_curr[address]</span>\n");
+?>
+                                                                    <?=$r_sch_curr['place']?><br/>
+                                                                    <span class='address'><?=$r_sch_curr['address']?></span>
+<?php
                                                                 }
 ?>
                                                             </td>
@@ -177,7 +195,6 @@
                                         if (mysqli_num_rows($q_sch_next) > 0){
                                             $r_sch_next = mysqli_fetch_array($q_sch_next);
 ?>
-                                            
                                             <div class='festival_event' itemprop='subEvent' itemscope itemtype='http://schema.org/Event'>
                                                 <h4><?=$lng['index_festivals_schedule_next']?></h4>
                                                 <meta itemprop='inLanguage' content='<?=$lang?>'/>
@@ -188,15 +205,19 @@
                                                 </span>
 <?php
                                                 if (strlen($r_sch_curr['isoend']) > 0){
-                                                    echo("<meta itemprop='endDate' content='$r_sch_next[isoend]'/>\n");
+?>
+                                                    <meta itemprop='endDate' content='<?=$r_sch_next['isoend']?>'/>
+<?php
                                                 }
 ?>
                                                 <div class='schedule_content'>
                                                     <span class='title'><?=$r_sch_next['title']?> - <?=$r_sch_next['st']?></span>
 <?php
                                                     if (strlen($r_sch_next["description"]) > 0 && $r_sch_next["description"] != $r_sch_next["title"]){
-                                                        echo("<br/><p class='description'>$r_sch_next[description]</p>\n");
-                                                        echo("<meta itemprclass='entry'op='description' content='$r_sch_next[description]'/>\n");
+?>
+                                                        <br/><p class='description'><?=$r_sch_next['description']?></p>
+                                                        <meta itemprclass='entry'op='description' content='<?=$r_sch_next['description']?>'/>
+<?php
                                                     }
 ?>
                                                     <table class='location'>
@@ -231,15 +252,12 @@
                                 </div> <!-- festivals_schedule_cell -->
                                 <div class='festivals_schedule_cell'>
 <?php
-                                                
                                     //City schedule
                                     $q_sch_curr = mysqli_query($con, "SELECT festival_event.id AS id, gm, title_$lang AS title, description_$lang AS description, host, place, date_format(start, '%H:%i') AS st, date_format(end, '%H:%i') AS end, DATE_FORMAT(start, '%Y-%m-%dT%H:%i:00') AS isostart, DATE_FORMAT(end, '%Y-%m-%dT%H:%i:00') AS isoend, place.name_$lang AS place, address_$lang AS address, lat, lon FROM festival_event, place WHERE place.id = festival_event.place AND gm = 0 AND start > NOW() - INTERVAL 45 MINUTE AND start < NOW() + INTERVAL 30 MINUTE ORDER BY start LIMIT 1;");
                                     $q_sch_next = mysqli_query($con, "SELECT festival_event.id AS id, gm, title_$lang AS title, description_$lang AS description, host, place, date_format(start, '%H:%i') AS st, date_format(end, '%H:%i') AS end, DATE_FORMAT(start, '%Y-%m-%dT%H:%i:00') AS isostart, DATE_FORMAT(end, '%Y-%m-%dT%H:%i:00') AS isoend, place.name_$lang AS place, address_$lang AS address, lat, lon FROM festival_event, place WHERE place.id = festival_event.place AND gm = 0 AND start > NOW() AND start < NOW() + INTERVAL 240 MINUTE ORDER BY start LIMIT 1;");
                                     if (mysqli_num_rows($q_sch_curr) > 0 || mysqli_num_rows($q_sch_next) > 0){
                                         echo "<div class='entry festival_schedule' id='festivals_city'>\n";
-                                        
                                         echo "<h3 class='entry_title'>$lng[index_festivals_city_schedule]</h3>\n";
-                                    
                                         if (mysqli_num_rows($q_sch_curr) > 0){
                                             $r_sch_curr = mysqli_fetch_array($q_sch_curr);
 ?>
@@ -259,7 +277,6 @@
                                                 <div class='schedule_content'>
                                                     <span class='title'><?=$r_sch_curr['title']?></span>
 <?php
-
                                                     if (strlen($r_sch_curr["description"]) > 0 && $r_sch_curr["description"] != $r_sch_curr["title"]){
                                                         echo("<br/><p class='description'>$r_sch_curr[description]</p>\n");
                                                         echo("<meta itemprop='description' content='$r_sch_curr[description]'/>\n");
@@ -289,8 +306,6 @@
                                             </div> <!-- festival-event -->
 <?php
                                         }
-
-                                        
                                         if (mysqli_num_rows($q_sch_next) > 0){
                                             $r_sch_next = mysqli_fetch_array($q_sch_next);
 ?>
@@ -349,240 +364,354 @@
                         </div> <!-- festivals_schedule_table -->
                         <a class='go_to_section' href='<?=$proto?><?=$http_host?>/lablanca/'><?=$lng['index_festivals_link']?></a>
                         <br/>
-                        
                     </div> <!-- festivals - section-->
 <?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;");
                 $upcoming_activity_shown = false;
                 if (mysqli_num_rows($q_activity) > 0){
                     $upcoming_activity_shown = true;
                     $r_activity = mysqli_fetch_array($q_activity);
-                    echo "<div class='section'>\n";
-                    echo "<h3 class='section_title'>$lng[index_upcoming_activity]</h3>\n";
-                    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]'/></span>\n");
-                    echo "<meta itemprop='url' content='$proto$http_host/actividades/$r_activity[permalink]'/>\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='2013-02-03'/>\n";
-                    echo "<meta itemprop='telephone' content='+34637140371'/>\n";
-                    echo "</div>\n";
-                    echo "<div id='upcoming_activity' class='table'><div class='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 "<div class='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/$r_activity_image[image]'/>\n";
-                        echo "<img src='$proto$http_host/img/actividades/miniature/$r_activity_image[image]' alt='$r_activity[title]'/>\n";
-                        echo "</a>\n";
-                        echo "</div></div>\n";
-                    }
-                    echo "<div class='td'><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></h3>\n";
-                    echo "<p>". cutText($r_activity['text'], 250, "$lng[index_read_more]", "$http_host/actividades/$r_activity[permalink]") . "</p>\n";
-                    echo "</div></div>\n";
-                    echo "<div class='td'><div id='upcoming_details'>\n";
-                    echo "<table>\n";
-                    echo "<tr><td>\n";
-                    echo "$lng[index_upcoming_activity_date]</td><td>" . formatDate($r_activity['date'], $lang, false) . "\n";
-                    echo "</td></tr>\n";
-                    echo "<tr>\n";
-                    echo "<td>$lng[index_upcoming_activity_price]</td>";
-                    if ($r_activity['price'] == 0){
-                        echo "<td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>$lng[index_upcoming_activity_free]\n";
-                        echo "<meta itemprop='priceCurrency' content='EUR'/><meta itemprop='price' content='0'/><meta itemprop='url' content='$proto$http_host/actividades/$r_activity[permalink]'/>\n</td>\n";
-                        echo "</tr><tr>\n";
-                        echo "<td>$lng[index_upcoming_activity_inscription]</td>";
-                        if ($r_activity['inscription'] == 1)
-                            echo "<td>$lng[yes]</td>\n";
-                        else
-                            echo "<td>$lng[no]</td>\n";
-                    }
-                    else{
-                        echo "<td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>$r_activity[price] €\n";
-                        echo "<meta itemprop='priceCurrency' content='EUR'/><meta itemprop='price' content='$r_activity[price]'/></td>\n";
-                    }
-                    echo "</tr>\n";
-                    if ($r_activity['max_people'] > 0){
-                        echo "<tr><td>$lng[index_upcoming_activity_max_people]</td><td>$r_activity[max_people]</td></tr>\n";
-                    }
-                    echo "</table>\n";
-                    echo "<a href='$proto$http_host/actividades/$r_activity[permalink]'>$lng[index_upcoming_activity_see]</a><br/><br/>\n";
-                    
-                    echo "</div></div></div></div>\n";
-                    echo "</div>\n";//Entry
-                    echo "<a class='go_to_section' href='$proto$http_host/actividades/'>$lng[index_upcoming_activity_see_all]</a><br/>\n";
-                    echo "</div>\n";//Section
+?>
+                    <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' 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='url' content='<?=$server?>/actividades/<?=$r_activity['permalink']?>'/>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td><?=$lng['index_upcoming_activity_inscription']?>s</td>
+<?php
+                                                        if ($r_activity['inscription'] == 1){
+?>
+                                                            <td><?=$lng['yes']?></td>
+<?php
+                                                        }
+                                                        else{
+?>
+                                                            <td><?=$lng['no']?></td>
+<?php
+                                                        }
+                                                    }
+                                                    else{
+?>
+                                                        <td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>
+                                                            <?=$r_activity['price']?> €
+                                                                <meta itemprop='priceCurrency' content='EUR'/>
+                                                                <meta itemprop='price' content='<?=$r_activity['price']?>'/>
+                                                        </td>
+<?php
+                                                    }
+?>
+                                                </tr>
+<?php
+                                                if ($r_activity['max_people'] > 0){
+?>
+                                                    <tr>
+                                                        <td><?=$lng['index_upcoming_activity_max_people']?></td>
+                                                        <td><?=$r_activity['max_people']?></td>
+                                                    </tr>
+<?php
+                                                }
+?>
+                                            </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 -->
+<?php
                 }
 ?>
-            <div class='section' itemscope itemtype='http://schema.org/Organization'>
-                <meta itemprop='url' content='<?php echo("$proto$http_host"); ?>'/>
-                <h3 class='section_title' itemprop='name'><?php echo($lng['index_us']); ?></h3>
-                <div class='entry' id='us'>
-                    <p itemprop='description'><?php echo($lng['index_us_content']); ?></p>
-                    <div><img itemprop='logo' src='<?php echo("$proto$http_host/img/logo/GasteizkoMargolariak.png"); ?>'/></div>
-                </div>
-                <a class='go_to_section' href='<?php echo($proto.$http_host); ?>/nosotros/'><?php echo($lng['index_us_more']) ?></a>
-                <br/>
-            </div>
+                <div class='section' itemscope itemtype='http://schema.org/Organization'>
+                    <meta itemprop='url' content='<?=$server?>'/>
+                    <h3 class='section_title' itemprop='name'><?=$lng['index_us']?></h3>
+                    <div class='entry' id='us'>
+                        <p itemprop='description'><?=$lng['index_us_content']?></p>
+                    </div> <!-- .entry -->
+                    <a class='go_to_section' href='<?=$server?>/nosotros/'><?=$lng['index_us_more']?></a>
+                    </br>
+                </div> <!-- .section -->
+								<br/>
             <div id='content_table'>
                 <div class='content_row'>
                     <div class='content_cell' id='cell_posts'>
                         <div class='section' id='latest_posts'>
-        <?php
-                                echo "<h3 class='section_title'>$lng[index_latest_posts]</h3>\n";
+                            <h3 class='section_title'><?=$lng['index_latest_posts']?></h3>
+<?php
                                 $q_post = mysqli_query($con, "SELECT id, permalink, title_$lang AS title, text_$lang AS text, dtime, DATE_FORMAT(dtime, '%Y-%m-%dT%T') AS isodate FROM post WHERE visible = 1 ORDER BY dtime DESC LIMIT 2;");
                                 if (mysqli_num_rows($q_post) == 0){
-                                    echo "<div class='entry'><h3 class='entry_title'>$lng[index_no_post]</div>\n";
+?>
+                                    <div class='entry'>
+                                        <h3 class='entry_title'><?=$lng['index_no_post']?></h3>
+                                    </div>
+<?php
                                 }
                                 else{
                                     while ($r_post = mysqli_fetch_array($q_post)){
-                                        echo "<div class='entry post' itemscope itemtype='http://schema.org/BlogPosting'>\n";
-                                        echo "<meta itemprop='inLanguage' content='$lang'/>\n";
-                                        echo "<meta itemprop='datePublished dateModified' content='$r_post[isodate]'/>\n";
-                                        echo "<meta itemprop='headline name' content='$r_post[title]'/>\n";
-                                        echo "<meta itemprop='articleBody text' content='$r_post[text]'/>\n";
-                                        echo "<meta itemprop='mainEntityOfPage' content='$proto$http_host'/>\n";
-                                        echo "<div class='hidden' itemprop='author publisher' 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_post_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $r_post[id] ORDER BY idx LIMIT 1;");
-                                        if (mysqli_num_rows($q_post_image) > 0){
-                                            $r_post_image = mysqli_fetch_array($q_post_image);
-                                            echo "<meta itemprop='image' content='$proto$http_host/img/blog/preview/$r_post_image[image]'/>\n";
-                                            echo "<a href='$proto$http_host/blog/$r_post[permalink]'><img src='$proto$http_host/img/blog/miniature/$r_post_image[image]'/></a>\n";
-                                        }
-                                        echo "<h3 class='entry_title'><a itemprop='url' href='$proto$http_host/blog/$r_post[permalink]'>$r_post[title]</a></h3>\n";
-                                        echo "<p>". cutText($r_post['text'], 100, "$lng[index_read_more]", "$proto$http_host/blog/$r_post[permalink]") . "</p>\n";
-                                        echo "<span>" . formatDate($r_post['dtime'], $lang, false) . "</span>\n";
-                                        echo "</div>\n";
-                                    }
-                                echo "<a class='go_to_section' href='$proto$http_host/blog/'>$lng[index_see_all_posts]</a><br/>\n";
-                                }
-        ?>
-                        </div>
-                    </div>
+?>
+                                        <div class='entry post' itemscope itemtype='http://schema.org/BlogPosting'>
+                                            <meta itemprop='inLanguage' content='<?=$lang?>'/>
+                                            <meta itemprop='datePublished dateModified' content='<?=$r_post['isodate']?>'/>
+                                            <meta itemprop='headline name' content='<?=$r_post['title']?>'/>
+                                            <meta itemprop='articleBody text' content='<?=$r_post[text]?>'/>
+                                            <meta itemprop='mainEntityOfPage' content='<?=$server?>'/>
+                                            <div class='hidden' itemprop='author publisher' 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_post_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $r_post[id] ORDER BY idx LIMIT 1;");
+                                            if (mysqli_num_rows($q_post_image) > 0){
+                                                $r_post_image = mysqli_fetch_array($q_post_image);
+?>
+                                                <meta itemprop='image' content='<?=$server?>/img/blog/preview/<?=$r_post_image['image']?>'/>
+                                                <a href='<?=$server?>/blog/<?=$r_post['permalink']?>'>
+                                                    <img src='<?=$server?>/img/blog/miniature/<?=$r_post_image['image']?>'/>
+                                                </a>
+<?php
+                                            } //if (mysqli_num_rows($q_post_image) > 0)
+?>
+                                            <h3 class='entry_title'>
+                                                <a itemprop='url' href='<?=$server?>/blog/<?=$r_post['permalink']?>'><?=$r_post['title']?></a>
+                                            </h3>
+                                            <p class='mobile'><?=cutText($r_post['text'], 100, $lng['index_read_more'], "$server/blog/$r_post[permalink]")?></p>
+                                            <p class='desktop'><?=cutText($r_post['text'], 150, $lng['index_read_more'], "$server/blog/$r_post[permalink]")?></p>
+                                            <span><?=formatDate($r_post['dtime'], $lang, false)?></span>
+                                        </div> <!-- .entry -->
+<?php
+                                    } //while ($r_post = mysqli_fetch_array($q_post))
+?>
+
+                                    <a class='go_to_section' href='<?=$server?>/blog/'><?$lng['index_see_all_posts']?></a>
+                                    <br/>
+<?php
+                                } //if (mysqli_num_rows($q_post) == 0) ELSE
+?>
+                            </div> <!-- .section-->
+                    </div> <!-- .cell_posts-->
                     <div class='content_cell' id='cell_photos'>
                         <div class='section' id='latest_photos'>
-        <?php
-                                echo "<h3 class='section_title'>$lng[index_latest_photos]</h3>\n";
-                                $q_photos = mysqli_query($con, "SELECT id, file, title_$lang AS title, DATE_FORMAT(uploaded, '%Y-%m-%d') AS isodate FROM photo ORDER BY uploaded DESC LIMIT 6;");
-                                //TODO WHERE approved = 1
+                            <h3 class='section_title'><?=$lng['index_latest_photos']?></h3>
+<?php
+                                $q_photos = mysqli_query($con, "SELECT id, file, title_$lang AS title, DATE_FORMAT(uploaded, '%Y-%m-%d') AS isodate FROM photo WHERE approved = 1 ORDER BY uploaded DESC LIMIT 6;");
                                 if (mysqli_num_rows($q_photos) == 0){
-                                    echo "<div class='entry'>$lng[index_no_photos]</div>\n";
+?>
+                                    <div class='entry'><?=$lng['index_no_photos']?></div>
+<?php
                                 }
                                 else{
-                                    echo "<div class='entry'>\n";
-                                    echo "<table id='table_photos'>\n";
-                                    echo "<tr>\n";
-                                    $i = 0;
-                                    while ($r_photos = mysqli_fetch_array($q_photos)){
-                                        $q_album = mysqli_query($con, "select permalink from album, photo_album WHERE photo = $r_photos[id] AND id = album LIMIT 1;");
-                                        $r_album = mysqli_fetch_array($q_album);
-                                        echo "<td itemscope itemtype='http://schema.org/Photograph'>\n";
-                                        echo "<meta itemprop='datePublished' content='$r_photos[isodate]'/>\n";
-                                        echo "<a href='$proto$http_host/galeria/$r_album[permalink]'>\n";
-                                        echo "<meta itemprop='image' content='http://$http_host/img/galeria/$r_photos[file]'/>\n";
-                                        echo "<img src='$proto$http_host/img/galeria/miniature/$r_photos[file]' alt='$r_photos[title]' /></a></td>\n";
-                                        $i ++;
-                                        if ($i % 2 == 0)
-                                        echo "</tr><tr>";
-                                    }
-                                    echo "</tr>\n";
-                                    echo "</table>\n";
-                                    echo "</div>\n";
-                                    echo "<a class='go_to_section' href='$proto$http_host/galeria/'>$lng[index_see_all_photos]</a><br/>\n";
-                                }
-        ?>
-                        </div>
-                    </div>
-                </div>
-            </div>
+?>
+                                    <div class='entry'>
+                                        <table id='table_photos'>
+                                            <tr>
+<?php
+                                                $i = 0;
+                                                while ($r_photos = mysqli_fetch_array($q_photos)){
+                                                    $q_album = mysqli_query($con, "select permalink from album, photo_album WHERE photo = $r_photos[id] AND id = album LIMIT 1;");
+                                                    $r_album = mysqli_fetch_array($q_album);
+?>
+                                                    <td itemscope itemtype='http://schema.org/Photograph'>
+                                                        <meta itemprop='datePublished' content='<?=$r_photos['isodate']?>'/>
+                                                        <a href='$server/galeria/<?=$r_album['permalink']?>'>
+                                                            <meta itemprop='image' content='<?=$serve?>/img/galeria/<?=$r_photos['file']?>'/>
+                                                            <img src='<?=$server?>/img/galeria/miniature/<?=$r_photos['file']?>' alt='<?=$r_photos['title']?>' />
+                                                        </a>
+                                                    </td>
+<?php
+                                                    $i ++;
+                                                    if ($i % 2 == 0){
+?>
+                                                        </tr>
+                                                        <tr>
+<?php
+                                                    } //if ($i % 2 == 0)
+                                                } //while ($r_photos = mysqli_fetch_array($q_photos))
+?>
+                                            </tr>
+                                        </table>
+                                    </div> <!-- .entry -->
+                                    <a class='go_to_section' href='<?=$server?>/galeria/'><?=$lng['index_see_all_photos']?></a>
+                                    <br/>
+<?php
+                                } //if (mysqli_num_rows($q_photos) == 0) ELSE
+?>
+                            </div> <!-- .section -->
+                        </div> <!-- .content_cell -->
+                    </div> <!-- .content_row -->
+                </div> <!-- .table -->
 <?php
                 if ($upcoming_activity_shown == false){
                     $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, after_$lang AS after, price, inscription, people, max_people, city FROM activity WHERE visible = 1 ORDER BY date DESC LIMIT 2;");
                     if (mysqli_num_rows($q_activity) > 0){
-                        echo "<div class='section' id='latest_activities'>\n";
-                        echo "<h3 class='section_title'>$lng[index_latest_activities]</h3>\n";
-                        while ($r_activity = mysqli_fetch_array($q_activity)){
-                            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 "<h3 class='entry_title'><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a></h3>\n";
-                            echo "<table class='latest_activity'><tr>\n";
-                            $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 class='latest_activity_image'><a href='$proto$http_host/actividades/$r_activity[permalink]'>\n";
-                                echo "<meta itemprop='image' content='$proto$http_host/img/actividades/$r_activity_image[image]'/>\n";
-                                echo "<img src='$proto$http_host/img/actividades/miniature/$r_activity_image[image]' alt='$r_activity[title]'/>\n";
-                                echo "</a></td>\n";
-                            }
-                            //echo "<div class='activity_text'>\n";
-                            //echo "<p>". cutText($r_activity['text'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_activity[permalink]") . "</p>\n";
-                            if ($r_activity['after'] == ''){
-                                echo "<td class='latest_activity_text'>" . cutText($r_activity['text'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_activity[permalink]") . "</td>\n";
-                            }
-                            else{
-                                echo "<td class='latest_activity_text'>" . cutText($r_activity['after'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_activity[permalink]") . "</td>\n";
+?>
+                        <div class='section' id='latest_activities'>
+                            <h3 class='section_title'><?=$lng['index_latest_activities']?></h3>
+<?php
+                            while ($r_activity = mysqli_fetch_array($q_activity)){
+?>
+                                <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> <!-- .hidden -->
+                                    <h3 class='entry_title'>
+                                        <a itemprop='url' href='<?=$server?>/actividades/<?=$r_activity['permalink']?>'><?=$r_activity['title']?></a>
+                                    </h3>
+                                    <table class='latest_activity'>
+                                        <tr>
+<?php
+                                            $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 class='latest_activity_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>
+                                                </td>
+<?php
+                                            } // if (mysqli_num_rows($q_activity_image) > 0)
+                                            if ($r_activity['after'] == ''){
+?>
+                                                <td class='mobile latest_activity_text'>
+                                                    <?=cutText($r_activity['text'], 260, "$lng[index_read_more]", "$server/actividades/$r_activity[permalink]")?>
+                                                </td>
+                                                <td class='desktop latest_activity_text'>
+                                                    <?=cutText($r_activity['text'], 400, "$lng[index_read_more]", "$server/actividades/$r_activity[permalink]")?>
+                                                </td>
+<?php
+                                            } // if ($r_activity['after'] == '')
+                                            else{
+?>
+                                                <td class='mobile latest_activity_text'>
+                                                    <?=cutText($r_activity['after'], 260, "$lng[index_read_more]", "$server/actividades/$r_activity[permalink]")?>
+                                                </td>
+                                                <td class='desktop latest_activity_text'>
+                                                    <?=cutText($r_activity['after'], 400, "$lng[index_read_more]", "$server/actividades/$r_activity[permalink]")?>
+                                                </td>
+<?php
+                                            } // if ($r_activity['after'] == '') ELSE
+?>
+                                        </tr>
+                                    </table>
+                                </div> <!-- .entry -->
+<?php
                             }
-                            echo "</tr></table>\n";
-                            //echo "</div>\n";
-                            //echo "</div>\n";
-                            echo "</div>\n";
-                        }
-                        echo "<a class='go_to_section' href='$proto$http_host/actividades/'>$lng[index_upcoming_activity_see_all]</a><br/>\n";
-                        echo "</div>";
-                        
-                    }
-                }
+?>
+                            <a class='go_to_section' href='<?=$server?>/actividades/'><?=$lng['index_upcoming_activity_see_all']?></a>
+                            <br/>
+                        </div> <!-- .section -->
+<?php
+                    } // if (mysqli_num_rows($q_activity) > 0)
+                } // if ($upcoming_activity_shown == false)
+
                 //Festivals section (if no festivals shown on top)
                 if ($festivals == 0){
 ?>
-                        <div class='section'>
-                            <h3 class='section_title'><?php echo($lng['index_festivals_header']); ?></h3>
-                            <div class='entry'>
-        <?php echo (cutText($lng['lablanca_no_content'] . '<br/>' . $lng['lablanca_no_content_2'], 300, "$lng[index_read_more]", "$proto$http_host/lablanca/")); ?>
-                            </div>
-                        </div>
+                    <div class='section'>
+                        <h3 class='section_title'><?=$lng['index_festivals_header']?></h3>
+                        <div class='entry'>
+                            <span class='desktop'>
+                                <?=cutText($lng['lablanca_no_content'] . '<br/>' . $lng['lablanca_no_content_2'], 300, $lng['index_read_more'], "$server/lablanca/")?>
+                            </span>
+                            <span class='desktop'>
+                                <?=cutText($lng['lablanca_no_content'] . '<br/>' . $lng['lablanca_no_content_2'], 200, $lng['index_read_more'], "$server/lablanca/")?>
+                            </span>
+                        </div> <!-- .entry -->
+                    </div> <!-- .section -->
 <?php
-                }
+                } // if ($festivals == 0)
 ?>
-        </div>
+        </div> <!-- #content -->
 <?php
 
-            //Footer
-            include("footer.php");
-            $ad = ad($con, $lang, $lng); 
-            stats($ad, $ad_static, "index", "");
+        //Footer
+        include("footer.php");
+        $ad = ad($con, $lang, $lng);
+        stats($ad, $ad_static, "index", "");
 ?>
     </body>
 </html>

ファイルの差分が大きいため隠しています
+ 12 - 11
www/lang/lang_en.php


ファイルの差分が大きいため隠しています
+ 6 - 4
www/lang/lang_es.php


ファイルの差分が大きいため隠しています
+ 23 - 21
www/lang/lang_eu.php


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません