updated the tooltip of maps topic appears in
This commit is contained in:
parent
363ca365c1
commit
78743fbba5
5 changed files with 52 additions and 12 deletions
|
@ -1092,14 +1092,16 @@ Metamaps.TopicCard = {
|
||||||
|
|
||||||
$('.links .mapCount').unbind().click(function(event){
|
$('.links .mapCount').unbind().click(function(event){
|
||||||
$('.mapCount .tip').toggle();
|
$('.mapCount .tip').toggle();
|
||||||
|
$('.hoverTip').toggleClass('hide');
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
});
|
});
|
||||||
$('.mapCount .tip').unbind().click(function(event){
|
$('.mapCount .tip').unbind().click(function(event){
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
});
|
});
|
||||||
$('.showCard').unbind('.hideTip').bind('click.hideTip', function(){
|
$('.showcard').unbind('.hideTip').bind('click.hideTip', function(){
|
||||||
$('.mapCount .tip').hide();
|
$('.mapCount .tip').hide();
|
||||||
});
|
});
|
||||||
|
|
||||||
var originalText = $('.showMore').html();
|
var originalText = $('.showMore').html();
|
||||||
$('.mapCount .tip .showMore').unbind().toggle(
|
$('.mapCount .tip .showMore').unbind().toggle(
|
||||||
function(event){
|
function(event){
|
||||||
|
@ -1187,22 +1189,25 @@ Metamaps.TopicCard = {
|
||||||
nodeValues.attachments = '';
|
nodeValues.attachments = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(topic.get("inmaps"));
|
|
||||||
var inmapsAr = topic.get("inmaps");
|
var inmapsAr = topic.get("inmaps");
|
||||||
|
var inmapsLinks = topic.get("inmapsLinks");
|
||||||
nodeValues.inmaps ='';
|
nodeValues.inmaps ='';
|
||||||
if (inmapsAr.length < 6) {
|
if (inmapsAr.length < 6) {
|
||||||
for (i = 0; i < inmapsAr.length; i++) {
|
for (i = 0; i < inmapsAr.length; i++) {
|
||||||
nodeValues.inmaps += '<li>' + inmapsAr[i] + '</li>';
|
var url = "/maps/" + inmapsLinks[i];
|
||||||
|
nodeValues.inmaps += '<li><a href="' + url + '">' + inmapsAr[i]+ '</a></li>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
for (i = 0; i < 5; i++){
|
for (i = 0; i < 5; i++){
|
||||||
nodeValues.inmaps += '<li>' + inmapsAr[i] + '</li>';
|
var url = "/maps/" + inmapsLinks[i];
|
||||||
|
nodeValues.inmaps += '<li><a href="' + url + '">' + inmapsAr[i] + '</a></li>';
|
||||||
}
|
}
|
||||||
extra = inmapsAr.length - 5;
|
extra = inmapsAr.length - 5;
|
||||||
nodeValues.inmaps += '<li><span class="showMore">See ' + extra + ' more...</span></li>'
|
nodeValues.inmaps += '<li><span class="showMore">See ' + extra + ' more...</span></li>'
|
||||||
for (i = 5; i < inmapsAr.length; i++){
|
for (i = 5; i < inmapsAr.length; i++){
|
||||||
nodeValues.inmaps += '<li class="hideExtra extraText">' + inmapsAr[i] + '</li>';
|
var url = "/maps/" + inmapsLinks[i];
|
||||||
|
nodeValues.inmaps += '<li class="hideExtra extraText"><a href="' + url + '">' + inmapsAr[i]+ '</a></li>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
nodeValues.permission = topic.get("permission");
|
nodeValues.permission = topic.get("permission");
|
||||||
|
|
|
@ -247,18 +247,39 @@
|
||||||
background-image: url(map32_sprite.png);
|
background-image: url(map32_sprite.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: 0 0;
|
background-position: 0 0;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
.linkItem.mapCount:hover .mapCountIcon {
|
.linkItem.mapCount:hover .mapCountIcon {
|
||||||
background-position: 0 -32px;
|
background-position: 0 -32px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.CardOnGraph .mapCount .tip {
|
.linkItem.mapCount:hover .hoverTip {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
.CardOnGraph .mapCount .tip, .CardonGraph .mapCount .hoverTip {
|
||||||
top: 44px;
|
top: 44px;
|
||||||
left: 0px;
|
left: 0px;
|
||||||
font-size: 12px !important;
|
font-size: 12px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.CardOnGraph .mapCount .tip:before {
|
.hoverTip {
|
||||||
|
white-space: nowrap;
|
||||||
|
font-family: 'din-regular';
|
||||||
|
top: 44px;
|
||||||
|
left: 0px;
|
||||||
|
font-size: 12px !important;
|
||||||
|
display: none;
|
||||||
|
position: absolute;
|
||||||
|
background: black;
|
||||||
|
color: white;
|
||||||
|
border-radius: 4px;
|
||||||
|
line-height: 17px;
|
||||||
|
padding: 3px 5px 2px;
|
||||||
|
z-index: 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.CardOnGraph .mapCount .tip:before, .CardOnGraph .mapCount .hoverTip:before {
|
||||||
content: '';
|
content: '';
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 26px;
|
top: 26px;
|
||||||
|
@ -293,6 +314,14 @@
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mapCount .tip a {
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mapCount .tip a:hover {
|
||||||
|
color: #757575;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.linkItem.synapseCount {
|
.linkItem.synapseCount {
|
||||||
margin-left: 2px;
|
margin-left: 2px;
|
||||||
|
@ -315,9 +344,9 @@
|
||||||
|
|
||||||
.CardOnGraph .synapseCount .tip {
|
.CardOnGraph .synapseCount .tip {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
background: #424242;
|
background: black;
|
||||||
width: auto;
|
width: auto;
|
||||||
top: 45px;
|
top: 44px;
|
||||||
color: white;
|
color: white;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
|
@ -339,7 +368,7 @@
|
||||||
margin-left: 6px;
|
margin-left: 6px;
|
||||||
width: 0;
|
width: 0;
|
||||||
height: 0;
|
height: 0;
|
||||||
border-bottom: 4px solid #424242;
|
border-bottom: 4px solid black;
|
||||||
border-left: 5px solid transparent;
|
border-left: 5px solid transparent;
|
||||||
border-right: 5px solid transparent;
|
border-right: 5px solid transparent;
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,7 @@ module TopicsHelper
|
||||||
topic['originatorImage'] = t.user.image.url(:thirtytwo)
|
topic['originatorImage'] = t.user.image.url(:thirtytwo)
|
||||||
topic['rtype'] = "topic"
|
topic['rtype'] = "topic"
|
||||||
topic['inmaps'] = t.inmaps
|
topic['inmaps'] = t.inmaps
|
||||||
|
topic['inmapsLinks'] = t.inmapsLinks
|
||||||
|
|
||||||
temp.push topic
|
temp.push topic
|
||||||
end
|
end
|
||||||
|
|
|
@ -58,8 +58,12 @@ class Topic < ActiveRecord::Base
|
||||||
self.maps.map(&:name)
|
self.maps.map(&:name)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def inmapsLinks
|
||||||
|
self.maps.map(&:id)
|
||||||
|
end
|
||||||
|
|
||||||
def as_json(options={})
|
def as_json(options={})
|
||||||
super(:methods =>[:user_name, :user_image, :map_count, :synapse_count, :inmaps])
|
super(:methods =>[:user_name, :user_image, :map_count, :synapse_count, :inmaps, :inmapsLinks])
|
||||||
end
|
end
|
||||||
|
|
||||||
def topic_autocomplete_method
|
def topic_autocomplete_method
|
||||||
|
|
|
@ -237,9 +237,10 @@
|
||||||
<img src="/assets/user.png" class="contributorIcon" width="32" height="32" />
|
<img src="/assets/user.png" class="contributorIcon" width="32" height="32" />
|
||||||
<div class="contributorName">{{username}}</div>
|
<div class="contributorName">{{username}}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="linkItem mapCount" title="Click to see which maps topic appears on">
|
<div class="linkItem mapCount">
|
||||||
<div class="mapCountIcon"></div>
|
<div class="mapCountIcon"></div>
|
||||||
{{map_count}}
|
{{map_count}}
|
||||||
|
<div class ="hoverTip">Click to see which maps topic appears on</div>
|
||||||
<div class="tip"><ul>{{{inmaps}}}</ul></div>
|
<div class="tip"><ul>{{{inmaps}}}</ul></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue