Browse Source

Fixes in several pages.

Iñigo Valentin 9 years ago
parent
commit
7fd544d010
7 changed files with 336 additions and 297 deletions
  1. 24 24
      www/actividades/index.php
  2. 31 31
      www/blog/buscar.php
  3. 1 1
      www/blog/common/rightpanel.php
  4. 41 35
      www/blog/index.php
  5. 159 159
      www/blog/post.php
  6. 60 27
      www/lablanca/fiestas.php
  7. 20 20
      www/lablanca/index.php

+ 24 - 24
www/actividades/index.php

@@ -22,15 +22,15 @@
         <link rel="shortcut icon" href="<?php echo "$server/img/logo/favicon.ico";?>">
         <!-- CSS files -->
         <style>
-<?php 
-            include("../css/ui.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"); 
+<?php
+            include("../css/m/ui.css");
             include("../css/m/actividades.css");
 ?>
         </style>
@@ -42,29 +42,29 @@
 ?>
         </script>
         <!-- Meta tags -->
-        <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="<?=$lang?>"/>
-        <meta name="twitter:card" content="summary"/>
-        <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"/>
+        <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='<?=$lang?>'/>
+        <meta name='twitter:card' content='summary'/>
+        <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")
 ?>
-        <div id="content">
+        <div id='content'>
 
             <div class='section'>
                 <h3 class='section_title'><?=$lng["activities_upcoming"]?></h3>
@@ -102,7 +102,7 @@
                                         $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"]?>'>
@@ -244,7 +244,7 @@
                             }
                             $i ++;
 ?>
-                            <div class='<?=$past_class?>' id='past_activity_details_$r_past[id]'>
+                            <div class='<?=$past_class?>' id='past_activity_details_<?=$r_past["id"]?>'>
                                 <table class='past_activity'>
                                     <tr>
 <?php

+ 31 - 31
www/blog/buscar.php

@@ -5,13 +5,13 @@
     $con = startdb();
     $proto = getProtocol();
     $server = "$server";
-    
+
     //Language
     $lang = selectLanguage();
     include("../lang/lang_$lang.php");
-    
+
     $cur_section = $lng["section_blog"];
-    
+
     //Search terms
     $search_field = mysqli_real_escape_string($con, $_GET["where"]);
     $search_term = strtolower(mysqli_real_escape_string($con, $_GET["query"]));
@@ -19,7 +19,7 @@
         header("Location: $server/blog/");
         exit(-1);
     }
