Prechádzať zdrojové kódy

Redesigned, back to PHP.

Iñigo Valentin 2 rokov pred
rodič
commit
0e6abf34ef
81 zmenil súbory, kde vykonal 2393 pridanie a 4133 odobranie
  1. 5 10
      .gitignore
  2. 45 6
      application/Context.php
  3. 55 210
      application/Controller.php
  4. 8 0
      application/config/config.ini
  5. 0 44
      application/config/config.php
  6. 74 48
      application/entity/Cv.php
  7. 10 16
      application/entity/Entity.php
  8. 67 46
      application/entity/Lang.php
  9. 2 9
      application/entity/License.php
  10. 40 36
      application/entity/Project.php
  11. 18 11
      application/entity/Project_Image.php
  12. 2 7
      application/entity/Project_Url.php
  13. 54 21
      application/entity/Project_Url_Type.php
  14. 85 0
      application/entity/Social.php
  15. 231 0
      application/entity/User.php
  16. 0 1
      application/helper/HTML_Helper.php
  17. 1 1
      application/helper/Helper.php
  18. 96 106
      application/helper/TEXT_Helper.php
  19. 10 11
      application/page/Error_Page.php
  20. 74 50
      application/page/Help_Page.php
  21. 10 18
      application/page/Home_Page.php
  22. 71 65
      application/page/Page.php
  23. 67 54
      application/page/Profile_Page.php
  24. 38 36
      application/page/Project_Page.php
  25. 36 37
      application/page/Projects_Page.php
  26. 32 0
      application/page/Robots_Page.php
  27. 74 0
      application/page/Sitemap_Page.php
  28. 0 3
      application/resources/text/HELP_COOKIES_TEXT__EN
  29. 0 3
      application/resources/text/HELP_COOKIES_TEXT__ES
  30. 0 3
      application/resources/text/HELP_COOKIES_TEXT__EU
  31. 0 0
      application/resources/text/HELP_INFO_TEXT__EN
  32. 0 0
      application/resources/text/HELP_INFO_TEXT__ES
  33. 0 0
      application/resources/text/HELP_INFO_TEXT__EU
  34. 0 9
      application/resources/text/HELP_LICENSE_TEXT__EN
  35. 0 9
      application/resources/text/HELP_LICENSE_TEXT__ES
  36. 0 9
      application/resources/text/HELP_LICENSE_TEXT__EU
  37. 0 7
      application/resources/text/HELP_PRIVACY_TEXT__EN
  38. 0 7
      application/resources/text/HELP_PRIVACY_TEXT__ES
  39. 0 7
      application/resources/text/HELP_PRIVACY_TEXT__EU
  40. 0 49
      application/resources/text/LICENSE_CC-BY-SA_SUMMARY__EN
  41. 0 49
      application/resources/text/LICENSE_CC-BY-SA_SUMMARY__ES
  42. 0 49
      application/resources/text/LICENSE_CC-BY-SA_SUMMARY__EU
  43. 0 128
      application/resources/text/LICENSE_CC-BY-SA__EN
  44. 0 128
      application/resources/text/LICENSE_CC-BY-SA__ES
  45. 0 128
      application/resources/text/LICENSE_CC-BY-SA__EU
  46. 0 1
      application/resources/text/LICENSE_GPLV3_SUMMARY__EN
  47. 0 1
      application/resources/text/LICENSE_GPLV3_SUMMARY__ES
  48. 0 1
      application/resources/text/LICENSE_GPLV3_SUMMARY__EU
  49. 0 683
      application/resources/text/LICENSE_GPLV3__EN
  50. 0 683
      application/resources/text/LICENSE_GPLV3__ES
  51. 0 683
      application/resources/text/LICENSE_GPLV3__EU
  52. 0 12
      application/resources/text/PROJECT_GM_TEXT__EN
  53. 0 12
      application/resources/text/PROJECT_GM_TEXT__ES
  54. 0 12
      application/resources/text/PROJECT_GM_TEXT__EU
  55. 0 1
      application/resources/text/USER_TEXT__EN
  56. 0 1
      application/resources/text/USER_TEXT__ES
  57. 0 1
      application/resources/text/USER_TEXT__EU
  58. 2 4
      application/util/Log.php
  59. 17 6
      application/util/URL.php
  60. 7 18
      application/view/error.php
  61. 43 40
      application/view/help.php
  62. 47 15
      application/view/home.php
  63. 21 16
      application/view/inc/footer.php
  64. 3 4
      application/view/inc/header.php
  65. 53 53
      application/view/profile.php
  66. 80 65
      application/view/project.php
  67. 54 56
      application/view/projects.php
  68. 16 0
      application/view/robots.php
  69. 16 0
      application/view/sitemap.php
  70. 73 7
      public/css/help.css
  71. 95 12
      public/css/home.css
  72. 27 17
      public/css/profile.css
  73. 31 23
      public/css/project.css
  74. 40 14
      public/css/projects.css
  75. 247 27
      public/css/ui.css
  76. 1 2
      public/img/content/resizer
  77. 0 0
      public/img/layout/social/web.svg
  78. 27 9
      public/js/help.js
  79. 118 99
      sql/01_structure.sql
  80. 9 3
      sql/02_security.sql
  81. 161 121
      sql/03_data.sql

+ 5 - 10
.gitignore

@@ -14,6 +14,7 @@ Thumbs.db
 .project
 .settings
 .externalToolBuilders
+*.kate-swp
 
 #Local server and deploy tools
 deploy
@@ -21,18 +22,12 @@ server_*
 .php_pid
 
 #SQL custom data
-sql/DES/
-sql/PRE/
-sql/DBG/
+sql/XX_*
 
 #Passwords file
 .htpasswd*
-application/config/auth.php_*
+application/config/config.ini_*
 
 #Content images
-public/img/content/*.png
-public/img/content/*.svg
-public/img/content/*/*.png
-public/img/content/*/*.svg
-public/img/content/*/*/*.png
-public/img/content/*/*/*.svg
+public/img/content/
+application/resources/

+ 45 - 6
application/Context.php

@@ -9,6 +9,8 @@
  * @package IV
  */
 
+require_once(PATH::ENTITY . "User.php");
+
 /**
  * Application context.
  *
@@ -23,6 +25,28 @@ class Context {
      */
     private $db;
 
+    /**
+     * Current site user profile.
+     */
+    private $user;
+    
+    /**
+     * Two letter language code.
+     */
+    private $lang;
+    
+    /**
+     * List of two letter language codes available in the application.
+     * */
+    private $available_languages = [];
+    
+    public function __construct(){
+        // TODO: Validate language codes.
+        $langs = parse_ini_file(__DIR__ . "/config/config.ini", true)["language"]["available"];
+        $this->available_languages = explode("|", $langs);
+        $this->lang = parse_ini_file(__DIR__ . "/config/config.ini", true)["language"]["default"];
+    }
+
     /**
      * Retrieves the database connection.
      *
@@ -41,28 +65,43 @@ class Context {
         $this->db = $db;
         Log::debug("Context database is set and accesible.");
         if ($this->db == null){
-            Log::debug("It is null");
+            Log::error("DB is null");
         }
     }
+
+    public function get_user(){
+        if ($this->user == null) $this->user = new User();
+        return $this->user;
+    }
     
     /**
      * Retrieves the language.
      * 
-     * @todo Implement
      * @return string Two letter language code.
      */
     public function get_lang(){
-        return "es";
+        return $this->lang;
+    }
+    
+    /**
+     * Sets the anguage.
+     * @param string $code Two letter language code.
+     */
+    public function set_lang($code){
+        if (in_array(strtolower($code), $this->available_languages)){
+            $this->lang = strtolower($code);
+            setcookie("lang", $this->lang, time()+ 60 * 60 * 24 * 30, "/", $_SERVER["HTTP_HOST"]);
+        }
+        else Log::warn("Tried to set unsupported language '$code'");
     }
     
     /**
      * Retrieves the list of available languages.
      *
-     * @todo Implement
-     * @return string Two letter language code.
+     * @return string Two letter language code of avilable languages.
      */
     public function get_available_langs(){
-        return [];
+        return $this->available_languages;
     }
 
 }

+ 55 - 210
application/Controller.php

@@ -9,7 +9,6 @@
  * @package IVV
  */
 
-require_once(__DIR__ . "/Context.php");
 require_once(__DIR__ . "/helper/DB_Helper.php");
 require_once(__DIR__ . "/helper/TEXT_Helper.php");
 require_once(__DIR__ . "/helper/NET_Helper.php");
@@ -17,10 +16,7 @@ require_once(__DIR__ . "/helper/HTML_Helper.php");
 require_once(__DIR__ . "/util/Log.php");
 require_once(__DIR__ . "/util/Path.php");
 require_once(__DIR__ . "/util/URL.php");
-//require_once(__DIR__ . "/helper/net.php");
-//require_once(__DIR__ . "/Application.php");
-//require_once(__DIR__ . "/util/Log.php");
-
+require_once(__DIR__ . "/Context.php");
 
 /**
  * Application controller.
@@ -42,9 +38,19 @@ class Controller extends Context{
      */
     private $context;
     
-    private $command = "";
+    /**
+     * @var string URL command (first parameter, excluding optional language).
+     */
+     private $command = "";
     
+     /**
+      * @var int HTTP status.
+      */
     private $status = 201;
+
+    /**
+     * @var string HTTP message.
+     */
     private $message = "OK";
     
 
