filter list appears all simultaneously

This commit is contained in:
Ezequiel Bergamaschi 2014-02-08 18:25:32 -03:00
parent 3df00e9e0e
commit 08a9289893
3 changed files with 24 additions and 16 deletions

View File

@ -26,7 +26,7 @@
margin-top: 4px;
border: 1px solid rgb(213, 207, 207);
border-radius: 6px;
box-shadow: 3px 3px 1px #888888;
box-shadow: 0px 1px 3px #888888;
}
.nav-header {
background-color: #eee;
@ -35,6 +35,12 @@
position: relative;
left: 8px;
}
#mindmapListTable {
border-radius: 6px;
left: -4px;
position: relative;
box-shadow: 0px 1px 9px #888888;
}
#mindmapListContainer {
background: #FFFFFF;

View File

@ -502,6 +502,7 @@ $(function () {
$(document).ready(function() {
// add labels to filter list...
$("#foldersContainer li").fadeIn('fast');
fetchLabels({
postUpdate: function(data) {
var labels = data.labels;
@ -516,16 +517,17 @@ $(function () {
/*--------------------------------------------- Label actions --------------------------------------------------**/
function createLabelItem(data, id) {
var labelId = data.id || id;
$("#foldersContainer").find("ul").append(
$("<li data-filter=\"" + data.title + "\">").append(
"<a href=\"#\"> " +
"<i class=\"icon-tag labelIcon\"></i>" +
"<div class='labelColor' style='background: " + data.color + "'></div>" +
"<div class='labelName labelNameList'>" + data.title + "</div>" +
"<button id='deleteLabelBtn' class='close closeLabel' labelid=\""+ labelId +"\">x</button>" +
"</a>"
)
)
var labelItem = $("<li data-filter=\"" + data.title + "\">");
labelItem.append(
"<a href=\"#\"> " +
"<i class=\"icon-tag labelIcon\"></i>" +
"<div class='labelColor' style='background: " + data.color + "'></div>" +
"<div class='labelName labelNameList'>" + data.title + "</div>" +
"<button id='deleteLabelBtn' class='close closeLabel' labelid=\""+ labelId +"\">x</button>" +
"</a>"
);
labelItem.hide().appendTo($("#foldersContainer").find("ul"));
labelItem.fadeIn('fast');
}
function labelTagsAsHtml(labels) {

View File

@ -154,31 +154,31 @@
<div class="span2" id="foldersContainer">
<ul class="nav nav-list">
<li class="nav-header"><spring:message code="FILTERS"/></li>
<li data-filter="all" class="active">
<li data-filter="all" class="active" style="display:none">
<a href="#">
<i class="icon-inbox icon-white"></i>
<spring:message code="ALL_MAPS"/>
</a>
</li>
<li data-filter="my_maps">
<li data-filter="my_maps" style="display:none">
<a href="#">
<i class="icon-user"></i>
<spring:message code="MY_MAPS"/>
</a>
</li>
<li data-filter="shared_with_me">
<li data-filter="shared_with_me" style="display:none">
<a href="#">
<i class="icon-share"></i>
<spring:message code="SHARED_WITH_ME"/>
</a>
</li>
<li data-filter="starred">
<li data-filter="starred" style="display:none">
<a href="#">
<i class="icon-star"></i>
<spring:message code="STARRED"/>
</a>
</li>
<li data-filter="public">
<li data-filter="public" style="display:none">
<a href="#">
<i class="icon-globe"></i>
<spring:message code="PUBLIC_MAPS"/>