-    
+
     //Get matches
     switch ($search_field){
         case $lng["search_field_all"]:
@@ -43,15 +43,15 @@
         <link rel="shortcut icon" href="<?=$server?>/img/logo/favicon.ico">
         <!-- CSS files -->
         <style>
-<?php 
-            include("../css/ui.css"); 
+<?php
+            include("../css/ui.css");
             include("../css/blog.css");
 ?>
         </style>
         <!-- CSS for mobile version -->
         <style media="(max-width : 990px)">
-<?php 
-            include("../css/m/ui.css"); 
+<?php
+            include("../css/m/ui.css");
             include("../css/m/blog.css");
 ?>
         </style>
@@ -63,36 +63,36 @@
             ?>
         </script>
         <!-- Meta tags -->
-        <link rel="canonical" href="<?=$server?>/blog"/>
-        <link rel="author" href="<?=$server?>"/>
-        <link rel="publisher" href="<?=$server?>"/>
-        <meta name="description" content="<?=$lng["blog_descrption"]?>"/>
-        <meta property="og:title" content="<?=$lng["blog_title"]?> - Gasteizko Margolariak"/>
-        <meta property="og:url" content="<?=$server?>/blog"/>
-        <meta property="og:description" content="<?=$lng["blog_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="<?=$lang?>"/>
-        <meta name="twitter:card" content="summary"/>
-        <meta name="twitter:title" content="<?=$lng["blog_title"]?> - Gasteizko Margolariak"/>
-        <meta name="twitter:description" content="<?=$lng["blog_description"]?>"/>
-        <meta name="twitter:image" content="<?=$server?>/img/logo/logo.png"/>
-        <meta name="twitter:url" content="<?=$server?>"/>
-        <meta name="robots" content="no-index no-follow"/>
+        <link rel='canonical' href='<?=$server?>/blog'/>
+        <link rel='author' href='<?=$server?>'/>
+        <link rel='publisher' href='<?=$server?>'/>
+        <meta name='description' content='<?=$lng["blog_descrption"]?>'/>
+        <meta property='og:title' content='<?=$lng["blog_title"]?> - Gasteizko Margolariak'/>
+        <meta property='og:url' content='<?=$server?>/blog'/>
+        <meta property='og:description' content='<?=$lng["blog_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='<?=$lang?>'/>
+        <meta name='twitter:card' content='summary'/>
+        <meta name='twitter:title' content='<?=$lng["blog_title"]?> - Gasteizko Margolariak'/>
+        <meta name='twitter:description' content='<?=$lng["blog_description"]?>'/>
+        <meta name='twitter:image' content='<?=$server?>/img/logo/logo.png'/>
+        <meta name='twitter:url' content='<?=$server?>'/>
+        <meta name='robots' content='no-index no-follow'/>
     </head>
     <body>
 <?php
         include("../header.php");
 ?>
-        <div id="content">
-<?=
+        <div id='content'>
+<?php
             include("common/leftpanel.php");
 ?>
-            <div id="middle_column">
-                <div class="section">
-                    <h3 class="section_title"><?=$lng["blog_search"])?></h3>
-                    <div class="entry">
+            <div id='middle_column'>
+                <div class='section'>
+                    <h3 class='section_title'><?=$lng["blog_search"]?></h3>
+                    <div class='entry'>
 <?php
                         if (mysqli_num_rows($q) == 1){
 ?>

+ 1 - 1
www/blog/common/rightpanel.php

@@ -16,7 +16,7 @@
                     while($r_month = mysqli_fetch_array($q_month)){
 ?>
                         <div class='month pointer' onClick='toggleElement("month_<?=$r_year["year"]?>_<?=$r_month["month"]?>");'>
-                            <img class='slid' id='slid_month_<?=$r_year["year"]?>_<?=$r_month["month"]?>' src='<?=$server?>?/img/misc/slid-right.png' alt='<?=$r_month["month"]?>'/>
+                            <img class='slid' id='slid_month_<?=$r_year["year"]?>_<?=$r_month["month"]?>' src='<?=$server?>/img/misc/slid-right.png' alt='<?=$r_month["month"]?>'/>
                             <span class='fake_a'><?=$lng["months"][$r_month["month"] - 1]?></span>
                         </div>
                         <ul id='list_month_<?=$r_year["year"]?>_<?=$r_month["month"]?>' class='post_list'>

+ 41 - 35
www/blog/index.php

@@ -15,11 +15,11 @@
 <!DOCTYPE html>
 <html>
     <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">
+        <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><?=$lng["blog_title"];?> - Gasteizko Margolariak</title>
-        <link rel="shortcut icon" href="<?=$server?>/img/logo/favicon.ico">
+        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'>
         <!-- CSS files -->
         <style>
 <?php
@@ -28,43 +28,47 @@
 ?>
         </style>
         <!-- CSS for mobile version -->
-        <style media="(max-width : 990px)">
+        <style media='(max-width : 990px)'>
 <?php
-            include("../css/m/ui.css"); 
+            include("../css/m/ui.css");
             include("../css/m/blog.css");
 ?>
         </style>
         <!-- Script files -->
-        <script type="text/javascript">
+        <script type='text/javascript'>
 <?php
-                include("../script/ui.js");
-                include("../script/blog.js");
+            include("../script/ui.js");
+            include("../script/blog.js");
 ?>
         </script>
         <!-- Meta tags -->
-        <link rel="canonical" href="<?=$server?>/blog/">
-        <link rel="author" href="<?=$server?>"/>
-        <link rel="publisher" href="<?=$server?>"/>
-        <meta name="description" content="<?=$lng["blog_descrption"]?>"/>
-        <meta property="og:title" content="<?=$lng["blog_title"]?> - Gasteizko Margolariak"/>
-        <meta property="og:url" content="<?=$server?>/blog/">
-        <meta property="og:description" content="<?=$lng["blog_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 name="twitter:card" content="summary"/>
-        <meta name="twitter:title" content="<?=$lng["blog_title"]?> - Gasteizko Margolariak"/>
-        <meta name="twitter:description" content="<?=$lng["blog_description"]?>"/>
-        <meta name="twitter:image" content="<?=$server?>/img/logo/logo.png";?>"/>
-        <meta name="twitter:url" content="<?=$server?>"/>
-        <meta name="robots" content="index follow"/>
+        <link rel='canonical' href='<?=$server?>/blog/'>
+        <link rel='author' href='<?=$server?>'/>
+        <link rel='publisher' href='<?=$server?>'/>
+        <meta name='description' content='<?=$lng["blog_descrption"]?>'/>
+        <meta property='og:title' content='<?=$lng["blog_title"]?> - Gasteizko Margolariak'/>
+        <meta property='og:url' content='<?=$server?>/blog/'>
+        <meta property='og:description' content='<?=$lng["blog_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='<?=$lang?>'/>
+        <meta name='twitter:card' content='summary'/>
+        <meta name='twitter:title' content='<?=$lng["blog_title"]?> - Gasteizko Margolariak'/>
+        <meta name='twitter:description' content='<?=$lng["blog_description"]?>'/>
+        <meta name='twitter:image' content='<?=$server?>/img/logo/logo.png"?>'/>
+        <meta name='twitter:url' content='<?=$server?>/blog/'/>
+        <meta name='robots' content='index follow'/>
     </head>
     <body>
-<?php include("../header.php"); ?>
-        <div id="content">
-<?php include("common/leftpanel.php"); ?>
-            <div id="middle_column" class="section">
+<?php
+        include("../header.php");
+?>
+        <div id='content'>
+<?php
+            include("common/leftpanel.php");
+?>
+            <div id='middle_column' class='section'>
                 <h3 class='section_title'><?=$lng["section_blog"]?></h3>
 <?php
                     $q = mysqli_query($con, "SELECT id, permalink, title_$lang AS title, text_$lang AS text, DATE_FORMAT(dtime, '%Y-%m-%dT%T') AS isodate, dtime, comments FROM post WHERE visible = 1 ORDER BY dtime DESC;");
@@ -84,7 +88,9 @@
                                 <meta itemprop='telephone' content='+34637140371'/>
                                 <meta itemprop='url' content='<?=$server?>'/>
                             </div>
-                            <h3 class='entry_title'><a itemprop='url' href='<?=$server?>/blog/<?=$r["permalink"]?>'><?=$r["title"]?></a></h3>
+                            <h3 class='entry_title'>
+                                <a itemprop='url' href='<?=$server?>/blog/<?=$r["permalink"]?>'><?=$r["title"]?></a>
+                            </h3>
 <?php
                             $q_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $r[id] ORDER BY idx LIMIT 1;");
                             if (mysqli_num_rows($q_image) > 0){
@@ -100,7 +106,6 @@
                             }
 ?>
                             <p><?=cutText($r["text"], 800, $lng["blog_read_more"], "$server/blog/$r[permalink]/")?></p>
-
                             <hr/>
                             <table class='post_footer'>
                                 <tr>
@@ -120,7 +125,8 @@
 ?>
                                         <meta itemprop='keywords' content='<?=$tag_raw?>'/>
                                         <td>
-                                            <span class='date'><?=formatDate($r["dtime"], $lang, false)?></span>&nbsp;&nbsp;&nbsp;<?=$tag_string?>
+                                            <span class='date'><?=formatDate($r["dtime"], $lang, false)?></span>
+                                            &nbsp;&nbsp;&nbsp;<?=$tag_string?>
                                         </td>
 <?php
                                     }
@@ -157,7 +163,7 @@
 ?>
                                         </td>
 <?php
-                                    }if ($r["comments"] == 1)
+                                    } // if ($r["comments"] == 1)
 ?>
                                 </tr>
                             </table> <!-- .post_footer -->
