Django templating#32

Open

catcosmo wants to merge 187 commits into

ecprice:masterfrom

NewsdiffsDE:DjangoTemplating

Commits on Apr 15, 2015

Commits on Apr 28, 2015

Commits on Apr 29, 2015

Commits on May 1, 2015

deleted images in about and front
Relana
committed

Commits on May 6, 2015

Commits on May 7, 2015

modified article-list-page and made diff-list-page to include paulas new nav, search, and footer, included custom css for those two pages, added jquery
Relana
committed
some major changes in htmls, minor in css
Relana
committed

Commits on May 8, 2015

Commits on May 10, 2015

Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/NewsdiffsDE/newsdiffs into Frontend/Static-HTML-Templates
paulahaertel
committed
add stylesheet for anything related to searchbar
paulahaertel
committed
add folder for images related to searchbar
paulahaertel
committed
Edited Logo font
PashGit
committed

Commits on May 13, 2015

Commits on May 14, 2015

Commits on May 15, 2015

use not-fixed-to-top-navbar in index.html, delete searchbar content from custom.css and put it in custom-searchbar.css, modify searchbar code in index.html, create a javascript file for foldout-effect
paulahaertel
committed

Commits on May 16, 2015

Commits on May 18, 2015

Update ND_2015-05-14_frontent-review.md
Relana
committed

Commits on May 22, 2015

delete text below search bar and adjusted search bar width
paulahaertel
committed

Commits on May 23, 2015

Commits on May 25, 2015

Commits on May 27, 2015

used only 5 menu items in index.html and highlights.html
paulahaertel
committed

Commits on Jun 2, 2015

css with @media query and removed table-responsive class from diff-list table to get line breaks (no side scrolling)
Relana
committed

Commits on Jun 3, 2015

changed console.log statement in the javascript file
paulahaertel
committed
Merge pull request #14 from NewsdiffsDE/Frontend/Static-HTML-Templates-Fixes
paulahaertel
committed
icons in links are no longer underlined on :hover
Relana
committed
added javascript snippet to listen on click of category links - does not work yet
paulahaertel
committed

Commits on Jun 5, 2015

add foldout functionality to search bar - not 100% done yet
paulahaertel
committed
shift placeholder text to the right, change colors of foldout links
paulahaertel
committed
add footer hover color, add general link color settings
paulahaertel
committed
add home link to logo
paulahaertel
committed
change link color back to blue
paulahaertel
committed
add about page including sections Einführung, F.A.Q. and Presse - no scrolling yet
paulahaertel
committed
add styling for about page
paulahaertel
committed
try out solution for toggled navbar problem, add about page link to menu
paulahaertel
committed
align page content with header and footer
paulahaertel
committed
moved description css to into custom-searchbar.css
paulahaertel
committed
add margin to description because container is now container-fluid
paulahaertel
committed

Commits on Jun 8, 2015

changed bottom margin of searchbar
paulahaertel
committed
changed nothing
paulahaertel
committed
deleted description text
paulahaertel
committed
implemented smooth scrolling and submenu - submenu to be discussed
paulahaertel
committed
styled submenu, optimized section height, took away section coloring
paulahaertel
committed

Commits on Jun 15, 2015

detected unused css rules
paulahaertel
committed
used consistent container, put menu in own container and added a row
paulahaertel
committed
adjusted padding of logo
paulahaertel
committed
deleted unused css rule
paulahaertel
committed

Commits on Jun 17, 2015

views angepasst

catcosmo
authored and
catcosmo
committed
views angepasst

catcosmo
authored and
catcosmo
committed

Commits on Jun 18, 2015

moved html files to templates, static files to static folder

catcosmo
authored and
catcosmo
committed
created headerfooter html for templating

catcosmo
authored and
catcosmo
committed
built on headerfooter, created favicon

catcosmo
authored and
catcosmo
committed
integrated sticky footer styles into custom css
Relana
committed
added images regex url
Relana
committed
added fav, image functionality test

catcosmo
authored and
catcosmo
committed
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

catcosmo
authored and
catcosmo
committed
tried something else with the img url
Relana
committed
images source reference in headerfooter equivalent to styles references
Relana
committed
functional templates for header footer and index content

catcosmo
authored and
catcosmo
committed
entdecken template created and adjusted in views/urls

catcosmo
authored and
catcosmo
committed
templated diff-list-page
Relana
committed
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating
Relana
committed
complete django templating for main menue pages

catcosmo
authored and
catcosmo
committed
uniforming of links and variables

catcosmo
authored and
catcosmo
committed
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

catcosmo
authored and
catcosmo
committed
renamed diff-list to article_history in all files
Relana
committed
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating
Relana
committed
'outsourced' the searchbar into an html of its own
Relana
committed
article-hostory-missing template

catcosmo
authored and
catcosmo
committed

Commits on Jun 23, 2015

fixed social media icons

catcosmo
authored and
catcosmo
committed
links underlined instead of blue

catcosmo
authored and
catcosmo
committed

Commits on Jun 24, 2015

start: trying to merge frontend and templates

catcosmo
authored and
catcosmo
committed
url/view einbindung von kontakt/impressum. created impressum.html

catcosmo
authored and
catcosmo
committed
added mac relevant file name
paulahaertel
committed
merged css
paulahaertel
committed
included about text
paulahaertel
committed
specified link coloring for more precision
paulahaertel
committed
included heading and floated it with submenu
paulahaertel
committed
added class
paulahaertel
committed
included heading, deleted searchbar, added maincontent class
paulahaertel
committed
article is now diffview
Relana
committed
url/view changes for unity

catcosmo
authored and
catcosmo
committed
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

catcosmo
authored and
catcosmo
committed
followed bootstrap convention, aligned header
paulahaertel
committed
styling for searchbar dropdown links: cursor, underline
paulahaertel
committed
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

catcosmo
authored and
catcosmo
committed
url/view einbindung von suchergebnissen. anpassung srticle missing

catcosmo
authored and
catcosmo
committed
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating
paulahaertel
committed
uncommented unneeded styling
paulahaertel
committed
began with diffview template
Relana
committed
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating
Relana
committed
added endblock syntax and corrected icon links
paulahaertel
committed
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating
paulahaertel
committed
included search, corrected text
paulahaertel
committed
deleted unnecessary css link
paulahaertel
committed
updated from static
paulahaertel
committed
included css to avoid including it in the other html files
paulahaertel
committed
deleted margin because text is now below search bar
paulahaertel
committed
included search, updated from static
paulahaertel
committed
included search correctly, updated from static (align)
paulahaertel
committed
included search correctly, updated from static (align), changed title, added text
paulahaertel
committed
included search bar correctly, added breadcrumbs
paulahaertel
committed
included search bar correctly, updated from static (align), included breadcrumbs. not tested yet bc not running
paulahaertel
committed
renamed css, updated from static (align), included search
paulahaertel
committed
did basic set up for file
paulahaertel
committed
url/view einbindung von diffview and article_history. update tazparser

catcosmo
authored and
catcosmo
committed
Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

catcosmo
authored and
catcosmo
committed

Commits on Jun 25, 2015

included scroll javascript
paulahaertel
committed
updated icon links, made suchergebisse table responsive
paulahaertel
committed

Commits on Jun 26, 2015

Commits on Jun 27, 2015

added filter-column
Relana
committed

Commits on Jun 28, 2015

Commits on Jun 30, 2015

safely deleted unused css styling
paulahaertel
committed