\#5, TODO: Add codes and add sources and versions

Source/assets/html/TOS.twig

@@ -1,4 +1,4 @@
-{% extends "base.twig" %}
+{% extends app.fronthtml~"/base.twig" %}
 {% block content %}
     <div class="container justified" style="font-size: 12pt">
         <h4 style="text-align: center">Terms of service</h4>
@@ -20,7 +20,7 @@
         <p>The registered user in all moment can close their account but all data hosted in CodeShare will remain
             hosted.
             <br>JKA Network is reserved the right to ban the access to account of any user who engage <a
-                    href="index.php?page=doc#vandalism">vandalism</a></p>
+                    href="{{path('doc')}}#vandalism">vandalism</a></p>
         <h4 class="docheader top10" id="cookiePolicy">Cookie policiy</h4>
         <p>In CodeShare are used two differents cookies, one for session system and other for cookies' consent. You can
             block CodeShare cookies but you cannot log in because we cannot check if login was right.

Source/assets/html/code.twig

@@ -25,7 +25,7 @@
             <a href="?page=del&id={{ code.idc }}&lang={{ code.lang }}&version={{ code.version }}" class="btn btn-danger">Delete source</a>
         {% endif %}#}
         {% if page.otherV %}
-            <div style='text-align: center; font-size: 22px; '><a href='?page=code&id={{ code.idc }}&lang={{ code.lang }}'>View version's history</a></div>
+            <div style='text-align: center; font-size: 22px; '><a href='{{ path('codeVer',{'idc': code.idc,'lang': code.lang}) }}'>View version's history</a></div>
         {% endif %}
         {#<div id='QOZU_box'>Se necesita tener JavaScript habilitado para poder ver los comentarios de la web.</div>#}
         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" style="text-align:center;"><h3>Other implementations</h3>
@@ -36,12 +36,12 @@
                     <table>
                         <tr>
                             <th>
-                                <a href="?page=code&id={{ code.idc }}&lang={{ i.lang }}&version={{ i.version }}">Link</a>
+                                <a href="{{ path('code',{'idc': code.idc,'lang': i.lang,'version': i.version}) }}">{{i.lLang}}</a>
                             </th>
                         </tr>
-                        <tr>
-                            <td><strong>Lang: </strong>{{ i.lLang }}</td>
-                        </tr>
+                        {#<tr>
+                            <td><strong>Version: </strong>{{ i.version }}</td>
+                        </tr>#}
                         <tr>
                             <td>
                                 <pre><code class='{{ i.lang }}'>{{ i.code }}</code></pre>

Source/assets/html/error.twig

@@ -1,4 +1,4 @@
-{% extends "base.twig" %}
+{% extends app.fronthtml~"/base.twig" %}
 {% block content %}
     <div class='center'>
     <h1>{{ error.number }} - {{ error.text }}

Source/assets/html/loginregister.twig

@@ -1,4 +1,4 @@
-{% extends "base.twig" %}
+{% extends app.fronthtml~"/base.twig" %}
 {% block content %}
     <div class="container">
         <div class="row">
@@ -11,7 +11,7 @@
             {% if page.state == 1 %}
                 <p class="text-danger">Bad credentials</p>
             {% elseif page.state == 2 %}
-                <p class="text-danger">Email already exits</p>
+                <p class="text-danger">Error during sign-up, check your data</p>
             {% endif %}
             </div>
         </div>
@@ -32,8 +32,7 @@
             </div>
             <div class="form-group">
                 <div class="col-sm-offset-2 col-sm-10">
-                    <button type="submit" class="btn btn-success g-recaptcha" data-sitekey="6Lc7gXAUAAAAAJRaFo99vIkOUWckuGW8IOLtUxwZ"
-                    data-callback="YourOnSubmitFn">Submit</button>
+                    <button type="submit" class="btn btn-success">Submit</button>
                 </div>
             </div>
             <div class="col-sm-offset-1 col-sm-12">
@@ -74,16 +73,14 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="control-label col-sm-3" for="tos">You agree to our <a href="?page=tos">Terms of service</a></label>
+                <label class="control-label col-sm-3" for="tos">You agree to our <a href="{{path('tos')}}">Terms of service</a></label>
                 <div class="col-sm-9">
                     <input type="checkbox"  required="required" name="tos" id="tos">
                 </div>
             </div>
             <div class="form-group">
                 <div class="col-sm-offset-2 col-sm-10">
-                    <button type="submit" class="btn btn-success g-recaptcha"
-                    data-sitekey="6Lc7gXAUAAAAAJRaFo99vIkOUWckuGW8IOLtUxwZ"
-                    data-callback="YourOnSubmitFn">Submit</button>
+                    <button type="submit" class="btn btn-success">Submit</button>
                 </div>
             </div>
             <div class="col-sm-offset-1 col-sm-12">
@@ -128,7 +125,7 @@
         document.getElementById("emailre").onchange = checkEmail;
         document.getElementById("emailre-re").onchange = checkEmail;
 
-        {% if page.page == "register" or page.state == 2 %}
+        {% if page.page == "sign-up" or page.state == 2 %}
         nowRegister();
         {% endif %}
 

Source/assets/html/nav.twig

@@ -34,17 +34,17 @@
                 </li>
                 {% if user.nick is defined %}
                     <li {% if page.page == "user" %}class="active"{% endif %}>
-                        <a href="?page=user">{{ user.nick }}</a>
+                        <a href="{{path('user')}}">{{ user.nick }}</a>
                     </li>
                     <li>
-                        <a href="?page=logout">Log out</a>
+                        <a href="{{ path('logout')}}">Log out</a>
                     </li>
                 {% else %}
                     <li {% if page.page == "login" %}class="active"{% endif %}>
-                        <a href="?page=login">Log in</a>
+                        <a href="{{ path('login') }}">Log in</a>
                     </li>
                     <li {% if page.page == "register" %}class="active"{% endif %}>
-                        <a href="?page=register">Register</a>
+                        <a href="{{ path('register') }}">Register</a>
                     </li>
                 {% endif %}
             </ul>

Source/assets/html/otherVersion.twig

@@ -1,4 +1,4 @@
-{% extends "base.twig" %}
+{% extends app.fronthtml~"/base.twig" %}
 {% block content %}
-        {% include "firstCodes.twig" %}
+        {% include app.fronthtml~"/firstCodes.twig" %}
 {% endblock %}

Source/assets/html/user.twig

@@ -1,4 +1,4 @@
-{% extends "base.twig" %}
+{% extends app.fronthtml~"/base.twig" %}
 {% block content %}
     <h4 style="text-align: center" xmlns="http://www.w3.org/1999/html">{{ user.nick }}</h4>
     <div class="container">