diff --git a/tetawebapp/static/styles/tetawebapp.css b/tetawebapp/static/styles/tetawebapp.css index c91896a..eaddf4a 100644 --- a/tetawebapp/static/styles/tetawebapp.css +++ b/tetawebapp/static/styles/tetawebapp.css @@ -41,7 +41,7 @@ main > section.inline > article.right { margin-left: 10px; } -div.content > nav { +div.content > nav.vertical { flex: 0 0 200px; background-color: var(--clear-bg); border-right-color: var(--mid-bg); @@ -49,12 +49,12 @@ div.content > nav { border-right-width: 1px; } -div.content > nav { +div.content > nav.vertical { order: -1; display: block; } -div.content > nav > a { +div.content > nav.vertical > a { display: block; background-color: var(--clear-bg); font-size: 20px; @@ -63,13 +63,13 @@ div.content > nav > a { text-decoration: none; } -div.content > nav > a:hover { +div.content > nav.vertical > a:hover { background-color: var(--coloured-bg); color: var(--white); cursor: pointer; } -div.content > nav > a.selected { +div.content > nav.vertical > a.selected { background-color: var(--light-coloured-bg); } @@ -79,6 +79,53 @@ main { width: 100%; } +main > div.navbar_container { + text-align: center; + padding: 0; + margin: 0; +} + +main > div.navbar_container > ul.horizontal { + display: inline-block; + list-style-type: none; + margin: 10px; + padding: 0; + overflow: hidden; + background-color: var(--clear-bg); + border-color: var(--coloured-bg); + border-style: solid; + border-width: 1px; + color: var(--text-color); + border-radius: 2px; +} + +main > div.navbar_container > ul.horizontal > li { + float: left; +} + +main > div.navbar_container > ul.horizontal > li > a { + display: block; + color: var(--text-color); + text-align: center; + padding: 5px; + text-decoration: none; +} + +main > div.navbar_container > ul.horizontal > li > a:hover { + background-color: var(--coloured-bg); + color: var(--white); +} + +main > div.navbar_container > ul.horizontal > li > a.right_border { + border-right-color: var(--coloured-bg); + border-right-style: solid; + border-right-width: 1px; +} + +main > div.navbar_container > ul.horizontal > li > a.selected { + background-color: var(--light-coloured-bg); +} + main > article { padding: 10px; color: var(--text-color); diff --git a/tetawebapp/templates/ajax.html b/tetawebapp/templates/ajax.html index 3f6ef3d..304e282 100644 --- a/tetawebapp/templates/ajax.html +++ b/tetawebapp/templates/ajax.html @@ -1,4 +1,5 @@ {% extends "index.html" %} +{% block title %}Ajax{% endblock %} {% block main %}

Get HTML response from AJAX

diff --git a/tetawebapp/templates/articles.html b/tetawebapp/templates/articles.html index 68d51de..4c2f6c6 100644 --- a/tetawebapp/templates/articles.html +++ b/tetawebapp/templates/articles.html @@ -1,64 +1,12 @@ {% extends "index.html" %} +{% block title %}Articles{% endblock %} {% block main %} -
-

This is the title

- dummy pic +
+

Choose your article

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore - et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut - aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum - dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui - officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, - sed do eiusmod tempor incididunt ut labore -

-

This link will lead to an error page

-

- et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut - aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum - dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui - officia desers unt mollit anim id est laborum. -

-
    -
  • plop
  • -
  • plap
  • -
  • plip
  • -
-
    -
  1. plop
  2. -
  3. plap
  4. -
  5. plip
  6. -
-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore - et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut - aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum - dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui - officia deserunt mollit anim id est laborum. + Please select your article

-
-

The title is back again and is angry

- dummy pic -

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore - et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut - aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum - dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui - officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, - sed do eiusmod tempor incididunt ut labore -

-

- et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut - aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum - dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui - officia deserunt mollit anim id est laborum. -

-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore - et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut - aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum - dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui - officia deserunt mollit anim id est laborum. -

+
{% endblock %} diff --git a/tetawebapp/templates/articles_by_id.html b/tetawebapp/templates/articles_by_id.html new file mode 100644 index 0000000..b17b68c --- /dev/null +++ b/tetawebapp/templates/articles_by_id.html @@ -0,0 +1,65 @@ +{% extends "index.html" %} +{% block title %}Articles{% endblock %} + {% block main %} +
+

Article #{{ ID }}

+ dummy pic +

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore + et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum + dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui + officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, + sed do eiusmod tempor incididunt ut labore +

+

This link will lead to an error page

+

+ et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum + dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui + officia desers unt mollit anim id est laborum. +

+
    +
  • plop
  • +
  • plap
  • +
  • plip
  • +
+
    +
  1. plop
  2. +
  3. plap
  4. +
  5. plip
  6. +
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore + et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum + dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui + officia deserunt mollit anim id est laborum. +

+
+
+

Another disposition

+ dummy pic +

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore + et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum + dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui + officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, + sed do eiusmod tempor incididunt ut labore +

+

+ et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum + dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui + officia deserunt mollit anim id est laborum. +

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore + et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum + dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui + officia deserunt mollit anim id est laborum. +

+
+ {% endblock %} diff --git a/tetawebapp/templates/basics.html b/tetawebapp/templates/basics.html index da9cb8a..941399f 100644 --- a/tetawebapp/templates/basics.html +++ b/tetawebapp/templates/basics.html @@ -1,4 +1,5 @@ {% extends "index.html" %} +{% block title %}Basics{% endblock %} {% block main %}

Basics

diff --git a/tetawebapp/templates/database.html b/tetawebapp/templates/database.html index 57029fb..df73b8a 100644 --- a/tetawebapp/templates/database.html +++ b/tetawebapp/templates/database.html @@ -1,4 +1,5 @@ {% extends "index.html" %} +{% block title %}Database{% endblock %} {% block main %}

Accessing database

diff --git a/tetawebapp/templates/index.html b/tetawebapp/templates/index.html index 77d2cf3..fa5a7e3 100644 --- a/tetawebapp/templates/index.html +++ b/tetawebapp/templates/index.html @@ -1,7 +1,7 @@ - {% block title %}Accueil{% endblock %} + TetaWebApp - {% block title %}Accueil{% endblock %} @@ -15,19 +15,34 @@
{% block banner %}TetaWebApp{% endblock %}
{% block nav %} -