Merge branch 'permalinks' into 'master' (e3ca56bb) · Commits · Anton Sarukhanov / PyBusMap · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

PyBusMap
- Activity
- Members
- Labels
- Releases
- Model registry
- Incidents

Snippets Groups Projects

e3ca56bb

Commit e3ca56bb authored 8 years ago by Anton Sarukhanov

Downloads
- Plain Diff

Merge branch 'permalinks' into 'master'

Implemented Embed-code generator interface



See merge request !1

parents 5a5fe1e3 220b87d4

No related branches found

No related tags found

No related merge requests found

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

app.py 73 additions, 25 deletions

app.py
bower.json 1 addition, 1 deletion

bower.json
celerytasks.py 15 additions, 8 deletions

celerytasks.py
nextbus.py 4 additions, 2 deletions

nextbus.py
static/css/combined.css 23 additions, 0 deletions

static/css/combined.css
static/css/map.css 99 additions, 47 deletions

static/css/map.css
static/css/predictions.css 27 additions, 0 deletions

static/css/predictions.css
static/js/embed.js 119 additions, 0 deletions

static/js/embed.js
static/js/map.js 180 additions, 49 deletions

static/js/map.js
static/js/predictions.js 159 additions, 0 deletions

static/js/predictions.js
templates/base.html 1 addition, 1 deletion

templates/base.html
templates/combined.html 61 additions, 0 deletions

templates/combined.html
templates/map.html 2 additions, 34 deletions

templates/map.html
templates/modal-about.html 7 additions, 3 deletions

templates/modal-about.html
templates/modal-embed.html 78 additions, 0 deletions

templates/modal-embed.html
templates/modal-welcome.html 1 addition, 1 deletion

templates/modal-welcome.html
templates/predictions.html 25 additions, 0 deletions

templates/predictions.html

with 875 additions and 171 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment