Permalink
Browse files

Merge remote-tracking branch 'origin/HEAD' into feature/new-feature-m…

…etadata

Conflicts:
	app/compile.sh
	app/js/mol.map.layers.js
  • Loading branch information...
2 parents 50375bd + 912ec9f commit 51afd49041519fc9a27947ee9959f0b5a90ebfdb @jmalczyk jmalczyk committed Mar 15, 2013
View
@@ -4,6 +4,6 @@ cd js
rm -rf ../static/js/mol.js
-cat mol.js mol.core.js mol.bus.js mol.mvp.js mol.services.js mol.services.cartodb.js mol.map.js mol.map.loading.js mol.map.layers.js mol.map.menu.js mol.map.results.js mol.map.search.js mol.map.tiles.js mol.map.dashboard.js mol.map.feature.js mol.map.query.js mol.map.basemap.js mol.map.metadata.js mol.map.splash.js mol.map.help.js mol.map.status.js mol.map.images.js mol.map.boot.js > ../static/js/mol.js
+cat mol.js mol.core.js mol.bus.js mol.mvp.js mol.services.js mol.services.cartodb.js mol.map.js mol.map.loading.js mol.map.layers.js mol.map.menu.js mol.map.results.js mol.map.search.js mol.map.tiles.js mol.map.dashboard.js mol.map.feature.js mol.map.query.js mol.map.basemap.js mol.map.metadata.js mol.map.splash.js mol.map.help.js mol.map.status.js mol.map.styler.js mol.map.images.js mol.map.boot.js > ../static/js/mol.js
cd ..
@@ -451,7 +451,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em .5em; background: none; overflow: auto; zoom: 1; }
.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
View
@@ -1371,6 +1371,51 @@ div.mol-Dashboard-TableWindow {
padding:0px;
}
+.mol-Map-ListDialogContent.ui-dialog-content.ui-widget-content {
+ padding: 0.5em 0.5em;
+}
+
+.mol-Map-ListDialogContent .ui-tabs-nav.ui-widget-header {
+ box-shadow: none;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ background-image: none;
+}
+
+.mol-Map-ListDialogContent li.ui-state-default {
+ background: #1D2B52;
+ opacity: 0.75;
+}
+
+.mol-Map-ListDialogContent li.ui-state-default a {
+ padding: 0.3em 0.4em;
+ /*color: white;*/
+ font-size: 0.8em;
+}
+
+.mol-Map-ListDialogContent li.ui-state-default a {
+ color: white;
+}
+
+.mol-Map-ListDialogContent li.ui-state-hover a {
+ color: #C77405;
+}
+
+.mol-Map-ListDialogContent li.ui-state-active a {
+ color: #1D2B52;
+}
+
+
+
+.mol-Map-ListDialogContent li.ui-state-active {
+ background: none;
+}
+
+.mol-Map-ListDialogContent .ui-tabs.ui-tabs-nav {
+ padding: 0;
+}
+
+
.mol-Map-ListQuery {
margin:4px;
}
@@ -0,0 +1,62 @@
+// jQuery.XDomainRequest.js
+// Author: Jason Moon - @JSONMOON
+// IE8+
+if (!jQuery.support.cors && window.XDomainRequest) {
+ var httpRegEx = /^https?:\/\//i,
+ getOrPostRegEx = /^get|post$/i,
+ sameSchemeRegEx = new RegExp("^" + location.protocol, "i"),
+ jsonRegEx = /\/json/i,
+ xmlRegEx = /\/xml/i;
+ jQuery.ajaxTransport("text html xml json", function(e, t, n) {
+ if (e.crossDomain && e.async && getOrPostRegEx.test(e.type) && httpRegEx.test(t.url) && sameSchemeRegEx.test(t.url)) {
+ var r = null,
+ i = (t.dataType || "").toLowerCase();
+ return {
+ send: function(n, s) {
+ r = new XDomainRequest, /^\d+$/.test(t.timeout) && (r.timeout = t.timeout), r.ontimeout = function() {
+ s(500, "timeout")
+ }, r.onload = function() {
+ var e = "Content-Length: " + r.responseText.length + "\r\nContent-Type: " + r.contentType,
+ t = {
+ code: 200,
+ message: "success"
+ },
+ n = {
+ text: r.responseText
+ };
+ try {
+ if (i === "json" || i !== "text" && jsonRegEx.test(r.contentType)) try {
+ n.json = $.parseJSON(r.responseText)
+ } catch (o) {
+ t.code = 500, t.message = "parseerror"
+ } else if (i === "xml" || i !== "text" && xmlRegEx.test(r.contentType)) {
+ var u = new ActiveXObject("Microsoft.XMLDOM");
+ u.async = !1;
+ try {
+ u.loadXML(r.responseText)
+ } catch (o) {
+ u = undefined
+ }
+ if (!u || !u.documentElement || u.getElementsByTagName("parsererror").length) throw t.code = 500, t.message = "parseerror", "Invalid XML: " + r.responseText;
+ n.xml = u
+ }
+ } catch (a) {
+ throw a
+ } finally {
+ s(t.code, t.message, n, e)
+ }
+ }, r.onerror = function() {
+ s(500, "error", {
+ text: r.responseText
+ })
+ };
+ var o = t.data && $.param(t.data) || "";
+ r.open(e.type, e.url), r.send(o)
+ },
+ abort: function() {
+ r && r.abort()
+ }
+ }
+ }
+ })
+};
@@ -438,7 +438,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em .5em; background: none; overflow: auto; zoom: 1; }
.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
View
@@ -15,6 +15,7 @@ mol.modules.map = function(mol) {
'basemap',
'metadata',
'splash',
+ 'styler',
'help',
'status',
'images',
Oops, something went wrong.

0 comments on commit 51afd49

Please sign in to comment.