ソースを参照

Small files reformatted (no change in functionality). Error pages polished and added for some new cases.

Iñigo Valentin 9 年 前
コミット
b3dcaaed87
8 ファイル変更380 行追加186 行削除
  1. 71 69
      www/ayuda/index.php
  2. 36 0
      www/css/error.css
  3. 15 0
      www/css/m/error.css
  4. 86 0
      www/error/403.php
  5. 36 69
      www/error/404.php
  6. 86 0
      www/error/500.php
  7. 0 0
      www/lang/lang_es.php
  8. 50 48
      www/nosotros/index.php

+ 71 - 69
www/ayuda/index.php

@@ -1,6 +1,6 @@
 <?php
     session_start();
-    $http_host = $_SERVER['HTTP_HOST'];
+    $http_host = $_SERVER["HTTP_HOST"];
     include("../functions.php");
     $con = startdb();
     $proto = getProtocol();
@@ -10,7 +10,7 @@
     $lang = selectLanguage();
     include("../lang/lang_" . $lang . ".php");
     
-    $cur_section = $lng['section_help'];
+    $cur_section = $lng["section_help"];
 ?>
 <!DOCTYPE html>
 <html>
@@ -18,109 +18,111 @@
         <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['footer_help']?> - Gasteizko Margolariak</title>
+        <title><?=$lng["footer_help"]?> - Gasteizko Margolariak</title>
         <link rel="shortcut icon" href="<?="$server/img/logo/favicon.ico";?>">
         <!-- CSS files -->
         <style>
-            <?php 
-                include("../css/ui.css"); 
-                include("../css/ayuda.css");
-            ?>
+<?php 
+            include("../css/ui.css"); 
+            include("../css/ayuda.css");
+?>
         </style>
         <!-- CSS for mobile version -->
         <style media="(max-width : 990px)">
