moved files
moved files
Ambiguous directory is renamed.
New branch + db setup
Merge pull request #2 from dmozina/master

Pull request for DB
Merge branch 'master' of https://github.com/ipri2013/portalznanja
Validating server.

Page not found (404)
IPRI assignment 2 parts: 5, 6 finished! Part 7 is 30% done.

Added web module for all frontend files. urls.py has been updated to include some paths used on the portal.
views.py was created within the web module and views were added for paths: /, /login, /logout, /search, /user.
Templates and web files (html, css) were created and added to web module.

Login view not disimbagutes get and post requests, additional functionality should be added to the post section to support user login and session creation.

settings.py was fixed to include relative path to the .db file instead of absolute.
Merge pull request #3 from busho/master

Ipri assignment 2, parts 5,6 - views, templates, error pages
User model added.
models.py is added.

Video_Resource (Title, Url, Lenght, Quality, Genre, Rating)
User_Preferences(Tag, Prefered_videos, language, timezon, prefered_genre) --> FK USER
Comment (Subject, text, datetime)
Audit (user_login, user_logout, session_time) _> FK(User)

N.B. !!!
syncdb was not yet executed.
Models Added.
models.py is added.

Video_Resource (Title, Url, Lenght, Quality, Genre, Rating)
User_Preferences(Tag, Prefered_videos, language, timezon, prefered_genre) --> FK USER
Comment (Subject, text, datetime)
Audit (user_login, user_logout, session_time) _> FK(User)

N.B. !!!
syncdb was not yet executed.
Merge pull request #4 from dmozina/master

User Model
Assignment #2 :: Task #3 is done. The first variant of the models.
Changed a few view types and implemented alpha user login.
Completed and/or updated all IPRI assignments tasks.

Views and templates now successfully output user_firstName is user is authenticated and login action results. Templates and .css data are still pretty much empty, only basic page structure is currently finished.

LoginView now fully supports user login! This can be tested by accessing /user page which is only accessible if user is logged in!
Aside from admin users a new user with credetials test/test was created to test login functionality.

models.py has been updated to have more appropriate tables and fields. Additional models were created.

Also, resolved the conflict in sqlite3.db file.
Merge pull request #5 from busho/master

Finished/checked/updated all IPRI assignments.
User login/logout url. Small changes in /user.
Fixes for assignment #2.
- Footer & Header moved into base.html
- File README contains U&P for development.