some button actions

This commit is contained in:
Ezequiel Bergamaschi 2014-02-01 23:32:55 -03:00 committed by Ezequiel Bergamaschi
parent f65149c948
commit 9a19e2a5eb
4 changed files with 46 additions and 20 deletions

View File

@ -73,7 +73,6 @@ ONLY_VIEW_PRIVATE = This mindmap can be viewed by you only.
ALL_VIEW_PUBLIC = This mindmap can be viewed by any user. ALL_VIEW_PUBLIC = This mindmap can be viewed by any user.
NEW_MAP_MSG=Create a new map NEW_MAP_MSG=Create a new map
NEW_LABEL_MSG=Create a new label NEW_LABEL_MSG=Create a new label
ADD_LABEL_MSG=Add label to maps
PUBLISH=Publish PUBLISH=Publish
PUBLISH_DETAILS=By publishing the map you make it visible to everyone on the Internet. PUBLISH_DETAILS=By publishing the map you make it visible to everyone on the Internet.
ACCOUNT_DETAIL=Do you want to change you user options?. Here is the place. ACCOUNT_DETAIL=Do you want to change you user options?. Here is the place.
@ -138,16 +137,13 @@ FILTERS=Filter
MORE=More MORE=More
ADD_NEW_MAP=Add New Map ADD_NEW_MAP=Add New Map
ADD_NEW_LABEL=Add New Label ADD_NEW_LABEL=Add New Label
ADD_LABEL=Add Label LABEL=Label
IMPORTING=Importing ... IMPORTING=Importing ...
NEW=New NEW=New
NEW_MAP=Map
NEW_LABEL=Label
MIND_FILE=File MIND_FILE=File
PARENT_LABEL=Nest label under PARENT_LABEL=Nest label under
CHOOSE_COLOR=Choose a color CHOOSE_COLOR=Choose a color
CHOOSE_LABEL=Choose a label CHOOSE_LABEL=Choose a label
CREATE_NEW_LABEL=Create a new label..
SELECT_LABEL=Please select a label SELECT_LABEL=Please select a label
NO_SEARCH_RESULT=No mindmap available for the selected filter criteria NO_SEARCH_RESULT=No mindmap available for the selected filter criteria
SEARCH=Search SEARCH=Search

View File

@ -124,6 +124,7 @@ input#selectAll {
display: inline-block; display: inline-block;
position: relative; position: relative;
left: 7px; left: 7px;
top: -1px;
} }
.labelNameList { .labelNameList {
@ -133,7 +134,7 @@ input#selectAll {
.labelTag { .labelTag {
border: 1px solid; border: 1px solid;
border-radius: 4px; border-radius: 3px;
color: white; color: white;
display: inline-block; display: inline-block;
font-size: 11px; font-size: 11px;
@ -154,6 +155,30 @@ input#selectAll {
background-color: #d5d3d4; background-color: #d5d3d4;
} }
.tableTag {
padding:0px;
margin-bottom: 0px;
margin-right: 5px;
float: right;
top: -3px;
position: relative;
}
table.tableTag td {
user-select: none;
border-radius: 1px;
padding-left: 5px;
padding-right:5px;
padding-top:0px;
padding-bottom: 0px;
background-color: #000000;
color: #ffffff;
}
table.tableTag td:hover {
background-color: #ffffff;
}
/* ---------------------------- Sorting --------------------------------- */ /* ---------------------------- Sorting --------------------------------- */
.sorting_asc { .sorting_asc {

View File

@ -12,8 +12,12 @@ $(function () {
$(document).on('click', '#createLabelBtn', $(document).on('click', '#createLabelBtn',
function () { function () {
var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds();
var url = mapIds.length == 0
? "c/restful/labels"
: "c/restful/labels/maps?ids=" + jQuery.makeArray(mapIds).join(',');
$("#new-folder-dialog-modal").dialogForm({ $("#new-folder-dialog-modal").dialogForm({
url:"c/restful/labels/maps?ids=" + jQuery.makeArray(mapIds).join(','), url: url,
postUpdate: function(data, id) { postUpdate: function(data, id) {
createLabelItem(data, id); createLabelItem(data, id);
tagMindmaps(data.title, data.color); tagMindmaps(data.title, data.color);
@ -59,7 +63,7 @@ $(function () {
var labelId = $(this).attr('value'); var labelId = $(this).attr('value');
var labelName = $(this).text(); var labelName = $(this).text();
var labelColor = $(this).attr('color'); var labelColor = $(this).attr('color');
if (mapIds.length > 0) {
jQuery.ajax("c/restful/labels/maps?ids=" + jQuery.makeArray(mapIds).join(','), { jQuery.ajax("c/restful/labels/maps?ids=" + jQuery.makeArray(mapIds).join(','), {
type:'POST', type:'POST',
dataType: "json", dataType: "json",
@ -70,6 +74,7 @@ $(function () {
} }
}); });
} }
}
); );
} }
}); });

View File

@ -195,10 +195,10 @@
</button> </button>
</div> </div>
<div class="btn-group act-multiple" style="display:none"> <div class="btn-group">
<button id='addLabelButton' class="btn btn-primary dropdown-toggle" data-toggle="dropdown"> <button id='addLabelButton' class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<i class="icon-tag icon-white"></i> <i class="icon-plus icon-white"></i>
<spring:message code="ADD_LABEL"/> <spring:message code="LABEL"/>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
@ -206,7 +206,7 @@
<li id="createLabelBtn"> <li id="createLabelBtn">
<a href="#" onclick="return false"> <a href="#" onclick="return false">
<!--i class="icon-tag"></i--> <!--i class="icon-tag"></i-->
<spring:message code="CREATE_NEW_LABEL"/> <spring:message code="CREATE"/>
</a> </a>
</li> </li>
</ul> </ul>