Przeglądaj źródła

Merge branch 'Help'

Iñigo Valentin 9 lat temu
rodzic
commit
a0d40683be
6 zmienionych plików z 132 dodań i 85 usunięć
  1. 62 47
      www/ayuda/index.php
  2. 19 2
      www/css/ayuda.css
  3. 13 0
      www/css/m/ayuda.css
  4. 11 11
      www/lang/lang_en.php
  5. 5 4
      www/lang/lang_es.php
  6. 22 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{

+ 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;
 }

Plik diff jest za duży
+ 11 - 11
www/lang/lang_en.php


Plik diff jest za duży
+ 5 - 4
www/lang/lang_es.php


Plik diff jest za duży
+ 22 - 21
www/lang/lang_eu.php


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików