Commit Graph

50 Commits

Author SHA1 Message Date
Ivan Hörler 29e99e49c0 Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
* 'cart' of git.2li.ch:ibz/web_AI-5:
  some corrections to comply with PEP8
  remove the inline pictures from the Article admin page
  add surround the submit button with a P Tag
  add another use case
  fix a typo
  add a entry about testing
  correct the bib entries
  correct spelling mistakes
  wrap the jinja template in a sexylisting environment
  remove todo tag
  add empty lines for better visibiliy
  remove whitespace
  add a source for fixtures
2018-02-18 21:59:04 +01:00
Ivan Hörler cb19ca6205 add amountform not working yet 2018-02-18 21:58:46 +01:00
Andreas Zweili 190242bbb7 add surround the submit button with a P Tag 2018-02-18 18:33:14 +01:00
Ivan Hörler 7f98e528e9 Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
* 'cart' of git.2li.ch:ibz/web_AI-5:
  fix "Varianten" heading
  correct wording
  correct false escaping in the documentation
  exend the section "Varianten"
  move a section
  remove a comment and some todo tags
  add the currency name to all the prices
2018-02-17 10:51:42 +01:00
Ivan Hörler 59073ad8c2 add of checkout form 2018-02-17 10:51:32 +01:00
Ivan Hörler ccee783a98 add local bootstrap to be able to develop offline 2018-02-15 07:46:43 +01:00
Andreas Zweili 9b31f2a20f add the currency name to all the prices 2018-02-13 20:00:15 +01:00
Andreas Zweili 9120b019aa remove the solution with the filter 2018-02-11 22:37:27 +01:00
Andreas Zweili 7a9c06bbba push for review 2018-02-11 21:56:53 +01:00
Ivan Hörler 775f32887a add art# and Price of all items 2018-02-11 18:19:21 +01:00
Ivan Hörler 4f17a85dc7 add total summ 2018-02-04 21:48:29 +01:00
Ivan Hörler ccf823fad2 add amount to template 2018-02-04 20:18:49 +01:00
Ivan Hörler e36e290314 change cart view to list all chosen items 2018-02-04 19:58:17 +01:00
Ivan Hörler e9a24863dc add patch 2018-02-04 19:27:09 +01:00
Ivan Hörler 1fe10e2185 commit for andreas 2018-02-04 18:32:54 +01:00
Ivan Hörler eb77635920 first hit to addtocartform 2018-02-01 17:02:08 +01:00
Andreas Zweili 6ee5f56e73 add the currency calculation to the article view 2018-01-28 21:26:36 +01:00
Andreas Zweili 915f31c413 add the currency calculation to the categories view 2018-01-28 21:14:55 +01:00
Andreas Zweili 62db260ec1 rename the articles_list in the category view 2018-01-28 21:09:27 +01:00
Andreas Zweili fb6831920c remove jquery from the base template 2018-01-28 20:41:32 +01:00
Andreas Zweili 1481727a51 add the currency calculation to the index page 2018-01-28 20:41:14 +01:00
Andreas Zweili c2758afb00 add a name to the register button 2018-01-28 20:30:35 +01:00
Andreas Zweili 138f712e3b add names and ids to forms and buttons 2018-01-28 20:28:36 +01:00
Ivan Hörler dba76057b3 added new generic rss fetch and parse functions and setup to store not only today value but all values in file and update if new are available. 2018-01-21 21:31:26 +01:00
Ivan Hörler b53f52cac1 a work in progress test of custom filters 2018-01-19 15:40:55 +01:00
Ivan Hörler 9d6c4b308c fixed AJAX request and response 2018-01-16 00:54:35 +01:00
Ivan Hörler fce2f77cb2 add same id as value and name now it pops up because of app.js but does override somehow 2018-01-15 00:07:14 +01:00
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