-            <?php 
-                include("../css/m/ui.css"); 
-                include("../css/m/ayuda.css");
-            ?>
+<?php 
+            include("../css/m/ui.css"); 
+            include("../css/m/ayuda.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="<?=$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 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: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:site_name" content="<?=$lng["us_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['us_title']?> - Gasteizko Margolariak"/>
-        <meta name="twitter:description" content="<?=$lng['us_description']?>"/>
+        <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 -->
+<?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'><?=$lng['help_contact_title']?></h3>
+                        <h3 class='section_title'><?=$lng["help_contact_title"]?></h3>
                         <div class="entry">
                             <table id="association">
                                 <tr>
-                                    <td class="name"><?=$lng['help_contact_register']?></td>
-                                    <td class="value"><?=$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"><?=$lng['help_contact_date_constitution']?></td>
-                                    <td class="value"><?=$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"><?=$lng['help_contact_date_inscription']?></td>
-                                    <td class="value"><?=$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"><?=$lng['help_contact_city']?></td>
-                                    <td class="value"><?=$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"><?=$lng['help_contact_territory']?></td>
-                                    <td class="value"><?=$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"><?=$lng['help_contact_country']?></td>
-                                    <td class="value"><?=$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"><?=$lng['help_contact_clasification']?></td>
-                                    <td class="value"><?=$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"><?=$lng['help_contact_objectives']?></td>
-                                    <td class="value"><?=$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"><?=$lng['help_contact_phone']?></td>
-                                    <td class="value"><?=$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"><?=$lng['help_contact_email']?></td>
-                                    <td class="value"><?=$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>
@@ -128,9 +130,9 @@
                 </div>
                 <div class="content_cell">
                     <div class="section" id="section_license">
-                        <h3 class='section_title'><?=$lng['help_license_title']?></h3>
+                        <h3 class='section_title'><?=$lng["help_license_title"]?></h3>
                         <div class="entry">
-                            <?=$lng['help_license']?>
+                            <?=$lng["help_license"]?>
                         </div>
                     </div>
                 </div>
@@ -138,17 +140,17 @@
             <div class="content_row">
                 <div class="content_cell">
                     <div class="section" id="section_privacy">
-                        <h3 class="section_title"><?=$lng['help_privacy_title']?></h3>
+                        <h3 class="section_title"><?=$lng["help_privacy_title"]?></h3>
                         <div class="entry">
-                            <?=$lng['help_privacy']; ?>
+                            <?=$lng["help_privacy"]; ?>
                         </div>
                     </div>
                 </div>
                 <div class="content_cell">
                     <div class="section" id="section_cookie">
-                        <h3 class='section_title'><?=$lng['help_cookie_title']?></h3>
+                        <h3 class='section_title'><?=$lng["help_cookie_title"]?></h3>
                         <div class="entry">
-                            <?=$lng['help_cookie']; ?>
+                            <?=$lng["help_cookie"]; ?>
                         </div>
                     </div>
                 </div>
@@ -156,18 +158,18 @@
             <div class="content_row">
                 <div class="content_cell">
                     <div class="section" id="section_ads">
-                        <h3 class="section_title"><?=$lng['help_ad_title']?></h3>
+                        <h3 class="section_title"><?=$lng["help_ad_title"]?></h3>
                         <div class="entry">
-                            <?=$lng['help_ad']?>
+                            <?=$lng["help_ad"]?>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-        <?php
-            include("../footer.php");
-            $ad = ad($con, $lang, $lng); 
-            stats($ad, $ad_static, "ayuda", "");
-        ?>
+<?php
+        include("../footer.php");
+        $ad = ad($con, $lang, $lng); 
+        stats($ad, $ad_static, "ayuda", "");
+?>
     </body>
 </html>

+ 36 - 0
www/css/error.css

@@ -0,0 +1,36 @@
+div#error_code{
+    display: inline-block;
+    margin-top: 2em;
+    margin-left: 10%;
+    border: 0.1em solid #000011;
+    border-radius: 1em;
+    padding: 0.5em 0 0.5em 0;
+    background-color: #0078ff;
+    -webkit-filter: drop-shadow(0 0 0.4em #000011);
+    filter: drop-shadow(0 0 0.4em #000011);
+    -ms-filter: "progid:DXImageTransform.Microsoft.Dropshadow(OffX=0, OffY=0, Color='#000011')";
+    filter: "progid:DXImageTransform.Microsoft.Dropshadow(OffX=0, OffY=0, Color='#000011')";
+    color: #ffffff;
+}
+
+
+td#error_number{
+    font-size: 300%;
+    border-right: 0.063em solid #000000;
+    padding-right: 1.875em;
+    padding-left: 1.250em;
+}
+td#error_tag{
+    font-size: 110%;
+    padding-left: 1.750em;
+    padding-right: 1.250em;
+}
+div#error_message{
+    width: 80%;
+    margin-left: 10%;
+    margin-bottom: 4em;
+}
+
+div#error_message div.entry{
+    padding: 0.8em;
+}

+ 15 - 0
www/css/m/error.css

@@ -0,0 +1,15 @@
+div#error_code{
+    width: 90%;
+    margin-left: 5%;
+    margin-right: auto;
+    margin-top: 4em;
+    margin-bottom: 2em;
+}
+div#error_message{
+    width: 90%;
+    margin-left: 5%;
+    margin-right: auto;
+    margin-top: 0;
+    margin-bottom: 4;
+}
+

+ 86 - 0
www/error/403.php

@@ -0,0 +1,86 @@
+<?php
+    $http_host = $_SERVER['HTTP_HOST'];
+    include("../functions.php");
+    $con = startdb();
+    $proto = getProtocol();
+    $server = "$proto$http_host";
+
+    //Language
+    $lang = selectLanguage();
+    include("../lang/lang_$lang.php");
+
+    $cur_section = $lng['section_home'];
+?>
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta content="text/html; charset=windows-1252" http-equiv="content-type"/>
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+        <title><?php echo $lng['error_title'] ?> - Gasteizko Margolariak</title>
+        <link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
+        <!-- CSS files -->
+        <style>
+<?php
+            include("../css/ui.css");
+            include("../css/error.css");
+?>
+        </style>
+        <!-- CSS for mobile version -->
+        <style media="(max-width : 990px)">
+<?php
+            include("../css/m/ui.css");
+            include("../css/m/error.css");
+?>
+        </style>
+        <!-- Script files -->
+        <script type="text/javascript">
+<?php
+            include("../script/ui.js");
+?>
+        </script>
+        <meta name="robots" content="noindex follow"/>
+    </head>
+    <body>
+<?php
+        include("../header.php")
+?>
+        <div id="error_code">
+            <table id="error_code">
+                <tr>
+                    <td id="error_number">
+                        403
+                    </td>
+                    <td id="error_tag">
+                        <?=$lng["error_error"]?>
+                        <br/>
+                        <?=$lng["error_code"]?>
+                    </td>
+                <tr>
+            </table>
+        </div>
+        <br/><br/><br/><br/>
+        <div id="error_message" class="section">
+            <h3 class='section_title'><?=$lng["error_403_title"]?></h3>
+            <div class="entry">
+                <?=$lng["error_403_description"]?>
+                <br/><br/>
+                <?=$lng["error_403_solution"]?>
+                <ul>
+                    <li>
+                        <a href="javascript: history.go(-1);"><?=$lng["error_403_solution_0"]?></a>
+                    </li>
+                    <li>
+                        <a href="<?php echo "$proto$http_host/";?>"><?=$lng["error_403_solution_1"]?></a>
+                    </li>
+                    <li>
+                        <a target='_blank' href="https://www.youtube.com/results?search_query=cats"><?=$lng["error_403_solution_2"]?></a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+<?php
+        include("../footer.php");
+        stats(-1, $ad_static, "error", "403");
+?>
+    </body>
+</html>

