From dd6c065630593a7a17076d773507b1924165e3cf Mon Sep 17 00:00:00 2001 From: samanpwbb Date: Wed, 26 Mar 2014 17:54:52 -0400 Subject: [PATCH 01/10] add field reference to remote source --- app/source.css | 7 +++++++ templates/layerremote._ | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/source.css b/app/source.css index 92a15a47..ebc769fd 100644 --- a/app/source.css +++ b/app/source.css @@ -17,6 +17,13 @@ .layer-label { width: 80px;} +.editor .field-key { + padding:2px 5px; + border-radius: 3px; + background: rgba(241, 240, 117, .75); + color: rgba(0,0,0,.75); + } + /* Conf pane */ .editor > div.conf { display:block; } .sql .editor > div.conf, diff --git a/templates/layerremote._ b/templates/layerremote._ index 015a97be..58d25295 100644 --- a/templates/layerremote._ +++ b/templates/layerremote._ @@ -6,12 +6,23 @@
-
+
- <% if ('minzoom' in obj) { %> + <% if ('fields' in obj) { %> +
+ <% _(obj.fields||{}).each(function(desc,name) { %> +
+ <%=name%> + <%=desc||'No description.'%> +
+ <% }); %> +
+ <% } %> + + <% if ('minzoom' in obj) { %>
From 0bfc5a523110fc10c95d7c9078b0480617247429 Mon Sep 17 00:00:00 2001 From: samanpwbb Date: Wed, 26 Mar 2014 18:29:11 -0400 Subject: [PATCH 02/10] start to redesign remote layer inspect --- templates/layerremote._ | 45 ++++++++++++----------------------------- templates/source._ | 22 +++++++++++--------- 2 files changed, 26 insertions(+), 41 deletions(-) diff --git a/templates/layerremote._ b/templates/layerremote._ index 58d25295..4f9114ac 100644 --- a/templates/layerremote._ +++ b/templates/layerremote._ @@ -1,43 +1,24 @@ -
-
-

<%= obj.id %>

- - -
- -
-
- - -
+
+ +
icon'><%=obj.id%>
+
+ <% if ('minzoom' && 'maxzoom' in obj) { %> + <%= obj.minzoom %>-<%= obj.maxzoom %> + <% } %> +
+
+
<%=obj.description||'No description.'%>
<% if ('fields' in obj) { %>
<% _(obj.fields||{}).each(function(desc,name) { %> -
+
<%=name%> <%=desc||'No description.'%>
<% }); %>
<% } %> +
- <% if ('minzoom' in obj) { %> -
-
- - - <%= obj.minzoom %> -
- <% } %> - <% if ('maxzoom' in obj) { %> -
- - - <%= obj.maxzoom %> -
- <% } %> -
- -
-
+ \ No newline at end of file diff --git a/templates/source._ b/templates/source._ index 4e4946db..a30c9f0c 100644 --- a/templates/source._ +++ b/templates/source._ @@ -141,23 +141,26 @@ revlayers.reverse();
- <% _(revlayers).each(function(l) { %> - <% print(this.layeritem(_({_prefs:source._prefs}).extend(l))); %> - <% }.bind(this)); %> + <% _(revlayers).each(function(l) { + if (remote) { + print(this['layerremote'](l)); + } else { + print(this.layeritem(_({_prefs:source._prefs}).extend(l))); + } + }.bind(this)); %>
+
-<% _(revlayers).each(function(l) { - if (remote) { - print(this['layerremote'](l)); - } else { +<% if (!remote) { + _(revlayers).each(function(l) { var type = (l.Datasource && l.Datasource.type); if (this['layer' + type]) print(this['layer' + type](_({ tm: tm, vt: source.vector_layers.filter(function(v) { return v.id === l.id })[0] }).extend(l))); - } -}.bind(this)); %> + }.bind(this)); +} %>
<% if (!remote) print(this.modalbrowser({ @@ -303,6 +306,7 @@ Editor.prototype.events = { 'click .layer .xrayinspector': 'toggleinspector', 'click .js-browsefile': 'browsefile', 'click #settings .js-tab': 'tabbed', + 'click .layer .js-tab': 'tabbed', 'click #settings .js-ref-delete': 'delstyle', 'submit #addlayer': 'addlayer', 'submit #addmapbox': 'addmapbox', From 8bc587d54b371d8cc82499c15c955597738b5f3d Mon Sep 17 00:00:00 2001 From: samanpwbb Date: Wed, 26 Mar 2014 23:25:35 -0400 Subject: [PATCH 03/10] remove layerremote template, move stuff into layeritem --- app/app.css | 2 +- app/source.css | 2 -- templates/layeritem._ | 36 ++++++++++++++++++++++++++---------- templates/layerremote._ | 24 ------------------------ templates/source._ | 17 +++++++---------- 5 files changed, 34 insertions(+), 47 deletions(-) delete mode 100644 templates/layerremote._ diff --git a/app/app.css b/app/app.css index fff9ca94..6fb81a0d 100644 --- a/app/app.css +++ b/app/app.css @@ -516,7 +516,7 @@ a.project:hover { background: rgba(255,255,255,.15);} } /* Data menu */ -#layers .layer { border-bottom-color: rgba(0,0,0,.2);} +#layers .layer { border-color: rgba(0,0,0,.2);} #layers .layer:hover { background: rgba(0,0,0,.05);} #layers .data-y, #layers .data-n { display:none; } diff --git a/app/source.css b/app/source.css index ebc769fd..59864bbd 100644 --- a/app/source.css +++ b/app/source.css @@ -15,8 +15,6 @@ .leaflet-popup .xray { color: #f1f075;} -.layer-label { width: 80px;} - .editor .field-key { padding:2px 5px; border-radius: 3px; diff --git a/templates/layeritem._ b/templates/layeritem._ index aeb02aae..85ac9b48 100644 --- a/templates/layeritem._ +++ b/templates/layeritem._ @@ -2,22 +2,38 @@ var inspector = obj._prefs && obj._prefs.inspector && obj._prefs.inspector === obj.id; var disabled = obj._prefs && obj._prefs.disabled && obj._prefs.disabled.indexOf(obj.id) >= 0; %> -
- +
+ <%=obj.id%> <% if (obj.Datasource && obj.Datasource.type) { %> <%= (obj.Datasource.type) %> <% } %> + <% if ('minzoom' && 'maxzoom' in obj) { %> +
+ <%= obj.minzoom %>-<%= obj.maxzoom %> +
+ <% } %> -
- '> + '> <%=obj.geometry||'unknown'%>' style='background-color:<%=this.xraycolor(obj.id)%>'><% if (obj.Datasource && obj.Datasource.type) { %><% if (obj.Datasource && obj.Datasource.type) { %><% } %>
- <%=obj.description||'No description.'%> - <% _(obj.help||{}).each(function(desc,name) { %> - <%=name%><%=desc||'No description.'%> - <% }); %> + +
+
<%=obj.description||'No description.'%>
+ <% if ('fields' in obj) { %> +
+ <% _(obj.fields||{}).each(function(desc,name) { %> +
+ <%=name%> + <%=desc||'No description.'%> +
+ <% }); %> +
+ <% } %> +
+
diff --git a/templates/layerremote._ b/templates/layerremote._ deleted file mode 100644 index 4f9114ac..00000000 --- a/templates/layerremote._ +++ /dev/null @@ -1,24 +0,0 @@ -
- -
icon'><%=obj.id%>
-
- <% if ('minzoom' && 'maxzoom' in obj) { %> - <%= obj.minzoom %>-<%= obj.maxzoom %> - <% } %> -
- -
-
<%=obj.description||'No description.'%>
- <% if ('fields' in obj) { %> -
- <% _(obj.fields||{}).each(function(desc,name) { %> -
- <%=name%> - <%=desc||'No description.'%> -
- <% }); %> -
- <% } %> -
- -
\ No newline at end of file diff --git a/templates/source._ b/templates/source._ index a30c9f0c..b6e03505 100644 --- a/templates/source._ +++ b/templates/source._ @@ -132,21 +132,18 @@ revlayers.reverse(); <% } else { %>
Layers
<% } %> -
- InspectVisibilityVisibility<% if (!remote) { %>DeleteDelete<% } %> -
+ Zoom
<% _(revlayers).each(function(l) { - if (remote) { - print(this['layerremote'](l)); - } else { - print(this.layeritem(_({_prefs:source._prefs}).extend(l))); - } + print(this.layeritem(_({_prefs:source._prefs}).extend(l))); }.bind(this)); %>
From 13a63531f0965797a4d1367d0035529a5dfbd624 Mon Sep 17 00:00:00 2001 From: samanpwbb Date: Thu, 27 Mar 2014 11:34:23 -0400 Subject: [PATCH 04/10] cleanup source inspector --- app/source.css | 13 ++++--------- templates/layeritem._ | 26 ++++++++++++++++---------- templates/source._ | 6 ++++-- templates/xraytemplate._ | 6 +++--- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/app/source.css b/app/source.css index 59864bbd..e3f29f2f 100644 --- a/app/source.css +++ b/app/source.css @@ -1,20 +1,15 @@ +.leaflet-popup .leaflet-popup-content { padding: 10px 10px 5px;} .leaflet-popup .leaflet-popup-content .xray-listing { width:240px; /* leaflet overrides */ - font-size: 10px; + font-size: 11px; line-height: 20px; - letter-spacing: 0; -} -.xray-listing:first-child { border-top: 1px solid rgba(0,0,0,.2);} -.dark .xray-listing, -.dark .xray-listing div { - border-color: rgba(0,0,0,.2); + font-family:'Open Sans', sans-serif; } .source-menu { box-shadow: rgba(0,0,0,0.1) -2px 0px 0px; } -.leaflet-popup .xray { color: #f1f075;} - +.leaflet-popup .xray, .editor .field-key { padding:2px 5px; border-radius: 3px; diff --git a/templates/layeritem._ b/templates/layeritem._ index 85ac9b48..559d8b16 100644 --- a/templates/layeritem._ +++ b/templates/layeritem._ @@ -3,24 +3,30 @@ var inspector = obj._prefs && obj._prefs.inspector && obj._prefs.inspector === o var disabled = obj._prefs && obj._prefs.disabled && obj._prefs.disabled.indexOf(obj.id) >= 0; %>
- + <%=obj.id%> <% if (obj.Datasource && obj.Datasource.type) { %> <%= (obj.Datasource.type) %> <% } %> - <% if ('minzoom' && 'maxzoom' in obj) { %> -
+ <% if ('minzoom' && 'maxzoom' in obj) { %> +
<%= obj.minzoom %>-<%= obj.maxzoom %>
- <% } %> + <% } %>
- '> - <%=obj.geometry||'unknown'%>' style='background-color:<%=this.xraycolor(obj.id)%>'><% if (obj.Datasource && obj.Datasource.type) { %><% } %>
+ + '> + + + <%=obj.geometry||'unknown'%>' style='background-color:<%=this.xraycolor(obj.id)%>'> + + <% if (obj.Datasource && obj.Datasource.type) { %> + + + + <% } %> +
<%=obj.description||'No description.'%>
diff --git a/templates/source._ b/templates/source._ index b6e03505..80f95cf4 100644 --- a/templates/source._ +++ b/templates/source._ @@ -350,9 +350,11 @@ Editor.prototype.user = function() { }; Editor.prototype.zoomin = function(out) { map.setZoom(map.getZoom()+1); + return false; }; Editor.prototype.zoomout = function() { map.setZoom(map.getZoom()-1); + return false; }; Editor.prototype.togglePane = function(name) { var loc = location.href; @@ -498,11 +500,11 @@ Editor.prototype.save = function(ev, options) { attr.center = [lon , map.getCenter().lat, map.getZoom() ]; } attr._prefs.inspector = $('#layers .js-layer:has(.xrayinspector.active)').size() - ? $('#layers .js-layer:has(.xrayinspector.active)').attr('id') + ? $('#layers .js-layer:has(.xrayinspector.active)').attr('id').split('-').pop() : false; attr._prefs.disabled = _($('#layers .layer').map(function(v) { return $('.xrayswatch.disabled', this).size() - ? $(this).attr('id') + ? $(this).attr('id').split('-').pop() : false; })).compact(); diff --git a/templates/xraytemplate._ b/templates/xraytemplate._ index 8b6fa1ae..377511e5 100644 --- a/templates/xraytemplate._ +++ b/templates/xraytemplate._ @@ -1,9 +1,9 @@ {{#__full__}} <% _(obj).each(function(field) { %> {{#<%=field%>}} -
-
<%=field%>
-
{{<%=field%>}}
+
+
<%=field%>
+
{{<%=field%>}}
{{/<%=field%>}} <% }); %> From 4a33203a221a974d545593a928082480f0530e06 Mon Sep 17 00:00:00 2001 From: samanpwbb Date: Thu, 27 Mar 2014 12:26:26 -0400 Subject: [PATCH 05/10] simplify details toggle --- templates/layeritem._ | 16 ++++++++-------- templates/source._ | 25 +++++++++++++++---------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/templates/layeritem._ b/templates/layeritem._ index 559d8b16..748550aa 100644 --- a/templates/layeritem._ +++ b/templates/layeritem._ @@ -2,7 +2,7 @@ var inspector = obj._prefs && obj._prefs.inspector && obj._prefs.inspector === obj.id; var disabled = obj._prefs && obj._prefs.disabled && obj._prefs.disabled.indexOf(obj.id) >= 0; %> -
+
<%=obj.id%> <% if (obj.Datasource && obj.Datasource.type) { %> @@ -15,17 +15,17 @@ var disabled = obj._prefs && obj._prefs.disabled && obj._prefs.disabled.indexOf( <% } %>
- - '> - - - <%=obj.geometry||'unknown'%>' style='background-color:<%=this.xraycolor(obj.id)%>'> - <% if (obj.Datasource && obj.Datasource.type) { %> - + <% } %> + + <%=obj.geometry||'unknown'%>' style='background-color:<%=this.xraycolor(obj.id)%>'> + + + '> +
diff --git a/templates/source._ b/templates/source._ index 80f95cf4..728a6251 100644 --- a/templates/source._ +++ b/templates/source._ @@ -133,13 +133,14 @@ revlayers.reverse();
Layers
<% } %>
- InspectVisibility<% if (!remote) { %>Delete<% } %> - Zoom
+ <% if (!remote) { %> + Delete + <% } else { %> + Zoom + <% } %> + Visibility + Inspect +
<% _(revlayers).each(function(l) { @@ -303,7 +304,7 @@ Editor.prototype.events = { 'click .layer .xrayinspector': 'toggleinspector', 'click .js-browsefile': 'browsefile', 'click #settings .js-tab': 'tabbed', - 'click .layer .js-tab': 'tabbed', + 'click .layer .js-tab': 'tabbedFields', 'click #settings .js-ref-delete': 'delstyle', 'submit #addlayer': 'addlayer', 'submit #addmapbox': 'addmapbox', @@ -356,6 +357,10 @@ Editor.prototype.zoomout = function() { map.setZoom(map.getZoom()-1); return false; }; +Editor.prototype.tabbedFields = function(ev) { + $(ev.currentTarget).parent('.layer').addClass('active').siblings('.layer').removeClass('active'); + return false; +}; Editor.prototype.togglePane = function(name) { var loc = location.href; if (loc.indexOf('#'+name) === -1) { @@ -500,11 +505,11 @@ Editor.prototype.save = function(ev, options) { attr.center = [lon , map.getCenter().lat, map.getZoom() ]; } attr._prefs.inspector = $('#layers .js-layer:has(.xrayinspector.active)').size() - ? $('#layers .js-layer:has(.xrayinspector.active)').attr('id').split('-').pop() + ? $('#layers .js-layer:has(.xrayinspector.active)').attr('id') : false; attr._prefs.disabled = _($('#layers .layer').map(function(v) { return $('.xrayswatch.disabled', this).size() - ? $(this).attr('id').split('-').pop() + ? $(this).attr('id') : false; })).compact(); From b64106988ef9489a6055f36615abe9c542e2525f Mon Sep 17 00:00:00 2001 From: samanpwbb Date: Thu, 27 Mar 2014 12:57:39 -0400 Subject: [PATCH 06/10] bring back help text --- templates/layeritem._ | 8 +++++++- templates/source._ | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/templates/layeritem._ b/templates/layeritem._ index 748550aa..8e3a1ad3 100644 --- a/templates/layeritem._ +++ b/templates/layeritem._ @@ -3,7 +3,7 @@ var inspector = obj._prefs && obj._prefs.inspector && obj._prefs.inspector === o var disabled = obj._prefs && obj._prefs.disabled && obj._prefs.disabled.indexOf(obj.id) >= 0; %> + <% console.log(obj.help) %> + + <% _(obj.help||{}).each(function(desc,name) { %> + <%=name%><%=desc||'No description.'%> + <% }); %> +
<%=obj.description||'No description.'%>
<% if ('fields' in obj) { %> diff --git a/templates/source._ b/templates/source._ index 728a6251..296de588 100644 --- a/templates/source._ +++ b/templates/source._ @@ -135,11 +135,12 @@ revlayers.reverse();
<% if (!remote) { %> Delete - <% } else { %> - Zoom <% } %> Visibility Inspect + <% if (remote) { %> + Zoom + <% } %>
From 83f94cf82b6bc8b853592818a03f6c87b217026e Mon Sep 17 00:00:00 2001 From: samanpwbb Date: Thu, 27 Mar 2014 13:20:18 -0400 Subject: [PATCH 07/10] remove old code --- templates/layeritem._ | 6 ------ 1 file changed, 6 deletions(-) diff --git a/templates/layeritem._ b/templates/layeritem._ index 8e3a1ad3..f81b36ed 100644 --- a/templates/layeritem._ +++ b/templates/layeritem._ @@ -28,12 +28,6 @@ var disabled = obj._prefs && obj._prefs.disabled && obj._prefs.disabled.indexOf(
- <% console.log(obj.help) %> - - <% _(obj.help||{}).each(function(desc,name) { %> - <%=name%><%=desc||'No description.'%> - <% }); %> -
<%=obj.description||'No description.'%>
<% if ('fields' in obj) { %> From e23096d7a4c01fbe5024fedc6176e9fdbf4c4766 Mon Sep 17 00:00:00 2001 From: samanpwbb Date: Thu, 27 Mar 2014 13:52:05 -0400 Subject: [PATCH 08/10] clarify purpose of 'fields' panel --- templates/layerfields._ | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/templates/layerfields._ b/templates/layerfields._ index 8458713a..d99a0306 100644 --- a/templates/layerfields._ +++ b/templates/layerfields._ @@ -1,8 +1,19 @@
+
+ + +
<% _(obj).each(function(helptext, field) { %> -
+
+
+
<%= field %>
+
+
+ +
<% }); %> -
\ No newline at end of file +
+ Done +
+
From 9d75ecf5ca61d82414aeecf1a71ab16f4037a28f Mon Sep 17 00:00:00 2001 From: samanpwbb Date: Thu, 27 Mar 2014 13:56:59 -0400 Subject: [PATCH 09/10] extend yellow to fill col --- templates/layerfields._ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/layerfields._ b/templates/layerfields._ index d99a0306..95f195e7 100644 --- a/templates/layerfields._ +++ b/templates/layerfields._ @@ -6,7 +6,7 @@ <% _(obj).each(function(helptext, field) { %>
-
<%= field %>
+
<%= field %>
From 3c08b10b63ead0a99cc24092dc5c83de73b611d8 Mon Sep 17 00:00:00 2001 From: samanpwbb Date: Thu, 27 Mar 2014 15:20:32 -0400 Subject: [PATCH 10/10] style refinements, deal with displaying long names --- app/app.css | 2 +- app/source.css | 4 +++- templates/layerfields._ | 12 ++++++------ templates/layeritem._ | 4 ++-- templates/sourcelayers._ | 2 +- templates/xraytemplate._ | 4 ++-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/app.css b/app/app.css index 6fb81a0d..d7ce7589 100644 --- a/app/app.css +++ b/app/app.css @@ -528,7 +528,7 @@ a.project:hover { background: rgba(255,255,255,.15);} #layers * { border-color: rgba(0,0,0,.2); } #layers .field-key { - padding:2px 5px; + padding:0 5px; border-radius: 3px; background: rgba(241, 240, 117, .75); color: rgba(0,0,0,.75); diff --git a/app/source.css b/app/source.css index e3f29f2f..4139d27b 100644 --- a/app/source.css +++ b/app/source.css @@ -11,10 +11,12 @@ .leaflet-popup .xray, .editor .field-key { - padding:2px 5px; + padding:0 5px; border-radius: 3px; background: rgba(241, 240, 117, .75); color: rgba(0,0,0,.75); + vertical-align: top; + font-family:'Open Sans', sans-serif; } /* Conf pane */ diff --git a/templates/layerfields._ b/templates/layerfields._ index 95f195e7..6175295d 100644 --- a/templates/layerfields._ +++ b/templates/layerfields._ @@ -1,15 +1,15 @@
- - + +
<% _(obj).each(function(helptext, field) { %>
-
-
<%= field %>
+
+
-
- +
+
<% }); %> diff --git a/templates/layeritem._ b/templates/layeritem._ index f81b36ed..c54b2bc5 100644 --- a/templates/layeritem._ +++ b/templates/layeritem._ @@ -34,8 +34,8 @@ var disabled = obj._prefs && obj._prefs.disabled && obj._prefs.disabled.indexOf(
<% _(obj.fields||{}).each(function(desc,name) { %>
- <%=name%> - <%=desc||'No description.'%> + <%=name%> + <%=desc||'No description.'%>
<% }); %>
diff --git a/templates/sourcelayers._ b/templates/sourcelayers._ index 9191fa5a..0af93a40 100644 --- a/templates/sourcelayers._ +++ b/templates/sourcelayers._ @@ -38,7 +38,7 @@ with no sources. Once vector tile compositing is available revisit.
<% _(l.fields||{}).each(function(desc,name) { %>
- <%=name%> + <%=name%> <%=desc||'No description.'%>
<% }); %> diff --git a/templates/xraytemplate._ b/templates/xraytemplate._ index 377511e5..3961d3a8 100644 --- a/templates/xraytemplate._ +++ b/templates/xraytemplate._ @@ -1,8 +1,8 @@ {{#__full__}} <% _(obj).each(function(field) { %> {{#<%=field%>}} -
-
<%=field%>
+
+
<%=field%>
{{<%=field%>}}
{{/<%=field%>}}