Merged local dev

.gitignore

@@ -1,103 +1 @@
-*~
-.svn
-.cvs
-.git
-.listing
-*.bak
-*.swp
-*.log
-.DS_Store
-last-mod
-plugins/wp-file-cache/cache
-cache
-_wpeprivate
-.cache
-temp
-tmp
-*.tmp
-imagecache*
-uploads*
-*_backup
-gt-cache
-ics-importer-cache
-wp-config-sample.php
-wp-content/w3tc*
-wp-content/w3-*
-wp-content/plugins/wpengine-snapshot/snapshots/*
-wp-content/uploads/snapshots
-wp-content/themes/thesis*/custom/cache
-wp-content/themes/thesis*/lib/scripts/cache
-wp-content/themes/*/cache
-wp-content/plugins/*/cache
-wp-content/w3tc-bak
-wp-content/backup*
-wp-content/temp*
-wp-content/debug.log
-wp-content/backups
-wp-content/managewp
-wp-content/upgrade/*
-wp-content/uploads
-wp-content/blogs.dir/*/*
-pclzip-*
-
-# WordPress debugging files
-log.txt
-debug.log
-
-# Gallaries in various places
-gallery/*
-wp-content/gallery/*
-wp-content/album/*
-
-# Found in 'sneakernews' - probably just a backup but never going to be good to include
-wp-content/plugins/plugins
-
-# Found in the root of pod-1009
-.a
-
-# Forum software we probably shouldn't support anyway
-forum/*
-
-# known large file types
-*.hqx
-*.bin
-*.exe
-*.dll
-*.deb
-*.dmg
-*.iso
-*.img
-*.msi
-*.msp
-*.msm
-*.mid
-*.midi
-*.kar
-*.mp3
-*.ogg
-*.m4a
-*.ra
-*.3gpp
-*.3gp
-*.mp4
-*.mpeg
-*.mpg
-*.mov
-*.webm
-*.flv
-*.m4v
-*.mng
-*.asx
-*.asf
-*.wmv
-*.avi
 *.zip
-*.tar
-*.tgz
-*.gz
-.synthquota
-.s3backupstatus
-importbuddy.php
-backupbuddy
-wp-content/mu-plugins/*
-_BAK_

README.md

@@ -78,3 +78,11 @@ Known Bugs
 This plugin loads cartodb.js which includes its own copy of Leaflet. If other 
 plugins are also loading leaflet, there will likely be conflicts. These conflicts
 may manifest themselves in various ways including not finding loaded plugins.
+
+Release Log
+-----------
+
+### 0.1.0 Initial Release
+ * Support for CartoDB
+ * Support for remote GeoJSON files
+ * Support for caching

assets/savvy.css

@@ -14,24 +14,53 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
+ */
 
 /**
  * SavvyMapper CSS
  */
 
-.remove-instance{
-	text-decoration: underline;
-	cursor: pointer;
+table.savvy_settings th {
+	text-align: left;
+}
+
+.savvyoptions_wrap .form-table {
+	display: none;
 }
 
-.remove-instance:hover{
-	text-decoration: none;
+.savvyoptions_wrap label {
+	margin-right: 4px;
+	width: 150px;
+	display: inline-block;
 }
-table.savvy_settings th {
-	text-align: left;
+
+.savvyoptions_wrap label:after {
+	content: ':';
 }
 
+.savvyoptions_wrap input,
+.savvyoptions_wrap select
+{
+	min-width: 330px;
+	margin-bottom: 5px;
+}
+
+.savvyoptions_wrap input[type=checkbox],
+.savvyoptions_wrap input[type=submit],
+.savvyoptions_wrap input[type=button] {
+	min-width: auto;
+}
+
+div.savvyoptions_wrap textarea {
+	resize: both;
+	width: 100%;
+	width: calc(100% - 250px);
+	vertical-align: top;
+	display: inline-block;
+	margin-bottom: 5px;
+}
+
+
 .savvy_metabox_map_div, .savvy_lookupbox {
 	min-height: 400px;
 	min-width: 250px;
@@ -69,10 +98,10 @@ table.savvy_settings th {
 
 /*
 .savvy-attr {
-	font-weight: bold;
-	color: #690000;
+font-weight: bold;
+color: #690000;
 }
-*/
+ */
 
 .savvy-attr::after {
 	content: ', ';
@@ -102,11 +131,6 @@ div.savvymapper_metabox_col textarea {
 	resize: both;
 	width: 100%;
 }
-div.savvymapper_mapping_wrap textarea, 
-div.savvymapper_options_wrap textarea
-{
-	resize: both;
-}
 
 div.savvy_metabox_wrapper .wide {
 	width: 100%;
@@ -140,3 +164,41 @@ table.savvymapper_popup tr.empty_row {
 .entry-content a.leaflet-popup-close-button {
 	border: none;
 }
+
+.savvyhinner {
+	background-color: #f8faee;
+	border: 3px solid #bfbfbf;
+	display: inline-block;
+	padding: 10px 15px 10px 5px;
+	border-radius: 15px;
+}
+
+
+.savvyhinner .dashicons-no {
+	color: #842424;
+}
+
+.savvyhinner .dashicons-no:hover {
+	color: #ff4747;
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+
+.savvyconnectionname {
+	color: #888;
+}
+
+.toplabel {
+	position: absolute;
+	top: 0;
+	font-weight: bold;
+	font-size: 1.2em;
+}
+#savvy_mapping_form {
+	position: relative;
+	padding-top: 1.6em;
+}
+label.toplabel:after {
+	content: '';
+}

assets/savvyclass.js

@@ -6,7 +6,10 @@ MIT Licensed.
 This sets up a method this._super() which can call the parent method (if it exists) from inside the child method. 
 */
 (function(){
-	var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
+	var initializing = false;
+	var testres;
+	testres = /xyz/.test(function(){return xyz;});
+	var fnTest = ( testres ? /\b_super\b/ : /.*/);
 
 	// The base SavvyClass implementation (does nothing)
 	this.SavvyClass = function(){};