+ 36 - 69
www/error/404.php

@@ -3,11 +3,12 @@
     include("../functions.php");
     $con = startdb();
     $proto = getProtocol();
-    
+    $server = "$proto$http_host";
+
     //Language
     $lang = selectLanguage();
-    include("../lang/lang_" . $lang . ".php");
-    
+    include("../lang/lang_$lang.php");
+
     $cur_section = $lng['section_home'];
 ?>
 <!DOCTYPE html>
@@ -19,101 +20,67 @@
         <link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
         <!-- CSS files -->
         <style>
-            <?php 
-                include("../css/ui.css"); 
-                include("../css/error.css");
-            ?>
+<?php
+            include("../css/ui.css");
+            include("../css/error.css");
+?>
         </style>
         <!-- CSS for mobile version -->
         <style media="(max-width : 990px)">
-            <?php 
-                include("../css/m/ui.css"); 
-                include("../css/m/error.css");
-            ?>
+<?php
+            include("../css/m/ui.css");
+            include("../css/m/error.css");
+?>
         </style>
         <!-- Script files -->
         <script type="text/javascript">
-            <?php
-                include("../script/ui.js");
-            ?>
+<?php
+            include("../script/ui.js");
+?>
         </script>
-        <style>
-            div#error-code{
-                display:        inline-block;
-                margin-top:        2em;
-                margin-left:     10%;
-            }
-            td#error-number{
-                font-size:        300%;
-                border-right:    0.063em solid #000000;
-                padding-right:    1.875em;
-                padding-left:    1.250em;
-            }
-            td#error-tag{
-                font-size:        110%;
-                padding-left:    1.750em;
-                padding-right:    1.250em;
-            }
-            div#error-message{
-                width:            80%;
-                margin-left:    10%;
-            }
-            @media (max-width: 990px){
-                div#error-code{
-                    width:            90%;
-                    margin-left:    auto;
-                    margin-right:    auto;
-                    margin-top:        0;
-                    margin-bottom:    0;
-                }
-                div#error-message{
-                    width:            90%;
-                    margin-left:    auto;
-                    margin-right:    auto;
-                    margin-top:        0;
-                    margin-bottom:    0;
-                }
-            }
-        </style>
         <meta name="robots" content="noindex follow"/>
     </head>
     <body>
-        <?php  include("../header.php");?>
-        <div class="section" id="error-code">
-            <table id="error-code" class="section">
+<?php
+        include("../header.php")
+?>
+        <div id="error_code">
+            <table id="error_code">
                 <tr>
-                    <td id="error-number">
+                    <td id="error_number">
                         404
                     </td>
-                    <td id="error-tag">
-                        <?php echo "$lng[error_error]<br/>$lng[error_code]\n"; ?>
+                    <td id="error_tag">
+                        <?=$lng["error_error"]?>
+                        <br/>
+                        <?=$lng["error_code"]?>
                     </td>
                 <tr>
             </table>
         </div>
         <br/><br/><br/><br/>
