created map prompt

This commit is contained in:
Connor Turland 2014-10-11 22:49:44 -04:00
parent fcdc6d57b2
commit cd4474a0f0
7 changed files with 81 additions and 16 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

View file

@ -2826,6 +2826,7 @@ var Canvas;
this.getPos(true); this.getPos(true);
this.translateOffsetX = this.translateOffsetY = 0; this.translateOffsetX = this.translateOffsetY = 0;
this.scaleOffsetX = this.scaleOffsetY = 1; this.scaleOffsetX = this.scaleOffsetY = 1;
for(var i=0, l=this.canvases.length; i<l; i++) { for(var i=0, l=this.canvases.length; i<l; i++) {
this.canvases[i].resize(width, height); this.canvases[i].resize(width, height);
} }
@ -3025,6 +3026,7 @@ var Canvas;
canvas.height = height; canvas.height = height;
styles.width = width + "px"; styles.width = width + "px";
styles.height = height + "px"; styles.height = height + "px";
//small ExCanvas fix //small ExCanvas fix
if(!supportsCanvas) { if(!supportsCanvas) {
this.translateToCenter(size); this.translateToCenter(size);
@ -3035,6 +3037,7 @@ var Canvas;
this.translateOffsetY = 0; this.translateOffsetY = 0;
this.scaleOffsetX = this.scaleOffsetX =
this.scaleOffsetY = 1; this.scaleOffsetY = 1;
this.clear(); this.clear();
this.viz.resize(width, height, this); this.viz.resize(width, height, this);
}, },

View file

