Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

closes #48

  • Loading branch information...
commit f65f3fcdd0486037ade588e4f944c3a527b65eeb 1 parent 82d8f2b
@xavijam xavijam authored
View
2  Termfile
@@ -32,7 +32,7 @@ end
tab "cartodb sql api" do
run "cd $CARTODB_SQL_PATH"
- run "node cluster development"
+ run "node app.js development"
end
tab "cartodb tiler" do
View
1  app/views/admin/client_applications/oauth.html.erb
@@ -23,6 +23,7 @@
<div class="middle_white_medium">
<div class="end_oauth">
<p>Using the key and secret you can access CartoDB from external applications.</p>
+ <p class="margin">For more information on OAuth in CartoDB, and on our preconfigured API client libraries, take a look at our <a href="http://developers.cartodb.com/">developers page</a>.</p>
<span class="form_block">
<label>CONSUMER KEY</label>
<input type="text" value="<%= current_user.client_application.key %>" readonly="readonly"/>
View
98 app/views/admin/tables/embed_map.html.erb
@@ -7,21 +7,37 @@
html {width:100%; height:100%; padding:0; margin:0; border:none;}
body {width:100%; height:100%; padding:0; margin:0; background:none;}
div#outer_map_cartodb_container {position:relative; width:100%; height:100%; background:white; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
- div#map_cartodb_container {position:absolute; top:5px; left:5px; right:5px; bottom:5px;}
- a.cartodb_logo {position:absolute; bottom:14px; left:75px; display:block; width:70px; height:15px; background:url('http://vizzuality.s3.amazonaws.com/cartodb_tumblr_files/logo.png') no-repeat 0 0;
+ div#map_cartodb_container {position:absolute; top:5px; left:5px; right:5px; bottom:5px; z-index:0;}
+ a.cartodb_logo {position:absolute; bottom:13px; left:75px; display:block; width:72px; height:17px; background:url('http://cartodb.s3.amazonaws.com/static/logo.png') no-repeat 0 0;
text-indent:-9999px; line-height:0; font-size:0;}
- span.map_controls {position:absolute; top:10px; left:10px; width:26px; height:auto;}
- span.map_controls a.zoom_in {width:26px; height:26px; background:url('/images/admin/map/zoomin.png') no-repeat 0 0;}
- span.map_controls a.zoom_in:hover {background-position:0 -26px; cursor:pointer;}
- span.map_controls a.zoom_out {width:26px; height:26px; margin:5px 0 0 0; background:url('/images/admin/map/zoomout.png') no-repeat 0 0;}
- span.map_controls a.zoom_out:hover {background-position:0 -26px; cursor:pointer;}
+ span.cartodb_map_controls {position:absolute; top:10px; left:10px; width:26px; height:100px; z-index:10;}
+ span.cartodb_map_controls a.cartodb_map_embed_zoom_in {display:block; width:30px; height:32px; text-indent:-9999px; line-height:0; font-size:0; background:url('http://cartodb.s3.amazonaws.com/static/maps_sprite.png') no-repeat 0 0;}
+ span.cartodb_map_controls a.cartodb_map_embed_zoom_in:hover {background-position:-31px 0; cursor:pointer;}
+ span.cartodb_map_controls a.cartodb_map_embed_zoom_out {display:block; width:30px; height:32px; text-indent:-9999px; line-height:0; font-size:0; background:url('http://cartodb.s3.amazonaws.com/static/maps_sprite.png') no-repeat 0 -32px;}
+ span.cartodb_map_controls a.cartodb_map_embed_zoom_out:hover {background-position:-31px -32px; cursor:pointer;}
</style>
+
<% if @table.public? %>
<script type="text/javascript">
var table_name = "<%= @table.name %>",
table_id = "<%= @table.id %>",
- user_name = "<%= @subdomain %>";
+ user_name = "<%= @subdomain %>",
+ <% if Rails.env == "development" %>
+ TILEHTTP = "http",
+ TILESERVER = "localhost.lan:8181",
+ SQL_SERVER = 'localhost.lan:8080',
+ global_api_url = '/api/v1/';
+ <% elsif Rails.env == "staging" || Rails.env == "test" %>
+ TILEHTTP = "http",
+ TILESERVER = "ec2-50-16-103-51.compute-1.amazonaws.com",
+ global_api_url = '/api/v1/';
+ <% else %>
+ TILEHTTP = "https",
+ TILESERVER = "cartodb.com",
+ SQL_SERVER = 'cartodb.com',
+ global_api_url = '/api/v1/';
+ <% end %>
</script>
<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=true"></script>
@@ -41,7 +57,7 @@
var cartodb_layer = {
getTileUrl: function(coord, zoom) {
- return 'http' + '://' + user_name + '.cartodb.com/tiles/' + table_name + '/'+zoom+'/'+coord.x+'/'+coord.y+'.png8?map_key=';
+ return TILEHTTP + '://' + user_name + '.' + TILESERVER + '/tiles/' + table_name + '/'+zoom+'/'+coord.x+'/'+coord.y+'.png8';
},
tileSize: new google.maps.Size(256, 256)
};
@@ -49,31 +65,37 @@
carto_embed_map.overlayMapTypes.insertAt(0, cartodb_imagemaptype);
- //
- //
- // var me = this;
- // $.ajax({
- // method: "GET",
- // url: global_api_url+'queries?sql='+escape('select ST_Extent(the_geom) from '+ table_name),
- // headers: {"cartodbclient":"true"},
- // success: function(data) {
- // if (data.rows[0].st_extent!=null) {
- // var coordinates = data.rows[0].st_extent.replace('BOX(','').replace(')','').split(',');
- //
- // var coor1 = coordinates[0].split(' ');
- // var coor2 = coordinates[1].split(' ');
- // var bounds = new google.maps.LatLngBounds();
- //
- // bounds.extend(new google.maps.LatLng(coor1[1],coor1[0]));
- // bounds.extend(new google.maps.LatLng(coor2[1],coor2[0]));
- //
- // embed_map.fitBounds(bounds);
- // }
- //
- // },
- // error: function(e) {
- // }
- // });
+ $.ajax({
+ method: "GET",
+ url: 'http://'+user_name+'.'+SQL_SERVER+global_api_url+'/sql/?q='+escape('select ST_Extent(the_geom) from '+ table_name),
+ dataType: 'jsonp',
+ success: function(data) {
+ if (data.rows[0].st_extent!=null) {
+ var coordinates = data.rows[0].st_extent.replace('BOX(','').replace(')','').split(',');
+
+ var coor1 = coordinates[0].split(' ');
+ var coor2 = coordinates[1].split(' ');
+ var bounds = new google.maps.LatLngBounds();
+
+ bounds.extend(new google.maps.LatLng(coor1[1],coor1[0]));
+ bounds.extend(new google.maps.LatLng(coor2[1],coor2[0]));
+
+ carto_embed_map.fitBounds(bounds);
+ }
+
+ },
+ error: function(e) {}
+ });
+
+
+ $('a.cartodb_map_embed_zoom_in').click(function(ev){
+ ev.preventDefault();
+ carto_embed_map.setZoom(carto_embed_map.getZoom()+1);
+ });
+ $('a.cartodb_map_embed_zoom_out').click(function(ev){
+ ev.preventDefault();
+ carto_embed_map.setZoom(carto_embed_map.getZoom()-1);
+ });
});
</script>
@@ -85,13 +107,11 @@
<div id="outer_map_cartodb_container">
<div id="map_cartodb_container"></div>
</div>
- <span class="map_controls">
- <a href="#zoom_in" class="zoom_in">+</a>
- <a href="#zoom_out" class="zoom_out">-</a>
+ <span class="cartodb_map_controls">
+ <a href="#zoom_in" class="cartodb_map_embed_zoom_in">+</a>
+ <a href="#zoom_out" class="cartodb_map_embed_zoom_out">-</a>
</span>
<a href="http://cartodb.com" class="cartodb_logo" target="_blank">CartoDB</a>
- <% else %>
- This table is private...
<% end %>
</body>
</html>
View
1  app/views/admin/tables/show.html.erb
@@ -14,6 +14,7 @@
"plugins/codemirror/codemirror.js",
"plugins/codemirror/plsql.js",
"plugins/codemirror/css.js",
+ "plugins/ZeroClipboard.js",
"plugins/underscore",
"plugins/mustache",
"plugins/tag-it",
View
2  public/embed.html
@@ -1 +1 @@
-<iframe src="http://admin.localhost.lan:3000/tables/9/embed_map" width="300" height="200"></iframe>
+<iframe src="http://admin.localhost.lan:3000/tables/4/embed_map" width="400" height="200"></iframe>
View
5 public/javascripts/admin/maps/CartoMap.js
@@ -271,7 +271,6 @@
$('a.clear_table').livequery('click',function(ev){
var view_map = ($('body').attr('view_mode') == 'map');
if (view_map) {
- console.log('map');
stopPropagation(ev);
me.query_mode = false;
me.refresh();
@@ -353,8 +352,8 @@
me.map_.fitBounds(bounds);
- if (map.getZoom()<2) {
- map.setZoom(2);
+ if (me.map_.getZoom()<2) {
+ me.map_.setZoom(2);
}
}
View
1  public/javascripts/admin/maps/geometryCreator.js
@@ -228,7 +228,6 @@
thisObj.coords.push(value.getLatLng());
});
- console.log(this.coords);
this.polygonObj=new google.maps.Polygon({paths:this.coords,strokeColor:"#FFFFFF",strokeOpacity:1,strokeWeight:2,fillColor:"#FF6600",fillOpacity:0.5,map:this.map,clickable:true});
View
37 public/javascripts/admin/table/out_table_elements.js
@@ -1138,17 +1138,20 @@
'<div class="html_code">'+
'<h4>HTML CODE</h4>'+
'<span class="copy_code">'+
- '<input type="text" disabled="disabled" value="<iframe src=\'http://'+user_name+'.cartodb.com/tables/'+table_name+'/embed\' width=\'300\' height=\'200\'></iframe>" />'+
+ '<input type="text" disabled="disabled" value="<iframe src=\'http://'+user_name+'.cartodb.com/tables/'+table_name+'/embed\' width=\'572\' height=\'220\'></iframe>" />'+
'<a id="test" class="copy">Copy</a>'+
'</span>'+
'<span class="outer_map">'+
'<div id="embed_map" class="embed_map"></div>'+
+ '<a href="#zoom_in" class="embed_zoom_in">+</a>'+
+ '<a href="#zoom_out" class="embed_zoom_out">-</a>'+
+ '<a href="http://cartodb.com" class="cartodb_logo" target="_blank">CartoDB</a>'+
'</span>'+
'</div>'+
'<div class="tiles_code">'+
'<h4>OR TILES URL</h4>'+
'<span class="copy_code">'+
- '<input type="text" disabled="disabled" value="asdfasdfasfsadfasdfsadfasdfasdfasdfasdfasfasdsadfasdfasdfasdfasdfasdf" />'+
+ '<input type="text" disabled="disabled" value="'+TILEHTTP + '://' + user_name + '.' + TILESERVER + '/tiles/' + table_name + '/{z}/{x}/{y}'+'.png8'+'" />'+
'<a class="copy">Copy</a>'+
'</span>'+
'</div>'+
@@ -1173,6 +1176,14 @@
createMap();
toggleLayer();
zoomToBBox();
+
+ // Start zclip
+ $("div.embed_window .inner_ span.top div span a.copy").zclip({
+ path: "/javascripts/plugins/ZeroClipboard.swf",
+ copy: function(){
+ return $(this).parent().find('input').val();
+ }
+ });
});
bindESC();
});
@@ -1180,14 +1191,21 @@
$('div.embed_window a.close, div.embed_window a.cancel').click(function(ev){
stopPropagation(ev);
closeOutTableWindows();
+ $("div.embed_window .inner_ span.top div span a.copy").zclip('remove');
unbindESC();
});
-
- $('div.embed_window .inner_ span.top div span a').click(function(ev){
- stopPropagation(ev);
- var text = $(this).parent().find('input').val();
- //$.copy('asdfasfasdfasdfadsasdfasdfsafsadfadsfdsaf');
+
+
+
+ // Zooms
+ $('a.embed_zoom_in').click(function(ev){
+ ev.preventDefault();
+ embed_map.setZoom(embed_map.getZoom()+1);
+ });
+ $('a.embed_zoom_out').click(function(ev){
+ ev.preventDefault();
+ embed_map.setZoom(embed_map.getZoom()-1);
});
function createMap() {
@@ -1201,7 +1219,7 @@
var cartodb_layer = {
getTileUrl: function(coord, zoom) {
- return TILEHTTP + '://' + user_name + '.' + TILESERVER + '/tiles/' + table_name + '/'+zoom+'/'+coord.x+'/'+coord.y+'.png8?map_key='+map_key;
+ return TILEHTTP + '://' + user_name + '.' + TILESERVER + '/tiles/' + table_name + '/'+zoom+'/'+coord.x+'/'+coord.y+'.png8';
},
tileSize: new google.maps.Size(256, 256)
};
@@ -1392,7 +1410,8 @@
$('span.title_window').hide();
$('span.advanced_options').hide();
$('span.tags_window').hide();
- $('div.sql_window').hide()
+ $('div.sql_window').hide();
+ $("div.embed_window .inner_ span.top div span a.copy").zclip('remove');
//popup windows
$('div.mamufas').fadeOut('fast',function(){
View
12 public/javascripts/plugins/ZeroClipboard.js
@@ -0,0 +1,12 @@
+/*
+ * zClip :: jQuery ZeroClipboard v1.1.1
+ * http://steamdev.com/zclip
+ *
+ * Copyright 2011, SteamDev
+ * Released under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Date: Wed Jun 01, 2011
+ */
+
+(function(a){a.fn.zclip=function(c){if(typeof c=="object"&&!c.length){var b=a.extend({path:"/javascripts/plugins/ZeroClipboard.swf",copy:null,beforeCopy:null,afterCopy:null,clickAfter:true,setHandCursor:true,setCSSEffects:true},c);return this.each(function(){var e=a(this);if(e.is(":visible")&&(typeof b.copy=="string"||a.isFunction(b.copy))){ZeroClipboard.setMoviePath(b.path);var d=new ZeroClipboard.Client();if(a.isFunction(b.copy)){e.bind("zClip_copy",b.copy)}if(a.isFunction(b.beforeCopy)){e.bind("zClip_beforeCopy",b.beforeCopy)}if(a.isFunction(b.afterCopy)){e.bind("zClip_afterCopy",b.afterCopy)}d.setHandCursor(b.setHandCursor);d.setCSSEffects(b.setCSSEffects);d.addEventListener("mouseOver",function(f){e.trigger("mouseenter")});d.addEventListener("mouseOut",function(f){e.trigger("mouseleave")});d.addEventListener("mouseDown",function(f){e.trigger("mousedown");if(!a.isFunction(b.copy)){d.setText(b.copy)}else{d.setText(e.triggerHandler("zClip_copy"))}if(a.isFunction(b.beforeCopy)){e.trigger("zClip_beforeCopy")}});d.addEventListener("complete",function(f,g){if(a.isFunction(b.afterCopy)){e.trigger("zClip_afterCopy")}else{if(g.length>500){g=g.substr(0,500)+"...\n\n("+(g.length-500)+" characters not shown)"}e.removeClass("hover");}if(b.clickAfter){e.trigger("click")}});d.glue(e[0],e.parent()[0]);a(window).bind("load resize",function(){d.reposition()})}})}else{if(typeof c=="string"){return this.each(function(){var f=a(this);c=c.toLowerCase();var e=f.data("zclipId");var d=a("#"+e+".zclip");if(c=="remove"){d.remove();f.removeClass("active hover")}else{if(c=="hide"){d.hide();f.removeClass("active hover")}else{if(c=="show"){d.show()}}}})}}}})(jQuery);var ZeroClipboard={version:"1.0.7",clients:{},moviePath:"ZeroClipboard.swf",nextId:1,$:function(a){if(typeof(a)=="string"){a=document.getElementById(a)}if(!a.addClass){a.hide=function(){this.style.display="none"};a.show=function(){this.style.display=""};a.addClass=function(b){this.removeClass(b);this.className+=" "+b};a.removeClass=function(d){var e=this.className.split(/\s+/);var b=-1;for(var c=0;c<e.length;c++){if(e[c]==d){b=c;c=e.length}}if(b>-1){e.splice(b,1);this.className=e.join(" ")}return this};a.hasClass=function(b){return !!this.className.match(new RegExp("\\s*"+b+"\\s*"))}}return a},setMoviePath:function(a){this.moviePath=a},dispatch:function(d,b,c){var a=this.clients[d];if(a){a.receiveEvent(b,c)}},register:function(b,a){this.clients[b]=a},getDOMObjectPosition:function(c,a){var b={left:0,top:0,width:c.width?c.width:c.offsetWidth,height:c.height?c.height:c.offsetHeight};if(c&&(c!=a)){b.left+=c.offsetLeft;b.top+=c.offsetTop}return b},Client:function(a){this.handlers={};this.id=ZeroClipboard.nextId++;this.movieId="ZeroClipboardMovie_"+this.id;ZeroClipboard.register(this.id,this);if(a){this.glue(a)}}};ZeroClipboard.Client.prototype={id:0,ready:false,movie:null,clipText:"",handCursorEnabled:true,cssEffects:true,handlers:null,glue:function(d,b,e){this.domElement=ZeroClipboard.$(d);var f=99;if(this.domElement.style.zIndex){f=parseInt(this.domElement.style.zIndex,10)+1}if(typeof(b)=="string"){b=ZeroClipboard.$(b)}else{if(typeof(b)=="undefined"){b=document.getElementsByTagName("body")[0]}}var c=ZeroClipboard.getDOMObjectPosition(this.domElement,b);this.div=document.createElement("div");this.div.className="zclip";this.div.id="zclip-"+this.movieId;$(this.domElement).data("zclipId","zclip-"+this.movieId);var a=this.div.style;a.position="absolute";a.left=""+c.left+"px";a.top=""+c.top+"px";a.width=""+c.width+"px";a.height=""+c.height+"px";a.zIndex=f;if(typeof(e)=="object"){for(addedStyle in e){a[addedStyle]=e[addedStyle]}}b.appendChild(this.div);this.div.innerHTML=this.getHTML(c.width,c.height)},getHTML:function(d,a){var c="";var b="id="+this.id+"&width="+d+"&height="+a;if(navigator.userAgent.match(/MSIE/)){var e=location.href.match(/^https/i)?"https://":"http://";c+='<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="'+e+'download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" width="'+d+'" height="'+a+'" id="'+this.movieId+'" align="middle"><param name="allowScriptAccess" value="always" /><param name="allowFullScreen" value="false" /><param name="movie" value="'+ZeroClipboard.moviePath+'" /><param name="loop" value="false" /><param name="menu" value="false" /><param name="quality" value="best" /><param name="bgcolor" value="#ffffff" /><param name="flashvars" value="'+b+'"/><param name="wmode" value="transparent"/></object>'}else{c+='<embed id="'+this.movieId+'" src="'+ZeroClipboard.moviePath+'" loop="false" menu="false" quality="best" bgcolor="#ffffff" width="'+d+'" height="'+a+'" name="'+this.movieId+'" align="middle" allowScriptAccess="always" allowFullScreen="false" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" flashvars="'+b+'" wmode="transparent" />'}return c},hide:function(){if(this.div){this.div.style.left="-2000px"}},show:function(){this.reposition()},destroy:function(){if(this.domElement&&this.div){this.hide();this.div.innerHTML="";var a=document.getElementsByTagName("body")[0];try{a.removeChild(this.div)}catch(b){}this.domElement=null;this.div=null}},reposition:function(c){if(c){this.domElement=ZeroClipboard.$(c);if(!this.domElement){this.hide()}}if(this.domElement&&this.div){var b=ZeroClipboard.getDOMObjectPosition(this.domElement);var a=this.div.style;a.left=""+b.left+"px";a.top=""+b.top+"px"}},setText:function(a){this.clipText=a;if(this.ready){this.movie.setText(a)}},addEventListener:function(a,b){a=a.toString().toLowerCase().replace(/^on/,"");if(!this.handlers[a]){this.handlers[a]=[]}this.handlers[a].push(b)},setHandCursor:function(a){this.handCursorEnabled=a;if(this.ready){this.movie.setHandCursor(a)}},setCSSEffects:function(a){this.cssEffects=!!a},receiveEvent:function(d,f){d=d.toString().toLowerCase().replace(/^on/,"");switch(d){case"load":this.movie=document.getElementById(this.movieId);if(!this.movie){var c=this;setTimeout(function(){c.receiveEvent("load",null)},1);return}if(!this.ready&&navigator.userAgent.match(/Firefox/)&&navigator.userAgent.match(/Windows/)){var c=this;setTimeout(function(){c.receiveEvent("load",null)},100);this.ready=true;return}this.ready=true;try{this.movie.setText(this.clipText)}catch(h){}try{this.movie.setHandCursor(this.handCursorEnabled)}catch(h){}break;case"mouseover":if(this.domElement&&this.cssEffects){this.domElement.addClass("hover");if(this.recoverActive){this.domElement.addClass("active")}}break;case"mouseout":if(this.domElement&&this.cssEffects){this.recoverActive=false;if(this.domElement.hasClass("active")){this.domElement.removeClass("active");this.recoverActive=true}this.domElement.removeClass("hover")}break;case"mousedown":if(this.domElement&&this.cssEffects){this.domElement.addClass("active")}break;case"mouseup":if(this.domElement&&this.cssEffects){this.domElement.removeClass("active");this.recoverActive=false}break}if(this.handlers[d]){for(var b=0,a=this.handlers[d].length;b<a;b++){var g=this.handlers[d][b];if(typeof(g)=="function"){g(this,f)}else{if((typeof(g)=="object")&&(g.length==2)){g[0][g[1]](this,f)}else{if(typeof(g)=="string"){window[g](this,f)}}}}}}};
View
BIN  public/javascripts/plugins/ZeroClipboard.swf
Binary file not shown
View
56 public/javascripts/plugins/tumblr.js
@@ -1,56 +0,0 @@
-
-
- //////////////////////////////////////////////
- // Get last post from CartoDB Tumblr blog //
- //////////////////////////////////////////////
-
- // head(function(){
- // var tables_published = 0;
- // var last_post = 0;
- //
- // if ($('section.prefooter').length>0) {
- // $.getJSON("http://cartodb.tumblr.com/api/read/json?type=text&tagged=table_published&num=2&filter=text&callback=?",
- // function(blog_posts) {
- // $.each(blog_posts.posts, function(index,post){
- // if (tables_published != 2) {
- // var text = post["regular-body"].substr(0,200);
- // if (post["regular-title"].length>53) {
- // var title = post["regular-title"].substr(0,50) + '...';
- // } else {
- // var title = post["regular-title"];
- // }
- // if (tables_published==0) {
- // $('section.prefooter div.block:eq(0) h4').html('<a href="'+post.url+'" target="_blank">'+title+'</a>');
- // $('section.prefooter div.block:eq(0) p').html(text+'... <a href="'+post.url+'" target="_blank">Read more...</a>');
- // } else {
- // $('section.prefooter div.block:eq(1) h4').html('<a href="'+post.url+'" target="_blank">'+title+'</a>');
- // $('section.prefooter div.block:eq(1) p').html(text+'... <a href="'+post.url+'" target="_blank">Read more...</a>');
- // }
- // tables_published++;
- // } else {
- // return false;
- // }
- // });
- // }
- // );
- // $.getJSON("http://cartodb.tumblr.com/api/read/json?type=text&tagged=Post&num=1&filter=text&callback=?",
- // function(blog_posts) {
- // $.each(blog_posts.posts, function(index,post){
- // var text = post["regular-body"].substr(0,200);
- // if (post["regular-title"].length>53) {
- // var title = post["regular-title"].substr(0,50) + '...';
- // } else {
- // var title = post["regular-title"];
- // }
- // if (last_post!=1) {
- // $('section.prefooter div.block:eq(2) h4').html('<a href="'+post.url+'" target="_blank">'+title+'</a>');
- // $('section.prefooter div.block:eq(2) p').html(text+'... <a href="'+post.url+'" target="_blank">Read more...</a>');
- // last_post++;
- // } else {
- // return false;
- // }
- // });
- // }
- // );
- // }
- // });
View
3  public/stylesheets/admin/others/tokens.css
@@ -94,6 +94,9 @@ section#content div.left div.middle_white_medium a.submit.orange:hover {
section#content div.left div.middle_white_medium div.end_oauth {width:576px; margin:0; padding:22px 22px 0;}
section#content div.left div.middle_white_medium div.end_oauth p {margin:0; padding:0; font:normal 15px Arial; color:#333333;}
+section#content div.left div.middle_white_medium div.end_oauth p.margin {padding:15px 0 0 0;}
+section#content div.left div.middle_white_medium div.end_oauth p a {color:#FF9900; text-decoration:none}
+section#content div.left div.middle_white_medium div.end_oauth p a:hover {color:#FF6600; text-decoration:underline}
section#content div.left div.middle_white_medium div.end_oauth span.form_block {display:inline-block; width:275px; margin:5px 20px 0 0!important; padding:0; vertical-align:top;}
section#content div.left div.middle_white_medium div.end_oauth span.form_block.last {margin:5px 0 0 0!important;}
section#content div.left div.middle_white_medium div.end_oauth span.form_block label {font:bold 10px "Helvetica",Arial; color:#999999;}
View
10 public/stylesheets/admin/table/out_table_elements.css
@@ -472,10 +472,16 @@ div.mamufas div.embed_window div.inner_ div span.copy_code input {float:left; wi
div.mamufas div.embed_window div.inner_ div span.copy_code a {float:right; height:12px; margin:3px 3px 0 0; padding:4px 6px; font:bold 11px "Helvetica",Arial; color:#333333; text-align:center; border:1px solid #999999; text-decoration:none; text-shadow:0 1px white;
-webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; line-height:12px; background:linear-gradient(-90deg, #FFFFFF, #CACBCE); background:-webkit-gradient(linear, 50% 0%, 50% 100%, from(#FFFFFF), to(#CACBCE));
background:-moz-linear-gradient(-90deg, #FFFFFF, #CACBCE); background: -o-linear-gradient(#FFFFFF,#CACBCE); filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#FFFFFF', endColorstr='#CACBCE');}
-div.mamufas div.embed_window div.inner_ div span.copy_code a:hover {background:linear-gradient(-90deg, #CACBCE, #FFFFFF); background:-webkit-gradient(linear, 50% 0%, 50% 100%, from(#CACBCE), to(#FFFFFF));
+div.mamufas div.embed_window div.inner_ div span.copy_code a.hover {background:linear-gradient(-90deg, #CACBCE, #FFFFFF); background:-webkit-gradient(linear, 50% 0%, 50% 100%, from(#CACBCE), to(#FFFFFF));
background:-moz-linear-gradient(-90deg, #CACBCE, #FFFFFF); background: -o-linear-gradient(#CACBCE,#FFFFFF); filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#CACBCE', endColorstr='#FFFFFF'); cursor:pointer;}
-div.mamufas div.embed_window div.inner_ div.html_code span.outer_map {float:left; width:560px; height:208px; padding:5px; margin:5px 0 0 0; border:1px solid #CDCDCD; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; background:white;}
+div.mamufas div.embed_window div.inner_ div.html_code span.outer_map {position:relative; float:left; width:560px; height:208px; padding:5px; margin:5px 0 0 0; border:1px solid #CDCDCD; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; background:white;}
div.mamufas div.embed_window div.inner_ div.html_code span.outer_map div.embed_map {width:560px; height:208px;}
+div.mamufas div.embed_window span.outer_map a.embed_zoom_in {position:absolute; top:10px; left:10px; display:block; width:30px; height:32px; text-indent:-9999px; line-height:0; font-size:0; background:url('http://cartodb.s3.amazonaws.com/static/maps_sprite.png') no-repeat 0 0;}
+div.mamufas div.embed_window span.outer_map a.embed_zoom_in:hover {background-position:-31px 0; cursor:pointer;}
+div.mamufas div.embed_window span.outer_map a.embed_zoom_out {position:absolute; top:42px; left:10px; display:block; width:30px; height:32px; text-indent:-9999px; line-height:0; font-size:0; background:url('http://cartodb.s3.amazonaws.com/static/maps_sprite.png') no-repeat 0 -32px;}
+div.mamufas div.embed_window span.outer_map a.embed_zoom_out:hover {background-position:-31px -32px; cursor:pointer;}
+div.mamufas div.embed_window span.outer_map a.cartodb_logo {position:absolute; bottom:13px; left:75px; display:block; width:72px; height:17px; background:url('http://cartodb.s3.amazonaws.com/static/logo.png') no-repeat 0 0;
+ text-indent:-9999px; line-height:0; font-size:0;}
div.mamufas div.embed_window div.inner_ span.bottom {float:left; width:581px; padding:0 10px 10px; border-top:1px solid white;}
div.mamufas div.embed_window div.inner_ span.bottom a.cancel {float:right; height:12px; margin:10px 0 0 0; padding:7px 9px; font:bold 12px Arial; color:#333333; text-align:center; border:1px solid #999999; text-decoration:none; text-shadow:0 1px white;
-webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; line-height:12px; background:linear-gradient(-90deg, #FFFFFF, #CACBCE); background:-webkit-gradient(linear, 50% 0%, 50% 100%, from(#FFFFFF), to(#CACBCE));
Please sign in to comment.
Something went wrong with that request. Please try again.