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

Django templating #32

Open
wants to merge 187 commits into
base: master
Choose a base branch
from
Open

Django templating #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
187 commits
Select commit Hold shift + click to select a range
573fc22
added gitignore and modified manage.py
anjakammer Apr 15, 2015
c6e220e
Merge pull request #2 from NewsdiffsDE/Setup/Project
thomaspuppe Apr 15, 2015
674ef0a
translated article_history_missing.html
Relana Apr 28, 2015
b1d1b7c
Update 404.html
Relana Apr 28, 2015
5f49eb0
translated 500.html
Relana Apr 28, 2015
6082ecd
translated about.html
Relana Apr 28, 2015
1ca3ea8
translated article_history.html
Relana Apr 28, 2015
7abf9ca
translated article_history.xml
Relana Apr 28, 2015
89e4aad
translated browse.html
Relana Apr 28, 2015
416b2e7
translated browse_base.html
Relana Apr 28, 2015
e600556
translated contact.html
Relana Apr 28, 2015
9ba5037
translated diffview.html
Relana Apr 28, 2015
336fed6
translated part of examples.html
Relana Apr 28, 2015
518efb0
translated feed.xml
Relana Apr 28, 2015
7d79ccd
translated find_by_uri.html
Relana Apr 28, 2015
6e0bd13
edited front.html
Relana Apr 28, 2015
10afc18
translated navigation
Relana Apr 28, 2015
14f67a4
translated upvote.html
Relana Apr 28, 2015
28d69ca
minor changes like href fixes
Relana Apr 29, 2015
1fd2e30
corrected Twitterhandle and url
Relana Apr 29, 2015
5b142d1
deleted images in about and front
Relana May 1, 2015
0ddf9e0
corrected some links, deleted unused pages/routing
anjakammer May 4, 2015
d1004ed
deleted unused links
anjakammer May 4, 2015
0655d21
deleted contactForm script
anjakammer May 4, 2015
9caa86b
Merge pull request #3 from NewsdiffsDE/Frontend/ContentTranslation
anjakammer May 4, 2015
8c3069b
added static HTML templates
PashGit May 6, 2015
0bb521e
Fixed stylesheet link in html files
PashGit May 6, 2015
063461e
modified article-list-page and made diff-list-page to include paulas …
Relana May 7, 2015
72bdf07
some major changes in htmls, minor in css
Relana May 7, 2015
a99f94b
included new index and custom, and old bootstrap
Relana May 8, 2015
1bf663c
Merge pull request #6 from NewsdiffsDE/Frontend/Static-HTML-Templates…
May 8, 2015
e027f8d
added colspan for header and footer; changed side-margins for #search…
Relana May 8, 2015
0d008b6
Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/N…
May 8, 2015
0407f4f
made everything in footer white
Relana May 8, 2015
b385d7b
Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/N…
May 8, 2015
f23eed0
changed small things
Relana May 8, 2015
ac8c7d2
added article details html file
PashGit May 8, 2015
1b00752
Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/N…
PashGit May 8, 2015
8af1557
Added social media icons
PashGit May 8, 2015
9d716a4
Added html and css file for Article display
PashGit May 8, 2015
19e8e7b
Added compare and archive icons
PashGit May 8, 2015
df1b67b
Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/N…
May 10, 2015
bc771b7
add stylesheet for anything related to searchbar
May 10, 2015
2045afc
add folder for images related to searchbar
May 10, 2015
144e202
Edited Logo font
PashGit May 10, 2015
cbc07ea
Please enter the commit message for your changes. Lines startin
May 12, 2015
8d08cab
set size of items in searchbar
anjakammer May 12, 2015
59d5cac
foldout under input
anjakammer May 12, 2015
7ae8c68
inserted rows
anjakammer May 12, 2015
73ad5ce
checked logic
anjakammer May 12, 2015
4e39c75
Added Buttons on Article Page for prior and next version
PashGit May 12, 2015
f48e6d2
changes on article-list and diff-list html and css, and smaller icons
Relana May 13, 2015
c6639ae
cleaned up article-list and diff-list htmls
Relana May 13, 2015
9aa7eec
fixed HTML syntax errors
thomaspuppe May 14, 2015
2b5f428
layout with nav, content, sticky footer
thomaspuppe May 14, 2015
cc72f38
nav styling
thomaspuppe May 14, 2015
3d63ead
use not-fixed-to-top-navbar in index.html, delete searchbar content f…
May 15, 2015
194e967
remove unwanted navbar-fixed-top class
thomaspuppe May 16, 2015
f5ae3f4
added explanation for Bootstrap Grid Layout
thomaspuppe May 16, 2015
bd3c79b
added explanation for article list pages
thomaspuppe May 16, 2015
c81c75e
Update ND_2015-05-14_frontent-review.md
Relana May 18, 2015
5278e1a
delete text below search bar and adjusted search bar width
May 22, 2015
f6999ad
adjusted search bar details, tried out new logo, tried out different …
May 23, 2015
c795129
added borders to menu for topic grouping
May 23, 2015
6e62889
made technical and visual improvements on border: no accidental pixel…
May 23, 2015
f32f88a
deleted navbar-fixed-top in list-htmls
Relana May 25, 2015
e7b377e
filled list-htmls with 'real' content
Relana May 25, 2015
39b6352
changed button tags to a tags for Quellen, Vergleichen, Artikelverlau…
Relana May 25, 2015
7f161a6
changed another button tag to a tag in diff-list-html
Relana May 25, 2015
6b7fc08
added correct links to source a-tags
Relana May 25, 2015
81d9606
deleted seperate column for 'Zeitungen/Quelle', put link to newssite …
Relana May 25, 2015
027029c
changed structure a little in diff-list
Relana May 25, 2015
aa19fe4
Merge pull request #13 from NewsdiffsDE/Frontend/Static-HTML-Template…
PashGit May 25, 2015
ae22c1a
added faq page, added contact page with submit form
PashGit May 25, 2015
9808381
removed ul- and li-tags in table (as requested in ND_2015-05-14_front…
Relana May 25, 2015
1c1a81a
changed some margins, paddings etc. in article-list-page
Relana May 25, 2015
d2ed002
used only 5 menu items in index.html and highlights.html
May 27, 2015
9d71bc9
removed buttons in table, removed some margins
Relana May 31, 2015
4a3864d
made diff table resposive with bootstrap class
Relana May 31, 2015
3ad9c9f
assimilated diff-list to article-list a bit
Relana May 31, 2015
7894690
changed hrefs, corrected icon association
Relana May 31, 2015
5892246
css with @media query and removed table-responsive class from diff-li…
Relana Jun 2, 2015
b820e07
changed console.log statement in the javascript file
Jun 3, 2015
f1e7337
Merge pull request #14 from NewsdiffsDE/Frontend/Static-HTML-Template…
Jun 3, 2015
8a97fd2
icons in links are no longer underlined on :hover
Relana Jun 3, 2015
2a235a5
added javascript snippet to listen on click of category links - does …
Jun 3, 2015
a449bce
add foldout functionality to search bar - not 100% done yet
Jun 5, 2015
917dcd9
shift placeholder text to the right, change colors of foldout links
Jun 5, 2015
c66b8e8
add footer hover color, add general link color settings
Jun 5, 2015
8755725
add home link to logo
Jun 5, 2015
6b0c59a
change link color back to blue
Jun 5, 2015
0fb8c56
add about page including sections Einführung, F.A.Q. and Presse - no …
Jun 5, 2015
8355ac0
add styling for about page
Jun 5, 2015
c6f2e4d
try out solution for toggled navbar problem, add about page link to menu
Jun 5, 2015
b7938fd
align page content with header and footer
Jun 5, 2015
610c95c
moved description css to into custom-searchbar.css
Jun 5, 2015
bcbf8ad
add margin to description because container is now container-fluid
Jun 5, 2015
c4a022e
changed bottom margin of searchbar
Jun 8, 2015
17f6ded
changed nothing
Jun 8, 2015
244ceb1
deleted description text
Jun 8, 2015
5e914d1
implemented smooth scrolling and submenu - submenu to be discussed
Jun 8, 2015
a3fb714
styled submenu, optimized section height, took away section coloring
Jun 8, 2015
c465ea0
detected unused css rules
Jun 15, 2015
bad2374
used consistent container, put menu in own container and added a row
Jun 15, 2015
d5e1e43
adjusted padding of logo
Jun 15, 2015
6b743e1
deleted unused css rule
Jun 15, 2015
d04b476
views angepasst
Jun 17, 2015
622a7e4
views angepasst
Jun 17, 2015
aeb5091
moved html files to templates, static files to static folder
Jun 18, 2015
34ed007
created headerfooter html for templating
Jun 18, 2015
ffb866f
built on headerfooter, created favicon
Jun 18, 2015
381f705
integrated sticky footer styles into custom css
Relana Jun 18, 2015
aa62038
added images regex url
Relana Jun 18, 2015
99147d6
added fav, image functionality test
Jun 18, 2015
728db10
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Jun 18, 2015
326e9cf
tried something else with the img url
Relana Jun 18, 2015
70bf69f
images source reference in headerfooter equivalent to styles references
Relana Jun 18, 2015
8defb90
functional templates for header footer and index content
Jun 18, 2015
9c44c73
entdecken template created and adjusted in views/urls
Jun 18, 2015
cd84f75
templated diff-list-page
Relana Jun 18, 2015
ff10271
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Relana Jun 18, 2015
598fdb8
complete django templating for main menue pages
Jun 18, 2015
9b6e18a
uniforming of links and variables
Jun 18, 2015
c94a23e
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Jun 18, 2015
edf80b2
renamed diff-list to article_history in all files
Relana Jun 18, 2015
358f160
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Relana Jun 18, 2015
b06e23d
'outsourced' the searchbar into an html of its own
Relana Jun 18, 2015
b0d0ab4
article-hostory-missing template
Jun 18, 2015
5f7d3d6
fixed social media icons
Jun 23, 2015
98ea461
links underlined instead of blue
Jun 23, 2015
796ae1a
start: trying to merge frontend and templates
Jun 24, 2015
c774acc
url/view einbindung von kontakt/impressum. created impressum.html
Jun 24, 2015
db22d97
added mac relevant file name
Jun 24, 2015
11f3dd4
merged css
Jun 24, 2015
aa49e4e
included about text
Jun 24, 2015
bcd37bb
specified link coloring for more precision
Jun 24, 2015
6a06d84
included heading and floated it with submenu
Jun 24, 2015
7dcbb8c
added class
Jun 24, 2015
1d58a3a
included heading, deleted searchbar, added maincontent class
Jun 24, 2015
21aa1f6
article is now diffview
Relana Jun 24, 2015
bbf6a7a
url/view changes for unity
Jun 24, 2015
b6eb459
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Jun 24, 2015
87e8bf3
followed bootstrap convention, aligned header
Jun 24, 2015
d2c6d6c
styling for searchbar dropdown links: cursor, underline
Jun 24, 2015
950a17c
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Jun 24, 2015
749a7e3
url/view einbindung von suchergebnissen. anpassung srticle missing
Jun 24, 2015
1a84655
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Jun 24, 2015
f508385
uncommented unneeded styling
Jun 24, 2015
865d3ed
began with diffview template
Relana Jun 24, 2015
a28d177
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Relana Jun 24, 2015
655f407
added endblock syntax and corrected icon links
Jun 24, 2015
70fcdea
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Jun 24, 2015
dd3890e
included search, corrected text
Jun 24, 2015
72ee430
deleted unnecessary css link
Jun 24, 2015
0f080dc
updated from static
Jun 24, 2015
b5aaee4
included css to avoid including it in the other html files
Jun 24, 2015
7dd9d78
deleted margin because text is now below search bar
Jun 24, 2015
deffde6
included search, updated from static
Jun 24, 2015
5c1cb5b
included search correctly, updated from static (align)
Jun 24, 2015
64ebd0c
included search correctly, updated from static (align), changed title…
Jun 24, 2015
90ce710
included search bar correctly, added breadcrumbs
Jun 24, 2015
c6040ee
included search bar correctly, updated from static (align), included …
Jun 24, 2015
10e45c8
renamed css, updated from static (align), included search
Jun 24, 2015
5df8219
did basic set up for file
Jun 24, 2015
cb67164
url/view einbindung von diffview and article_history. update tazparser
Jun 24, 2015
b8989b3
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Jun 24, 2015
b629763
included scroll javascript
Jun 25, 2015
4283b5c
updated icon links, made suchergebisse table responsive
Jun 25, 2015
885a4c5
deleted the questionmark
Relana Jun 26, 2015
f0d6f43
Moved static tagcloud to Templating branch, Modifications
PashGit Jun 26, 2015
17bb956
Moved tagcloud css to Templating branch
PashGit Jun 26, 2015
4229444
fixed googleapi-links <- those do not need the django template langua…
Relana Jun 26, 2015
8a3cf01
included missing closing-div-tag
Relana Jun 26, 2015
67a7327
Changed tagcloud font colors to different shades of grey.
PashGit Jun 26, 2015
092adf3
put social column on the right hand side (as it was in the static htm…
Relana Jun 26, 2015
5a2ebf0
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Relana Jun 26, 2015
42a8c5f
changed some selectors and removed border from a's in .cloud ('.mainc…
Relana Jun 26, 2015
b28616c
added filter-column
Relana Jun 27, 2015
d2afc9d
added link configuration for archiv
Jun 28, 2015
e343bd2
rearranged faq and integrated javascript
Jun 28, 2015
02ed5b0
deleted empty statement
Jun 28, 2015
d079925
added top identifier for about-scroll-function
Jun 28, 2015
f631fe3
separated image from link for css styling
Jun 28, 2015
68b5fb3
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new…
Jun 28, 2015
0d6fe4e
Added categories filter html to Discover
PashGit Jun 28, 2015
eda691c
Added required css classes for categories filter
PashGit Jun 28, 2015
92ac9f1
safely deleted unused css styling
Jun 30, 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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.idea
/articles

*~
Expand Down Expand Up @@ -31,3 +32,5 @@ pip-log.txt

newsdiffs.db
database_settings.py

.DS_Store
476 changes: 476 additions & 0 deletions html_css_static/css/bootstrap-theme.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions html_css_static/css/bootstrap-theme.css.map
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions html_css_static/css/bootstrap-theme.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading