summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdolfo Fitoria <adolfo.fitoria@gmail.com>2013-05-27 10:36:26 -0600
committerAdolfo Fitoria <adolfo.fitoria@gmail.com>2013-05-27 10:36:26 -0600
commit41f622bde4d225bfe98e92f385d5e937618313be (patch)
tree0a598c8dbbc76b22974e65fa43b9be4e82526788
parent1e47b60a90af843221c4c1aee0baeea6189e6e74 (diff)
parent7e4b0cc0abc4672cb55906616596e455cf1c58ee (diff)
downloadaskbot-41f622bde4d225bfe98e92f385d5e937618313be.tar.gz
askbot-41f622bde4d225bfe98e92f385d5e937618313be.tar.bz2
askbot-41f622bde4d225bfe98e92f385d5e937618313be.zip
Merge branch 'master' of github.com:ASKBOT/askbot-devel into solrmultilang
-rw-r--r--askbot/conf/minimum_reputation.py9
-rw-r--r--askbot/conf/settings_wrapper.py4
-rw-r--r--askbot/conf/sidebar_main.py18
-rw-r--r--askbot/conf/sidebar_profile.py23
-rw-r--r--askbot/conf/sidebar_question.py36
-rw-r--r--askbot/conf/site_modes.py1
-rw-r--r--askbot/doc/source/changelog.rst2
-rw-r--r--askbot/doc/source/contributors.rst1
-rw-r--r--askbot/media/js/utils.js352
-rw-r--r--askbot/media/style/style.css95
-rw-r--r--askbot/media/style/style.less107
-rw-r--r--askbot/setup_templates/settings.py4
-rw-r--r--askbot/setup_templates/settings.py.mustache16
-rw-r--r--askbot/templates/main_page/sidebar.html4
-rw-r--r--askbot/templates/meta/bottom_scripts.html8
-rw-r--r--askbot/templates/question.html2
-rw-r--r--askbot/templates/question/content.html2
-rw-r--r--askbot/templates/question/sidebar.html4
-rw-r--r--askbot/templates/user_profile/user.html11
-rw-r--r--askbot/templates/widgets/user_long_score_and_badge_summary.html6
-rw-r--r--askbot/templates/widgets/user_perms.html28
-rw-r--r--askbot/templatetags/extra_filters_jinja.py9
-rw-r--r--askbot/tests/db_api_tests.py7
-rw-r--r--askbot/tests/management_command_tests.py11
-rw-r--r--askbot/tests/question_views_tests.py5
-rw-r--r--askbot/urls.py7
-rw-r--r--askbot/utils/slug.py7
-rw-r--r--askbot/views/readers.py62
-rw-r--r--askbot/views/users.py1
29 files changed, 590 insertions, 252 deletions
diff --git a/askbot/conf/minimum_reputation.py b/askbot/conf/minimum_reputation.py
index 229edf96..19b5e69d 100644
--- a/askbot/conf/minimum_reputation.py
+++ b/askbot/conf/minimum_reputation.py
@@ -195,15 +195,6 @@ settings.register(
settings.register(
livesettings.IntegerValue(
MIN_REP,
- 'MIN_REP_TO_LOCK_POSTS',
- default=400,
- description=_('Lock posts')
- )
-)
-
-settings.register(
- livesettings.IntegerValue(
- MIN_REP,
'MIN_REP_TO_HAVE_STRONG_URL',
default=25,
description=_('Remove rel=nofollow from own homepage'),
diff --git a/askbot/conf/settings_wrapper.py b/askbot/conf/settings_wrapper.py
index b6b5f302..0a4ba45f 100644
--- a/askbot/conf/settings_wrapper.py
+++ b/askbot/conf/settings_wrapper.py
@@ -53,6 +53,10 @@ class ConfigSettings(object):
"""return the defalut value for the setting"""
return getattr(self.__instance, key).default
+ def get_description(self, key):
+ """returns descriptive title of the setting"""
+ return unicode(getattr(self.__instance, key).description)
+
def reset(self, key):
"""returns setting to the default value"""
self.update(key, self.get_default(key))
diff --git a/askbot/conf/sidebar_main.py b/askbot/conf/sidebar_main.py
index 8fa4bdf0..97b89e37 100644
--- a/askbot/conf/sidebar_main.py
+++ b/askbot/conf/sidebar_main.py
@@ -32,6 +32,15 @@ settings.register(
settings.register(
values.BooleanValue(
SIDEBAR_MAIN,
+ 'SIDEBAR_MAIN_HEADER_ANON_ONLY',
+ description=_('Show above only to anonymous users'),
+ default=False
+ )
+)
+
+settings.register(
+ values.BooleanValue(
+ SIDEBAR_MAIN,
'SIDEBAR_MAIN_SHOW_AVATARS',
description = _('Show avatar block in sidebar'),
help_text = _(
@@ -94,3 +103,12 @@ settings.register(
)
)
+settings.register(
+ values.BooleanValue(
+ SIDEBAR_MAIN,
+ 'SIDEBAR_MAIN_FOOTER_ANON_ONLY',
+ default=False,
+ description=_('Show above only to anonymous users')
+ )
+)
+
diff --git a/askbot/conf/sidebar_profile.py b/askbot/conf/sidebar_profile.py
index 948daa4a..a216de4b 100644
--- a/askbot/conf/sidebar_profile.py
+++ b/askbot/conf/sidebar_profile.py
@@ -16,8 +16,8 @@ SIDEBAR_PROFILE = ConfigurationGroup(
settings.register(
values.LongStringValue(
SIDEBAR_PROFILE,
- 'SIDEBAR_PROFILE_HEADER',
- description = _('Custom sidebar header'),
+ 'SIDEBAR_PROFILE',
+ description = _('Custom sidebar'),
default = '',
help_text = _(
'Use this area to enter content at the TOP of the sidebar'
@@ -25,23 +25,16 @@ settings.register(
'(as well as the sidebar footer), please '
'use the HTML validation service to make sure that '
'your input is valid and works well in all browsers.'
- )
+ )
)
)
+
settings.register(
- values.LongStringValue(
+ values.BooleanValue(
SIDEBAR_PROFILE,
- 'SIDEBAR_PROFILE_FOOTER',
- description = _('Custom sidebar footer'),
- default = '',
- help_text = _(
- 'Use this area to enter content at the BOTTOM of the sidebar'
- 'in HTML format. When using this option '
- '(as well as the sidebar header), please '
- 'use the HTML validation service to make sure that '
- 'your input is valid and works well in all browsers.'
- )
+ 'SIDEBAR_PROFILE_ANON_ONLY',
+ description=_('Show above only to anonymous users'),
+ default=False
)
)
-
diff --git a/askbot/conf/sidebar_question.py b/askbot/conf/sidebar_question.py
index ffe2f783..8d38692a 100644
--- a/askbot/conf/sidebar_question.py
+++ b/askbot/conf/sidebar_question.py
@@ -27,6 +27,15 @@ settings.register(
)
settings.register(
+ values.BooleanValue(
+ SIDEBAR_QUESTION,
+ 'QUESTION_PAGE_TOP_BANNER_ANON_ONLY',
+ default=False,
+ description=_('Show above only to anonymous users'),
+ )
+)
+
+settings.register(
values.LongStringValue(
SIDEBAR_QUESTION,
'QUESTION_PAGE_ANSWER_BANNER',
@@ -42,6 +51,16 @@ settings.register(
)
settings.register(
+ values.BooleanValue(
+ SIDEBAR_QUESTION,
+ 'QUESTION_PAGE_ANSWER_BANNER_ANON_ONLY',
+ default=False,
+ description=_('Show above only to anonymous users'),
+ )
+)
+
+
+settings.register(
values.LongStringValue(
SIDEBAR_QUESTION,
'SIDEBAR_QUESTION_HEADER',
@@ -60,6 +79,15 @@ settings.register(
settings.register(
values.BooleanValue(
SIDEBAR_QUESTION,
+ 'SIDEBAR_QUESTION_HEADER_ANON_ONLY',
+ default=False,
+ description=_('Show above only to anonymous users')
+ )
+)
+
+settings.register(
+ values.BooleanValue(
+ SIDEBAR_QUESTION,
'SIDEBAR_QUESTION_SHOW_TAGS',
description = _('Show tag list in sidebar'),
help_text = _(
@@ -113,3 +141,11 @@ settings.register(
)
)
+settings.register(
+ values.BooleanValue(
+ SIDEBAR_QUESTION,
+ 'SIDEBAR_QUESTION_FOOTER_ANON_ONLY',
+ default=False,
+ description=_('Show above only to anonymous users')
+ )
+)
diff --git a/askbot/conf/site_modes.py b/askbot/conf/site_modes.py
index 7c81341e..feadd32b 100644
--- a/askbot/conf/site_modes.py
+++ b/askbot/conf/site_modes.py
@@ -27,7 +27,6 @@ LARGE_SITE_MODE_SETTINGS = {
'MIN_REP_TO_EDIT_OTHERS_POSTS': 2000,
'MIN_REP_TO_VIEW_OFFENSIVE_FLAGS': 2000,
'MIN_REP_TO_CLOSE_OTHERS_QUESTIONS': 2000,
- 'MIN_REP_TO_LOCK_POSTS': 4000,
'MIN_REP_TO_HAVE_STRONG_URL': 250,
#badge settings
'NOTABLE_QUESTION_BADGE_MIN_VIEWS': 250,
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index cda70e77..85a7015e 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -3,6 +3,8 @@ Changes in Askbot
Development version
-------------------
+* Added hovercard on the user's karma display in the header
+* Added option to hide ad blocks from logged in users
* Applied Askbot templates to the settings control panel
* Added option to auto-follow questions by the question posters with default "on"
* Support for Django 1.5
diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst
index 44cd8ccb..85d252bc 100644
--- a/askbot/doc/source/contributors.rst
+++ b/askbot/doc/source/contributors.rst
@@ -47,6 +47,7 @@ Programming, bug fixes and documentation
* `Jorge López Pérez <https://github.com/adobo>`_
* `Zafer Cakmak <https://github.com/xaph>`_
* `Kevin Porterfield <http://www.shotgunsoftware.com>_`
+* `Robert Martin <https://github.com/bobbydavid>_`
Translations
------------
diff --git a/askbot/media/js/utils.js b/askbot/media/js/utils.js
index 0380e6fe..51e3b7ba 100644
--- a/askbot/media/js/utils.js
+++ b/askbot/media/js/utils.js
@@ -59,6 +59,11 @@ var setController = function(controller, name) {
askbot['controllers'][name] = controller;
};
+var sortChildNodes = function(node, cmpFunc) {
+ var items = node.children().sort(cmpFunc);
+ node.append(items);
+};
+
var getUniqueValues = function(values) {
var uniques = new Object();
var out = new Array();
@@ -2011,8 +2016,18 @@ SelectBox.prototype.createDom = function() {
var GroupDropdown = function(groups){
WrappedElement.call(this);
this._group_list = groups;
+};
+inherits(GroupDropdown, WrappedElement);
+
+GroupDropdown.prototype.createDom = function(){
+ this._element = this.makeElement('ul');
+ this._element.attr('class', 'dropdown-menu');
+ this._element.attr('id', 'groups-dropdown');
+ this._element.attr('role', 'menu');
+ this._element.attr('aria-labelledby', 'navGroups');
+
this._input_box = new TippedInput();
- this._input_box.setInstruction('group name');
+ this._input_box.setInstruction(gettext('group name'));
this._input_box.createDom();
this._input_box_element = this._input_box.getElement();
this._input_box_element.attr('class', 'group-name');
@@ -2021,115 +2036,128 @@ var GroupDropdown = function(groups){
this._add_link.attr('href', '#');
this._add_link.attr('class', 'group-name');
this._add_link.text(gettext('add new group'));
+
+ for (var i=0; i<this._group_list.length; i++){
+ var li = this.makeElement('li');
+ var a = this.makeElement('a');
+ a.text(this._group_list[i].name);
+ a.attr('href', this._group_list[i].link);
+ a.attr('class', 'group-name');
+ li.append(a);
+ this._element.append(li);
+ }
+ if (askbot['data']['userIsAdmin']) {
+ this.enableAddGroups();
+ }
};
-inherits(GroupDropdown, WrappedElement);
-GroupDropdown.prototype.createDom = function(){
- this._element = this.makeElement('ul');
- this._element.attr('class', 'dropdown-menu');
- this._element.attr('id', 'groups-dropdown');
- this._element.attr('role', 'menu');
- this._element.attr('aria-labelledby', 'navGroups');
-
- for (i=0; i<this._group_list.length; i++){
- li_element = this.makeElement('li');
- a_element = this.makeElement('a');
- a_element.text(this._group_list[i].name);
- a_element.attr('href', this._group_list[i].link);
- a_element.attr('class', 'group-name');
- li_element.append(a_element);
- this._element.append(li_element);
- }
+/**
+ * inserts a link to group with a given url to the group page
+ * and name
+ */
+GroupDropdown.prototype.insertGroup = function(group_name, url){
+
+ //1) take out first and last list elements:
+ // everyone and the "add group" item
+ var list = this._element.children();
+ var everyoneGroup = list.first().detach();
+ var groupAdder = list.last().detach();
+ var divider = this._element.find('.divider').detach();
+
+ //2) append group link into the list
+ var li = this.makeElement('li');
+ var a = this.makeElement('a');
+ a.attr('href', url);
+ a.attr('class', 'group-name');
+ a.text(group_name);
+ li.append(a);
+ li.hide();
+ this._element.append(li);
+
+ //3) sort rest of the list alphanumerically
+ sortChildNodes(
+ this._element,
+ function(a, b) {
+ var valA = $(a).find('a').text().toLowerCase();
+ var valB = $(b).find('a').text().toLowerCase();
+ return (valA < valB) ? -1: (valA > valB) ? 1: 0;
+ }
+ );
+
+ //a dramatic effect
+ li.fadeIn();
+
+ //4) reinsert the first and last elements of the list:
+ this._element.prepend(everyoneGroup);
+ this._element.append(divider);
+ this._element.append(groupAdder);
};
-GroupDropdown.prototype.decorate = function(element){
- this._element = element;
- this._element.attr('class', 'dropdown-menu');
- this._element.attr('id', 'groups-dropdown');
- this._element.attr('role', 'menu');
- this._element.attr('aria-labelledby', 'navGroups');
-
- for (i=0; i<this._group_list.length; i++){
- li_element = this.makeElement('li');
- a_element = this.makeElement('a');
- a_element.text(this._group_list[i].name);
- a_element.attr('href', this._group_list[i].link);
- a_element.attr('class', 'group-name');
- li_element.append(a_element);
- this._element.append(li_element);
- }
+GroupDropdown.prototype.setState = function(state) {
+ if (state === 'display') {
+ this._input_box_element.hide();
+ this._add_link.show();
+ }
};
-GroupDropdown.prototype.insertGroup = function(group_name, url){
- var new_group_li = this.makeElement('li');
- new_group_a = this.makeElement('a');
- new_group_a.attr('href', url);
- new_group_a.attr('class', 'group-name');
- new_group_a.text(group_name);
- new_group_li.append(new_group_a);
- links_array = this._element.find('a')
- for (i=1; i < links_array.length; i++){
- var listedName = links_array[i].text;
- var cleanedListedName = listedName.toLowerCase();
- var cleanedNewName = group_name.toLowerCase()
- if (listedName < newName) {
- if (i == links_array.length - 1){
- new_group_li.insertAfter(this._element.find('li')[i-1])
- break;
- } else {
- continue;
- }
- } else if (cleanedNewName === cleanedNewName) {
- var message = interpolate(gettext(
- 'Group %(name)s already exists. Group names are case-insensitive.'
- ), {'name': listedName}, true
- );
- notify.show(message);
- return;
- } else {
- new_group_li.insertAfter(this._element.find('li')[i-1])
- break;
+GroupDropdown.prototype.hasGroup = function(groupName) {
+ var items = this._element.find('li');
+ for (var i=1; i < items.length - 1; i++) {
+ var cGroupName = $(items[i]).find('a').text();
+ if (cGroupName.toLowerCase() === groupName.toLowerCase()) {
+ return true;
}
}
+ return false;
};
GroupDropdown.prototype._add_group_handler = function(group_name){
- var group_name = this._input_box_element.val();
- self = this;
- if (!group_name){
- return;
- }
+ var group_name = this._input_box_element.val();
+ var me = this;
+ if (!group_name){
+ return;
+ }
- $.ajax({
- type: 'POST',
- url: askbot['urls']['add_group'],
- data: {group: group_name},
- success: function(data){
- if (data.success){
- self.insertGroup(data.group_name, data.url);
- self._input_box_element.hide();
- self._add_link.show();
- return true;
- } else{
- return false;
- }
- },
- error: function(){console.log('error');}
- });
+ $.ajax({
+ type: 'POST',
+ url: askbot['urls']['add_group'],
+ data: {group: group_name},
+ success: function(data){
+ if (data['success']){
+ var groupName = data['group_name'];
+ if (me.hasGroup(groupName)) {
+ var message = interpolate(gettext(
+ 'Group %(name)s already exists. Group names are case-insensitive.'
+ ), {'name': groupName}, true
+ );
+ notify.show(message);
+ return false;
+ } else {
+ me.insertGroup(data['group_name'], data['url']);
+ me.setState('display');
+ return true;
+ }
+ } else{
+ notify.show(data['message']);
+ return false;
+ }
+ },
+ error: function(){console.log('error');}
+ });
};
GroupDropdown.prototype.enableAddGroups = function(){
var self = this;
this._add_link.click(function(){
- self._add_link.hide();
- self._input_box_element.show();
- self._input_box_element.focus();
+ self._add_link.hide();
+ self._input_box_element.show();
+ self._input_box_element.focus();
});
this._input_box_element.keydown(function(event){
- if (event.which == 13 || event.keyCode==13){
- self._add_group_handler();
- self._input_box_element.val('');
- }
+ if (event.which == 13 || event.keyCode==13){
+ self._add_group_handler();
+ self._input_box_element.val('');
+ }
});
var divider = this.makeElement('li');
@@ -2297,6 +2325,148 @@ Tag.prototype.createDom = function(){
}
};
+var PermsHoverCard = function() {
+ WrappedElement.call(this);
+ this._isLoaded = false;
+};
+inherits(PermsHoverCard, WrappedElement);
+
+PermsHoverCard.prototype.setContent = function(data) {
+ this._element.html(data['html']);
+};
+
+PermsHoverCard.prototype.setTrigger = function(trigger) {
+ this._trigger = trigger;
+};
+
+PermsHoverCard.prototype.setPosition = function() {
+ var trigger = this._trigger.getElement();
+ var coors = trigger.offset();
+ var height = trigger.outerHeight();
+ var triangle = this._element.find('.triangle')
+ var triangleHeight = triangle.outerHeight();
+ this._element.css({
+ 'top': coors.top + height + triangleHeight,
+ 'left': coors.left
+ });
+};
+
+PermsHoverCard.prototype.setUrl = function(url) {
+ this._url = url;
+};
+
+PermsHoverCard.prototype.startLoading = function(onLoad) {
+ var me = this;
+ $.ajax({
+ type: 'GET',
+ dataType: 'json',
+ cache: false,
+ url: this._url,
+ success: function(data) {
+ if (data['success']) {
+ me.setContent(data);
+ me.setPosition();
+ onLoad();
+ me.setIsLoaded();
+ } else {
+ notify.show(data['message']);
+ }
+ }
+ });
+};
+
+PermsHoverCard.prototype.isLoaded = function() {
+ return this._isLoaded;
+};
+
+PermsHoverCard.prototype.setIsLoaded = function() {
+ this._isLoaded = true;
+};
+
+PermsHoverCard.prototype.getOpenHandler = function() {
+ var me = this;
+ return function() {
+ me.clearCancelOpenTimeout();
+ if (me.isLoaded()) {
+ me.getElement().show();
+ } else {
+ var onload = function() {
+ me.getElement().show();
+ }
+ me.startLoading(onload);
+ }
+ };
+};
+
+PermsHoverCard.prototype.setCancelOpenTimoutId = function(timeoutId) {
+ this._cancelOpenTimeoutId = timeoutId;
+};
+
+PermsHoverCard.prototype.clearCancelOpenTimeout = function() {
+ var timeout = this._cancelOpenTimeoutId;
+ if (timeout) {
+ clearTimeout(timeout);
+ }
+};
+
+PermsHoverCard.prototype.getCloseHandler = function() {
+ var me = this;
+ return function() {
+ var element = me.getElement();
+ //start timeout to close
+ var timeout = setTimeout(function() {
+ element.hide();
+ //element.fadeOut('fast');
+ }, 200);
+ me.setCancelOpenTimoutId(timeout);
+ };
+};
+
+PermsHoverCard.prototype.getImmediateCloseHandler = function() {
+ var me = this;
+ return function() {
+ me.getElement().hide();
+ };
+};
+
+PermsHoverCard.prototype.getKeepHandler = function() {
+ var me = this;
+ return function() {
+ me.clearCancelOpenTimeout();
+ };
+};
+
+PermsHoverCard.prototype.createDom = function() {
+ var element = this.makeElement('div');
+ this._element = element;
+ element.addClass('hovercard');
+ element.hover(
+ this.getKeepHandler(),
+ this.getCloseHandler()
+ );
+};
+
+var ShowPermsTrigger = function() {
+ WrappedElement.call(this);
+};
+inherits(ShowPermsTrigger, WrappedElement);
+
+ShowPermsTrigger.prototype.decorate = function(element) {
+ this._element = element;
+ var hoverCard = new PermsHoverCard();
+ this._hoverCard = hoverCard;
+ $('body').append(hoverCard.getElement());
+
+ hoverCard.setTrigger(this);
+ hoverCard.setUrl(element.data('url'));
+
+ var onEnter = hoverCard.getOpenHandler();
+ var onExit = hoverCard.getCloseHandler();
+ element.hover(onEnter, onExit);
+ var onClose = hoverCard.getImmediateCloseHandler();
+ $('body').click(onClose);
+};
+
//Search Engine Keyword Highlight with Javascript
//http://scott.yang.id.au/code/se-hilite/
Hilite={elementid:"content",exact:true,max_nodes:1000,onload:true,style_name:"hilite",style_name_suffix:true,debug_referrer:""};Hilite.search_engines=[["local","q"],["cnprog\\.","q"],["google\\.","q"],["search\\.yahoo\\.","p"],["search\\.msn\\.","q"],["search\\.live\\.","query"],["search\\.aol\\.","userQuery"],["ask\\.com","q"],["altavista\\.","q"],["feedster\\.","q"],["search\\.lycos\\.","q"],["alltheweb\\.","q"],["technorati\\.com/search/([^\\?/]+)",1],["dogpile\\.com/info\\.dogpl/search/web/([^\\?/]+)",1,true]];Hilite.decodeReferrer=function(d){var g=null;var e=new RegExp("");for(var c=0;c<Hilite.search_engines.length;c++){var f=Hilite.search_engines[c];e.compile("^http://(www\\.)?"+f[0],"i");var b=d.match(e);if(b){var a;if(isNaN(f[1])){a=Hilite.decodeReferrerQS(d,f[1])}else{a=b[f[1]+1]}if(a){a=decodeURIComponent(a);if(f.length>2&&f[2]){a=decodeURIComponent(a)}a=a.replace(/\'|"/g,"");a=a.split(/[\s,\+\.]+/);return a}break}}return null};Hilite.decodeReferrerQS=function(f,d){var b=f.indexOf("?");var c;if(b>=0){var a=new String(f.substring(b+1));b=0;c=0;while((b>=0)&&((c=a.indexOf("=",b))>=0)){var e,g;e=a.substring(b,c);b=a.indexOf("&",c)+1;if(e==d){if(b<=0){return a.substring(c+1)}else{return a.substring(c+1,b-1)}}else{if(b<=0){return null}}}}return null};Hilite.hiliteElement=function(f,e){if(!e||f.childNodes.length==0){return}var c=new Array();for(var b=0;b<e.length;b++){e[b]=e[b].toLowerCase();if(Hilite.exact){c.push("\\b"+e[b]+"\\b")}else{c.push(e[b])}}c=new RegExp(c.join("|"),"i");var a={};for(var b=0;b<e.length;b++){if(Hilite.style_name_suffix){a[e[b]]=Hilite.style_name+(b+1)}else{a[e[b]]=Hilite.style_name}}var d=function(m){var j=c.exec(m.data);if(j){var n=j[0];var i="";var h=m.splitText(j.index);var g=h.splitText(n.length);var l=m.ownerDocument.createElement("SPAN");m.parentNode.replaceChild(l,h);l.className=a[n.toLowerCase()];l.appendChild(h);return l}else{return m}};Hilite.walkElements(f.childNodes[0],1,d)};Hilite.hilite=function(){var a=Hilite.debug_referrer?Hilite.debug_referrer:document.referrer;var b=null;a=Hilite.decodeReferrer(a);if(a&&((Hilite.elementid&&(b=document.getElementById(Hilite.elementid)))||(b=document.body))){Hilite.hiliteElement(b,a)}};Hilite.walkElements=function(d,f,e){var a=/^(script|style|textarea)/i;var c=0;while(d&&f>0){c++;if(c>=Hilite.max_nodes){var b=function(){Hilite.walkElements(d,f,e)};setTimeout(b,50);return}if(d.nodeType==1){if(!a.test(d.tagName)&&d.childNodes.length>0){d=d.childNodes[0];f++;continue}}else{if(d.nodeType==3){d=e(d)}}if(d.nextSibling){d=d.nextSibling}else{while(f>0){d=d.parentNode;f--;if(d.nextSibling){d=d.nextSibling;break}}}}};if(Hilite.onload){if(window.attachEvent){window.attachEvent("onload",Hilite.hilite)}else{if(window.addEventListener){window.addEventListener("load",Hilite.hilite,false)}else{var __onload=window.onload;window.onload=function(){Hilite.hilite();__onload()}}}};
diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css
index 3aab9f21..4d040adc 100644
--- a/askbot/media/style/style.css
+++ b/askbot/media/style/style.css
@@ -218,6 +218,43 @@ body.user-messages {
text-align: center;
margin: 5px 0 8px;
}
+.hovercard {
+ background: white;
+ border: 3px solid #ddd;
+ -webkit-box-shadow: 0 0 3px #929292;
+ -moz-box-shadow: 0 0 3px #929292;
+ box-shadow: 0 0 3px #929292;
+ font-size: 13px;
+ display: block;
+ max-width: 250px;
+ padding: 10px;
+ position: absolute;
+ border-radius: 5px;
+ -ms-border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ z-index: 1001;
+}
+.hovercard p:last-child {
+ margin-bottom: 0;
+}
+.hovercard ul {
+ margin-bottom: 0;
+}
+.hovercard ul li {
+ font-size: 13px;
+ line-height: 16px;
+ margin: 5px 0;
+}
+.hovercard .triangle {
+ border-left: 5px solid transparent;
+ border-right: 10px solid transparent;
+ border-bottom: 10px solid #ddd;
+ height: 0;
+ margin: -20px 0 10px 0;
+ width: 0;
+}
#closeNotify {
position: absolute;
right: 5px;
@@ -354,23 +391,17 @@ body.user-messages {
}
#metaNav a.group-name {
padding: 0px;
- float: center;
- margin: 5px 0px 5px 10px;
+ float: none;
+ margin: 5px 10px;
}
#metaNav input.group-name {
- border: none;
- height: 25px;
- font-size: 18px;
- font-weight: 100;
- text-decoration: none;
+ border: 1px solid #c9c9b5;
+ color: #464646;
display: block;
- margin: 0px 10px 0px 10px;
- width: 140px;
- font-family: 'Open Sans Condensed', Arial, sans-serif;
- font-weight: 100;
-}
-#metaNav input.group-name:focus {
- border: none;
+ font-size: 14px;
+ height: 25px;
+ margin: 0px 10px 5px 10px;
+ padding: 0 5px;
}
#metaNav a.group-name:hover {
background-color: transparent;
@@ -386,7 +417,7 @@ body.user-messages {
}
#metaNav .dropdown-menu {
border-top: none;
- left: 7%;
+ left: 33px;
z-index: 10100;
}
#metaNav .dropdown-menu a {
@@ -1742,7 +1773,7 @@ ul#related-tags li {
}
.groups-input,
.users-input {
- width: 152px;
+ width: 150px;
padding-left: 5px;
border: #c9c9b5 1px solid;
height: 25px;
@@ -1751,7 +1782,7 @@ ul#related-tags li {
.add-groups,
.add-users {
border: 0;
- margin-top: -2px;
+ margin: -2px 0 0 0 !important;
}
.share-input-col {
width: 160px;
@@ -1771,32 +1802,6 @@ ul#related-tags li {
width: 395px;
font-size: 14px;
}
-.groups-input,
-.users-input {
- width: 152px;
- padding-left: 5px;
- border: #c9c9b5 1px solid;
- height: 25px;
- font-size: 14px;
-}
-.add-groups,
-.add-users {
- border: 0;
- margin-top: -2px;
-}
-.add-everyone-group {
- text-align: center;
- margin: auto;
- display: block;
- padding: 0 10px;
-}
-#id_user,
-#id_user_author {
- height: 25px;
- padding-left: 5px;
- width: 395px;
- font-size: 14px;
-}
.title-desc {
color: #707070;
font-size: 13px;
@@ -2280,7 +2285,9 @@ ul#related-tags li {
line-height: 18px;
margin-top: -2px;
margin-left: 4px;
- box-shadow: none;
+ -webkit-box-shadow: 0 0 0 #929292;
+ -moz-box-shadow: 0 0 0 #929292;
+ box-shadow: 0 0 0 #929292;
}
.question-page .post-controls .answer-convert input:hover,
.question-page .answer-controls .answer-convert input:hover {
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less
index efde976d..e345db96 100644
--- a/askbot/media/style/style.less
+++ b/askbot/media/style/style.less
@@ -232,6 +232,38 @@ body.user-messages {
margin: 5px 0 8px;
}
+.hovercard {
+ background: white;
+ border: 3px solid #ddd;
+ .box-shadow(0, 0, 3px);
+ font-size: 13px;
+ display: block;
+ max-width: 250px;
+ padding: 10px;
+ position: absolute;
+ .rounded-corners(5px);
+ z-index: 1001;
+ p:last-child {
+ margin-bottom: 0;
+ }
+ ul {
+ margin-bottom: 0;
+ li {
+ font-size: 13px;
+ line-height: 16px;
+ margin: 5px 0;
+ }
+ }
+ .triangle {
+ border-left: 5px solid transparent;
+ border-right: 10px solid transparent;
+ border-bottom: 10px solid #ddd;
+ height: 0;
+ margin: -20px 0 10px 0;
+ width: 0;
+ }
+}
+
#closeNotify {
position: absolute;
right: 5px;
@@ -381,25 +413,18 @@ body.user-messages {
a.group-name {
padding: 0px;
- float:center;
- margin:5px 0px 5px 10px;
+ float: none;
+ margin: 5px 10px;
}
- input.group-name{
- border:none;
- height: 25px;
- font-size: 18px;
- font-weight: 100;
- text-decoration: none;
+ input.group-name {
+ border: 1px solid #c9c9b5;
+ color: #464646;
display: block;
- margin: 0px 10px 0px 10px;
- width: 140px;
- font-family: @main-font;
- font-weight: 100;
- }
-
- input.group-name:focus{
- border:none;
+ font-size: 14px;
+ height: 25px;
+ margin: 0px 10px 5px 10px;
+ padding: 0 5px;
}
a.group-name:hover{
@@ -418,11 +443,11 @@ body.user-messages {
float:left;
}
- .dropdown-menu{
+ .dropdown-menu {
border-top: none;
- left: 7%;
+ left: 33px;
z-index: 10100;
- a{
+ a {
color: #666;
height: 25px;
}
@@ -1838,17 +1863,17 @@ ul#related-tags li {
.groups-input,
.users-input {
- width:152px;
- padding-left:5px;
- border:#c9c9b5 1px solid;
- height:25px;
+ width: 150px;
+ padding-left: 5px;
+ border: #c9c9b5 1px solid;
+ height: 25px;
font-size: 14px;
}
.add-groups,
.add-users {
- border:0;
- margin-top:-2px;
+ border: 0;
+ margin: -2px 0 0 0 !important;
}
.share-input-col {
@@ -1872,36 +1897,6 @@ ul#related-tags li {
font-size:14px;
}
-.groups-input,
-.users-input {
- width:152px;
- padding-left:5px;
- border:#c9c9b5 1px solid;
- height:25px;
- font-size: 14px;
-}
-
-.add-groups,
-.add-users {
- border:0;
- margin-top:-2px;
-}
-
-.add-everyone-group {
- text-align: center;
- margin: auto;
- display: block;
- padding: 0 10px;
-}
-
-#id_user,
-#id_user_author {
- height:25px;
- padding-left:5px;
- width:395px;
- font-size:14px;
-}
-
.title-desc {
color: @info-text;
font-size: 13px;
@@ -2401,7 +2396,7 @@ ul#related-tags li {
line-height:18px;
margin-top:-2px;
margin-left:4px;
- box-shadow: none;
+ .box-shadow(0, 0, 0);
}
.answer-convert input:hover{
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index 7dd82acd..e5b21d92 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -311,3 +311,7 @@ if 'ASKBOT_CSS_DEVEL' in locals() and ASKBOT_CSS_DEVEL == True:
COMPRESS_JS_FILTERS = []
COMPRESS_PARSER = 'compressor.parser.HtmlParser'
JINJA2_EXTENSIONS = ('compressor.contrib.jinja2ext.CompressorExtension',)
+
+# Use syncdb for tests instead of South migrations. Without this, some tests
+# fail spuriously in MySQL.
+SOUTH_TESTS_MIGRATE = False
diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache
index f6a5367c..f59dd735 100644
--- a/askbot/setup_templates/settings.py.mustache
+++ b/askbot/setup_templates/settings.py.mustache
@@ -27,6 +27,8 @@ DATABASES = {
'PASSWORD': '{{database_password}}', # Not used with sqlite3.
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
'PORT': '', # Set to empty string for default. Not used with sqlite3.
+ 'TEST_CHARSET': 'utf8', # Setting the character set and collation to utf-8
+ 'TEST_COLLATION': 'utf8_general_ci', # is necessary for MySQL tests to work properly.
}
}
@@ -46,7 +48,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
#go to the site's live settings and enable the feature
#"Email settings" -> "allow asking by email"
#
-# WARNING: command post_emailed_questions DELETES all
+# WARNING: command post_emailed_questions DELETES all
# emails from the mailbox each time
# do not use your personal mail box here!!!
#
@@ -125,7 +127,7 @@ ROOT_URLCONF = os.path.basename(os.path.dirname(__file__)) + '.urls'
#UPLOAD SETTINGS
FILE_UPLOAD_TEMP_DIR = os.path.join(
- os.path.dirname(__file__),
+ os.path.dirname(__file__),
'tmp'
).replace('\\','/')
@@ -260,7 +262,7 @@ HAYSTACK_ENABLE_REGISTRATIONS = False
#http://django-haystack.readthedocs.org/en/v1.2.7/settings.html
HAYSTACK_SEARCH_ENGINE = 'simple'
-TINYMCE_COMPRESSOR = True
+TINYMCE_COMPRESSOR = True
TINYMCE_SPELLCHECKER = False
TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/')
#TINYMCE_JS_URL = STATIC_URL + 'default/media/js/tinymce/tiny_mce.js'
@@ -289,7 +291,7 @@ TINYMCE_DEFAULT_CONFIG = {
}
#delayed notifications, time in seconds, 15 mins by default
-NOTIFICATION_DELAY_TIME = 60 * 15
+NOTIFICATION_DELAY_TIME = 60 * 15
GROUP_MESSAGING = {
'BASE_URL_GETTER_FUNCTION': 'askbot.models.user_get_profile_url',
@@ -305,5 +307,9 @@ if 'ASKBOT_CSS_DEVEL' in locals() and ASKBOT_CSS_DEVEL == True:
)
COMPRESS_JS_FILTERS = []
-COMPRESS_PARSER = 'compressor.parser.HtmlParser'
+COMPRESS_PARSER = 'compressor.parser.HtmlParser'
JINJA2_EXTENSIONS = ('compressor.contrib.jinja2ext.CompressorExtension',)
+
+# Use syncdb for tests instead of South migrations. Without this, some tests
+# fail spuriously in MySQL.
+SOUTH_TESTS_MIGRATE = False
diff --git a/askbot/templates/main_page/sidebar.html b/askbot/templates/main_page/sidebar.html
index 7acbe091..610d2b60 100644
--- a/askbot/templates/main_page/sidebar.html
+++ b/askbot/templates/main_page/sidebar.html
@@ -1,6 +1,6 @@
{% import "macros.html" as macros %}
-{% if settings.SIDEBAR_MAIN_HEADER %}
+{% if 'SIDEBAR_MAIN_HEADER'|show_block_to(request.user) %}
<div class="box">
{{ settings.SIDEBAR_MAIN_HEADER }}
</div>
@@ -22,7 +22,7 @@
{% include "widgets/related_tags.html" %}
{% endif %}
-{% if settings.SIDEBARE_MAIN_FOOTER %}
+{% if 'SIDEBAR_MAIN_FOOTER'|show_block_to(request.user) %}
<div class="box">
{{ settings.SIDEBAR_MAIN_FOOTER }}
</div>
diff --git a/askbot/templates/meta/bottom_scripts.html b/askbot/templates/meta/bottom_scripts.html
index eec4256d..5c398358 100644
--- a/askbot/templates/meta/bottom_scripts.html
+++ b/askbot/templates/meta/bottom_scripts.html
@@ -97,9 +97,11 @@
askbot['urls']['add_group'] = "{% url add_group %}";
var group_dropdown = new GroupDropdown({{ group_list }});
$('.dropdown').append(group_dropdown.getElement());
- if (askbot['data']['userIsAdmin']) {
- group_dropdown.enableAddGroups();
- }
+ }
+ var userRep = $('#userToolsNav .reputation');
+ if (userRep.length) {
+ var showPermsTrigger = new ShowPermsTrigger();
+ showPermsTrigger.decorate(userRep);
}
});
if (askbot['data']['haveFlashNotifications']) {
diff --git a/askbot/templates/question.html b/askbot/templates/question.html
index 13593adc..ca2f4022 100644
--- a/askbot/templates/question.html
+++ b/askbot/templates/question.html
@@ -285,7 +285,7 @@
</script>
{% endblock %}
{% block content %}
- {% if settings.QUESTION_PAGE_TOP_BANNER %}
+ {% if 'QUESTION_PAGE_TOP_BANNER'|show_block_to(request.user) %}
<div class="banner">{{ settings.QUESTION_PAGE_TOP_BANNER|safe }}</div>
{% endif %}
{% if is_cacheable %}
diff --git a/askbot/templates/question/content.html b/askbot/templates/question/content.html
index 23286ce0..c8fef9a6 100644
--- a/askbot/templates/question/content.html
+++ b/askbot/templates/question/content.html
@@ -12,7 +12,7 @@
<div class="clean"></div>
{% for answer in answers %}
- {% if answers|length > 1 and loop.index == 2 %}
+ {% if loop.index == 2 and 'QUESTION_PAGE_ANSWER_BANNER'|show_block_to(request.user) %}
<div class="banner">{{ settings.QUESTION_PAGE_ANSWER_BANNER|safe }}</div>
{% endif %}
{% include "question/answer_card.html" %}
diff --git a/askbot/templates/question/sidebar.html b/askbot/templates/question/sidebar.html
index c11a4336..523f01ff 100644
--- a/askbot/templates/question/sidebar.html
+++ b/askbot/templates/question/sidebar.html
@@ -1,5 +1,5 @@
{% import "macros.html" as macros %}
-{% if settings.SIDEBAR_QUESTION_HEADER %}
+{% if 'SIDEBAR_QUESTION_HEADER'|show_block_to(request.user) %}
<div class="box">
{{ settings.SIDEBAR_QUESTION_HEADER }}
</div>
@@ -173,7 +173,7 @@
{#% endcache %#}
{% endif %}
-{% if settings.SIDEBAR_QUESTION_FOOTER %}
+{% if 'SIDEBAR_QUESTION_FOOTER'|show_block_to(request.user) %}
<div class="box">
{{ settings.SIDEBAR_QUESTION_FOOTER }}
</div>
diff --git a/askbot/templates/user_profile/user.html b/askbot/templates/user_profile/user.html
index 3aee3cfa..c72dc857 100644
--- a/askbot/templates/user_profile/user.html
+++ b/askbot/templates/user_profile/user.html
@@ -36,11 +36,10 @@
{% endblock %}
{% endblock %}
{% block sidebar %}
-<div class="box">
- {{ settings.SIDEBAR_PROFILE_HEADER }}
-</div>
-<div class="box">
- {{ settings.SIDEBAR_PROFILE_FOOTER }}
-</div>
+ {% if 'SIDEBAR_PROFILE'|show_block_to(request.user) %}
+ <div class="box">
+ {{ settings.SIDEBAR_PROFILE }}
+ </div>
+ {% endif %}
{% endblock %}
<!-- end of user.html -->
diff --git a/askbot/templates/widgets/user_long_score_and_badge_summary.html b/askbot/templates/widgets/user_long_score_and_badge_summary.html
index 35e4cb67..771a8f3f 100644
--- a/askbot/templates/widgets/user_long_score_and_badge_summary.html
+++ b/askbot/templates/widgets/user_long_score_and_badge_summary.html
@@ -1,7 +1,9 @@
{% set have_badges = user.gold or user.silver or user.bronze %}
{%- if karma_mode != 'hidden' -%}
-<a class="user-micro-info"
- href="{{user.get_absolute_url()}}?sort=reputation"
+<a
+ class="user-micro-info reputation"
+ href="{{user.get_absolute_url()}}?sort=reputation"
+ data-url="{% url 'get_perms_data' %}"
>{% trans %}karma:{% endtrans %} {{user.reputation}}</a>{% if badges_mode == 'public' and have_badges %},{% endif %}
{%- endif -%}
{% if badges_mode == 'public' and have_badges %}
diff --git a/askbot/templates/widgets/user_perms.html b/askbot/templates/widgets/user_perms.html
new file mode 100644
index 00000000..887a712f
--- /dev/null
+++ b/askbot/templates/widgets/user_perms.html
@@ -0,0 +1,28 @@
+<!--h2>{% trans karma=user.reputation %}Your karma is {{ karma }}{% endtrans %}</h2-->
+<div class="triangle"></div>
+<p>
+ {% trans %}Karma reflects the value of your contribution to this community.{% endtrans %}
+</p>
+<p>
+ {% if user.is_administrator_or_moderator() %}
+ {% if user.is_moderator() %}
+ {% set role=gettext('moderator') %}
+ {% else %}
+ {% set role=gettext('administrator') %}
+ {% endif %}
+ {% trans %}Since you are the site {{ role }}, you have access to all functions regardless of your karma.{% endtrans %}
+ {% else %}
+ {% trans %}The higher is your karma, the more rights you have on this site.{% endtrans %}
+ {% endif %}
+</p>
+{% if not user.is_administrator_or_moderator() %}
+<p> {% trans %}Currently, you can:{% endtrans %}</p>
+<ul>
+ <li>{% trans %}Post questions, answers and comments{% endtrans %}</li>
+ {% for perm in perms_data %}
+ {% if user.reputation >= perm[1] %}
+ <li>{{ perm[0] }}</li>
+ {% endif %}
+ {% endfor %}
+</ul>
+{% endif %}
diff --git a/askbot/templatetags/extra_filters_jinja.py b/askbot/templatetags/extra_filters_jinja.py
index dccd9a2a..93acea84 100644
--- a/askbot/templatetags/extra_filters_jinja.py
+++ b/askbot/templatetags/extra_filters_jinja.py
@@ -79,6 +79,15 @@ def safe_urlquote(text, quote_plus = False):
return urllib.quote(text.encode('utf8'))
@register.filter
+def show_block_to(block_name, user):
+ block = getattr(askbot_settings, block_name)
+ if block:
+ flag_name = block_name + '_ANON_ONLY'
+ require_anon = getattr(askbot_settings, flag_name, False)
+ return (require_anon is False) or user.is_anonymous()
+ return False
+
+@register.filter
def strip_path(url):
"""removes path part of the url"""
return url_utils.strip_path(url)
diff --git a/askbot/tests/db_api_tests.py b/askbot/tests/db_api_tests.py
index 8d775fd0..1a7ad9e4 100644
--- a/askbot/tests/db_api_tests.py
+++ b/askbot/tests/db_api_tests.py
@@ -514,9 +514,14 @@ class GroupTests(AskbotTestCase):
self.assertEqual(qa.groups.filter(name='private').exists(), True)
def test_global_group_name_setting_changes_group_name(self):
+ orig_group_name = askbot_settings.GLOBAL_GROUP_NAME;
askbot_settings.update('GLOBAL_GROUP_NAME', 'all-people')
group = models.Group.objects.get_global_group()
self.assertEqual(group.name, 'all-people')
+ # Revert the global group name, so we don't mess up other tests!
+ askbot_settings.update('GLOBAL_GROUP_NAME', orig_group_name);
+ group = models.Group.objects.get_global_group()
+ self.assertEqual(group.name, orig_group_name)
def test_ask_global_group_by_id_works(self):
group = models.Group.objects.get_global_group()
@@ -698,5 +703,3 @@ class LinkPostingTests(AskbotTestCase):
self.assert_no_link(question.html)
self.edit_question(user=admin, question=question, body_text=text + ' ok')
self.assert_has_link(question.html, 'http://wikipedia.org')
-
-
diff --git a/askbot/tests/management_command_tests.py b/askbot/tests/management_command_tests.py
index e9341a8b..f1c6728d 100644
--- a/askbot/tests/management_command_tests.py
+++ b/askbot/tests/management_command_tests.py
@@ -34,20 +34,19 @@ class ManagementCommandTests(AskbotTestCase):
question = self.post_question(user=user_one)
comment = self.post_comment(user=user_one, parent_post=question)
number_of_gold = 50
- user_one.gold = number_of_gold
+ user_one.gold = number_of_gold
reputation = 20
- user_one.reputation = reputation
+ user_one.reputation = reputation
user_one.save()
# Create a second user and transfer all objects from 'user_one' to 'user_two'
user_two = self.create_user(username='unique')
+ user_two_pk = user_two.pk
management.call_command('merge_users', user_one.id, user_two.id)
# Check that the first user was deleted
self.assertEqual(models.User.objects.filter(pk=user_one.id).count(), 0)
# Explicitly check that the values assigned to user_one are now user_two's
self.assertEqual(user_two.posts.get_questions().filter(pk=question.id).count(), 1)
self.assertEqual(user_two.posts.get_comments().filter(pk=comment.id).count(), 1)
- #todo: change groups to django groups
- #then replace to 3 back to 2 in the line below
- user_two = models.User.objects.get(pk=2)
- self.assertEqual(user_two.gold, number_of_gold)
+ user_two = models.User.objects.get(pk=user_two_pk)
+ self.assertEqual(user_two.gold, number_of_gold)
self.assertEqual(user_two.reputation, reputation)
diff --git a/askbot/tests/question_views_tests.py b/askbot/tests/question_views_tests.py
index 9486b854..da3e081d 100644
--- a/askbot/tests/question_views_tests.py
+++ b/askbot/tests/question_views_tests.py
@@ -33,7 +33,7 @@ class PrivateQuestionViewsTests(AskbotTestCase):
dom = BeautifulSoup(response2.content)
title = dom.find('h1').text
self.assertTrue(unicode(const.POST_STATUS['private']) in title)
- question = models.Thread.objects.get(id=1)
+ question = models.Thread.objects.get()
self.assertEqual(question.title, self.qdata['title'])
self.assertFalse(models.Group.objects.get_global_group() in set(question.groups.all()))
@@ -114,7 +114,7 @@ class PrivateQuestionViewsTests(AskbotTestCase):
class PrivateAnswerViewsTests(AskbotTestCase):
-
+
def setUp(self):
self._backup = askbot_settings.GROUPS_ENABLED
askbot_settings.update('GROUPS_ENABLED', True)
@@ -147,7 +147,6 @@ class PrivateAnswerViewsTests(AskbotTestCase):
response = self.client.get(self.question.get_absolute_url())
self.assertFalse('some answer text' in response.content)
-
def test_private_checkbox_is_on_when_editing_private_answer(self):
answer = self.post_answer(
question=self.question, user=self.user, is_private=True
diff --git a/askbot/urls.py b/askbot/urls.py
index f71962f1..e82ad0df 100644
--- a/askbot/urls.py
+++ b/askbot/urls.py
@@ -534,7 +534,12 @@ urlpatterns = patterns('',
service_url(
r'^widgets/questions/(?P<widget_id>\d+)/$',
views.widgets.question_widget,
- name = 'question_widget'
+ name='question_widget'
+ ),
+ service_url(
+ r'^get-perms-data/$',
+ views.readers.get_perms_data,
+ name='get_perms_data'
),
service_url(
r'^start-sharing-twitter/$',
diff --git a/askbot/utils/slug.py b/askbot/utils/slug.py
index f9e30cbf..1c95e1d4 100644
--- a/askbot/utils/slug.py
+++ b/askbot/utils/slug.py
@@ -50,10 +50,13 @@ def slugify(input_text, max_length=150):
return input_text
allow_unicode_slugs = getattr(settings, 'ALLOW_UNICODE_SLUGS', False)
- if allow_unicode_slugs:
+ if isinstance(input_text, unicode) and not allow_unicode_slugs:
+ input_text = unidecode(input_text)
+
+ if isinstance(input_text, unicode):
slug = unicode_slugify(input_text)
else:
- slug = defaultfilters.slugify(unidecode(input_text))
+ slug = defaultfilters.slugify(input_text)
while len(slug) > max_length:
# try to shorten word by word until len(slug) <= max_length
temp = slug[:slug.rfind('-')]
diff --git a/askbot/views/readers.py b/askbot/views/readers.py
index f738da25..b2a27324 100644
--- a/askbot/views/readers.py
+++ b/askbot/views/readers.py
@@ -638,3 +638,65 @@ def get_comment(request):
comment = models.Post.objects.get(post_type='comment', id=id)
request.user.assert_can_edit_comment(comment)
return {'text': comment.text}
+
+
+@csrf.csrf_exempt
+@ajax_only
+@anonymous_forbidden
+@get_only
+def get_perms_data(request):
+ """returns details about permitted activities
+ according to the users reputation
+ """
+
+ items = (
+ 'MIN_REP_TO_VOTE_UP',
+ 'MIN_REP_TO_VOTE_DOWN',
+ )
+
+ if askbot_settings.MIN_DAYS_TO_ANSWER_OWN_QUESTION > 0:
+ items += ('MIN_REP_TO_ANSWER_OWN_QUESTION',)
+
+ if askbot_settings.ACCEPTING_ANSWERS_ENABLED:
+ items += (
+ 'MIN_REP_TO_ACCEPT_OWN_ANSWER',
+ 'MIN_REP_TO_ACCEPT_ANY_ANSWER',
+ )
+
+ items += (
+ 'MIN_REP_TO_FLAG_OFFENSIVE',
+ 'MIN_REP_TO_DELETE_OTHERS_COMMENTS',
+ 'MIN_REP_TO_DELETE_OTHERS_POSTS',
+ 'MIN_REP_TO_UPLOAD_FILES',
+ 'MIN_REP_TO_INSERT_LINK',
+ 'MIN_REP_TO_SUGGEST_LINK',
+ 'MIN_REP_TO_CLOSE_OWN_QUESTIONS',
+ 'MIN_REP_TO_REOPEN_OWN_QUESTIONS',
+ 'MIN_REP_TO_CLOSE_OTHERS_QUESTIONS',
+ 'MIN_REP_TO_RETAG_OTHERS_QUESTIONS',
+ 'MIN_REP_TO_EDIT_WIKI',
+ 'MIN_REP_TO_EDIT_OTHERS_POSTS',
+ 'MIN_REP_TO_VIEW_OFFENSIVE_FLAGS',
+ )
+
+ if askbot_settings.ALLOW_ASKING_BY_EMAIL or askbot_settings.REPLY_BY_EMAIL:
+ items += (
+ 'MIN_REP_TO_POST_BY_EMAIL',
+ 'MIN_REP_TO_TWEET_ON_OTHERS_ACCOUNTS',
+ )
+
+ data = list()
+ for item in items:
+ setting = (
+ askbot_settings.get_description(item),
+ getattr(askbot_settings, item)
+ )
+ data.append(setting)
+
+ template = get_template('widgets/user_perms.html')
+ html = template.render({
+ 'user': request.user,
+ 'perms_data': data
+ })
+
+ return {'html': html}
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 179392d2..c58b5abd 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -60,6 +60,7 @@ def owner_or_moderator_required(f):
return f(request, profile_owner, context)
return wrapped_func
+
def show_users(request, by_group=False, group_id=None, group_slug=None):
"""Users view, including listing of users by group"""
if askbot_settings.GROUPS_ENABLED and not by_group: