Merge pull request #149 from maptiler/cleaning

Responzive desing and cleaning of templates
maptiler · Sep 17, 2019 · 7a8672e · 7a8672e
2 parents 7424abd + ba10041
commit 7a8672e
Show file tree

Hide file tree

Showing 107 changed files with 3,163 additions and 2,636 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "javascript/library"]
 	path = javascript/library
 	url = https://github.com/klokantech/javascript.git
+[submodule "styles/lib"]
+	path = styles/lib
+	url = https://github.com/klokantech/styles.git
diff --git a/Dockerfile b/Dockerfile
@@ -17,3 +17,4 @@ RUN pip install -q -r requirements.txt
 EXPOSE 8080
 
 CMD gunicorn --workers 4 --bind 0.0.0.0:8080 --log-level info --reload app:app
+# CMD python app.py # dev
diff --git a/Makefile b/Makefile
@@ -0,0 +1,19 @@
+.PHONY: init
+init: | submodules
+
+.PHONY: submodules
+submodules:
+	git submodule init
+	git submodule update
+
+styles:
+	sass --watch styles/base.scss ./static/css/base.min.css --style compressed
+
+styles-build:
+	sass styles/base.scss static/css/base.min.css --style compressed
+
+run:
+	docker run -v $(pwd):/var/www/epsg.io -p 8000:8080 epsg.io
+
+build:
+	docker build . --tag=epsg.io
diff --git a/app.py b/app.py
diff --git a/css/main.css b/css/main.css
diff --git a/requirements.txt b/requirements.txt
@@ -6,3 +6,6 @@ bottle==0.11.6
 gunicorn==19.3
 # setproctitle==1.1.8
 wsgiref==0.1.2
