diff --git a/fabfile.py b/fabfile.py index 8386cdd2..0da710fe 100644 --- a/fabfile.py +++ b/fabfile.py @@ -239,7 +239,7 @@ def collect_remote_statics(): run_as_umap('mkdir -p {0}'.format(remote_static_dir)) remote_repositories = { 'leaflet': "git://github.com/Leaflet/Leaflet.git@master#v0.7.1", - 'draw': "git://github.com/Leaflet/Leaflet.draw.git@master", + 'draw': "git://github.com/Leaflet/Leaflet.draw.git@master#0.2.3", 'hash': "git://github.com/mlevans/leaflet-hash.git@master", 'storage': 'git://github.com/yohanboniface/Leaflet.Storage.git@master', 'edit_in_osm': 'git://github.com/yohanboniface/Leaflet.EditInOSM.git@master', diff --git a/umap/static/umap/font/pts55f-webfont.eot b/umap/static/umap/font/pts55f-webfont.eot new file mode 100644 index 00000000..7062749a Binary files /dev/null and b/umap/static/umap/font/pts55f-webfont.eot differ diff --git a/umap/static/umap/font/pts55f-webfont.svg b/umap/static/umap/font/pts55f-webfont.svg new file mode 100644 index 00000000..1a5d6cae --- /dev/null +++ b/umap/static/umap/font/pts55f-webfont.svg @@ -0,0 +1,678 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/umap/static/umap/font/pts55f-webfont.ttf b/umap/static/umap/font/pts55f-webfont.ttf new file mode 100644 index 00000000..51216081 Binary files /dev/null and b/umap/static/umap/font/pts55f-webfont.ttf differ diff --git a/umap/static/umap/font/pts55f-webfont.woff b/umap/static/umap/font/pts55f-webfont.woff new file mode 100644 index 00000000..057991d3 Binary files /dev/null and b/umap/static/umap/font/pts55f-webfont.woff differ diff --git a/umap/static/umap/font/pts56f-webfont.eot b/umap/static/umap/font/pts56f-webfont.eot new file mode 100644 index 00000000..af9e6d16 Binary files /dev/null and b/umap/static/umap/font/pts56f-webfont.eot differ diff --git a/umap/static/umap/font/pts56f-webfont.svg b/umap/static/umap/font/pts56f-webfont.svg new file mode 100644 index 00000000..49e718fc --- /dev/null +++ b/umap/static/umap/font/pts56f-webfont.svg @@ -0,0 +1,706 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/umap/static/umap/font/pts56f-webfont.ttf b/umap/static/umap/font/pts56f-webfont.ttf new file mode 100644 index 00000000..3f39f0b1 Binary files /dev/null and b/umap/static/umap/font/pts56f-webfont.ttf differ diff --git a/umap/static/umap/font/pts56f-webfont.woff b/umap/static/umap/font/pts56f-webfont.woff new file mode 100644 index 00000000..da0d5c79 Binary files /dev/null and b/umap/static/umap/font/pts56f-webfont.woff differ diff --git a/umap/static/umap/font/pts75f-webfont.eot b/umap/static/umap/font/pts75f-webfont.eot new file mode 100644 index 00000000..bbba0cff Binary files /dev/null and b/umap/static/umap/font/pts75f-webfont.eot differ diff --git a/umap/static/umap/font/pts75f-webfont.svg b/umap/static/umap/font/pts75f-webfont.svg new file mode 100644 index 00000000..8335a139 --- /dev/null +++ b/umap/static/umap/font/pts75f-webfont.svg @@ -0,0 +1,879 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/umap/static/umap/font/pts75f-webfont.ttf b/umap/static/umap/font/pts75f-webfont.ttf new file mode 100644 index 00000000..8f667668 Binary files /dev/null and b/umap/static/umap/font/pts75f-webfont.ttf differ diff --git a/umap/static/umap/font/pts75f-webfont.woff b/umap/static/umap/font/pts75f-webfont.woff new file mode 100644 index 00000000..39ca4faa Binary files /dev/null and b/umap/static/umap/font/pts75f-webfont.woff differ diff --git a/umap/static/umap/font/pts76f-webfont.eot b/umap/static/umap/font/pts76f-webfont.eot new file mode 100644 index 00000000..d52bc7a7 Binary files /dev/null and b/umap/static/umap/font/pts76f-webfont.eot differ diff --git a/umap/static/umap/font/pts76f-webfont.svg b/umap/static/umap/font/pts76f-webfont.svg new file mode 100644 index 00000000..6160650e --- /dev/null +++ b/umap/static/umap/font/pts76f-webfont.svg @@ -0,0 +1,763 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/umap/static/umap/font/pts76f-webfont.ttf b/umap/static/umap/font/pts76f-webfont.ttf new file mode 100644 index 00000000..9eb86257 Binary files /dev/null and b/umap/static/umap/font/pts76f-webfont.ttf differ diff --git a/umap/static/umap/font/pts76f-webfont.woff b/umap/static/umap/font/pts76f-webfont.woff new file mode 100644 index 00000000..ac3ba450 Binary files /dev/null and b/umap/static/umap/font/pts76f-webfont.woff differ diff --git a/umap/static/umap/img/edit.svg b/umap/static/umap/img/edit.svg new file mode 100644 index 00000000..93a110bb --- /dev/null +++ b/umap/static/umap/img/edit.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/logo.svg b/umap/static/umap/img/logo.svg new file mode 100644 index 00000000..cf75320d --- /dev/null +++ b/umap/static/umap/img/logo.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/umap/static/umap/img/logo_filigree.png b/umap/static/umap/img/logo_filigree.png new file mode 100644 index 00000000..e2ab1549 Binary files /dev/null and b/umap/static/umap/img/logo_filigree.png differ diff --git a/umap/static/umap/img/opensource.svg b/umap/static/umap/img/opensource.svg new file mode 100644 index 00000000..33387232 --- /dev/null +++ b/umap/static/umap/img/opensource.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/osm.svg b/umap/static/umap/img/osm.svg new file mode 100644 index 00000000..5694b0a8 --- /dev/null +++ b/umap/static/umap/img/osm.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/umap/static/umap/umap.css b/umap/static/umap/umap.css index 260011e9..113ed24b 100644 --- a/umap/static/umap/umap.css +++ b/umap/static/umap/umap.css @@ -1,3 +1,190 @@ +/* ************************************************* */ +/* *********************** FONT ******************** */ +/* ************************************************* */ + + +@font-face { + font-family: 'pt_sansbold_italic'; + src: url('./font/pts76f-webfont.eot'); + src: url('./font/pts76f-webfont.eot?#iefix') format('embedded-opentype'), + url('./font/pts76f-webfont.woff') format('woff'), + url('./font/pts76f-webfont.ttf') format('truetype'), + url('./font/pts76f-webfont.svg#pt_sansbold_italic') format('svg'); + font-weight: normal; + font-style: normal; + +} + + +@font-face { + font-family: 'pt_sansbold'; + src: url('./font/pts75f-webfont.eot'); + src: url('./font/pts75f-webfont.eot?#iefix') format('embedded-opentype'), + url('./font/pts75f-webfont.woff') format('woff'), + url('./font/pts75f-webfont.ttf') format('truetype'), + url('./font/pts75f-webfont.svg#pt_sansbold') format('svg'); + font-weight: normal; + font-style: normal; + +} + + +@font-face { + font-family: 'pt_sansitalic'; + src: url('./font/pts56f-webfont.eot'); + src: url('./font/pts56f-webfont.eot?#iefix') format('embedded-opentype'), + url('./font/pts56f-webfont.woff') format('woff'), + url('./font/pts56f-webfont.ttf') format('truetype'), + url('./font/pts56f-webfont.svg#pt_sansitalic') format('svg'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'pt_sansregular'; + src: url('./font/pts55f-webfont.eot'); + src: url('./font/pts55f-webfont.eot?#iefix') format('embedded-opentype'), + url('./font/pts55f-webfont.woff') format('woff'), + url('./font/pts55f-webfont.ttf') format('truetype'), + url('./font/pts55f-webfont.svg#pt_sansregular') format('svg'); + font-weight: normal; + font-style: normal; + +} + + +/* +* Generic +*/ +body, div, ul, li, a, section, nav, +h1, h2, h3, h4, h5, h6, +hr, input, textarea { + -moz-box-sizing:border-box; + -webkit-box-sizing:border-box; + box-sizing: border-box; + margin: 0; + padding: 0; + font-family: 'pt_sansregular', sans-serif; +} +a { + text-decoration: none; + color: SeaGreen; +} +hr { + clear: both; + width: 100%; + height: 0; + max-width: 980px; + margin: 28px auto; + -moz-border-bottom-colors: none; + -moz-border-left-colors: none; + -moz-border-right-colors: none; + -moz-border-top-colors: none; + border-color: #ddd; + border-image: none; + border-style: solid; + border-width: 1px 0 0; +} +h1, h2, h3, h4, h5 { + font-family: 'pt_sansbold', sans-serif; + font-weight: normal; +} +h1, h2 { + margin-bottom: 28px; +} +h3, h4, h5 { + margin-bottom: 14px; +} +p { + line-height: 21px; + margin-top: 14px; + margin-bottom: 14px; +} + +/* +* List +*/ +ul { + list-style-image:none; + list-style-position:inside; + list-style-type:none; +} + +/* ************************************************* */ +/* *********************** GRID ******************** */ +/* ************************************************* */ +.wrapper { + width: 100%; + clear: both; +} +.wrapper:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; +} +.row { + width: 100%; + max-width: 1200px; + clear: both; + margin-left: auto; + margin-right: auto; + margin-top: 40px; +} +.col { + float: left; +} +.right { + float: right; +} +.col + .col { + padding-left: 20px; +} +.half { + width: 50%; +} +.third { + width: 33.33%; +} +.two-third { + width: 66.66% +} +.quarter { + width: 25%; +} +.wide { + width: 100%; +} +.col + .wide { + padding-left: inherit; +} +.mshow, .tshow { + display: none; +} +.center { + margin-left: auto; + margin-right: auto; + float: none; +} + +/* +* Content +*/ +.tintbox, .tintbox a { + font-family: serif; +} +.tintbox { + background-color: #f2f2f2; + padding: 28px; +} +.tintbox p { + color: #6f6f6f; +} + + /* Foundation use a position:relative; on body, which break the 100% rule on #map @@ -8,31 +195,6 @@ body.map_detail { position: inherit; } -/* HOME */ -.map_fragment { - width: 100%; -} -.map_list .map_fragment, -.demo_map .map_fragment { - height: 210px; -} -.umap-features-list img { - width: 14px; - vertical-align: middle; - padding-right: 14px; -} -.umap-features-list li { - line-height: 21px; -} - -/* Modals */ -.reveal-modal.update-tilelayers { - width: 75%; - max-height: 500px; /* TODO Make it dynamic */ - overflow: auto; - margin-left: -35%; -} - /* Global alert */ .alert-box.global { z-index: 1001; @@ -135,16 +297,21 @@ fieldset.toggle.on .more_style_options { /* * Navigation */ -nav { +header { + margin: 14px 0; +} +header nav { min-height: 70px; - font-family: sans-serif; font-size: 0; - border-bottom: solid 1px #ddd; + padding-top: 0; + max-width: 1200px; + margin-left: auto; + margin-right: auto; } nav section, nav h1, nav ul, nav li, nav a { display: inline-block; - font-size: 14px; + font-size: 16px; letter-spacing: -1px; margin-bottom: 0; font-weight: normal; @@ -164,17 +331,22 @@ nav a { text-align: center; } -nav a:hover { - background-color: #79c1c0; +nav .menu a:hover { + text-decoration: underline; } nav h1 a { - background-position: 50% 50%; + background-image: url("./img/logo.svg"); + background-position: left center; background-repeat: no-repeat; - background-image: url("./umap.png"); - color: transparent; - font-size: 0px; + background-size: 60px auto; + font-family: 'pt_sansbold'; + font-size: 30px; + font-weight: normal; height: 70px; + padding-left: 80px; + text-align: left; + color: #3A4259; } nav a.logout { @@ -183,6 +355,10 @@ nav a.logout { nav li.has-button { padding-top: 7px; + margin-bottom: 0; +} +nav li.has-button .button { + margin-bottom: 0; } nav .branding ul, nav .branding li, @@ -190,9 +366,124 @@ nav .branding a, nav .branding h1 { width: 100%; } -nav .branding { - margin-bottom: 7px; +footer { + height: 140px; + margin-top: 40px; + background-color: #2E3641; + text-align: center; + line-height: 140px; + color: #8F96A3; } +footer a { + background-image: url("./img/logo_filigree.png"); + background-position: left center; + background-repeat: no-repeat; + background-size: 60px auto; + font-family: 'pt_sansbold'; + font-size: 30px; + font-weight: normal; + height: 140px; + padding-left: 70px; + color: #8F96A3; + display: inline-block; +} + + +/* **************************** */ +/* home */ +/* **************************** */ +.map_fragment { + width: 100%; +} +.map_list .map_fragment, +.demo_map .map_fragment { + height: 210px; +} +.map_list .legend { + padding-top: 7px; + margin-bottom: 28px; + text-align: center; + font-size: 1.2em; +} +.map_list .legend a { + color: #222; + font-family: "pt_sansbold"; + font-style: normal; + font-weight: normal; +} +.map_list .legend em, +.map_list .legend em a { + color: #444; + font-family: "pt_sansregular"; + font-style: normal; +} +.map_list hr { + display: none; +} +.map_list .wide + hr { + display: block; +} +.umap-features-list li img { + width: 14px; + vertical-align: middle; + padding-right: 14px; +} +.umap-features-list ul { + margin-top: 14px; +} +.umap-features-list li { + line-height: 21px; +} +.summary { + background-color: #eee; +} +.summary .row { + margin-top: 0; + padding-top: 20px; +} +.search_wrapper { + background-color: #2E3641; +} +.search_wrapper .row { + margin-top: 0; + padding-top: 20px; +} +.showcase-map { + background-color: #fff; + padding-bottom: 28px; +} +.showcase-map .row { + margin-top: 28px; +} +h2.section { + text-transform: uppercase; + color: #666; + text-align: center; + padding-top: 28px; +} +.showcase-map .map_fragment { + height: 400px; +} +.highlights { + text-align: center; +} +.highlights img.colophon { + display: inline-block; + height: 128px; +} +.button-bar { + text-align: center; +} +.button-bar .button { + display: inline-block; +} +.button-bar .button + .button { + margin-left: 14px; +} +.button-bar .button.half { + width: calc(50% - 7px); +} + /* **************************** */ /* colors */ @@ -203,6 +494,10 @@ a { .button, input[type="submit"] { background-color: #79c1c0; } +.neutral, input[type="submit"].neutral { + background-color: #ddd; + color: #666; +} .button:hover, input[type="submit"]:hover { background-color: #689191; } @@ -233,6 +528,15 @@ a { .darline-autocomplete li.on { background-color: #79c1c0; } +.dark { + background-color: #2E3641; + color: #efefef; + padding-top: 20px; + margin-top: 20px; +} +.dark .row { + margin-top: 0; +} /* **************************** */ @@ -256,3 +560,56 @@ body.content #storage-ui-container { .leaflet-control-browse .storage-browse-actions a.storage-browse-link { background-color: #79c1c0 !important; } + +/* ************************************************* */ +/* ********************* MOBILE ******************** */ +/* ************************************************* */ +@media only screen and (max-width:770px) { + .row { + padding-left: 5px; + padding-right: 5px; + } + .twide { + width: 100%; + padding-left: 0!important; + } + .tthird { + width: 33.3333%; + } + .ttwo-third { + width: 66.6666%; + } + .tshow { + display: inherit; + } + .thide { + display: none; + } + nav .branding h1 { + text-align: center; + } + nav .branding h1 a { + width: auto; + } +} +@media only screen and (max-width: 639px) { + .mwide { + padding-left: 0!important; + width: 100%; + } + .mwide + .mwide { + margin-top: 20px; + } + .mthird { + width: 33.3333%; + } + .mshow { + display: inherit; + } + .mhide { + display: none; + } + header nav ul { + display: block; + } +} diff --git a/umap/templates/auth/user_detail.html b/umap/templates/auth/user_detail.html index 37cf7ad6..1d697a53 100644 --- a/umap/templates/auth/user_detail.html +++ b/umap/templates/auth/user_detail.html @@ -3,16 +3,18 @@ {% load i18n %} {% block content %} -
-

{% blocktrans %}Browse {{ current_user }}'s maps{% endblocktrans %}

+
+

{% blocktrans %}Browse {{ current_user }}'s maps{% endblocktrans %}

-
+
+
{% if maps %} {% include "leaflet_storage/map_list.html" %} {% else %}
- {{ current_user }} has not map yet. + {{ current_user }} has not map yet.
{% endif %}
+
{% endblock content %} diff --git a/umap/templates/base.html b/umap/templates/base.html index 382bb184..6ac58a31 100644 --- a/umap/templates/base.html +++ b/umap/templates/base.html @@ -6,10 +6,6 @@ {% compress css %} - - - - diff --git a/umap/templates/leaflet_storage/map_list.html b/umap/templates/leaflet_storage/map_list.html index a36c9f6f..3ae68912 100644 --- a/umap/templates/leaflet_storage/map_list.html +++ b/umap/templates/leaflet_storage/map_list.html @@ -1,11 +1,12 @@ {% load leaflet_storage_tags umap_tags i18n %} {% for map_inst in maps %} -
+
+
{% map_fragment map_inst %} -
{{ map_inst.name }}{% if map_inst.owner %} {% trans "Cooked up by" %} {{ map_inst.owner }}{% endif %} — {% trans "See this map!" %}
+
{{ map_inst.name }}{% if map_inst.owner %} {% trans "by" %} {{ map_inst.owner }}{% endif %}
{% endfor %} {% if maps.has_next %} -
{% trans "More" %}
+
{% trans "More" %}
{% endif %} \ No newline at end of file diff --git a/umap/templates/umap/about_summary.html b/umap/templates/umap/about_summary.html index bcc31084..b3601e8e 100644 --- a/umap/templates/umap/about_summary.html +++ b/umap/templates/umap/about_summary.html @@ -1,32 +1,43 @@ {% load leaflet_storage_tags i18n %} -
-
-
{% trans "What is uMap" %}
-

{% blocktrans with osm_url="http://osm.org" %}uMap let you create maps with OpenStreetMap layers in a minute and embed them in your site.{% endblocktrans %}

-

- {% if DEMO_SITE %} - {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" stable_url="http://umap.openstreetmap.fr" %}This is a demo instance, used for tests and pre-rolling releases. If you need a stable instance, please use {{ stable_url }}. You can also host your own instance, it's open source!{% endblocktrans %} - {% else %} - {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" %}And it's open source!{% endblocktrans %} - {% endif %} -

+
+
+
+ +

{% blocktrans with osm_url="http://osm.org" %}uMap let you create maps with OpenStreetMap layers in a minute and embed them in your site.{% endblocktrans %}

+
+
+ +
    +
  • {% trans "Choose the layers of your map" %}
    • +
  • {% trans "Add POIs: markers, lines, polygons..." %}
    • +
  • {% trans "Manage POIs colours and icons" %}
    • +
  • {% trans "Manage map options: display a minimap, locate user on load…" %}
    • +
  • {% trans "Batch import geostructured data (geojson, gpx, kml, osm...)" %}
    • +
  • {% trans "Choose the license for your data" %}
    • +
  • {% trans "Embed and share your map" %}
    • +
+
+
+ +

+ {% if DEMO_SITE %} + {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" stable_url="http://umap.openstreetmap.fr" %}This is a demo instance, used for tests and pre-rolling releases. If you need a stable instance, please use {{ stable_url }}. You can also host your own instance, it's open source!{% endblocktrans %} + {% else %} + {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" %}And it's open source!{% endblocktrans %} + {% endif %} +

+
+
+
+
+
+
+ {% spaceless %} + {% trans "Create a map" %} + {% if demo_map %} + {% trans "Play with the demo" %} + {% endif %} + {% endspaceless %} +
-
-
{% trans "What can you do?" %}
-
    -
  • {% trans "Choose the layers of your map" %}
    • -
  • {% trans "Add POIs: markers, lines, polygons..." %}
    • -
  • {% trans "Manage POIs colours and icons" %}
    • -
  • {% trans "Manage map options: display a minimap, locate user on load…" %}
    • -
  • {% trans "Batch import geostructured data (GEOJson...)" %}
    • -
  • {% trans "Choose the license for your data" %}
    • -
  • {% trans "Embed and share your map" %}
    • -
-
- {% if demo_map %} -
- {% map_fragment demo_map %} - {% trans "Play with the demo" %} -
- {% endif %}
diff --git a/umap/templates/umap/content.html b/umap/templates/umap/content.html index 31dadbac..f8b3064a 100644 --- a/umap/templates/umap/content.html +++ b/umap/templates/umap/content.html @@ -12,29 +12,12 @@ {% endblock %} {% block header %} -
+
{% include 'umap/navigation.html' %} -
+ {% endblock %} {% block content %} -
-
-
- -
-
- -
-
-
-
-
-

{% trans "Last maps" %}

- {% include "leaflet_storage/map_list.html" %} -
- - {% endblock content %} {% block bottom_js %} @@ -73,4 +56,11 @@ } D.Event.on('.more_button', 'click', getMore); -{% endblock bottom_js %} \ No newline at end of file +{% endblock bottom_js %} + +{% block footer %} + {{ block.super }} +
+ umap an OpenStreetMap project +
+{% endblock footer %} diff --git a/umap/templates/umap/home.html b/umap/templates/umap/home.html index d512ddf8..317027f6 100644 --- a/umap/templates/umap/home.html +++ b/umap/templates/umap/home.html @@ -3,14 +3,21 @@ {% load leaflet_storage_tags i18n %} {% block content %} -{% if not user.is_authenticated %} - {% include "umap/about_summary.html" %} -
-{% endif %} {% include "umap/search_bar.html" %} -
-

{% trans "Get inspired, browse maps" %}

- {% include "leaflet_storage/map_list.html" %} +{% include "umap/about_summary.html" %} +{% if showcase_map %} +
+

Map of the maps

+
+ {% map_fragment showcase_map zoomControl=1 %} +
+
+{% endif %} +
+

Be inspired, browse maps

+
+ {% include "leaflet_storage/map_list.html" %} +
{% endblock content %} diff --git a/umap/templates/umap/navigation.html b/umap/templates/umap/navigation.html index fcd7e3ba..5307c85f 100644 --- a/umap/templates/umap/navigation.html +++ b/umap/templates/umap/navigation.html @@ -1,12 +1,12 @@ {% load i18n %}