Skip to content
This repository has been archived by the owner on Oct 11, 2018. It is now read-only.

Commit

Permalink
Version 1.10.3
Browse files Browse the repository at this point in the history
• Animate main menu of users module.
• Add logo assets.
• Update dependancies, code cleaning & fix some under the hood bugs.
  • Loading branch information
natolh committed Sep 30, 2018
1 parent 2379fdf commit 0b9147a
Show file tree
Hide file tree
Showing 30 changed files with 202 additions and 142 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ __pycache__
.mypy_cache
.pytest_cache
.env
*.pid

# Configuration
*.cfg
Expand Down
141 changes: 71 additions & 70 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added assets/logo.afdesign
Binary file not shown.
13 changes: 13 additions & 0 deletions assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions linnote/account/controllers.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class AccountLoginController(MethodView):
"""Controller for managing user login task."""

decorators = [skip_if_authenticated]
template = 'authentification/login.html'
template = 'account/authentification/login.html'

def get(self):
"""
Expand Down Expand Up @@ -72,7 +72,7 @@ class AccountProfileController(MethodView):
"""

decorators = [login_required]
template = 'profile.html'
template = 'account/profile.html'

def get(self):
"""Display the profile."""
Expand All @@ -98,7 +98,7 @@ class AccountPasswordController(MethodView):
"""Controller for managing the user's account password."""

decorators = [login_required]
template = 'password.html'
template = 'account/password.html'

def get(self):
"""Get the password modification formular."""
Expand Down Expand Up @@ -128,7 +128,7 @@ def render(cls, **kwargs):
class AccountResetController(MethodView):
"""Controller for resetting the user's account password."""

template = 'authentification/reset.html'
template = 'account/authentification/reset.html'

def get(self):
"""Build user's account password reset view."""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1>compte</h1>
</a>
</li>
</menu>
{% include 'menu.html' %}
{% include 'account/menu.html' %}
</header>

<section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1>compte</h1>
</a>
</li>
</menu>
{% include 'menu.html' %}
{% include 'account/menu.html' %}
</header>

<section>
Expand Down
12 changes: 6 additions & 6 deletions linnote/assessments/controllers.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AssessmentsController(MethodView):
"""Controls assessments view."""

decorators = [login_required]
template = 'assessments.html'
template = 'assessments/assessments.html'

def get(self):
"""Build assessments view."""
Expand Down Expand Up @@ -85,7 +85,7 @@ def rank(assessment, groups_id=None) -> None:
class AssessmentCreationController(AssessmentController):
"""Controls assessment's creation view."""

template = 'assessment/creation.html'
template = 'assessments/assessment/creation.html'

def get(self):
"""Build assessment's creation view."""
Expand Down Expand Up @@ -124,7 +124,7 @@ def post(self):
class AssessmentSettingsController(AssessmentController):
"""Controls assessment's settings view."""

template = 'assessment/settings.html'
template = 'assessments/assessment/settings.html'

def get(self, identifier):
"""Build assessment's settings view."""
Expand Down Expand Up @@ -158,7 +158,7 @@ class AssessmentResultsController(MethodView):
"""Controls assessment's results view."""

decorators = [login_required]
template = 'assessment/results.html'
template = 'assessments/assessment/results.html'

def get(self, identifier):
"""Build assessment's results view."""
Expand Down Expand Up @@ -197,7 +197,7 @@ class MergeController(MethodView):
"""Controls assessments merging view."""

decorators = [login_required]
template = 'merger.html'
template = 'assessments/merger.html'

def get(self):
"""Build assessments merging view."""
Expand Down Expand Up @@ -243,7 +243,7 @@ def render(cls, **kwargs):
class AssessmentRankingsController(MethodView):
"""Controls assessment's report view."""

template = 'assessment/rankings.html'
template = 'assessments/assessment/rankings.html'

def get(self, identifier):
"""Build assessment's rankings view."""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1>{{ assessment.title }}</h1>
</button>
</li>
</menu>
{% include 'assessment/menu.html' %}
{% include 'assessments/assessment/menu.html' %}
</header>
<section>
<header>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% block content %}
<header>
<h1>{{ assessment.title }}</h1>
{% include 'assessment/menu.html' %}
{% include 'assessments/assessment/menu.html' %}
</header>
<section>
<form method="post" enctype="multipart/form-data">
Expand Down
Loading

0 comments on commit 0b9147a

Please sign in to comment.