@@ -53,9 +59,7 @@ class Controller extends Context{
      * 
      * @return Context The context.
      */
-    public function get_context(){
-        return $this->context;
-    }
+    public function get_context(){return $this->context;}
     
     /**
      * Controller constructor.
@@ -95,49 +99,33 @@ class Controller extends Context{
             }
         }
         
-        // Obtain the command and process it
-        if (sizeof($this->params) > 0){
-            $this->command = strtoupper($this->params[0]);
+        // Check if the first parameter is a language code.
+        if (sizeof($this->params) > 0 && $this->context->get_user()->is_valid_language($this->params[0])){
+            $this->context->set_lang($this->params[0]);
+            $this->params = array_slice($this->params, 1);
         }
-        Log::debug("Controller command set: '" . $this->command . "'");
-        switch ($this->command){
-            case "": // Main page
-                break;
-            case "API": // An API call
-                return; // End preparation here, the API controller will deal with everything.
-                break;
-            case "ACTION": // Execute an action
-                //$auth_required = true;
-                break;
-            case "PLAYER": // A player page
-                if (sizeof($this->params) > 1){
-                    $player_id = $this->params[1];
-                }
-                else{
-                    $this->status = 400;
-                    $this->message = "Bad request";
-                    return;
+        elseif(isSet($_COOKIE['lang']) && $this->context->get_user()->is_valid_language($_COOKIE['lang'])){
+            $this->context->set_lang($_COOKIE['lang']);
+        }
+        else{
+            $lang = "";
+            // Set a default
+            if (sizeof($this->context->get_user()->get_langs()) > 0)
+                $lang = $this->context->get_user()->get_langs()[0]->get_code();
+            // Get a list of avaiable languages from client browser.
+            foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $accepted) {
+                $code = substr($accepted, 0, 2);
+                if ($this->context->get_user()->is_valid_language($code)){
+                    $lang = $code;
+                    break;
                 }
-                break;
-            case "LOGIN": // The login page
-                break;
-            case "REGISTER": // Registration page
-                break;
-            case "SEARCH": // Search results
-                break;
-            case "DUNGEON": // Dungeon static pages
-                break;
-            case "BUILDING": // Building static pages
-                break;
-            case "FUSION": // Fusion static pages
-                break;
-            case "HELP": // Help static page
-                break;
-            case "ERROR": // Error page
-                break;
-            default: // Unknown page
-                
+            }
+            if ($lang != "") $this->context->set_lang($lang);
         }
+        
+        // Obtain the command and process it
+        if (sizeof($this->params) > 0) $this->command = strtoupper($this->params[0]);
+        Log::debug("Controller command set: '" . $this->command . "'");
     }
     
     /**
@@ -147,9 +135,7 @@ class Controller extends Context{
      * @return void|number
      */
     public function action(){
-        
         Log::debug("Executing action");
-        
         // If there was an error in preparation, it's time to throw it.
         if ($this->status >= 400 && $this->status < 500){
             Log::debug("Executing action error code: " . $this->status);
@@ -167,95 +153,33 @@ class Controller extends Context{
                 require_once(PATH::PAGE . "Home_Page.php");
                 $page = new Home_Page();
                 break;
-            case "ACTION": // Execute an action
-                // If no action specified
-                if (sizeof($this->params) < 2){
-                    require_once(PATH::PAGE . "Error_Page.php");
-                    $page = new Error_Page(400, "No action specified.");
-                    require_once($page->get_view());
-                    http_response_code(400);
-                    return 400;
-                }
-                
-                // Process action
-                $action = strtoupper($this->params[1]);
-                switch ($action){
-                    // Special cases where the output must be printed:
-                    case "OPTIMIZE_LIST":
-                        require_once(PATH::ACTION . "Optimize_List_Action.php");
-                        $action = new Optimize_List_Action();
-                        break;
-                    default:
-                        require_once(PATH::PAGE . "Error_Page.php");
-                        $page = new Error_Page(404, "Action not found");
-                        require_once($page->get_view());
-                        http_response_code(404);
-                        return;
-                }
-                $action->execute();
-                if (strlen($action->get_output()) > 0){
-                    echo($action->get_output());
-                }
-                http_response_code($action->get_code());
-                return $action->get_code();
-                break;
-            case "PLAYER": // A player page
-                if ($this->context->get_player() == null || $this->context->get_player()->get_id() == null){
-                    require_once(PATH::PAGE . "Error_Page.php");
-                    $page = new Error_Page(404, "Player not found");
-                    require_once($page->get_view());
-                    http_response_code(404);
-                    return;
-                }
-                if (
-                  $this->context->get_player()->is_public() == false &&
-                  (
-                      $this->context->get_user() == null ||
-                    $this->context->get_player()->get_user() != $this->context->get_user()->get_id()
-                  )
-                ){
-                    require_once(PATH::PAGE . "Error_Page.php");
-                    $page = new Error_Page(401, "Player profile set to private");
-                    require_once($page->get_view());
-                    http_response_code(401);
-                }
-                $subcommand = "";
-                if (sizeof($this->params) > 2){
-                    $subcommand = strtoupper($this->params[2]);
-                }
-                $page = null;
-                switch ($subcommand){
-                    case "": // Player profile
-                        require_once(PATH::PAGE . "Player_Page.php");
-                        $page = new Player_Page($this->context->get_player()->get_id());
-                        break;
-                    
-                    case "TEAMS":
-                        require_once(PATH::PAGE . "Teams_Page.php");
-                        $page = new Teams_Page();
-                        break;
-                }
-                break;
-            
-            case "BUILDINGS": // Building static pages
+            case "PROJECT": // Projects
+            case "PROJECTS": // Projects
                 if (sizeof($this->params) > 1){
-                    require_once(PATH::PAGE . "Building_Page.php");
-                    $page = new Building_Page($this->params[1]);
+                    require_once(PATH::PAGE . "Project_Page.php");
+                    $page = new Project_Page($this->params[1]);
                 }
                 else{
-                    require_once(PATH::PAGE . "Buildings_Page.php");
-                    $page = new Buildings_Page();
+                    require_once(PATH::PAGE . "Projects_Page.php");
+                    $page = new Projects_Page();
                 }
                 break;
+            case "PROFILE": // Profile
+                require_once(PATH::PAGE . "Profile_Page.php");
+                $page = new Profile_Page();
                 break;
-            /*case "FUSION": // Fusion static pages
-                require_once(PATH::PAGE . "Fusion_Page.php");
-                $page = new Fusion_Page();
-                break;*/
             case "HELP": // Help static page
                 require_once(PATH::PAGE . "Help_Page.php");
                 $page = new Help_Page();
                 break;
+            case "SITEMAP.XML": // Sitemap file
+                require_once(PATH::PAGE . "Sitemap_Page.php");
+                $page = new Sitemap_Page();
+                break;
+            case "ROBOTS.TXT": // robots.txt file
+                require_once(PATH::PAGE . "Robots_Page.php");
+                $page = new Robots_Page();
+                break;
         }
         
         // If page is not set, it's a not found.
@@ -279,84 +203,5 @@ class Controller extends Context{
         http_response_code($page->get_code());
     }
 
-        /**
-         * Constructor.
-         *
-         * Handles every request, creating the required models and selecting the
-         * view.
-         */
-        /*public function __construct($params){
-
-            global $path;
-            global $base_url;
-            global $static;
-            global $static_url;
-            global $base_dir;
-            $page;
-            
-            header("Content-Type: text/html; charset=utf8");
-            
-            // Read configuration
-            // TODO: Read the other params and do something with them.
-            $configuration = parse_ini_file(__DIR__ . "/config/config.ini", true);
-            $db = DB::start($configuration["database"]);
-
-            // Parse parameters, get lang and build the route.
-            $pars = [];
-            foreach($params as $p){
-                if (strlen($p) > 0){
-                    array_push($pars, $p);
-                }
-            }
-            $route = [];
-            if (sizeof($pars) > 0 && preg_match("/^[a-zA-Z]{2}$/", $pars[0])){
-                $lang = $pars[0];
-                array_splice($pars, 0, 1);
-                // Override global to include language in URL
-                $base_url = get_protocol() . $_SERVER["HTTP_HOST"] . "/" . $lang;
-            }
-            else{
-                $lang = select_language($db);
-            }
-            foreach($pars as $p){
-                array_push($route, $p);
-            }
-
-            // Select the model to load.
-            if (sizeof($route) == 0){
-                require_once($path["page"] . "Home_Page.php");
-                $page = new Home_Page($db, $lang);
-            }
-            else{
-                if (strtoupper($route[0]) == "HELP"){
-                    require_once($path["page"] . "Help_Page.php");
-                    $page = new Help_Page($db, $lang);
-                }
-                if (strtoupper($route[0]) == "PROFILE"){
-                    require_once($path["page"] . "Profile_Page.php");
-                    $page = new Profile_Page($db, $lang);
-                }
-                elseif (strtoupper($route[0]) == "PROJECT"){
-                    if (sizeof($route) > 1){
-                        // Project page
-                        require_once($path["page"] . "Project_Page.php");
-                        $page = new Project_Page($db, $lang, $route[1]);
-                    }
-                    else{
-                        // Project list page
-                        require_once($path["page"] . "Projects_Page.php");
-                        $page = new Projects_Page($db, $lang);
-                    }
-                }
-            }
-
-            // Load the view, or set an error code.
-            if (!isset($page)){
-                http_response_code(404);
-                require_once($path["page"] . "Error_Page.php");
-                $page = new Error_Page($db, $lang);
-            }
-            require_once($page->view);
-        }*/
-    }
+}
 ?>

+ 8 - 0
application/config/config.ini

@@ -10,5 +10,13 @@ pass = "XXX"
 available = "en|es|eu"
 default = "es"
 
+[user]
+id = "1"
+year = "2022"
+
+[log]
+level = "warn"
+file = "/var/log/"
+
 [maintenance]
 enable = false

+ 0 - 44
application/config/config.php

@@ -1,44 +0,0 @@
-<?php
-
-    require_once(__DIR__ . "/../helper/net.php");
-
-    /**
-     * Server base url, including protocol, without language indicator.
-     * It may be overwritten by the controller to add the language.
-     */
-    $base_url = get_protocol() . $_SERVER["HTTP_HOST"];
-    $static_url = get_protocol() . $_SERVER["HTTP_HOST"];
-
-    /**
-     * Static url, absolute, language independant.
-     */
-    $static = [
-        "layout" => $static_url . "/img/layout/",
-        "content" => $static_url . "/img/content/",
-        "fonts" => $static_url . "/fonts/",
-        "css" => $static_url . "/css/",
-        "demo" => $static_url . "/demo/",
-        "js" => $static_url . "/js/",
-        "cv" => $static_url . "/cv/"
-    ];
-
-    /**
-     * Server document root.
-     */
-    $base_dir = $_SERVER["DOCUMENT_ROOT"];
-
-    /**
-     * Paths within the server.
-     */
-    $path = [
-        "application" => $base_dir . "/../application/",
-        "controller" => $base_dir . "/../application/Controller.php",
-        "entity" => $base_dir . "/../application/entity/",
-        "page" => $base_dir . "/../application/page/",
-        "helper" => $base_dir . "/../application/helper/",
-        "view" => $base_dir . "/../application/view/",
-        "inc" => $base_dir . "/../application/view/inc/",
-        "string" => $base_dir . "/../application/view/string/"
-    ];
-
-?>

+ 74 - 48
application/entity/Cv.php

@@ -1,58 +1,84 @@
 <?php
+/**
+ * CV (resume) entity file.
+ *
+ * Provides the entity Cv.
+ *
+ * @author Iñigo Valentin <i@inigovalentin.com>
+ * @license https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License V3
+ * @package IVV
+ */
 
-    require_once($path["entity"] . "Entity.php");
-    require_once($path["entity"] . "Lang.php");
+require_once(PATH::ENTITY . "Entity.php");
+require_once(PATH::ENTITY . "Lang.php");
 
+/**
+ * CV (resume).
+ *
+ * Represents an object from the table 'cv'.
+ */
+class Cv extends Entity{
 
     /**
-     * CV file.
+     * CV file identifier.
+     */
+    private $id;
+
+    /**
+     * CV {@see Lang}.
+     */
+    private $lang;
+
+    /**
+     * Filename.
+     */
+    private $file;
+
+    /**
+     * Constructor.
+     *
+     * Searches the database and retrieves the information about the
+     * object, populating it.
      *
-     * Represents an object from the table 'cv'.
+     * @param string $id CV id.
      */
-    class Cv extends Entity{
-
-        /**
-         * CV file identifier.
-         */
-        public $id;
-
-        /**
-         * CV {@see Lang}.
-         */
-        public $lang;
-
-        /**
-         * Filename.
-         */
-        public $file;
-
-
-        /**
-         * Constructor.
-         *
-         * Searches the database and retrieves the information about the
-         * object, populating it.
-         *
-         * @param MySQL_connection $db Connection to the database.
-         * @param int $id Database identifier of the language.
-         */
-        public function __construct($db, $id){
-            parent::__construct($db, null);
-            $s =
-              "SELECT " .
-              "  lang, " .
-              "  file " .
-              "FROM cv " .
-              "WHERE " .
-              "  id = '$id'; ";
-            error_log($s);
-            $q = mysqli_query($this->db, $s);
-            if (mysqli_num_rows($q) > 0){
-                $r = mysqli_fetch_array($q);
-                $this->id = $id;
-                $this->lang = new Lang($this->db, $r["lang"]);
-                $this->file = $r["file"];
-            }
+    public function __construct($id){
+        $statement = get_context()->get_db()->prepare("SELECT lang, file FROM cv WHERE id = :id");
+        $statement->bindValue(':id', $id, PDO::PARAM_INT);
+        $statement->execute();
+        $r_cv = $statement->fetch(PDO::FETCH_ASSOC);
+        if ($r_cv !== false){
+            $this->id = $id;
+            $this->lang = new Lang($r_cv["lang"]);
+            $this->file = $r_cv["file"];
         }
     }
+
+    /**
+     * Retrieves the CV identifier.
+     *
+     * @return int CV ID.
+     */
+    public function get_id(){
+        return $this->id;
+    }
+
+    /**
+     * Retrieves the CV language.
+     *
+     * @return int CV language.
+     */
+    public function get_lang(){
+        return $this->lang;
+    }
+
+    /**
+     * Retrieves the path to the CV file.
+     *
+     * @return int CV file path.
+     */
+    public function get_file(){
+        return $this->file;
+    }
+}
 ?>

+ 10 - 16
application/entity/Entity.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Entity superclass file.
+ *
+ * Provides a class to extend all entities from.
+ *
+ * @author Iñigo Valentin <i@inigovalentin.com>
+ * @license https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License V3
+ * @package IVV
+ */
 
 /**
  * Entity superclass.
@@ -6,19 +15,4 @@
  * Every other entity must inherit from this one. It represents a database
  * entity.
  */
-abstract class Entity{
-    protected $loaded = false;
-    protected $complete = false;
-    protected function mark_as_loaded($loaded){
-        $this->loaded = (bool) $loaded;
-    }
-    protected function mark_as_complete($complete){
-        $this->complete = (bool) $complete;
-    }
-    public function is_loaded(){
-        return $this->loaded;
-    }
-    public function is_complete(){
-        return $this->complete;
-    }
-}
+abstract class Entity{}

+ 67 - 46
application/entity/Lang.php

@@ -1,56 +1,77 @@
 <?php
 
-    require_once($path["entity"] . "Entity.php");
+require_once(PATH::ENTITY . "Entity.php");
 
 
+/**
+ * Language.
+ *
+ * Represents an object from the table 'lang'.
+ */
+class Lang extends Entity{
+
+    /**
+     * Lowercase, two-letter language code.
+     */
+    private $code;
+
+    /**
+     * Language name, in it's own language.
+     */
+    private $name;
+
     /**
-     * Language.
+     * Indictes wether the language is offered in this language.
+     */
+    private $active;
+
+    /**
+     * Constructor.
      *
-     * Represents an object from the table 'lang'.
+     * Searches the database and retrieves the information about the
+     * object, populating it.
+     *
+     * @param int $id Database identifier of the language.
      */
-    class Lang extends Entity{
-
-        /**
-         * Lowercase, two-letter language code.
-         */
-        public $code;
-
-        /**
-         * Language name, in it's own language.
-         */
-        public $name;
-
-        /**
-         * Indictes wether the language is offered in this language.
-         */
-        public $active;
-
-        /**
-         * Constructor.
-         *
-         * Searches the database and retrieves the information about the
-         * object, populating it.
-         *
-         * @param MySQL_connection $db Connection to the database.
-         * @param int $id Database identifier of the language.
-         */
-        public function __construct($db, $id){
-            parent::__construct($db, null);
-            $s =
-              "SELECT " .
-              "  code, " .
-              "  name, " .
-              "  active " .
-              "FROM lang " .
-              "WHERE " .
-              "  code = '$id'; ";
-            $q = mysqli_query($this->db, $s);
-            if (mysqli_num_rows($q) > 0){
-                $r = mysqli_fetch_array($q);
-                $this->code = $r["code"];
-                $this->name = $r["name"];
-                $this->active = $r["active"];
-            }
+    public function __construct($id){
+        $statement = get_context()->get_db()->prepare(
+          "SELECT code, name, active FROM lang WHERE code = :id"
+        );
+        $statement->bindValue(':id', $id, PDO::PARAM_STR);
+        $statement->execute();
+        $r_lang = $statement->fetch(PDO::FETCH_ASSOC);
+        if ($r_lang !== false){
+            $this->code = $r_lang["code"];
+            $this->name = $r_lang["name"];
+            $this->active = $r_lang["active"];
         }
     }
+
+    /**
+     * Retrieves the language identifier code.
+     *
+     * @return int Language code.
+     */
+    public function get_code(){
+        return $this->code;
+    }
+
+    /**
+     * Retrieves the language name.
+     *
+     * @return int Language name.
+     */
+    public function get_name(){
+        return $this->name;
+    }
+
+    /**
+     * Checks if the language is active.
+     *
+     * @return bool True if the language is active, false otherwise.
+     */
+    public function is_active(){
+        return $this->active;
+    }
+}
 ?>

+ 2 - 9
application/entity/License.php

@@ -46,16 +46,11 @@ class License extends Entity{
      */
     public function __construct($id){
         $statement = get_context()->get_db()->prepare("
-          SELECT
-            id
-            summary
-            legal
-            logo
-            icon
+          SELECT id, summary, legal, logo, icon
           FROM license
           WHERE id = :id
         ");
-        $statement->bindValue(':id', $id, PDO::PARAM_INT);
+        $statement->bindValue(':id', $id, PDO::PARAM_STR);
         $statement->execute();
         $r_license = $statement->fetch(PDO::FETCH_ASSOC);
         if ($r_license !== false){
@@ -64,8 +59,6 @@ class License extends Entity{
             $this->legal = TEXT::get($r_license["legal"]);
             $this->logo = $r_license["logo"];
             $this->icon = $r_license["icon"];
-            $this->mark_as_loaded(true);
-            $this->mark_as_complete(true);
         }
         else{
             Log::warn("License with id '$id' doesn't exist");

+ 40 - 36
application/entity/Project.php

@@ -58,6 +58,11 @@ class Project extends Entity{
      * @var String Project description in the selected language.
      */
     private $text;
+
+    /**
+     * @var String Project commentary by the developer.
+     */
+    private $comment;
     
     /**
      * @var int License identifier.
@@ -91,7 +96,8 @@ class Project extends Entity{
         "type" => false,
         "images" => false,
         "tags" => false,
-        "urls" => false
+        "urls" => false,
+        "license" => false
     ];
 
     /**
@@ -105,20 +111,9 @@ class Project extends Entity{
     public function __construct($id){
         Log::debug("Loading project with ID: " . $id);
         $statement = get_context()->get_db()->prepare("
-          SELECT
-            id,
-            permalink,
-            idx,
-            type,
-            title,
-            logo,
-            header,
-            text,
-            license
+          SELECT id, permalink, idx, type, title, logo, header, text, comment, license
           FROM project
-          WHERE
-            id = :id OR
-            permalink = :permalink
+          WHERE id = :id OR permalink = :permalink
           LIMIT 1
         ");
         $statement->bindValue(':id', $id, PDO::PARAM_INT);
@@ -131,11 +126,11 @@ class Project extends Entity{
             $this->idx = $r_project["idx"];
             $this->title = Text::get($r_project["title"]);
             $this->logo = $r_project["logo"];
-            $this->header = Text::get($r_project["header"]);
-            $this->text = Text::get($r_project["text"]);
+            $this->header = Text::get($r_project["header"], false);
+            $this->text = Text::get($r_project["text"], false);
+            $this->comment = Text::get($r_project["comment"], false);
             $this->type_id = $r_project["type"];
             $this->license_id = $r_project["license"];
-            $this->mark_as_loaded(true);
         }
         else{
             Log::debug("Project with id '$id' doesn't exist");
@@ -175,9 +170,9 @@ class Project extends Entity{
      * Not exposed, must be called before accessing the project type.
      */
     private function load_type(){
-        if ($this->get_flag("type") === false){
+        if ($this->load_flags["type"] === false){
             $this->type = new Project_Type($this->type_id);
-            $this->set_flag("type", true);
+            $this->load_flags["type"] = true;
         }
     }
     
@@ -187,7 +182,7 @@ class Project extends Entity{
      * @return Project_Type The project type.
      */
     public function get_type(){
-        if ($this->get_flag("type") === false){
+        if ($this->load_flags["type"] === false){
             $this->load_type();
         }
         return $this->type;
@@ -228,16 +223,25 @@ class Project extends Entity{
     public function get_text(){
         return $this->text;
     }
-    
+
+    /**
+     * Retrieves the project comment.
+     *
+     * @return string Project comment text.
+     */
+    public function get_comment(){
+        return $this->comment;
+    }
+
     /**
      * Loads the project license information.
      *
      * Not exposed, must be called before accessing the project license.
      */
     private function load_license(){
-        if ($this->get_flag("license") === false){
-            $this->type = new License($this->licenses_id);
-            $this->set_flag("license", true);
+        if ($this->load_flags["license"] === false){
+            $this->license = new License($this->license_id);
+            $this->load_flags["license"] = true;
         }
     }
 
@@ -247,7 +251,7 @@ class Project extends Entity{
      * @return License Project license.
      */
     public function get_license(){
-        if ($this->get_flag("license") === false){
+        if ($this->load_flags["license"] === false){
             $this->load_license();
         }
         return $this->license;
@@ -259,7 +263,7 @@ class Project extends Entity{
      * Not exposed, must be called before accessing the project images.
      */
     private function load_images(){
-        if ($this->get_flag("images") === false){
+        if ($this->load_flags["images"] === false){
             $statement = get_context()->get_db()->prepare("
               SELECT id 
               FROM project_image
@@ -271,7 +275,7 @@ class Project extends Entity{
             while ($r_image = $statement->fetch(PDO::FETCH_ASSOC)){
                 array_push($this->images, new Project_Image($r_image["id"]));
             }
-            $this->set_flag("images", true);
+            $this->load_flags["images"] = true;
         }
     }
 
@@ -281,7 +285,7 @@ class Project extends Entity{
      * @return Project_Image[] List of the project images.
      */
     public function get_images(){
-        if ($this->get_flag("images") === false){
+        if ($this->load_flags["images"] === false){
             $this->load_images();
         }
         return $this->images;
@@ -293,18 +297,18 @@ class Project extends Entity{
      * Not exposed, must be called before accessing the project tags.
      */
     private function load_tags(){
-        if ($this->get_flag("tags") === false){
+        if ($this->load_flags["tags"] === false){
             $statement = get_context()->get_db()->prepare("
-              SELECT id
+              SELECT tag
               FROM project_tag
               WHERE project = :id
             ");
             $statement->bindValue(':id', $this->id, PDO::PARAM_INT);
             $statement->execute();
             while ($r_tag = $statement->fetch(PDO::FETCH_ASSOC)){
-                array_push($this->tags, Text::get($r_tag["id"]));
+                array_push($this->tags, Text::get($r_tag["tag"]));
             }
-            $this->set_flag("tags", true);
+            $this->load_flags["tags"] = true;
         }
     }
 
@@ -314,7 +318,7 @@ class Project extends Entity{
      * @return Project_Tag[] Project tags. 
      */
     public function get_tags(){
-        if ($this->get_flag("tags") === false){
+        if ($this->load_flags["tags"] === false){
             $this->load_tags();
         }
         return $this->tags;
@@ -326,7 +330,7 @@ class Project extends Entity{
      * Not exposed, must be called before accessing the project URLs.
      */
     private function load_urls(){
-        if ($this->get_flag("urls") === false){
+        if ($this->load_flags["urls"] === false){
             $statement = get_context()->get_db()->prepare("
               SELECT id
               FROM project_url
@@ -337,7 +341,7 @@ class Project extends Entity{
             while ($r_url = $statement->fetch(PDO::FETCH_ASSOC)){
                 array_push($this->urls, new Project_Url($r_url["id"]));
             }
-            $this->set_flag("urls", true);
+            $this->load_flags["urls"] = true;
         }
     }
 
@@ -347,7 +351,7 @@ class Project extends Entity{
      * @return Project_URL[] List of the project URLs. 
      */
     public function get_urls(){
-        if ($this->get_flag("urls") === false){
+        if ($this->load_flags["urls"] === false){
             $this->load_urls();
         }
         return $this->urls;

+ 18 - 11
application/entity/Project_Image.php

@@ -26,10 +26,15 @@ class Project_Image extends Entity{
     private $idx;
 
     /**
-     * @var int Filename of the image.
+     * @var string Filename of the image.
      */
     private $image;
 
+    /**
+     * @var string Alternative text for the image.
+     */
+    private $alt;
+
     /**
      * Constructor.
      *
@@ -40,24 +45,17 @@ class Project_Image extends Entity{
      */
     public function __construct($id){
         $statement = get_context()->get_db()->prepare("
-          SELECT
-            id,
-            project,
-            idx,
-            image
-          FROM project_image
-          WHERE id = :id
+          SELECT id, project, idx, image, alt FROM project_image WHERE id = :id
         ");
         $statement->bindValue(':id', $id, PDO::PARAM_INT);
         $statement->execute();
         $r_image = $statement->fetch(PDO::FETCH_ASSOC);
         if ($r_image !== false){
             $this->id = $r_image["id"];
-            $this->project = $r_image["title"];
+            $this->project = $r_image["project"];
             $this->idx = $r_image["idx"];
             $this->image = $r_image["image"];
-            $this->mark_as_loaded(true);
-            $this->mark_as_complete(true);
+            $this->alt = Text::get($r_image["alt"]);
         }
         else{
             Log::warn("Project image with id '$id' doesn't exist");
@@ -99,4 +97,13 @@ class Project_Image extends Entity{
     public function get_image(){
         return $this->image;
     }
+
+    /**
+     * Retrieves the image alternative text or title.
+     *
+     * @return string Image text.
+     */
+    public function get_text(){
+        return $this->alt;
+    }
 }

+ 2 - 7
application/entity/Project_Url.php

@@ -1,6 +1,7 @@
 <?php
 
 require_once(PATH::ENTITY . "Entity.php");
+require_once(PATH::ENTITY . "Project_Url_Type.php");
 
 
 /**
@@ -40,11 +41,7 @@ class Project_Url extends Entity{
      */
     public function __construct($id){
         $statement = get_context()->get_db()->prepare("
-          SELECT
-            id
-            project
-            type
-            url
+          SELECT id, project, type, url
           FROM project_url
           WHERE id = :id
         ");
@@ -56,8 +53,6 @@ class Project_Url extends Entity{
             $this->project = $r_url["project"];
             $this->type = new Project_Url_Type($r_url["type"]);
             $this->url = $r_url["url"];
-            $this->mark_as_loaded(true);
-            $this->mark_as_complete(true);
         }
         else{
             Log::warn("Project URL with id '$id' doesn't exist");

+ 54 - 21
application/entity/Project_Url_Type.php

@@ -13,23 +13,23 @@ class Project_Url_Type extends Entity{
     /**
      * URL type identifier.
      */
-    public $id;
+    private $id;
 
     /**
      * URL denomination, in the defined language.
      */
-    public $title;
+    private $title;
 
     /**
      * URL short explanation, in the defined language.
      */
-    public $summary;
+    private $summary;
 
     /**
      * Filename of the logo of the URL. Usually, the logo of the site it
      * points to.
      */
-    public $logo;
+    private $logo;
 
     /**
      * Constructor.
@@ -41,23 +41,56 @@ class Project_Url_Type extends Entity{
      * @param string $lang Lowercase, two-letter language code.
      * @param int $id Identifier of the url type.
      */
-    public function __construct($db, $lang, $id){
-        parent::__construct($db, $lang);
-        $s =
-          "SELECT " .
-          "  id, " .
-          "  title, " .
-          "  summary, " .
-          "  logo " .
-          "FROM project_url_type " .
-          "WHERE id = '$id' ;";
-        $q = mysqli_query($this->db, $s);
-        if (mysqli_num_rows($q) > 0){
-            $r = mysqli_fetch_array($q);
-            $this->id = $r["id"];
-            $this->title = text($this, $r["title"]);
-            $this->summary = text($this, $r["summary"]);
-            $this->logo = $r["logo"];
+    public function __construct($id){
+        $statement = get_context()->get_db()->prepare("
+          SELECT id, title, summary, logo
+          FROM project_url_type
+          WHERE id = :id
+        ");
+        $statement->bindValue(':id', $id, PDO::PARAM_STR);
+        $statement->execute();
+        $r_type = $statement->fetch(PDO::FETCH_ASSOC);
+        if ($r_type != false){
+            $this->id = $r_type["id"];
+            $this->title = Text::get($r_type["title"]);
+            $this->summary = Text::get($r_type["summary"]);
+            $this->logo = $r_type["logo"];
         }
     }
+
+    /**
+     * Retrieves the project url typeidentifier
+     *
+     * @return int Project url type ID.
+     */
+    public function get_id(){
+        return $this->id;
+    }
+
+    /**
+     * Retrieves the project url type title.
+     *
+     * @return string Title.
+     */
+    public function get_title(){
+        return $this->title;
+    }
+
+    /**
+     * Retrieves the project url type summary.
+     *
+     * @return string The logo filename.
+     */
+    public function get_summary(){
+        return $this->summary;
+    }
+
+    /**
+     * Retrieves the project url type logo.
+     *
+     * @return string The logo filename.
+     */
+    public function get_logo(){
+        return $this->logo;
+    }
 }

+ 85 - 0
application/entity/Social.php

@@ -0,0 +1,85 @@
+<?php
+
+require_once(PATH::ENTITY . "Entity.php");
+
+/**
+ * Social.
+ *
+ * Represents a social link.
+ */
+class Social extends Entity{
+
+    /**
+     * @var int User profile URL.
+     */
+    private $url;
+
+    /**
+     * @var string Social site name.
+     */
+    private $site_name;
+
+    /**
+     * @var string Path to the site logo.
+     */
+    private $logo;
+
+    /**
+     * @var string Link text.
+     */
+    private $text;
+
+    /**
+     * Constructor.
+     *
+     * Searches the database and retrieves the information about the social link, populating it.
+     */
+    public function __construct($id){
+        $user_id = parse_ini_file(__DIR__ . "/../config/config.ini", true)["user"]["id"];
+        $statement = get_context()->get_db()->prepare("
+          SELECT site_name, url, logo, text
+          FROM social, user_social
+          WHERE social.id = user_social.social AND user = :user AND user_social.id = :id
+        ");
+        $statement->bindValue(':id', $id, PDO::PARAM_INT);
+        $statement->bindValue(':user', $user_id, PDO::PARAM_INT);
+        $statement->execute();
+        $r_social = $statement->fetch(PDO::FETCH_ASSOC);
+        if ($r_social !== false){
+            $this->url = $r_social["url"];
+            $this->site_name = $r_social["site_name"];
+            $this->logo = $r_social["logo"];
+            $this->text = Text::get($r_social["text"]);
+        }
+        else Log::error("Social link with id '$id' doesn't exist for user '$user_id'");
+    }
+
+    /**
+     * Retrieves the link URL.
+     *
+     * @return string link URL.
+     */
+    public function get_url(){return $this->url;}
+
+    /**
+     * Retrieves the social site name.
+     *
+     * @return string The social site name.
+     */
+    public function get_site_name(){return $this->site_name;}
+
+    /**
+     * Retrieves the site logo.
+     *
+     * @return string The site logo file path.
+     */
+    public function get_logo(){return $this->logo;}
+
+    /**
+     * Retrieves the social link text.
+     *
+     * @return string The social link text.
+     */
+    public function get_text(){return $this->text;}
+
+}

+ 231 - 0
application/entity/User.php

@@ -0,0 +1,231 @@
+<?php
+
+require_once(PATH::ENTITY . "Entity.php");
+require_once(PATH::ENTITY . "Lang.php");
+require_once(PATH::ENTITY . "Social.php");
+
+/**
+ * User.
+ *
+ * Represents an object from the table 'user'.
+ */
+class User extends Entity{
+
+    /**
+     * @var int User identifier.
+     */
+    private $id;
+
+    /**
+     * @var string User's display name.
+     */
+    private $display_name;
+
+
+    /**
+     * @var string User's image path.
+     */
+    private $image;
+
+    /**
+     * @var Lang[] List of the user languages.
+     */
+    private $langs = [];
+
+    /**
+     * @var Email[] List of the user emails.
+     */
+    private $email = [];
+
+    /**
+     * @var Social[] List of the user social links.
+     */
+    private $social = [];
+
+    /**
+     * @var string[] List uf user-defined texts.
+     */
+    private $texts = [];
+
+    /**
+     * @var bool[] Control flags to check loading status.
+     */
+    private $load_flags = [
+        "email" => false,
+        "social" => false,
+        "lang" => false
+    ];
+
+    /**
+     * Constructor.
+     *
+     * Searches the database and retrieves the information about the user, populating it. The
+     * user to be loaded must be defined in the configuration file.
+     */
+    public function __construct(){
+        $this->id = parse_ini_file(__DIR__ . "/../config/config.ini", true)["user"]["id"];
+        $statement = get_context()->get_db()->prepare(
+          "SELECT id, name, image FROM user WHERE id = :id"
+        );
+        $statement->bindValue(':id', $this->id, PDO::PARAM_INT);
+        $statement->execute();
+        $r_user = $statement->fetch(PDO::FETCH_ASSOC);
+        if ($r_user !== false){
+            $this->id = $r_user["id"];
+            $this->display_name = $r_user["name"];
+            $this->image = $r_user["image"];
+        }
+        else Log::error("User with id '$this->id' doesn't exist");
+    }
+
+    /**
+     * Retrieves the user identifier
+     *
+     * @return int User ID.
+     */
+    public function get_id(){return $this->id;}
+
+    /**
+     * Retrieves the user's display name.
+     *
+     * @return string The user's display name.
+     */
+    public function get_display_name(){return $this->display_name;}
+
+    /**
+     * Retrieves a user defined text text.
+     *
+     * @param string $key Text key.
+     * @return string The defined text, or an empty string if it doesn't exist.
+     */
+    public function get_text($key){
+        if (isset($this->texts[$key])) return $this->texts[$key];
+        $statement = get_context()->get_db()->prepare(
+          "SELECT text FROM user_text WHERE user = :user AND upper(name) = upper(:key)"
+        );
+        $statement->bindValue(':user', $this->id, PDO::PARAM_INT);
+        $statement->bindValue(':key', $key, PDO::PARAM_STR);
+        $statement->execute();
+        $r = $statement->fetch(PDO::FETCH_ASSOC);
+        if ($r == false) return "";
+        $this->texts[$key] = Text::get($r["text"], false);
+        return $this->texts[$key];
+    }
+
+    /**
+     * Retrieves the user's profile image file path.
+     *
+     * @return string The user's profile image.
+     */
+    public function get_image(){return $this->image;}
+
+    /**
+     * Retrieves the user's list of emails.
+     *
+     * @return string[] The user's list of emails.
+     */
+    public function get_emails(){
+        if ($this->load_flags["email"] === false) $this->load_email();
+        return $this->email;
+    }
+
+    /**
+     * Retrieves the user's first visible email address.
+     *
+     * @return string The user's first visible email, null if there are none.
+     */
+    public function get_first_email(){
+        if ($this->load_flags["email"] === false) $this->load_email();
+        if (sizeof($this->email) == 0) return null;
+        else return $this->email[0];
+    }
+
+    /**
+     * Retrieves the user's list of supported languages.
+     *
+     * @return string[] The user's list of languages, sorted by priority.
+     */
+    public function get_langs(){
+        if ($this->load_flags["lang"] === false) $this->load_lang();
+        return $this->langs;
+    }
+
+    /**
+     * Retrieves the user's list of social links.
+     *
+     * @return Social[] The user's list of social links.
+     */
+    public function get_social(){
+        if ($this->load_flags["social"] === false) $this->load_social();
+        return $this->social;
+    }
+    
+    /**
+     * Checks if a language is supported by the user.
+     * 
+     * @param sting $code Two letter language code to check, case insensitive.
+     * @return True if the language is supported by the user, false otherwise.
+     */
+    public function is_valid_language($code){
+        if ($this->load_flags["lang"] === false) $this->load_lang();
+        foreach ($this->langs as $lang){
+            if (strtolower($lang->get_code()) == strtolower($code))
+                return true;
+        }
+        return false;
+    }
+
+    /**
+     * Loads the user emails.
+     *
+     * Not exposed, must be called before accessing the user email list.
+     */
+    private function load_email(){
+        if ($this->load_flags["email"] === false){
+            $statement = get_context()->get_db()->prepare(
+              "SELECT email FROM user_email WHERE user = :id AND visible = 1"
+            );
+            $statement->bindValue(':id', $this->id, PDO::PARAM_INT);
+            $statement->execute();
+            while ($r_email = $statement->fetch(PDO::FETCH_ASSOC))
+                array_push($this->email, $r_email["email"]);
+            $this->load_flags["email"] = true;
+        }
+    }
+
+    /**
+     * Loads the user supported languages.
+     *
+     * Not exposed, must be called before accessing the user languages.
+     */
+    private function load_lang(){
+        if ($this->load_flags["lang"] === false){
+            $statement = get_context()->get_db()->prepare(
+              "SELECT lang FROM user_lang WHERE user = :id ORDER BY priority"
+            );
+            $statement->bindValue(':id', $this->id, PDO::PARAM_INT);
+            $statement->execute();
+            while ($r_lang = $statement->fetch(PDO::FETCH_ASSOC))
+                array_push($this->langs, new Lang($r_lang["lang"]));
+            $this->load_flags["lang"] = true;
+        }
+    }
+
+    /**
+     * Loads the user social links.
+     *
+     * Not exposed, must be called before accessing the user links.
+     */
+    private function load_social(){
+        if ($this->load_flags["social"] === false){
+            $statement = get_context()->get_db()->prepare(
+              "SELECT id FROM user_social WHERE user = :id ORDER BY priority"
+            );
+            $statement->bindValue(':id', $this->id, PDO::PARAM_INT);
+            $statement->execute();
+            while ($r_social = $statement->fetch(PDO::FETCH_ASSOC))
+                array_push($this->social, new Social($r_social["id"]));
+            $this->load_flags["social"] = true;
+        }
+    }
+}

+ 0 - 1
application/helper/HTML_Helper.php

@@ -83,7 +83,6 @@ final class HTML extends Helper{
      * @return string srcset atttribute content.
      */
     public static function srcset($file){
-        global $static;
         $srcset = "";
         $dir = dirname($file);
         $name = basename($file);

+ 1 - 1
application/helper/Helper.php

@@ -6,7 +6,7 @@
  *
  * @author Iñigo Valentin <i@inigovalentin.com>
  * @license https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License V3
- * @package SWDB
+ * @package IV
  */
 
 /**

+ 96 - 106
application/helper/TEXT_Helper.php

@@ -24,36 +24,28 @@ final class TEXT extends Helper{
     /**
      * Selects the language the page will be displayed on.
      * 
-     * First, it tries to read the language cookie in the client. If none is
-     * set, get the browser language preference list. If none is provided or
-     * they are not supported, it will use the default language.
+     * First, it tries to read the language cookie in the client. If none is set, get the browser
+     * language preference list. If none is provided or they are not supported, it will use the
+     * default language.
      * 
      * @return string Lowercase, two-letter language code.
+     * @todo Refactor to use user definced languages.
      */
     function select_language(){
-
         // Get available languages from db
         $available_languages = array();
         $q_lang = mysqli_query($db, "SELECT code FROM lang WHERE active = 1;");
-        while ($r_lang = mysqli_fetch_array($q_lang)){
+        while ($r_lang = mysqli_fetch_array($q_lang))
             array_push($available_languages, $r_lang["code"]);
-        }
-
         // Is there a language cookie installed on the client?.
         header("Cache-control: private");
         if (isSet($_COOKIE["lang"])){
             $lang = $_COOKIE["lang"];
-            if (in_array($lang, $available_languages)){
-                return $lang;
-            }
+            if (in_array($lang, $available_languages)) return $lang;
         }
-
         // If no cookie, select from client browser preferences.
         $lang = prefered_language($available_languages, $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
-        if (in_array($lang, $available_languages)){
-            return $lang;
-        }
-
+        if (in_array($lang, $available_languages)) return $lang;
         // If no method was succesfull, default language
         $lang = $available_languages[0];
         return $lang;
@@ -61,52 +53,44 @@ final class TEXT extends Helper{
 
 
     /**
-     * Parses the language prefrences of the client broser, comparing them to
-     * the languages offered by the site and selects the prefered one among
-     * the ones supported.
+     * Parses the language prefrences of the client broser, comparing them to the languages
+     * offered by the site and selects the prefered one among the ones supported.
      * 
-     * @param string[] available_languages List of lowercase, two-letter
-     *                                      language codes allowed by the site.
-     * @param string http_accept_language Raw header with info about client
-     *                                    language preferences.
-     * @return string Lowercase, two-letter code of the prefered available
-     *                language.
+     * @param string[] available_languages List of lowercase, two-letter language codes allowed by
+     * the site.
+     * @param string http_accept_language Raw header with info about client language preferences.
+     * @return string Lowercase, two-letter code of the prefered available language.
+     * @todo Refactor to user user defined languages.
      */
     function prefered_language(array $available_languages, $http_accept_language) {
 
         $available_languages = array_flip($available_languages);
-
-        $langs;
-        preg_match_all("~([\w-]+)(?:[^,\d]+([\d.]+))?~", strtolower($http_accept_language), $matches, PREG_SET_ORDER);
+        $langs = [];
+        preg_match_all(
+          "~([\w-]+)(?:[^,\d]+([\d.]+))?~", strtolower($http_accept_language),
+          $matches, PREG_SET_ORDER
+        );
         foreach($matches as $match) {
-
             list($a, $b) = explode("-", $match[1]) + array("", "");
             $value = isset($match[2]) ? (float) $match[2] : 1.0;
-
             if(isset($available_languages[$match[1]])) {
                 $langs[$match[1]] = $value;
                 continue;
             }
-
-            if(isset($available_languages[$a])) {
-                $langs[$a] = $value - 0.1;
-            }
-
+            if(isset($available_languages[$a])) $langs[$a] = $value - 0.1;
         }
         if (count($langs) > 0){
             arsort($langs);
             //return $langs[0];
-            array_values($langs)[0];
-        }
-        else{
-            return 'en';
+            return array_values($langs)[0];
         }
+        else return 'en';
     }
 
 
     /**
-     * Tturns a date string into a human readable string on the specified
-     * language. Only works for spanish, basque and english.
+     * Returns a date string into a human readable string on the specified language. Only works
+     * for spanish, basque and english.
      * 
      * @param string $str_date Date string ('yyyy-mm-dd' or 'yyyy-mm-dd HH:MM:SS')
      * @param string $lang Language code (es, en, eu).
@@ -125,34 +109,43 @@ final class TEXT extends Helper{
         $minute = date("i", $date);
         switch ($lang){
             case "en":
-                $week = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
-                $months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-                if ($time){
-                    $str = "$week[$wday], $months[$month] $day, $year at $hour:$minute";
-                }
-                else{
-                    $str = "$week[$wday], $months[$month] $day, $year";
-                }
+                $week = [
+                  "Monday", "Tuesday", "Wednesday", "Thursday",
+                  "Friday", "Saturday", "Sunday"
+                ];
+                $months = [
+                  "January", "February", "March", "April", "May", "June",
+                  "July", "August", "September", "October", "November", "December"
+                ];
+                if ($time) $str = "$week[$wday], $months[$month] $day, $year at $hour:$minute";
+                else $str = "$week[$wday], $months[$month] $day, $year";
                 break;
             case "eu":
-                $week = ["astelehena", "asteartea", "asteazkena", "osteguna", "ostirala", "larumbata", "igandea"];
-                $months = ["urtarrilaren", "otsailaren", "martxoaren", "apirilaren", "maiatzaren", "ekainaren", "uztailaren", "abuztuaren", "irailaren", "urriaren", "azaroaren", "abenduaren"];
-                if ($time){
+                $week = [
+                  "astelehena", "asteartea", "asteazkena", "osteguna",
+                  "ostirala", "larumbata", "igandea"
+                ];
+                $months = [
+                  "urtarrilaren", "otsailaren", "martxoaren", "apirilaren",
+                  "maiatzaren","ekainaren", "uztailaren", "abuztuaren",
+                  "irailaren", "urriaren", "azaroaren", "abenduaren"
+                ];
+                if ($time)
                     $str = $year . "ko $months[$month] $day" . "an, $week[$wday], $hour:$minute";
-                }
-                else{
-                    $str = $year . "ko $months[$month] $day" . "an, $week[$wday]";
-                }
+                else $str = $year . "ko $months[$month] $day" . "an, $week[$wday]";
                 break;
             default:
-                $week = ["Lunes", "Martes", "Mi&eacute;rcoles", "Jueves", "Viernes", "S&aacute;bado", "Domingo"];
-                $months = ["enero", " febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"];
-                if ($time){
+                $week = [
+                  "Lunes", "Martes", "Mi&eacute;rcoles", "Jueves",
+                  "Viernes", "S&aacute;bado", "Domingo"
+                ];
+                $months = [
+                  "enero", " febrero", "marzo", "abril", "mayo", "junio",
+                  "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"
+                ];
+                if ($time)
                     $str = "$week[$wday] $day de $months[$month] de $year a las $hour:$minute";
-                }
-                else{
-                    $str = "$week[$wday] $day de $months[$month] de $year";
-                }
+                else $str = "$week[$wday] $day de $months[$month] de $year";
         }
         return $str;
     }
@@ -163,42 +156,48 @@ final class TEXT extends Helper{
      * 
      * @param string $id Text identifier.
      * @param bool $html True to decode for HTML.
-     * @returns string The text.
+     * @returns string The text, or an empty string if it's not found.
      */
     public static function get($id, $html = true){
-        $statement = get_context()->get_db()->prepare("
-          SELECT
-            text,
-            file
-          FROM text
-          WHERE
-            id = :id AND
-            lang = :lang
-        ");
+        $statement = get_context()->get_db()->prepare(
+          "SELECT text, file FROM text WHERE id = :id AND lang = :lang"
+        );
         $statement->bindValue(':id', $id, PDO::PARAM_STR);
         $statement->bindValue(':lang', get_context()->get_lang(), PDO::PARAM_STR);
         $statement->execute();
         $row = $statement->fetch(PDO::FETCH_ASSOC);
         if ($row !== false){
             $text = "";
-            if (strlen($row["file"]) > 0){
-                $text = file_get_contents(PATH::TEXT . $row["file"]);
-            }
-            else{
-                $text = $row["text"];
-            }
-            $text = utf8_decode($text);
-            if ($html === true){
-                $text = htmlentities($text, ENT_QUOTES);
-            }
+            if (strlen($row["file"]) > 0) $text = file_get_contents(PATH::TEXT . $row["file"]);
+            else $text = $row["text"];
+            //$text = utf8_decode($text);
+            if ($html === true) $text = htmlentities($text, ENT_QUOTES | ENT_SUBSTITUTE);
             return $text;
         }
         else{
             Log::error("Text resource with id '$id' not found.");
-            return false;
+            return "";
         }
     }
 
+    /**
+     * Retrieves and formats  atext fragment from the database.
+     *
+     * @param string $id Text identifier.
+     * @param string[] $fragments Texts to replace each "#" character with.
+     * @param bool $html True to decode for HTML.
+     * @returns string The text.
+     */
+    public static function compose($id, $fragments, $html = true){
+        $text = Text::get($id, $html);
+        foreach ($fragments as $fragment){
+            $pos = strpos($text, "$");
+            if ($pos !== false)
+                $text = substr($text, 0, $pos) . $fragment . substr($text, $pos + 1);
+        }
+        return $text;
+    }
+
 
     /**
      * This function closes all the opened HTML tags in a given string.
@@ -208,30 +207,26 @@ final class TEXT extends Helper{
      */
     function close_tags($html) {
         $result = [];
-        preg_match_all("#<(?!meta|img|br|hr|input\b)\b([a-z]+)(?: .*)?(?<![/|/ ])>#iU", $html, $result);
+        preg_match_all(
+          "#<(?!meta|img|br|hr|input\b)\b([a-z]+)(?: .*)?(?<![/|/ ])>#iU", $html, $result
+        );
         $openedtags = $result[1];
         preg_match_all("#</([a-z]+)>#iU", $html, $result);
         $closedtags = $result[1];
         $len_opened = count($openedtags);
-        if (count($closedtags) == $len_opened) {
-            return $html;
-        }
+        if (count($closedtags) == $len_opened) return $html;
         $openedtags = array_reverse($openedtags);
         for ($i=0; $i < $len_opened; $i++) {
-            if (!in_array($openedtags[$i], $closedtags)) {
-                $html .= "</".$openedtags[$i].">";
-            } else {
-                unset($closedtags[array_search($openedtags[$i], $closedtags)]);
-            }
+            if (!in_array($openedtags[$i], $closedtags)) $html .= "</".$openedtags[$i].">";
+            else unset($closedtags[array_search($openedtags[$i], $closedtags)]);
         }
         return $html;
     }
 
 
     /**
-     * Text shortener. Given a string, it trims in the proximity of the
-     * desired string, up to the next white character. If indicated, it will
-     * append a link to the full text.
+     * Text shortener. Given a string, it trims in the proximity of the desired string, up to the
+     * next white character. If indicated, it will append a link to the full text.
      * 
      * @param string $text The text to shorten.
      * @param int $length The desired length.
@@ -240,22 +235,18 @@ final class TEXT extends Helper{
      * @return string Shortened text.
      */
      function cut_text($text, $length, $link_text = "", $link = ""){
-        if (strlen($text) < $length){
-            return $text;
-        }
+        if (strlen($text) < $length) return $text;
         $cut = substr($text, 0, strpos($text, " ", $length));
         $cut = close_tags($cut);
-        if (strlen($cut) == 0){
-            $cut = $text;
-        }
-        if (strlen($text) != strlen($cut) && strlen($link) > 0 && strlen($link_text) > 0){
+        if (strlen($cut) == 0) $cut = $text;
+        if (strlen($text) != strlen($cut) && strlen($link) > 0 && strlen($link_text) > 0)
             $cut = $cut . "... <a href='$link'>$link_text</a>";
-        }
         return $cut;
     }
 
     /**
      * Creates the srcset attribute for content images.
+     *
      * Creates 9 different resolutions, from 100px to 900px.
      * 
      * @param string $file Path to the file, relative to $path["img"]["content"]).
@@ -266,9 +257,8 @@ final class TEXT extends Helper{
         $srcset = "";
         $dir = dirname($file);
         $name = basename($file);
-        foreach (range(1, 9) as $d) {
-            $srcset = $srcset . $static["content"] . $dir . "/x" . $d . "00/" . $name . " " . $d . "00px, ";
-        }
+        foreach (range(1, 9) as $d)
+            $srcset .= $static["content"] . $dir . "/x" . $d . "00/" . $name . " " . $d . "00px, ";
         $srcset = rtrim($srcset, ", ");
         return $srcset;
     }

+ 10 - 11
application/page/Error_Page.php

@@ -1,8 +1,6 @@
 <?php
 
-    require_once($path["page"] . "Page.php");
-    require_once($path["helper"] . "text.php");
-
+    require_once(PATH::PAGE . "Page.php");
 
     /**
      * Error page model.
@@ -26,7 +24,8 @@
             global $path;
             global $base_url;
             parent::__construct($db, $lang);
-            $this->view = $path["view"] . "error.php";
+            $this->view = PATH::VIEW . "error.php";
+            $this->set_view("error.php");
             $this->code = http_response_code();
             if (in_array($this->code, array(400, 401, 403, 404, 500))){
                 $err = $this->code;
@@ -34,13 +33,13 @@
             else{
                 $err = "XXX";
             }
-            $this->error_description = text($this, "ERROR_" . $err . "_DESCRIPTION");
-            $this->advice = text($this, "ERROR_" . $err . "_SOLUTION");
-            array_push($this->solution, text($this, "ERROR_" . $err . "_SOLUTION_0"));
-            array_push($this->solution, text($this, "ERROR_" . $err . "_SOLUTION_1"));
-            array_push($this->solution, text($this, "ERROR_" . $err . "_SOLUTION_2"));
-            $this->title = text($this, "ERROR_TITLE") . " " . $this->code . " - " . text($this, "USER_NAME");
-            $this->description = text($this, "ERROR_TITLE") . " " . $this->code . " - " . text($this, "USER_NAME");
+            $this->error_description = Text::get("ERROR_" . $err . "_DESCRIPTION");
+            $this->advice = Text::get("ERROR_" . $err . "_SOLUTION");
+            array_push($this->solution, Text::get("ERROR_" . $err . "_SOLUTION_0"));
+            array_push($this->solution, Text::get("ERROR_" . $err . "_SOLUTION_1"));
+            array_push($this->solution, Text::get("ERROR_" . $err . "_SOLUTION_2"));
+            $this->title = Text::get("ERROR_TITLE") . " " . $this->code . " - " . Text::get("USER_NAME");
+            $this->description = Text::get("ERROR_TITLE") . " " . $this->code . " - " . Text::get("USER_NAME");
         }
     }
 ?>

+ 74 - 50
application/page/Help_Page.php

@@ -1,58 +1,82 @@
 <?php
 
-    require_once($path["page"] . "Page.php");
-    require_once($path["helper"] . "text.php");
+require_once(PATH::PAGE . "Page.php");
 
+/**
+ * Help page model.
+ */
+class Help_Page extends Page{
+
+    private $help = [
+        "info" => [
+            "title" => "",
+            "text" => "",
+        ],
+        "license" => [
+            "title" => "",
+            "text" => "",
+        ],
+        "privacy" => [
+            "title" => "",
+            "text" => "",
+        ],
+        "cookies" => [
+            "title" => "",
+            "text" => "",
+        ]
+    ];
 
     /**
-     * Help page model.
+     * Constructor.
+     *
+     * Retrieves the data and initializes the variables.
      */
-    class Help_Page extends Page{
-
-        public $help = [
-            "info" => [
-                "title" => "",
-                "text" => "",
-            ],
-            "license" => [
-                "title" => "",
-                "text" => "",
-            ],
-            "privacy" => [
-                "title" => "",
-                "text" => "",
-            ],
-            "cookies" => [
-                "title" => "",
-                "text" => "",
-            ]
-        ];
-
-        /**
-         * Constructor.
-         *
-         * Retrieves the data and initializes the variables.
-         *
-         * @param MySQL_connection $db Connection to the database.
-         * @param string $lang Lowercase, two-letter language code.
-         */
-        public function __construct($db, $lang){
-            global $path;
-            global $base_url;
-            parent::__construct($db, $lang);
-            $this->view = $path["view"] . "help.php";
-
-            $this->help["info"]["title"] = text($this, "HELP_INFO_TITLE");
-            $this->help["info"]["text"] = text($this, "HELP_INFO_TEXT");
-            $this->help["license"]["title"] = text($this, "HELP_LICENSE_TITLE");
-            $this->help["license"]["text"] = text($this, "HELP_LICENSE_TEXT");
-            $this->help["privacy"]["title"] = text($this, "HELP_PRIVACY_TITLE");
-            $this->help["privacy"]["text"] = text($this, "HELP_PRIVACY_TEXT");
-            $this->help["cookies"]["title"] = text($this, "HELP_COOKIES_TITLE");
-            $this->help["cookies"]["text"] = text($this, "HELP_COOKIES_TEXT");
-            $this->title = text($this, "USER_NAME");
-            $this->description = text($this, "USER_NAME") . " - " . text($this, "USER_TAGLINE");
-            $this->canonical = $base_url . "/help/";
-        }
+    public function __construct(){
+        parent::__construct();
+        $this->set_view("help.php");
+        $this->help["info"]["title"] = Text::get("HELP_INFO_TITLE");
+        $this->help["info"]["text"] = get_context()->get_user()->get_text("HELP");
+        $this->help["license"]["title"] = Text::get("HELP_LICENSE_TITLE");
+        $this->help["license"]["text"] = get_context()->get_user()->get_text("LICENSE");
+        $this->help["privacy"]["title"] = Text::get("HELP_PRIVACY_TITLE");
+        $this->help["privacy"]["text"] = get_context()->get_user()->get_text("PRIVACY");
+        $this->help["cookies"]["title"] = Text::get("HELP_COOKIES_TITLE");
+        $this->help["cookies"]["text"] = get_context()->get_user()->get_text("COOKIES");
+        $this->set_title(Text::get("HELP_TITLE"));
+        $this->set_description(Text::get("HELP_DESCRIPTION") . " - " . Text::get("USER_TAGLINE"));
+        $this->set_canonical(URL::HELP);
+        $this->add_css("help.css");
+        $this->add_js("help.js");
+    }
+    
+    /**
+     * Retrives the text body for a section.
+     * 
+     * Available sections are "info", "license", "privacy" and "cookies".
+     * 
+     * @param string $section Section for which to retrieve the text, case insensitive.
+     * @return The text for the requested section, or an empty string if an invalid section is
+     * provided or the text is not defined.
+     */
+    public function get_section_text($section){
+        if (isSet($this->help[$section]))
+            if (isSet($this->help[$section]["text"])) return $this->help[$section]["text"];
+        return "";
+    }
+    
+    /**
+     * Retrives the title of a section.
+     * 
+     * Available sections are "info", "license", "privacy" and "cookies".
+     * 
+     * @param string $section Section for which to retrieve the title, case insensitive.
+     * @return The title for the requested section, or an empty string if an invalid section
+     * is provided or the title is not defined.
+     */
+    public function get_section_title($section){
+        if (isSet($this->help[$section]))
+            if (isSet($this->help[$section]["title"])) return $this->help[$section]["title"];
+        return "";
     }
+}
 ?>

+ 10 - 18
application/page/Home_Page.php

@@ -21,40 +21,32 @@ class Home_Page extends Page{
      * Retrieves the data and initializes the variables.
      */
     public function __construct(){
-        $this->view = PATH::VIEW . "home.php";
         parent::__construct();
         $this->set_view("home.php");
-        $this->set_title(Text::get("USER_NAME"));
-        $this->set_description(Text::get("USER_NAME"));
+        $this->set_title("");
+        $this->set_description(get_context()->get_user()->get_text("TAGLINE"));
         $this->set_canonical("");
         $this->add_css("home.css");
         $this->set_code(200);
         $this->set_message("OK");
-
-        $statement = get_context()->get_db()->prepare("
-          SELECT id
-          FROM project
-          WHERE visible = 1
-          ORDER BY idx DESC
-          LIMIT :limit
-        ");
+        $statement = get_context()->get_db()->prepare(
+          "SELECT id FROM project WHERE user = :user AND visible = 1 ORDER BY idx LIMIT :limit"
+        );
         $statement->bindValue(':limit', $this->max_projects, PDO::PARAM_INT);
-        
-        
+        $statement->bindValue(':user', get_context()->get_user()->get_id(), PDO::PARAM_INT);
         $statement->execute();
-        while ($r_project = $statement->fetch(PDO::FETCH_ASSOC)) {
+        while ($r_project = $statement->fetch(PDO::FETCH_ASSOC)){
             Log::debug("Instantiating new project: " . $r_project["id"]);
-            array_push($this->project, new Project($r_project["id"]));
+            array_push($this->projects, new Project($r_project["id"]));
         }
         
     }
+
     /**
      * Retrieves the projects to show on the page.
      *
      * @return Project[] Project list.
      */
-    public function get_projects(){
-        return $this->projects;
-    }
+    public function get_projects(){return $this->projects;}
 
 }

+ 71 - 65
application/page/Page.php

@@ -23,6 +23,11 @@ abstract class Page{
      */
     private $css = [];
     
+    /**
+     * @var string[] List of js files required for the page.
+     */
+    private $js = [];
+    
     /**
      * @var string Path to the view associated with the page.
      */
@@ -77,9 +82,9 @@ abstract class Page{
      * Constructor.
      */
     public function __construct(){
-        $this->favicon = URL::IMG["LOGO"] . "sw.png";
-        $this->icon = URL::IMG["LOGO"] . "sw.png";
-        $this->name = "SWDB";
+        $this->favicon = URL::IMG["LOGO"] . "logo.svg";
+        $this->icon = URL::IMG["LOGO"] . "logo.svg";
+        $this->name = get_context()->get_user()->get_display_name();
         $this->author = URL::BASE;
         $this->add_css("ui.css");
     }
@@ -90,23 +95,35 @@ abstract class Page{
      * @param string $css Css file. Can be the absolute URL, or just the filename.
      */
     protected function add_css($css){
-        if (strripos($css, URL::CSS) === false){
-            $file = URL::CSS . $css;
-        }
-        else{
-            $file = $css;
-        }
+        if (strripos($css, URL::CSS) === false) $file = URL::CSS . $css;
+        else $file = $css;
         array_push($this->css, $file);
     }
     
+    /**
+     * Adds a JS file to the list.
+     *
+     * @param string $js JS file. Can be the absolute URL, or just the filename.
+     */
+    protected function add_js($js){
+        if (strripos($js, URL::JS) === false) $file = URL::JS . $js;
+        else $file = $js;
+        array_push($this->js, $file);
+    }
+    
     /**
      * Retrieves the CSS file URLs for the page.
      *
      * @return string[] CSS files (by absolute URL.)
      */
-    public function get_css(){
-        return $this->css;
-    }
+    public function get_css(){return $this->css;}
+    
+    /**
+     * Retrieves the JS file URLs for the page.
+     *
+     * @return string[] JS files (by absolute URL.)
+     */
+    public function get_js(){return $this->js;}
     
     /**
      * Sets the page view.
@@ -114,12 +131,8 @@ abstract class Page{
      * @param string $view View file. Can be the relative path, or just the filename.
      */
     protected function set_view($view){
-        if (strripos($view, PATH::VIEW) === false){
-            $file = PATH::VIEW . $view;
-        }
-        else{
-            $file = $view;
-        }
+        if (strripos($view, PATH::VIEW) === false) $file = PATH::VIEW . $view;
+        else $file = $view;
         $this->view = $file;
     }
     
@@ -128,19 +141,19 @@ abstract class Page{
      *
      * @return string Path to the view file.
      */
-    public function get_view(){
-        return $this->view;
-    }
+    public function get_view(){return $this->view;}
     
     /**
      * Sets the page title.
      *
-     * The string " - SWDB" will always be added at the end.
+     * The user name" will always be added at the end.
      *
      * @param string $title Page title.
      */
     protected function set_title($title){
-        $this->title = htmlentities($title, ENT_QUOTES) . " - SWDB";
+        $this->title = htmlentities($title, ENT_QUOTES);
+        if ($title != "") $this->title = $this->title . " - ";
+        $this->title = $this->title . get_context()->get_user()->get_display_name();
     }
     
     /**
@@ -148,28 +161,26 @@ abstract class Page{
      *
      * @return string Page title.
      */
-    public function get_title(){
-        return $this->title;
-    }
+    public function get_title(){return $this->title;}
     
     /**
      * Retrieves the site name.
      *
      * @return string Site name.
      */
-    public function get_name(){
-        return $this->name;
-    }
+    public function get_name(){return $this->name;}
     
     /**
      * Sets the page description.
      *
-     * The string " - Summoners War DataBase" will always be added at the end.
+     * The user tagline will always be added at the end.
      *
      * @param string $description Page description text.
      */
     protected function set_description($description){
-        $this->description = htmlentities($description, ENT_QUOTES) . " - " . Text::get("USER_TAGLINE");
+        $this->description = htmlentities($description, ENT_QUOTES);
+        if ($description != "") $this->description = $this->description . " - ";
+        $this->description = $this->description . get_context()->get_user()->get_text("TAGLINE");
     }
     
     /**
@@ -177,27 +188,21 @@ abstract class Page{
      *
      * @return string Page description.
      */
-    public function get_description(){
-        return $this->description;
-    }
+    public function get_description(){return $this->description;}
     
     /**
      * Retrieves the URL to the favicon.
      *
      * @return string Favicon URL.
      */
-    public function get_favicon(){
-        return $this->favicon;
-    }
+    public function get_favicon(){return $this->favicon;}
     
     /**
      * Retrieves the URL to the thumbnail image.
      *
      * @return string Thmbnail icon URL.
      */
-    public function get_icon(){
-        return $this->icon;
-    }
+    public function get_icon(){return $this->icon;}
     
     /**
      * Sets the page canonical URL.
@@ -205,12 +210,8 @@ abstract class Page{
      * @param string $canonical Canonical URL, absolute or relative.
      */
     protected function set_canonical($canonical){
-        if (strripos($canonical, URL::BASE) === false){
-            $file = URL::BASE . $canonical;
-        }
-        else{
-            $file = $canonical;
-        }
+        if (strripos($canonical, URL::BASE) === false) $file = URL::BASE . $canonical;
+        else $file = $canonical;
         $this->canonical = $file;
     }
     
@@ -219,18 +220,14 @@ abstract class Page{
      *
      * @return string Canonical URL.
      */
-    public function get_canonical(){
-        return $this->canonical;
-    }
+    public function get_canonical(){return $this->canonical;}
     
     /**
      * Retrieves the author URL (site main URL).
      *
      * @return string AUthor URL.
      */
-    public function get_author(){
-        return $this->author;
-    }
+    public function get_author(){return $this->author;}
     
     /**
      * Sets the HTTP status code for the page to return.
@@ -238,9 +235,7 @@ abstract class Page{
      * @param int HTTP status code.
      */
     protected function set_code($code){
-        if (is_int($code) && $code >= 200 && $code <= 500){
-            $this->code = $code;
-        }
+        if (is_int($code) && $code >= 200 && $code <= 500) $this->code = $code;
     }
     
     /**
@@ -248,27 +243,21 @@ abstract class Page{
      *
      * @return int HTTP status code
      */
-    public function get_code(){
-        return $this->code;
-    }
+    public function get_code(){return $this->code;}
     
     /**
      * Sets the HTTP status message for the page to return.
      *
      * @param string HTTP status message.
      */
-    protected function set_message($mesage){
-        $this->message = strval($mesage);
-    }
+    protected function set_message($mesage){$this->message = strval($mesage);}
     
     /**
      * Retrieves the page HTTP status message.
      *
      * @return string HTTP status code
      */
-    public function get_message(){
-        return $this->message;
-    }
+    public function get_message(){return $this->message;}
     
     /**
      * Generates the content to be inserted in the HTML <head> section.
@@ -289,12 +278,29 @@ abstract class Page{
             $head .= "
           <link rel='stylesheet' type='text/css' href='$css'/>";
         }
+        $head .= "
+          <!-- JS files -->";
+        foreach ($this->get_js() as $js){
+            $head .= "
+          <script type='text/javascript' src='$js'></script>";
+        }
         $head .= "
           <!-- Meta tags -->
           <link rel='canonical' href='" . $this->get_canonical() . "'/>
           <link rel='author' href='" . $this->get_author() . "'/>
           <link rel='publisher' href='" . $this->get_author() . "'/>
-          <meta name='description' content='" . $this->get_description() . "'/>
+          <meta name='description' content='" . $this->get_description() . "'/>";
+        foreach (get_context()->get_available_langs() as $lang){
+            if ($lang != get_context()->get_lang()){
+                $url = substr($this->get_canonical(), strlen(URL::BASE));
+                if (substr($url, 0, 3) == get_context()->get_lang() . "/")
+                    $url = URL::BASE . $lang . "/" . substr($url, 2);
+                else $url = URL::BASE . $lang . "/" . $url;
+                $head .= "
+          <link rel='alternate' hreflang='$lang' href='$url' />";
+            }
+        }
+        $head .= "
           <meta property='og:title' content='" . $this->get_title() . "'/>
           <meta property='og:url' content='" . $this->get_canonical() . "'/>
           <meta property='og:description' content='" . $this->get_description() . "'/>

+ 67 - 54
application/page/Profile_Page.php

@@ -1,62 +1,75 @@
 <?php
 
-    require_once($path["page"] . "Page.php");
-    require_once($path["entity"] . "Cv.php");
-    require_once($path["helper"] . "text.php");
+require_once(PATH::PAGE . "Page.php");
+require_once(PATH::ENTITY . "Cv.php");
 
+/**
+ * Profile page model.
+ */
+class Profile_Page extends Page{
 
     /**
-     * Profile page model.
-     */
-    class Profile_Page extends Page{
-
-        /**
-         * List of available {@see CV}.
-         */
-        public $cv = [];
-
-        /**
-         * {@see CV} in the current languages.
-         */
-        public $main_cv;
-
-        /**
-         * List {@see CV}s in other languages.
-         */
-        public $other_cv = [];
-
-        /**
-         * Constructor.
-         *
-         * Retrieves the data and initializes the variables.
-         *
-         * @param MySQL_connection $db Connection to the database.
-         * @param string $lang Lowercase, two-letter language code.
-         */
-        public function __construct($db, $lang){
-            global $path;
-            global $base_url;
-            parent::__construct($db, $lang);
-            $this->view = $path["view"] . "profile.php";
-            $s =
-              "SELECT id " .
-              "FROM cv " .
-              "WHERE visible = 1 " .
-              "ORDER BY lang = '" . $this->lang . "' DESC;";
-            $q = mysqli_query($this->db, $s);
-            while($r = mysqli_fetch_array($q)){
-                $c = new Cv($this->db, $r["id"]);
-                array_push($this->cv, $c);
-                if ($c->lang == $this->lang){
-                    $this->main_cv = $c;
-                }
-                else{
-                     array_push($this->other_cv, $c);
-                }
-            }
-            $this->title = text($this, "USER_NAME");
-            $this->description = text($this, "SECTION_ME") . " - " . text($this, "USER_NAME");
-            $this->canonical = $base_url . "/profile/";
+    * List of available {@see CV}.
+    */
+    private $cv = [];
+
+    /**
+    * {@see CV} in the current languages.
+    */
+    private $main_cv;
+
+    /**
+    * List {@see CV}s in other languages.
+    */
+    private $other_cv = [];
+
+    /**
+    * Constructor.
+    *
+    * Retrieves the data and initializes the variables.
+    */
+    public function __construct(){
+        $this->view = PATH::VIEW . "profile.php";
+        parent::__construct();
+        $this->set_view("profile.php");
+        $statement = get_context()->get_db()->prepare(
+          "SELECT id FROM cv WHERE user = :user AND visible = 1 ORDER BY lang = :lang DESC"
+        );
+        $statement->bindValue(':user', get_context()->get_user()->get_id(), PDO::PARAM_INT);
+        $statement->bindValue(':lang', get_context()->get_lang(), PDO::PARAM_STR);
+        $statement->execute();
+        while ($r_cv = $statement->fetch(PDO::FETCH_ASSOC)){
+            $c = new Cv($r_cv["id"]);
+            array_push($this->cv, $c);
+            if ($c->get_lang()->get_code() == get_context()->get_lang()) $this->main_cv = $c;
+            array_push($this->other_cv, $c);
         }
+
+        $this->set_title(Text::get("USER_NAME"));
+        $this->set_description(Text::get("SECTION_ME") . " - " . Text::get("USER_NAME"));
+        $this->set_canonical(URL::PROFILE);
+        $this->add_css("profile.css");
     }
+
+    /**
+     * Retrieves the list of CVs.
+     *
+     * @return CV[] CV list.
+     */
+    public function get_cvs(){return $this->cv;}
+
+    /**
+     * Retrieves the main CV.
+     *
+     * @return Main CV.
+     */
+    public function get_main_cv(){return $this->main_cv;}
+
+    /**
+     * Retrieves the list of CVs excluding the main one.
+     *
+     * @return CV[] CV list, excluding the main one.
+     */
+    public function get_other_cvs(){return $this->other_cv;}
+}
 ?>

+ 38 - 36
application/page/Project_Page.php

@@ -1,45 +1,47 @@
 <?php
 
-    require_once($path["page"] . "Page.php");
-    require_once($path["entity"] . "Project.php");
-    require_once($path["helper"] . "text.php");
+require_once(PATH::PAGE . "Page.php");
+require_once(PATH::ENTITY . "Project.php");
 
 
-    /**
-     * Project page model.
-     */
-    class Project_Page extends Page{
+/**
+    * Project page model.
+    */
+class Project_Page extends Page{
 
-        /**
-         * The selected {@see Project}.
-         */
-        public $project;
+    /**
+    * The selected {@see Project}.
+    */
+    private $project;
 
-        /**
-         * Constructor.
-         *
-         * Retrieves the data and initializes the variables.
-         *
-         * @param MySQL_connection $db Connection to the database.
-         * @param string $lang Lowercase, two-letter language code.
-         * @param string $id Project id or permalink.
-         */
-        public function __construct($db, $lang, $id){
-            global $path;
-            global $base_url;
-            global $static;
-            parent:: __construct($db, $lang);
-            $this->view = $path["view"] . "project.php";
-            $this->project = new Project($this->db, $this->lang, $id);
-            $this->title = $this->project->title . " - " . text($this, "USER_NAME");
-            $this->description = $this->project->header;
-            if (strlen($this->project->logo) > 0){
-                $this->icon = $static["content"] . "project/" . $this->project->logo;
-            }
-            else{
-                $this->icon = $static["layout"] . "logo/logo.svg";
-            }
-            $this->canonical = $base_url . "/project/" . $this->project->permalink . "/";
+    /**
+    * Constructor.
+    *
+    * Retrieves the data and initializes the variables.
+    *
+    * @param string $id Project id or permalink.
+    */
+    public function __construct($id){
+        parent:: __construct();
+        $this->view = PATH::VIEW . "project.php";
+        $this->set_view("project.php");
+        $this->project = new Project($id);
+        $this->set_title($this->project->get_title() . " - " . Text::get("USER_NAME"));
+        $this->set_description($this->project->get_header());
+        $this->add_css("project.css");
+        if (strlen($this->project->get_logo()) > 0){
+            $this->icon = URL::IMG["CONTENT"] . "project/x100/" . $this->project->get_logo();
         }
+        $this->set_canonical(URL::PROJECTS . $this->project->get_permalink() . "/");
+    }
+
+    /**
+     * Retrieves the loade project.
+     *
+     * @return Project Loaded project.
+     */
+    public function get_project(){
+        return $this->project;
     }
+}
 ?>

+ 36 - 37
application/page/Projects_Page.php

@@ -1,46 +1,45 @@
 <?php
 
-    require_once($path["page"] . "Page.php");
-    require_once($path["entity"] . "Project.php");
-    require_once($path["helper"] . "text.php");
+require_once(PATH::PAGE . "Page.php");
+require_once(PATH::ENTITY . "Project.php");
 
+/**
+ * Projects list page model.
+ */
+class Projects_Page extends Page{
 
     /**
-     * Projects list page model.
+     * Array with the {@see Project}.
      */
-    class Projects_Page extends Page{
+    private $projects = [];
 
-        /**
-         * Array with the {@see Project}.
-         */
-        public $project = [];
-
-        /**
-         * Constructor.
-         *
-         * Retrieves the data and initializes the variables.
-         *
-         * @param MySQL_connection $db Connection to the database.
-         * @param string $lang Lowercase, two-letter language code.
-         * @param string $id Project id or permalink.
-         */
-        public function __construct($db, $lang){
-            global $path;
-            global $base_url;
-            parent:: __construct($db, $lang);
-            $this->view = $path["view"] . "projects.php";
-            $s =
-              "SELECT id " .
-              "FROM project " .
-              "WHERE visible = 1 " .
-              "ORDER BY idx;";
-            $q = mysqli_query($this->db, $s);
-            while($r = mysqli_fetch_array($q)){
-                array_push($this->project, new Project($this->db, $this->lang, $r["id"]));
-            }
-            $this->title = text($this, "PROJECT_TITLE") . " - " . text($this, "USER_NAME");
-            $this->description = text($this, "PROJECT_DESCRIPTION");
-            $this->canonical = $base_url . "/project/";
-        }
+    /**
+     * Constructor.
+     *
+     * Retrieves the data and initializes the variables.
+     */
+    public function __construct(){
+        $this->view = PATH::VIEW . "projects.php";
+        parent:: __construct();
+        $this->set_view("projects.php");
+        $statement = get_context()->get_db()->prepare(
+          "SELECT id FROM project WHERE user = :user AND visible = 1 ORDER BY idx"
+        );
+        $statement->bindValue(':user', get_context()->get_user()->get_id(), PDO::PARAM_INT);
+        $statement->execute();
+        while ($r_projects = $statement->fetch(PDO::FETCH_ASSOC))
+            array_push($this->projects, new Project($r_projects["id"]));
+        $this->set_title(Text::get("PROJECT_TITLE"));
+        $this->set_description(Text::get("PROJECT_DESCRIPTION"));
+        $this->set_canonical(URL::PROJECTS);
+        $this->add_css("projects.css");
     }
+
+    /**
+     * Retrieves the projects to show on the page.
+     *
+     * @return Project[] Project list.
+     */
+    public function get_projects(){return $this->projects;}
+}
 ?>

+ 32 - 0
application/page/Robots_Page.php

@@ -0,0 +1,32 @@
+<?php
+
+require_once(PATH::PAGE . 'Page.php');
+
+/**
+ * robots.txt file page model.
+ */
+class Robots_Page extends Page{
+
+    /**
+     * robots.txt contents
+     */
+    private $text = "User-agent: *\nDisallow:";
+
+    /**
+     * Constructor.
+     *
+     * Retrieves the data and populates the text.
+     */
+    public function __construct(){
+        parent::__construct();
+        $this->set_view('robots.php');
+    }
+
+    /**
+     * Retrieves the text for the robots.txt file.
+     *
+     * @return string The text for the txt file.
+     */
+    public function get_text(){return $this->text;}
+
+}

+ 74 - 0
application/page/Sitemap_Page.php

@@ -0,0 +1,74 @@
+<?php
+
+require_once(PATH::PAGE . 'Page.php');
+
+/**
+ * Sitemap.xml file page model.
+ */
+class Sitemap_Page extends Page{
+
+    /**
+     * Sitemap contents
+     */
+    private $text = '';
+
+    /**
+     * Constructor.
+     *
+     * Retrieves the data and populates the text.
+     */
+    public function __construct(){
+        parent::__construct();
+        $this->set_view('sitemap.php');
+        // TODO: Don't use static date.
+        $lastmod = "2023-09-14";
+        $this->text .= "<?xml version='1.0' encoding='UTF-8'?>
+<urlset xmlns='http://www.sitemaps.org/schemas/sitemap/0.9'>
+    <url>
+        <loc>" . URL::BASE . "</loc>
+        <lastmod>" . $lastmod ."</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>1.0</priority>
+    </url>
+    <url>
+        <loc>" . URL::BASE . "profile/</loc>
+        <lastmod>" . $lastmod ."</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.9</priority>
+    </url>
+    <url>
+        <loc>" . URL::BASE . "projects/</loc>
+        <lastmod>" . $lastmod ."</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.8</priority>
+    </url>";
+        $statement = get_context()->get_db()->prepare(
+          'SELECT permalink FROM project WHERE user = :user AND visible = 1 ORDER BY idx'
+        );
+        $statement->bindValue(':user', get_context()->get_user()->get_id(), PDO::PARAM_INT);
+        $statement->execute();
+        $priority = 0.7;
+        $priority_dec = 0.3 / $statement->rowcount();
+        while ($r = $statement->fetch(PDO::FETCH_ASSOC)){
+            $this->text .= "
+    <url>
+        <loc>" . URL::BASE . "projects/" . $r["permalink"]. "</loc>
+        <lastmod>" . $lastmod ."</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>" . $priority . "</priority>
+    </url>";
+            $priority -= $priority_dec;
+        }
+        $this->text .= "
+</urlset>";
+
+    }
+
+    /**
+     * Retrieves the text for the sitemap XML file.
+     *
+     * @return string The text for the XML.
+     */
+    public function get_text(){return $this->text;}
+
+}

+ 0 - 3
application/resources/text/HELP_COOKIES_TEXT__EN

@@ -1,3 +0,0 @@
-Being consequent with the previous paragraph, I&#39;ve got bad news.
-<br/><br/>No cookies on this site.
-<br/><br/>:(

+ 0 - 3
application/resources/text/HELP_COOKIES_TEXT__ES

@@ -1,3 +0,0 @@
-Being consequent with the previous paragraph, I&#39;ve got bad news.
-<br/><br/>No cookies on this site.
-<br/><br/>:(

+ 0 - 3
application/resources/text/HELP_COOKIES_TEXT__EU

@@ -1,3 +0,0 @@
-Being consequent with the previous paragraph, I&#39;ve got bad news.
-<br/><br/>No cookies on this site.
-<br/><br/>:(

+ 0 - 0
application/resources/text/HELP_INFO_TEXT__EN


+ 0 - 0
application/resources/text/HELP_INFO_TEXT__ES


+ 0 - 0
application/resources/text/HELP_INFO_TEXT__EU


+ 0 - 9
application/resources/text/HELP_LICENSE_TEXT__EN

@@ -1,9 +0,0 @@
-Bad news first: There are some icons (application stores, social networks, code repositories...) which, of course, are no work of mine, and are propery of their respective owners.
-<br/><br/>
-But as for everything else:
-<br/><br/>
-On most projects and code on this site you&#39;ll find it&#39;s license, usually a GPL one. For every thing else in this site a <a rel="license" target="_blank" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a> applies.
-<br/><br/>
-Wich means that you can use, modify, and share this work or its modifications, as long as you give credit to me (for example, by linking to this page) and you keep this license unchanged.
-<br/><br/>
-So, go on! Start copying and downloading as if there were no tomorrow.

+ 0 - 9
application/resources/text/HELP_LICENSE_TEXT__ES

@@ -1,9 +0,0 @@
-Bad news first: There are some icons (application stores, social networks, code repositories...) which, of course, are no work of mine, and are propery of their respective owners.
-<br/><br/>
-But as for everything else:
-<br/><br/>
-On most projects and code on this site you&#39;ll find it&#39;s license, usually a GPL one. For every thing else in this site a <a rel="license" target="_blank" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a> applies.
-<br/><br/>
-Wich means that you can use, modify, and share this work or its modifications, as long as you give credit to me (for example, by linking to this page) and you keep this license unchanged.
-<br/><br/>
-So, go on! Start copying and downloading as if there were no tomorrow.

+ 0 - 9
application/resources/text/HELP_LICENSE_TEXT__EU

@@ -1,9 +0,0 @@
-Bad news first: There are some icons (application stores, social networks, code repositories...) which, of course, are no work of mine, and are propery of their respective owners.
-<br/><br/>
-But as for everything else:
-<br/><br/>
-On most projects and code on this site you&#39;ll find it&#39;s license, usually a GPL one. For every thing else in this site a <a rel="license" target="_blank" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a> applies.
-<br/><br/>
-Wich means that you can use, modify, and share this work or its modifications, as long as you give credit to me (for example, by linking to this page) and you keep this license unchanged.
-<br/><br/>
-So, go on! Start copying and downloading as if there were no tomorrow.

+ 0 - 7
application/resources/text/HELP_PRIVACY_TEXT__EN

@@ -1,7 +0,0 @@
-Let&#39;s be honest. Nobody likes being tracked. At least I don&#39;t. That&#39;s why I don&#39;t track you.
-<br/><br/>
-I try to collect as few personal information about you as posible. There is no advertising, no registration is needed to download anything, no email subscription to see any content on the page, no third party code to track visits...
-<br/><br/>
-I like to keep a basic track of the visits on the site, it&#39;s good for my ego. To do so, I use hashed IP of the visitors (meaning I can&#39;t know the real IP address)
-<br/><br/>
-And that&#39;s pretty much it.

+ 0 - 7
application/resources/text/HELP_PRIVACY_TEXT__ES

@@ -1,7 +0,0 @@
-Let&#39;s be honest. Nobody likes being tracked. At least I don&#39;t. That&#39;s why I don&#39;t track you.
-<br/><br/>
-I try to collect as few personal information about you as posible. There is no advertising, no registration is needed to download anything, no email subscription to see any content on the page, no third party code to track visits...
-<br/><br/>
-I like to keep a basic track of the visits on the site, it&#39;s good for my ego. To do so, I use hashed IP of the visitors (meaning I can&#39;t know the real IP address)
-<br/><br/>
-And that&#39;s pretty much it.

+ 0 - 7
application/resources/text/HELP_PRIVACY_TEXT__EU

@@ -1,7 +0,0 @@
-Let&#39;s be honest. Nobody likes being tracked. At least I don&#39;t. That&#39;s why I don&#39;t track you.
-<br/><br/>
-I try to collect as few personal information about you as posible. There is no advertising, no registration is needed to download anything, no email subscription to see any content on the page, no third party code to track visits...
-<br/><br/>
-I like to keep a basic track of the visits on the site, it&#39;s good for my ego. To do so, I use hashed IP of the visitors (meaning I can&#39;t know the real IP address)
-<br/><br/>
-And that&#39;s pretty much it.

+ 0 - 49
application/resources/text/LICENSE_CC-BY-SA_SUMMARY__EN

@@ -1,49 +0,0 @@
-<div style="text-align: left">
-    <div>
-        <h3 style="text-align: center">You are free to:</h3>
-        <ul>
-            <li><strong>Share</strong> — copy and redistribute the material in any medium or format</li>
-            <li resource="http://creativecommons.org/ns#DerivativeWorks"><strong>Adapt</strong> — remix, transform, and build upon the material for any purpose, even commercially.</li>
-        </ul>
-    </div>
-    <div>
-        <img src="/img/license/freeculturalworks.jpg" style="border: 0" alt="This license is acceptable for Free Cultural Works."/>
-    </div>
-</div>
-<div>
-    <ul style="text-align: center">
-        <li>The licensor cannot revoke these freedoms as long as you follow the license terms.</li>
-    </ul>
-</div>
-<div>
-    <div>
-        <hr>
-    </div>
-</div>
-<div>
-    <h3 style="text-align: center">Under the following terms:</h3>
-    <ul style="text-align: left">
-        <li>
-            <p><strong>Attribution</strong> — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</p>
-            <p style="display:none;"><strong>Attribute this work:</strong><br><img src="/images/information.png"></p>
-        </li>
-        <li><p><strong>ShareAlike</strong> — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</p></li>
-    </ul>
-</div>
-<div>
-    <ul>
-        <li><strong>No additional restrictions</strong> — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</li>
-    </ul>
-</div>
-<div>
-    <div class="col-md-offset-1 col-md-10">
-        <hr>
-    </div>
-</div>
-<div>
-    <h3 style="text-align: center">Notices:</h3>
-    <ul>
-        <li>You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.</li>
-        <li>No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.</li>
-    </ul>
-</div>

+ 0 - 49
application/resources/text/LICENSE_CC-BY-SA_SUMMARY__ES

@@ -1,49 +0,0 @@
-<div style="text-align: left">
-    <div>
-        <h3 style="text-align: center">You are free to:</h3>
-        <ul>
-            <li><strong>Share</strong> — copy and redistribute the material in any medium or format</li>
-            <li resource="http://creativecommons.org/ns#DerivativeWorks"><strong>Adapt</strong> — remix, transform, and build upon the material for any purpose, even commercially.</li>
-        </ul>
-    </div>
-    <div>
-        <img src="/img/license/freeculturalworks.jpg" style="border: 0" alt="This license is acceptable for Free Cultural Works."/>
-    </div>
-</div>
-<div>
-    <ul style="text-align: center">
-        <li>The licensor cannot revoke these freedoms as long as you follow the license terms.</li>
-    </ul>
-</div>
-<div>
-    <div>
-        <hr>
-    </div>
-</div>
-<div>
-    <h3 style="text-align: center">Under the following terms:</h3>
-    <ul style="text-align: left">
-        <li>
-            <p><strong>Attribution</strong> — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</p>
-            <p style="display:none;"><strong>Attribute this work:</strong><br><img src="/images/information.png"></p>
-        </li>
-        <li><p><strong>ShareAlike</strong> — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</p></li>
-    </ul>
-</div>
-<div>
-    <ul>
-        <li><strong>No additional restrictions</strong> — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</li>
-    </ul>
-</div>
-<div>
-    <div class="col-md-offset-1 col-md-10">
-        <hr>
-    </div>
-</div>
-<div>
-    <h3 style="text-align: center">Notices:</h3>
-    <ul>
-        <li>You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.</li>
-        <li>No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.</li>
-    </ul>
-</div>

+ 0 - 49
application/resources/text/LICENSE_CC-BY-SA_SUMMARY__EU

@@ -1,49 +0,0 @@
-<div style="text-align: left">
-    <div>
-        <h3 style="text-align: center">You are free to:</h3>
-        <ul>
-            <li><strong>Share</strong> — copy and redistribute the material in any medium or format</li>
-            <li resource="http://creativecommons.org/ns#DerivativeWorks"><strong>Adapt</strong> — remix, transform, and build upon the material for any purpose, even commercially.</li>
-        </ul>
-    </div>
-    <div>
-        <img src="/img/license/freeculturalworks.jpg" style="border: 0" alt="This license is acceptable for Free Cultural Works."/>
-    </div>
-</div>
-<div>
-    <ul style="text-align: center">
-        <li>The licensor cannot revoke these freedoms as long as you follow the license terms.</li>
-    </ul>
-</div>
-<div>
-    <div>
-        <hr>
-    </div>
-</div>
-<div>
-    <h3 style="text-align: center">Under the following terms:</h3>
-    <ul style="text-align: left">
-        <li>
-            <p><strong>Attribution</strong> — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</p>
-            <p style="display:none;"><strong>Attribute this work:</strong><br><img src="/images/information.png"></p>
-        </li>
-        <li><p><strong>ShareAlike</strong> — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</p></li>
-    </ul>
-</div>
-<div>
-    <ul>
-        <li><strong>No additional restrictions</strong> — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</li>
-    </ul>
-</div>
-<div>
-    <div class="col-md-offset-1 col-md-10">
-        <hr>
-    </div>
-</div>
-<div>
-    <h3 style="text-align: center">Notices:</h3>
-    <ul>
-        <li>You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.</li>
-        <li>No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.</li>
-    </ul>
-</div>

+ 0 - 128
application/resources/text/LICENSE_CC-BY-SA__EN

@@ -1,128 +0,0 @@
-<h3>Creative Commons Attribution-ShareAlike 4.0 International Public License</h3>
-<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
-<p><strong>Section 1 – Definitions.</strong></p>
-<ol>
-    <li><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
-    <li><strong>Adapter&#39;s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
-    <li><strong>BY-SA Compatible License</strong> means a license listed at <a href="//creativecommons.org/compatiblelicenses"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>
-    <li><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.</li>
-    <li><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may notbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similarinternational agreements.</li>
-    <li><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
-    <li><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.</li>
-    <li><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
-    <li><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
-    <li><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
-    <li><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
-    <li><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
-    <li><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
-</ol>
-<p><strong>Section 2 – Scope.</strong></p>
-<ol>
-    <li>
-        <strong>License grant</strong>.
-        <ol>
-            <li>Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-                <ol>
-                    <li>reproduce and Share the Licensed Material, in whole or in part; and</li>
-                    <li>produce, reproduce, and Share Adapted Material.</li>
-                </ol>
-            </li>
-            <li><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
-            <li><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section 6(a).</li>
-            <li><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.</li>
-            <li>
-                <span style="text-decoration: underline;">Downstream recipients</span>.
-                <div>
-                    <ol>
-                        <li><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
-                        <li><span style="text-decoration: underline;">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter&#39;s License You apply.</li>
-                        <li><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
-                    </ol>
-                </div>
-            </li>
-            <li><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).</li>
-        </ol>
-    </li>
-    <li>
-        <p><strong>Other rights</strong>.</p>
-        <ol>
-            <li>Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
-            <li>Patent and trademark rights are not licensed under this Public License.</li>
-            <li>To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>
-        </ol>
-    </li>
-</ol>
-<p><strong>Section 3 – License Conditions.</strong></p><p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
-<ol>
-    <li>
-        <p><strong>Attribution</strong>.</p>
-        <ol>
-            <li><p>If You Share the Licensed Material (including in modified form), You must:</p>
-                <ol>
-                    <li>retain the following if it is supplied by the Licensor with the Licensed Material:
-                        <ol>
-                            <li>identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
-                            <li>a copyright notice;</li>
-                            <li>a notice that refers to this Public License; </li>
-                            <li>a notice that refers to the disclaimer of warranties;</li>
-                            <li>a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
-                        </ol>
-                    </li>
-                    <li>indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
-                    <li>indicate the Licensed Material is licensed under this Public License,and include the text of, or the URI or hyperlink to, this PublicLicense.</li>
-                </ol>
-            </li>
-            <li>You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
-            <li>If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.</li>
-        </ol>
-    </li>
-    <li><strong>ShareAlike</strong>.
-        <p>In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.</p>
-        <ol>
-            <li>The Adapter&#39;s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.</li>
-            <li>You must include the text of, or the URI or hyperlink to, the Adapter&#39;s License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>
-            <li>You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter&#39;s License You apply.</li>
-        </ol>
-    </li>
-</ol>
-<p><strong>Section 4 – Sui Generis Database Rights.</strong></p>
-<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
-<ol>
-    <li>for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>
-    <li>if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and</li>
-    <li>You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.</li>
-</ol>For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-<p><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
-<ol style="font-weight: bold;">
-    <li><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
-    <li><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
-</ol>
-<ol start="3">
-    <li>The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
-</ol>
-<p><strong>Section 6 – Term and Termination.</strong></p>
-<ol>
-    <li>This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
-    <li>
-        <p>Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:</p>
-        <ol>
-            <li>automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
-            <li>upon express reinstatement by the Licensor.</li>
-        </ol>
-        For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-    </li>
-    <li>For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
-    <li>Sections 1, 5, 6, 7, and 8 survive termination of this Public License.</li>
-</ol>
-<p><strong>Section 7 – Other Terms and Conditions.</strong></p>
-<ol>
-    <li>The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
-    <li>Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
-</ol>
-<p><strong>Section 8 – Interpretation.</strong></p>
-<ol>
-    <li>For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
-    <li>To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
-    <li>No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
-    <li>Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
-</ol>

+ 0 - 128
application/resources/text/LICENSE_CC-BY-SA__ES

@@ -1,128 +0,0 @@
-<h3>Creative Commons Attribution-ShareAlike 4.0 International Public License</h3>
-<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
-<p><strong>Section 1 – Definitions.</strong></p>
-<ol>
-    <li><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
-    <li><strong>Adapter&#39;s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
-    <li><strong>BY-SA Compatible License</strong> means a license listed at <a href="//creativecommons.org/compatiblelicenses"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>
-    <li><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.</li>
-    <li><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may notbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similarinternational agreements.</li>
-    <li><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
-    <li><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.</li>
-    <li><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
-    <li><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
-    <li><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
-    <li><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
-    <li><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
-    <li><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
-</ol>
-<p><strong>Section 2 – Scope.</strong></p>
-<ol>
-    <li>
-        <strong>License grant</strong>.
-        <ol>
-            <li>Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-                <ol>
-                    <li>reproduce and Share the Licensed Material, in whole or in part; and</li>
-                    <li>produce, reproduce, and Share Adapted Material.</li>
-                </ol>
-            </li>
-            <li><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
-            <li><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section 6(a).</li>
-            <li><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.</li>
-            <li>
-                <span style="text-decoration: underline;">Downstream recipients</span>.
-                <div>
-                    <ol>
-                        <li><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
-                        <li><span style="text-decoration: underline;">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter&#39;s License You apply.</li>
-                        <li><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
-                    </ol>
-                </div>
-            </li>
-            <li><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).</li>
-        </ol>
-    </li>
-    <li>
-        <p><strong>Other rights</strong>.</p>
-        <ol>
-            <li>Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
-            <li>Patent and trademark rights are not licensed under this Public License.</li>
-            <li>To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>
-        </ol>
-    </li>
-</ol>
-<p><strong>Section 3 – License Conditions.</strong></p><p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
-<ol>
-    <li>
-        <p><strong>Attribution</strong>.</p>
-        <ol>
-            <li><p>If You Share the Licensed Material (including in modified form), You must:</p>
-                <ol>
-                    <li>retain the following if it is supplied by the Licensor with the Licensed Material:
-                        <ol>
-                            <li>identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
-                            <li>a copyright notice;</li>
-                            <li>a notice that refers to this Public License; </li>
-                            <li>a notice that refers to the disclaimer of warranties;</li>
-                            <li>a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
-                        </ol>
-                    </li>
-                    <li>indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
-                    <li>indicate the Licensed Material is licensed under this Public License,and include the text of, or the URI or hyperlink to, this PublicLicense.</li>
-                </ol>
-            </li>
-            <li>You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
-            <li>If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.</li>
-        </ol>
-    </li>
-    <li><strong>ShareAlike</strong>.
-        <p>In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.</p>
-        <ol>
-            <li>The Adapter&#39;s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.</li>
-            <li>You must include the text of, or the URI or hyperlink to, the Adapter&#39;s License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>
-            <li>You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter&#39;s License You apply.</li>
-        </ol>
-    </li>
-</ol>
-<p><strong>Section 4 – Sui Generis Database Rights.</strong></p>
-<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
-<ol>
-    <li>for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>
-    <li>if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and</li>
-    <li>You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.</li>
-</ol>For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-<p><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
-<ol style="font-weight: bold;">
-    <li><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
-    <li><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
-</ol>
-<ol start="3">
-    <li>The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
-</ol>
-<p><strong>Section 6 – Term and Termination.</strong></p>
-<ol>
-    <li>This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
-    <li>
-        <p>Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:</p>
-        <ol>
-            <li>automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
-            <li>upon express reinstatement by the Licensor.</li>
-        </ol>
-        For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-    </li>
-    <li>For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
-    <li>Sections 1, 5, 6, 7, and 8 survive termination of this Public License.</li>
-</ol>
-<p><strong>Section 7 – Other Terms and Conditions.</strong></p>
-<ol>
-    <li>The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
-    <li>Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
-</ol>
-<p><strong>Section 8 – Interpretation.</strong></p>
-<ol>
-    <li>For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
-    <li>To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
-    <li>No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
-    <li>Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
-</ol>

+ 0 - 128
application/resources/text/LICENSE_CC-BY-SA__EU

@@ -1,128 +0,0 @@
-<h3>Creative Commons Attribution-ShareAlike 4.0 International Public License</h3>
-<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p>
-<p><strong>Section 1 – Definitions.</strong></p>
-<ol>
-    <li><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li>
-    <li><strong>Adapter&#39;s License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li>
-    <li><strong>BY-SA Compatible License</strong> means a license listed at <a href="//creativecommons.org/compatiblelicenses"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li>
-    <li><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.</li>
-    <li><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may notbe circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similarinternational agreements.</li>
-    <li><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li>
-    <li><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.</li>
-    <li><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li>
-    <li><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li>
-    <li><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li>
-    <li><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li>
-    <li><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li>
-    <li><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li>
-</ol>
-<p><strong>Section 2 – Scope.</strong></p>
-<ol>
-    <li>
-        <strong>License grant</strong>.
-        <ol>
-            <li>Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-                <ol>
-                    <li>reproduce and Share the Licensed Material, in whole or in part; and</li>
-                    <li>produce, reproduce, and Share Adapted Material.</li>
-                </ol>
-            </li>
-            <li><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li>
-            <li><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section 6(a).</li>
-            <li><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.</li>
-            <li>
-                <span style="text-decoration: underline;">Downstream recipients</span>.
-                <div>
-                    <ol>
-                        <li><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li>
-                        <li><span style="text-decoration: underline;">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter&#39;s License You apply.</li>
-                        <li><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li>
-                    </ol>
-                </div>
-            </li>
-            <li><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).</li>
-        </ol>
-    </li>
-    <li>
-        <p><strong>Other rights</strong>.</p>
-        <ol>
-            <li>Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li>
-            <li>Patent and trademark rights are not licensed under this Public License.</li>
-            <li>To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li>
-        </ol>
-    </li>
-</ol>
-<p><strong>Section 3 – License Conditions.</strong></p><p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
-<ol>
-    <li>
-        <p><strong>Attribution</strong>.</p>
-        <ol>
-            <li><p>If You Share the Licensed Material (including in modified form), You must:</p>
-                <ol>
-                    <li>retain the following if it is supplied by the Licensor with the Licensed Material:
-                        <ol>
-                            <li>identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li>
-                            <li>a copyright notice;</li>
-                            <li>a notice that refers to this Public License; </li>
-                            <li>a notice that refers to the disclaimer of warranties;</li>
-                            <li>a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li>
-                        </ol>
-                    </li>
-                    <li>indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li>
-                    <li>indicate the Licensed Material is licensed under this Public License,and include the text of, or the URI or hyperlink to, this PublicLicense.</li>
-                </ol>
-            </li>
-            <li>You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li>
-            <li>If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.</li>
-        </ol>
-    </li>
-    <li><strong>ShareAlike</strong>.
-        <p>In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.</p>
-        <ol>
-            <li>The Adapter&#39;s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.</li>
-            <li>You must include the text of, or the URI or hyperlink to, the Adapter&#39;s License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li>
-            <li>You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter&#39;s License You apply.</li>
-        </ol>
-    </li>
-</ol>
-<p><strong>Section 4 – Sui Generis Database Rights.</strong></p>
-<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p>
-<ol>
-    <li>for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li>
-    <li>if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and</li>
-    <li>You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.</li>
-</ol>For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-<p><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p>
-<ol style="font-weight: bold;">
-    <li><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li>
-    <li><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li>
-</ol>
-<ol start="3">
-    <li>The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li>
-</ol>
-<p><strong>Section 6 – Term and Termination.</strong></p>
-<ol>
-    <li>This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li>
-    <li>
-        <p>Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:</p>
-        <ol>
-            <li>automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li>
-            <li>upon express reinstatement by the Licensor.</li>
-        </ol>
-        For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-    </li>
-    <li>For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li>
-    <li>Sections 1, 5, 6, 7, and 8 survive termination of this Public License.</li>
-</ol>
-<p><strong>Section 7 – Other Terms and Conditions.</strong></p>
-<ol>
-    <li>The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li>
-    <li>Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li>
-</ol>
-<p><strong>Section 8 – Interpretation.</strong></p>
-<ol>
-    <li>For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li>
-    <li>To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li>
-    <li>No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li>
-    <li>Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li>
-</ol>

+ 0 - 1
application/resources/text/LICENSE_GPLV3_SUMMARY__EN

@@ -1 +0,0 @@
-You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build & install instructions.

+ 0 - 1
application/resources/text/LICENSE_GPLV3_SUMMARY__ES

@@ -1 +0,0 @@
-You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build & install instructions.

+ 0 - 1
application/resources/text/LICENSE_GPLV3_SUMMARY__EU

@@ -1 +0,0 @@
-You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build & install instructions.

+ 0 - 683
application/resources/text/LICENSE_GPLV3__EN

@@ -1,683 +0,0 @@
-<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
-<p style="text-align: center;">Version 3, 29 June 2007</p>
-
-<p>Copyright &copy; 2007 Free Software Foundation, Inc.
- &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.</p>
-
-<h3>Preamble</h3>
-
-<p>The GNU General Public License is a free, copyleft license for
-software and other kinds of works.</p>
-
-<p>The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.</p>
-
-<p>When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.</p>
-
-<p>To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.</p>
-
-<p>For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.</p>
-
-<p>Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.</p>
-
-<p>For the developers&#39; and authors&#39; protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users&#39; and
-authors&#39; sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.</p>
-
-<p>Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users&#39; freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.</p>
-
-<p>Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.</p>
-
-<p>The precise terms and conditions for copying, distribution and
-modification follow.</p>
-
-<h3>TERMS AND CONDITIONS</h3>
-
-<h4>0. Definitions.</h4>
-
-<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
-
-<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.</p>
- 
-<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
-&ldquo;recipients&rdquo; may be individuals or organizations.</p>
-
-<p>To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a &ldquo;modified version&rdquo; of the
-earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
-
-<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
-on the Program.</p>
-
-<p>To &ldquo;propagate&rdquo; a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.</p>
-
-<p>To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.</p>
-
-<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.</p>
-
-<h4>1. Source Code.</h4>
-
-<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
-for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
-form of a work.</p>
-
-<p>A &ldquo;Standard Interface&rdquo; means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.</p>
-
-<p>The &ldquo;System Libraries&rdquo; of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-&ldquo;Major Component&rdquo;, in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.</p>
-
-<p>The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work&#39;s
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.</p>
-
-<p>The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.</p>
-
-<p>The Corresponding Source for a work in source code form is that
-same work.</p>
-
-<h4>2. Basic Permissions.</h4>
-
-<p>All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.</p>
-
-<p>You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.</p>
-
-<p>Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.</p>
-
-<h4>3. Protecting Users&#39; Legal Rights From Anti-Circumvention Law.</h4>
-
-<p>No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.</p>
-
-<p>When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work&#39;s
-users, your or third parties&#39; legal rights to forbid circumvention of
-technological measures.</p>
-
-<h4>4. Conveying Verbatim Copies.</h4>
-
-<p>You may convey verbatim copies of the Program&#39;s source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.</p>
-
-<p>You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.</p>
-
-<h4>5. Conveying Modified Source Versions.</h4>
-
-<p>You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:</p>
-
-<ul>
-<li>a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.</li>
-
-<li>b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    &ldquo;keep intact all notices&rdquo;.</li>
-
-<li>c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.</li>
-
-<li>d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.</li>
-</ul>
-
-<p>A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-&ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation&#39;s users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.</p>
-
-<h4>6. Conveying Non-Source Forms.</h4>
-
-<p>You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:</p>
-
-<ul>
-<li>a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.</li>
-
-<li>b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.</li>
-
-<li>c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.</li>
-
-<li>d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.</li>
-
-<li>e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.</li>
-</ul>
-
-<p>A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.</p>
-
-<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, &ldquo;normally used&rdquo; refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.</p>
-
-<p>&ldquo;Installation Information&rdquo; for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.</p>
-
-<p>If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).</p>
-
-<p>The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.</p>
-
-<p>Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.</p>
-
-<h4>7. Additional Terms.</h4>
-
-<p>&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.</p>
-
-<p>When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.</p>
-
-<p>Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:</p>
-
-<ul>
-<li>a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or</li>
-
-<li>b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or</li>
-
-<li>c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or</li>
-
-<li>d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or</li>
-
-<li>e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or</li>
-
-<li>f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.</li>
-</ul>
-
-<p>All other non-permissive additional terms are considered &ldquo;further
-restrictions&rdquo; within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.</p>
-
-<p>If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.</p>
-
-<p>Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.</p>
-
-<h4>8. Termination.</h4>
-
-<p>You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).</p>
-
-<p>However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.</p>
-
-<p>Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.</p>
-
-<p>Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.</p>
-
-<h4>9. Acceptance Not Required for Having Copies.</h4>
-
-<p>You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.</p>
-
-<h4>10. Automatic Licensing of Downstream Recipients.</h4>
-
-<p>Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.</p>
-
-<p>An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party&#39;s predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.</p>
-
-<p>You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.</p>
-
-<h4>11. Patents.</h4>
-
-<p>A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor&#39;s &ldquo;contributor version&rdquo;.</p>
-
-<p>A contributor&#39;s &ldquo;essential patent claims&rdquo; are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, &ldquo;control&rdquo; includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.</p>
-
-<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor&#39;s essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.</p>
-
-<p>In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To &ldquo;grant&rdquo; such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.</p>
-
-<p>If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  &ldquo;Knowingly relying&rdquo; means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient&#39;s use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.</p>
-  
-<p>If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.</p>
-
-<p>A patent license is &ldquo;discriminatory&rdquo; if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.</p>
-
-<p>Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.</p>
-
-<h4>12. No Surrender of Others&#39; Freedom.</h4>
-
-<p>If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.</p>
-
-<h4>13. Use with the GNU Affero General Public License.</h4>
-
-<p>Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.</p>
-
-<h4>14. Revised Versions of this License.</h4>
-
-<p>The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.</p>
-
-<p>Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License &ldquo;or any later version&rdquo; applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.</p>
-
-<p>If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy&#39;s
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.</p>
-
-<p>Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.</p>
-
-<h4>15. Disclaimer of Warranty.</h4>
-
-<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
-
-<h4>16. Limitation of Liability.</h4>
-
-<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.</p>
-
-<h4>17. Interpretation of Sections 15 and 16.</h4>
-
-<p>If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.</p>
-
-<p>END OF TERMS AND CONDITIONS</p>
-
-<h3>How to Apply These Terms to Your New Programs</h3>
-
-<p>If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.</p>
-
-<p>To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the &ldquo;copyright&rdquo; line and a pointer to where the full notice is found.</p>
-
-<pre>    &lt;one line to give the program&#39;s name and a brief idea of what it does.&gt;
-    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
-</pre>
-
-<p>Also add information on how to contact you by electronic and paper mail.</p>
-
-<p>If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:</p>
-
-<pre>    &lt;program&gt;  Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w&#39;.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c&#39; for details.
-</pre>
-
-<p>The hypothetical commands `show w&#39; and `show c&#39; should show the appropriate
-parts of the General Public License.  Of course, your program&#39;s commands
-might be different; for a GUI interface, you would use an &ldquo;about box&rdquo;.</p>
-
-<p>You should also get your employer (if you work as a programmer) or school,
-if any, to sign a &ldquo;copyright disclaimer&rdquo; for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-&lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</p>
-
-<p>The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-&lt;<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>&gt;.</p>

+ 0 - 683
application/resources/text/LICENSE_GPLV3__ES

@@ -1,683 +0,0 @@
-<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
-<p style="text-align: center;">Version 3, 29 June 2007</p>
-
-<p>Copyright &copy; 2007 Free Software Foundation, Inc.
- &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.</p>
-
-<h3>Preamble</h3>
-
-<p>The GNU General Public License is a free, copyleft license for
-software and other kinds of works.</p>
-
-<p>The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.</p>
-
-<p>When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.</p>
-
-<p>To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.</p>
-
-<p>For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.</p>
-
-<p>Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.</p>
-
-<p>For the developers&#39; and authors&#39; protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users&#39; and
-authors&#39; sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.</p>
-
-<p>Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users&#39; freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.</p>
-
-<p>Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.</p>
-
-<p>The precise terms and conditions for copying, distribution and
-modification follow.</p>
-
-<h3>TERMS AND CONDITIONS</h3>
-
-<h4>0. Definitions.</h4>
-
-<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
-
-<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.</p>
- 
-<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
-&ldquo;recipients&rdquo; may be individuals or organizations.</p>
-
-<p>To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a &ldquo;modified version&rdquo; of the
-earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
-
-<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
-on the Program.</p>
-
-<p>To &ldquo;propagate&rdquo; a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.</p>
-
-<p>To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.</p>
-
-<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.</p>
-
-<h4>1. Source Code.</h4>
-
-<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
-for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
-form of a work.</p>
-
-<p>A &ldquo;Standard Interface&rdquo; means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.</p>
-
-<p>The &ldquo;System Libraries&rdquo; of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-&ldquo;Major Component&rdquo;, in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.</p>
-
-<p>The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work&#39;s
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.</p>
-
-<p>The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.</p>
-
-<p>The Corresponding Source for a work in source code form is that
-same work.</p>
-
-<h4>2. Basic Permissions.</h4>
-
-<p>All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.</p>
-
-<p>You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.</p>
-
-<p>Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.</p>
-
-<h4>3. Protecting Users&#39; Legal Rights From Anti-Circumvention Law.</h4>
-
-<p>No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.</p>
-
-<p>When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work&#39;s
-users, your or third parties&#39; legal rights to forbid circumvention of
-technological measures.</p>
-
-<h4>4. Conveying Verbatim Copies.</h4>
-
-<p>You may convey verbatim copies of the Program&#39;s source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.</p>
-
-<p>You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.</p>
-
-<h4>5. Conveying Modified Source Versions.</h4>
-
-<p>You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:</p>
-
-<ul>
-<li>a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.</li>
-
-<li>b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    &ldquo;keep intact all notices&rdquo;.</li>
-
-<li>c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.</li>
-
-<li>d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.</li>
-</ul>
-
-<p>A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-&ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation&#39;s users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.</p>
-
-<h4>6. Conveying Non-Source Forms.</h4>
-
-<p>You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:</p>
-
-<ul>
-<li>a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.</li>
-
-<li>b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.</li>
-
-<li>c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.</li>
-
-<li>d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.</li>
-
-<li>e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.</li>
-</ul>
-
-<p>A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.</p>
-
-<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, &ldquo;normally used&rdquo; refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.</p>
-
-<p>&ldquo;Installation Information&rdquo; for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.</p>
-
-<p>If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).</p>
-
-<p>The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.</p>
-
-<p>Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.</p>
-
-<h4>7. Additional Terms.</h4>
-
-<p>&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.</p>
-
-<p>When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.</p>
-
-<p>Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:</p>
-
-<ul>
-<li>a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or</li>
-
-<li>b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or</li>
-
-<li>c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or</li>
-
-<li>d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or</li>
-
-<li>e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or</li>
-
-<li>f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.</li>
-</ul>
-
-<p>All other non-permissive additional terms are considered &ldquo;further
-restrictions&rdquo; within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.</p>
-
-<p>If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.</p>
-
-<p>Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.</p>
-
-<h4>8. Termination.</h4>
-
-<p>You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).</p>
-
-<p>However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.</p>
-
-<p>Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.</p>
-
-<p>Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.</p>
-
-<h4>9. Acceptance Not Required for Having Copies.</h4>
-
-<p>You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.</p>
-
-<h4>10. Automatic Licensing of Downstream Recipients.</h4>
-
-<p>Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.</p>
-
-<p>An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party&#39;s predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.</p>
-
-<p>You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.</p>
-
-<h4>11. Patents.</h4>
-
-<p>A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor&#39;s &ldquo;contributor version&rdquo;.</p>
-
-<p>A contributor&#39;s &ldquo;essential patent claims&rdquo; are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, &ldquo;control&rdquo; includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.</p>
-
-<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor&#39;s essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.</p>
-
-<p>In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To &ldquo;grant&rdquo; such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.</p>
-
-<p>If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  &ldquo;Knowingly relying&rdquo; means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient&#39;s use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.</p>
-  
-<p>If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.</p>
-
-<p>A patent license is &ldquo;discriminatory&rdquo; if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.</p>
-
-<p>Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.</p>
-
-<h4>12. No Surrender of Others&#39; Freedom.</h4>
-
-<p>If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.</p>
-
-<h4>13. Use with the GNU Affero General Public License.</h4>
-
-<p>Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.</p>
-
-<h4>14. Revised Versions of this License.</h4>
-
-<p>The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.</p>
-
-<p>Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License &ldquo;or any later version&rdquo; applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.</p>
-
-<p>If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy&#39;s
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.</p>
-
-<p>Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.</p>
-
-<h4>15. Disclaimer of Warranty.</h4>
-
-<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
-
-<h4>16. Limitation of Liability.</h4>
-
-<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.</p>
-
-<h4>17. Interpretation of Sections 15 and 16.</h4>
-
-<p>If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.</p>
-
-<p>END OF TERMS AND CONDITIONS</p>
-
-<h3>How to Apply These Terms to Your New Programs</h3>
-
-<p>If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.</p>
-
-<p>To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the &ldquo;copyright&rdquo; line and a pointer to where the full notice is found.</p>
-
-<pre>    &lt;one line to give the program&#39;s name and a brief idea of what it does.&gt;
-    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
-</pre>
-
-<p>Also add information on how to contact you by electronic and paper mail.</p>
-
-<p>If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:</p>
-
-<pre>    &lt;program&gt;  Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w&#39;.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c&#39; for details.
-</pre>
-
-<p>The hypothetical commands `show w&#39; and `show c&#39; should show the appropriate
-parts of the General Public License.  Of course, your program&#39;s commands
-might be different; for a GUI interface, you would use an &ldquo;about box&rdquo;.</p>
-
-<p>You should also get your employer (if you work as a programmer) or school,
-if any, to sign a &ldquo;copyright disclaimer&rdquo; for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-&lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</p>
-
-<p>The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-&lt;<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>&gt;.</p>

+ 0 - 683
application/resources/text/LICENSE_GPLV3__EU

@@ -1,683 +0,0 @@
-<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
-<p style="text-align: center;">Version 3, 29 June 2007</p>
-
-<p>Copyright &copy; 2007 Free Software Foundation, Inc.
- &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.</p>
-
-<h3>Preamble</h3>
-
-<p>The GNU General Public License is a free, copyleft license for
-software and other kinds of works.</p>
-
-<p>The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.</p>
-
-<p>When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.</p>
-
-<p>To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.</p>
-
-<p>For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.</p>
-
-<p>Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.</p>
-
-<p>For the developers&#39; and authors&#39; protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users&#39; and
-authors&#39; sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.</p>
-
-<p>Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users&#39; freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.</p>
-
-<p>Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.</p>
-
-<p>The precise terms and conditions for copying, distribution and
-modification follow.</p>
-
-<h3>TERMS AND CONDITIONS</h3>
-
-<h4>0. Definitions.</h4>
-
-<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
-
-<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.</p>
- 
-<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
-&ldquo;recipients&rdquo; may be individuals or organizations.</p>
-
-<p>To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a &ldquo;modified version&rdquo; of the
-earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
-
-<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
-on the Program.</p>
-
-<p>To &ldquo;propagate&rdquo; a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.</p>
-
-<p>To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.</p>
-
-<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.</p>
-
-<h4>1. Source Code.</h4>
-
-<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
-for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
-form of a work.</p>
-
-<p>A &ldquo;Standard Interface&rdquo; means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.</p>
-
-<p>The &ldquo;System Libraries&rdquo; of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-&ldquo;Major Component&rdquo;, in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.</p>
-
-<p>The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work&#39;s
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.</p>
-
-<p>The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.</p>
-
-<p>The Corresponding Source for a work in source code form is that
-same work.</p>
-
-<h4>2. Basic Permissions.</h4>
-
-<p>All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.</p>
-
-<p>You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.</p>
-
-<p>Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.</p>
-
-<h4>3. Protecting Users&#39; Legal Rights From Anti-Circumvention Law.</h4>
-
-<p>No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.</p>
-
-<p>When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work&#39;s
-users, your or third parties&#39; legal rights to forbid circumvention of
-technological measures.</p>
-
-<h4>4. Conveying Verbatim Copies.</h4>
-
-<p>You may convey verbatim copies of the Program&#39;s source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.</p>
-
-<p>You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.</p>
-
-<h4>5. Conveying Modified Source Versions.</h4>
-
-<p>You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:</p>
-
-<ul>
-<li>a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.</li>
-
-<li>b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    &ldquo;keep intact all notices&rdquo;.</li>
-
-<li>c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.</li>
-
-<li>d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.</li>
-</ul>
-
-<p>A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-&ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation&#39;s users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.</p>
-
-<h4>6. Conveying Non-Source Forms.</h4>
-
-<p>You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:</p>
-
-<ul>
-<li>a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.</li>
-
-<li>b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.</li>
-
-<li>c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.</li>
-
-<li>d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.</li>
-
-<li>e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.</li>
-</ul>
-
-<p>A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.</p>
-
-<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, &ldquo;normally used&rdquo; refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.</p>
-
-<p>&ldquo;Installation Information&rdquo; for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.</p>
-
-<p>If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).</p>
-
-<p>The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.</p>
-
-<p>Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.</p>
-
-<h4>7. Additional Terms.</h4>
-
-<p>&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.</p>
-
-<p>When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.</p>
-
-<p>Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:</p>
-
-<ul>
-<li>a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or</li>
-
-<li>b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or</li>
-
-<li>c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or</li>
-
-<li>d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or</li>
-
-<li>e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or</li>
-
-<li>f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.</li>
-</ul>
-
-<p>All other non-permissive additional terms are considered &ldquo;further
-restrictions&rdquo; within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.</p>
-
-<p>If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.</p>
-
-<p>Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.</p>
-
-<h4>8. Termination.</h4>
-
-<p>You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).</p>
-
-<p>However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.</p>
-
-<p>Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.</p>
-
-<p>Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.</p>
-
-<h4>9. Acceptance Not Required for Having Copies.</h4>
-
-<p>You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.</p>
-
-<h4>10. Automatic Licensing of Downstream Recipients.</h4>
-
-<p>Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.</p>
-
-<p>An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party&#39;s predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.</p>
-
-<p>You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.</p>
-
-<h4>11. Patents.</h4>
-
-<p>A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor&#39;s &ldquo;contributor version&rdquo;.</p>
-
-<p>A contributor&#39;s &ldquo;essential patent claims&rdquo; are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, &ldquo;control&rdquo; includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.</p>
-
-<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor&#39;s essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.</p>
-
-<p>In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To &ldquo;grant&rdquo; such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.</p>
-
-<p>If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  &ldquo;Knowingly relying&rdquo; means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient&#39;s use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.</p>
-  
-<p>If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.</p>
-
-<p>A patent license is &ldquo;discriminatory&rdquo; if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.</p>
-
-<p>Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.</p>
-
-<h4>12. No Surrender of Others&#39; Freedom.</h4>
-
-<p>If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.</p>
-
-<h4>13. Use with the GNU Affero General Public License.</h4>
-
-<p>Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.</p>
-
-<h4>14. Revised Versions of this License.</h4>
-
-<p>The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.</p>
-
-<p>Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License &ldquo;or any later version&rdquo; applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.</p>
-
-<p>If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy&#39;s
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.</p>
-
-<p>Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.</p>
-
-<h4>15. Disclaimer of Warranty.</h4>
-
-<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
-
-<h4>16. Limitation of Liability.</h4>
-
-<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.</p>
-
-<h4>17. Interpretation of Sections 15 and 16.</h4>
-
-<p>If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.</p>
-
-<p>END OF TERMS AND CONDITIONS</p>
-
-<h3>How to Apply These Terms to Your New Programs</h3>
-
-<p>If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.</p>
-
-<p>To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the &ldquo;copyright&rdquo; line and a pointer to where the full notice is found.</p>
-
-<pre>    &lt;one line to give the program&#39;s name and a brief idea of what it does.&gt;
-    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
-</pre>
-
-<p>Also add information on how to contact you by electronic and paper mail.</p>
-
-<p>If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:</p>
-
-<pre>    &lt;program&gt;  Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w&#39;.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c&#39; for details.
-</pre>
-
-<p>The hypothetical commands `show w&#39; and `show c&#39; should show the appropriate
-parts of the General Public License.  Of course, your program&#39;s commands
-might be different; for a GUI interface, you would use an &ldquo;about box&rdquo;.</p>
-
-<p>You should also get your employer (if you work as a programmer) or school,
-if any, to sign a &ldquo;copyright disclaimer&rdquo; for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-&lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</p>
-
-<p>The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-&lt;<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>&gt;.</p>

+ 0 - 12
application/resources/text/PROJECT_GM_TEXT__EN

@@ -1,12 +0,0 @@
-Gasteizko Margolariak is a Cultural Association and a Cuadrilla de Blusas y Neskas in Vitoria-Gasteiz.
-<br/><br/>
-The app suite includes:
-<p style="margin:0.7em 1.5em; text-indent: 1em;">
-    <span style="font-weight: bold;">Public website</span> with information for it&lsquo;s members. During the Festivals it allows them to check the planning, the activities around the city and the rela time location of the Cuadrilla. During the rest of the year it is uses to publish news and inteesting info to it &lsquo;s members.
-</p>
-<p style="margin:0.7em 1.5em; text-indent: 1em;">
-    <span style="font-weight: bold;">Private site</span> for internal management. It allows the association directors to handle calendars, schedules, member lists...
-</p>
-<p style="margin:0.7em 1.5em; text-indent: 1em;">
-    <span style="font-weight: bold;">Android and iOS</span> for the members. They sync the website contents in real time and use the geolocalization features to recomend events during the festivals, broadcast the realtime location of Gasteizko Margolariak and to receive notifications.
-</p>

+ 0 - 12
application/resources/text/PROJECT_GM_TEXT__ES

@@ -1,12 +0,0 @@
-Gasteizko Margolariak es una Asociaci&oacute;n Cultural y una Cuadrilla de Blusas y Neskas en Vitoria-Gasteiz.
-<br/><br/>
-Este aplicativo incluye:
-<p style="margin:0.7em 1.5em; text-indent: 1em;">
-    <span style="font-weight: bold;">Sitio web p&uacute;blico</span> con informaci&ooacute;n para socios. Durante las fiestas permite consultar el programa, las actividades en la ciudad y conocer la localizaci&oacute; en tiempo real de la cuadrilla. Durante el resto del a&ntilde;o presenta informaci&oacute;n y noticias para socios. Adem&aacute;s incluye una API para las aplicaciones.
-</p>
-<p style="margin:0.7em 1.5em; text-indent: 1em;">
-    <span style="font-weight: bold;">Sitio web privado</span> para gesti&oacute;n interna. Permite a la direcci&oacute;n de la Asociaci&oacute;n configurar los calendarios, el programa de fiestas, el registro de socios...
-</p>
-<p style="margin:0.7em 1.5em; text-indent: 1em;">
-    <span style="font-weight: bold;">Aplicaci&oacute;nes para Android e iOS</span> para los socios. Permiten la sincronizaci&oacute;n en tiempo real con el contenido del sitio web, adem&aacute;s de hacer uso de la funci&oacute; de geolocalizaci&oacute;n para recomendar eeventos durante las fiestas, anunciar la ubicaci&oacute;n de la cuadrilla y recibir notificaciones.
-</p>

+ 0 - 12
application/resources/text/PROJECT_GM_TEXT__EU

@@ -1,12 +0,0 @@
-Gasteizko Margolariak es una Asociaci&oacute;n Cultural y una Cuadrilla de Blusas y Neskas en Vitoria-Gasteiz.
-<br/><br/>
-Este aplicativo incluye:
-<p style="margin:1.5em;">
-    <span style="font-weight: bold;">Sitio web p&uacute;blico</span> con informaci&ooacute;n para socios. Durante las fiestas permite consultar el programa, las actividades en la ciudad y conocer la localizaci&oacute; en tiempo real de la cuadrilla. Durante el resto del a&ntilde;o presenta informaci&oacute;n y noticias para socios. Adem&aacute;s incluye una API para las aplicaciones.
-</p>
-<p style="margin:1.5em;">
-    <span style="font-weight: bold;">Sitio web privado</span> para gesti&oacute;n interna. Permite a la direcci&oacute;n de la Asociaci&oacute;n configurar los calendarios, el programa de fiestas, el registro de socios...
-</p>
-<p style="margin:1.5em;">
-    <span style="font-weight: bold;">Aplicaci&oacute;nes para Android e iOS</span> para los socios. Permiten la sincronizaci&oacute;n en tiempo real con el contenido del sitio web, adem&aacute;s de hacer uso de la funci&oacute; de geolocalizaci&oacute;n para recomendar eeventos durante las fiestas, anunciar la ubicaci&oacute;n de la cuadrilla y recibir notificaciones.
-</p>

+ 0 - 1
application/resources/text/USER_TEXT__EN

@@ -1 +0,0 @@
-Programador vers&aacute;til, con 3 a&ntilde;os de experiencia profesional, acostumbrado a trabajar tanto en equipos y proyectos grandes como en tareas individuales. Buena gesti&oacute;n del tiempo y gran capacidad de adaptaci&oacute;n a nuevos entornos y tecnolog&iacute;as.

+ 0 - 1
application/resources/text/USER_TEXT__ES

@@ -1 +0,0 @@
-Programador vers&aacute;til, con 3 a&ntilde;os de experiencia profesional, acostumbrado a trabajar tanto en equipos y proyectos grandes como en tareas individuales. Buena gesti&oacute;n del tiempo y gran capacidad de adaptaci&oacute;n a nuevos entornos y tecnolog&iacute;as.

+ 0 - 1
application/resources/text/USER_TEXT__EU

@@ -1 +0,0 @@
-Programador vers&aacute;til, con 3 a&ntilde;os de experiencia profesional, acostumbrado a trabajar tanto en equipos y proyectos grandes como en tareas individuales. Buena gesti&oacute;n del tiempo y gran capacidad de adaptaci&oacute;n a nuevos entornos y tecnolog&iacute;as.

+ 2 - 4
application/util/Log.php

@@ -37,9 +37,7 @@ final class Log{
      */
     private static function format($tag, $message, $code = null){
         $msg = "[" . $tag . "][" . date("c") . "]";
-        if (is_int($code)){
-            $msg .= "[$code]";
-        }
+        if (is_int($code)) $msg .= "[$code]";
         $msg .= " $message\n";
         return $msg;
     }
@@ -121,4 +119,4 @@ final class Log{
         $msg = Log::format("FATAL", $message, $code);
         file_put_contents($config["file"], $msg, FILE_APPEND);
     }
-}
+}

+ 17 - 6
application/util/URL.php

@@ -30,22 +30,32 @@ final class URL{
     /**
      * Profile page.
      */
-    const PROFILE = BASE_URL . "/profile/";
+    const PROFILE = BASE_URL . "profile/";
     
     /**
      * Projects page.
      */
-    const PROJECTS = BASE_URL . "/projects/";
+    const PROJECTS = BASE_URL . "projects/";
 
     /**
      * Fonts full url (includes final '/').
      */
-    const FONTS = BASE_URL . "/fonts/";
+    const FONTS = BASE_URL . "fonts/";
 
     /**
      * CSS full url (includes final '/').
      */
     const CSS = BASE_URL . "css/";
+    
+    /**
+     * JS full url (includes final '/').
+     */
+    const JS = BASE_URL . "js/";
+
+    /**
+     * Help full url (includes final '/').
+     */
+    const HELP = BASE_URL . "help/";
 
     /**
      * URLs to image resources.
@@ -53,9 +63,10 @@ final class URL{
     const IMG = array(
         "BASE" => BASE_URL . "img/",
         "UNKNOWN" => BASE_URL . "img/unknown.png",
-        "ICON" => BASE_URL . "img/icon/",
-        "LOGO" => BASE_URL . "img/logo/",
+        "ICON" => BASE_URL . "img/layout/icon/",
+        "CONTROL" => BASE_URL . "img/layout/control/",
+        "LOGO" => BASE_URL . "img/layout/logo/",
         "LAYOUT" => BASE_URL . "img/layout/",
         "CONTENT" => BASE_URL . "img/content/",
     );
-}
+}

+ 7 - 18
application/view/error.php

@@ -1,33 +1,22 @@
 <!DOCTYPE html>
-<html lang='<?=$lang?>'>
+<html lang='<?=get_context()->get_lang()?>'>
     <head>
-        <meta content='text/html; charset=utf-8' http-equiv='content-type'/>
-        <meta charset='utf-8'/>
-        <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'>
-        <title><?=$page->title?></title>
-        <link rel='shortcut icon' href='<?=$static["layout"]?>/layout/logo/logo.svg'/>
-        <!-- CSS files -->
-        <link rel='stylesheet' type='text/css' href='<?=$static["css"]?>ui.css'/>
-        <link rel='stylesheet' type='text/css' href='<?=$static["css"]?>error.css'/>
-        <!-- Script files -->
-        <script type="text/javascript" src="<?=$static["js"]?>ui.js"></script>
-        <!-- No meta -->
-        <meta name="robots" content="noindex follow"/>
+        <?=$page->generate_head()?>
     </head>
     <body>
 <?php
-        include $path["inc"] . "header.php";
+        include __DIR__ . "/inc/header.php";
 ?>
         <main>
             <section>
-                <h3><?=text($page, "ERROR_ERROR");?></h3>
+                <h3><?=Text::get("ERROR_ERROR")?></h3>
                 <div id='left'>
                     <p id='code'>
                         <?=$page->code?>
                     </p>
                     <p>
-                        <span><?=text($page, "ERROR_ERROR");?></span>
-                        <span><?=text($page, "ERROR_CODE");?></span>
+                        <span><?=Text::get("ERROR_ERROR")?></span>
+                        <span><?=Text::get("ERROR_CODE")?></span>
                     </p>
                 </div>
                 <div id='right'>
@@ -50,7 +39,7 @@
             </section>
         </main>
 <?php
-        include $path["inc"] . "footer.php";
+        include __DIR__ . "/inc/footer.php";
 ?>
     </body>
 </html>

+ 43 - 40
application/view/help.php

@@ -1,59 +1,62 @@
+<?php
+/**
+ * Project view.
+ *
+ * Contains the view layout and some code to present the data.
+ *
+ * @author Iñigo Valentin <i@inigovalentin.com>
+ * @license https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License V3
+ * @package IV
+ * @category View
+ * @property Help_Page $page The page model.
+ * @var Help_Page $page The page model.
+ */
+?>
 <!DOCTYPE html>
-<html lang='<?=$page->lang?>'>
+<html lang='<?=get_context()->get_lang()?>'>
     <head>
-        <meta content='text/html; charset=utf-8' http-equiv='content-type'/>
-        <meta charset='utf-8'/>
-        <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
-        <title><?=$page->title?></title>
-        <link rel='shortcut icon' href='<?=$page->favicon?>'/>
-        <!-- CSS files -->
-        <link rel='stylesheet' type='text/css' href='<?=$static["css"]?>ui.css'/>
-        <link rel='stylesheet' type='text/css' href='<?=$static["css"]?>help.css'/>
-        <!-- Script files -->
-        <script type="text/javascript" src="<?=$static["js"]?>ui.js"></script>
-        <script type="text/javascript" src="<?=$static["js"]?>help.js"></script>
-        <!-- Meta tags -->
-        <link rel='canonical' href='<?=$page->canonical?>'/>
-        <link rel='author' href='<?=$page->author?>'/>
-        <link rel='publisher' href='<?=$page->author?>'/>
-        <meta name='description' content='<?=$page->description?>'/>
-        <meta property='og:title' content='<?=$page->title?>'/>
-        <meta property='og:url' content='<?=$page->canonical?>'/>
-        <meta property='og:description' content='<?=$page->description?>'/>
-        <meta property='og:image' content='<?=$page->icon?>'/>
-        <meta property='og:site_name' content='<?=$page->name?>'/>
-        <meta property='og:type' content='website'/>
-        <meta property='og:locale' content='<?=$page->lang?>'/>
-        <meta name='twitter:card' content='summary'/>
-        <meta name='twitter:title' content='<?=$page->title?>'/>
-        <meta name='twitter:description' content='<?=$page->description?>'/>
-        <meta name='twitter:image' content='<?=$page->icon?>'/>
-        <meta name='twitter:url' content='<?=$page->canonical?>'/>
-        <meta name='robots' content='index follow'/>
+        <?=$page->generate_head()?>
     </head>
     <body>
 <?php
-        include $path["inc"] . "header.php";
+        include __DIR__ . "/inc/header.php";
 ?>
         <main>
 <?php
-            foreach($page->help as $key=>$help) {
+            $sections = ["info", "license", "privacy", "cookies"];
+            $first = true;
+            foreach($sections as $section) {
 ?>
-                <section id='<?=$key?>' class='help'>
-                    <h3 class='pointer' onClick='toggleHelp("<?=$key?>");'>
-                        <img class='slider' src='<?=$static["layout"]?>control/slid_r.svg' alt='>'/>
-                        <?=$help["title"]?>
+                <section id='<?=$section?>' class='help <?=$first ? "selected" : ""?>'>
+                    <h3 class='pointer' onClick='toggleHelp("<?=$section?>");'>
+                        <img class='slider' src='<?=URL::IMG["CONTROL"]?>slid_r.svg' alt='>'/>
+                        <?=$page->get_section_title($section)?>
                     </h3>
-                    <p>
-                        <?=$help["text"]?>
-                    </p>
+                    <div>
+                        <?=$page->get_section_text($section)?>
+                    </div>
                 </section>
 <?php
+                $first = false;
             }
 ?>
         </main>
+        <div id='policy_cover'></div>
+        <section id='policy'>
+            <h3>
+                <?=TEXT::get("HELP_POLICY")?>
+                <div id='policy_close'>
+                    <a onClick='closePolicy();'>
+                        <img src='<?=URL::IMG["LAYOUT"]?>control/close.svg'/>
+                    </a>
+                </div>
+            </h3>
+            <div>
+                <?=get_context()->get_user()->get_text("POLICY")?>
+            </div>
+        </section>
 <?php
-        include $path["inc"] . "footer.php";
+        include __DIR__ . "/inc/footer.php";
 ?>
     </body>
 </html>

+ 47 - 15
application/view/home.php

@@ -13,7 +13,7 @@
  */
 ?>
 <!DOCTYPE html>
-<html lang='en'>
+<html lang='<?=get_context()->get_lang()?>'>
     <head>
         <?=$page->generate_head()?>
     </head>
@@ -26,26 +26,58 @@
         <main>
             <section id='profile'>
                 <h3>
-                    <?=$page->get_title()?>
+                    <?=get_context()->get_user()->get_display_name()?>
                 </h3>
                 <!-- TODO: Profile form model -->
                 <article>
+                    <h4 id='tagline'><?=get_context()->get_user()->get_text("TAGLINE")?></h4>
                     <img
                       id='profile_image'
-                      srcset='<?=HTML::srcset("profile/profile.png")?>'
-                      src='<?=URL::IMG["CONTENT"]?>profile/x400/profile.png'
-                      alt='<?=TEXT::get("USER_NAME");?>'
-                      title='<?=TEXT::get("USER_NAME");?>'
+                      srcset='<?=HTML::srcset(get_context()->get_user()->get_image())?>'
+                      src='<?=URL::IMG["CONTENT"] . 'profile/' . get_context()->get_user()->get_image()?>'
+                      alt='<?=get_context()->get_user()->get_display_name()?>'
+                      title='<?=get_context()->get_user()->get_display_name()?>'
                     />
-                    <div id='profile_content'>
-                        <h4 id='tagline'><?=TEXT::get("USER_TAGLINE");?></h4>
-                        <p id='bio'><?=TEXT::get("USER_BIO");?></p>
+                    <table id='profile_table'>
+                        <tr>
+<?php
+                            $i = 0;
+                            $total = sizeof(get_context()->get_user()->get_social());
+                            if (get_context()->get_user()->get_first_email() != null){
+                                $i ++;
+                                $total ++;
+?>
+                                <td class='social'>
+                                    <a target='_blank' title='eMail' href='mailto:<?=get_context()->get_user()->get_first_email()?>'>
+                                        <img src='<?=URL::IMG["LAYOUT"]?>social/email.svg' alt='eMail' title='eMail'/>
+                                    </a>
+                                </td>
+<?php
+                            }
+                            foreach (get_context()->get_user()->get_social() as $social){
+?>
+                                <td class='social'>
+                                    <a target='_blank' title='<?=$social->get_text()?>' href='<?=$social->get_url()?>'>
+                                        <img src='<?=URL::IMG["LAYOUT"]?>social/<?=$social->get_logo()?>' title='<?=$social->get_text()?>' alt='<?=$social->get_site_name()?>'/>
+                                    </a>
+                                </td>
+<?php
+                                $i ++;
+                                if ($total > 3 && $i >= $total / 2){
+                                    $i = 0;
+?>
+                                    </tr>
+                                    <tr>
+<?php
+                                }
+                            }
+?>
+                        </tr>
+                    </table>
+<!--                     <div id='profile_content'> -->
+                        <p id='bio'><?=get_context()->get_user()->get_text("BIO")?></p>
                     </div>
                     <div class='buttons'>
-                        <a class='a_button' title='eMail' href='mailto:i@inigovalentin.com'>
-                            <?=TEXT::get("INDEX_PROFILE_MAIL");?>
-                            <img class='footer_social_icon' src='<?=URL::IMG["LAYOUT"]?>social/email.svg' alt='eMail' title='eMail'/>
-                        </a>
                         <a class='a_button' href='<?=URL::PROFILE?>'>
                             <?=TEXT::get("INDEX_PROFILE_MORE");?>
                         </a>
@@ -65,14 +97,14 @@
 <?php
                             if (strlen($project->get_logo()) > 0){
 ?>
-                                <td>
+                                <td class='logo'>
                                     <a href='<?=URL::PROJECTS . $project->get_permalink()?>'>
                                         <img
                                           class='project_image'
                                           alt='<?=TEXT::get($project->get_title())?>'
                                           title='<?=TEXT::get($project->get_title())?>'
                                           srcset='<?=HTML::srcset("project/" . $project->get_logo())?>'
-                                          src='<?=URL::IMG["CONTENT"]?>project/x200/<?=$project->get_logo()?>'
+                                          src='<?=URL::IMG["CONTENT"]?>project/<?=$project->get_logo()?>'
                                         />
                                     </a>
                                 </td>

+ 21 - 16
application/view/inc/footer.php

@@ -7,37 +7,42 @@
                 <span id='footer_follow' class='desktop'>
                     <?=TEXT::get("FOOTER_FOLLOW");?>
                 </span>
-                <a target='_blank' title='eMail' href='mailto:i@inigovalentin.com'>
-                    <img class='footer_social_icon' src='<?=URL::IMG["LAYOUT"]?>social/email.svg' alt='eMail' title='eMail'/>
-                </a>
-                <a target='_blank' title='Telegram' href='https://telegram.me/InigoValentin'>
-                    <img class='footer_social_icon' src='<?=URL::IMG["LAYOUT"]?>social/telegram.svg' alt='Telegram' title='Telegram'/>
-                </a>
-                <a target='_blank' title='Github' href='https://github.com/InigoValentin'>
-                    <img class='footer_social_icon' src='<?=URL::IMG["LAYOUT"]?>social/github.svg' alt='Github' title='Github'/>
-                </a>
-                <a target='_blank' title='LinkedIn' href='https://www.linkedin.com/in/ivalentin'>
-                    <img class='footer_social_icon' src='<?=URL::IMG["LAYOUT"]?>social/linkedin.svg' alt='LinkedIn' title='LinkedIn'/>
-                </a>
+<?php
+                if (get_context()->get_user()->get_first_email() != null){
+?>
+                    <a target='_blank' title='eMail' href='mailto:<?=get_context()->get_user()->get_first_email()?>'>
+                        <img class='footer_social_icon' src='<?=URL::IMG["LAYOUT"]?>social/email.svg' alt='eMail' title='eMail'/>
+                    </a>
+<?php
+                }
+                foreach (get_context()->get_user()->get_social() as $social){
+?>
+                    <a target='_blank' title='<?=$social->get_text()?>' href='<?=$social->get_url()?>'>
+                        <img class='footer_social_icon' src='<?=URL::IMG["LAYOUT"]?>social/<?=$social->get_logo()?>' title='<?=$social->get_text()?>' alt='<?=$social->get_site_name()?>'/>
+                    </a>
+<?php
+                }
+?>
             </td>
             <td id='footer_center'>
                 <?=str_replace("#YEAR#", date("Y"), TEXT::get("FOOTER_COPY"));?>
             </td>
             <td id='footer_right'>
-                <a id='footer_help' href='<?=URL::BASE?>/help/'>
+                <a id='footer_help' href='<?=URL::BASE?>help/'>
                     <?=TEXT::get("FOOTER_HELP");?>
                 </a>
                 <br/><br/>
 <?php
-                foreach (get_context()->get_available_langs() as $lang){
+                foreach (get_context()->get_available_langs() as $code){
+                    $lang = new Lang($code);
                     $uri = $_SERVER["REQUEST_URI"];
                     if (substr($uri, 3, 1) == '/'){
                         $uri = substr($uri, 3);
                     }
-                    $dest = URL::BASE . "/" . $lang->code . $uri;
+                    $dest = URL::BASE . $lang->get_code() . $uri;
 ?>
                     <a class='lang' href='<?=$dest?>'>
-                        <img src='<?=URL::IMG["LAYOUT"]?>lang/<?=$lang->code?>.svg' alt='<?=$lang->name?>' title='<?=$lang->name?>'/>
+                        <img src='<?=URL::IMG["LAYOUT"]?>lang/<?=$lang->get_code()?>.svg' alt='<?=$lang->get_name()?>' title='<?=$lang->get_name()?>'/>
                     </a>
 <?php
                 }

+ 3 - 4
application/view/inc/header.php

@@ -1,18 +1,17 @@
-<?php global $static?>
 <header>
     <div id='logo'>
         inigoValentin
     </div>
     <nav>
-        <a href='<?=URL::BASE?>/'>
+        <a href='<?=URL::BASE?>'>
             <img src='<?=URL::IMG["LAYOUT"]?>icon/home.svg'/>
             <?=TEXT::get("SECTION_HOME")?>
         </a>
-        <a href='<?=URL::BASE?>/profile/'>
+        <a href='<?=URL::BASE?>profile/'>
             <img src='<?=URL::IMG["LAYOUT"]?>icon/profile.svg'/>
             <?=TEXT::get("SECTION_ME")?>
         </a>
-        <a href='<?=URL::BASE?>/project/'>
+        <a href='<?=URL::BASE?>project/'>
             <img src='<?=URL::IMG["LAYOUT"]?>icon/project.svg'/>
             <?=TEXT::get("SECTION_PROJECTS")?>
         </a>

+ 53 - 53
application/view/profile.php

@@ -1,80 +1,80 @@
+<?php
+/**
+ * Profile view.
+ *
+ * Contains the view layout and some code to present the data.
+ *
+ * @author Iñigo Valentin <i@inigovalentin.com>
+ * @license https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License V3
+ * @package IV
+ * @category View
+ * @property Profile_Page $page The page model.
+ * @var Profile_Page $page The page model.
+ */
+?>
 <!DOCTYPE html>
-<html lang='<?=$page->lang?>'>
+<html lang='<?=get_context()->get_lang()?>'>
     <head>
-        <meta content='text/html; charset=utf-8' http-equiv='content-type'/>
-        <meta charset='utf-8'/>
-        <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
-        <title><?=$page->title?></title>
-        <link rel='shortcut icon' href='<?=$page->favicon?>'/>
-        <!-- CSS files -->
-        <link rel='stylesheet' type='text/css' href='<?=$static["css"]?>ui.css'/>
-        <link rel='stylesheet' type='text/css' href='<?=$static["css"]?>profile.css'/>
-        <!-- Script files -->
-        <script type="text/javascript" src="<?=$static["js"]?>ui.js"></script>
-        <!-- Meta tags -->
-        <link rel='canonical' href='<?=$page->canonical?>'/>
-        <link rel='author' href='<?=$page->author?>'/>
-        <link rel='publisher' href='<?=$page->author?>'/>
-        <meta name='description' content='<?=$page->description?>'/>
-        <meta property='og:title' content='<?=$page->title?>'/>
-        <meta property='og:url' content='<?=$page->canonical?>'/>
-        <meta property='og:description' content='<?=$page->description?>'/>
-        <meta property='og:image' content='<?=$page->icon?>'/>
-        <meta property='og:site_name' content='<?=$page->name?>'/>
-        <meta property='og:type' content='website'/>
-        <meta property='og:locale' content='<?=$page->lang?>'/>
-        <meta name='twitter:card' content='summary'/>
-        <meta name='twitter:title' content='<?=$page->title?>'/>
-        <meta name='twitter:description' content='<?=$page->description?>'/>
-        <meta name='twitter:image' content='<?=$page->icon?>'/>
-        <meta name='twitter:url' content='<?=$page->canonical?>'/>
-        <meta name='robots' content='index follow'/>
+        <?=$page->generate_head()?>
     </head>
     <body>
 <?php
-        include $path["inc"] . "header.php";
+        include __DIR__ . "/inc/header.php";
 ?>
         <main>
             <section id='info'>
                 <h3>
-                    <?=text($page, "USER_NAME");?>
+                    <?=get_context()->get_user()->get_display_name()?>
                 </h3>
-                <img id='profile_image' srcset='<?=srcset("profile/profile.png")?>' src='<?=$static["content"]?>profile/x400/profile.png' alt='<?=text($page, "USER_NAME");?>' title='<?=text($page, "USER_NAME");?>' />
+                <img
+                  id='profile_image'
+                  srcset='<?=HTML::srcset("profile/" . get_context()->get_user()->get_image())?>'
+                  src='<?=URL::IMG["CONTENT"]?>profile/<?=get_context()->get_user()->get_image()?>'
+                  alt='<?=get_context()->get_user()->get_display_name()?>'
+                  title='<?=get_context()->get_user()->get_display_name()?>'
+                />
+                <h4>
+                    <?=get_context()->get_user()->get_text("TAGLINE")?>
+                </h4>
                 <div id='social'>
-                    <a target='_blank' title='eMail' href='mailto:i@inigovalentin.com'>
-                        <img class='footer_social_icon' src='<?=$static["layout"]?>social/email.svg' alt='eMail' title='eMail'/>
-                    </a>
-                    <a target='_blank' title='Telegram' href='https://telegram.me/InigoValentin'>
-                        <img class='footer_social_icon' src='<?=$static["layout"]?>social/telegram.svg' alt='Telegram' title='Telegram'/>
-                    </a>
-                    <a target='_blank' title='Github' href='https://github.com/InigoValentin'>
-                        <img class='footer_social_icon' src='<?=$static["layout"]?>social/github.svg' alt='Github' title='Github'/>
-                    </a>
-                    <a target='_blank' title='LinkedIn' href='https://www.linkedin.com/in/ivalentin'>
-                        <img class='footer_social_icon' src='<?=$static["layout"]?>social/linkedin.svg' alt='LinkedIn' title='LinkedIn'/>
-                    </a>
+<?php
+                    if (get_context()->get_user()->get_first_email() != null){
+?>
+                        <a target='_blank' title='eMail' href='mailto:<?=get_context()->get_user()->get_first_email()?>'>
+                            <img src='<?=URL::IMG["LAYOUT"]?>social/email.svg' alt='eMail' title='eMail'/>
+                        </a>
+<?php
+                    }
+                    foreach (get_context()->get_user()->get_social() as $social){
+?>
+                        <a target='_blank' title='<?=$social->get_text()?>' href='<?=$social->get_url()?>'>
+                            <img src='<?=URL::IMG["LAYOUT"]?>social/<?=$social->get_logo()?>' title='<?=$social->get_text()?>' alt='<?=$social->get_site_name()?>'/>
+                        </a>
+<?php
+                    }
+?>
                 </div>
             </section>
             <section id='about'>
                 <h3>
-                    <?=text($page, "PROFILE_DESCRIPTION");?>
+                    <?=Text::get("PROFILE_DESCRIPTION");?>
                 </h3>
                 <p>
-                    <?=text($page, "USER_TEXT");?>
+                    <?=get_context()->get_user()->get_text("TEXT")?>
                 </p>
                 <div id='cv_download'>
-                    <a class='a_button' target='_blank' href='<?=$static["cv"] . $page->main_cv->file?>'>
-                        <?=text($page, "PROFILE_CV");?>
+                    <a class='a_button' target='_blank' href='<?=$static["cv"] . $page->get_main_cv()->get_file()?>'>
+                        <?=Text::get("PROFILE_CV");?>
                     </a>
                     <details>
-                        <summary class='pointer'><?=text($page, "PROFILE_CV_LANG");?></summary>
+                        <summary class='pointer'><?=Text::get("PROFILE_CV_LANG");?></summary>
                         <ul>
 <?php
-                            for ($i = 1; $i < count($page->other_cv); $i ++) {
+                            for ($i = 1; $i < count($page->get_other_cvs()); $i ++) {
 ?>
                                 <li>
-                                    <a target='_blank' href='<?=$static["cv"] . $page->other_cv[$i]->file?>'>
-                                        <?=$page->other_cv[$i]->lang->name?>
+                                    <a target='_blank' href='<?=$static["cv"] . $page->get_other_cvs()[$i]->get_file()?>'>
+                                        <?=$page->get_other_cvs()[$i]->get_lang()->get_name()?>
                                     </a>
                                 </li>
 <?php
@@ -86,7 +86,7 @@
             </section>
         </main>
 <?php
-        include $path["inc"] . "footer.php";
+        include __DIR__ . "/inc/footer.php";
 ?>
     </body>
 </html>

+ 80 - 65
application/view/project.php

@@ -1,85 +1,93 @@
+<?php
+/**
+ * Project view.
+ *
+ * Contains the view layout and some code to present the data.
+ *
+ * @author Iñigo Valentin <i@inigovalentin.com>
+ * @license https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License V3
+ * @package IV
+ * @category View
+ * @property Project_Page $page The page model.
+ * @var Project_Page $page The page model.
+ */
+?>
 <!DOCTYPE html>
-<html lang='<?=$page->lang?>'>
+<html lang='<?=get_context()->get_lang()?>'>
     <head>
-        <meta content='text/html; charset=utf-8' http-equiv='content-type'/>
-        <meta charset='utf-8'/>
-        <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
-        <title><?=$page->title?></title>
-        <link rel='shortcut icon' href='<?=$page->favicon?>'/>
-        <!-- CSS files -->
-        <link rel='stylesheet' type='text/css' href='<?=$static["css"]?>ui.css'/>
-        <link rel='stylesheet' type='text/css' href='<?=$static["css"]?>project.css'/>
-        <!-- Script files -->
-        <script type="text/javascript" src="<?=$static["js"]?>ui.js"></script>
-        <script type="text/javascript" src="<?=$static["js"]?>project.js"></script>
-        <!-- Meta tags -->
-        <link rel='canonical' href='<?=$page->canonical?>'/>
-        <link rel='author' href='<?=$page->author?>'/>
-        <link rel='publisher' href='<?=$page->author?>'/>
-        <meta name='description' content='<?=$page->description?>'/>
-        <meta property='og:title' content='<?=$page->title?>'/>
-        <meta property='og:url' content='<?=$page->canonical?>'/>
-        <meta property='og:description' content='<?=$page->description?>'/>
-        <meta property='og:image' content='<?=$page->icon?>'/>
-        <meta property='og:site_name' content='<?=$page->name?>'/>
-        <meta property='og:type' content='website'/>
-        <meta property='og:locale' content='<?=$page->lang?>'/>
-        <meta name='twitter:card' content='summary'/>
-        <meta name='twitter:title' content='<?=$page->title?>'/>
-        <meta name='twitter:description' content='<?=$page->description?>'/>
-        <meta name='twitter:image' content='<?=$page->icon?>'/>
-        <meta name='twitter:url' content='<?=$page->canonical?>'/>
-        <meta name='robots' content='index follow'/>
+        <?=$page->generate_head()?>
     </head>
     <body>
 <?php
-        include $path["inc"] . "header.php";
+        include __DIR__ . "/inc/header.php";
 ?>
         <main>
             <section>
                 <h3>
-                    <?=$page->project->title?>
+                    <?=$page->get_project()->get_title()?>
                 </h3>
                 <article>
                     <div id='info_summary'>
                         <h4>
-                            <?=$page->project->header?>
+                            <?=$page->get_project()->get_header()?>
                         </h4>
-                        <p id='text'>
+                        <div id='text'>
+                            <?=$page->get_project()->get_text()?>
+                        </div>
 <?php
-                            if (strlen($page->project->logo) > 0){
+                        if ($page->get_project()->get_comment() != ""){
 ?>
-                                <img id='logo' src='<?=$static["content"]?>project/<?=$page->project->logo?>' title='<?=$page->project->title?>' alt='<?=$page->project->title?>'/>
+                            <div id='comment'>
+                                <div id='comment_title'>
+                                    <?=Text::compose("PROJECT_COMMENT", explode(" ", get_context()->get_user()->get_display_name()))?>
+                                </div>
+                                <?=$page->get_project()->get_comment()?>
+                            </div>
 <?php
-                            }
+                        }
 ?>
-                            <?=$page->project->text?>
-                        </p>
                     </div>
                     <div id='info_details'>
+<?php
+                        if (strlen($page->get_project()->get_logo()) > 0){
+?>
+                            <img
+                                id='logo'
+                                srcset='<?=HTML::srcset("project/" . $page->get_project()->get_logo())?>'
+                                src='<?=URL::IMG["CONTENT"]?>project/<?=$page->get_project()->get_logo()?>'
+                                title='<?=$page->get_project()->get_title()?>'
+                                alt='<?=$page->get_project()->get_title()?>'
+                            />
+<?php
+                        }
+?>
                         <div id='tags' class='details'>
 <?php
                             $str_tag = "";
-                            foreach($page->project->tag as $tag){
-                                $str_tag = $str_tag . $tag->tag . ", ";
-                            }
+                            foreach($page->get_project()->get_tags() as $tag)
+                                $str_tag .= $tag . ", ";
                             $str_tag = rtrim($str_tag, ", ");
 ?>
-                            <?=text($page, "PROJECT_TAGS")?>: <?=$str_tag?>
+                            <?=Text::get("PROJECT_TAGS")?>: <?=$str_tag?>
                             <hr class='details_separator'/>
                         </div> <!-- #tags -->
 <?php
-                        if (sizeof($page->project->url) > 0){
+                        if (sizeof($page->get_project()->get_urls()) > 0){
 ?>
                             <div id='links' class='details'>
 <?php
-                                foreach($page->project->url as $url){
-                                    if ($url->type->id != "E"){
+                                foreach($page->get_project()->get_urls() as $url){
+                                    if ($url->get_type()->get_id() != "E"){
 ?>
                                         <div>
-                                            <a target='_blank' class='link' href='<?=$url->url?>'>
-                                                <img class='link' title='<?=$url->type->title?>' alt='<?=$url->type->title?>' src='<?=$static["layout"]?>social/<?=$url->type->logo?>'/>
-                                                <?=$url->type->summary?>
+                                            <a target='_blank' class='link' href='<?=$url->get_url()?>'>
+                                                <img
+                                                  class='link'
+                                                  title='<?=$url->get_type()->get_title()?>'
+                                                  alt='<?=$url->get_type()->get_title()?>'
+                                                  src='<?=URL::IMG["LAYOUT"] . "social/" . $url->get_type()->get_logo()?>'
+                                                />
+                                                <?=$url->get_type()->get_summary()?>
                                             </a>
                                         </div>
 <?php
@@ -92,37 +100,44 @@
                         }
 ?>
                         <div id='license' class='details'>
-                            <?=text($page, "PROJECT_LICENSE")?>:
-                            <img src='<?=$static["layout"]?>license/<?=$page->project->license->logo?>' title='<?=$page->project->license->id?>' alt='<?=$page->project->license->id?>'/>
+                            <?=Text::get("PROJECT_LICENSE")?>:
+                            <img
+                              src='<?=URL::IMG["LAYOUT"] . "license/" . $page->get_project()->get_license()->get_logo()?>'
+                              title='<?=$page->get_project()->get_license()->get_id()?>'
+                              alt='<?=$page->get_project()->get_license()->get_id()?>'/>
                         </div> <!-- #license -->
                     </div> <!-- #info_details -->
                 </article>
 <?php
-                foreach($page->project->url as $embed){
-                    if ($embed->type->id == "E"){
+                foreach($page->get_project()->get_urls() as $embed){
+                    if ($embed->get_type()->get_id() == "E"){
 ?>
-                        <iframe id='demo' src='<?=$static["demo"]?><?=$embed->url?>' onload='setTimeout(function(){resizeDemo();}, 500);'></iframe>
+                        <iframe id='demo' src='<?=$static["demo"]?><?=$embed->get_url()?>' onload='setTimeout(function(){resizeDemo();}, 500);'></iframe>
 <?php
                     }
                 }
 ?>
 <?php
-                if (sizeof($page->project->image) > 0){
+                if (sizeof($page->get_project()->get_images()) > 0){
 ?>
                     <div id='image_reel'>
-                        <table>
-                            <tr>
 <?php
-                                foreach($page->project->image as $image){
+                        foreach($page->get_project()->get_images() as $image){
 ?>
-                                    <td>
-                                        <img title='<?=$page->project->title?>' alt='<?=$page->project->title?>' src='<?=$static["content"]?>project/<?=$image->image?>'/>
-                                    </td>
+                            <div class='img'>
+                                <img
+                                  title='<?=$page->get_project()->get_title()?>'
+                                  alt='<?=$image->get_text()?>'
+                                  src='<?=URL::IMG["CONTENT"]?>project/<?=$image->get_image()?>'
+                                  srcset='<?=HTML::srcset("project/" . $image->get_image())?>'
+                                />
+                                <h5>
+                                    <?=$image->get_text()?>
+                                </h5>
+                            </div>
 <?php
-                                }
+                        }
 ?>
-                            </tr>
-                        </table>
                     </div> <!-- #image_reel -->
 <?php
                 }
@@ -130,7 +145,7 @@
             </section>
         </main>
 <?php
-        include $path["inc"] . "footer.php";
+        include __DIR__ . "/inc/footer.php";
 ?>
     </body>
 </html>

+ 54 - 56
application/view/projects.php

@@ -1,79 +1,77 @@
+<?php
+/**
+ * Project list view.
+ *
+ * Contains the view layout and some code to present the data.
+ *
+ * @author Iñigo Valentin <i@inigovalentin.com>
+ * @license https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License V3
+ * @package IV
+ * @category View
+ * @property Projects_Page $page The page model.
+ * @var Projects_Page $page The page model.
+ */
+?>
 <!DOCTYPE html>
-<html lang='<?=$page->lang?>'>
+<html lang='<?=get_context()->get_lang()?>'>
     <head>
-        <meta content='text/html; charset=utf-8' http-equiv='content-type'/>
-        <meta charset='utf-8'/>
-        <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
-        <title><?=$page->title?></title>
-        <link rel='shortcut icon' href='<?=$page->favicon?>'/>
-        <!-- CSS files -->
-        <link rel='stylesheet' type='text/css' href='<?=$static["css"]?>ui.css'/>
-        <link rel='stylesheet' type='text/css' href='<?=$static["css"]?>projects.css'/>
-        <!-- Script files -->
-        <script type="text/javascript" src="<?=$static["js"]?>ui.js"></script>
-        <!-- Meta tags -->
-        <link rel='canonical' href='<?=$page->canonical?>'/>
-        <link rel='author' href='<?=$page->author?>'/>
-        <link rel='publisher' href='<?=$page->author?>'/>
-        <meta name='description' content='<?=$page->description?>'/>
-        <meta property='og:title' content='<?=$page->title?>'/>
-        <meta property='og:url' content='<?=$page->canonical?>'/>
-        <meta property='og:description' content='<?=$page->description?>'/>
-        <meta property='og:image' content='<?=$page->icon?>'/>
-        <meta property='og:site_name' content='<?=$page->name?>'/>
-        <meta property='og:type' content='website'/>
-        <meta property='og:locale' content='<?=$page->lang?>'/>
-        <meta name='twitter:card' content='summary'/>
-        <meta name='twitter:title' content='<?=$page->title?>'/>
-        <meta name='twitter:description' content='<?=$page->description?>'/>
-        <meta name='twitter:image' content='<?=$page->icon?>'/>
-        <meta name='twitter:url' content='<?=$page->canonical?>'/>
-        <meta name='robots' content='index follow'/>
+        <?=$page->generate_head()?>
     </head>
     <body>
 <?php
-        include $path["inc"] . "header.php";
+        include __DIR__ . "/inc/header.php";
 ?>
         <main>
             <section>
-                <h3><?=text($page, "PROJECT_TITLE");?></h3>
+                <h3><?=Text::get("PROJECT_TITLE")?></h3>
+                    <p>
+                        <?=get_context()->get_user()->get_text("PROJECTS")?>
+                    </p>
+                    <div id='projects'>
 <?php
-                    foreach ($page->project as $project){
+                        foreach ($page->get_projects() as $project){
 ?>
-                    <article class='project'>
-                        <table>
-                            <tr>
+                            <article class='project'>
+                                <table>
+                                    <tr>
 <?php
-                                    if (strlen($project->logo) > 0){
+                                        if (strlen($project->get_logo() > 0)){
 ?>
-                                    <td>
-                                        <a href='<?=$base_url?>/project/<?=$project->permalink?>'>
-                                            <img class='project_image' alt='<?=$project->title?>' title='<?=$project->title?>' src='<?=$static["content"]?>project/<?=$project->logo?>' srcset='<?=srcset("project/" . $project->logo)?>'/>
-                                        </a>
-                                    </td>
+                                            <td class='logo'>
+                                                <a href='<?=URL::PROJECTS . $project->get_permalink()?>'>
+                                                    <img
+                                                      class='project_image'
+                                                      alt='<?=$project->get_title()?>'
+                                                      title='<?=$project->get_title()?>'
+                                                      srcset='<?=HTML::srcset("project/" . $project->get_logo())?>'
+                                                      src='<?=URL::IMG["CONTENT"]?>project/<?=$project->get_logo()?>'
+                                                    />
+                                                </a>
+                                            </td>
 <?php
-                                    }
+                                        }
 ?>
-                                <td class='project_details'>
-                                    <h4 class='project_name'>
-                                        <a href='<?=$base_url?>/project/<?=$project->permalink?>'>
-                                            <?=$project->title?>
-                                        </a>
-                                    </h4>
-                                    <span>
-                                        <?=$project->header?>
-                                    </span>
-                                </td>
-                            </tr>
-                        </table>
-                    </article> <!-- .project -->
+                                    <td class='project_details'>
+                                        <h4 class='project_name'>
+                                            <a href='<?=URL::PROJECTS . $project->get_permalink()?>'>
+                                                <?=$project->get_title()?>
+                                            </a>
+                                        </h4>
+                                        <span>
+                                            <?=$project->get_header()?>
+                                        </span>
+                                    </td>
+                                </tr>
+                            </table>
+                        </article> <!-- .project -->
 <?php
                     }
 ?>
+                </div>
             </section>
         </main>
 <?php
-        include $path["inc"] . "footer.php";
+        include __DIR__ . "/inc/footer.php";
 ?>
     </body>
 </html>

+ 16 - 0
application/view/robots.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * robots.txt file.
+ *
+ * Prints the robots.txt contents.
+ *
+ * @author Iñigo Valentin <i@inigovalentin.com>
+ * @license https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License V3
+ * @package IV
+ * @category View
+ * @property Robots_Page $page The page model.
+ * @var Robots_Page $page The page model.
+ */
+?>
+<?php header('Content-type: text/plain; charset=utf-8') ?>
+<?=$page->get_text()?>

+ 16 - 0
application/view/sitemap.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Sitemap file.
+ *
+ * Prints the sitemap XML contents.
+ *
+ * @author Iñigo Valentin <i@inigovalentin.com>
+ * @license https://www.gnu.org/licenses/gpl-3.0.en.html GNU General Public License V3
+ * @package IV
+ * @category View
+ * @property Sitemap_Page $page The page model.
+ * @var Sitemap_Page $page The page model.
+ */
+?>
+<?php header('Content-type: application/xml; charset=utf-8') ?>
+<?=$page->get_text()?>

+ 73 - 7
public/css/help.css

@@ -1,4 +1,4 @@
-section{
+section.help{
     padding: 0;
     max-height: 2.8em;
     overflow-y: hidden;
@@ -6,24 +6,90 @@ section{
     border-bottom-left-radius: 0.5em;
     transition: all .5s ease-in-out;
 }
-section.selected{
-    max-height: 15em;
+@media screen and (max-width : 800px){
+    section.help{
+        max-height: 2em;
+        width: 90%;
+    }
+}
+section.help.selected{
+    max-height: 30em;
     border-bottom-right-radius: 1.5em;
     border-bottom-left-radius: 1.5em;
 }
-section h3{
+@media screen and (max-width : 800px){
+    section.help.selected{
+        max-height: 50em;
+    }
+}
+section.help h3{
     margin: 0;
 }
-section h3 img.slider{
+@media screen and (max-width : 800px){
+    section.help h3{
+        margin: -0.8em -1em 0em -1em;
+    }
+}
+section.help h3 img.slider{
     width: 1em;
     height: 1em;
     transition: all .3s ease-in-out;
     float: left;
     margin-left: -2em;
 }
-section.selected h3 img.slider{
+@media screen and (max-width : 800px){
+    section.help h3 img.slider{
+        margin-left: 0;
+        margin-top: 0.1em;
+    }
+}
+section.help.selected h3 img.slider{
     transform: rotate(90deg);
 }
-section p{
+section.help div{
     margin: 1em 2em;
 }
+
+div#policy_cover{
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 99;
+    background-color: #000000aa;
+    display: none;
+}
+
+section#policy{
+    position: fixed;
+    top: 10%;
+    left: 10%;
+    width: 80%;
+    height: 80%;
+    z-index: 100;
+    display: none;
+}
+
+section#policy h3 div#policy_close{
+    float: right;
+    cursor: pointer;
+}
+
+section#policy h3 div#policy_close img{
+    height: 1.2em;
+    width: 1.2em;
+}
+
+section#policy div{
+    overflow-y: scroll;
+    height: 90%;
+}
+
+section#policy div h1, section#policy div h2, section#policy div h3{
+    all: revert;
+}
+
+section#policy div h3::before{
+    all: revert;
+}

+ 95 - 12
public/css/home.css

@@ -11,16 +11,58 @@ section#profile{
         margin: auto;
     }
 }
+
+section#profile article h4#tagline{
+    display: block;
+    vertical-align: middle;
+}
+
 section#profile article img#profile_image{
     display: inline-block;
-    vertical-align: top;
-    width: 25%;
-    height: 25%;
+    vertical-align: bottom;
+    max-width: 12em;
+    max-height: 12em;
     border-radius: 50%;
     box-shadow: 0 0 0 0.1em #000000, 0 0 0 0.3em #66bf38, 0 0 0 0.4em #000000;
+    margin-right: 1.5em;
+}
+@media screen and (max-width : 800px){
+    section#profile article img#profile_image{
+        max-width: 11em;
+        max-height: 11em;
+        margin-right: 1.5em;
+    }
+}
+
+section#profile article table{
+    display: inline-block;
+    vertical-align: bottom;
+}
+
+section#profile article table td.social img{
+    width: 4em;
+    height: 4em;
+    margin-right: 0.5em;
+    background-color: #ffffff;
+    border: 0.2em solid #ffffff;
+    border-radius: 0.4em;
+    box-shadow: 0 0 0.3em #003300;
+    transition: all .2s ease-in-out;
+}
+
+@media screen and (max-width : 800px){
+    section#profile article table td.social img{
+        width: 3em;
+        height: 3em;
+    }
+}
+
+section#profile article table td.social img:hover{
+    border-radius: 50%;
+    box-shadow: 0 0 0.5em #55aa55;
 }
+
 section#profile article div#profile_content{
-    width: 60%;
     padding: 0.5em 1.5em;
     display: inline-block;
     vertical-align: top;
@@ -30,6 +72,11 @@ section#profile article div.buttons{
     text-align: right;
     padding: 0.5em 2em 0 2em;
 }
+@media screen and (max-width : 800px){
+    section#profile article div.buttons{
+        padding: 0;
+    }
+}
 
 section#profile article div.buttons a.a_button img{
     filter: invert(1) brightness(1.4);
@@ -48,30 +95,66 @@ section#projects{
     section#projects{
         display: block;
         width: 90%;
-        margin: 2em auto auto auto;
+        margin: 2em auto 0 auto;
+    }
+}
+
+section#projects article.project{
+    position: relative;
+    margin: 1em 3%;
+    padding: 1em;
+    text-align: left;
+    border-left: 0.1em solid #aacaaa;
+    border-right: 0.1em solid #aacaaa;
+    background: linear-gradient(to bottom, #e5f0e500 0%, #e5f0e5ff 20%, #e5f0e5ff 80%, #e5f0e500 100%);
+}
+@media screen and (max-width : 800px){
+    section#projects article.project{
+        margin: 0.3em auto;
+        padding: 0.3em;
+    }
+}
+
+@media screen and (max-width : 800px){
+    section#projects article.project table td.logo{
+        vertical-align: top;
     }
 }
-section#projects article.project img.project_image{
+section#projects article.project table td.logo img.project_image{
     padding: 0.5em;
-    width: 5em;
-    height: 5em;
+    max-width: 5em;
+    max-height: 5em;
     background-color: #cccccc;
     border: 0.1em solid #60ae29;
     box-shadow: inset 0 0 0.5em #00220077;
     border-radius: 1em;
 }
 @media screen and (max-width : 800px){
-    section#projects article.project img.project_image{
-        padding: 0.9em;
-        width: 10em;
-        height: 10em;
+    section#projects article.project table td.logo img.project_image{
+        padding: 0.2em;
+        max-width: 13vw;
+        max-height: 13vw;
     }
 }
 section#projects article.project td.project_details{
     vertical-align: top;
     padding-left: 1em;
 }
+@media screen and (max-width : 800px){
+    section#projects article.project td.project_details{
+        padding-left: 0.3em;
+    }
+    section#projects article.project td.project_details h4{
+        margin-bottom: 0.2em;
+    }
+}
 section#projects div.buttons{
     text-align: right;
     padding: 0.5em 2em 0 2em;
 }
+@media screen and (max-width : 800px){
+    section#projects div.buttons{
+        padding: 0;
+        margin: 0.4em 0.4em;
+    }
+}

+ 27 - 17
public/css/profile.css

@@ -2,12 +2,15 @@ main{
     text-align: center;
 }
 
+section{
+    margin: auto 2em;
+}
+
 section#info{
     text-align: left;
     display: inline-block;
     vertical-align: top;
     width: 30%;
-    margin: auto 2em auto auto;
 }
 @media screen and (max-width : 800px){
     section#info{
@@ -22,20 +25,18 @@ section#info{
 
 section#info img#profile_image{
     display: block;
-    margin: 0.5em auto;
-    max-width: 10em;
-    max-height: 10em;
-    border-radius: 1.2em;
+    max-width: 12em;
+    max-height: 12em;
+    border-radius: 50%;
     box-shadow: 0 0 0 0.1em #000000, 0 0 0 0.3em #66bf38, 0 0 0 0.4em #000000;
+    margin: auto;
 }
-@media screen and (max-width : 800px){
-    section#info img#profile_image{
-        display: inline-block;
-        vertical-align: middle;
-        width: 30%;
-        max-width: 12em;
-        max-height: 12em;
-    }
+
+section#info h4{
+    margin-top: 0;
+    text-align: center;
+    font-size: 110%;
+    padding: 0.5em;
 }
 section#info div#social{
     text-align: center;
@@ -45,7 +46,7 @@ section#info div#social{
     section#info div#social{
         display: inline-block;
         vertical-align: middle;
-        width: 40%;
+        width: 100%;
         margin: auto;
     }
 }
@@ -73,7 +74,6 @@ section#about{
     display: inline-block;
     vertical-align: top;
     width: 50%;
-    margin: auto;
 }
 @media screen and (max-width : 800px){
     section#about{
@@ -87,25 +87,35 @@ section#about p{
     margin: 2em 4em;
     color: #335333;
 }
+@media screen and (max-width : 800px){
+    section#about p{
+        font-style: initial;
+        text-indent: 0.7em;
+        color: initial;
+        margin: 0 0 1em 0;
+    }
+}
 section#about div#cv_download{
     text-align: center;
 }
 section#about div#cv_download a.a_button{
     display: inline-block;
     vertical-align: top;
-    margin: auto 3em 1.5em auto;
+    margin: auto 1.5em 1.5em auto;
 }
 section#about div#cv_download details{
     display: inline-block;
     vertical-align: top;
     font-style: italic;
     margin-top: 0.5em;
+    width: 15em;
 }
 section#about div#cv_download details summary{
     color: #777777;
     font-size: 90%;
+    text-align: left;
 }
 section#about div#cv_download details ul{
     text-align: left;
-    margin: 0.1em;
+    margin: 0.1em 0.1em 0.1em 0.1em;
 }

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 31 - 23
public/css/project.css


+ 40 - 14
public/css/projects.css

@@ -2,10 +2,12 @@
 section{
     width: 90%;
     margin: auto;
-    text-align: center;
 }
-section h3{
-    text-align: left;
+
+section div#projects{
+    margin: 0;
+    padding: 0;
+    text-align: center;
 }
 
 section article.project{
@@ -21,31 +23,55 @@ section article.project{
     background: linear-gradient(to bottom, #e5f0e500 0%, #e5f0e5ff 20%, #e5f0e5ff 80%, #e5f0e500 100%);
 }
 @media screen and (max-width : 800px){
-	section article.project{
-	    width: 90%;
-	    margin: 1em auto;
-	}
+    section article.project{
+        width: 96%;
+        margin: 0.3em auto;
+        padding: 0.3em;
+    }
 }
 
 section article.project table{
     width: 100%;
 }
-
-section article.project table img.project_image{
+section article.project table td.logo{
+    text-align: center;
+    vertical-align: top;
+    width: 9em;
+}
+section article.project table td.logo img.project_image{
     padding: 0.5em;
-    width: 7em;
-    height: 7em;
+    max-width: 9em;
+    max-height: 9em;
     background-color: #cccccc;
     border: 0.1em solid #60ae29;
     box-shadow: inset 0 0 0.5em #00220077;
     border-radius: 1em;
 }
-
-div#project_list article.project table td.project_details{
+@media screen and (max-width : 800px){
+    section article.project table td.logo{
+        width: 17vw;
+    }
+    section article.project table td.logo img.project_image{
+        padding: 0.3em;
+        width: 15vw;
+        height: 15vw;
+        border-radius: 0.5em;
+    }
+}
+section article.project table td.project_details{
     padding-left: 1.5em;
+    vertical-align: top;
+}
+@media screen and (max-width : 800px){
+    section article.project table td.project_details{
+        padding-left: 0.5em;
+    }
+    section article.project table td.project_details h4{
+        margin-bottom: 0.2em;
+    }
 }
 
-div#project_list article.project table span.project_tagline{
+section article.project table span.project_tagline{
     font-size: 80%;
     font-style: italic;
 }

+ 247 - 27
public/css/ui.css

@@ -7,6 +7,10 @@
     font-family: 'Latin'; 
     src:  url('/fonts/Latin-Modern-Mono-Light-Bold.otf');
 }
+@font-face {
+    font-family: 'Handwritten'; 
+    src:  url('/fonts/Handwritten.ttf'); 
+}
 
 /* Elements to be shown only in large screens. */
 .desktop{
@@ -38,15 +42,15 @@ body{
     padding: 0;
     margin: 0;
     background-color: #000000;
-    font-size: 90%;
+    font-size: 110%;
     min-height: 100vh;
-	flex-direction: column;
-	display: flex;
+    flex-direction: column;
+    display: flex;
 }
 @media screen and (max-width : 800px){
-	body{
-	    font-size: 100%;
-	}
+    body{
+        font-size: 120%;
+    }
 }
 
 /* Style for all links. */
@@ -83,7 +87,6 @@ a{
 img.slider{
     width: 1em;
     height: 1em;
-    vertial-align: middle;
     transition: all .3s ease-in-out;
 }
 
@@ -112,7 +115,7 @@ header div#logo{
     font-family: 'Latin';
 }
 header nav{
-	width: 100%;
+    width: 100%;
 }
 header nav a{
     font-size: 1.5em;
@@ -145,13 +148,19 @@ header nav a img{
     vertical-align: bottom;
 }
 @media screen and (max-width : 800px){
+    header div#logo{
+        /* Adjusted for the text 'inigoValentin' */
+        font-size: 12vw;
+    }
     header nav{
         overflow: hidden;
         white-space: nowrap;
+        width: 95%;
+        margin: auto;
     }
     header nav a{
         display: inline-block;
-        width: 32%;
+        width: 30%;
         margin: 0;
         padding: 0.5em 0;
         text-align: center;
@@ -159,10 +168,13 @@ header nav a img{
         text-decoration: none;
         border: 0.1em solid #aaaaaa;
         background-color: #222222;
+        font-size: 4vw;
     }
     header nav a img{
-        height: 1.1em;
+        height: 1em;
+        width: 1em;
         vertical-align: middle;
+        margin-right: 0.2em;
     }
 }
 
@@ -176,12 +188,19 @@ footer{
     margin-left: auto;
     margin-right: auto;
     margin-top: 3em;
-    margin-bottom: 2em;
+    margin-bottom: 3.5em;
     color: #dddddd;
     bottom: 0;
     left: 0;
     padding: 1em 2em 3em 2em;
 }
+@media screen and (max-width : 800px){
+    footer{
+        padding: 1em 0;
+        margin-top: 1em;
+        margin-bottom: 7em;
+    }
+}
 
 /* A table containing all the elements in the footer */
 footer table#footer_table{
@@ -215,6 +234,13 @@ footer table#footer_table td#footer_left span#footer_follow{
     display: block;
     margin: 0 0 1em 0;
 }
+@media screen and (max-width : 800px){
+    /* It already has the class 'desktop', which usually hiddes elements */
+    /* for small devices, but I'm overriding the display property */
+    footer table#footer_table td#footer_left span#footer_follow{
+        display: none;
+    }
+}
 
 /* Icons for social media */
 footer table#footer_table td#footer_left img.footer_social_icon{
@@ -232,6 +258,12 @@ footer table#footer_table td#footer_center{
     text-align: center;
 }
 
+@media screen and (max-width : 800px){
+    footer table#footer_table td#footer_center{
+        display: none;
+    }
+}
+
 /* Right area of the footer */
 footer table#footer_table td#footer_right{
     width: 33%;
@@ -259,13 +291,128 @@ footer table#footer_table td#footer_right a.lang img:hover{
 }
 @media screen and (max-width : 800px){
     footer table#footer_table td#footer_right a.lang img{
-        height: 1.5em;
-        margin: 0.2em;
+        height: 1.2em;
+        margin: 0.1em;
         border-radius: 0.1em;
         border: 0.1em solid #555555;
         box-shadow: 0 0 0 #dde;
     }
 }
+/* The contact form */
+div#contact_bg{
+    display: none;
+    background: #000000;
+    opacity: 0.6;
+    transition: all .4s ease-in-out;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+}
+section#contact{
+    display: none;
+    position: fixed;
+    top: 20%;
+    width: 60%;
+    margin: auto;
+    left: 20%;
+}
+@media screen and (max-width : 800px){
+    section#contact{
+        width: 90%;
+        top: 15%;
+        left: 5%;
+    }
+}
+section#contact h3 img#contact_close{
+    float:right;
+    width: 1em;
+    height: 1em;
+}
+section#contact div.contact_buttons{
+    text-align: center;
+}
+section#contact div.contact_buttons input{
+    margin: 1em;
+}
+@media screen and (max-width : 800px){
+    section#contact div.contact_buttons input{
+        margin: 0.3em;
+    }
+}
+section#contact div#contact_menu{
+    height: 18em;
+}
+section#contact div#contact_menu table{
+    width: 100%;
+}
+section#contact div#contact_menu table td.label{
+    width: 8em;
+    text-align: right;
+    padding-right: 1em;
+    vertical-align: top;
+}
+section#contact div#contact_menu table input[type=text]{
+    width: 18em;
+}
+@media screen and (max-width : 800px){
+    section#contact div#contact_menu table td.label{
+        width: initial;
+        padding-right: 0.5em;
+        padding-bottom: 1em;
+    }
+    section#contact div#contact_menu table input[type=text]{
+        width: 90%;
+    }
+}
+section#contact div#contact_menu table textarea{
+    width: 90%;
+    height: 5em;
+    margin: auto;
+}
+section#contact div#contact_menu span.contact_error {
+    font-weight: bold;
+    color: #581010;
+    background-color: #E2AAAA;
+    border: 0.2em solid #E02323;
+    border-radius: 0.429em;
+    padding: 0.2em 0.5em;
+    text-shadow: 0 0 0.15em #0003;
+    cursor: pointer;
+    font-size: 80%;
+    margin-top: -0.5em;
+    margin-left: 1em;
+    transition: all .2s ease-in-out;
+}
+section#contact div#contact_progress{
+    height: 18em;
+    text-align: center;
+}
+section#contact div#contact_progress img{
+    margin-top: 6em;
+    width: 3em;
+    height: 3em;
+    animation: contact_progress 4s infinite linear;
+}
+@keyframes contact_progress {
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(359deg);
+    }
+}
+section#contact div#contact_confirmation{
+    height: 18em;
+    text-align: center;
+}
+section#contact div#contact_confirmation p{
+    padding-top: 2em;
+    padding-bottom: 2em;
+    font-size: 150%;
+    font-weight: bold;
+}
 main{
     background-color: #000000;
     width: 100%;
@@ -297,6 +444,7 @@ section{
 @media screen and (max-width : 800px){
     section{
         margin: 1em;
+        padding: 0.2em;
     }
 }
 
@@ -317,6 +465,13 @@ section h3:before {
     opacity: 0.3;
 }
 
+@media screen and (max-width : 800px){
+    section h3{
+        font-size: 120%;
+        padding: 1em 2em 0.2em 1.5em;
+    }
+}
+
 /* .entry is a style only class to show content. Must be allways children os a .lighted element */
 section article{
     border: 0.1em solid #aaffaa00;
@@ -325,6 +480,13 @@ section article{
     margin: 0.5em;
     transition: all .4s ease-in-out;
 }
+@media screen and (max-width : 800px){
+    section article{
+        border-radius: 0.3em;
+        padding: 0.2em;
+        margin: 0.2em;
+    }
+}
 section article h4{
     font-variant: small-caps;
     text-decoration: underline;
@@ -332,6 +494,11 @@ section article h4{
     font-size: 140%;
     margin: 0.2em auto 1em auto;
 }
+@media screen and (max-width : 800px){
+    section article h4{
+        font-size: 120%;
+    }
+}
 
 section section_list:hover{
     background-color: #efffef;
@@ -416,7 +583,7 @@ input[type=submit]{
 }
 
 /* Style forr buttons */
-input[type=button]{
+input[type=button], input[type=submit]{
     cursor: pointer;
     display: inline-block;
     color: #cccccc;
@@ -435,10 +602,10 @@ input[type=button]{
     text-transform: capitalize;
 }
 @media screen and (max-width : 800px){
-	input[type=button]{
-		font-size: 120%;	
-		padding: 0.9em 1.4em;
-	}
+    input[type=button], input[type=submit]{
+        /*font-size: 120%;    
+        padding: 0.9em 1.4em;*/
+    }
 }
 input[type=button]::first-letter{
     color: #ffffff;
@@ -475,12 +642,11 @@ input[type=checkbox]{
 /* Style for textareas */
 textarea{
     width: 80%;
-    font-weight: bold;
-    color: #444444;
-    background-color: #bbbbbb;
-    border: 0.286em solid #dddddd; 
+    color: #224422;
+    background-color: #bbccbb;
+    border: 0.286em solid #ddeedd; 
     border-color: #dddddd;
-    border-radius: 0.286em;
+    border-radius: 0.429em;
     padding: 0.25em;
     text-shadow: 0 0 0.5em #ffffff;
     resize: none;
@@ -547,8 +713,8 @@ a.a_button{
 }
 @media screen and (max-width : 800px){
     a.a_button{
-        font-size: 120%;
-        padding: 0.9em 1.4em;
+        font-size: 100%;
+        padding: 0.3em 0.2em;
     }
 }
 a.a_button::first-letter{
@@ -601,7 +767,6 @@ img.comment_image{
     max-height: 6em;
     max-width: 60%;
     display: block;
-    vertical-align: top;
     border: 0.133em solid black;
     margin-left: 0.938em;
     margin-bottom: 0.938em;
@@ -610,7 +775,6 @@ img.comment_image{
 
 /* Paragraph with the comment text */
 p.comment_text{
-    vertical-align: top;
     width: auto;
     display: block;
     margin-top: 0.938em;
@@ -684,3 +848,59 @@ a.share img.share:hover{
     box-shadow: 0 0 0.7em #005500;
     border-radius: 0.7em;
 }
+
+span.technology{
+    display: inline-block;
+}
+
+span.technology img.technology_logo{
+    display: inline-block;
+    position:relative;
+    vertical-align: middle;
+    border-radius: 50%;
+    border-width: 0.2em;
+    z-index: 2;
+    background-color: #ffffff;
+    border-style: solid;
+    border-color: #000000;
+    height: 1.5em;
+    width: 1.5em;
+}
+span.technology span.technology_name{
+    display: inline-block;
+    position:relative;
+    vertical-align: middle;
+    border-radius: 15%;
+    border-width: 0.2em;
+    border-style: solid;
+    padding: 0.1em 0.2em 0.1em 1.1em;
+    z-index: 1;
+    background-color: #ffffff;
+    border-color: #000000;
+    margin-left: -1.3em;
+    font-size: 70%;
+    font-weight: bold;
+}
+
+span.technology_1 span.technology_name{
+    background-color: #f4a4a4;
+}
+span.technology_2 span.technology_name{
+    background-color: #ffc898;
+}
+span.technology_3 span.technology_name{
+    background-color: #a4c3f4;
+}
+span.technology_4 span.technology_name{
+    background-color: #f4a4e4;
+}
+span.technology_5 span.technology_name{
+    background-color: #a4f4a9;
+}
+span.technology_6 span.technology_name{
+    background-color: #f4e8a4;
+}
+
+
+
+

+ 1 - 2
public/img/content/resizer

@@ -1,4 +1,4 @@
-for file in */*.png; do
+for file in pro*/*/*/*.*; do
 	for i in $(seq 1 9); do
 		if [ ! -d $(dirname "${file}")/x"$i"00 ]; then
 			mkdir $(dirname "${file}")/x"$i"00
@@ -6,4 +6,3 @@ for file in */*.png; do
 		convert "$file" -resize "$i"00  $(dirname "${file}")/x"$i"00/$(basename "$file")
 	done
 done
-#    convert "$file" -resize 800x800  "view/$file"

+ 0 - 0
public/img/layout/social/www.svg → public/img/layout/social/web.svg


+ 27 - 9
public/js/help.js

@@ -1,16 +1,34 @@
+/**
+ * Opens or closes a section in the help page.
+ *
+ * If the currently openend section is toggled, it will just close. If another onw is toggled, it
+ * will open, and any other currently open sections will be closed.
+ *
+ * @param id Id of the section to toggle.
+ */
 function toggleHelp(id){
     var helps = document.getElementsByClassName("help");
     for (var i = 0; i < helps.length; i++) {
         if (helps[i].id == id){
-            if (helps[i].classList.contains("selected")){
-                helps[i].classList.remove("selected");
-            }
-            else{
-                helps[i].classList.add("selected");
-            }
-        }
-        else{
-            helps[i].classList.remove("selected");
+            if (helps[i].classList.contains("selected")) helps[i].classList.remove("selected");
+            else helps[i].classList.add("selected");
         }
+        else helps[i].classList.remove("selected");
     }
 }
+
+/**
+ * Hiddes the privacy policy.
+ */
+function closePolicy(){
+    document.getElementById('policy_cover').style.display = 'none';
+    document.getElementById('policy').style.display = 'none';
+}
+
+/**
+ * Shows the privacy policy.
+ */
+function openPolicy(){
+    document.getElementById('policy_cover').style.display = 'block';
+    document.getElementById('policy').style.display = 'block';
+}

+ 118 - 99
sql/01_structure.sql

@@ -1,4 +1,4 @@
-DROP DATABASE IF EXISTS webpre;
+DROP DATABASE IF EXISTS web;
 CREATE DATABASE web CHARACTER SET utf8 COLLATE utf8_bin;
 
 SET NAMES utf8;
@@ -6,147 +6,166 @@ SET NAMES utf8;
 CONNECT web;
 
 CREATE TABLE lang (
-    code    VARCHAR(2)   PRIMARY KEY,
-    name    VARCHAR(16)  NOT NULL,
-    active  BOOLEAN      DEFAULT 0
+    code   VARCHAR(2)  PRIMARY KEY,
+    name   VARCHAR(16) NOT NULL,
+    active BOOLEAN     NOT NULL DEFAULT 1
 );
 
 CREATE TABLE text (
-    id       VARCHAR(32)    NOT NULL,
-    lang     VARCHAR(2)     NOT NULL,
-    section  VARCHAR(32),
-    text     VARCHAR(5000),
-    file     VARCHAR(32),
-    PRIMARY KEY(id, lang),
-    FOREIGN KEY (lang) REFERENCES lang(code)
+    id      VARCHAR(32)  NOT NULL,
+    lang    VARCHAR(2)   NOT NULL REFERENCES lang(code),
+    section VARCHAR(32),
+    text    VARCHAR(5000),
+    file    VARCHAR(32),
+    PRIMARY KEY(id, lang)
 );
+CREATE INDEX i_text ON text(id, lang);
 
 CREATE TABLE user (
-    id          INT             AUTO_INCREMENT PRIMARY KEY,
-    name        VARCHAR(32)     NOT NULL UNIQUE,
-    mail        VARCHAR(128)    NOT NULL UNIQUE,
-    first_name  VARCHAR(64),
-    lat_name    VARCHAR(64),
-    passord     VARCHAR(256),
-    salt        VARCHAR(256)
+    id         INT         AUTO_INCREMENT PRIMARY KEY,
+    username   VARCHAR(32) NOT NULL UNIQUE,
+    first_name VARCHAR(64),
+    last_name  VARCHAR(64),
+    password   VARCHAR(256),
+    salt       VARCHAR(256),
+    name       VARCHAR(256),
+    image      VARCHAR(128),
+    admin      BOOLEAN NOT NULL DEFAULT 0
+);
+
+CREATE TABLE user_lang (
+    user     INT        NOT NULL REFERENCES user(id),
+    lang     VARCHAR(2) NOT NULL REFERENCES lang(code),
+    priority INT        NOT NULL DEFAULT 0,
+    PRIMARY KEY(user, lang)
+);
+
+CREATE TABLE user_email (
+    user    INT          NOT NULL REFERENCES user(id),
+    email   VARCHAR(256) PRIMARY KEY,
+    visible BOOLEAN      NOT NULL DEFAULT 0
+);
+
+CREATE TABLE user_text (
+    user INT         NOT NULL REFERENCES user(id),
+    name VARCHAR(32) NOT NULL,
+    text VARCHAR(32) NOT NULL,
+    PRIMARY KEY(user, name)
+);
+
+CREATE TABLE social (
+    id        INT          AUTO_INCREMENT PRIMARY KEY,
+    site_name VARCHAR(128) NOT NULL UNIQUE,
+    site_url  VARCHAR(256),
+    logo      VARCHAR(128) NOT NULL,
+    text      VARCHAR(32)  NOT NULL REFERENCES text(id)
+);
+
+CREATE TABLE user_social (
+    id       INT          AUTO_INCREMENT PRIMARY KEY,
+    priority INT          NOT NULL DEFAULT 0,
+    user     INT          NOT NULL REFERENCES user(id),
+    social   INT          NOT NULL REFERENCES social(id),
+    url      VARCHAR(256) NOT NULL
 );
 
-CREATE INDEX i_text ON text(id, lang);
 
 CREATE TABLE share(
-    id       INT           AUTO_INCREMENT PRIMARY KEY,
-    idx      INT           NOT NULL UNIQUE,
-    visible  BOOLEAN       NOT NULL DEFAULT 1,
-    title    VARCHAR(32)   NOT NULL UNIQUE,
-    text     VARCHAR(32),
-    icon     VARCHAR(16)   NOT NULL,
-    url      VARCHAR(256)  NOT NULL,
-    FOREIGN KEY (title) REFERENCES text(id),
-    FOREIGN KEY (text)  REFERENCES text(id)
+    id      INT          AUTO_INCREMENT PRIMARY KEY,
+    idx     INT          NOT NULL UNIQUE,
+    visible BOOLEAN      NOT NULL DEFAULT 1,
+    title   VARCHAR(32)  NOT NULL UNIQUE REFERENCES text(id),
+    text    VARCHAR(32)  REFERENCES text(id),
+    icon    VARCHAR(16)  NOT NULL,
+    url     VARCHAR(256) NOT NULL
 );
 
 CREATE TABLE license (
-    id       VARCHAR(32)  PRIMARY KEY,
-    summary  VARCHAR(32)  NOT NULL,
-    legal    VARCHAR(32)  NOT NULL,
-    logo     VARCHAR(32),
-    icon     VARCHAR(32),
-    FOREIGN KEY (summary)   REFERENCES text(id),
-    FOREIGN KEY (legal)     REFERENCES text(id)
+    id      VARCHAR(32) PRIMARY KEY,
+    summary VARCHAR(32) NOT NULL REFERENCES text(id),
+    legal   VARCHAR(32) NOT NULL REFERENCES text(id),
+    logo    VARCHAR(32),
+    icon    VARCHAR(32)
 );
 
 CREATE TABLE project_type (
-    id       VARCHAR(1)   NOT NULL PRIMARY KEY,
-    title    VARCHAR(32)  NOT NULL,
-    summary  VARCHAR(32)  NOT NULL,
-    FOREIGN KEY (title)     REFERENCES text(id),
-    FOREIGN KEY (summary)   REFERENCES text(id)
+    id      VARCHAR(1)  NOT NULL PRIMARY KEY,
+    title   VARCHAR(32) NOT NULL REFERENCES text(id),
+    summary VARCHAR(32) NOT NULL REFERENCES text(id)
 );
 
 CREATE TABLE project (
-    id         INT           AUTO_INCREMENT PRIMARY KEY,
-    permalink  VARCHAR(300)  NOT NULL,
-    idx        INT           NOT NULL UNIQUE,
-    type       VARCHAR(1)    NOT NULL,
-    title      VARCHAR(32)   NOT NULL,
-    logo       VARCHAR(32),
-    header     VARCHAR(32),
-    text       VARCHAR(32),
-    license    VARCHAR(32),
-    user       INT           NOT NULL,
-    visible    BOOLEAN       NOT NULL DEFAULT 1,
-    FOREIGN KEY (type)      REFERENCES project_type(id),
-    FOREIGN KEY (title)     REFERENCES text(id),
-    FOREIGN KEY (header)    REFERENCES text(id),
-    FOREIGN KEY (text)      REFERENCES text(id),
-    FOREIGN KEY (license)   REFERENCES license(id),
-    FOREIGN KEY (user)      REFERENCES user(id)
+    id        INT           AUTO_INCREMENT PRIMARY KEY,
+    permalink VARCHAR(300)  NOT NULL,
+    user      INT           NOT NULL REFERENCES user(id),
+    idx       INT           NOT NULL UNIQUE,
+    type      VARCHAR(1)    NOT NULL REFERENCES project_type(id),
+    title     VARCHAR(32)   NOT NULL REFERENCES text(id),
+    logo      VARCHAR(128),
+    header    VARCHAR(32)   NOT NULL REFERENCES text(id),
+    text      VARCHAR(32)   REFERENCES text(id),
+    comment   VARCHAR(32)   REFERENCES text(id),
+    license   VARCHAR(32)   NOT NULL REFERENCES license(id),
+    visible   BOOLEAN       NOT NULL DEFAULT 1
 );
 
 CREATE TABLE project_url_type (
-    id       VARCHAR(1)   NOT NULL PRIMARY KEY,
-    title    VARCHAR(32),
-    summary  VARCHAR(32),
-    logo     VARCHAR(32),
-    FOREIGN KEY (title) REFERENCES text(id),
-    FOREIGN KEY (summary) REFERENCES text(id)
+    id      VARCHAR(1)  PRIMARY KEY,
+    title   VARCHAR(32) REFERENCES text(id),
+    summary VARCHAR(32) REFERENCES text(id),
+    logo    VARCHAR(32)
 );
 
 CREATE TABLE project_url (
-    id       INT            AUTO_INCREMENT PRIMARY KEY,
-    project  INT            NOT NULL,
-    type     VARCHAR(1)     NOT NULL,
-    url      VARCHAR(1024)  NOT NULL,
-    FOREIGN KEY (project) REFERENCES project(id),
-    FOREIGN KEY (type) REFERENCES project_url_type(id)
+    id      INT           AUTO_INCREMENT PRIMARY KEY,
+    project INT           REFERENCES project(id),
+    type    VARCHAR(1)    REFERENCES project_url_type(id),
+    url     VARCHAR(1024) NOT NULL
 );
 
 CREATE TABLE project_image (
-    id       INT           AUTO_INCREMENT PRIMARY KEY,
-    project  INT           NOT NULL,
-    idx      INT           NOT NULL,
-    image    VARCHAR(200)  NOT NULL,
-    FOREIGN KEY (project) REFERENCES project(id)
+    id      INT          AUTO_INCREMENT PRIMARY KEY,
+    project INT          REFERENCES project(id),
+    idx     INT          NOT NULL,
+    image   VARCHAR(200) NOT NULL,
+    alt     VARCHAR(32)
 );
 
 CREATE TABLE project_tag (
-    project  INT          NOT NULL,
-    tag      VARCHAR(32)  NOT NULL,
-    PRIMARY KEY (project, tag),
-    FOREIGN KEY (project)   REFERENCES project(id),
-    FOREIGN KEY (tag)       REFERENCES text(id)
+    project INT          REFERENCES project(id),
+    tag     VARCHAR(32)  REFERENCES text(id),
+    PRIMARY KEY (project, tag)
 );
 
 CREATE TABLE cv (
-    id         INT           AUTO_INCREMENT PRIMARY KEY,
-    lang       VARCHAR(2)    NOT NULL,
-    file       VARCHAR(300)  NOT NULL,
-    visible    BOOLEAN       NOT NULL DEFAULT 1,
-    FOREIGN KEY (lang) REFERENCES lang(code)
+    id      INT          AUTO_INCREMENT PRIMARY KEY,
+    user    INT          NOT NULL REFERENCES user(id),
+    lang    VARCHAR(2)   NOT NULL REFERENCES lang(code),
+    file    VARCHAR(300) NOT NULL,
+    visible BOOLEAN      NOT NULL DEFAULT 1
 );
 
 CREATE TABLE settings (
-    name     VARCHAR(64)  PRIMARY KEY,
-    value    VARCHAR(64)  NOT NULL,
-    changed  TIMESTAMP    NOT NULL DEFAULT now()
+    name    VARCHAR(64)  PRIMARY KEY,
+    value   VARCHAR(64)  NOT NULL,
+    changed TIMESTAMP    NOT NULL DEFAULT now()
 );
 
 CREATE TABLE stat_visit (
-    id       INT           AUTO_INCREMENT PRIMARY KEY,
-    ip       VARCHAR(50),
-    uagent   VARCHAR(400),
-    os       VARCHAR(150),
-    browser  VARCHAR(150),
-    dtime    TIMESTAMP     NOT NULL DEFAULT now()
+    id      INT           AUTO_INCREMENT PRIMARY KEY,
+    ip      VARCHAR(50),
+    uagent  VARCHAR(400),
+    os      VARCHAR(150),
+    browser VARCHAR(150),
+    dtime   TIMESTAMP     NOT NULL DEFAULT now()
 );
 
 CREATE TABLE stat_view (
-    id       INT           NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    visit    INT           NOT NULL,
-    section  VARCHAR(80)   NOT NULL,
-    entry    VARCHAR(100)  NOT NULL,
-    dtime    TIMESTAMP     NOT NULL DEFAULT now(),
-    FOREIGN KEY (visit) REFERENCES stat_visit(id)
+    id      INT          NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    visit   INT          NOT NULL REFERENCES stat_visit(id),
+    section VARCHAR(80)  NOT NULL,
+    entry   VARCHAR(100) NOT NULL,
+    dtime   TIMESTAMP    NOT NULL DEFAULT now()
 );
 CREATE INDEX i_visit ON stat_view(visit, dtime);
 

+ 9 - 3
sql/02_security.sql

@@ -2,9 +2,15 @@
 -- Uncomment all entries.
 
 --GRANT SELECT ON         web.lang             TO 'w'@'localhost' IDENTIFIED BY 'XXX';
---GRANT SELECT ON         web.license          TO 'w'@'localhost' IDENTIFIED BY 'XXX';
 --GRANT SELECT ON         web.text             TO 'w'@'localhost' IDENTIFIED BY 'XXX';
---GRANT SELECT ON         web.cv               TO 'w'@'localhost' IDENTIFIED BY 'XXX';
+--GRANT SELECT ON         web.user             TO 'w'@'localhost' IDENTIFIED BY 'XXX';
+--GRANT SELECT ON         web.user_lang        TO 'w'@'localhost' IDENTIFIED BY 'XXX';
+--GRANT SELECT ON         web.user_email       TO 'w'@'localhost' IDENTIFIED BY 'XXX';
+--GRANT SELECT ON         web.user_text        TO 'w'@'localhost' IDENTIFIED BY 'XXX';
+--GRANT SELECT ON         web.social           TO 'w'@'localhost' IDENTIFIED BY 'XXX';
+--GRANT SELECT ON         web.user_social      TO 'w'@'localhost' IDENTIFIED BY 'XXX';
+--GRANT SELECT ON         web.share            TO 'w'@'localhost' IDENTIFIED BY 'XXX';
+--GRANT SELECT ON         web.license          TO 'w'@'localhost' IDENTIFIED BY 'XXX';
 --GRANT SELECT ON         web.project          TO 'w'@'localhost' IDENTIFIED BY 'XXX';
 --GRANT SELECT ON         web.project_type     TO 'w'@'localhost' IDENTIFIED BY 'XXX';
 --GRANT SELECT ON         web.project_tag      TO 'w'@'localhost' IDENTIFIED BY 'XXX';
@@ -12,7 +18,7 @@
 --GRANT SELECT ON         web.project_url_type TO 'w'@'localhost' IDENTIFIED BY 'XXX';
 --GRANT SELECT ON         web.project_image    TO 'w'@'localhost' IDENTIFIED BY 'XXX';
 --GRANT SELECT ON         web.project_tag      TO 'w'@'localhost' IDENTIFIED BY 'XXX';
+--GRANT SELECT ON         web.cv               TO 'w'@'localhost' IDENTIFIED BY 'XXX';
 --GRANT SELECT ON         web.settings         TO 'w'@'localhost' IDENTIFIED BY 'XXX';
---GRANT SELECT ON         web.share            TO 'w'@'localhost' IDENTIFIED BY 'XXX';
 --GRANT SELECT, INSERT ON web.stat_view        TO 'w'@'localhost' IDENTIFIED BY 'XXX';
 --GRANT SELECT, INSERT ON web.stat_visit       TO 'w'@'localhost' IDENTIFIED BY 'XXX';

+ 161 - 121
sql/03_data.sql

@@ -1,7 +1,7 @@
 -- AVAILABLE LANGUAGES
 INSERT INTO lang VALUES ('es', 'Castellano', '1');
 INSERT INTO lang VALUES ('en', 'English', '1');
-INSERT INTO lang VALUES ('eu', 'Euskara', '0');
+INSERT INTO lang VALUES ('eu', 'Euskara', '1');
 
 -- DATE ELEMENTS
 INSERT INTO text VALUES ('MONTH_01', 'es', 'DATE', 'enero', null);
@@ -46,7 +46,7 @@ INSERT INTO text VALUES ('DAY_1', 'eu', 'DATE', 'astelehena', null);
 INSERT INTO text VALUES ('DAY_2', 'es', 'DATE', 'martes', null);
 INSERT INTO text VALUES ('DAY_2', 'en', 'DATE', 'Tuesday', null);
 INSERT INTO text VALUES ('DAY_2', 'eu', 'DATE', 'asteartea', null);
-INSERT INTO text VALUES ('DAY_3', 'es', 'DATE', 'mi&eacute;rcoles', null);
+INSERT INTO text VALUES ('DAY_3', 'es', 'DATE', 'miércoles', null);
 INSERT INTO text VALUES ('DAY_3', 'en', 'DATE', 'Wednesday', null);
 INSERT INTO text VALUES ('DAY_3', 'eu', 'DATE', 'astezkena', null);
 INSERT INTO text VALUES ('DAY_4', 'es', 'DATE', 'jueves', null);
@@ -55,7 +55,7 @@ INSERT INTO text VALUES ('DAY_4', 'eu', 'DATE', 'osteguna', null);
 INSERT INTO text VALUES ('DAY_5', 'es', 'DATE', 'viernes', null);
 INSERT INTO text VALUES ('DAY_5', 'en', 'DATE', 'Friday', null);
 INSERT INTO text VALUES ('DAY_5', 'eu', 'DATE', 'ostirala', null);
-INSERT INTO text VALUES ('DAY_6', 'es', 'DATE', 's&aacute;bado', null);
+INSERT INTO text VALUES ('DAY_6', 'es', 'DATE', 'sábado', null);
 INSERT INTO text VALUES ('DAY_6', 'en', 'DATE', 'Saturday', null);
 INSERT INTO text VALUES ('DAY_6', 'eu', 'DATE', 'larunbata', null);
 INSERT INTO text VALUES ('DAY_7', 'es', 'DATE', 'domingo', null);
@@ -74,29 +74,50 @@ INSERT INTO text VALUES ('SECTION_PROJECTS', 'en', 'SECTION', 'Projects', null);
 INSERT INTO text VALUES ('SECTION_PROJECTS', 'eu', 'SECTION', 'Proiektuak', null);
 
 -- SOCIAL
-INSERT INTO text VALUES ('SOCIAL_GITHUB', 'es', 'SOCIAL', 'Github', null);
-INSERT INTO text VALUES ('SOCIAL_GITHUB', 'en', 'SOCIAL', 'Github', null);
-INSERT INTO text VALUES ('SOCIAL_GITHUB', 'eu', 'SOCIAL', 'Github', null);
-INSERT INTO text VALUES ('SOCIAL_RSS', 'es', 'SOCIAL', 'RSS', null);
-INSERT INTO text VALUES ('SOCIAL_RSS', 'en', 'SOCIAL', 'RSS', null);
-INSERT INTO text VALUES ('SOCIAL_RSS', 'eu', 'SOCIAL', 'RSS', null);
-INSERT INTO text VALUES ('SOCIAL_MAIL', 'es', 'SOCIAL', 'Correo electr&oacute;nico', null);
-INSERT INTO text VALUES ('SOCIAL_MAIL', 'en', 'SOCIAL', 'eMail', null);
-INSERT INTO text VALUES ('SOCIAL_MAIL', 'eu', 'SOCIAL', 'ePosta', null);
-INSERT INTO text VALUES ('SOCIAL_LINKEDIN', 'es', 'SOCIAL', 'LinkedIn', null);
-INSERT INTO text VALUES ('SOCIAL_LINKEDIN', 'en', 'SOCIAL', 'LinkedIn', null);
-INSERT INTO text VALUES ('SOCIAL_LINKEDIN', 'eu', 'SOCIAL', 'LinkedIn', null);
+INSERT INTO text VALUES ('SOCIAL_FACEBOOK', 'es', 'SOCIAL', 'Visita mi perfil en Facebook.', null);
+INSERT INTO text VALUES ('SOCIAL_FACEBOOK', 'en', 'SOCIAL', 'Check out my Facebook profile.', null);
+INSERT INTO text VALUES ('SOCIAL_FACEBOOK', 'eu', 'SOCIAL', 'Begiratu nire Facebook profila.', null);
+INSERT INTO text VALUES ('SOCIAL_X', 'es', 'SOCIAL', 'Visita mi perfil en X.', null);
+INSERT INTO text VALUES ('SOCIAL_X', 'en', 'SOCIAL', 'Check out my X profile.', null);
+INSERT INTO text VALUES ('SOCIAL_X', 'eu', 'SOCIAL', 'Begiratu nire X profila.', null);
+INSERT INTO text VALUES ('SOCIAL_INSTAGRAM', 'es', 'SOCIAL', 'Visita mi perfil en Instagram.', null);
+INSERT INTO text VALUES ('SOCIAL_INSTAGRAM', 'en', 'SOCIAL', 'Check out my Instagram profile.', null);
+INSERT INTO text VALUES ('SOCIAL_INSTAGRAM', 'eu', 'SOCIAL', 'Begiratu nire Instagram profila.', null);
+INSERT INTO text VALUES ('SOCIAL_TELEGRAM', 'es', 'SOCIAL', 'Contáctame en Telegram.', null);
+INSERT INTO text VALUES ('SOCIAL_TELEGRAM', 'en', 'SOCIAL', 'Contact me on Telegram.', null);
+INSERT INTO text VALUES ('SOCIAL_TELEGRAM', 'eu', 'SOCIAL', 'Bidali mezu bat Telegram-en.', null);
+INSERT INTO text VALUES ('SOCIAL_LINKEDIN', 'es', 'SOCIAL', 'Visita mi perfil en LinkedIn.', null);
+INSERT INTO text VALUES ('SOCIAL_LINKEDIN', 'en', 'SOCIAL', 'Check out my LinkedIn profile.', null);
+INSERT INTO text VALUES ('SOCIAL_LINKEDIN', 'eu', 'SOCIAL', 'Begiratu nire LinkedId profila.', null);
+INSERT INTO text VALUES ('SOCIAL_VKONTAKTE', 'es', 'SOCIAL', 'Visita mi perfil en VKontakte', null);
+INSERT INTO text VALUES ('SOCIAL_VKONTAKTE', 'en', 'SOCIAL', 'Check out my VKontakte profile', null);
+INSERT INTO text VALUES ('SOCIAL_VKONTAKTE', 'eu', 'SOCIAL', 'Begiratu nire LinkedId profila.', null);
+INSERT INTO text VALUES ('SOCIAL_GITHUB', 'es', 'SOCIAL', 'Visita mi perfil en GitHub.', null);
+INSERT INTO text VALUES ('SOCIAL_GITHUB', 'en', 'SOCIAL', 'Check out my GitHub profile.', null);
+INSERT INTO text VALUES ('SOCIAL_GITHUB', 'eu', 'SOCIAL', 'Begiratu nire GitHub profila.', null);
+INSERT INTO text VALUES ('SOCIAL_GITLAB', 'es', 'SOCIAL', 'Visita mi perfil en GitLab.', null);
+INSERT INTO text VALUES ('SOCIAL_GITLAB', 'en', 'SOCIAL', 'Check out my GitLab profile.', null);
+INSERT INTO text VALUES ('SOCIAL_GITLAB', 'eu', 'SOCIAL', 'Begiratu nire GitLab profila.', null);
+INSERT INTO text VALUES ('SOCIAL_WEB', 'es', 'SOCIAL', 'Visita mi sitio web.', null);
+INSERT INTO text VALUES ('SOCIAL_WEB', 'en', 'SOCIAL', 'Check out my website.', null);
+INSERT INTO text VALUES ('SOCIAL_WEB', 'eu', 'SOCIAL', 'Begiratu nire webgunea.', null);
+INSERT INTO social VALUES (1, 'Facebook', 'https://facebook.com/', 'facebook.svg', 'SOCIAL_FACEBOOK');
+INSERT INTO social VALUES (2, 'X', 'https://x.com/', 'x.svg', 'SOCIAL_X');
+INSERT INTO social VALUES (3, 'Instagram', 'https://instagram.com/', 'instagram.svg', 'SOCIAL_INSTAGRAM');
+INSERT INTO social VALUES (4, 'Telegram', 'https://telegram.com/', 'telegram.svg', 'SOCIAL_TELEGRAM');
+INSERT INTO social VALUES (5, 'LinkedIn', 'https://linkedin.com/', 'linkedin.svg', 'SOCIAL_LINKEDIN');
+INSERT INTO social VALUES (6, 'VKontakte', 'https://vkontakte.com/', 'vkontakte.svg', 'SOCIAL_VKONTAKTE');
+INSERT INTO social VALUES (7, 'GitHub', 'https://github.com/', 'github.svg', 'SOCIAL_GITHUB');
+INSERT INTO social VALUES (8, 'GitLab', 'https://gitlab.com/', 'gitlab.svg', 'SOCIAL_GITLAB');
+INSERT INTO social VALUES (9, 'Web', null, 'web.svg', 'SOCIAL_WEB');
 
 -- SHARE
 INSERT INTO text VALUES ('SHARE_FACEBOOK', 'es', 'SHARE', 'Facebook', null);
 INSERT INTO text VALUES ('SHARE_FACEBOOK', 'en', 'SHARE', 'Facebook', null);
 INSERT INTO text VALUES ('SHARE_FACEBOOK', 'eu', 'SHARE', 'Facebook', null);
-INSERT INTO text VALUES ('SHARE_TWITTER', 'es', 'SHARE', 'Twitter', null);
-INSERT INTO text VALUES ('SHARE_TWITTER', 'en', 'SHARE', 'Twitter', null);
-INSERT INTO text VALUES ('SHARE_TWITTER', 'eu', 'SHARE', 'Twitter', null);
-INSERT INTO text VALUES ('SHARE_GOOGLE', 'es', 'SHARE', 'Google +', null);
-INSERT INTO text VALUES ('SHARE_GOOGLE', 'en', 'SHARE', 'Google +', null);
-INSERT INTO text VALUES ('SHARE_GOOGLE', 'eu', 'SHARE', 'Google +', null);
+INSERT INTO text VALUES ('SHARE_X', 'es', 'SHARE', 'X', null);
+INSERT INTO text VALUES ('SHARE_X', 'en', 'SHARE', 'X', null);
+INSERT INTO text VALUES ('SHARE_X', 'eu', 'SHARE', 'X', null);
 INSERT INTO text VALUES ('SHARE_TELEGRAM', 'es', 'SHARE', 'Telegram', null);
 INSERT INTO text VALUES ('SHARE_TELEGRAM', 'en', 'SHARE', 'Telegram', null);
 INSERT INTO text VALUES ('SHARE_TELEGRAM', 'eu', 'SHARE', 'Telegram', null);
@@ -109,12 +130,9 @@ INSERT INTO text VALUES ('SHARE_VKONTAKTE', 'eu', 'SHARE', 'VKontakte', null);
 INSERT INTO text VALUES ('SHARE_FACEBOOK_DESC', 'es', 'SHARE', 'Publicar en Facebook', null);
 INSERT INTO text VALUES ('SHARE_FACEBOOK_DESC', 'en', 'SHARE', 'Share on Facebook', null);
 INSERT INTO text VALUES ('SHARE_FACEBOOK_DESC', 'eu', 'SHARE', 'Facebook', null);
-INSERT INTO text VALUES ('SHARE_TWITTER_DESC', 'es', 'SHARE', 'Publicar en Twitter', null);
-INSERT INTO text VALUES ('SHARE_TWITTER_DESC', 'en', 'SHARE', 'Share on Twitter', null);
-INSERT INTO text VALUES ('SHARE_TWITTER_DESC', 'eu', 'SHARE', 'Twitter', null);
-INSERT INTO text VALUES ('SHARE_GOOGLE_DESC', 'es', 'SHARE', 'Publicar en Google +', null);
-INSERT INTO text VALUES ('SHARE_GOOGLE_DESC', 'en', 'SHARE', 'Share on Google +', null);
-INSERT INTO text VALUES ('SHARE_GOOGLE_DESC', 'eu', 'SHARE', 'Google +', null);
+INSERT INTO text VALUES ('SHARE_X_DESC', 'es', 'SHARE', 'Publicar en X', null);
+INSERT INTO text VALUES ('SHARE_X_DESC', 'en', 'SHARE', 'Share on X', null);
+INSERT INTO text VALUES ('SHARE_X_DESC', 'eu', 'SHARE', 'X', null);
 INSERT INTO text VALUES ('SHARE_TELEGRAM_DESC', 'es', 'SHARE', 'Publicar en Telegram', null);
 INSERT INTO text VALUES ('SHARE_TELEGRAM_DESC', 'en', 'SHARE', 'Share on Telegram', null);
 INSERT INTO text VALUES ('SHARE_TELEGRAM_DESC', 'eu', 'SHARE', 'Telegram', null);
@@ -124,12 +142,11 @@ INSERT INTO text VALUES ('SHARE_LINKEDIN_DESC', 'eu', 'SHARE', 'LinkedIn', null)
 INSERT INTO text VALUES ('SHARE_VKONTAKTE_DESC', 'es', 'SHARE', 'Publicar en VKontakte', null);
 INSERT INTO text VALUES ('SHARE_VKONTAKTE_DESC', 'en', 'SHARE', 'Share on VKontakte', null);
 INSERT INTO text VALUES ('SHARE_VKONTAKTE_DESC', 'eu', 'SHARE', 'VKontakte', null);
-INSERT INTO share VALUES (1, 1, 1, 'SHARE_FACEBOOK', 'SHARE_FACEBOOK_DESC', 'facebook.gif', 'https://www.facebook.com/sharer/sharer.php?u=');
-INSERT INTO share VALUES (2, 2, 1, 'SHARE_TWITTER', 'SHARE_TWITTER_DESC', 'twitter.gif', 'https://twitter.com/share?url=');
-INSERT INTO share VALUES (3, 3, 1, 'SHARE_GOOGLE', 'SHARE_GOOGLE_DESC', 'google.gif', 'https://plus.google.com/share?url=');
-INSERT INTO share VALUES (4, 4, 1, 'SHARE_TELEGRAM', 'SHARE_TELEGRAM_DESC', 'telegramn.gif', 'https://t.me/share/url?url=');
-INSERT INTO share VALUES (5, 5, 1, 'SHARE_LINKEDIN', 'SHARE_LINKEDIN_DESC', 'linkedin.gif', 'https://www.linkedin.com/shareArticle?mini=true&url=');
-INSERT INTO share VALUES (6, 6, 1, 'SHARE_VKONTAKTE', 'SHARE_VKONTAKTE_DESC', 'vkontakte.gif', 'http://vk.com/share.php?url=');
+INSERT INTO share VALUES (1, 1, 1, 'SHARE_FACEBOOK', 'SHARE_FACEBOOK_DESC', 'facebook.svg', 'https://www.facebook.com/sharer/sharer.php?u=');
+INSERT INTO share VALUES (2, 2, 1, 'SHARE_X', 'SHARE_X_DESC', 'x.svg', 'https://x.com/share?url=');
+INSERT INTO share VALUES (3, 4, 1, 'SHARE_TELEGRAM', 'SHARE_TELEGRAM_DESC', 'telegramn.svg', 'https://t.me/share/url?url=');
+INSERT INTO share VALUES (4, 5, 1, 'SHARE_LINKEDIN', 'SHARE_LINKEDIN_DESC', 'linkedin.svg', 'https://www.linkedin.com/shareArticle?mini=true&url=');
+INSERT INTO share VALUES (5, 6, 1, 'SHARE_VKONTAKTE', 'SHARE_VKONTAKTE_DESC', 'vkontakte.svg', 'http://vk.com/share.php?url=');
 
 -- TAGS
 INSERT INTO text VALUES ('TAG_JS',      'es', 'TAG', 'Javascript', null);
@@ -153,30 +170,25 @@ INSERT INTO text VALUES ('TAG_SWIFT',   'eu', 'TAG', 'Swift', null);
 INSERT INTO text VALUES ('TAG_WEB',     'es', 'TAG', 'Web', null);
 INSERT INTO text VALUES ('TAG_WEB',     'en', 'TAG', 'Web', null);
 INSERT INTO text VALUES ('TAG_WEB',     'eu', 'TAG', 'Web', null);
-INSERT INTO text VALUES ('TAG_CSS',     'es', 'TAG', 'CSS', null);
-INSERT INTO text VALUES ('TAG_CSS',     'en', 'TAG', 'CSS', null);
-INSERT INTO text VALUES ('TAG_CSS',     'eu', 'TAG', 'CSS', null);
+INSERT INTO text VALUES ('TAG_CPP',     'es', 'TAG', 'C++', null);
+INSERT INTO text VALUES ('TAG_CPP',     'en', 'TAG', 'C++', null);
+INSERT INTO text VALUES ('TAG_CPP',     'eu', 'TAG', 'C++', null);
+INSERT INTO text VALUES ('TAG_OGRE',    'es', 'TAG', 'OGRE', null);
+INSERT INTO text VALUES ('TAG_OGRE',    'en', 'TAG', 'OGRE', null);
+INSERT INTO text VALUES ('TAG_OGRE',    'eu', 'TAG', 'OGRE', null);
 INSERT INTO text VALUES ('TAG_PHP',     'es', 'TAG', 'PHP', null);
 INSERT INTO text VALUES ('TAG_PHP',     'en', 'TAG', 'PHP', null);
 INSERT INTO text VALUES ('TAG_PHP',     'eu', 'TAG', 'PHP', null);
-INSERT INTO text VALUES ('TAG_MYSQL',   'es', 'TAG', 'MySQL', null);
-INSERT INTO text VALUES ('TAG_MYSQL',   'en', 'TAG', 'MySQL', null);
-INSERT INTO text VALUES ('TAG_MYSQL',   'eu', 'TAG', 'MySQL', null);
-INSERT INTO text VALUES ('TAG_SQLITE',  'es', 'TAG', 'SQLite', null);
-INSERT INTO text VALUES ('TAG_SQLITE',  'en', 'TAG', 'SQLite', null);
-INSERT INTO text VALUES ('TAG_SQLITE',  'eu', 'TAG', 'SQLite', null);
-
-
 
 -- PAGE footer
-INSERT INTO text VALUES ('FOOTER_FOLLOW', 'es', 'FOOTER', 'S&iacute;gueme', null);
-INSERT INTO text VALUES ('FOOTER_COPY',   'es', 'FOOTER', 'Copyright I&ntilde;igo Valentin 2014 - #YEAR#', null);
+INSERT INTO text VALUES ('FOOTER_FOLLOW', 'es', 'FOOTER', 'Sígueme', null);
+INSERT INTO text VALUES ('FOOTER_COPY',   'es', 'FOOTER', 'Copyright Iñigo Valentin 2014 - #YEAR#', null);
 INSERT INTO text VALUES ('FOOTER_HELP',   'es', 'FOOTER', 'Ayuda', null);
 INSERT INTO text VALUES ('FOOTER_FOLLOW', 'en', 'FOOTER', 'Follow me', null);
-INSERT INTO text VALUES ('FOOTER_COPY',   'en', 'FOOTER', 'Copyright I&ntilde;igo Valentin 2014 - #YEAR#', null);
+INSERT INTO text VALUES ('FOOTER_COPY',   'en', 'FOOTER', 'Copyright Iñigo Valentin 2014 - #YEAR#', null);
 INSERT INTO text VALUES ('FOOTER_HELP',   'en', 'FOOTER', 'Help', null);
 INSERT INTO text VALUES ('FOOTER_FOLLOW', 'eu', 'FOOTER', 'Jarraitu', null);
-INSERT INTO text VALUES ('FOOTER_COPY',   'eu', 'FOOTER', 'Copyright I&ntilde;igo Valentin 2014 - #YEAR#', null);
+INSERT INTO text VALUES ('FOOTER_COPY',   'eu', 'FOOTER', 'Copyright Iñigo Valentin 2014 - #YEAR#', null);
 INSERT INTO text VALUES ('FOOTER_HELP',   'eu', 'FOOTER', 'Laguntza', null);
 
 
@@ -184,18 +196,21 @@ INSERT INTO text VALUES ('FOOTER_HELP',   'eu', 'FOOTER', 'Laguntza', null);
 INSERT INTO text VALUES ('INDEX_PROFILE',      'es', 'INDEX', 'Yo', null);
 INSERT INTO text VALUES ('INDEX_PROFILE',      'en', 'INDEX', 'Me', null);
 INSERT INTO text VALUES ('INDEX_PROFILE',      'eu', 'INDEX', 'Ni', null);
-INSERT INTO text VALUES ('INDEX_PROFILE_MORE', 'es', 'INDEX', 'M&aacute;s sobre mi', null);
+INSERT INTO text VALUES ('INDEX_PROFILE_MAIL', 'es', 'INDEX', 'Contacta', null);
+INSERT INTO text VALUES ('INDEX_PROFILE_MAIL', 'en', 'INDEX', 'Contact me', null);
+INSERT INTO text VALUES ('INDEX_PROFILE_MAIL', 'eu', 'INDEX', 'Jarri harremanetan', null);
+INSERT INTO text VALUES ('INDEX_PROFILE_MORE', 'es', 'INDEX', 'Más sobre mi', null);
 INSERT INTO text VALUES ('INDEX_PROFILE_MORE', 'en', 'INDEX', 'More about me', null);
 INSERT INTO text VALUES ('INDEX_PROFILE_MORE', 'eu', 'INDEX', 'Ni', null);
 INSERT INTO text VALUES ('INDEX_PROFILE_CV',   'es', 'INDEX', 'CV', null);
-INSERT INTO text VALUES ('INDEX_PROFILE_CV',   'en', 'INDEX', 'R&eacute;sum&eacute;', null);
+INSERT INTO text VALUES ('INDEX_PROFILE_CV',   'en', 'INDEX', 'Résumé', null);
 INSERT INTO text VALUES ('INDEX_PROFILE_CV',   'eu', 'INDEX', 'CV', null);
 INSERT INTO text VALUES ('INDEX_PROJECTS',     'es', 'INDEX', 'Proyectos', null);
 INSERT INTO text VALUES ('INDEX_PROJECTS',     'en', 'INDEX', 'Projects', null);
 INSERT INTO text VALUES ('INDEX_PROJECTS',     'eu', 'INDEX', 'Proiektuak', null);
 INSERT INTO text VALUES ('INDEX_PROJECTS_ALL', 'es', 'INDEX', 'Ver todos', null);
 INSERT INTO text VALUES ('INDEX_PROJECTS_ALL', 'en', 'INDEX', 'See all projects', null);
-INSERT INTO text VALUES ('INDEX_PROJECTS_ALL', 'eu', 'INDEX', 'Ver todos', null);
+INSERT INTO text VALUES ('INDEX_PROJECTS_ALL', 'eu', 'INDEX', 'Denak ikusi', null);
 
 
 -- PAGE project
@@ -208,18 +223,18 @@ INSERT INTO text VALUES ('PROJECT_DESCRIPTION',     'eu', 'PROJECT', '', null);
 INSERT INTO text VALUES ('PROJECT_SEARCH',          'es', 'PROJECT', 'Buscar', null);
 INSERT INTO text VALUES ('PROJECT_SEARCH',          'en', 'PROJECT', 'Search', null);
 INSERT INTO text VALUES ('PROJECT_SEARCH',          'eu', 'PROJECT', 'Bilatu', null);
-INSERT INTO text VALUES ('PROJECT_SEARCH_ADVANCED', 'es', 'PROJECT', 'B&uacute;squeda avanzada', null);
+INSERT INTO text VALUES ('PROJECT_SEARCH_ADVANCED', 'es', 'PROJECT', 'Búsqueda avanzada', null);
 INSERT INTO text VALUES ('PROJECT_SEARCH_ADVANCED', 'en', 'PROJECT', 'Advanced search', null);
-INSERT INTO text VALUES ('PROJECT_SEARCH_ADVANCED', 'eu', 'PROJECT', 'B&uacute;squeda avanzada', null);
+INSERT INTO text VALUES ('PROJECT_SEARCH_ADVANCED', 'eu', 'PROJECT', 'Búsqueda avanzada', null);
 INSERT INTO text VALUES ('PROJECT_SEARCH_TYPE',     'es', 'PROJECT', 'Tipo', null);
 INSERT INTO text VALUES ('PROJECT_SEARCH_TYPE',     'en', 'PROJECT', 'Project type', null);
 INSERT INTO text VALUES ('PROJECT_SEARCH_TYPE',     'eu', 'PROJECT', 'Tipu', null);
 INSERT INTO text VALUES ('PROJECT_SEARCH_LICENSE',  'es', 'PROJECT', 'Licencia', null);
 INSERT INTO text VALUES ('PROJECT_SEARCH_LICENSE',  'en', 'PROJECT', 'License', null);
 INSERT INTO text VALUES ('PROJECT_SEARCH_LICENSE',  'eu', 'PROJECT', 'Lizenzia', null);
-INSERT INTO text VALUES ('PROJECT_VERSION',         'es', 'PROJECT', 'Versi&oacute;n', null);
+INSERT INTO text VALUES ('PROJECT_VERSION',         'es', 'PROJECT', 'Versión', null);
 INSERT INTO text VALUES ('PROJECT_VERSION',         'en', 'PROJECT', 'Version', null);
-INSERT INTO text VALUES ('PROJECT_VERSION',         'eu', 'PROJECT', 'Versi&oacute;n', null);
+INSERT INTO text VALUES ('PROJECT_VERSION',         'eu', 'PROJECT', 'Versión', null);
 INSERT INTO text VALUES ('PROJECT_CLOSE',           'es', 'PROJECT', 'Cerrar', null);
 INSERT INTO text VALUES ('PROJECT_CLOSE',           'en', 'PROJECT', 'Close', null);
 INSERT INTO text VALUES ('PROJECT_CLOSE',           'eu', 'PROJECT', 'Itxali', null);
@@ -238,13 +253,16 @@ INSERT INTO text VALUES ('PROJECT_LICENSE_SUMMARY', 'eu', 'PROJECT', 'En resumen
 INSERT INTO text VALUES ('PROJECT_LICENSE_LEGAL',   'es', 'PROJECT', 'Texto completo:', null);
 INSERT INTO text VALUES ('PROJECT_LICENSE_LEGAL',   'en', 'PROJECT', 'Full legal text:', null);
 INSERT INTO text VALUES ('PROJECT_LICENSE_LEGAL',   'eu', 'PROJECT', 'Textu osoa:', null);
+INSERT INTO text VALUES ('PROJECT_COMMENT',         'es', 'PROJECT', 'Notas de $', null);
+INSERT INTO text VALUES ('PROJECT_COMMENT',         'en', 'PROJECT', "$'s notes", null);
+INSERT INTO text VALUES ('PROJECT_COMMENT',         'eu', 'PROJECT', '$ren oharrak', null);
 
 
 -- PAGE profile
 INSERT INTO text VALUES ('PROFILE_TITLE',            'es', 'PROFILE', 'Yo', null);
 INSERT INTO text VALUES ('PROFILE_TITLE',            'en', 'PROFILE', 'Me', null);
 INSERT INTO text VALUES ('PROFILE_TITLE',            'eu', 'PROFILE', 'Ni', null);
-INSERT INTO text VALUES ('PROFILE_DESCRIPTION',      'es', 'PROFILE', 'Sobre m&iacute;', null);
+INSERT INTO text VALUES ('PROFILE_DESCRIPTION',      'es', 'PROFILE', 'Sobre mí', null);
 INSERT INTO text VALUES ('PROFILE_DESCRIPTION',      'en', 'PROFILE', 'About me', null);
 INSERT INTO text VALUES ('PROFILE_DESCRIPTION',      'eu', 'PROFILE', 'Niri buruz', null);
 INSERT INTO text VALUES ('PROFILE_DOWNLOAD_CURRENT', 'es', 'PROFILE', 'Descargar en castellano', null);
@@ -254,11 +272,11 @@ INSERT INTO text VALUES ('PROFILE_DOWNLOAD_OTHER',   'es', 'PROFILE', 'Descargar
 INSERT INTO text VALUES ('PROFILE_DOWNLOAD_OTHER',   'en', 'PROFILE', 'Download in other languages', null);
 INSERT INTO text VALUES ('PROFILE_DOWNLOAD_OTHER',   'eu', 'PROFILE', 'Beste hizkuntzetan deskargatu', null);
 INSERT INTO text VALUES ('PROFILE_CV',               'es', 'PROFILE', 'CV', null);
-INSERT INTO text VALUES ('PROFILE_CV',               'en', 'PROFILE', 'R&eacute;sum&eacute;', null);
-INSERT INTO text VALUES ('PROFILE_CV',               'eu', 'PROFILE', 'R&eacute;sum&eacute;', null);
+INSERT INTO text VALUES ('PROFILE_CV',               'en', 'PROFILE', 'Résumé', null);
+INSERT INTO text VALUES ('PROFILE_CV',               'eu', 'PROFILE', 'Résumé', null);
 INSERT INTO text VALUES ('PROFILE_CV_PRINTABLE',     'es', 'PROFILE', 'Ver en formato imprimible', null);
 INSERT INTO text VALUES ('PROFILE_CV_PRINTABLE',     'en', 'PROFILE', 'View printable format', null);
-INSERT INTO text VALUES ('PROFILE_CV_PRINTABLE',     'eu', 'PROFILE', 'R&eacute;sum&eacute;', null);
+INSERT INTO text VALUES ('PROFILE_CV_PRINTABLE',     'eu', 'PROFILE', 'Résumé', null);
 INSERT INTO text VALUES ('PROFILE_CV_LANG',          'es', 'PROFILE', 'Otros idiomas', null);
 INSERT INTO text VALUES ('PROFILE_CV_LANG',          'en', 'PROFILE', 'Other languages', null);
 INSERT INTO text VALUES ('PROFILE_CV_LANG',          'eu', 'PROFILE', 'Beste hizkuntzak', null);
@@ -266,6 +284,28 @@ INSERT INTO text VALUES ('PROFILE_SKILLS',           'es', 'PROFILE', 'Habilidad
 INSERT INTO text VALUES ('PROFILE_SKILLS',           'en', 'PROFILE', 'Skills', null);
 INSERT INTO text VALUES ('PROFILE_SKILLS',           'eu', 'PROFILE', 'Habilitateak', null);
 
+-- PAGE help
+INSERT INTO text VALUES ('HELP_TITLE', 'es', 'HELP', 'Ayuda', null);
+INSERT INTO text VALUES ('HELP_TITLE', 'en', 'HELP', 'Help', null);
+INSERT INTO text VALUES ('HELP_TITLE', 'eu', 'HELP', 'Laguntza', null);
+INSERT INTO text VALUES ('HELP_DESCRIPTION', 'es', 'HELP', 'Ayuda', null);
+INSERT INTO text VALUES ('HELP_DESCRIPTION', 'en', 'HELP', 'Help', null);
+INSERT INTO text VALUES ('HELP_DESCRIPTION', 'eu', 'HELP', 'Laguntza', null);
+INSERT INTO text VALUES ('HELP_INFO_TITLE', 'es', 'HELP', 'Ayuda', null);
+INSERT INTO text VALUES ('HELP_INFO_TITLE', 'en', 'HELP', 'Help', null);
+INSERT INTO text VALUES ('HELP_INFO_TITLE', 'eu', 'HELP', 'Laguntza', null);
+INSERT INTO text VALUES ('HELP_LICENSE_TITLE', 'es', 'HELP', 'Licencias', null);
+INSERT INTO text VALUES ('HELP_LICENSE_TITLE', 'en', 'HELP', 'Licenses', null);
+INSERT INTO text VALUES ('HELP_LICENSE_TITLE', 'eu', 'HELP', 'Lizentziak', null);
+INSERT INTO text VALUES ('HELP_PRIVACY_TITLE', 'es', 'HELP', 'Privacidad', null);
+INSERT INTO text VALUES ('HELP_PRIVACY_TITLE', 'en', 'HELP', 'Privacy', null);
+INSERT INTO text VALUES ('HELP_PRIVACY_TITLE', 'eu', 'HELP', 'Pribatutasuna', null);
+INSERT INTO text VALUES ('HELP_COOKIES_TITLE', 'es', 'HELP', 'Cookies', null);
+INSERT INTO text VALUES ('HELP_COOKIES_TITLE', 'en', 'HELP', 'Cookies', null);
+INSERT INTO text VALUES ('HELP_COOKIES_TITLE', 'eu', 'HELP', 'Cookiak', null);
+INSERT INTO text VALUES ('HELP_POLICY', 'es', 'HELP', 'Política de privacidad', null);
+INSERT INTO text VALUES ('HELP_POLICY', 'en', 'HELP', 'Privacy Policy', null);
+INSERT INTO text VALUES ('HELP_POLICY', 'eu', 'HELP', 'Pribatutasun Politika', null);
 
 -- PAGE error
 INSERT INTO text VALUES ('ERROR_TITLE',           'es', 'ERROR', 'Error', null);
@@ -281,110 +321,110 @@ INSERT INTO text VALUES ('ERROR_400_TITLE',       'es', 'ERROR', 'Bad request',
 INSERT INTO text VALUES ('ERROR_400_TITLE',       'en', 'ERROR', 'Bad request', null);
 INSERT INTO text VALUES ('ERROR_400_TITLE',       'eu', 'ERROR', 'Bad request', null);
 INSERT INTO text VALUES ('ERROR_400_DESCRIPTION', 'es', 'ERROR', 'La solicitud se ha recibido con errores... y no se como responder.', null);
-INSERT INTO text VALUES ('ERROR_400_DESCRIPTION', 'en', 'ERROR', 'This server doesnt understand your request.', null);
+INSERT INTO text VALUES ('ERROR_400_DESCRIPTION', 'en', 'ERROR', 'This server doesn''t understand your request.', null);
 INSERT INTO text VALUES ('ERROR_400_DESCRIPTION', 'eu', 'ERROR', 'La solicitud se ha recibido con errores... y no se como responder.', null);
-INSERT INTO text VALUES ('ERROR_400_SOLUTION',    'es', 'ERROR', 'Prueba una soluci&oacute;n:', null);
+INSERT INTO text VALUES ('ERROR_400_SOLUTION',    'es', 'ERROR', 'Prueba una solución:', null);
 INSERT INTO text VALUES ('ERROR_400_SOLUTION',    'en', 'ERROR', 'Try a solution:', null);
-INSERT INTO text VALUES ('ERROR_400_SOLUTION',    'eu', 'ERROR', 'Prueba una soluci&oacute;n:', null);
-INSERT INTO text VALUES ('ERROR_400_SOLUTION_0',  'es', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
+INSERT INTO text VALUES ('ERROR_400_SOLUTION',    'eu', 'ERROR', 'Prueba una solución:', null);
+INSERT INTO text VALUES ('ERROR_400_SOLUTION_0',  'es', 'ERROR', 'Volver a la página anterior', null);
 INSERT INTO text VALUES ('ERROR_400_SOLUTION_0',  'en', 'ERROR', 'Go to the previous page', null);
-INSERT INTO text VALUES ('ERROR_400_SOLUTION_0',  'eu', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
-INSERT INTO text VALUES ('ERROR_400_SOLUTION_1',  'es', 'ERROR', 'Ir a la p&aacute; principal', null);
+INSERT INTO text VALUES ('ERROR_400_SOLUTION_0',  'eu', 'ERROR', 'Volver a la página anterior', null);
+INSERT INTO text VALUES ('ERROR_400_SOLUTION_1',  'es', 'ERROR', 'Ir a la página principal', null);
 INSERT INTO text VALUES ('ERROR_400_SOLUTION_1',  'en', 'ERROR', 'Go to the main page', null);
-INSERT INTO text VALUES ('ERROR_400_SOLUTION_1',  'eu', 'ERROR', 'Ir a la p&aacute; principal', null);
-INSERT INTO text VALUES ('ERROR_400_SOLUTION_2',  'es', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_400_SOLUTION_1',  'eu', 'ERROR', 'Ir a la página principal', null);
+INSERT INTO text VALUES ('ERROR_400_SOLUTION_2',  'es', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 INSERT INTO text VALUES ('ERROR_400_SOLUTION_2',  'en', 'ERROR', 'Watch cute cat videos in Youtube', null);
-INSERT INTO text VALUES ('ERROR_400_SOLUTION_2',  'eu', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
-INSERT INTO text VALUES ('ERROR_401_TITLE',       'es', 'ERROR', 'Sin autorizaci&oacute;n', null);
+INSERT INTO text VALUES ('ERROR_400_SOLUTION_2',  'eu', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_401_TITLE',       'es', 'ERROR', 'Sin autorización', null);
 INSERT INTO text VALUES ('ERROR_401_TITLE',       'en', 'ERROR', 'Unauthorized', null);
-INSERT INTO text VALUES ('ERROR_401_TITLE',       'eu', 'ERROR', 'Sin autorizaci&oacute;n', null);
-INSERT INTO text VALUES ('ERROR_401_DESCRIPTION', 'es', 'ERROR', 'Est&aacute;s intentando ver algo que no debes. No soy muy de prohibir, as&iacute; que lo m&aacutes probable es que sea algo momentaneo.', null);
+INSERT INTO text VALUES ('ERROR_401_TITLE',       'eu', 'ERROR', 'Sin autorización', null);
+INSERT INTO text VALUES ('ERROR_401_DESCRIPTION', 'es', 'ERROR', 'Estás intentando ver algo que no debes. No soy muy de prohibir, así que lo má probable es que sea algo momentaneo.', null);
 INSERT INTO text VALUES ('ERROR_401_DESCRIPTION', 'en', 'ERROR', 'You are trying to see something you are not supposed to.', null);
-INSERT INTO text VALUES ('ERROR_401_DESCRIPTION', 'eu', 'ERROR', 'Est&aacute;s intentando ver algo que no debes. No soy muy de prohibir, as&iacute; que lo m&aacutes probable es que sea algo momentaneo.', null);
-INSERT INTO text VALUES ('ERROR_401_SOLUTION',    'es', 'ERROR', 'Prueba una soluci&oacute;n:', null);
+INSERT INTO text VALUES ('ERROR_401_DESCRIPTION', 'eu', 'ERROR', 'Estás intentando ver algo que no debes. No soy muy de prohibir, así que lo má probable es que sea algo momentaneo.', null);
+INSERT INTO text VALUES ('ERROR_401_SOLUTION',    'es', 'ERROR', 'Prueba una solución:', null);
 INSERT INTO text VALUES ('ERROR_401_SOLUTION',    'en', 'ERROR', 'Try a solution:', null);
-INSERT INTO text VALUES ('ERROR_401_SOLUTION',    'eu', 'ERROR', 'Prueba una soluci&oacute;n:', null);
-INSERT INTO text VALUES ('ERROR_401_SOLUTION_0',  'es', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
+INSERT INTO text VALUES ('ERROR_401_SOLUTION',    'eu', 'ERROR', 'Prueba una solución:', null);
+INSERT INTO text VALUES ('ERROR_401_SOLUTION_0',  'es', 'ERROR', 'Volver a la página anterior', null);
 INSERT INTO text VALUES ('ERROR_401_SOLUTION_0',  'en', 'ERROR', 'Go to the previous page', null);
-INSERT INTO text VALUES ('ERROR_401_SOLUTION_0',  'eu', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
-INSERT INTO text VALUES ('ERROR_401_SOLUTION_1',  'es', 'ERROR', 'Ir a la p&aacute; principal', null);
+INSERT INTO text VALUES ('ERROR_401_SOLUTION_0',  'eu', 'ERROR', 'Volver a la página anterior', null);
+INSERT INTO text VALUES ('ERROR_401_SOLUTION_1',  'es', 'ERROR', 'Ir a la pá principal', null);
 INSERT INTO text VALUES ('ERROR_401_SOLUTION_1',  'en', 'ERROR', 'Go to the main page', null);
-INSERT INTO text VALUES ('ERROR_401_SOLUTION_1',  'eu', 'ERROR', 'Ir a la p&aacute; principal', null);
-INSERT INTO text VALUES ('ERROR_401_SOLUTION_2',  'es', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_401_SOLUTION_1',  'eu', 'ERROR', 'Ir a la pá principal', null);
+INSERT INTO text VALUES ('ERROR_401_SOLUTION_2',  'es', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 INSERT INTO text VALUES ('ERROR_401_SOLUTION_2',  'en', 'ERROR', 'Watch cute cat videos in Youtube', null);
-INSERT INTO text VALUES ('ERROR_401_SOLUTION_2',  'eu', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_401_SOLUTION_2',  'eu', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 INSERT INTO text VALUES ('ERROR_403_TITLE',       'es', 'ERROR', 'Prohibido', null);
 INSERT INTO text VALUES ('ERROR_403_TITLE',       'en', 'ERROR', 'Forbidden', null);
 INSERT INTO text VALUES ('ERROR_403_TITLE',       'eu', 'ERROR', 'Debekatuta', null);
-INSERT INTO text VALUES ('ERROR_403_DESCRIPTION', 'es', 'ERROR', 'Est&aacute;s intentando ver algo que no debes. No soy muy de prohibir, as&iacute; que lo m&aacutes probable es que sea algo momentaneo.', null);
+INSERT INTO text VALUES ('ERROR_403_DESCRIPTION', 'es', 'ERROR', 'Estás intentando ver algo que no debes. No soy muy de prohibir, así que lo má probable es que sea algo momentaneo.', null);
 INSERT INTO text VALUES ('ERROR_403_DESCRIPTION', 'en', 'ERROR', 'You are trying to see something you are not supposed to.', null);
-INSERT INTO text VALUES ('ERROR_403_DESCRIPTION', 'eu', 'ERROR', 'Est&aacute;s intentando ver algo que no debes. No soy muy de prohibir, as&iacute; que lo m&aacutes probable es que sea algo momentaneo.', null);
-INSERT INTO text VALUES ('ERROR_403_SOLUTION',    'es', 'ERROR', 'Prueba una soluci&oacute;n:', null);
+INSERT INTO text VALUES ('ERROR_403_DESCRIPTION', 'eu', 'ERROR', 'Estás intentando ver algo que no debes. No soy muy de prohibir, así que lo má probable es que sea algo momentaneo.', null);
+INSERT INTO text VALUES ('ERROR_403_SOLUTION',    'es', 'ERROR', 'Prueba una solución:', null);
 INSERT INTO text VALUES ('ERROR_403_SOLUTION',    'en', 'ERROR', 'Try a solution:', null);
-INSERT INTO text VALUES ('ERROR_403_SOLUTION',    'eu', 'ERROR', 'Prueba una soluci&oacute;n:', null);
-INSERT INTO text VALUES ('ERROR_403_SOLUTION_0',  'es', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
+INSERT INTO text VALUES ('ERROR_403_SOLUTION',    'eu', 'ERROR', 'Prueba una solución:', null);
+INSERT INTO text VALUES ('ERROR_403_SOLUTION_0',  'es', 'ERROR', 'Volver a la página anterior', null);
 INSERT INTO text VALUES ('ERROR_403_SOLUTION_0',  'en', 'ERROR', 'Go to the previous page', null);
-INSERT INTO text VALUES ('ERROR_403_SOLUTION_0',  'eu', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
-INSERT INTO text VALUES ('ERROR_403_SOLUTION_1',  'es', 'ERROR', 'Ir a la p&aacute; principal', null);
+INSERT INTO text VALUES ('ERROR_403_SOLUTION_0',  'eu', 'ERROR', 'Volver a la página anterior', null);
+INSERT INTO text VALUES ('ERROR_403_SOLUTION_1',  'es', 'ERROR', 'Ir a la pá principal', null);
 INSERT INTO text VALUES ('ERROR_403_SOLUTION_1',  'en', 'ERROR', 'Go to the main page', null);
-INSERT INTO text VALUES ('ERROR_403_SOLUTION_1',  'eu', 'ERROR', 'Ir a la p&aacute; principal', null);
-INSERT INTO text VALUES ('ERROR_403_SOLUTION_2',  'es', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_403_SOLUTION_1',  'eu', 'ERROR', 'Ir a la pá principal', null);
+INSERT INTO text VALUES ('ERROR_403_SOLUTION_2',  'es', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 INSERT INTO text VALUES ('ERROR_403_SOLUTION_2',  'en', 'ERROR', 'Watch cute cat videos in Youtube', null);
-INSERT INTO text VALUES ('ERROR_403_SOLUTION_2',  'eu', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_403_SOLUTION_2',  'eu', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 INSERT INTO text VALUES ('ERROR_404_TITLE',       'es', 'ERROR', 'No enconrtado', null);
 INSERT INTO text VALUES ('ERROR_404_TITLE',       'en', 'ERROR', 'Not found', null);
 INSERT INTO text VALUES ('ERROR_404_TITLE',       'eu', 'ERROR', 'No enconrtado', null);
-INSERT INTO text VALUES ('ERROR_404_DESCRIPTION', 'es', 'ERROR', 'La p&aacute;gina que buscas no existe en este universo. Int&eacute;ntalo en uno diferente.', null);
+INSERT INTO text VALUES ('ERROR_404_DESCRIPTION', 'es', 'ERROR', 'La página que buscas no existe en este universo. Inténtalo en uno diferente.', null);
 INSERT INTO text VALUES ('ERROR_404_DESCRIPTION', 'en', 'ERROR', 'Sorry. The page you are looking for doesn&#39;t exist in this universe. Try in an alternate one.', null);
-INSERT INTO text VALUES ('ERROR_404_DESCRIPTION', 'eu', 'ERROR', 'La p&aacute;gina que buscas no existe en este universo. Int&eacute;ntalo en uno diferente.', null);
-INSERT INTO text VALUES ('ERROR_404_SOLUTION',    'es', 'ERROR', 'Prueba una soluci&oacute;n:', null);
+INSERT INTO text VALUES ('ERROR_404_DESCRIPTION', 'eu', 'ERROR', 'La página que buscas no existe en este universo. Inténtalo en uno diferente.', null);
+INSERT INTO text VALUES ('ERROR_404_SOLUTION',    'es', 'ERROR', 'Prueba una solución:', null);
 INSERT INTO text VALUES ('ERROR_404_SOLUTION',    'en', 'ERROR', 'Try a solution:', null);
-INSERT INTO text VALUES ('ERROR_404_SOLUTION',    'eu', 'ERROR', 'Prueba una soluci&oacute;n:', null);
-INSERT INTO text VALUES ('ERROR_404_SOLUTION_0',  'es', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
+INSERT INTO text VALUES ('ERROR_404_SOLUTION',    'eu', 'ERROR', 'Prueba una solución:', null);
+INSERT INTO text VALUES ('ERROR_404_SOLUTION_0',  'es', 'ERROR', 'Volver a la página anterior', null);
 INSERT INTO text VALUES ('ERROR_404_SOLUTION_0',  'en', 'ERROR', 'Go to the previous page', null);
-INSERT INTO text VALUES ('ERROR_404_SOLUTION_0',  'eu', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
-INSERT INTO text VALUES ('ERROR_404_SOLUTION_1',  'es', 'ERROR', 'Ir a la p&aacute; principal', null);
+INSERT INTO text VALUES ('ERROR_404_SOLUTION_0',  'eu', 'ERROR', 'Volver a la página anterior', null);
+INSERT INTO text VALUES ('ERROR_404_SOLUTION_1',  'es', 'ERROR', 'Ir a la pá principal', null);
 INSERT INTO text VALUES ('ERROR_404_SOLUTION_1',  'en', 'ERROR', 'Go to the main page', null);
-INSERT INTO text VALUES ('ERROR_404_SOLUTION_1',  'eu', 'ERROR', 'Ir a la p&aacute; principal', null);
-INSERT INTO text VALUES ('ERROR_404_SOLUTION_2',  'es', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_404_SOLUTION_1',  'eu', 'ERROR', 'Ir a la pá principal', null);
+INSERT INTO text VALUES ('ERROR_404_SOLUTION_2',  'es', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 INSERT INTO text VALUES ('ERROR_404_SOLUTION_2',  'en', 'ERROR', 'Watch cute cat videos in Youtube', null);
-INSERT INTO text VALUES ('ERROR_404_SOLUTION_2',  'eu', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_404_SOLUTION_2',  'eu', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 INSERT INTO text VALUES ('ERROR_500_TITLE',       'es', 'ERROR', 'Error del servidor', null);
 INSERT INTO text VALUES ('ERROR_500_TITLE',       'en', 'ERROR', 'Server error', null);
 INSERT INTO text VALUES ('ERROR_500_TITLE',       'eu', 'ERROR', 'Errorea serbidorean', null);
-INSERT INTO text VALUES ('ERROR_500_DESCRIPTION', 'es', 'ERROR', 'La he liado parda. El fallo est&aacute; en mi lado, pero no te preocupes, ahor&aacute; mismo el inform&aacute;tico estar&aacute; sudando tinta gorda para arreglarlo.', null);
+INSERT INTO text VALUES ('ERROR_500_DESCRIPTION', 'es', 'ERROR', 'La he liado parda. El fallo está en mi lado, pero no te preocupes, ahorá mismo el informático estará sudando tinta gorda para arreglarlo.', null);
 INSERT INTO text VALUES ('ERROR_500_DESCRIPTION', 'en', 'ERROR', 'This one is on me: I&#39;ve messed something up. Sorry! I&#39;m probably trying to fix it right now.', null);
-INSERT INTO text VALUES ('ERROR_500_DESCRIPTION', 'eu', 'ERROR', 'La he liado parda. El fallo est&aacute; en mi lado, pero no te preocupes, ahor&aacute; mismo el inform&aacute;tico estar&aacute; sudando tinta gorda para arreglarlo.', null);
-INSERT INTO text VALUES ('ERROR_500_SOLUTION',    'es', 'ERROR', 'Prueba una soluci&oacute;n:', null);
+INSERT INTO text VALUES ('ERROR_500_DESCRIPTION', 'eu', 'ERROR', 'La he liado parda. El fallo está en mi lado, pero no te preocupes, ahorá mismo el informático estará sudando tinta gorda para arreglarlo.', null);
+INSERT INTO text VALUES ('ERROR_500_SOLUTION',    'es', 'ERROR', 'Prueba una solución:', null);
 INSERT INTO text VALUES ('ERROR_500_SOLUTION',    'en', 'ERROR', 'Try a solution:', null);
-INSERT INTO text VALUES ('ERROR_500_SOLUTION',    'eu', 'ERROR', 'Prueba una soluci&oacute;n:', null);
-INSERT INTO text VALUES ('ERROR_500_SOLUTION_0',  'es', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
+INSERT INTO text VALUES ('ERROR_500_SOLUTION',    'eu', 'ERROR', 'Prueba una solución:', null);
+INSERT INTO text VALUES ('ERROR_500_SOLUTION_0',  'es', 'ERROR', 'Volver a la página anterior', null);
 INSERT INTO text VALUES ('ERROR_500_SOLUTION_0',  'en', 'ERROR', 'Go to the previous page', null);
-INSERT INTO text VALUES ('ERROR_500_SOLUTION_0',  'eu', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
-INSERT INTO text VALUES ('ERROR_500_SOLUTION_1',  'es', 'ERROR', 'Ir a la p&aacute; principal', null);
+INSERT INTO text VALUES ('ERROR_500_SOLUTION_0',  'eu', 'ERROR', 'Volver a la página anterior', null);
+INSERT INTO text VALUES ('ERROR_500_SOLUTION_1',  'es', 'ERROR', 'Ir a la pá principal', null);
 INSERT INTO text VALUES ('ERROR_500_SOLUTION_1',  'en', 'ERROR', 'Go to the main page', null);
-INSERT INTO text VALUES ('ERROR_500_SOLUTION_1',  'eu', 'ERROR', 'Ir a la p&aacute; principal', null);
-INSERT INTO text VALUES ('ERROR_500_SOLUTION_2',  'es', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_500_SOLUTION_1',  'eu', 'ERROR', 'Ir a la pá principal', null);
+INSERT INTO text VALUES ('ERROR_500_SOLUTION_2',  'es', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 INSERT INTO text VALUES ('ERROR_500_SOLUTION_2',  'en', 'ERROR', 'Watch cute cat videos in Youtube', null);
-INSERT INTO text VALUES ('ERROR_500_SOLUTION_2',  'eu', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_500_SOLUTION_2',  'eu', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 INSERT INTO text VALUES ('ERROR_XXX_TITLE',       'es', 'ERROR', 'Error inesperado', null);
 INSERT INTO text VALUES ('ERROR_XXX_TITLE',       'en', 'ERROR', 'Unexpected error', null);
 INSERT INTO text VALUES ('ERROR_XXX_TITLE',       'eu', 'ERROR', 'Error inesperado', null);
 INSERT INTO text VALUES ('ERROR_XXX_DESCRIPTION', 'es', 'ERROR', 'Algo ha ido mal...', null);
 INSERT INTO text VALUES ('ERROR_XXX_DESCRIPTION', 'en', 'ERROR', 'Something went wrong...', null);
 INSERT INTO text VALUES ('ERROR_XXX_DESCRIPTION', 'eu', 'ERROR', 'Algo ha ido mal...', null);
-INSERT INTO text VALUES ('ERROR_XXX_SOLUTION',    'es', 'ERROR', 'Prueba una soluci&oacute;n:', null);
+INSERT INTO text VALUES ('ERROR_XXX_SOLUTION',    'es', 'ERROR', 'Prueba una solución:', null);
 INSERT INTO text VALUES ('ERROR_XXX_SOLUTION',    'en', 'ERROR', 'Try a solution:', null);
-INSERT INTO text VALUES ('ERROR_XXX_SOLUTION',    'eu', 'ERROR', 'Prueba una soluci&oacute;n:', null);
-INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_0',  'es', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
+INSERT INTO text VALUES ('ERROR_XXX_SOLUTION',    'eu', 'ERROR', 'Prueba una solución:', null);
+INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_0',  'es', 'ERROR', 'Volver a la página anterior', null);
 INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_0',  'en', 'ERROR', 'Go to the previous page', null);
-INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_0',  'eu', 'ERROR', 'Volver a la p&aacute;gina anterior', null);
-INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_1',  'es', 'ERROR', 'Ir a la p&aacute; principal', null);
+INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_0',  'eu', 'ERROR', 'Volver a la página anterior', null);
+INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_1',  'es', 'ERROR', 'Ir a la pá principal', null);
 INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_1',  'en', 'ERROR', 'Go to the main page', null);
-INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_1',  'eu', 'ERROR', 'Ir a la p&aacute; principal', null);
-INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_2',  'es', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_1',  'eu', 'ERROR', 'Ir a la pá principal', null);
+INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_2',  'es', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_2',  'en', 'ERROR', 'Watch cute cat videos in Youtube', null);
-INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_2',  'eu', 'ERROR', 'Ver v&iacute;deos de gatitos en Youtube', null);
+INSERT INTO text VALUES ('ERROR_XXX_SOLUTION_2',  'eu', 'ERROR', 'Ver vídeos de gatitos en Youtube', null);
 
 
 -- TABLE project_type
@@ -408,7 +448,7 @@ INSERT INTO project_type VALUES ('S', 'PROJECT_TYPE_S', 'PROJECT_TYPE_S_SUMMARY'
 INSERT INTO text VALUES ('URL_TYPE_W',         'es', 'DB_URL_TYPE', 'Ver sitio web', null);
 INSERT INTO text VALUES ('URL_TYPE_W',         'en', 'DB_URL_TYPE', 'Go to web site', null);
 INSERT INTO text VALUES ('URL_TYPE_W',         'eu', 'DB_URL_TYPE', 'Horrialdera', null);
-INSERT INTO text VALUES ('URL_TYPE_W_SUMMARY', 'es', 'DB_URL_TYPE', 'Ver el sitio web.', null);
+INSERT INTO text VALUES ('URL_TYPE_W_SUMMARY', 'es', 'DB_URL_TYPE', 'Ver sitio wew de este proyecto.', null);
 INSERT INTO text VALUES ('URL_TYPE_W_SUMMARY', 'en', 'DB_URL_TYPE', 'See web site.', null);
 INSERT INTO text VALUES ('URL_TYPE_W_SUMMARY', 'eu', 'DB_URL_TYPE', 'Horrialdera.', null);
 INSERT INTO text VALUES ('URL_TYPE_P',         'es', 'DB_URL_TYPE', 'Google Play', null);
@@ -426,7 +466,7 @@ INSERT INTO text VALUES ('URL_TYPE_A_SUMMARY', 'eu', 'DB_URL_TYPE', 'App Store-a
 INSERT INTO text VALUES ('URL_TYPE_G',         'es', 'DB_URL_TYPE', 'Github', null);
 INSERT INTO text VALUES ('URL_TYPE_G',         'en', 'DB_URL_TYPE', 'Github', null);
 INSERT INTO text VALUES ('URL_TYPE_G',         'eu', 'DB_URL_TYPE', 'Github', null);
-INSERT INTO text VALUES ('URL_TYPE_G_SUMMARY', 'es', 'DB_URL_TYPE', 'Ver c&oacute;digo fuente en Github.', null);
+INSERT INTO text VALUES ('URL_TYPE_G_SUMMARY', 'es', 'DB_URL_TYPE', 'Ver código fuente en Github.', null);
 INSERT INTO text VALUES ('URL_TYPE_G_SUMMARY', 'en', 'DB_URL_TYPE', 'Checkout source code on Github.', null);
 INSERT INTO text VALUES ('URL_TYPE_G_SUMMARY', 'eu', 'DB_URL_TYPE', 'Kodea Github-n.', null);
 INSERT INTO text VALUES ('URL_TYPE_M',         'es', 'DB_URL_TYPE', 'Ver', null);
@@ -436,7 +476,7 @@ INSERT INTO text VALUES ('URL_TYPE_M_SUMMARY', 'es', 'DB_URL_TYPE', 'Ver', null)
 INSERT INTO text VALUES ('URL_TYPE_M_SUMMARY', 'en', 'DB_URL_TYPE', 'See', null);
 INSERT INTO text VALUES ('URL_TYPE_M_SUMMARY', 'eu', 'DB_URL_TYPE', 'Ikusi', null);
 INSERT INTO project_url_type VALUES ('E', null, null, null);
-INSERT INTO project_url_type VALUES ('W', 'URL_TYPE_W', 'URL_TYPE_W_SUMMARY', 'www.svg');
+INSERT INTO project_url_type VALUES ('W', 'URL_TYPE_W', 'URL_TYPE_W_SUMMARY', 'web.svg');
 INSERT INTO project_url_type VALUES ('P', 'URL_TYPE_P', 'URL_TYPE_P_SUMMARY', 'google_play.svg');
 INSERT INTO project_url_type VALUES ('A', 'URL_TYPE_A', 'URL_TYPE_A_SUMMARY', 'app_store.svg');
 INSERT INTO project_url_type VALUES ('G', 'URL_TYPE_G', 'URL_TYPE_G_SUMMARY', 'github.svg');

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov