github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-21 03:59:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix moving discussions from uncategorized

Browse Source
This commit is contained in:
Toby Zerner 2015-05-07 09:20:19 +09:30
parent 2fa694fe3d
commit 9661aacdee
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/tags/js/src/components/move-discussion-modal.js
View File

@ -12,17 +12,18 @@ export default class MoveDiscussionModal extends Component {
view() {
var discussion = this.props.discussion;
var discussionCategory = discussion && discussion.category();
return m('div.modal-dialog.modal-move-discussion', [
m('div.modal-content', [
m('button.btn.btn-icon.btn-link.close.back-control', {onclick: app.modal.close.bind(app.modal)}, icon('times')),
m('div.modal-header', m('h3.title-control', discussion
? ['Move ', m('em', discussion.title()), ' from ', categoryLabel(discussion.category()), ' to...']
? ['Move ', m('em', discussion.title()), ' from ', categoryLabel(discussionCategory), ' to...']
: ['Start a Discussion In...'])),
m('div', [
m('ul.category-list', [
this.categories().map(category =>
(discussion && category.id() === discussion.category().id()) ? '' : m('li.category-tile', {style: 'background-color: '+category.color()}, [
(discussion && discussionCategory && category.id() === discussionCategory.id()) ? '' : m('li.category-tile', {style: 'background-color: '+category.color()}, [
m('a[href=javascript:;]', {onclick: this.save.bind(this, category)}, [
m('h3.title', category.title()),
m('p.description', category.description()),

13
extensions/tags/js/src/helpers/category-label.js
View File

@ -1,3 +1,12 @@
export default function categoryLabel(category) {
return m('span.category-label', {style: {backgroundColor: category.color()}}, category.title());
export default function categoryLabel(category, attrs) {
attrs = attrs || {};
if (category) {
attrs.style = attrs.style || {};
attrs.style.backgroundColor = category.color();
} else {
attrs.className = (attrs.className || '')+' uncategorized';
}
return m('span.category-label', attrs, category ? category.title() : 'Uncategorized');
}

5
extensions/tags/less/categories.less
View File

@ -7,6 +7,11 @@
padding: 1px 5px;
border-radius: 4px;
&.uncategorized {
border: 1px dotted @fl-body-muted-color;
color: @fl-body-muted-color;
}
.discussion-summary & {
margin-right: 5px;
font-size: 11px;