Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Templatework #4

Open
wants to merge 35 commits into
base: develop
Choose a base branch
from
Open

Templatework #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d1e58cb
Template cloned in delegues :D
Nov 14, 2015
e241a3a
Added bootstrap css and js, plus jquery
Nov 14, 2015
17b23a3
Merge pull request #1 from agepoly/origin/templatework
Nov 14, 2015
f1f9e29
First version of header
Nov 15, 2015
575c53d
Finished first version of home page
Nov 16, 2015
5000597
Added forum name. SWAG.
Nov 16, 2015
54c8084
Added login (/login) and padding for submit button
Nov 16, 2015
4bc1fd3
Better table, better bottom navbar
Nov 18, 2015
ca3fe3d
polydeg
Nov 19, 2015
06dca82
Nice Forum-view
Nov 19, 2015
9ede572
Start work on user search
Nov 19, 2015
2604e12
Merge branch 'templatework' of https://github.com/agepoly/delegues in…
Nov 19, 2015
204232a
Change tree view in Topic
jeannechaverot Nov 19, 2015
710e70b
Merge branch 'templatework' of https://github.com/agepoly/delegues in…
jeannechaverot Nov 19, 2015
3f83577
Edit user search as expected
Nov 20, 2015
d7e5d71
Add better select
Nov 20, 2015
4f8b0fb
Add AGEP colors
Nov 26, 2015
0b25751
Add panel around reply
jeannechaverot Nov 26, 2015
e896570
Merge branch 'templatework' of https://github.com/agepoly/delegues in…
jeannechaverot Nov 26, 2015
8b0bfb3
Changes to search results and alerts
Nov 26, 2015
da01927
Merge branch 'templatework' of https://github.com/agepoly/delegues in…
Nov 26, 2015
2f90985
Finish search (for now)
Nov 26, 2015
1efcd50
Add table for post
jeannechaverot Nov 26, 2015
6d6ca9b
Modified account settings, all for nothing :'(
Nov 26, 2015
bc0912d
Merge branch 'templatework' of https://github.com/agepoly/delegues in…
Nov 26, 2015
cd8d07e
New post changes
Nov 26, 2015
83da6a1
DiStyle post using biatch divs
Nov 26, 2015
aeb63e6
Merge branch 'templatework' of https://github.com/agepoly/delegues in…
Nov 26, 2015
efc12b1
Add better div management in topic
Dec 2, 2015
5cee6ec
Add container for better visibility
Dec 2, 2015
6526502
Nice topic view
Dec 2, 2015
4bbfa53
Remove authority and reputation
Dec 2, 2015
30eb0b4
Fix divs in search pages
Dec 2, 2015
e7d6471
Small div changes
Dec 3, 2015
827f519
Add better forum view
Dec 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion delegues/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'DIRS': [os.path.join(BASE_DIR, 'delegues/templates/')],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
Expand All @@ -86,6 +86,10 @@
},
]

STATICFILES_DIRS = (
'delegues/static/',
)

WSGI_APPLICATION = 'delegues.wsgi.application'


Expand Down Expand Up @@ -129,3 +133,10 @@
from .local_settings import *
except ImportError:
pass


# Forum settings

DJANGOBB_FORUM_BASE_TITLE = 'Plateforme des délégués'
DJANGOBB_HEADER = 'AGEPolytique'
DJANGOBB_TAGLINE = "La plateforme des délégués de l'EPFL"
Loading