Skip to content
This repository has been archived by the owner on Dec 3, 2018. It is now read-only.

prompt add source when creating new source #303

Merged
merged 3 commits into from Apr 16, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/app.css
Expand Up @@ -305,7 +305,6 @@ a.project:hover { background: rgba(255,255,255,.15);}
-ms-transform:translateY(10px);
transform:translateY(10px);
}
#search .search-result { padding-right:30px; }

.dark #search { box-shadow:0 0 0 2px rgba(0,0,0,.5);}

Expand Down Expand Up @@ -572,8 +571,7 @@ a.project:hover { background: rgba(255,255,255,.15);}
#layers .field-key {
padding:0 5px;
border-radius: 3px;
background: rgba(241, 240, 117, .75);
color: rgba(0,0,0,.75);
color: #343434;
}
#layers .layer.active { background: rgba(0,0,0,.2);}
#style-ui #layers a.active,
Expand Down Expand Up @@ -714,7 +712,7 @@ span.cm-carto-string { color:#8010a0; }
span.cm-carto-filter { color:#66475B; }

.dark .CodeMirror { background:transparent; border-top: 1px solid rgba(0,0,0,.2); }
.dark .CodeMirror-gutters { background:#333; border-color:#333; }
.dark .CodeMirror-gutters { background:rgba(0,0,0,.1); border-color:rgba(0,0,0,0.2); }
.dark .CodeMirror pre { background: transparent;}
.dark .CodeMirror .CodeMirror-cursor { border-color:#ccc; }
.dark .CodeMirror-selected,
Expand Down
1 change: 0 additions & 1 deletion app/source.css
Expand Up @@ -26,7 +26,6 @@
.editor .field-key {
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;
Expand Down
2 changes: 1 addition & 1 deletion index.js
Expand Up @@ -474,7 +474,7 @@ app.get('/new/style', function(req, res, next) {
});

app.get('/new/source', function(req, res, next) {
res.redirect('/source?id=' + source.tmpid());
res.redirect('/source?id=' + source.tmpid() + '#addlayer');
});

app.get('/', function(req, res, next) {
Expand Down
2 changes: 1 addition & 1 deletion templates/layerfields._
Expand Up @@ -6,7 +6,7 @@
<% _(obj).each(function(helptext, field) { %>
<section class='keyline-bottom pad1 clearfix small'>
<div class='pad1x pad0y col3'>
<label for='fields-<%=field%>' title='<%= field %>' class='truncate field-key col12 inline field'><%= field %></label>
<label for='fields-<%=field%>' title='<%= field %>' class='fill-lighten2 truncate field-key col12 inline field'><%= field %></label>
</div>
<div class='col9 pad1x'>
<input class='small short stretch' id='fields-<%=field%>' name='fields-<%=field%>' type='text' value='<%=_(helptext).escape()%>' />
Expand Down
2 changes: 1 addition & 1 deletion templates/layeritem._
Expand Up @@ -34,7 +34,7 @@ var disabled = obj._prefs && obj._prefs.disabled && obj._prefs.disabled.indexOf(
<div class='small pad0y'>
<% _(obj.fields||{}).each(function(desc,name) { %>
<div class='field pad1x space-bottom0 clearfix'>
<span class='field-key break-word col3'><%=name%> </span>
<span class='fill-lighten2 field-key break-word col3'><%=name%> </span>
<span class='quiet col9 pad1x'><%=desc||'No description.'%></span>
</div>
<% }); %>
Expand Down
10 changes: 7 additions & 3 deletions templates/source._
Expand Up @@ -211,10 +211,12 @@ revlayers.reverse();
<% if (!remote) { %>
<form id='addlayer' class='modal round pad2 col6 margin3 fill-light'>
<a class="pad1 quiet icon x pin-topright" href="#"></a>
<fieldset class='col8 margin2 space-bottom1'>
<input class='col12 space-bottom1' type='text' placeholder='layername' title='No spaces allowed.' size='20' name='id' pattern='\w+'/>
<fieldset class='col8 margin2'>
<p class='center'>Add a layer to your source.</p>
<input class='col12 space-bottom1' type='text' placeholder='Name' title='No spaces, punctuation marks, or special characters allowed.' size='20' name='id' pattern='\w+'/>
</fieldset>
<fieldset class='col8 margin2'>
<div class="space-bottom1 small quiet">Select the format of the data you wish to convert into a vector source:</div>
<div class='col12 scroll-styled radio-buttons'>
<input name='type' type='radio' id='addlayer-postgis' value='postgis' checked >
<label class='contain icon check quiet short button col12' for='addlayer-postgis'>
Expand Down Expand Up @@ -272,7 +274,9 @@ tm.srs = <%= JSON.stringify(tm.srs) %>;
statHandler('srcbytes')();

// set initial page view to avoid #browsefile trap
$(function() { window.location.href = '#';});
$(function() {
if (window.location.hash === '#browsefile') window.location.hash = '#';
});

var Layer = function(id, datasource) {
var code;
Expand Down
2 changes: 1 addition & 1 deletion templates/sourcelayers._
Expand Up @@ -25,7 +25,7 @@
<div class='pad1y'>
<% _(l.fields||{}).each(function(desc,name) { %>
<div class='field pad1x pad0y clearfix'>
<span class='field-key break-word col4'><%=name%> </span>
<span class='fill-lighten2 field-key break-word col4'><%=name%> </span>
<span class='quiet col8 pad1x'><%=desc||'No description.'%></span>
</div>
<% }); %>
Expand Down
4 changes: 2 additions & 2 deletions templates/style._
Expand Up @@ -93,15 +93,15 @@
<% if (style._prefs.mapid) { %>
<section class='space-bottom0 clearfix'>
<label class='inline col4 pad0y' for='map_id'>Map ID</label>
<input id='map_id' class='short small col8 readonly' name='mapid' type='text' value='<%= _(style._prefs.mapid).escape() %>' placeholder='Mapbox map id' readonly disabled></input>
<input id='map_id' class='code clean short small col8 readonly' name='mapid' type='text' value='<%= _(style._prefs.mapid).escape() %>' placeholder='Mapbox map id' readonly disabled></input>
</section>
<% } %>
</fieldset>
<fieldset class='fill-darken0 pad1 round'>
<div class='space-bottom0 small quiet'><em>Underlay your style with a Mapbox map. For reference only.</em></div>
<section class='clearfix'>
<label class='inline col4 pad0y' for='baselayer_id'>Baselayer ID</label>
<input id='baselayer_id' class='short small col8' name='baselayer' type='text' value='<%= _(style._prefs.baselayer).escape() %>' placeholder='Mapbox map id'></input>
<input id='baselayer_id' class='code short small col8' name='baselayer' type='text' value='<%= _(style._prefs.baselayer).escape() %>' placeholder='Mapbox map id'></input>
</section>
</fieldset>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/xraytemplate._
Expand Up @@ -2,7 +2,7 @@
<% _(obj).each(function(field) { %>
{{#<%=field%>}}
<div class='clearfix space-bottom0 xray-listing'>
<div class='col4 break-word xray'><%=field%></div>
<div class='col4 break-word fill-lighten2 xray'><%=field%></div>
<div class='quiet pad1x col8'>{{<%=field%>}}</div>
</div>
{{/<%=field%>}}
Expand Down