glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updates to metacode select within topic card

Browse source
This commit is contained in:
Connor Turland 2014-09-18 02:33:38 -04:00
parent f62ca67d9f
commit af5560b495
3 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/src/Metamaps.js
View file

@ -766,7 +766,7 @@ Metamaps.TopicCard = {
selectingMetacode = true; selectingMetacode = true;
$(this).addClass('minimize'); // this line flips the drop down arrow to a pull up arrow $(this).addClass('minimize'); // this line flips the drop down arrow to a pull up arrow
$('.metacodeSelect').show(); $('.metacodeSelect').show();
$('.metacodeSelect li').click(function () { $('.metacodeSelect li li').click(function () {
selectingMetacode = false; selectingMetacode = false;
var metacodeName = $(this).find('.mSelectName').text(); var metacodeName = $(this).find('.mSelectName').text();
var metacode = Metamaps.Metacodes.findWhere({ var metacode = Metamaps.Metacodes.findWhere({

45
app/assets/stylesheets/base.css
View file

@ -322,39 +322,46 @@ cursor: pointer;
} }
.CardOnGraph .metacodeSelect { .CardOnGraph .metacodeSelect {
display:none; display:none;
width:100%; width:200px;
z-index: 2; z-index: 2;
position: absolute; position: absolute;
background: #EAEAEA; background: #EAEAEA;
height: 150px; left: 300px;
} }
.CardOnGraph .metacodeSelect ul { .CardOnGraph .metacodeSelect ul {
font-style: italic; position: relative;
font-family: 'vinyl'; line-height: 14px;
text-transform: uppercase; font-size: 14px;
position: absolute; display:block;
line-height: 36px; width: 100%;
font-size: 20px; margin:0;
display:block; padding: 0;
width: 100%; list-style:none;
margin:0; border: 1px solid #BDBDBD;
padding: 0;
list-style:none;
height:150px;
overflow:hidden;
} }
.CardOnGraph .metacodeSelect ul li { .CardOnGraph .metacodeSelect ul li {
background-color: #EAEAEA; background-color: #F5F5F5;
width:100%;
border-bottom:1px solid #AAAAAA;
cursor:pointer; cursor:pointer;
position: relative;
padding: 9px 12px;
} }
.CardOnGraph .metacodeSelect ul li:hover { .CardOnGraph .metacodeSelect ul li:hover {
background-color: #F8F8F8; background-color: #E0E0E0;
} }
.CardOnGraph .metacodeSelect ul li img, .CardOnGraph .metacodeSelect ul li .mSelectName { .CardOnGraph .metacodeSelect ul li img, .CardOnGraph .metacodeSelect ul li .mSelectName {
float:left; float:left;
} }
.CardOnGraph .metacodeSelect ul ul {
display:none;
position: absolute;
left: 200px;
top: 0;
max-height: 270px;
overflow-y: auto;
}
.CardOnGraph .metacodeSelect li:hover ul {
display: block;
}
.CardOnGraph .hoverForTip:hover .tip, .mapCard .hoverForTip:hover .tip { .CardOnGraph .hoverForTip:hover .tip, .mapCard .hoverForTip:hover .tip {
display:block; display:block;

2
app/views/layouts/_templates.html.erb
View file

@ -193,6 +193,7 @@
<div class="linkItem icon"> <div class="linkItem icon">
<div class="metacodeTitle {{metacode_class}}">{{metacode}}</div> <div class="metacodeTitle {{metacode_class}}">{{metacode}}</div>
<div class="metacodeImage" style="background-image:url({{imgsrc}});" title="click and drag to move card"></div> <div class="metacodeImage" style="background-image:url({{imgsrc}});" title="click and drag to move card"></div>
<div class="metacodeSelect">{{{metacode_select}}}</div>
</div> </div>
<div class="linkItem contributor"> <div class="linkItem contributor">
<img src="/assets/user.png" class="contributorIcon" width="32" height="32" /> <img src="/assets/user.png" class="contributorIcon" width="32" height="32" />
@ -209,7 +210,6 @@
<div class="linkItem mapPerm {{mk_permission}}" title="{{permission}}"></div> <div class="linkItem mapPerm {{mk_permission}}" title="{{permission}}"></div>
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>
<div class="metacodeSelect">{{{metacode_select}}}</div>
<div class="scroll"> <div class="scroll">
<div class="desc"> <div class="desc">
<span class="best_in_place best_in_place_desc" data-url="/topics/{{id}}" data-object="topic" data-nil="{{desc_nil}}" data-attribute="desc" data-type="textarea">{{desc}}</span> <span class="best_in_place best_in_place_desc" data-url="/topics/{{id}}" data-object="topic" data-nil="{{desc_nil}}" data-attribute="desc" data-type="textarea">{{desc}}</span>