From f600e174b11e269b0956b90363178013aeaa8fb0 Mon Sep 17 00:00:00 2001 From: Skia Date: Sat, 16 Jul 2016 16:35:45 +0200 Subject: [PATCH] CSS and templating, Sith begins to look nice --- core/management/commands/populate.py | 2 +- core/static/core/base.css | 45 +++++ core/static/core/form.css | 188 +++++++++++++++++++ core/static/core/img/logo.png | Bin 0 -> 10072 bytes core/static/core/style.css | 160 +++++++++++++++- core/templates/core/base.jinja | 36 ++-- core/templates/core/page_detail.jinja | 5 +- core/templates/core/user_detail.jinja | 26 +-- core/templates/core/user_edit.jinja | 4 +- core/templates/core/user_tools.jinja | 1 - counter/templates/counter/counter_main.jinja | 4 +- 11 files changed, 429 insertions(+), 42 deletions(-) create mode 100644 core/static/core/base.css create mode 100644 core/static/core/form.css create mode 100644 core/static/core/img/logo.png diff --git a/core/management/commands/populate.py b/core/management/commands/populate.py index f1b6c0a8..dc5d3efb 100644 --- a/core/management/commands/populate.py +++ b/core/management/commands/populate.py @@ -117,7 +117,7 @@ Cette page vise à documenter la syntaxe *Markdown* utilisée sur le site. p.set_lock(skia) p.save() with open(os.path.join(root_path)+'/README.md', 'r') as rm: - PageRev(page=p, title="REAMDE", author=skia, content=rm.read()).save() + PageRev(page=p, title="README", author=skia, content=rm.read()).save() # Subscription ## Skia diff --git a/core/static/core/base.css b/core/static/core/base.css new file mode 100644 index 00000000..35eced0d --- /dev/null +++ b/core/static/core/base.css @@ -0,0 +1,45 @@ +/*--------------------------------RESET--------------------------------*/ +/*--------------------------------RESET--------------------------------*/ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/core/static/core/form.css b/core/static/core/form.css new file mode 100644 index 00000000..007f1cbb --- /dev/null +++ b/core/static/core/form.css @@ -0,0 +1,188 @@ +/* ---------------------------------------------------------------------------------------------------- +Super Form Reset +----------------------------------------------------------------------------------------------------*/ + +input, +label, +select, +button, +textarea +{ + margin: 0; + border: 0; + padding: 0; + display: inline-block; + vertical-align: middle; + white-space: normal; + background: none; + line-height: 1; + + /* Browsers have different default form fonts */ + font-size: 13px; + font-family: Arial; +} + +/* Remove the stupid outer glow in Webkit */ +input:focus +{ + outline: 0; +} + +/* Box Sizing Reset +-----------------------------------------------*/ + +/* All of our custom controls should be what we expect them to be */ +input, +textarea +{ + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +/* These elements are usually rendered a certain way by the browser */ +button, +input[type=reset], +input[type=button], +input[type=submit], +input[type=checkbox], +input[type=radio], +select +{ + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +/* Text Inputs +-----------------------------------------------*/ + +input[type=date], +input[type=datetime], +input[type=datetime-local], +input[type=email], +input[type=month], +input[type=number], +input[type=password], +input[type=range], +input[type=search], +input[type=tel], +input[type=text], +input[type=time], +input[type=url], +input[type=week] +{ + background-color: white; + border: 1px solid black; + padding: 2px; + border-radius: 2px; +} + +/* Button Controls +-----------------------------------------------*/ + +input[type=checkbox], +input[type=radio] +{ + width: 13px; + height: 13px; +} + +/* File Uploads +-----------------------------------------------*/ + +input[type=file] +{ + +} + +/* Search Input +-----------------------------------------------*/ + +/* Make webkit render the search input like a normal text field */ +input[type=search] +{ + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; +} + +/* Turn off the recent search for webkit. It adds about 15px padding on the left */ +::-webkit-search-decoration +{ + display: none; +} + +/* Buttons +-----------------------------------------------*/ + +button, +input[type="reset"], +input[type="button"], +input[type="submit"] +{ + /* Fix IE7 display bug */ + overflow: visible; + width: auto; + cursor: pointer; + padding: 3px; + border: 1px solid black; + border-radius: 2px; + background-color: white; +} + +button:hover, +input[type="reset"]:hover, +input[type="button"]:hover, +input[type="submit"]:hover +{ + box-shadow: 0 0 2px #000; +} + +button:active, +input[type="reset"]:active, +input[type="button"]:active, +input[type="submit"]:active +{ + box-shadow: inset 0 0 2px #000; +} + +/* IE8 and FF freak out if this rule is within another selector */ +::-webkit-file-upload-button +{ + padding: 0; + border: 0; + background: none; +} + +/* Textarea +-----------------------------------------------*/ + +textarea +{ + /* Move the label to the top */ + vertical-align: top; + + /* Turn off scroll bars in IE unless needed */ + overflow: auto; +} + +/* Selects +-----------------------------------------------*/ + +select +{ + +} + +select[multiple] +{ + /* Move the label to the top */ + vertical-align: top; +} + +/* Tables +-----------------------------------------------*/ +tbody>tr{ + display: block; + margin: 3px; +} diff --git a/core/static/core/img/logo.png b/core/static/core/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..6d23a853842dd4953fa9172542a8567c4e0cfc51 GIT binary patch literal 10072 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 X*IYr0%6<4PIDmqTige{ClW+eI1rFCy literal 0 HcmV?d00001 diff --git a/core/static/core/style.css b/core/static/core/style.css index 5da7a456..a3a7b5c4 100644 --- a/core/static/core/style.css +++ b/core/static/core/style.css @@ -1,9 +1,161 @@ -body { - background: #EEE; +/*--------------------------------GENERAL------------------------------*/ +body{ + background-color:#EEE; + position: relative; + width: 100%; + font-family: sans-serif; +} +/*--------------------------------HEADER-------------------------------*/ +#logo { + margin-left: 5%; +} +header { + display: block; + position: absolute; + top : 0px; + right : 8%; + left: 40%; + background-color:#DDD; + height: 3em; +} +header a { + display: inline-block; + color: inherit; + text-decoration: none; + padding: 1em; +} +header a:hover { + color: #2D3; } -div { - box-shadow: 2px 2px 10px #888888; +/*---------------------------------NAV---------------------------------*/ +nav { + display: block; + width: 90%; + margin: 0px auto; + background: grey; + color: white; +} + +nav a { + color: white; + font-style: normal; + font-weight: bolder; + text-decoration: none; + display: inline-block; + padding: 20px; +} +nav a:hover { + background: purple; +} + +/*--------------------------------CONTENT------------------------------*/ +#content { + width: 88%; + margin: 0px auto; + padding: 1em 1%; + background: white; +} + +h1, h2, h3, h4, h5, h6 { + font-weight: bold; + margin-top: 0.5em; +} + +h1 { + font-size: 160%; + margin-left: 50px; +} + +h2 { + font-size: 150%; + margin-left: 40px; +} + +h3 { + font-size: 140%; + margin-left: 30px; +} + +h4 { + font-size: 130%; + margin-left: 20px; +} + +h5 { + font-size: 120%; + margin-left: 10px; +} + +h6 { + font-size: 110%; + margin-left: 0px; +} + +p, pre { + margin-top: 1em; + margin-left: 0px; +} + +ul, ol { + margin-top: 1em; + list-style-type: disc; + margin-left: 25px; +} + +.edit-bar { + display: block; + margin: 4px; +} +.edit-bar a { + display: inline-block; + margin: 4px; +} + +/*-----------------------------USER PROFILE----------------------------*/ +.user_profile { +} +/*---------------------------------PAGE--------------------------------*/ +.page_content { + display: block; margin: 10px; padding: 10px; + background: white; +} + +.page_content code { + font-family: monospace; + color: white; + background: black; + display: inline-block; + padding: 4px; + line-height: 120%; +} + +/*--------------------------------FOOTER-------------------------------*/ +footer{ + text-align: center; +} + +/*--------------------------------MODALE-------------------------------*/ +.form-wrapper { + display: inline-block; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: #DDD; + opacity: 0.8; + padding: 15px; + border-radius: 4px; +} +.form-wrapper>form { + display: inline-block; + position: absolute; + padding: 15px; + border-radius: 4px; + left: 30%; + top: 40%; + background-color: white; } diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja index 22ee71fc..33edbbdc 100644 --- a/core/templates/core/base.jinja +++ b/core/templates/core/base.jinja @@ -3,6 +3,8 @@ {% block head %} {% block title %}Bienvenue sur le Sith de l'AE!{% endblock %} + + @@ -10,28 +12,24 @@ + + {% block header %}
- {% block header %} - {% if user.is_authenticated() %}Hello, {{ user.username }}!{% endif %} -
    - {% if not user.is_authenticated() %} -
  • Register
    • -
  • Login
    • - {% else %} -
  • Logout
    • - {% endif %} -
- {% if user.is_authenticated() %} - + {% if not user.is_authenticated() %} + Register | + Login + {% else %} + {{ user.get_display_name() }} | + Tools | + Logout {% endif %} - {% endblock %}
+ {% endblock %} +
{% if error %} diff --git a/core/templates/core/page_detail.jinja b/core/templates/core/page_detail.jinja index 889698bf..5c3bb3d2 100644 --- a/core/templates/core/page_detail.jinja +++ b/core/templates/core/page_detail.jinja @@ -11,13 +11,14 @@ {% endif %}

You're seeing the page {{ page.get_display_name() }} - History

+
{% if rev %}

This may not be the last update, you are seeing revision {{ rev.id }}!

{{ rev.title }}

-

{{ rev.content|markdown }}

+
{{ rev.content|markdown }}
{% else %}

{{ page.revisions.last().title }}

-

{{ page.revisions.last().content|markdown }}

+
{{ page.revisions.last().content|markdown }}
{% endif %} {% endblock %} diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja index 86272a5e..4e5febd0 100644 --- a/core/templates/core/user_detail.jinja +++ b/core/templates/core/user_detail.jinja @@ -5,24 +5,25 @@ {% endblock %} {% block content %} -

User Profile

-

Back to list

- -
    +
    {% if can_edit(profile, request.user) or user.id == profile.id %} -
  • Edit
    • + Edit {% endif %} {% if can_edit_prop(profile, request.user) %} -
  • Props
    • + Props {% endif %} -