-        <div id="error-message" class="section">
-            <h2><?php echo $lng['error_404_title']; ?></h2>
+        <div id="error_message" class="section">
+            <h3 class='section_title'><?=$lng["error_404_title"]?></h3>
             <div class="entry">
-                <?php echo $lng['error_404_description']; ?>
+                <?=$lng["error_404_description"]?>
                 <br/><br/>
-                <?php echo $lng['error_404_solution']; ?>
+                <?=$lng["error_404_solution"]?>
                 <ul>
                     <li>
-                        <a href="javascript: history.go(-1);"><?php echo $lng['error_404_solution_0']; ?></a>
+                        <a href="javascript: history.go(-1);"><?=$lng["error_404_solution_0"]?></a>
                     </li>
                     <li>
-                        <a href="<?php echo "$proto$http_host/";?>"><?php echo $lng['error_404_solution_1']; ?></a>
+                        <a href="<?php echo "$proto$http_host/";?>"><?=$lng["error_404_solution_1"]?></a>
                     </li>
                     <li>
-                        <a target='_blank' href="https://www.youtube.com/results?search_query=cats"><?php echo $lng['error_404_solution_2']; ?></a>
+                        <a target='_blank' href="https://www.youtube.com/results?search_query=cats"><?=$lng["error_404_solution_2"]?></a>
                     </li>
                 </ul>
             </div>
         </div>
-        <?php
-            include("../footer.php");
-            stats(-1, $ad_static, "error", "404");
-        ?>
+<?php
+        include("../footer.php");
+        stats(-1, $ad_static, "error", "404");
+?>
     </body>
 </html>

+ 86 - 0
www/error/500.php

@@ -0,0 +1,86 @@
+<?php
+    $http_host = $_SERVER['HTTP_HOST'];
+    include("../functions.php");
+    $con = startdb();
+    $proto = getProtocol();
+    $server = "$proto$http_host";
+
+    //Language
+    $lang = selectLanguage();
+    include("../lang/lang_$lang.php");
+
+    $cur_section = $lng['section_home'];
+?>
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta content="text/html; charset=windows-1252" http-equiv="content-type"/>
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+        <title><?php echo $lng['error_title'] ?> - Gasteizko Margolariak</title>
+        <link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
+        <!-- CSS files -->
+        <style>
+<?php
+            include("../css/ui.css");
+            include("../css/error.css");
+?>
+        </style>
+        <!-- CSS for mobile version -->
+        <style media="(max-width : 990px)">
+<?php
+            include("../css/m/ui.css");
+            include("../css/m/error.css");
+?>
+        </style>
+        <!-- Script files -->
+        <script type="text/javascript">
+<?php
+            include("../script/ui.js");
+?>
+        </script>
+        <meta name="robots" content="noindex follow"/>
+    </head>
+    <body>
+<?php
+        include("../header.php")
+?>
+        <div id="error_code">
+            <table id="error_code">
+                <tr>
+                    <td id="error_number">
+                        500
+                    </td>
+                    <td id="error_tag">
+                        <?=$lng["error_error"]?>
+                        <br/>
+                        <?=$lng["error_code"]?>
+                    </td>
+                <tr>
+            </table>
+        </div>
+        <br/><br/><br/><br/>
+        <div id="error_message" class="section">
+            <h3 class='section_title'><?=$lng["error_500_title"]?></h3>
+            <div class="entry">
+                <?=$lng["error_500_description"]?>
+                <br/><br/>
+                <?=$lng["error_500_solution"]?>
+                <ul>
+                    <li>
+                        <a href="javascript: history.go(-1);"><?=$lng["error_500_solution_0"]?></a>
+                    </li>
+                    <li>
+                        <a href="<?php echo "$proto$http_host/";?>"><?=$lng["error_500_solution_1"]?></a>
+                    </li>
+                    <li>
+                        <a target='_blank' href="https://www.youtube.com/results?search_query=cats"><?=$lng["error_500_solution_2"]?></a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+<?php
+        include("../footer.php");
+        stats(-1, $ad_static, "error", "500");
+?>
+    </body>
+</html>

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


+ 50 - 48
www/nosotros/index.php

@@ -4,10 +4,11 @@
     include("../functions.php");
     $con = startdb();
     $proto = getProtocol();
+	$server = "$proto$http_host";
     
     //Language
     $lang = selectLanguage();
