Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up

This commit is contained in:
Catrin 2014-05-03 10:45:09 +02:00 committed by Neil Lalonde
parent 772a304fc2
commit 66dccfe8d0
7 changed files with 96 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/models/category.js
View File

@ -162,7 +162,6 @@ Discourse.Category = Discourse.Model.extend({
}.property('notification_level'),
setNotification: function(notification_level) {
//console.log("inside category.js");
var url = "/category/" + this.get('id')+"/notifications";
this.set('notification_level', notification_level)
return Discourse.ajax(url, {

6
app/assets/javascripts/discourse/routes/discovery_route_builders.js
View File

@ -150,6 +150,12 @@ function buildCategoryRoute(filter, params) {
deactivate: function() {
this._super();
this.controllerFor('search').set('searchContext', null);
},
actions: {
setNotification: function(notification_level){
this.currentModel.setNotification(notification_level);
}
}
});
}

17
app/assets/javascripts/discourse/templates/category_notification_dropdown.js.handlebars Normal file
View File

@ -0,0 +1,17 @@
<div>
<button class='btn standard dropdown-toggle' data-toggle='dropdown'>
<i class="fa fa-circle {{view.icon}}"></i>&nbsp;{{view.text}}
<span class='caret'></span>
</button>
<ul class='notification-dropdown-menu'>
{{#each level in view.dropDownContent}}
<li data-id="{{level.id}}">
<a {{action setNotification level.id}} href="#">
<span class='title'>{{level.title}}</span><span>{{level.description}}</span>
</a>
</li>
{{/each}}
</ul>
</div>

79
app/assets/javascripts/discourse/views/buttons/category_notification_dropdown_view.js
View File

@ -1,50 +1,39 @@
/**
This view handles rendering of a button with an associated drop down
// /**
// This view handles rendering of a button with an associated drop down
@class CategoryNotificationDropdownButtonView
@extends Discourse.View
@namespace Discourse
@module Discourse
**/
Discourse.CategoryNotificationDropdownButtonView = Discourse.View.extend({
classNameBindings: [':btn-group', 'hidden'],
shouldRerender: Discourse.View.renderIfChanged('text', 'text'),
// @class CategoryNotificationDropdownButtonView
// @extends Discourse.View
// @namespace Discourse
// @module Discourse
// **/
// Discourse.CategoryNotificationDropdownButtonView = Discourse.View.extend({
// //classNameBindings: [':btn-group', 'hidden'],
// //shouldRerender: Discourse.View.renderIfChanged('text', 'text'),
// //templateName: 'category_notification_dropdown',
// // didInsertElement: function() {
// // // If there's a click handler, call it
// // if (this.clicked) {
// // var dropDownButtonView = this;
// // this.$('ul li').on('click.dropdown-button', function(e) {
// // e.preventDefault();
// // dropDownButtonView.clicked($(e.currentTarget).data('id'));
// // return false;
// // });
// // }
// // },
didInsertElement: function() {
// If there's a click handler, call it
if (this.clicked) {
var dropDownButtonView = this;
this.$('ul li').on('click.dropdown-button', function(e) {
e.preventDefault();
dropDownButtonView.clicked($(e.currentTarget).data('id'));
return false;
});
}
},
// // willDestroyElement: function() {
// // this.$('ul li').off('click.dropdown-button');
// // },
willDestroyElement: function() {
this.$('ul li').off('click.dropdown-button');
},
// click: function(foo) {
// console.log(foo);
// },
render: function(buffer) {
buffer.push("<button class='btn standard dropdown-toggle' data-toggle='dropdown'>");
buffer.push(this.get('text'));
buffer.push("</button>");
// actions: {
// setNotification: function(foo){
// console.log(foo);
// }
// }
buffer.push("<ul class='notification-dropdown-menu'>");
_.each(this.get('dropDownContent'), function(row) {
var id = row[0],
textKey = row[1],
title = I18n.t(textKey + ".title"),
description = I18n.t(textKey + ".description");
buffer.push("<li data-id=\"" + id + "\"><a href='#'>");
buffer.push("<span class='title'>" + title + "</span>");
buffer.push("<span>" + description + "</span>");
buffer.push("</a></li>");
});
buffer.push("</ul>");
}
});
// });

45
app/assets/javascripts/discourse/views/buttons/category_notifications_button.js
View File

@ -6,13 +6,16 @@
@namespace Discourse
@module Discourse
**/
Discourse.CategoryNotificationsButton = Discourse.CategoryNotificationDropdownButtonView.extend({
Discourse.CategoryNotificationsButton = Discourse.View.extend({
classNames: ['notification-options'],
//title: I18n.t('category.notifications.title'),
//longDescriptionBinding: 'topic.details.notificationReasonText',
//topic: Em.computed.alias('controller.model'),
category: Em.computed.alias('controller.model'),
hidden: Em.computed.alias('topic.deleted'),
hidden: Em.computed.alias('category.deleted'),
templateName: 'category_notification_dropdown',
init: function() {
this._super();
this.display();
},
dropDownContent: function() {
var contents = [];
@ -26,17 +29,20 @@ Discourse.CategoryNotificationsButton = Discourse.CategoryNotificationDropdownBu
if (pair[1] === 'regular') { return; }
contents.push([
Discourse.Category.NotificationLevel[pair[0]],
'category.notifications.' + pair[1]
]);
contents.push({
id: Discourse.Category.NotificationLevel[pair[0]],
title: I18n.t('category.notifications.' + pair[1] + '.title'),
description: I18n.t('category.notifications.' + pair[1] + '.description')
}
);
});
return contents;
}.property(),
// displayed Button
text: function() {
display: function() {
var key = (function() {
switch (this.get('category.notification_level')) {
case Discourse.Category.NotificationLevel.WATCHING: return 'watching';
@ -48,18 +54,17 @@ Discourse.CategoryNotificationsButton = Discourse.CategoryNotificationDropdownBu
var icon = (function() {
switch (key) {
case 'watching': return '<i class="fa fa-circle heatmap-high"></i>&nbsp;';
case 'tracking': return '<i class="fa fa-circle heatmap-low"></i>&nbsp;';
case 'muted': return '<i class="fa fa-times-circle"></i>&nbsp;';
case 'watching': return 'heatmap-high';
case 'tracking': return 'fa-circle heatmap-low';
case 'muted': return 'fa-times-circle';
default: return '';
}
})();
return icon + (I18n.t("category.notifications." + key + ".title")) + "<span class='caret'></span>";
}.property('category.notification_level'),
clicked: function(id) {
return this.get('category').setNotification(id);
}
this.set("text", I18n.t("category.notifications." + key + ".title"));
this.set("icon", icon);
},
changeDisplay: function() {
this.display();
}.observes('category.notification_level')
});

5
app/assets/stylesheets/desktop/category-notification.scss
View File

@ -16,8 +16,8 @@
background-clip: padding-box;
span {font-size: 12px;}
.title {font-weight: bold; display: block; font-size: 14px;}
}
.notification-dropdown-menu a {
a {
display: block;
padding: 3px 15px;
clear: both;
@ -25,6 +25,7 @@
line-height: 18px;
color: $primary_text_color;
}
}
.notification-dropdown-menu li > a:hover,
.notification-dropdown-menu .active > a,
.notification-dropdown-menu .active > a:hover {

5
app/models/site.rb
View File

@ -45,10 +45,9 @@ class Site
by_id = {}
categories.each do |category|
# nur wenn user gesetzt ist
#unless guardian.anonymous?
unless @guardian.anonymous?
category.notification_level = CategoryUser.lookup_by_category(@guardian.user, category).pluck(:notification_level)[0]
#end
end
category.permission = CategoryGroup.permission_types[:full] if allowed_topic_create.include?(category.id)
by_id[category.id] = category