Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:mapbox/tilemill

  • Loading branch information...
commit 555225afddaaa5f983d3e3074b17a67743115f4b 2 parents 09a55cc + fa0d12d
AJ Ashton authored
View
9 CHANGELOG.md
@@ -1,3 +1,12 @@
+0.3.2
+-----
+- Fix broken references to PostGIS user field.
+
+0.3.1
+-----
+- Bugfixes for PostGIS layer support
+
+
0.3.0
-----
- Basic PostGIS layer support
View
9 client/css/tilemill.css
@@ -523,7 +523,10 @@ ul.form > li > label {
ul.form > li input.text,
ul.form > li textarea { width:100%; }
-ul.form > li input.inline { width:auto; }
+ul.form > li input.inline {
+ width:auto;
+ margin-right:10px;
+ }
ul.form ul.form > li {
padding:9px 10px 10px;
@@ -539,10 +542,10 @@ ul.form ul.form > li > label {
}
ul.form label.inline {
- display:block;
+ display:inline-block;
position:static;
text-align:left;
- width:auto;
+ width:70px;
border:0px;
padding:0px;
background:transparent;
View
29 client/index.html
@@ -484,7 +484,6 @@ <h1 class='breadcrumb'>
<script type='text/html' id='PostgisLayerForm'>
<form>
- <input type='hidden' id='geometry_field' value='{{geometry_field}}'>
<ul class='form'>
<li>
<label for='id'><span class='required' title='This field is required'>*</span> ID</label>
@@ -495,33 +494,33 @@ <h1 class='breadcrumb'>
<input type='text' class='text' id='class' value='{{class}}'/>
</li>
<li>
- <label for='host'>Hostname</label>
- <input type='text' class='text' id='host' value='{{host}}' />
+ <label for='dbname'><span class='required' title='This field is required'>*</span> Database</label>
+ <input type='text' class='text' id='dbname' value='{{dbname}}' />
</li>
<li>
- <label for='port'>Port</label>
- <input type='text' class='text' id='port' value='{{port}}' />
+ <label for='table'><span class='required' title='This field is required'>*</span> Query</label>
+ <code class="sql">SELECT * FROM </code>
+ <textarea class='text' id='table' >{{table}}</textarea>
</li>
<li>
- <label for='dbname'><span class='required' title='This field is required'>*</span> Database</label>
- <input type='text' class='text' id='dbname' value='{{dbname}}' />
+ <label for='host'>Hostname</label>
+ <input type='text' size='10' class='inline text' id='host' value='{{host}}' />
+ <label class='inline' for='port'>Port</label>
+ <input type='text' size='10' class='inline text' id='port' value='{{port}}' />
</li>
<li>
<label for='user'>Username</label>
- <input type='text' class='text' id='user' value='{{user}}' />
- </li>
- <li>
- <label for='password'>Password</label>
- <input type='password' class='text' id='password' value='{{password}}' />
+ <input type='text' size='10' class='inline text' id='user' value='{{user}}' />
+ <label class='inline' for='password'>Password</label>
+ <input type='password' size='10' class='inline text' id='password' value='{{password}}' />
</li>
<li>
<label for='extent'>Extent</label>
<input type='text' class='text' id='extent' value='{{extent}}' />
</li>
<li>
- <label for='table'><span class='required' title='This field is required'>*</span> Query</label>
- <code class="sql">SELECT * FROM </code>
- <textarea class='text' id='table' >{{table}}</textarea>
+ <label for='extent'>Geometry Field</label>
+ <input type='text' class='text' id='geometry_field' value='{{geometry_field}}' />
</li>
<li>
<label for='srs-name'>SRS</label>
View
12 client/js/project-layer.js
@@ -259,10 +259,7 @@ var PostgisLayerForm = Backbone.View.extend({
this.model = this.options.model;
if (!this.model.get('Datasource')) {
- this.model.set({Datasource: {
- host: 'localhost',
- port: '5432'
- }});
+ this.model.set({Datasource: {}});
}
var object = {};
@@ -277,11 +274,12 @@ var PostgisLayerForm = Backbone.View.extend({
object['host'] = datasource.host;
object['port'] = datasource.port;
object['database'] = datasource.database;
- object['username'] = datasource.username;
+ object['user'] = datasource.user;
object['password'] = datasource.password;
object['dbname'] = datasource.dbname;
object['table'] = datasource.table;
object['extent'] = datasource.extent;
+ object['geometry_field'] = datasource.geometry_field;
$(this.el).html(ich.PostgisLayerForm(object, true));
},
submit: function() {
@@ -293,7 +291,7 @@ var PostgisLayerForm = Backbone.View.extend({
host: $('input#host', this.el).val(),
port: $('input#port', this.el).val(),
database: $('input#database', this.el).val(),
- username: $('input#username', this.el).val(),
+ user: $('input#user', this.el).val(),
password: $('input#password', this.el).val(),
dbname: $('input#dbname', this.el).val(),
table: $('textarea#table', this.el).val(),
@@ -315,7 +313,7 @@ var PostgisLayerForm = Backbone.View.extend({
host: $('input#host', this.el).val(),
port: $('input#port', this.el).val(),
database: $('input#database', this.el).val(),
- username: $('input#username', this.el).val(),
+ user: $('input#user', this.el).val(),
password: $('input#password', this.el).val(),
dbname: $('input#dbname', this.el).val(),
table: $('textarea#table', this.el).val(),
View
1,686 test/fixtures/tilemill_test.sql
842 additions, 844 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.