@@ -173,7 +179,7 @@
         </div>
 <?php
             include("../footer.php");
-            $ad = ad($con, $lang, $lng); 
+            $ad = ad($con, $lang, $lng);
             stats($ad, $ad_static, "blog", "");
 ?>
     </body>

+ 159 - 159
www/blog/post.php

@@ -4,13 +4,13 @@
     $con = startdb();
     $proto = getProtocol();
     $server = "$proto$http_host";
-    
+
     //Language
     $lang = selectLanguage();
     include("../lang/lang_$lang.php");
-    
+
     $cur_section = $lng["section_blog"];
-    
+
     // Get current post id. Redirect if inexistent or invisible
     $perm = mysqli_real_escape_string($con, $_GET["perm"]);
     $q = mysqli_query($con, "SELECT id, permalink, title_$lang AS title, text_$lang AS text, DATE_FORMAT(dtime, '%Y-%m-%dT%T') AS isodate, DATE_FORMAT(dtime,'%b %d, %Y T%T') as dtime, comments FROM post WHERE permalink = '$perm' AND visible = 1;");
@@ -24,39 +24,39 @@
 <!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">
+        <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><?=$r["title"]?> - Gasteizko Margolariak</title>
-        <link rel="shortcut icon" href="<?=$server?>/img/logo/favicon.ico">
+        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'>
         <!-- CSS files -->
         <style>
-<?php 
-            include("../css/ui.css"); 
+<?php
+            include("../css/ui.css");
             include("../css/blog.css");
 ?>
         </style>
         <!-- CSS for mobile version -->
-        <style media="(max-width : 990px)">
-<?php 
-            include("../css/m/ui.css"); 
+        <style media='(max-width: 990px)'>
+<?php
+            include("../css/m/ui.css");
             include("../css/m/blog.css");
 ?>
         </style>
         <!-- Script files -->
-        <script type="text/javascript">
+        <script type='text/javascript'>
 <?php
             include("../script/ui.js");
             include("../script/blog.js");
 ?>
         </script>
         <!-- Meta tags -->
-        <link rel="canonical" href="<?=$server?>/blog/<?=$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?>/blog/<?=$r["permalink"]?>"/>
-        <meta property="og:description" content="<?=strip_tags($r["text_$lang"])?>"/>
+        <link rel='canonical' href='<?=$server?>/blog/<?=$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?>/blog/<?=$r["permalink"]?>'/>
+        <meta property='og:description' content='<?=strip_tags($r["text"])?>'/>
 <?php
         $q_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $id ORDER BY idx;");
         if (mysqli_num_rows($q_image) == 0)