-    include("../lang/lang_" . $lang . ".php");
+    include("../lang/lang_$lang.php");
     
     $cur_section = $lng['section_us'];
 ?>
@@ -17,66 +18,68 @@
         <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['us_title'];?> - Gasteizko Margolariak</title>
-        <link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
+        <title><?=$lng["us_title"]?> - Gasteizko Margolariak</title>
+        <link rel="shortcut icon" href="<?=$server?>/img/logo/favicon.ico">
         <!-- CSS files -->
         <style>
-            <?php 
-                include("../css/ui.css"); 
-                include("../css/nosotros.css");
-            ?>
+<?php 
+            include("../css/ui.css"); 
+            include("../css/nosotros.css");
+?>
         </style>
         <!-- CSS for mobile version -->
         <style media="(max-width : 990px)">
-            <?php 
-                include("../css/m/ui.css"); 
-                include("../css/m/nosotros.css");
-            ?>
+<?php 
+            include("../css/m/ui.css"); 
+            include("../css/m/nosotros.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/nosotros/"; ?>"/>
-        <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?>/nosotros/"/>
+        <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"); ?>
+<?php 
+		include("../header.php");
+?>
         <div id="content">
             <div class="content_row">
                 <div class="content_cell">
                     <div class="section" id="section_association">
-                        <h3 class='section_title'><?php echo $lng['us_association']; ?></h3>
+                        <h3 class='section_title'><?=$lng["us_association"] ?></h3>
                         <div class="entry">
-                            <img src="/img/nosotros/logo.png" alt=" "/>
-                            <?php echo $lng['us_association_content']; ?>
+                            <img src="<?=$server?>/img/nosotros/logo.png" alt=" "/>
+                            <?=$lng["us_association_content"] ?>
                         </div>
                     </div>
                 </div>
                 <div class="content_cell">
                     <div class="section" id="section_cuadrilla">
-                        <h3 class='section_title'><?php echo $lng['us_cuadrilla']; ?></h3>
+                        <h3 class='section_title'><?=$lng["us_cuadrilla"] ?></h3>
                         <div class="entry">
-                            <img src="/img/nosotros/margolo.png" alt=" "/>
-                            <?php echo $lng['us_cuadrilla_content']; ?>
+                            <img src="<?=$server?>/img/nosotros/margolo.png" alt=" "/>
+                            <?=$lng["us_cuadrilla_content"] ?>
                         </div>
                     </div>
                 </div>
@@ -84,32 +87,31 @@
             <div class="content_row">
                 <div class="content_cell">
                     <div class="section" id="section_activities">
-                        <h3 class='section_title'><?php echo $lng['us_activities']; ?></h3>
+                        <h3 class='section_title'><?=$lng["us_activities"] ?></h3>
                         <div class="entry">
-                            <img src="/img/nosotros/actividades.png" alt=" "/>
-                            <?php echo $lng['us_activities_content']; ?>
+                            <img src="<?=$server?>/img/nosotros/actividades.png" alt=" "/>
+                            <?=$lng["us_activities_content"] ?>
                         </div>
                     </div>
                 </div>
                 <div class="content_cell">
                     <div class="section" id="section_transparency">
-                        <h3 class='section_title'><?php echo $lng['us_transparency']; ?></h3>
+                        <h3 class='section_title'><?=$lng["us_transparency"] ?></h3>
                         <div class="entry">
-                            <img src="/img/nosotros/transparencia.png" alt=" "/>
-                            <?php echo $lng['us_transparency_content']; ?>
+                            <img src="<?=$server?>/img/nosotros/transparencia.png" alt=" "/>
+                            <?=$lng["us_transparency_content"] ?>
                             <div>
-                                <!-- TODO: Link like button -->
-<!--                                 <a href="/nosotros/transparencia/">Consulta nuestras cuentas</a> -->
+								<!-- <a class='button' href="/nosotros/transparencia/">Consulta nuestras cuentas</a> -->
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-        <?php
-            include("../footer.php");
-            $ad = ad($con, $lang, $lng); 
-            stats($ad, $ad_static, "nosotros", "");
-        ?>
+<?php
+        include("../footer.php");
+        $ad = ad($con, $lang, $lng); 
+        stats($ad, $ad_static, "nosotros", "");
+?>
     </body>
 </html>

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