Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-15 10:16:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

some more acp/nav fixes

Browse Source
This commit is contained in:
barisusakli
2015-09-26 15:36:56 -04:00
parent ec32e4ea4b
commit 5e0a7d7dac
3 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
public/less/admin/general/navigation.less
View File

@@ -1,15 +1,33 @@
#main-nav {
#navigation {
#main-nav {
.active { .active {
background-color: #eee; background-color: #eee;
} }
li { li a {
cursor: move; cursor: move;
} }
} }
#navigation {
#available {
.drag-item {
cursor: move;
margin-right: 10px;
}
}
#enabled {
.iconPicker i {
cursor: pointer;
}
}
ul { ul {
list-style-type: none; list-style-type: none;
padding: 0; padding: 0;
} }
} }

10
public/src/admin/general/navigation.js
View File

@@ -14,7 +14,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
translator.translate(translator.unescape($('#available').html()), function(html) { translator.translate(translator.unescape($('#available').html()), function(html) {
$('#available').html(html) $('#available').html(html)
.find('li').draggable({ .find('li .drag-item').draggable({
connectToSortable: '#main-nav', connectToSortable: '#main-nav',
helper: 'clone', helper: 'clone',
distance: 10, distance: 10,
@@ -23,7 +23,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
}); });
$('#main-nav').sortable().droppable({ $('#main-nav').sortable().droppable({
accept: $('#available li') accept: $('#available li .drag-item')
}); });
$('#enabled').on('click', '.iconPicker', function() { $('#enabled').on('click', '.iconPicker', function() {
@@ -50,7 +50,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
$('#main-nav li').removeClass('active'); $('#main-nav li').removeClass('active');
$(this).addClass('active'); $(this).addClass('active');
var detailsForm = $('#enabled').children().eq(clickedIndex); var detailsForm = $('#enabled').children('[data-index="' + clickedIndex + '"]');
$('#enabled li').addClass('hidden'); $('#enabled li').addClass('hidden');
if (detailsForm.length) { if (detailsForm.length) {
@@ -65,7 +65,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
data = id === 'custom' ? {iconClass: 'fa-navicon'} : available[id]; data = id === 'custom' ? {iconClass: 'fa-navicon'} : available[id];
data.enabled = false; data.enabled = false;
data.index = Math.max(0, $('#main-nav').children().length - 1); data.index = parseInt($('#enabled').children().last().attr('data-index'), 10) + 1;
templates.parse('admin/general/navigation', 'navigation', {navigation: [data]}, function(li) { templates.parse('admin/general/navigation', 'navigation', {navigation: [data]}, function(li) {
li = $(translator.unescape(li)); li = $(translator.unescape(li));
@@ -88,7 +88,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
}); });
indices.forEach(function(index) { indices.forEach(function(index) {
var el = $('#enabled').children().eq(index); var el = $('#enabled').children('[data-index="' + index + '"]');
var form = el.find('form').serializeArray(), var form = el.find('form').serializeArray(),
data = {}, data = {},
properties = {}; properties = {};

16
src/views/admin/general/navigation.tpl
View File

@@ -109,13 +109,21 @@
<div class="panel-heading">Available Menu Items</div> <div class="panel-heading">Available Menu Items</div>
<div class="panel-body"> <div class="panel-body">
<ul id="available"> <ul id="available">
<li data-id="custom" class="alert alert-warning"> <li data-id="custom" class="clearfix">
<div data-id="custom" class="drag-item alert alert-warning pull-left">
<i class="fa fa-fw fa-navicon"></i>
</div>
<strong>Custom Route</strong> <strong>Custom Route</strong>
</li> </li>
<!-- BEGIN available --> <!-- BEGIN available -->
<li data-id="@index" class="alert <!-- IF available.core -->alert-info<!-- ELSE -->alert-success<!-- ENDIF available.core -->"> <li data-id="@index" class="clearfix">
<strong>{available.text}</strong> {available.route} <div data-id="@index" class="drag-item alert <!-- IF available.core -->alert-info<!-- ELSE -->alert-success<!-- ENDIF available.core --> pull-left">
<span class="pull-right badge"><!-- IF available.core -->core<!-- ELSE -->plugin<!-- ENDIF available.core --></span> <i class="fa fa-fw <!-- IF available.iconClass -->{available.iconClass}<!-- ELSE -->fa-navicon<!-- ENDIF available.iconClass -->"></i>
</div>
<p>
<strong>{available.text}</strong> {available.route} <br/>
<!-- IF available.core --> core <!-- ELSE --> plugin <!-- ENDIF available.core -->
</p>
</li> </li>
<!-- END available --> <!-- END available -->
</ul> </ul>