Commit Graph

23 Commits

Author SHA1 Message Date
Ivan Hörler
1f0940a2a6 updated to newer syntax 2018-01-14 22:11:57 +01:00
Ivan Hörler
c7d9e62f05 again. 2018-01-14 22:11:34 +01:00
Ivan Hörler
5e91470470 Revert "change function name from camelcase to python syntactical underlines"
This reverts commit 213d231c81.
2018-01-14 22:09:18 +01:00
Ivan Hörler
213d231c81 change function name from camelcase to python syntactical underlines 2018-01-14 22:02:43 +01:00
Ivan Hörler
e765a999c6 divided the navigation to separate file. 2018-01-14 19:57:22 +01:00
Ivan Hörler
05b77b8845 unfinished part of currency dropdown 2018-01-14 17:13:41 +01:00
Ivan Hörler
013d3d2d28 falsche vorgehensweise um settings.py zurück zu bekommen 2018-01-14 14:07:53 +01:00
Ivan Hörler
368c7342ef add of a dropdown and footerinformation nicely 2018-01-14 13:43:13 +01:00
Andreas Zweili
852751bc27 Merge branch 'frontendstyling' into andreas 2018-01-13 08:29:31 +01:00
Andreas Zweili
3b73c67c66 add pictures to the article details page 2017-12-31 15:12:09 +01:00
Ivan Hörler
d500712dc2 changed some of the views and implemented a more selfish perspective of a shop.
For shure not ideal and in NO way DRY but a solution for now.
2017-12-29 22:32:27 +01:00
Ivan Hörler
dc083d9c5e Merge branch 'currency' into frontendstyling
* currency: (25 commits)
  changed view and deleted the database unique filed
  add tableview in /currencies
  checkout the production branch on the production server
  add a registration
  disable debugging for production
  add a user profile
  extend the base template with login, profile and logout links
  add templates to support user authentication
  add url patterns to support user authentication
  remove an unnecessary shebang
  remove unnecessary attributes from the Person model
  redirect logins back to the index
  make imports more explicit
  remove an unnecessary configuration
  remove an old file
  change the article status to active
  change the content include because the org-mode file is called doku
  add a python package to the ansible role
  add fixtures with test data
  Add date to currencies list
  ...

# Conflicts:
#	Vagrantfile
#	ansible/roles/web_AI-5/tasks/main.yml
#	django/didgeridoo/didgeridoo/settings.py
#	django/didgeridoo/webshop/templates/webshop/base.html
2017-12-29 19:43:16 +01:00
Andreas Zweili
1f3ab70dd6 add a registration 2017-12-29 16:46:21 +01:00
Ivan Hörler
7bb875e696 selfmade css file 2017-12-29 15:12:29 +01:00
Ivan Hörler
45ca9ca55e unfinshed atempt to make a nav abandoned for later use maybe 2017-12-29 15:11:45 +01:00
Andreas Zweili
d8a1d9ef54 add a user profile 2017-12-28 19:22:00 +01:00
Andreas Zweili
59db6e221e extend the base template with login, profile and logout links 2017-12-28 19:21:29 +01:00
Andreas Zweili
de3e07dedb add templates to support user authentication 2017-12-28 19:20:28 +01:00
Andreas Zweili
bc3b14b5dd add a base.html file and refactor the other html files 2017-12-19 20:21:46 +01:00
Andreas Zweili
e63627ca4f fix the category list 2017-12-17 19:37:49 +01:00
Andreas Zweili
6894a1bfba add a view to show the details of an article 2017-12-17 10:37:04 +01:00
Andreas Zweili
7c5af973f2 add a view to list all articles in a category 2017-12-17 10:36:44 +01:00
Andreas Zweili
cc313a50f3 add an index view and a coresponding template 2017-12-17 10:35:21 +01:00