+
-

-You're seeing the profile of {{ profile.get_full_name() }}
-{{ profile.nick_name }}
-{{ profile.date_of_birth|date("d/m/Y") }} -

+

User Profile

+
+ + +{% if user.membership.filter(end_date=None).exists() %}

{% if get_subscriber(profile).is_subscribed() %} User is subscriber until {{ get_subscriber(profile).subscriptions.last().subscription_end }} @@ -30,6 +31,7 @@ User is subscriber until {{ get_subscriber(profile).subscriptions.last().subscri User is not subscribed. New subscription {% endif %}

+{% endif %} {% endblock %} diff --git a/core/templates/core/user_edit.jinja b/core/templates/core/user_edit.jinja index f7ac879d..87489a1b 100644 --- a/core/templates/core/user_edit.jinja +++ b/core/templates/core/user_edit.jinja @@ -7,7 +7,9 @@ {{ form.as_p() }}

-

Change my password

+ {% if form.instance == user %} +

Change my password

+ {% endif %} {% endblock %} diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja index 443350fd..ec9e6312 100644 --- a/core/templates/core/user_tools.jinja +++ b/core/templates/core/user_tools.jinja @@ -6,7 +6,6 @@ {% block content %}

User Tools

-

Back to profile

Sith management

    diff --git a/counter/templates/counter/counter_main.jinja b/counter/templates/counter/counter_main.jinja index 156d7cea..7c01f0d9 100644 --- a/counter/templates/counter/counter_main.jinja +++ b/counter/templates/counter/counter_main.jinja @@ -32,7 +32,7 @@
    {% csrf_token %} {{ form.as_p() }} - +

    {% else %}

    Please, login

    @@ -48,7 +48,7 @@
    {% csrf_token %} {{ login_form.as_p() }} - +

    {% endblock %}