@ -186,13 +186,18 @@ Metamaps.GlobalUI.CreateMap = {
// bind permission changer events on the createMap form // bind permission changer events on the createMap form
$('.permIcon').unbind().bind('click', self.switchPermission); $('.permIcon').unbind().bind('click', self.switchPermission);
}, },
closeSuccess: function () {
$('#mapCreatedSuccess').fadeOut(300, function(){
$(this).remove();
});
},
generateSuccessMessage: function (id) { generateSuccessMessage: function (id) {
var stringStart = "Success! Do you want to <br> <a href='/maps/"; var stringStart = "<div id='mapCreatedSuccess'><h6>SUCCESS!</h6>Your map has been created. Do you want to: <a id='mapGo' href='/maps/";
stringStart += id; stringStart += id;
stringStart += "'>Go to your new map?</a>"; stringStart += "' onclick='Metamaps.GlobalUI.CreateMap.closeSuccess();'>Go to your new map</a>";
stringStart += "<br>or<br><a href='#' onclick='Metamaps.GlobalUI.closeLightbox(); return false;'>Stay on this "; stringStart += "<span>OR</span><a id='mapStay' href='#' onclick='Metamaps.GlobalUI.CreateMap.closeSuccess(); return false;'>Stay on this ";
var page = Metamaps.Active.Map ? 'map' : 'page'; var page = Metamaps.Active.Map ? 'map' : 'page';
var stringEnd = "?</a>"; var stringEnd = "</a></div>";
return stringStart + page + stringEnd; return stringStart + page + stringEnd;
}, },
switchPermission: function () { switchPermission: function () {
@ -239,9 +244,8 @@ Metamaps.GlobalUI.CreateMap = {
// TODO add error message // TODO add error message
}); });
if (Metamaps.GlobalUI.lightbox === 'forkmap') { Metamaps.GlobalUI.closeLightbox();
form.html('Working...'); Metamaps.GlobalUI.notifyUser('Working...');
}
}, },
success: function (model) { success: function (model) {
var self = Metamaps.GlobalUI.CreateMap; var self = Metamaps.GlobalUI.CreateMap;
@ -249,9 +253,9 @@ Metamaps.GlobalUI.CreateMap = {
var formId = Metamaps.GlobalUI.lightbox === 'forkmap' ? '#fork_map' : '#new_map'; var formId = Metamaps.GlobalUI.lightbox === 'forkmap' ? '#fork_map' : '#new_map';
var form = $(formId); var form = $(formId);
form.html(self.generateSuccessMessage(model.id)); Metamaps.GlobalUI.clearNotify();
$('#wrapper').append(self.generateSuccessMessage(model.id));
$('#lightbox_main').css('margin-top', '-' + ($('#lightbox_main').height() / 2) + 'px');
}, },
reset: function (id) { reset: function (id) {
var self = Metamaps.GlobalUI.CreateMap; var self = Metamaps.GlobalUI.CreateMap;

View file

@ -937,6 +937,7 @@ Metamaps.JIT = {
Metamaps.Create.newTopic.open(); Metamaps.Create.newTopic.open();
} else if (!Metamaps.Mouse.didPan) { } else if (!Metamaps.Mouse.didPan) {
// SINGLE CLICK, no pan // SINGLE CLICK, no pan
Metamaps.Filter.close();
Metamaps.TopicCard.hideCard(); Metamaps.TopicCard.hideCard();
Metamaps.SynapseCard.hideCard(); Metamaps.SynapseCard.hideCard();
Metamaps.Create.newTopic.hide(); Metamaps.Create.newTopic.hide();

View file

@ -2512,10 +2512,6 @@ Metamaps.Filter = {
var self = Metamaps.Filter; var self = Metamaps.Filter;
$('.sidebarFilterIcon').click(self.toggleBox); $('.sidebarFilterIcon').click(self.toggleBox);
$('.sidebarFilterBox').click(function(event){
event.stopPropagation();
});
$('body').click(self.close);
$('.sidebarFilterBox .showAllMetacodes').click(self.filterNoMetacodes); $('.sidebarFilterBox .showAllMetacodes').click(self.filterNoMetacodes);
$('.sidebarFilterBox .showAllSynapses').click(self.filterNoSynapses); $('.sidebarFilterBox .showAllSynapses').click(self.filterNoSynapses);

View file

@ -70,8 +70,8 @@ body,
.wrapper { .wrapper {
height: 100%; height: 100%;
} }
.wrapper.homePage { .homePage .famousYield {
/*background: url('mm-homepage-bg-image.png') no-repeat center -249px;*/ background: url(homepage-bg.png) no-repeat -515px -40px;
} }
.wrapper.mapPage { .wrapper.mapPage {
overflow: hidden; overflow: hidden;
@ -853,6 +853,67 @@ label[for="user_remember_me"] {
} }
/* end Save To New Map */ /* end Save To New Map */
/* Map Created */
#mapCreatedSuccess {
width: 332px;
height: 182px;
top: 50%;
position: absolute;
left: 50%;
margin-top: -107px;
margin-left: -182px;
background-color: #E0E0E0;
padding: 16px;
box-shadow: 0px 3px 3px rgba(0,0,0,0.12), 0 3px 3px rgba(0,0,0,0.24);
font-size: 14px;
font-family: 'din-regular', helvetica, sans-serif;
}
#mapCreatedSuccess h6 {
font-size: 18px;
font-family: 'din-medium', helvetica, sans-serif;
margin-bottom: 6px;
}
#mapCreatedSuccess span {
margin: 8px auto;
display: block;
width: 20px;
}
#mapCreatedSuccess a {
display: block;
width: 220px;
height: 14px;
padding: 16px 0;
text-align: center;
border-radius: 2px;
font-size: 12px;
box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24);
margin-left: auto;
margin-right: auto;
text-decoration: none;
text-transform: uppercase;
color: #FFFFFF;
cursor: pointer;
font-family: 'din-medium', helvetica, sans-serif;
}
#mapGo {
background-color: #4fc059;
margin-top: 16px;
}
#mapGo:hover {
background-color: #49ad4e;
}
#mapStay {
background-color: #a354cd;
}
#mapStay:hover {
background-color: #9150bc;
}
/* Filter */ /* Filter */
.sidebarFilter { .sidebarFilter {

View file

@ -5,7 +5,7 @@ var t = {};
t.logoContent = '<div class="logo">METAMAPS</div>'; t.logoContent = '<div class="logo">METAMAPS</div>';
t.logoContent += '<ul class="bottomLinks">'; t.logoContent += '<ul class="bottomLinks">';
t.logoContent += '<li onclick="Metamaps.GlobalUI.openLightbox(\'about\')">About /&nbsp;</li>'; t.logoContent += '<li onclick="Metamaps.GlobalUI.openLightbox(\'about\')">About /&nbsp;</li>';
t.logoContent += '<li><a href="/maps/blank">Terms of Use /&nbsp;</a></li>'; t.logoContent += '<li><a href="http://metamaps.cc/maps/331" data-bypass="true">Terms of Use /&nbsp;</a></li>';
t.logoContent += '<li onclick="Metamaps.GlobalUI.openLightbox(\'colophon\')">Colophon /&nbsp;</li>'; t.logoContent += '<li onclick="Metamaps.GlobalUI.openLightbox(\'colophon\')">Colophon /&nbsp;</li>';
t.logoContent += '<li onclick="Metamaps.GlobalUI.openLightbox(\'getInvolved\')">Get Involved!</li>'; t.logoContent += '<li onclick="Metamaps.GlobalUI.openLightbox(\'getInvolved\')">Get Involved!</li>';
t.logoContent += '</ul>'; t.logoContent += '</ul>';