@@ -66,195 +66,195 @@
             $img = "$server/img/blog/preview/" . $r_image["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="<?=$lang?>"/>
-        <meta property="article:section" content="Blog"/>
-        <meta property="article:published-time" content="<?=$r["time"]?>"/>
-        <meta property="article:modified-time" content="<?=$r["time"]?>"/>
-        <meta property="article:author" content="Gasteizko Margolariak"/>
+        <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='<?=$lang?>'/>
+        <meta property='article:section' content='Blog'/>
+        <meta property='article:published-time' content='<?=$r["isodate"]?>'>
+        <meta property='article:modified-time' content='<?=$r["isodate"]?>'/>
+        <meta property='article:author' content="Gasteizko Margolariak'/>
 <?php
         $q_tag = mysqli_query($con, "SELECT tag FROM post_tag WHERE post = $id;");
         $tag_string = "vitoria cuadrilla gasteizko margolariak ";
         while ($r_tag = mysqli_fetch_array($q_tag))
             $tag_string = $tag_string . " " . $r_tag["tag"]
 ?>
-        <meta property="article:tag" content="<?=$tag_string?>"/>
-        <meta name="twitter:card" content="summary"/>
-        <meta name="twitter:title" content="<?=$r["title"]?> - Gasteizko Margolariak"/>
-        <meta name="twitter:description" content="<?=strip_tags($r["text_$lang"])?>"/>
-        <meta name="twitter:image" content="<?=$img?>"/>
-        <meta name="twitter:url" content="<?=$server?>/blog/<?=$r["permalink"]?>"/>
-        <meta name="robots" content="index follow"/>
+        <meta property='article:tag' content='<?=$tag_string?>'/>
+        <meta name='twitter:card' content='summary'/>
+        <meta name='twitter:title' content='<?=$r["title"]?> - Gasteizko Margolariak'/>
+        <meta name='twitter:description' content='<?=strip_tags($r["text"])?>'/>
+        <meta name='witter:image' content='<?=$img?>'/>
+        <meta name='twitter:url' content='<?=$server?>/blog/<?=$r["permalink"]?>'/>
+        <meta name='robots' content="index follow"/>
     </head>
     <body>
 <?php
         include("../header.php");
 ?>
-        <div id="content">
+        <div id='content'>
 <?php
             include("common/leftpanel.php");
 ?>
             <div id="middle_column">
                 <div itemscope itemtype='http://schema.org/BlogPosting' class='section blog_entry'>
-                <meta itemprop='inLanguage' content='<?=$lang?>'/>
-                <meta itemprop='datePublished dateModified' content='<?=$r["isodate"]?>'/>
-                <meta itemprop='headline name' content='<?=$r["title"]?>'/>
-                <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>
-                <h3 class='section_title'><?=$r["title"]?></h3>
-                <div class='entry'>
+                    <meta itemprop='inLanguage' content='<?=$lang?>'/>
+                    <meta itemprop='datePublished dateModified' content='<?=$r["isodate"]?>'/>
+                    <meta itemprop='headline name' content='<?=$r["title"]?>'/>
+                    <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>
+                    <h3 class='section_title'><?=$r["title"]?></h3>
+                    <div class='entry'>
+<?php
+                        if ($r_image != null){
+?>
+                            <div class='image_container'>
+                                <meta itemprop='image' content='<?=$server?>/img/blog/<?=$r_image["image"]?>'/>
+                                <img class='post_image post_image_large' alt='<?=$r["title"]?>' src='<?=$server?>/img/blog/preview/<?=$r_image["image"]?>'/>
+                            </div>
+<?php
+                        }
+?>
+                        <p itemprop='text articleBody'><?=$r["text"]?></p>
+<?php
+                        //Other images
+                        if ($r_image != null){
+?>
+                            <table id='secondary_images'>
+                                <tr>
 <?php
-                    if ($r_image != null){
+                                    while ($r_image = mysqli_fetch_array($q_image)){
 ?>
-                        <div class='image_container'>
-                            <meta itemprop='image' content='<?=$server?>/img/blog/<?=$r_image["image"]?>'/>
-                            <img class='post_image post_image_large' alt='<?=$r["title"]?>' src='/img/blog/preview/<?=$r_image["image"]?>'/>\n";
-                        </div>
+                                        <meta itemprop='image' content='<?=$server?>/img/blog/<?=$r_image["image"]?>'/>
+                                        <td>
+                                            <img src='<?=$server?>/img/blog/preview/<?=$r_image["image"]?>'/>
+                                        </td>
 <?php
-                    }
+                                    }
 ?>
-                    <p itemprop='text articleBody'><?=$r["text"]?></p>
+                                </tr>
+                            </table>
 <?php
-                    //Other images
-                    if ($r_image != null){
+                        }
 ?>
-                        <table id='secondary_images'>
+                        <hr/>
+                        <table class='post_footer'>
                             <tr>
 <?php
-                                while ($r_image = mysqli_fetch_array($q_image)){
+                                # Tags (if any) and date
+                                $q_tag = mysqli_query($con, "SELECT tag FROM post_tag WHERE post= $id;");
+                                if (mysqli_num_rows($q_tag) > 0){
+                                    $tag_string = "<span id='tags' class='desktop'>Tags: ";
+                                    $tag_raw = "";
+                                    while ($r_tag = mysqli_fetch_array($q_tag)){
+                                        $tag_string = $tag_string . "<a href='$server/blog/buscar/tag/$r_tag[tag]'>$r_tag[tag]</a>, ";
+                                        $tag_raw = $tag_raw . "$r_tag[tag],";
+                                    }
+                                    $tag_string = substr($tag_string, 0, strlen($tag_string) - 2);
+                                    $tag_string = $tag_string . "</span>";
+                                    $tag_raw = substr($tag_raw, 0, strlen($tag_raw) - 1);
 ?>
-                                    <meta itemprop='image' content='<?=$server?>/img/blog/<?=$r_image["image"]?>'/>
+                                    <meta itemprop='keywords' content='<?=$tag_raw?>'/>
                                     <td>
-                                        <img src='<?=$server?>/img/blog/preview/<?=$r_image["image"]?>'/>
+                                        <span class='date'><?=formatDate($r["dtime"], $lang)?></span>
+                                        <br/><br class='mobile'/>
+                                        <?=$tag_string?>
                                     </td>
 <?php
                                 }
+                                else{
 ?>
-                            </tr>
-                        </table>
-<?php
-                    }
-?>
-                    <hr>
-                    <table class='post_footer'>
-                        <tr>
+                                    <td>
+                                        <span class='date'>
+                                            <span class='hidden'><?=formatDate($r["dtime"], $lang)?>
+                                        </span>
+                                    </td>
 <?php
-                            # Tags (if any) and date
-                            $q_tag = mysqli_query($con, "SELECT tag FROM post_tag WHERE post= $id;");
-                            if (mysqli_num_rows($q_tag) > 0){
-                                $tag_string = "<span id='tags' class='desktop'>Tags: ";
-                                $tag_raw = "";
-                                while ($r_tag = mysqli_fetch_array($q_tag)){
-                                    $tag_string = $tag_string . "<a href='$server/blog/buscar/tag/$r_tag[tag]'>$r_tag[tag]</a>, ";
-                                    $tag_raw = $tag_raw . "$r_tag[tag],";
                                 }
-                                $tag_string = substr($tag_string, 0, strlen($tag_string) - 2);
-                                $tag_string = $tag_string . "</span>";
-                                $tag_raw = substr($tag_raw, 0, strlen($tag_raw) - 1);
+                                #Share
 ?>
-                                <meta itemprop='keywords' content='<?=$tag_raw?>'/>
-                                <td>
-                                    <span class='date'><?=formatDate($r["dtime"], $lang)?></span>
-                                    <br/><br class='mobile'/>
-                                    <?=$tag_string?>
-                                </td>
+                                <td class='r_share'>
+                                    <span class='share'>
+                                        <span class='desktop'><?=$lng["blog_share"]?></span>
 <?php
-                            }
-                            else{
+                                        $title = urlencode("$r[title] - $http_host");
+                                        $url_f = htmlspecialchars("https://www.facebook.com/sharer/sharer.php?u=$server$_SERVER[REQUEST_URI]");
+                                        $url_t = htmlspecialchars("https://twitter.com/share?url=$server$_SERVER[REQUEST_URI]&text=$title");
+                                        $url_g = htmlspecialchars("https://plus.google.com/share?url=$server$_SERVER[REQUEST_URI]");
 ?>
-                                <td>
-                                    <span class='date'>
-                                        <span class='hidden'><?=formatDate($r["dtime"], $lang)?>
+                                        <a href='$url_f' target='_blank'><img class='share_icon' alt='Facebook' src='$server/img/social/facebook.gif'/></a>
+                                        <a href='$url_t' target='_blank'><img class='share_icon' alt='Twitter' src='$server/img/social/twitter.gif'/></a>
+                                        <a href='$url_g' target='_blank'><img class='share_icon' src='$server/img/social/googleplus.gif' alt='Google+'/></a>
                                     </span>
                                 </td>
+                            </tr>
+                        </table> <!-- .post_footer -->
 <?php
-                            }
-                            #Share
-?>
-                            <td class='r_share'>
-                                <span class='share'>
-                                    <span class='desktop'>$lng[blog_share]</span>
-<?php
-                                    $title = urlencode("$r[title] - $http_host");
-                                    $url_f = htmlspecialchars("https://www.facebook.com/sharer/sharer.php?u=$server$_SERVER[REQUEST_URI]");
-                                    $url_t = htmlspecialchars("https://twitter.com/share?url=$server$_SERVER[REQUEST_URI]&text=$title");
-                                    $url_g = htmlspecialchars("https://plus.google.com/share?url=$server$_SERVER[REQUEST_URI]");
-?>
-                                    <a href='$url_f' target='_blank'><img class='share_icon' alt='Facebook' src='$server/img/social/facebook.gif'/></a>\n";
-                                    <a href='$url_t' target='_blank'><img class='share_icon' alt='Twitter' src='$server/img/social/twitter.gif'/></a>\n";
-                                    <a href='$url_g' target='_blank'><img class='share_icon' src='$server/img/social/googleplus.gif' alt='Google+'/></a>\n";
-                                </span>
-                            </td>
-                        </tr>
-                    </table> <!-- .post_footer -->
-<?php
-                    #Comments
-                    if ($r["comments"] == 1){
-                        $q_comment = mysqli_query($con, "SELECT id, post, DATE_FORMAT(dtime, '%Y-%m-%dT%T') AS isodate, dtime, user, username, lang, text FROM post_comment WHERE post = $id AND approved = 1 ORDER BY dtime;");
-                        $count = mysqli_num_rows($q_comment);
+                        #Comments
+                        if ($r["comments"] == 1){
+                            $q_comment = mysqli_query($con, "SELECT id, post, DATE_FORMAT(dtime, '%Y-%m-%dT%T') AS isodate, dtime, user, username, lang, text FROM post_comment WHERE post = $id AND approved = 1 ORDER BY dtime;");
+                            $count = mysqli_num_rows($q_comment);
 ?>
-                        <hr/>
-                        <meta itemprop='commentCount interactionCount' content='<?=$count?>'/>
+                            <hr/>
+                            <meta itemprop='commentCount interactionCount' content='<?=$count?>'/>
 <?php
-                        switch ($count){
-                            case 0:
-                                $comment_count = "<h4><meta itemprop='interactionCount' content='0'/></meta>$lng[blog_comments_0]</h4>";
-                                break;
-                            case 1:
-                               $comment_count = "<h4><span itemprop='interactionCount'>1</span> $lng[blog_comments_1]</h4>";
-                                break;
-                            default:
-                                $comment_count = "<h4><span itemprop='interactionCount'>$count</span> $lng[blog_comments_multiple]</h4>";
-                        }
+                            switch ($count){
+                                case 0:
+                                    $comment_count = "<h4><meta itemprop='interactionCount' content='0'/></meta>$lng[blog_comments_0]</h4>";
+                                    break;
+                                case 1:
+                                    $comment_count = "<h4><span itemprop='interactionCount'>1</span> $lng[blog_comments_1]</h4>";
+                                    break;
+                                default:
+                                    $comment_count = "<h4><span itemprop='interactionCount'>$count</span> $lng[blog_comments_multiple]</h4>";
+                            }
 ?>
-                        <?=$comment_count?>
-                        <div id='comment_list'>
+                            <?=$comment_count?>
+                            <div id='comment_list'>
 <?php
-                            //WARNING: If changes are done here, do the same in comment.php
-                            while ($r_comment = mysqli_fetch_array($q_comment)){
+                                while ($r_comment = mysqli_fetch_array($q_comment)){
 ?>
-                                <div itemprop='comment' itemscope itemtype='http://schema.org/UserComments' id='comment_<?=$r_comment["id"]?>' class='comment'>
-                                    <span itemprop='creator' class='comment_user'><?=$r_comment["username"]?></span>
-                                    <span class='comment_date date'>
-                                        <meta itemprop='commentTime' content='<?=$r_comment["isodate"]?>'/>
-                                        <?=formatDate($r_comment["dtime"], $lang)?>
-                                    </span>
-                                    <p itemprop='commentText' class='comment_text'><?=$r_comment["text"]?></p>
-                                    <hr class='comment_line'/>
-                                </div>
+                                    <div itemprop='comment' itemscope itemtype='http://schema.org/UserComments' id='comment_<?=$r_comment["id"]?>' class='comment'>
+                                        <span itemprop='creator' class='comment_user'><?=$r_comment["username"]?></span>
+                                        <span class='comment_date date'>
+                                            <meta itemprop='commentTime' content='<?=$r_comment["isodate"]?>'/>
+                                            <?=formatDate($r_comment["dtime"], $lang)?>
+                                        </span>
+                                        <p itemprop='commentText' class='comment_text'><?=$r_comment["text"]?></p>
+                                        <hr class='comment_line'/>
+                                    </div>
 <?php
-                            }
+                                }
 ?>
-                        </div> <!-- #comment_list -->
-                        <div class='comment' id='comment_new'>
-                            <form id='comment_form' method='post' action='/' onsubmit='event.preventDefault();postComment(<?=$id?>, "<?=$lang?>");'>
-                                <textarea id='new_comment_text' name='text' maxlength='1800' onChange='defaultInputBorder(this);' onKeyDown='defaultInputBorder(this);' placeholder='<?=$lng["blog_placeholder_text"]?>'></textarea>
-                                <input type='hidden' name='id' value='<?=$id?>'>
-                                <div id='identification_form'>
-                                    <br>
-                                    <input id='new_comment_user' name='user' maxlength='50' type='text' placeholder='<?=$lng["blog_placeholder_name"]?>' onChange='defaultInputBorder(this);' onKeyDown='defaultInputBorder(this);'/>
-                                    <input type='submit' value='<?=$lng["blog_send"]?>'/>
-                                </div>
-                            </form>
-                        </div> <!-- .comment_new -->
+                            </div> <!-- #comment_list -->
+                            <div class='comment' id='comment_new'>
+                                <form id='comment_form' method='post' action='/' onsubmit='event.preventDefault();postComment(<?=$id?>, "<?=$lang?>");'>
+                                    <textarea id='new_comment_text' name='text' maxlength='1800' onChange='defaultInputBorder(this);' onKeyDown='defaultInputBorder(this);' placeholder='<?=$lng["blog_placeholder_text"]?>'></textarea>
+                                    <input type='hidden' name='id' value='<?=$id?>'/>
+                                    <div id='identification_form'>
+                                        <br/>
+                                        <input id='new_comment_user' name='user' maxlength='50' type='text' placeholder='<?=$lng["blog_placeholder_name"]?>' onChange='defaultInputBorder(this);' onKeyDown='defaultInputBorder(this);'/>
+                                        <input type='submit' value='<?=$lng["blog_send"]?>'/>
+                                    </div>
+                                </form>
+                            </div> <!-- .comment_new -->
 <?php
-                    }
-                    else{
+                        }
+                        else{
 ?>
-                        <h4><?=$lng["blog_comments_closed"]?></h4>
+                            <h4><?=$lng["blog_comments_closed"]?></h4>
 <?php
-                    }
+                        }
 ?>
-                </div> <!-- .entry -->
+                    </div> <!-- .entry -->
+                </div> <!-- .section -->
             </div> <!-- #middle_column -->
 <?php
             include("common/rightpanel.php");

+ 60 - 27
www/lablanca/fiestas.php

@@ -7,9 +7,18 @@
     if (mysqli_num_rows($q_f) > 0){
         $r_f = mysqli_fetch_array($q_f);
         if (strlen($r_f['img']) > 0){
-            echo("<div id='festivals_image_top_container'><div id='festivals_image_container'><img id='festivals_image' src='$proto$http_host/img/fiestas/preview/$r_f[img]'/></div></div><br/>\n");
+?>
+            <div id='festivals_image_top_container'>
+                <div id='festivals_image_container'>
+                    <img id='festivals_image' src='<?=$server?>/img/fiestas/preview/<?=$r_f["img"]?>'/>
+                </div>
+            </div>
+            <br/>
+<?php
         }
-        echo $r_f["text_$lang"] . "\n";
+?>
+        <?=$r_f["text_$lang"]?>
+<?php
     }
 ?>
     </div>
@@ -31,32 +40,56 @@
         </div>
         <div class='content_td' id='content_td_prices'>
             <div class='section' id='prices'>
-                <h3 class='section_title'><?php echo $lng['lablanca_prices']; ?></h3>
+                <h3 class='section_title'><?=$lng["lablanca_prices"]?></h3>
                 <div class='entry'>
-                    <?php
-                        $q_days = mysqli_query($con, "SELECT id, date, DATE_FORMAT(date, '%Y-%m-%d') AS isodate, name_$lang AS name, price FROM festival_day WHERE year(date) = $year ORDER BY date");
-                        if (mysqli_num_rows($q_days) > 0){
-                            echo "<h4>$lng[lablanca_prices_days]</h4>\n";
-                            echo "<table id='table_days'>\n";
+<?php
+                    $q_days = mysqli_query($con, "SELECT id, date, DATE_FORMAT(date, '%Y-%m-%d') AS isodate, name_$lang AS name, price FROM festival_day WHERE year(date) = $year ORDER BY date");
+                    if (mysqli_num_rows($q_days) > 0){
+?>
+                        <h4><?=$lng["lablanca_prices_days"]?></h4>
+                        <table id='table_days'>
+<?php
                             while ($r_days = mysqli_fetch_array($q_days)){
-                                echo "<tr><td>" . formatFestivalDate($r_days['date']) . "</td>\n";
-                                echo "<td class='price'>$r_days[price] &euro;</td></tr>\n";
-                            }
-                            echo "</table>\n</div>\n<div class='entry'>\n";
-                            $q_offers = mysqli_query($con, "SELECT id, name_$lang AS name, description_$lang AS description, price FROM festival_offer WHERE year = $year ORDER BY days;");
-                            if (mysqli_num_rows($q_offers) > 0){
-                                echo "<h4>$lng[lablanca_prices_offers]</h4>\n";
-                                echo "<table id='table_offers'>\n";
-                                while ($r_offers = mysqli_fetch_array($q_offers)){
-                                    echo "<tr><td><span class='name'>$r_offers[name]</span><br/><p class='description'>$r_offers[description]</p></td>\n";
-                                    echo "<td class='price'>$r_offers[price] &euro;</td></tr>\n";
-                                }
-                                echo "</table>\n";
+?>
+                                <tr>
+                                    <td><?=formatFestivalDate($r_days["date"])?></td>
+                                    <td class='price'><?=$r_days["price"]?> &euro;</td>
+                                </tr>
+<?php
                             }
-                        }
-                    ?>
+?>
+                        </table>
+<?php
+                    }
+?>
                 </div>
-            </div>
-        </div> <!--TD-->
-    </div> <!--TR-->
-</div> <!--Table-->
+                <div class='entry'>
+<?php
+                    $q_offers = mysqli_query($con, "SELECT id, name_$lang AS name, description_$lang AS description, price FROM festival_offer WHERE year = $year ORDER BY days;");
+                    if (mysqli_num_rows($q_offers) > 0){
+?>
+                        <h4><?=$lng["lablanca_prices_offers"]?></h4>
+                        <table id='table_offers'>
+<?php
+                            while ($r_offers = mysqli_fetch_array($q_offers)){
+?>
+                                <tr>
+                                    <td>
+                                        <span class='name'><?=$r_offers["name"]?></span>
+                                        <br/>
+                                        <p class='description'><?=$r_offers["description"]?></p>
+                                    </td>
+                                    <td class='price'><?=$r_offers["price"]?> &euro;</td>
+                                </tr>
+<?php
+                            }
+?>
+                        </table>
+<?php
+                    }
+?>
+                </div> <!-- .entry -->
+            </div> <!-- .section -->
+        </div> <!-- .content_td -->
+    </div> <!-- .content_tr -->
+</div> <!-- #content_table -->

+ 20 - 20
www/lablanca/index.php

@@ -5,13 +5,13 @@
     $proto = getProtocol();
     $http_host = $_SERVER["HTTP_HOST"];
     $server = "$proto$http_host";
-    
+
     //Language
     $lang = selectLanguage();
     include("../lang/lang_$lang.php");
-    
+
     $cur_section = $lng["section_lablanca"];
-    
+
     //Is festivals enabled in settings?
     $q = mysqli_query($con, "SELECT value FROM settings WHERE name = 'festivals';");
     if (mysqli_num_rows($q) == 0)
@@ -25,17 +25,17 @@
             $is_festivals = false;
         }
     }
-    
+
     //Get year
     $year = date("Y");
-    if ($_GET["year"] != ''){ 
+    if ($_GET["year"] != ''){
         $q_year = mysqli_query($con, "SELECT id FROM festival WHERE year = " . mysqli_real_escape_string($con, $_GET["year"]));
         if (mysqli_num_rows($q_year) > 0){
             $year = $_GET["year"];
             $is_festivals = true;
         }
     }
-    
+
 
 ?>
 <!DOCTYPE html>
@@ -62,14 +62,14 @@
         <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'>
         <!-- CSS files -->
         <style>
-<?php 
+<?php
             include("../css/ui.css"); 
             include("../css/lablanca.css");
 ?>
         </style>
         <!-- CSS for mobile version -->
         <style media="(max-width : 990px)">
-<?php 
+<?php
             include("../css/m/ui.css"); 
             include("../css/m/lablanca.css");
 ?>
@@ -82,9 +82,9 @@
 ?>
         </script>
         <!-- Meta tags -->
-        <link rel="canonical" href="<?=$server?>/lablanca/"/>
-        <link rel="author" href="<?=$server?>"/>
-        <link rel="publisher" href="<?=$server?>"/>
+        <link rel='canonical' href='<?=$server?>/lablanca/'/>
+        <link rel='author' href="<?=$server?>'/>
+        <link rel='publisher' href="<?=$server?>'/>
         <meta name='description' content='<?=$lng["lablanca_description"]?>'/>
 <?php
         if ($is_festivals){
@@ -108,26 +108,26 @@
 <?php
         if ($is_festivals){
 ?>
-            <meta property="twitter:title" content='<?=str_replace('#', $year, $lng["lablanca_title"])?> - Gasteizko Margolariak'/>
+            <meta property='twitter:title' content='<?=str_replace('#', $year, $lng["lablanca_title"])?> - Gasteizko Margolariak'/>
 <?php
         }
         else{
 ?>
-            <meta property="twitter:title" content='<?=str_replace('#', $year, $lng["lablanca_no_title"])?> - Gasteizko Margolariak'/>
+            <meta property='twitter:title' content='<?=str_replace('#', $year, $lng["lablanca_no_title"])?> - Gasteizko Margolariak'/>
 <?php
         }
 ?>
-        <meta name="twitter:description" content="<?=$lng["lablanca_description"]?>"/>
-        <meta name="twitter:image" content="<?=$server?>/img/logo/logo.png";?>"/>
-        <meta name="twitter:url" content="<?=$server?>"/>
-        <meta name="robots" content="index follow"/>
+        <meta name='twitter:description' content='<?=$lng["lablanca_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="content">
-<?php                
+    <div id='content'>
+<?php
         //Include file
         if ($is_festivals){
             include("fiestas.php");
@@ -173,7 +173,7 @@
     </div> <!-- #content -->
 <?php
     include("../footer.php");
-    $ad = ad($con, $lang, $lng); 
+    $ad = ad($con, $lang, $lng);
     stats($ad, $ad_static, "fiestas", "");
 ?>
     </body>