+Flask==0.12
+Flask-DebugToolbar==0.10.1
+Jinja2==2.9.3
diff --git a/static/css/base.min.css b/static/css/base.min.css
diff --git a/static/css/base.min.css.map b/static/css/base.min.css.map
diff --git a/fonts/OpenSans-Bold-webfont.eot → static/css/fonts/OpenSans-Bold-webfont.eot b/fonts/OpenSans-Bold-webfont.eot → static/css/fonts/OpenSans-Bold-webfont.eot
diff --git a/fonts/OpenSans-Bold-webfont.svg → static/css/fonts/OpenSans-Bold-webfont.svg b/fonts/OpenSans-Bold-webfont.svg → static/css/fonts/OpenSans-Bold-webfont.svg
diff --git a/fonts/OpenSans-Bold-webfont.ttf → static/css/fonts/OpenSans-Bold-webfont.ttf b/fonts/OpenSans-Bold-webfont.ttf → static/css/fonts/OpenSans-Bold-webfont.ttf
diff --git a/fonts/OpenSans-Bold-webfont.woff → static/css/fonts/OpenSans-Bold-webfont.woff b/fonts/OpenSans-Bold-webfont.woff → static/css/fonts/OpenSans-Bold-webfont.woff
diff --git a/fonts/OpenSans-BoldItalic-webfont.eot → ...css/fonts/OpenSans-BoldItalic-webfont.eot b/fonts/OpenSans-BoldItalic-webfont.eot → ...css/fonts/OpenSans-BoldItalic-webfont.eot
diff --git a/fonts/OpenSans-BoldItalic-webfont.svg → ...css/fonts/OpenSans-BoldItalic-webfont.svg b/fonts/OpenSans-BoldItalic-webfont.svg → ...css/fonts/OpenSans-BoldItalic-webfont.svg
diff --git a/fonts/OpenSans-BoldItalic-webfont.ttf → ...css/fonts/OpenSans-BoldItalic-webfont.ttf b/fonts/OpenSans-BoldItalic-webfont.ttf → ...css/fonts/OpenSans-BoldItalic-webfont.ttf
diff --git a/fonts/OpenSans-BoldItalic-webfont.woff → ...ss/fonts/OpenSans-BoldItalic-webfont.woff b/fonts/OpenSans-BoldItalic-webfont.woff → ...ss/fonts/OpenSans-BoldItalic-webfont.woff
diff --git a/fonts/OpenSans-Italic-webfont.eot → static/css/fonts/OpenSans-Italic-webfont.eot b/fonts/OpenSans-Italic-webfont.eot → static/css/fonts/OpenSans-Italic-webfont.eot
diff --git a/fonts/OpenSans-Italic-webfont.svg → static/css/fonts/OpenSans-Italic-webfont.svg b/fonts/OpenSans-Italic-webfont.svg → static/css/fonts/OpenSans-Italic-webfont.svg
diff --git a/fonts/OpenSans-Italic-webfont.ttf → static/css/fonts/OpenSans-Italic-webfont.ttf b/fonts/OpenSans-Italic-webfont.ttf → static/css/fonts/OpenSans-Italic-webfont.ttf
diff --git a/fonts/OpenSans-Italic-webfont.woff → ...ic/css/fonts/OpenSans-Italic-webfont.woff b/fonts/OpenSans-Italic-webfont.woff → ...ic/css/fonts/OpenSans-Italic-webfont.woff
diff --git a/fonts/OpenSans-Light-webfont.eot → static/css/fonts/OpenSans-Light-webfont.eot b/fonts/OpenSans-Light-webfont.eot → static/css/fonts/OpenSans-Light-webfont.eot
diff --git a/fonts/OpenSans-Light-webfont.svg → static/css/fonts/OpenSans-Light-webfont.svg b/fonts/OpenSans-Light-webfont.svg → static/css/fonts/OpenSans-Light-webfont.svg
diff --git a/fonts/OpenSans-Light-webfont.ttf → static/css/fonts/OpenSans-Light-webfont.ttf b/fonts/OpenSans-Light-webfont.ttf → static/css/fonts/OpenSans-Light-webfont.ttf
diff --git a/fonts/OpenSans-Light-webfont.woff → static/css/fonts/OpenSans-Light-webfont.woff b/fonts/OpenSans-Light-webfont.woff → static/css/fonts/OpenSans-Light-webfont.woff
diff --git a/fonts/OpenSans-Regular-webfont.eot → ...ic/css/fonts/OpenSans-Regular-webfont.eot b/fonts/OpenSans-Regular-webfont.eot → ...ic/css/fonts/OpenSans-Regular-webfont.eot
diff --git a/fonts/OpenSans-Regular-webfont.svg → ...ic/css/fonts/OpenSans-Regular-webfont.svg b/fonts/OpenSans-Regular-webfont.svg → ...ic/css/fonts/OpenSans-Regular-webfont.svg
diff --git a/fonts/OpenSans-Regular-webfont.ttf → ...ic/css/fonts/OpenSans-Regular-webfont.ttf b/fonts/OpenSans-Regular-webfont.ttf → ...ic/css/fonts/OpenSans-Regular-webfont.ttf
diff --git a/fonts/OpenSans-Regular-webfont.woff → ...c/css/fonts/OpenSans-Regular-webfont.woff b/fonts/OpenSans-Regular-webfont.woff → ...c/css/fonts/OpenSans-Regular-webfont.woff
diff --git a/fonts/OpenSans-Semibold-webfont.eot → ...c/css/fonts/OpenSans-Semibold-webfont.eot b/fonts/OpenSans-Semibold-webfont.eot → ...c/css/fonts/OpenSans-Semibold-webfont.eot
diff --git a/fonts/OpenSans-Semibold-webfont.svg → ...c/css/fonts/OpenSans-Semibold-webfont.svg b/fonts/OpenSans-Semibold-webfont.svg → ...c/css/fonts/OpenSans-Semibold-webfont.svg
diff --git a/fonts/OpenSans-Semibold-webfont.ttf → ...c/css/fonts/OpenSans-Semibold-webfont.ttf b/fonts/OpenSans-Semibold-webfont.ttf → ...c/css/fonts/OpenSans-Semibold-webfont.ttf
diff --git a/fonts/OpenSans-Semibold-webfont.woff → .../css/fonts/OpenSans-Semibold-webfont.woff b/fonts/OpenSans-Semibold-webfont.woff → .../css/fonts/OpenSans-Semibold-webfont.woff
diff --git a/fonts/epsg.eot → static/css/fonts/epsg.eot b/fonts/epsg.eot → static/css/fonts/epsg.eot
diff --git a/fonts/epsg.svg → static/css/fonts/epsg.svg b/fonts/epsg.svg → static/css/fonts/epsg.svg
diff --git a/fonts/epsg.ttf → static/css/fonts/epsg.ttf b/fonts/epsg.ttf → static/css/fonts/epsg.ttf
diff --git a/fonts/epsg.woff → static/css/fonts/epsg.woff b/fonts/epsg.woff → static/css/fonts/epsg.woff
diff --git a/fonts/epsg.woff2 → static/css/fonts/epsg.woff2 b/fonts/epsg.woff2 → static/css/fonts/epsg.woff2
diff --git a/static/css/fonts/icons.svg b/static/css/fonts/icons.svg
diff --git a/static/css/fonts/icons.ttf b/static/css/fonts/icons.ttf
diff --git a/static/css/fonts/icons.woff b/static/css/fonts/icons.woff
diff --git a/static/css/fonts/icons.woff2 b/static/css/fonts/icons.woff2
diff --git a/img/favicon.ico → static/favicon.ico b/img/favicon.ico → static/favicon.ico
diff --git a/img/bg-hatch-2.png → static/img/bg-hatch-2.png b/img/bg-hatch-2.png → static/img/bg-hatch-2.png
diff --git a/img/bg-hatch.png → static/img/bg-hatch.png b/img/bg-hatch.png → static/img/bg-hatch.png
diff --git a/img/bg-head-long.png → static/img/bg-head-long.png b/img/bg-head-long.png → static/img/bg-head-long.png
diff --git a/img/bg-head-wide.png → static/img/bg-head-wide.png b/img/bg-head-wide.png → static/img/bg-head-wide.png
diff --git a/img/bg-head.jpg → static/img/bg-head.jpg b/img/bg-head.jpg → static/img/bg-head.jpg
diff --git a/img/bg-homepage.png → static/img/bg-homepage.png b/img/bg-homepage.png → static/img/bg-homepage.png
diff --git a/img/coordinates.png → static/img/coordinates.png b/img/coordinates.png → static/img/coordinates.png
diff --git a/img/crosshair_old.png → static/img/crosshair_old.png b/img/crosshair_old.png → static/img/crosshair_old.png
diff --git a/img/dash.png → static/img/dash.png b/img/dash.png → static/img/dash.png
diff --git a/press/detail-pr.png → static/img/detail-pr.png b/press/detail-pr.png → static/img/detail-pr.png
diff --git a/img/epsg-target-large.png → static/img/epsg-target-large.png b/img/epsg-target-large.png → static/img/epsg-target-large.png
diff --git a/img/epsg-target-small.png → static/img/epsg-target-small.png b/img/epsg-target-small.png → static/img/epsg-target-small.png
diff --git a/img/[email protected] → static/img/espg-logo.png b/img/[email protected] → static/img/espg-logo.png
diff --git a/img/github-ribbon.png → static/img/github-ribbon.png b/img/github-ribbon.png → static/img/github-ribbon.png
diff --git a/press/gsoc2015-300x270.jpg → static/img/gsoc2015-300x270.jpg b/press/gsoc2015-300x270.jpg → static/img/gsoc2015-300x270.jpg
diff --git a/img/hzk-logo.png → static/img/hzk-logo.png b/img/hzk-logo.png → static/img/hzk-logo.png
diff --git a/img/klokan-logo-grey.png → static/img/klokan-logo-grey.png b/img/klokan-logo-grey.png → static/img/klokan-logo-grey.png
diff --git a/img/logo-118x39.png → static/img/logo-118x39.png b/img/logo-118x39.png → static/img/logo-118x39.png
diff --git a/img/[email protected] → static/img/[email protected] b/img/[email protected] → static/img/[email protected]
diff --git a/img/logo-232x76.png → static/img/logo-232x76.png b/img/logo-232x76.png → static/img/logo-232x76.png
diff --git a/press/main-page-pr.png → static/img/main-page-pr.png b/press/main-page-pr.png → static/img/main-page-pr.png
diff --git a/press/map-pr.png → static/img/map-pr.png b/press/map-pr.png → static/img/map-pr.png
diff --git a/img/maptiler-gmaps-banner.png → static/img/maptiler-gmaps-banner.png b/img/maptiler-gmaps-banner.png → static/img/maptiler-gmaps-banner.png
diff --git a/img/maptiler-logo-icon.png → static/img/maptiler-logo-icon.png b/img/maptiler-logo-icon.png → static/img/maptiler-logo-icon.png
diff --git a/img/maptiler-logo.png → static/img/maptiler-logo.png b/img/maptiler-logo.png → static/img/maptiler-logo.png
diff --git a/img/position.png → static/img/position.png b/img/position.png → static/img/position.png
diff --git a/press/results-pr.png → static/img/results-pr.png b/press/results-pr.png → static/img/results-pr.png
diff --git a/js/ZeroClipboard.min.js → static/js/ZeroClipboard.min.js b/js/ZeroClipboard.min.js → static/js/ZeroClipboard.min.js
diff --git a/js/ZeroClipboard.swf → static/js/ZeroClipboard.swf b/js/ZeroClipboard.swf → static/js/ZeroClipboard.swf
diff --git a/js/index.js → static/js/index.js b/js/index.js → static/js/index.js
diff --git a/js/map.js → static/js/map.js b/js/map.js → static/js/map.js
diff --git a/js/results.js → static/js/results.js b/js/results.js → static/js/results.js
diff --git a/js/transform.js → static/js/transform.js b/js/transform.js → static/js/transform.js
diff --git a/static/opensearch.xml b/static/opensearch.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
+  <ShortName>EPSG.io</ShortName>
+  <Description>Coordinate systems for spatial reference worldwide</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <Image width="16" height="16" type="image/x-icon">http://epsg.io/favicon.ico</Image>
+  <Contact>[email protected]</Contact>
+  <Url type="text/html" method="get" template="http://epsg.io/?q={searchTerms}"/>
+  <moz:SearchForm>http://epsg.io/</moz:SearchForm>
+
+</OpenSearchDescription>
diff --git a/press/Press_release_text.doc → static/press/Press_release_text.doc b/press/Press_release_text.doc → static/press/Press_release_text.doc
diff --git a/press/announcement-epsg_io.zip → static/press/announcement-epsg_io.zip b/press/announcement-epsg_io.zip → static/press/announcement-epsg_io.zip
diff --git a/static/press/detail-pr.png b/static/press/detail-pr.png
diff --git a/press/epsg-banner-1400-560-2.png → static/press/epsg-banner-1400-560-2.png b/press/epsg-banner-1400-560-2.png → static/press/epsg-banner-1400-560-2.png
diff --git a/img/epsg-banner-440x280-2.png → static/press/epsg-banner-440x280-2.png b/img/epsg-banner-440x280-2.png → static/press/epsg-banner-440x280-2.png
diff --git a/static/press/gsoc2015-300x270.jpg b/static/press/gsoc2015-300x270.jpg
diff --git a/static/press/main-page-pr.png b/static/press/main-page-pr.png
diff --git a/static/press/map-pr.png b/static/press/map-pr.png
diff --git a/press/press.txt → static/press/press.txt b/press/press.txt → static/press/press.txt
diff --git a/static/press/results-pr.png b/static/press/results-pr.png
diff --git a/styles/_custom-layout.scss b/styles/_custom-layout.scss
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,4 @@ RUN pip install -q -r requirements.txt
		EXPOSE 8080

		CMD gunicorn --workers 4 --bind 0.0.0.0:8080 --log-level info --reload app:app
		# CMD python app.py # dev