From 0880dd09962294723a167dd924bedb78cc7d3660 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Mon, 19 Mar 2012 23:16:52 -0400 Subject: assigning users to groups about 2/3 way done --- askbot/conf/__init__.py | 1 + askbot/conf/group_settings.py | 20 ++ askbot/forms.py | 4 + ..._add_groupmembership__add_field_tag_tag_wiki.py | 303 +++++++++++++++++++++ askbot/models/__init__.py | 8 + askbot/models/tag.py | 16 ++ askbot/models/user.py | 13 + askbot/skins/common/media/js/user.js | 147 ++++++++++ askbot/skins/default/templates/macros.html | 4 + .../skins/default/templates/user_profile/user.html | 2 + .../default/templates/user_profile/user_stats.html | 40 ++- askbot/tests/form_tests.py | 4 + askbot/urls.py | 5 + askbot/views/commands.py | 29 ++ 14 files changed, 574 insertions(+), 22 deletions(-) create mode 100644 askbot/conf/group_settings.py create mode 100644 askbot/migrations/0114_auto__add_groupmembership__add_field_tag_tag_wiki.py diff --git a/askbot/conf/__init__.py b/askbot/conf/__init__.py index dff91d8e..8c3bd957 100644 --- a/askbot/conf/__init__.py +++ b/askbot/conf/__init__.py @@ -17,6 +17,7 @@ import askbot.conf.sidebar_profile import askbot.conf.leading_sidebar import askbot.conf.spam_and_moderation import askbot.conf.user_settings +import askbot.conf.group_settings import askbot.conf.markup import askbot.conf.social_sharing import askbot.conf.badges diff --git a/askbot/conf/group_settings.py b/askbot/conf/group_settings.py new file mode 100644 index 00000000..a48fb55d --- /dev/null +++ b/askbot/conf/group_settings.py @@ -0,0 +1,20 @@ +"""Group settings""" +from askbot.conf.settings_wrapper import settings +from askbot.conf.super_groups import LOGIN_USERS_COMMUNICATION +from askbot.deps import livesettings +from django.utils.translation import ugettext as _ + +GROUP_SETTINGS = livesettings.ConfigurationGroup( + 'GROUP_SETTINGS', + _('Group settings'), + super_group = LOGIN_USERS_COMMUNICATION + ) + +settings.register( + livesettings.BooleanValue( + GROUP_SETTINGS, + 'GROUPS_ENABLED', + default = False, + description = _('Enable user groups'), + ) +) diff --git a/askbot/forms.py b/askbot/forms.py index 1816c202..ebb1b519 100644 --- a/askbot/forms.py +++ b/askbot/forms.py @@ -1135,3 +1135,7 @@ class SimpleEmailSubscribeForm(forms.Form): else: email_settings_form = EFF(initial=EFF.NO_EMAIL_INITIAL) email_settings_form.save(user, save_unbound=True) + +class AddUserToGroupForm(forms.Form): + user_id = forms.IntegerField() + group_name = forms.CharField() diff --git a/askbot/migrations/0114_auto__add_groupmembership__add_field_tag_tag_wiki.py b/askbot/migrations/0114_auto__add_groupmembership__add_field_tag_tag_wiki.py new file mode 100644 index 00000000..c255b7bc --- /dev/null +++ b/askbot/migrations/0114_auto__add_groupmembership__add_field_tag_tag_wiki.py @@ -0,0 +1,303 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'GroupMembership' + db.create_table('askbot_groupmembership', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['askbot.Tag'])), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + )) + db.send_create_signal('askbot', ['GroupMembership']) + + # Adding field 'Tag.tag_wiki' + db.add_column(u'tag', 'tag_wiki', + self.gf('django.db.models.fields.related.OneToOneField')(related_name='described_tag', unique=True, null=True, to=orm['askbot.Post']), + keep_default=False) + + def backwards(self, orm): + # Deleting model 'GroupMembership' + db.delete_table('askbot_groupmembership') + + # Deleting field 'Tag.tag_wiki' + db.delete_column(u'tag', 'tag_wiki_id') + + models = { + 'askbot.activity': { + 'Meta': {'object_name': 'Activity', 'db_table': "u'activity'"}, + 'active_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'activity_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_auditted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True'}), + 'receiving_users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'received_activity'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'incoming_activity'", 'symmetrical': 'False', 'through': "orm['askbot.ActivityAuditStatus']", 'to': "orm['auth.User']"}), + 'summary': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.activityauditstatus': { + 'Meta': {'unique_together': "(('user', 'activity'),)", 'object_name': 'ActivityAuditStatus'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Activity']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.anonymousanswer': { + 'Meta': {'object_name': 'AnonymousAnswer'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'anonymous_answers'", 'to': "orm['askbot.Post']"}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.anonymousquestion': { + 'Meta': {'object_name': 'AnonymousQuestion'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.award': { + 'Meta': {'object_name': 'Award', 'db_table': "u'award'"}, + 'awarded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'badge': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_badge'", 'to': "orm['askbot.BadgeData']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'notified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_user'", 'to': "orm['auth.User']"}) + }, + 'askbot.badgedata': { + 'Meta': {'ordering': "('slug',)", 'object_name': 'BadgeData'}, + 'awarded_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'awarded_to': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'badges'", 'symmetrical': 'False', 'through': "orm['askbot.Award']", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) + }, + 'askbot.emailfeedsetting': { + 'Meta': {'object_name': 'EmailFeedSetting'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'feed_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'frequency': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '8'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reported_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'subscriber': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notification_subscriptions'", 'to': "orm['auth.User']"}) + }, + 'askbot.favoritequestion': { + 'Meta': {'object_name': 'FavoriteQuestion', 'db_table': "u'favorite_question'"}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Thread']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_favorite_questions'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupmembership': { + 'Meta': {'object_name': 'GroupMembership'}, + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.markedtag': { + 'Meta': {'object_name': 'MarkedTag'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reason': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_selections'", 'to': "orm['askbot.Tag']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tag_selections'", 'to': "orm['auth.User']"}) + }, + 'askbot.post': { + 'Meta': {'object_name': 'Post'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'posts'", 'to': "orm['auth.User']"}), + 'comment_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'html': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_edited_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'last_edited_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_edited_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'locked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'locked_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'locked_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locked_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'offensive_flag_count': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'old_answer_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_comment_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_question_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'post_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'posts'", 'to': "orm['askbot.Thread']"}), + 'vote_down_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'vote_up_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'wikified_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}) + }, + 'askbot.postrevision': { + 'Meta': {'ordering': "('-revision',)", 'unique_together': "(('post', 'revision'),)", 'object_name': 'PostRevision'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'postrevisions'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisions'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'revised_at': ('django.db.models.fields.DateTimeField', [], {}), + 'revision': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'revision_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '125', 'blank': 'True'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '300', 'blank': 'True'}) + }, + 'askbot.questionview': { + 'Meta': {'object_name': 'QuestionView'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'viewed'", 'to': "orm['askbot.Post']"}), + 'when': ('django.db.models.fields.DateTimeField', [], {}), + 'who': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'question_views'", 'to': "orm['auth.User']"}) + }, + 'askbot.replyaddress': { + 'Meta': {'object_name': 'ReplyAddress'}, + 'address': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '25'}), + 'allowed_from_email': ('django.db.models.fields.EmailField', [], {'max_length': '150'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reply_addresses'", 'to': "orm['askbot.Post']"}), + 'response_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'edit_addresses'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.repute': { + 'Meta': {'object_name': 'Repute', 'db_table': "u'repute'"}, + 'comment': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'negative': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'positive': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'reputation_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'reputed_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.tag': { + 'Meta': {'ordering': "('-used_count', 'name')", 'object_name': 'Tag', 'db_table': "u'tag'"}, + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_tags'", 'to': "orm['auth.User']"}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_tags'", 'null': 'True', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'tag_wiki': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'described_tag'", 'unique': 'True', 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.thread': { + 'Meta': {'object_name': 'Thread'}, + 'accepted_answer': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'answer_accepted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'answer_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'close_reason': ('django.db.models.fields.SmallIntegerField', [], {'null': 'True', 'blank': 'True'}), + 'closed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'closed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'closed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'favorited_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'unused_favorite_threads'", 'symmetrical': 'False', 'through': "orm['askbot.FavoriteQuestion']", 'to': "orm['auth.User']"}), + 'favourite_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'followed_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'followed_threads'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_activity_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_activity_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'unused_last_active_in_threads'", 'to': "orm['auth.User']"}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'threads'", 'symmetrical': 'False', 'to': "orm['askbot.Tag']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'view_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.vote': { + 'Meta': {'unique_together': "(('user', 'voted_post'),)", 'object_name': 'Vote', 'db_table': "u'vote'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['auth.User']"}), + 'vote': ('django.db.models.fields.SmallIntegerField', [], {}), + 'voted_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'voted_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['askbot.Post']"}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}), + 'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}), + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), + 'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}), + 'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), + 'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['askbot'] \ No newline at end of file diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 09ec0018..19c1c559 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -30,6 +30,7 @@ from askbot.models.answer import AnonymousAnswer from askbot.models.tag import Tag, MarkedTag from askbot.models.meta import Vote from askbot.models.user import EmailFeedSetting, ActivityAuditStatus, Activity +from askbot.models.user import GroupMembership from askbot.models.post import Post, PostRevision from askbot.models.reply_by_email import ReplyAddress from askbot.models import signals @@ -2173,6 +2174,11 @@ def user_update_wildcard_tag_selections( return new_tags +def user_add_user_to_group(self, user = None, group = None): + """allows one user to add another to a pre-existing group""" + GroupMembership.objects.get_or_create(user, group) + + User.add_to_class( 'add_missing_askbot_subscriptions', user_add_missing_askbot_subscriptions @@ -2235,6 +2241,7 @@ User.add_to_class('can_post_comment', user_can_post_comment) User.add_to_class('is_administrator', user_is_administrator) User.add_to_class('is_administrator_or_moderator', user_is_administrator_or_moderator) User.add_to_class('set_admin_status', user_set_admin_status) +User.add_to_class('add_user_to_group', user_add_user_to_group) User.add_to_class('remove_admin_status', user_remove_admin_status) User.add_to_class('is_moderator', user_is_moderator) User.add_to_class('is_approved', user_is_approved) @@ -2847,6 +2854,7 @@ __all__ = [ 'Activity', 'ActivityAuditStatus', 'EmailFeedSetting', + 'GroupMembership', 'User', diff --git a/askbot/models/tag.py b/askbot/models/tag.py index a13de661..1cfb1573 100644 --- a/askbot/models/tag.py +++ b/askbot/models/tag.py @@ -82,6 +82,16 @@ class TagManager(BaseQuerySetManager): def get_query_set(self): return TagQuerySet(self.model) + def get_or_create_group_tag(self, group_name = None, user = None): + """creates a group tag or finds one, if exists""" + #todo: here we might fill out the group profile + try: + tag = self.get(name = group_name) + except self.model.DoesNotExist: + tag = self.model(name = group_name, created_by = user) + tag.save() + return tag + class Tag(models.Model): name = models.CharField(max_length=255, unique=True) created_by = models.ForeignKey(User, related_name='created_tags') @@ -92,6 +102,12 @@ class Tag(models.Model): deleted_at = models.DateTimeField(null=True, blank=True) deleted_by = models.ForeignKey(User, null=True, blank=True, related_name='deleted_tags') + tag_wiki = models.OneToOneField( + 'Post', + null=True, + related_name = 'described_tag' + ) + objects = TagManager() class Meta: diff --git a/askbot/models/user.py b/askbot/models/user.py index 6f27cbf3..c9a4e1e5 100644 --- a/askbot/models/user.py +++ b/askbot/models/user.py @@ -9,6 +9,7 @@ from django.utils.translation import ugettext as _ from django.utils.html import strip_tags from askbot import const from askbot.utils import functions +from askbot.models.tag import Tag class ResponseAndMentionActivityManager(models.Manager): def get_query_set(self): @@ -333,3 +334,15 @@ class EmailFeedSetting(models.Model): class Meta: app_label = 'askbot' + + +class GroupMembership(models.Model): + """an explicit model to link users and the tags + that by being recorded with this relation automatically + become group tags + """ + group = models.ForeignKey(Tag) + user = models.ForeignKey(User) + + class Meta: + app_label = 'askbot' diff --git a/askbot/skins/common/media/js/user.js b/askbot/skins/common/media/js/user.js index 5d205560..8a8a7f50 100644 --- a/askbot/skins/common/media/js/user.js +++ b/askbot/skins/common/media/js/user.js @@ -126,6 +126,22 @@ $(document).ready(function(){ $(re_content).slideToggle(); } ); + + $('.badge-context-toggle').each(function(idx, elem){ + var context_list = $(elem).parent().next('ul'); + if (context_list.children().length > 0){ + $(elem).addClass('active'); + var toggle_display = function(){ + if (context_list.css('display') == 'none'){ + $('.badge-context-list').hide(); + context_list.show(); + } else { + context_list.hide(); + } + }; + $(elem).click(toggle_display); + } + }); }); /** @@ -204,6 +220,131 @@ FollowUser.prototype.toggleState = function(){ } }; +GroupsContainer = function(){ + WrappedElement.call(this); +}; +inherits(GroupsContainer, WrappedElement); + +GroupsContainer.prototype.decorate = function(element){ + this._element = element; +}; + +GroupsContainer.prototype.addGroup = function(group_name){ + var group = this.makeElement('li'); + group.html(group_name); + this._element.append(group); +}; + +GroupAdderWidget = function(){ + WrappedElement.call(this); + this._state = 'display';//display or edit +}; +inherits(GroupAdderWidget, WrappedElement); + +/** + * @param {string} state + */ +GroupAdderWidget.prototype.setState = function(state){ + if (state === 'display'){ + this._element.html(gettext('add group')); + this._input.hide(); + this._button.hide(); + } else if (state === 'edit'){ + this._element.html(gettext('cancel')); + this._input.show(); + this._button.show(); + } else { + return; + } + this._state = state; +}; + +GroupAdderWidget.prototype.getValue = function(){ + return this._input.val(); +}; + +GroupAdderWidget.prototype.addGroup = function(group){ + this._groups_container.addGroup(group); +}; + +GroupAdderWidget.prototype.getAddGroupHandler = function(){ + var me = this; + return function(){ + var group_name = me.getValue(); + var data = { + group_name: group_name, + user_id: askbot['data']['viewUserId'] + }; + $.ajax({ + type: 'POST', + dataType: 'json', + data: data, + cache: false, + url: askbot['urls']['add_user_to_group'], + success: function(data){ + if (data['success'] === true){ + me.addGroup(group_name); + me.setState('display'); + } else { + var message = data['message']; + showMessage(me.getElement(), message, 'after'); + } + } + }); + }; +}; + +GroupAdderWidget.prototype.setGroupsContainer = function(container){ + this._groups_container = container; +}; + +GroupAdderWidget.prototype.toggleState = function(){ + if (this._state === 'display'){ + this.setState('edit'); + } else if (this._state === 'edit'){ + this.setState('display'); + } +}; + +GroupAdderWidget.prototype.decorate = function(element){ + this._element = element; + var input = this.makeElement('input'); + this._input = input; + var button = this.makeElement('button'); + button.html(gettext('add')); + this._button = button; + element.before(input); + input.after(button); + this.setState('display'); + setupButtonEventHandlers(button, this.getAddGroupHandler()); + var me = this; + setupButtonEventHandlers( + element, + function(){ me.toggleState() } + ); +}; + +/** + * @constructor + * allows editing user groups + */ +UserGroupsEditor = function(){ + WrappedElement.call(this); +}; +inherits(UserGroupsEditor, WrappedElement); + +UserGroupsEditor.prototype.decorate = function(element){ + this._element = element; + var add_link = element.find('#add-group'); + var adder = new GroupAdderWidget(); + adder.decorate(add_link); + + var groups_container = new GroupsContainer(); + groups_container.decorate(element.find('ul')); + adder.setGroupsContainer(groups_container); + //todo - add group deleters +}; + (function(){ var fbtn = $('.follow-toggle'); if (fbtn.length === 1){ @@ -211,5 +352,11 @@ FollowUser.prototype.toggleState = function(){ follow_user.decorate(fbtn); follow_user.setUserName(askbot['data']['viewUserName']); } + if (askbot['data']['userIsAdminOrMod']){ + var group_editor = new UserGroupsEditor(); + group_editor.decorate($('#user-groups')); + } else { + $('#add-group').remove(); + } })(); diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html index 20e2055c..71db477f 100644 --- a/askbot/skins/default/templates/macros.html +++ b/askbot/skins/default/templates/macros.html @@ -174,6 +174,10 @@ poor design of the data or methods on data objects #} {%- endmacro -%} +{%- macro user_group(group) -%} + {{ group.name }} +{%- endmacro -%} + {# todo: remove the extra content argument to make its usage more explicit #} {%- macro tag_widget( tag, diff --git a/askbot/skins/default/templates/user_profile/user.html b/askbot/skins/default/templates/user_profile/user.html index 789c3c86..a6fe614a 100644 --- a/askbot/skins/default/templates/user_profile/user.html +++ b/askbot/skins/default/templates/user_profile/user.html @@ -22,6 +22,8 @@ {% if request.user|can_moderate_user(view_user) %} diff --git a/askbot/skins/default/templates/user_profile/user_stats.html b/askbot/skins/default/templates/user_profile/user_stats.html index 774550d8..f47ba52b 100644 --- a/askbot/skins/default/templates/user_profile/user_stats.html +++ b/askbot/skins/default/templates/user_profile/user_stats.html @@ -6,6 +6,24 @@ {% endblock %} {% block usercontent %} {% include "user_profile/user_info.html" %} + {% if settings.GROUPS_ENABLED %} +
+

{% trans + username = view_user.username + %}{{username}}'s groups{% endtrans %} +

+ {% if user_groups %} + + {% endif %} + {% trans %}add group{% endtrans %} +
+ {% endif %} {% spaceless %}

{% trans counter=question_count %}{{counter}} Question{% pluralize %}{{counter}} Questions{% endtrans %}

@@ -132,26 +150,4 @@ {% endblock %} -{% block endjs %} - {{ super() }} - -{% endblock %} diff --git a/askbot/tests/form_tests.py b/askbot/tests/form_tests.py index 22f2a77c..654272b3 100644 --- a/askbot/tests/form_tests.py +++ b/askbot/tests/form_tests.py @@ -47,9 +47,12 @@ class AskByEmailFormTests(AskbotTestCase): 'subject': '[tag-one] where is titanic?', 'body_text': 'where is titanic?' } + def test_subject_line(self): """loops through various forms of the subject line and makes sure that tags and title are parsed out""" + setting_backup = askbot_settings.TAGS_ARE_REQUIRED + askbot_settings.update('TAGS_ARE_REQUIRED', True) for test_case in SUBJECT_LINE_CASES: self.data['subject'] = test_case[0] form = forms.AskByEmailForm(self.data) @@ -66,6 +69,7 @@ class AskByEmailFormTests(AskbotTestCase): form.cleaned_data['title'], output[1] ) + askbot_settings.update('TAGS_ARE_REQUIRED', setting_backup) def test_email(self): """loops through variants of the from field diff --git a/askbot/urls.py b/askbot/urls.py index 1ab3ea5d..4cf00313 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -252,6 +252,11 @@ urlpatterns = patterns('', views.commands.manage_inbox, name='manage_inbox' ), + url(#ajax only + r'^add_user_to_group/$', + views.commands.add_user_to_group, + name='add_user_to_group' + ), url( r'^feeds/(?P.*)/$', 'django.contrib.syndication.views.feed', diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 5d86d1a1..c534d87a 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -639,3 +639,32 @@ def read_message(request):#marks message a read if request.user.is_authenticated(): request.user.delete_messages() return HttpResponse('') + +@csrf.csrf_exempt +@decorators.ajax_only +@decorators.post_only +def add_user_to_group(request): + if request.user.is_anonymous(): + raise exceptions.PermissionDenied() + + if not request.user.is_administrator_or_moderator(): + raise exceptions.PermissionDenied( + _('Only moderators and administrators can assign users to groups') + ) + + form = forms.AddUserToGroupForm(request.POST) + if form.is_valid(): + group_name = form.cleaned_data['group_name'] + user_id = form.cleaned_data['user_id'] + + group = models.Tag.get_or_create_group_tag(group_name) + try: + user = models.User.objects.get(id = user_id) + except models.User.DoesNotExist: + raise exceptions.PermissionDenied( + 'user with id %d not found' % user_id + ) + + request.user.add_user_to_group(user, group) + else: + raise exceptions.PermissionDenied() -- cgit v1.2.3-1-g7c22 From 0cb6156c843686c4fbbbe1225cfa55c4c488eb89 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 20 Mar 2012 12:10:13 -0400 Subject: assigning users to groups works --- askbot/models/__init__.py | 2 +- askbot/models/tag.py | 29 +++++++++++++++++- askbot/models/user.py | 4 +-- askbot/skins/common/media/js/user.js | 34 ++++++++++++++++++++-- askbot/skins/default/templates/macros.html | 2 +- .../skins/default/templates/user_profile/user.html | 1 + askbot/urls.py | 5 ++++ askbot/utils/decorators.py | 2 ++ askbot/views/commands.py | 19 ++++++++++-- askbot/views/users.py | 2 +- 10 files changed, 89 insertions(+), 11 deletions(-) diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 19c1c559..bbda51bc 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2176,7 +2176,7 @@ def user_update_wildcard_tag_selections( def user_add_user_to_group(self, user = None, group = None): """allows one user to add another to a pre-existing group""" - GroupMembership.objects.get_or_create(user, group) + GroupMembership.objects.get_or_create(user = user, group = group) User.add_to_class( diff --git a/askbot/models/tag.py b/askbot/models/tag.py index 1cfb1573..097c2df9 100644 --- a/askbot/models/tag.py +++ b/askbot/models/tag.py @@ -82,9 +82,23 @@ class TagManager(BaseQuerySetManager): def get_query_set(self): return TagQuerySet(self.model) - def get_or_create_group_tag(self, group_name = None, user = None): +#todo: implement this +#class GroupTagQuerySet(models.query.QuerySet): +# """Custom query set for the group""" +# def __init__(self, model): + +class GroupTagManager(TagManager): + """manager for group tags""" + +# def get_query_set(self): +# return GroupTagQuerySet(self.model) + + def get_or_create(self, group_name = None, user = None): """creates a group tag or finds one, if exists""" #todo: here we might fill out the group profile + + #replace spaces with dashes + group_name = re.sub('\s+', '-', group_name.strip()) try: tag = self.get(name = group_name) except self.model.DoesNotExist: @@ -92,6 +106,18 @@ class TagManager(BaseQuerySetManager): tag.save() return tag + #todo: maybe move this to query set + def get_for_user(self, user = None): + return self.filter(user_memberships__user = user) + + #todo: remove this when the custom query set is done + def get_all(self): + return self.annotate( + member_count = models.Count('user_memberships') + ).filter( + member_count__gt = 0 + ) + class Tag(models.Model): name = models.CharField(max_length=255, unique=True) created_by = models.ForeignKey(User, related_name='created_tags') @@ -109,6 +135,7 @@ class Tag(models.Model): ) objects = TagManager() + group_tags = GroupTagManager() class Meta: app_label = 'askbot' diff --git a/askbot/models/user.py b/askbot/models/user.py index c9a4e1e5..20861a2a 100644 --- a/askbot/models/user.py +++ b/askbot/models/user.py @@ -341,8 +341,8 @@ class GroupMembership(models.Model): that by being recorded with this relation automatically become group tags """ - group = models.ForeignKey(Tag) - user = models.ForeignKey(User) + group = models.ForeignKey(Tag, related_name = 'user_memberships') + user = models.ForeignKey(User, related_name = 'group_memberships') class Meta: app_label = 'askbot' diff --git a/askbot/skins/common/media/js/user.js b/askbot/skins/common/media/js/user.js index 8a8a7f50..aed926d1 100644 --- a/askbot/skins/common/media/js/user.js +++ b/askbot/skins/common/media/js/user.js @@ -26,7 +26,7 @@ $(document).ready(function(){ data: JSON.stringify({memo_list: id_list, action_type: action_type}), url: askbot['urls']['manageInbox'], success: function(response_data){ - if (response_data['success'] === true){ + if (response_data['success'] == true){ if (action_type == 'delete' || action_type == 'remove_flag' || action_type == 'close' || action_type == 'delete_post'){ elements.remove(); } @@ -220,6 +220,9 @@ FollowUser.prototype.toggleState = function(){ } }; +/** + * @constructor + */ GroupsContainer = function(){ WrappedElement.call(this); }; @@ -227,9 +230,22 @@ inherits(GroupsContainer, WrappedElement); GroupsContainer.prototype.decorate = function(element){ this._element = element; + var groups = {}; + //collect list of groups + $.each(element.find('li'), function(idx, li){ + groups[$(li).html()] = 1; + //var str = $(li).html(); + //var bytes = []; + //for (var i = 0; i {% if request.user|can_moderate_user(view_user) %} diff --git a/askbot/urls.py b/askbot/urls.py index 4cf00313..1cc51be3 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -192,6 +192,11 @@ urlpatterns = patterns('', views.commands.get_tag_list, name = 'get_tag_list' ), + url( + r'^get-groups-list/', + views.commands.get_groups_list, + name = 'get_groups_list' + ), url( r'^swap-question-with-answer/', views.commands.swap_question_with_answer, diff --git a/askbot/utils/decorators.py b/askbot/utils/decorators.py index 29e92645..c20b92e2 100644 --- a/askbot/utils/decorators.py +++ b/askbot/utils/decorators.py @@ -84,6 +84,8 @@ def ajax_only(view_func): raise Http404 try: data = view_func(request, *args, **kwargs) + if data is None: + data = {} except Exception, e: message = unicode(e) if message == '': diff --git a/askbot/views/commands.py b/askbot/views/commands.py index c534d87a..2a7f9a0a 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -436,7 +436,20 @@ def get_tag_list(request): 'name', flat = True ) output = '\n'.join(tag_names) - return HttpResponse(output, mimetype = "text/plain") + return HttpResponse(output, mimetype = 'text/plain') + +@decorators.get_only +def get_groups_list(request): + """returns names of group tags + for the autocomplete function""" + group_names = models.Tag.group_tags.get_all().filter( + deleted = False + ).values_list( + 'name', flat = True + ) + group_names = map(lambda v: v.replace('-', ' '), group_names) + output = '\n'.join(group_names) + return HttpResponse(output, mimetype = 'text/plain') @csrf.csrf_protect def subscribe_for_tags(request): @@ -656,8 +669,6 @@ def add_user_to_group(request): if form.is_valid(): group_name = form.cleaned_data['group_name'] user_id = form.cleaned_data['user_id'] - - group = models.Tag.get_or_create_group_tag(group_name) try: user = models.User.objects.get(id = user_id) except models.User.DoesNotExist: @@ -665,6 +676,8 @@ def add_user_to_group(request): 'user with id %d not found' % user_id ) + group_params = {'group_name': group_name, 'user': user} + group = models.Tag.group_tags.get_or_create(**group_params) request.user.add_user_to_group(user, group) else: raise exceptions.PermissionDenied() diff --git a/askbot/views/users.py b/askbot/views/users.py index c625aeab..9858b872 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -394,7 +394,7 @@ def user_stats(request, user, context): 'votes_total_per_day': votes_total, 'user_tags' : user_tags, - + 'user_groups': models.Tag.group_tags.get_for_user(user = user), 'badges': badges, 'total_badges' : len(badges), } -- cgit v1.2.3-1-g7c22 From 2ab9a079954a11a9dcf8bac7dbc9454d32054e7b Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 20 Mar 2012 12:36:35 -0400 Subject: fixed a glitch where the first group could not be added to the user profile --- askbot/skins/default/templates/user_profile/user_stats.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/askbot/skins/default/templates/user_profile/user_stats.html b/askbot/skins/default/templates/user_profile/user_stats.html index f47ba52b..50f9e32e 100644 --- a/askbot/skins/default/templates/user_profile/user_stats.html +++ b/askbot/skins/default/templates/user_profile/user_stats.html @@ -12,15 +12,15 @@ username = view_user.username %}{{username}}'s groups{% endtrans %} - {% if user_groups %}
    + {% if user_groups %} {% for group in user_groups %}
  • {{ macros.user_group(group) }}
    • {% endfor %} -
{% endif %} + {% trans %}add group{% endtrans %} {% endif %} -- cgit v1.2.3-1-g7c22 From 362d4c3074983b6dbc5e420b7b4f4ebd8f1d380d Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 20 Mar 2012 21:37:05 -0400 Subject: user groups are deletable, commit from the bus en route to Cordoba --- askbot/forms.py | 13 ++- askbot/models/__init__.py | 18 +++- askbot/models/tag.py | 10 +- askbot/skins/common/media/js/user.js | 110 ++++++++++++++++++--- askbot/skins/common/media/js/utils.js | 16 +++ askbot/skins/default/media/style/style.less | 21 ++++ .../skins/default/templates/user_profile/user.html | 2 +- askbot/urls.py | 6 +- askbot/views/commands.py | 22 +++-- 9 files changed, 186 insertions(+), 32 deletions(-) diff --git a/askbot/forms.py b/askbot/forms.py index ebb1b519..45b722cc 100644 --- a/askbot/forms.py +++ b/askbot/forms.py @@ -1136,6 +1136,17 @@ class SimpleEmailSubscribeForm(forms.Form): email_settings_form = EFF(initial=EFF.NO_EMAIL_INITIAL) email_settings_form.save(user, save_unbound=True) -class AddUserToGroupForm(forms.Form): +class EditGroupMembershipForm(forms.Form): + """a form for adding or removing users + to and from user groups""" user_id = forms.IntegerField() group_name = forms.CharField() + action = forms.CharField() + + def clean_action(self): + """allowed actions are 'add' and 'remove'""" + action = self.cleaned_data['action'] + if action not in ('add', 'remove'): + del self.cleaned_data['action'] + raise forms.ValidationError('invalid action') + return action diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index bbda51bc..7ad46619 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2174,10 +2174,20 @@ def user_update_wildcard_tag_selections( return new_tags -def user_add_user_to_group(self, user = None, group = None): - """allows one user to add another to a pre-existing group""" - GroupMembership.objects.get_or_create(user = user, group = group) +def user_edit_group_membership(self, user = None, group = None, action = None): + """allows one user to add another to a group + or remove user from group. + If when adding, the group does not exist, it will be created + the delete function is not symmetric, the group will remain + even if it becomes empty + """ + if action == 'add': + GroupMembership.objects.get_or_create(user = user, group = group) + elif action == 'remove': + GroupMembership.objects.get(user = user, group = group).delete() + else: + raise ValueError('invalid action') User.add_to_class( 'add_missing_askbot_subscriptions', @@ -2241,7 +2251,7 @@ User.add_to_class('can_post_comment', user_can_post_comment) User.add_to_class('is_administrator', user_is_administrator) User.add_to_class('is_administrator_or_moderator', user_is_administrator_or_moderator) User.add_to_class('set_admin_status', user_set_admin_status) -User.add_to_class('add_user_to_group', user_add_user_to_group) +User.add_to_class('edit_group_membership', user_edit_group_membership) User.add_to_class('remove_admin_status', user_remove_admin_status) User.add_to_class('is_moderator', user_is_moderator) User.add_to_class('is_approved', user_is_approved) diff --git a/askbot/models/tag.py b/askbot/models/tag.py index 097c2df9..6e92bab9 100644 --- a/askbot/models/tag.py +++ b/askbot/models/tag.py @@ -86,6 +86,11 @@ class TagManager(BaseQuerySetManager): #class GroupTagQuerySet(models.query.QuerySet): # """Custom query set for the group""" # def __init__(self, model): +def clean_group_name(name): + """group names allow spaces, + tag names do not, so we use this method + to replace spaces with dashes""" + return re.sub('\s+', '-', name.strip()) class GroupTagManager(TagManager): """manager for group tags""" @@ -98,7 +103,7 @@ class GroupTagManager(TagManager): #todo: here we might fill out the group profile #replace spaces with dashes - group_name = re.sub('\s+', '-', group_name.strip()) + group_name = clean_group_name(group_name) try: tag = self.get(name = group_name) except self.model.DoesNotExist: @@ -118,6 +123,9 @@ class GroupTagManager(TagManager): member_count__gt = 0 ) + def get_by_name(self, group_name = None): + return self.get(name = clean_group_name(group_name)) + class Tag(models.Model): name = models.CharField(max_length=255, unique=True) created_by = models.ForeignKey(User, related_name='created_tags') diff --git a/askbot/skins/common/media/js/user.js b/askbot/skins/common/media/js/user.js index aed926d1..feab4d27 100644 --- a/askbot/skins/common/media/js/user.js +++ b/askbot/skins/common/media/js/user.js @@ -222,36 +222,114 @@ FollowUser.prototype.toggleState = function(){ /** * @constructor + * @param {string} name */ -GroupsContainer = function(){ +var UserGroup = function(name){ + WrappedElement.call(this); + this._name = name; +}; +inherits(UserGroup, WrappedElement); + +UserGroup.prototype.getDeleteHandler = function(){ + var group_name = this._name; + var me = this; + var groups_container = me._groups_container; + return function(){ + var data = { + user_id: askbot['data']['viewUserId'], + group_name: group_name, + action: 'remove' + }; + $.ajax({ + type: 'POST', + dataType: 'json', + data: data, + cache: false, + url: askbot['urls']['edit_group_membership'], + success: function(){ + groups_container.removeGroup(me); + } + }); + }; +}; + +UserGroup.prototype.getName = function(){ + return this._name; +}; + +UserGroup.prototype.setGroupsContainer = function(container){ + this._groups_container = container; +}; + +UserGroup.prototype.decorate = function(element){ + this._element = element; + this._name = $.trim(element.html()); + var deleter = new DeleteIcon(); + deleter.setHandler(this.getDeleteHandler()); + deleter.setContent('x'); + this._element.append(deleter.getElement()); + this._delete_icon = deleter; +}; + +UserGroup.prototype.createDom = function(){ + var element = this.makeElement('li'); + element.html(this._name + ' '); + this._element = element; + this.decorate(element); +}; + +UserGroup.prototype.dispose = function(){ + this._delete_icon.dispose(); + this._element.remove(); +}; + +/** + * @constructor + */ +var GroupsContainer = function(){ WrappedElement.call(this); }; inherits(GroupsContainer, WrappedElement); GroupsContainer.prototype.decorate = function(element){ this._element = element; - var groups = {}; + var groups = []; + var group_names = []; + var me = this; //collect list of groups $.each(element.find('li'), function(idx, li){ - groups[$(li).html()] = 1; - //var str = $(li).html(); - //var bytes = []; - //for (var i = 0; i -1){ return; } - var group = this.makeElement('li'); - group.html(group_name); - this._element.append(group); + var group = new UserGroup(group_name); + group.setGroupsContainer(this); + this._groups.push(group); + this._group_names.push(group_name); + this._element.append(group.getElement()); }; -GroupAdderWidget = function(){ +GroupsContainer.prototype.removeGroup = function(group){ + var idx = $.inArray(group, this._groups); + if (idx === -1){ + return; + } + this._groups.splice(idx, 1); + this._group_names.splice(idx, 1); + group.dispose(); +}; + +var GroupAdderWidget = function(){ WrappedElement.call(this); this._state = 'display';//display or edit }; @@ -291,14 +369,15 @@ GroupAdderWidget.prototype.getAddGroupHandler = function(){ var group_name = me.getValue(); var data = { group_name: group_name, - user_id: askbot['data']['viewUserId'] + user_id: askbot['data']['viewUserId'], + action: 'add' }; $.ajax({ type: 'POST', dataType: 'json', data: data, cache: false, - url: askbot['urls']['add_user_to_group'], + url: askbot['urls']['edit_group_membership'], success: function(data){ if (data['success'] == true){ me.addGroup(group_name); @@ -358,7 +437,7 @@ GroupAdderWidget.prototype.decorate = function(element){ * @constructor * allows editing user groups */ -UserGroupsEditor = function(){ +var UserGroupsEditor = function(){ WrappedElement.call(this); }; inherits(UserGroupsEditor, WrappedElement); @@ -389,4 +468,3 @@ UserGroupsEditor.prototype.decorate = function(element){ $('#add-group').remove(); } })(); - diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index 9e02b5d4..3a6fbfe5 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -240,6 +240,9 @@ WrappedElement.prototype.setElement = function(element){ WrappedElement.prototype.createDom = function(){ this._element = $('
'); }; +WrappedElement.prototype.decorate = function(element){ + this._element = element; +}; WrappedElement.prototype.getElement = function(){ if (this._element === null){ this.createDom(); @@ -308,6 +311,7 @@ EditLink.prototype.decorate = function(element){ var DeleteIcon = function(title){ SimpleControl.call(this); this._title = title; + this._content = null; }; inherits(DeleteIcon, SimpleControl); @@ -327,8 +331,20 @@ DeleteIcon.prototype.setHandlerInternal = function(){ DeleteIcon.prototype.createDom = function(){ this._element = this.makeElement('span'); this.decorate(this._element); + if (this._content !== null){ + this.setContent(this._content); + } }; +DeleteIcon.prototype.setContent = function(content){ + if (this._element === null){ + this._content = content; + } else { + this._content = content; + this._element.html(content); + } +} + var Tag = function(){ SimpleControl.call(this); this._deletable = false; diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index e63ff373..41e42d68 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -3383,3 +3383,24 @@ body.anon.lang-es { } } } + +/* user groups */ +#user-groups ul { + margin-bottom: 0px; +} +#user-groups .delete-icon { + float: none; + display: inline; + color: #525252; + padding: 0 3px 0 3px; + background: #ccc; + border-radius: 4px; + line-height:inherit; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-border-radius: 4px; +} +#user-groups .delete-icon:hover { + color: white; + background: #b32f2f; +} diff --git a/askbot/skins/default/templates/user_profile/user.html b/askbot/skins/default/templates/user_profile/user.html index f204d338..15e0622a 100644 --- a/askbot/skins/default/templates/user_profile/user.html +++ b/askbot/skins/default/templates/user_profile/user.html @@ -23,7 +23,7 @@ var viewUserID = {{view_user.id}}; askbot['data']['viewUserName'] = '{{ view_user.username }}'; askbot['data']['viewUserId'] = {{view_user.id}}; - askbot['urls']['add_user_to_group'] = '{% url add_user_to_group %}'; + askbot['urls']['edit_group_membership'] = '{% url edit_group_membership %}'; askbot['urls']['get_groups_list'] = '{% url get_groups_list %}'; {% if request.user|can_moderate_user(view_user) %} diff --git a/askbot/urls.py b/askbot/urls.py index 1cc51be3..a920ee6a 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -258,9 +258,9 @@ urlpatterns = patterns('', name='manage_inbox' ), url(#ajax only - r'^add_user_to_group/$', - views.commands.add_user_to_group, - name='add_user_to_group' + r'^edit-group-membership/$', + views.commands.edit_group_membership, + name='edit_group_membership' ), url( r'^feeds/(?P.*)/$', diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 2a7f9a0a..8d0fdda9 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -656,16 +656,16 @@ def read_message(request):#marks message a read @csrf.csrf_exempt @decorators.ajax_only @decorators.post_only -def add_user_to_group(request): +def edit_group_membership(request): if request.user.is_anonymous(): raise exceptions.PermissionDenied() if not request.user.is_administrator_or_moderator(): raise exceptions.PermissionDenied( - _('Only moderators and administrators can assign users to groups') + _('Only moderators and administrators can change user groups') ) - form = forms.AddUserToGroupForm(request.POST) + form = forms.EditGroupMembershipForm(request.POST) if form.is_valid(): group_name = form.cleaned_data['group_name'] user_id = form.cleaned_data['user_id'] @@ -676,8 +676,18 @@ def add_user_to_group(request): 'user with id %d not found' % user_id ) - group_params = {'group_name': group_name, 'user': user} - group = models.Tag.group_tags.get_or_create(**group_params) - request.user.add_user_to_group(user, group) + action = form.cleaned_data['action'] + if action == 'add': + group_params = {'group_name': group_name, 'user': user} + group = models.Tag.group_tags.get_or_create(**group_params) + request.user.edit_group_membership(user, group, 'add') + elif action == 'remove': + try: + group = models.Tag.group_tags.get_by_name(group_name = group_name) + request.user.edit_group_membership(user, group, 'remove') + except models.Tag.DoesNotExist: + raise exceptions.PermissionDenied() + else: + raise exceptions.PermissionDenied() else: raise exceptions.PermissionDenied() -- cgit v1.2.3-1-g7c22 From 95bd090f0f1bbcdd05e1fcbee81d2a5c2569cdc8 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 21 Mar 2012 19:17:54 -0400 Subject: untested fix for posting email with inline attachments --- askbot/lamson_handlers.py | 63 +++++++++++++-------- askbot/models/reply_by_email.py | 13 +++-- askbot/utils/mail.py | 119 ++++++++++++++++++++++------------------ 3 files changed, 116 insertions(+), 79 deletions(-) diff --git a/askbot/lamson_handlers.py b/askbot/lamson_handlers.py index 488d8b12..7e036644 100644 --- a/askbot/lamson_handlers.py +++ b/askbot/lamson_handlers.py @@ -55,6 +55,11 @@ def is_attachment(part): attachment""" return get_disposition(part) == 'attachment' +def is_inline_attachment(part): + """True if part content disposition is + inline""" + return get_disposition(part) == 'inline' + def process_attachment(part): """takes message part and turns it into SimpleUploadedFile object""" att_info = get_attachment_info(part) @@ -73,6 +78,35 @@ def is_body(part): return True return False +def get_part_type(part): + if is_body(part): + return 'body' + elif is_attachment(part): + return 'attachment' + elif is_inline_attacment(part): + return 'inline' + +def get_parts(message): + """returns list of tuples (, ), + where is one of 'body', 'attachment', 'inline' + and - will be in the directly usable form: + * if it is 'body' - then it will be unicode text + * for attachment - it will be django's SimpleUploadedFile instance + + There may be multiple 'body' parts as well as others + usually the body is split when there are inline attachments present. + """ + + parts = list() + for part in message.walk(): + part_type = get_part_type(part) + if part_type == 'body': + part_content = part.body + if part_type in ('attachment', 'inline'): + part_content = format_attachment(part) + parts.append(part_type, part_content) + return parts + def get_body(message): """returns plain text body of the message""" body = message.body() @@ -94,12 +128,10 @@ def get_attachments(message): @route('ask@(host)') @stateless def ASK(message, host = None): - body = get_body(message) - attachments = get_attachments(message) + parts = get_parts(message) from_address = message.From subject = message['Subject']#why lamson does not give it normally? - mail.process_emailed_question(from_address, subject, body, attachments) - + mail.process_emailed_question(from_address, subject, parts) @route('reply-(address)@(host)', address='.+') @stateless @@ -123,26 +155,11 @@ def PROCESS(message, address = None, host = None): address = address, allowed_from_email = message.From ) - separator = _("======= Reply above this line. ====-=-=") - parts = get_body(message).split(separator) - attachments = get_attachments(message) - if len(parts) != 2 : - error = _("Your message was malformed. Please make sure to qoute \ - the original notification you received at the end of your reply.") + parts = get_parts(message) + if reply_address.was_used: + reply_address.edit_post(parts) else: - reply_part = parts[0] - reply_part = '\n'.join(reply_part.splitlines(True)[:-3]) - #the function below actually posts to the forum - if reply_address.was_used: - reply_address.edit_post( - reply_part.strip(), - attachments = attachments - ) - else: - reply_address.create_reply( - reply_part.strip(), - attachments = attachments - ) + reply_address.create_reply(parts) except ReplyAddress.DoesNotExist: error = _("You were replying to an email address\ unknown to the system or you were replying from a different address from the one where you\ diff --git a/askbot/models/reply_by_email.py b/askbot/models/reply_by_email.py index 26c53999..bdf11021 100644 --- a/askbot/models/reply_by_email.py +++ b/askbot/models/reply_by_email.py @@ -10,6 +10,7 @@ from askbot.conf import settings as askbot_settings from askbot.utils import mail class ReplyAddressManager(BaseQuerySetManager): + """A manager for the :class:`ReplyAddress` model""" def get_unused(self, address, allowed_from_email): return self.get( @@ -19,6 +20,7 @@ class ReplyAddressManager(BaseQuerySetManager): ) def create_new(self, post, user): + """creates a new reply address""" reply_address = ReplyAddress( post = post, user = user, @@ -34,6 +36,8 @@ class ReplyAddressManager(BaseQuerySetManager): class ReplyAddress(models.Model): + """Stores a reply address for the post + and the user""" address = models.CharField(max_length = 25, unique = True) post = models.ForeignKey( Post, @@ -60,11 +64,11 @@ class ReplyAddress(models.Model): """True if was used""" return self.used_at != None - def edit_post(self, content, attachments = None): + def edit_post(self, parts): """edits the created post upon repeated response to the same address""" assert self.was_used == True - content += mail.process_attachments(attachments) + content, stored_files = mail.process_parts(parts) self.user.edit_post( post = self.response_post, body_text = content, @@ -72,12 +76,13 @@ class ReplyAddress(models.Model): ) self.response_post.thread.invalidate_cached_data() - def create_reply(self, content, attachments = None): + def create_reply(self, parts): """creates a reply to the post which was emailed to the user """ result = None - content += mail.process_attachments(attachments) + #todo: delete stored files if this function fails + content, stored_files = mail.process_parts(parts) if self.post.post_type == 'answer': result = self.user.post_comment(self.post, content) diff --git a/askbot/utils/mail.py b/askbot/utils/mail.py index e4fb7854..8ea45394 100644 --- a/askbot/utils/mail.py +++ b/askbot/utils/mail.py @@ -7,6 +7,7 @@ import logging from django.core import mail from django.conf import settings as django_settings from django.core.exceptions import PermissionDenied +from django.forms import ValidationError from django.utils.translation import ugettext_lazy as _ from django.utils.translation import string_concat from askbot import exceptions @@ -197,78 +198,92 @@ def bounce_email(email, subject, reason = None, body_text = None): body_text = error_message ) -def process_attachments(attachments): - """saves file attachments and adds - - cheap way of dealing with the attachments - just insert them inline, however it might - be useful to keep track of the uploaded files separately - and deal with them as with resources of their own value""" - if attachments: - content = '' - for att in attachments: - file_storage, file_name, file_url = store_file(att) - chunk = '[%s](%s) ' % (att.name, file_url) - file_extension = os.path.splitext(att.name)[1] - #todo: this is a hack - use content type - if file_extension.lower() in ('.png', '.jpg', '.gif'): - chunk = '\n\n!' + chunk - content += '\n\n' + chunk - return content - else: - return '' +def process_attachment(attachment): + """will save a single + attachment and return + link to file in the markdown format and the + file storage object + """ + file_storage, file_name, file_url = store_file(attachment) + markdown_link = '[%s](%s) ' % (attachment.name, file_url) + file_extension = os.path.splitext(attachment.name)[1] + #todo: this is a hack - use content type + if file_extension.lower() in ('.png', '.jpg', '.jpeg', '.gif'): + return '!' + markdown_link + return markdown_link, file_storage + +def process_parts(parts): + """Process parts will upload the attachments and parse out the + body, if body is multipart. Secondly - links to attachments + will be added to the body of the question. + Returns ready to post body of the message and the list + of uploaded files. + """ + body_markdown = '' + stored_files = list() + attachments_markdown = '' + for part_type, content in parts: + if part_type == 'attachment': + markdown, stored_file = process_attachment(content) + stored_files.append(stored_file) + attachments_markdown += '\n\n' + markdown + elif part_type == 'body': + body_markdown += + '\n\n' + content + elif part_type == 'inline': + markdown, stored_file = process_attachment(content) + stored_files.append(stored_file) + body_markdown += markdown + return body_markdown + attachments_markdown, stored_files -def process_emailed_question(from_address, subject, body, attachments = None): +def process_emailed_question(from_address, subject, parts): """posts question received by email or bounces the message""" #a bunch of imports here, to avoid potential circular import issues from askbot.forms import AskByEmailForm from askbot.models import User - data = { - 'sender': from_address, - 'subject': subject, - 'body_text': body - } - form = AskByEmailForm(data) - if form.is_valid(): - email_address = form.cleaned_data['email'] - try: + + try: + #todo: delete uploaded files when posting by email fails!!! + body, stored_files = process_parts(parts) + data = { + 'sender': from_address, + 'subject': subject, + 'body_text': body + } + form = AskByEmailForm(data) + if form.is_valid(): + email_address = form.cleaned_data['email'] user = User.objects.get( email__iexact = email_address ) - except User.DoesNotExist: - bounce_email(email_address, subject, reason = 'unknown_user') - except User.MultipleObjectsReturned: - bounce_email(email_address, subject, reason = 'problem_posting') + tagnames = form.cleaned_data['tagnames'] + title = form.cleaned_data['title'] + body_text = form.cleaned_data['body_text'] - tagnames = form.cleaned_data['tagnames'] - title = form.cleaned_data['title'] - body_text = form.cleaned_data['body_text'] - - try: - body_text += process_attachments(attachments) user.post_question( title = title, tags = tagnames, body_text = body_text ) - except PermissionDenied, error: - bounce_email( - email_address, - subject, - reason = 'permission_denied', - body_text = unicode(error) - ) - else: - #error_list = list() - #for field_errors in form.errors.values(): - # error_list.extend(field_errors) + else: + raise ValidationError() + except User.DoesNotExist: + bounce_email(email_address, subject, reason = 'unknown_user') + except User.MultipleObjectsReturned: + bounce_email(email_address, subject, reason = 'problem_posting') + except PermissionDenied, error: + bounce_email( + email_address, + subject, + reason = 'permission_denied', + body_text = unicode(error) + ) + except ValidationError: if from_address: bounce_email( from_address, subject, reason = 'problem_posting', - #body_text = '\n*'.join(error_list) ) -- cgit v1.2.3-1-g7c22 From 1dfdf5207ae6ea7c3b181c52e4939e742922eab0 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 21 Mar 2012 21:30:56 -0400 Subject: fixed bugs so that test cases pass --- askbot/const/__init__.py | 2 + askbot/lamson_handlers.py | 4 +- askbot/models/__init__.py | 1 + .../instant_notification_reply_by_email.html | 5 +-- askbot/tests/reply_by_email_tests.py | 46 ++++++++++++++-------- askbot/utils/mail.py | 20 ++++++++-- 6 files changed, 54 insertions(+), 24 deletions(-) diff --git a/askbot/const/__init__.py b/askbot/const/__init__.py index 66e20dae..ecd6df68 100644 --- a/askbot/const/__init__.py +++ b/askbot/const/__init__.py @@ -51,6 +51,8 @@ POST_SORT_METHODS = ( ('relevance-desc', _('relevance')), ) +REPLY_SEPARATOR = '======= Reply above this line. ====-=-=' + ANSWER_SORT_METHODS = (#no translations needed here 'latest', 'oldest', 'votes' ) diff --git a/askbot/lamson_handlers.py b/askbot/lamson_handlers.py index 7e036644..36ee03af 100644 --- a/askbot/lamson_handlers.py +++ b/askbot/lamson_handlers.py @@ -83,7 +83,7 @@ def get_part_type(part): return 'body' elif is_attachment(part): return 'attachment' - elif is_inline_attacment(part): + elif is_inline_attachment(part): return 'inline' def get_parts(message): @@ -104,7 +104,7 @@ def get_parts(message): part_content = part.body if part_type in ('attachment', 'inline'): part_content = format_attachment(part) - parts.append(part_type, part_content) + parts.append((part_type, part_content)) return parts def get_body(message): diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 7ad46619..08153396 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2400,6 +2400,7 @@ def format_instant_notification_email( 'post_url': strip_path(site_url) + post.get_absolute_url(), 'origin_post_title': origin_post.thread.title, 'user_subscriptions_url': user_subscriptions_url, + 'reply_separator': const.REPLY_SEPARATOR } subject_line = _('"%(title)s"') % {'title': origin_post.thread.title} return subject_line, template.render(Context(update_data)) diff --git a/askbot/skins/default/templates/instant_notification_reply_by_email.html b/askbot/skins/default/templates/instant_notification_reply_by_email.html index ffb43110..015a259d 100644 --- a/askbot/skins/default/templates/instant_notification_reply_by_email.html +++ b/askbot/skins/default/templates/instant_notification_reply_by_email.html @@ -1,8 +1,7 @@ {% if can_reply %} {% trans %} -{# Don't change the following line in the template. #} -======= Reply above this line. ====-=-= +{{ reply_separator }} {% endtrans %} {% else %} {% trans %} @@ -11,4 +10,4 @@ you need {{reply_by_email_karma_threshold}} karma, you have {{receiving_user_kar {% endtrans %} {% endif %} -{% include 'instant_notification.html' %} \ No newline at end of file +{% include 'instant_notification.html' %} diff --git a/askbot/tests/reply_by_email_tests.py b/askbot/tests/reply_by_email_tests.py index 5128c9e7..14ea359f 100644 --- a/askbot/tests/reply_by_email_tests.py +++ b/askbot/tests/reply_by_email_tests.py @@ -1,15 +1,31 @@ from django.utils.translation import ugettext as _ from askbot.models import ReplyAddress from askbot.lamson_handlers import PROCESS +from askbot import const from askbot.tests.utils import AskbotTestCase from askbot.models import Post, PostRevision +TEST_CONTENT = 'Test content' +TEST_EMAIL_PARTS = ( + ('body', TEST_CONTENT), +) +TEST_LONG_CONTENT = 'Test content' * 10 +TEST_LONG_EMAIL_PARTS = ( + ('body', TEST_LONG_CONTENT), +) + +class MockPart(object): + def __init__(self, body): + self.body = body + self.content_encoding = {'Content-Type':('text/plain',)} + class MockMessage(object): def __init__(self, body, from_email): self._body = body + self._part = MockPart(body) self.From= from_email def body(self): @@ -17,7 +33,7 @@ class MockMessage(object): def walk(self): """todo: add real file attachment""" - return list() + return [self._part] class EmailProcessingTests(AskbotTestCase): @@ -46,9 +62,11 @@ class EmailProcessingTests(AskbotTestCase): def test_process_correct_answer_comment(self): addr = ReplyAddress.objects.create_new( self.answer, self.u1).address - separator = _("======= Reply above this line. ====-=-=") - msg = MockMessage("This is a test reply \n\nOn such and such someone\ - wrote something \n\n%s\nlorem ipsum "%(separator), "user1@domain.com") + msg = MockMessage( + "This is a test reply \n\nOn such and such someone" + "wrote something \n\n%s\nlorem ipsum " % (const.REPLY_SEPARATOR), + "user1@domain.com" + ) PROCESS(msg, addr, '') self.assertEquals(self.answer.comments.count(), 2) self.assertEquals(self.answer.comments.all().order_by('-pk')[0].text.strip(), "This is a test reply") @@ -86,31 +104,27 @@ class ReplyAddressModelTests(AskbotTestCase): def test_create_answer_reply(self): result = ReplyAddress.objects.create_new( self.answer, self.u1) - post = result.create_reply("A test post") + post = result.create_reply(TEST_EMAIL_PARTS) self.assertEquals(post.post_type, "comment") - self.assertEquals(post.text, "A test post") + self.assertEquals(post.text, TEST_CONTENT) self.assertEquals(self.answer.comments.count(), 2) def test_create_comment_reply(self): result = ReplyAddress.objects.create_new( self.comment, self.u1) - post = result.create_reply("A test reply") + post = result.create_reply(TEST_EMAIL_PARTS) self.assertEquals(post.post_type, "comment") - self.assertEquals(post.text, "A test reply") + self.assertEquals(post.text, TEST_CONTENT) self.assertEquals(self.answer.comments.count(), 2) def test_create_question_comment_reply(self): result = ReplyAddress.objects.create_new( self.question, self.u3) - post = result.create_reply("A test post") + post = result.create_reply(TEST_EMAIL_PARTS) self.assertEquals(post.post_type, "comment") - self.assertEquals(post.text, "A test post") + self.assertEquals(post.text, TEST_CONTENT) def test_create_question_answer_reply(self): result = ReplyAddress.objects.create_new( self.question, self.u3) - post = result.create_reply("A test post "* 10) + post = result.create_reply(TEST_LONG_EMAIL_PARTS) self.assertEquals(post.post_type, "answer") - self.assertEquals(post.text, "A test post "* 10) - - - - + self.assertEquals(post.text, TEST_LONG_CONTENT) diff --git a/askbot/utils/mail.py b/askbot/utils/mail.py index 8ea45394..db09ce6a 100644 --- a/askbot/utils/mail.py +++ b/askbot/utils/mail.py @@ -198,6 +198,15 @@ def bounce_email(email, subject, reason = None, body_text = None): body_text = error_message ) +def extract_reply(text): + """take the part above the separator + and discard the last line above the separator""" + if const.REPLY_SEPARATOR in text: + text = text.split(const.REPLY_SEPARATOR)[0] + return '\n'.join(text.splitlines(True)[:-3]) + else: + return text + def process_attachment(attachment): """will save a single attachment and return @@ -222,19 +231,24 @@ def process_parts(parts): body_markdown = '' stored_files = list() attachments_markdown = '' - for part_type, content in parts: + for (part_type, content) in parts: if part_type == 'attachment': markdown, stored_file = process_attachment(content) stored_files.append(stored_file) attachments_markdown += '\n\n' + markdown elif part_type == 'body': - body_markdown += + '\n\n' + content + body_markdown += '\n\n' + content elif part_type == 'inline': markdown, stored_file = process_attachment(content) stored_files.append(stored_file) body_markdown += markdown - return body_markdown + attachments_markdown, stored_files + #if the response separator is present - + #split the body with it, and discard the "so and so wrote:" part + body_markdown = extract_reply(body_markdown) + + body_markdown += attachments_markdown + return body_markdown.strip(), stored_files def process_emailed_question(from_address, subject, parts): -- cgit v1.2.3-1-g7c22 From 6f26e41983e0049d1bb7e1d473813b529338adcc Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 21 Mar 2012 21:59:03 -0400 Subject: removed unused functions and fixed an undefined symbol error --- askbot/lamson_handlers.py | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/askbot/lamson_handlers.py b/askbot/lamson_handlers.py index 36ee03af..2b223118 100644 --- a/askbot/lamson_handlers.py +++ b/askbot/lamson_handlers.py @@ -60,7 +60,7 @@ def is_inline_attachment(part): inline""" return get_disposition(part) == 'inline' -def process_attachment(part): +def format_attachment(part): """takes message part and turns it into SimpleUploadedFile object""" att_info = get_attachment_info(part) name = att_info.get('filename', None) @@ -107,24 +107,6 @@ def get_parts(message): parts.append((part_type, part_content)) return parts -def get_body(message): - """returns plain text body of the message""" - body = message.body() - if body: - return body - for part in message.walk(): - if is_body(part): - return part.body - -def get_attachments(message): - """returns a list of file attachments - represented by StringIO objects""" - attachments = list() - for part in message.walk(): - if is_attachment(part): - attachments.append(process_attachment(part)) - return attachments - @route('ask@(host)') @stateless def ASK(message, host = None): -- cgit v1.2.3-1-g7c22 From c15b1aca84362a8d4e56dda0602dea8a3d886028 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 21 Mar 2012 22:06:33 -0400 Subject: another bug fix --- askbot/lamson_handlers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/askbot/lamson_handlers.py b/askbot/lamson_handlers.py index 2b223118..541a4708 100644 --- a/askbot/lamson_handlers.py +++ b/askbot/lamson_handlers.py @@ -102,8 +102,10 @@ def get_parts(message): part_type = get_part_type(part) if part_type == 'body': part_content = part.body - if part_type in ('attachment', 'inline'): + elif part_type in ('attachment', 'inline'): part_content = format_attachment(part) + else: + continue parts.append((part_type, part_content)) return parts -- cgit v1.2.3-1-g7c22 From 64da2ab817d115fd750e7657766d60f1f1589f4c Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 21 Mar 2012 22:16:11 -0400 Subject: fixed one more bug --- askbot/utils/mail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/askbot/utils/mail.py b/askbot/utils/mail.py index db09ce6a..dbdb3f13 100644 --- a/askbot/utils/mail.py +++ b/askbot/utils/mail.py @@ -218,7 +218,7 @@ def process_attachment(attachment): file_extension = os.path.splitext(attachment.name)[1] #todo: this is a hack - use content type if file_extension.lower() in ('.png', '.jpg', '.jpeg', '.gif'): - return '!' + markdown_link + markdown_link = '!' + markdown_link return markdown_link, file_storage def process_parts(parts): -- cgit v1.2.3-1-g7c22 From 54271be4a73c04411515cd3d8a09434ac22dde3e Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 21 Mar 2012 22:53:56 -0400 Subject: allowed emails with body() --- askbot/lamson_handlers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/askbot/lamson_handlers.py b/askbot/lamson_handlers.py index 541a4708..5fb758a7 100644 --- a/askbot/lamson_handlers.py +++ b/askbot/lamson_handlers.py @@ -98,6 +98,10 @@ def get_parts(message): """ parts = list() + + if message.body() + parts.append('body', message.body()) + for part in message.walk(): part_type = get_part_type(part) if part_type == 'body': -- cgit v1.2.3-1-g7c22 From f54df0094b31987c90791a82413b9c7bf9cc4ae0 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 21 Mar 2012 23:44:03 -0400 Subject: fixed three more bugs preventing post/reply/edit by email work --- askbot/lamson_handlers.py | 4 ++-- askbot/models/reply_by_email.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/askbot/lamson_handlers.py b/askbot/lamson_handlers.py index 5fb758a7..f121af06 100644 --- a/askbot/lamson_handlers.py +++ b/askbot/lamson_handlers.py @@ -99,8 +99,8 @@ def get_parts(message): parts = list() - if message.body() - parts.append('body', message.body()) + if message.body(): + parts.append(('body', message.body())) for part in message.walk(): part_type = get_part_type(part) diff --git a/askbot/models/reply_by_email.py b/askbot/models/reply_by_email.py index bdf11021..a8769307 100644 --- a/askbot/models/reply_by_email.py +++ b/askbot/models/reply_by_email.py @@ -3,7 +3,7 @@ import random import string from django.db import models from django.contrib.auth.models import User -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from askbot.models.post import Post from askbot.models.base import BaseQuerySetManager from askbot.conf import settings as askbot_settings -- cgit v1.2.3-1-g7c22 From 185f17cd0a8989daff1ae0dd88392c018b557e1f Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 22 Mar 2012 22:24:42 -0400 Subject: first pass on the "threaded" email alert format --- askbot/models/__init__.py | 36 ++++++++++++++++-------------------- askbot/models/post.py | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 08153396..029816af 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2372,22 +2372,18 @@ def format_instant_notification_email( ) #todo: remove hardcoded style else: - from askbot.templatetags.extra_filters_jinja import absolutize_urls_func - content_preview = absolutize_urls_func(post.html) - tag_style = "white-space: nowrap; " \ - + "font-size: 11px; color: #333;" \ - + "background-color: #EEE;" \ - + "border-left: 3px solid #777;" \ - + "border-top: 1px solid #EEE;" \ - + "border-bottom: 1px solid #CCC;" \ - + "border-right: 1px solid #CCC;" \ - + "padding: 1px 8px 1px 8px;" \ - + "margin-right:3px;" - if post.post_type == 'question':#add tags to the question - content_preview += '
' - for tag_name in post.get_tag_names(): - content_preview += '%s' % (tag_style, tag_name) - content_preview += '
' + content_preview = post.format_for_email() + + #add indented summaries for the parent posts + quote_level = 0 + current_post = post + while True: + parent_post = current_post.get_parent_post() + if parent_post is None: + break + quote_level += 1 + content_preview += parent_post.format_for_email(quote_level = quote_level) + current_post = parent_post update_data = { 'update_author_name': from_user.username, @@ -2426,16 +2422,16 @@ def send_instant_notifications_about_activity_in_post( return from askbot.skins.loaders import get_template - template = get_template('instant_notification.html') + if askbot_settings.REPLY_BY_EMAIL: + template = get_template('instant_notification_reply_by_email.html') + else: + template = get_template('instant_notification.html') update_type_map = const.RESPONSE_ACTIVITY_TYPE_MAP_FOR_TEMPLATES update_type = update_type_map[update_activity.activity_type] origin_post = post.get_origin_post() for user in recipients: - - if askbot_settings.REPLY_BY_EMAIL: - template = get_template('instant_notification_reply_by_email.html') subject_line, body_text = format_instant_notification_email( to_user = user, diff --git a/askbot/models/post.py b/askbot/models/post.py index 4ed528ea..1330f8a8 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -540,6 +540,36 @@ class Post(models.Model): """ return html_utils.strip_tags(self.html)[:120] + ' ...' + def format_tags_for_email(self): + """formats tags of the question post for email""" + tag_style = "white-space: nowrap; " \ + + "font-size: 11px; color: #333;" \ + + "background-color: #EEE;" \ + + "border-left: 3px solid #777;" \ + + "border-top: 1px solid #EEE;" \ + + "border-bottom: 1px solid #CCC;" \ + + "border-right: 1px solid #CCC;" \ + + "padding: 1px 8px 1px 8px;" \ + + "margin-right:3px;" + output = '
' + for tag_name in self.get_tag_names(): + output += '%s' % (tag_style, tag_name) + output += '
' + return output + + def format_for_email(self, quote_level = 0): + """format post for the output in email""" + from askbot.templatetags.extra_filters_jinja import absolutize_urls_func + output = absolutize_urls_func(self.html) + if self.post_type == 'question':#add tags to the question + output += self.format_tags_for_email() + quote_style = 'padding-left:5px; border-left: 2px solid #aaa;' + while quote_level > 0: + quote_level = quote_level - 1 + output = '
%s
' % (quote_style, output) + return output + + def set_cached_comments(self, comments): """caches comments in the lifetime of the object does not talk to the actual cache system @@ -965,6 +995,16 @@ class Post(models.Model): def tagname_meta_generator(self): return u','.join([unicode(tag) for tag in self.get_tag_names()]) + def get_parent_post(self): + """returns parent post or None + if there is no parent, as it is in the case of question post""" + if self.post_type == 'comment': + return self.parent + elif self.post_type == 'answer': + return self.get_origin_post() + else: + return None + def get_origin_post(self): if self.post_type == 'question': return self -- cgit v1.2.3-1-g7c22 From e14d3bcb9c45de0872f3b71c7637e371384d22e5 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 22 Mar 2012 23:06:27 -0400 Subject: added a small preamble to each post in the thread in the email response --- askbot/models/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 029816af..089c83a5 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2382,6 +2382,13 @@ def format_instant_notification_email( if parent_post is None: break quote_level += 1 + content_preview += _( + 'In reply to %(user)s %(post)s of %(date)s
' + ) % { + 'user': parent_post.author.username, + 'post': _(parent_post.post_type), + 'date': parent_post.added_at.strftime('%I:%M %p, %d %b %Y') + } content_preview += parent_post.format_for_email(quote_level = quote_level) current_post = parent_post -- cgit v1.2.3-1-g7c22 From b2a17d558830ba644b933f36cbfb29f10db087e9 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 22 Mar 2012 23:17:11 -0400 Subject: added title to the question thread summary in the email --- askbot/models/post.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/askbot/models/post.py b/askbot/models/post.py index 1330f8a8..2f6254a4 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -558,9 +558,15 @@ class Post(models.Model): return output def format_for_email(self, quote_level = 0): - """format post for the output in email""" + """format post for the output in email, + if quote_level > 0, the post will be indented that number of times + """ from askbot.templatetags.extra_filters_jinja import absolutize_urls_func - output = absolutize_urls_func(self.html) + output = '' + if self.post_type == 'question': + output =+ '%s
' % self.thread.title + + output += absolutize_urls_func(self.html) if self.post_type == 'question':#add tags to the question output += self.format_tags_for_email() quote_style = 'padding-left:5px; border-left: 2px solid #aaa;' -- cgit v1.2.3-1-g7c22 From efc6101f165b48f588d47b73fd5cfb355f5816a6 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 23 Mar 2012 00:11:22 -0400 Subject: added second format for the instant notification --- askbot/models/__init__.py | 21 +++++---------------- askbot/models/post.py | 45 +++++++++++++++++++++++++++++++++++++++++++-- askbot/models/question.py | 15 +++++++++++++++ 3 files changed, 63 insertions(+), 18 deletions(-) diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 089c83a5..c5e8c46f 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2375,22 +2375,11 @@ def format_instant_notification_email( content_preview = post.format_for_email() #add indented summaries for the parent posts - quote_level = 0 - current_post = post - while True: - parent_post = current_post.get_parent_post() - if parent_post is None: - break - quote_level += 1 - content_preview += _( - 'In reply to %(user)s %(post)s of %(date)s
' - ) % { - 'user': parent_post.author.username, - 'post': _(parent_post.post_type), - 'date': parent_post.added_at.strftime('%I:%M %p, %d %b %Y') - } - content_preview += parent_post.format_for_email(quote_level = quote_level) - current_post = parent_post + content_preview += post.format_for_email_as_parent_thread_summary() + + content_preview += '======= Full thread summary =======' + + content_preview += post.thread.format_for_email() update_data = { 'update_author_name': from_user.username, diff --git a/askbot/models/post.py b/askbot/models/post.py index 2f6254a4..cd8301b8 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -13,6 +13,7 @@ from django.core import urlresolvers from django.db import models from django.utils import html as html_utils from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext from django.utils.http import urlquote as django_urlquote from django.core import exceptions as django_exceptions from django.core.exceptions import ValidationError @@ -564,7 +565,7 @@ class Post(models.Model): from askbot.templatetags.extra_filters_jinja import absolutize_urls_func output = '' if self.post_type == 'question': - output =+ '%s
' % self.thread.title + output += '%s
' % self.thread.title output += absolutize_urls_func(self.html) if self.post_type == 'question':#add tags to the question @@ -574,7 +575,47 @@ class Post(models.Model): quote_level = quote_level - 1 output = '
%s
' % (quote_style, output) return output - + + def format_for_email_as_parent_thread_summary(self): + """format for email as summary of parent posts + all the way to the original question""" + quote_level = 0 + current_post = self + output = '' + while True: + parent_post = current_post.get_parent_post() + if parent_post is None: + break + quote_level += 1 + output += _( + 'In reply to %(user)s %(post)s of %(date)s
' + ) % { + 'user': parent_post.author.username, + 'post': _(parent_post.post_type), + 'date': parent_post.added_at.strftime('%I:%M %p, %d %b %Y') + } + output += parent_post.format_for_email(quote_level = quote_level) + current_post = parent_post + return output + + def format_for_email_as_subthread(self): + """outputs question or answer and all it's comments + returns empty string for all other post types + """ + if self.post_type in ('question', 'answer'): + output = self.format_for_email() + comments = self.get_cached_comments() + if comments: + comments_heading = ungettext( + '%(count)d comment:', + '%(count)d comments:', + len(comments) + ) % {'count': len(comments)} + output += '

%s

' % comments_heading + for comment in comments: + output += comment.format_for_email(quote_level = 1) + else: + return '' def set_cached_comments(self, comments): """caches comments in the lifetime of the object diff --git a/askbot/models/question.py b/askbot/models/question.py index 8c61385c..2f5884ae 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -9,6 +9,7 @@ from django.core import cache # import cache, not from cache import cache, to b from django.core.urlresolvers import reverse from django.utils.hashcompat import md5_constructor from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext import askbot import askbot.conf @@ -416,6 +417,20 @@ class Thread(models.Model): else: return self.title + def format_for_email(self): + """experimental function: output entire thread for email""" + question, answers, junk = self.get_cached_post_data() + output = question.format_for_email_as_subthread() + if answers: + answer_heading = ungettext( + '%(count)d answer:', + '%(count)d answers:', + len(answers) + ) + output += '

%s

' % answer_heading + for answer in answers: + output += answer.format_for_email_as_subthread() + def tagname_meta_generator(self): return u','.join([unicode(tag) for tag in self.get_tag_names()]) -- cgit v1.2.3-1-g7c22 From de09ca2920edb24f8cedf34b795d5870cd9aeb0a Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 23 Mar 2012 00:23:40 -0400 Subject: fixed bugs to pass the test cases --- askbot/models/post.py | 1 + askbot/models/question.py | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/askbot/models/post.py b/askbot/models/post.py index cd8301b8..0cc7b0ac 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -614,6 +614,7 @@ class Post(models.Model): output += '

%s

' % comments_heading for comment in comments: output += comment.format_for_email(quote_level = 1) + return output else: return '' diff --git a/askbot/models/question.py b/askbot/models/question.py index 2f5884ae..63d6b387 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -426,10 +426,11 @@ class Thread(models.Model): '%(count)d answer:', '%(count)d answers:', len(answers) - ) + ) % {'count': len(answers)} output += '

%s

' % answer_heading for answer in answers: output += answer.format_for_email_as_subthread() + return output def tagname_meta_generator(self): return u','.join([unicode(tag) for tag in self.get_tag_names()]) @@ -480,7 +481,7 @@ class Thread(models.Model): self.invalidate_cached_post_data() self.invalidate_cached_thread_content_fragment() - def get_cached_post_data(self, sort_method = None): + def get_cached_post_data(self, sort_method = 'votes'): """returns cached post data, as calculated by the method get_post_data()""" key = self.get_post_data_cache_key(sort_method) @@ -490,7 +491,7 @@ class Thread(models.Model): cache.cache.set(key, post_data, const.LONG_TIME) return post_data - def get_post_data(self, sort_method = None): + def get_post_data(self, sort_method = 'votes'): """returns question, answers as list and a list of post ids for the given thread the returned posts are pre-stuffed with the comments @@ -499,9 +500,9 @@ class Thread(models.Model): """ thread_posts = self.posts.all().order_by( { - "latest":"-added_at", - "oldest":"added_at", - "votes":"-score" + 'latest':'-added_at', + 'oldest':'added_at', + 'votes':'-score' }[sort_method] ) #1) collect question, answer and comment posts and list of post id's -- cgit v1.2.3-1-g7c22 From ebf0a342cd869e983ab63fe882d4f7ae87778ef8 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 23 Mar 2012 00:58:26 -0400 Subject: added user and date info to the full thread summary in the email response --- askbot/const/__init__.py | 1 + askbot/models/__init__.py | 2 +- askbot/models/post.py | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/askbot/const/__init__.py b/askbot/const/__init__.py index ecd6df68..11fc8655 100644 --- a/askbot/const/__init__.py +++ b/askbot/const/__init__.py @@ -19,6 +19,7 @@ CLOSE_REASONS = ( ) LONG_TIME = 60*60*24*30 #30 days is a lot of time +DATETIME_FORMAT = '%I:%M %p, %d %b %Y' TYPE_REPUTATION = ( (1, 'gain_by_upvoted'), diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index c5e8c46f..6a091db0 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2377,7 +2377,7 @@ def format_instant_notification_email( #add indented summaries for the parent posts content_preview += post.format_for_email_as_parent_thread_summary() - content_preview += '======= Full thread summary =======' + content_preview += '

======= Full thread summary =======

' content_preview += post.thread.format_for_email() diff --git a/askbot/models/post.py b/askbot/models/post.py index 0cc7b0ac..82102e4e 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -592,18 +592,28 @@ class Post(models.Model): ) % { 'user': parent_post.author.username, 'post': _(parent_post.post_type), - 'date': parent_post.added_at.strftime('%I:%M %p, %d %b %Y') + 'date': parent_post.added_at.strftime(const.DATETIME_FORMAT) } output += parent_post.format_for_email(quote_level = quote_level) current_post = parent_post return output + def format_for_email_as_metadata(self): + output = _( + 'Posted by %(user)s on %(date)s' + ) % { + 'user': self.author.username, + 'date': self.added_at.strftime(const.DATETIME_FORMAT) + } + return '

%s

' % output + def format_for_email_as_subthread(self): """outputs question or answer and all it's comments returns empty string for all other post types """ if self.post_type in ('question', 'answer'): - output = self.format_for_email() + output = self.format_for_email_as_metadata() + output += self.format_for_email() comments = self.get_cached_comments() if comments: comments_heading = ungettext( @@ -613,6 +623,7 @@ class Post(models.Model): ) % {'count': len(comments)} output += '

%s

' % comments_heading for comment in comments: + output += comment.format_for_email_as_metadata() output += comment.format_for_email(quote_level = 1) return output else: -- cgit v1.2.3-1-g7c22 From b71ded882d8af28d9d836142a4463b23540a1431 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 23 Mar 2012 02:40:32 -0400 Subject: simplified text of the instant email alert --- askbot/const/__init__.py | 3 +- askbot/models/__init__.py | 50 ++++++++++++++++------ .../default/templates/instant_notification.html | 39 +---------------- .../instant_notification_reply_by_email.html | 13 ------ askbot/tests/reply_by_email_tests.py | 6 ++- askbot/utils/mail.py | 4 +- 6 files changed, 49 insertions(+), 66 deletions(-) delete mode 100644 askbot/skins/default/templates/instant_notification_reply_by_email.html diff --git a/askbot/const/__init__.py b/askbot/const/__init__.py index 11fc8655..9942e27d 100644 --- a/askbot/const/__init__.py +++ b/askbot/const/__init__.py @@ -52,7 +52,8 @@ POST_SORT_METHODS = ( ('relevance-desc', _('relevance')), ) -REPLY_SEPARATOR = '======= Reply above this line. ====-=-=' +REPLY_SEPARATOR_TEMPLATE = '==== %(user_action)s %(instruction)s -=-==' +REPLY_SEPARATOR_REGEX = re.compile('^==== .* -=-==$', re.MULTILINE) ANSWER_SORT_METHODS = (#no translations needed here 'latest', 'oldest', 'votes' diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 6a091db0..8d4432aa 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2381,18 +2381,52 @@ def format_instant_notification_email( content_preview += post.thread.format_for_email() + if post.is_comment(): + if update_type.endswith('update'): + user_action = _('%(user)s edited a %(post_link)s.') + else: + user_action = _('%(user)s posted a %(post_link)s') + elif post.is_answer(): + if update_type.endswith('update'): + user_action = _('%(user)s edited an %(post_link)s.') + else: + user_action = _('%(user)s posted an %(post_link)s.') + elif post.is_question(): + if update_type.endswith('update'): + user_action = _('%(user)s edited a %(post_link)s.') + else: + user_action = _('%(user)s posted a %(post_link)s.') + else: + raise ValueError('unrecognized post type') + + post_url = strip_path(site_url) + post.get_absolute_url(), + user_action = user_action % { + 'user': from_user.username, + 'post_link': '%s' % (post_url, _(post.post_type)) + } + + can_reply = to_user.reputation > askbot_settings.MIN_REP_TO_POST_BY_EMAIL + + if can_reply: + reply_separator = const.REPLY_SEPARATOR_TEMPLATE % { + 'user_action': user_action, + 'instruction': _('To reply, PLEASE WRITE ABOVE THIS LINE.') + } + else: + reply_separator = user_action + update_data = { 'update_author_name': from_user.username, 'receiving_user_name': to_user.username, 'receiving_user_karma': to_user.reputation, 'reply_by_email_karma_threshold': askbot_settings.MIN_REP_TO_POST_BY_EMAIL, - 'can_reply': to_user.reputation > askbot_settings.MIN_REP_TO_POST_BY_EMAIL, + 'can_reply': can_reply, 'content_preview': content_preview,#post.get_snippet() 'update_type': update_type, - 'post_url': strip_path(site_url) + post.get_absolute_url(), + 'post_url': post_url, 'origin_post_title': origin_post.thread.title, 'user_subscriptions_url': user_subscriptions_url, - 'reply_separator': const.REPLY_SEPARATOR + 'reply_separator': reply_separator } subject_line = _('"%(title)s"') % {'title': origin_post.thread.title} return subject_line, template.render(Context(update_data)) @@ -2418,11 +2452,6 @@ def send_instant_notifications_about_activity_in_post( return from askbot.skins.loaders import get_template - if askbot_settings.REPLY_BY_EMAIL: - template = get_template('instant_notification_reply_by_email.html') - else: - template = get_template('instant_notification.html') - update_type_map = const.RESPONSE_ACTIVITY_TYPE_MAP_FOR_TEMPLATES update_type = update_type_map[update_activity.activity_type] @@ -2434,7 +2463,7 @@ def send_instant_notifications_about_activity_in_post( from_user = update_activity.user, post = post, update_type = update_type, - template = template, + template = get_template('instant_notification.html') ) #todo: this could be packaged as an "action" - a bundle @@ -2458,9 +2487,6 @@ def send_instant_notifications_about_activity_in_post( headers = headers ) - - - #todo: move to utils def calculate_gravatar_hash(instance, **kwargs): """Calculates a User's gravatar hash from their email address.""" diff --git a/askbot/skins/default/templates/instant_notification.html b/askbot/skins/default/templates/instant_notification.html index 92799a96..e5cde3a9 100644 --- a/askbot/skins/default/templates/instant_notification.html +++ b/askbot/skins/default/templates/instant_notification.html @@ -1,41 +1,6 @@ -{% trans %}

Dear {{receiving_user_name}},

{% endtrans %} - {% if update_type == 'question_comment' %} -{% trans %} -

{{update_author_name}} left a new comment:

-{% endtrans %} - {% endif %} - {% if update_type == 'answer_comment' %} -{% trans %} -

{{update_author_name}} left a new comment

-{% endtrans %} - {% endif %} - {% if update_type == 'new_answer' %} -{% trans %} -

{{update_author_name}} answered a question -{{origin_post_title}}

-{% endtrans %} - {% endif %} - {% if update_type == 'new_question' %} -{% trans %} -

{{update_author_name}} posted a new question -{{origin_post_title}}

-{% endtrans %} - {% endif %} - {%if update_type == 'answer_update' %} -{% trans %} -

{{update_author_name}} updated an answer to the question -{{origin_post_title}}

-{% endtrans %} - {% endif %} - {% if update_type == 'question_update' %} -{% trans %} -

{{update_author_name}} updated a question -{{origin_post_title}}

-{% endtrans %} - {% endif %} -

-{% trans %} +{{ reply_separator }}
{{content_preview}}
+{% trans %}

Please note - you can easily change how often you receive these notifications or unsubscribe. Thank you for your interest in our forum!

{% endtrans %} diff --git a/askbot/skins/default/templates/instant_notification_reply_by_email.html b/askbot/skins/default/templates/instant_notification_reply_by_email.html deleted file mode 100644 index 015a259d..00000000 --- a/askbot/skins/default/templates/instant_notification_reply_by_email.html +++ /dev/null @@ -1,13 +0,0 @@ - -{% if can_reply %} -{% trans %} -{{ reply_separator }} -{% endtrans %} -{% else %} -{% trans %} -You can post an answer or a comment by replying to email notifications. To do that -you need {{reply_by_email_karma_threshold}} karma, you have {{receiving_user_karma}} karma. -{% endtrans %} -{% endif %} - -{% include 'instant_notification.html' %} diff --git a/askbot/tests/reply_by_email_tests.py b/askbot/tests/reply_by_email_tests.py index 14ea359f..a1272b0d 100644 --- a/askbot/tests/reply_by_email_tests.py +++ b/askbot/tests/reply_by_email_tests.py @@ -62,9 +62,13 @@ class EmailProcessingTests(AskbotTestCase): def test_process_correct_answer_comment(self): addr = ReplyAddress.objects.create_new( self.answer, self.u1).address + reply_separator = const.REPLY_SEPARATOR_TEMPLATE % { + 'user_action': 'john did something', + 'instruction': 'reply above this line' + } msg = MockMessage( "This is a test reply \n\nOn such and such someone" - "wrote something \n\n%s\nlorem ipsum " % (const.REPLY_SEPARATOR), + "wrote something \n\n%s\nlorem ipsum " % (reply_separator), "user1@domain.com" ) PROCESS(msg, addr, '') diff --git a/askbot/utils/mail.py b/askbot/utils/mail.py index dbdb3f13..a09d8e0d 100644 --- a/askbot/utils/mail.py +++ b/askbot/utils/mail.py @@ -201,8 +201,8 @@ def bounce_email(email, subject, reason = None, body_text = None): def extract_reply(text): """take the part above the separator and discard the last line above the separator""" - if const.REPLY_SEPARATOR in text: - text = text.split(const.REPLY_SEPARATOR)[0] + if const.REPLY_SEPARATOR_REGEX.search(text): + text = const.REPLY_SEPARATOR_REGEX.split(text)[0] return '\n'.join(text.splitlines(True)[:-3]) else: return text -- cgit v1.2.3-1-g7c22 From dfd883a85323305e12e9e900796410067fa91240 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 23 Mar 2012 02:49:29 -0400 Subject: hopefully fixed the urls in the email --- askbot/models/__init__.py | 5 +++-- askbot/skins/default/templates/instant_notification.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 8d4432aa..b78864e6 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2399,9 +2399,10 @@ def format_instant_notification_email( else: raise ValueError('unrecognized post type') - post_url = strip_path(site_url) + post.get_absolute_url(), + post_url = strip_path(site_url) + post.get_absolute_url() + user_url = strip_path(site_url) + from_user.get_absolute_url() user_action = user_action % { - 'user': from_user.username, + 'user': '%s' % (user_url, from_user.username), 'post_link': '%s' % (post_url, _(post.post_type)) } diff --git a/askbot/skins/default/templates/instant_notification.html b/askbot/skins/default/templates/instant_notification.html index e5cde3a9..cd6e5427 100644 --- a/askbot/skins/default/templates/instant_notification.html +++ b/askbot/skins/default/templates/instant_notification.html @@ -1,5 +1,5 @@ {{ reply_separator }} -
{{content_preview}}
+
{{ content_preview }}
{% trans %}

Please note - you can easily change how often you receive these notifications or unsubscribe. Thank you for your interest in our forum!

-- cgit v1.2.3-1-g7c22 From 337799fc932f04aa07f32ca6605a353983ec8564 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 23 Mar 2012 03:13:48 -0400 Subject: fixed the regex to split out the email response --- askbot/const/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/askbot/const/__init__.py b/askbot/const/__init__.py index 9942e27d..3fb9ddbb 100644 --- a/askbot/const/__init__.py +++ b/askbot/const/__init__.py @@ -53,7 +53,7 @@ POST_SORT_METHODS = ( ) REPLY_SEPARATOR_TEMPLATE = '==== %(user_action)s %(instruction)s -=-==' -REPLY_SEPARATOR_REGEX = re.compile('^==== .* -=-==$', re.MULTILINE) +REPLY_SEPARATOR_REGEX = re.compile('==== .* -=-==', re.MULTILINE) ANSWER_SORT_METHODS = (#no translations needed here 'latest', 'oldest', 'votes' -- cgit v1.2.3-1-g7c22 From 371c6847b7225d829b3540532c054f7d4db7383a Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Mon, 26 Mar 2012 09:04:14 -0400 Subject: broken commit - in the process of creating group page, group description and the tag wiki facility --- askbot/models/user.py | 9 ++ askbot/skins/common/media/js/post.js | 131 +++++++++++++++++++++ askbot/skins/default/media/style/style.less | 4 + askbot/skins/default/templates/groups.html | 22 ++++ askbot/skins/default/templates/users.html | 42 ++++++- .../skins/default/templates/widgets/meta_nav.html | 8 ++ askbot/urls.py | 23 +++- askbot/views/commands.py | 6 + askbot/views/users.py | 64 ++++++++-- 9 files changed, 292 insertions(+), 17 deletions(-) create mode 100644 askbot/skins/default/templates/groups.html diff --git a/askbot/models/user.py b/askbot/models/user.py index 20861a2a..00b601e8 100644 --- a/askbot/models/user.py +++ b/askbot/models/user.py @@ -346,3 +346,12 @@ class GroupMembership(models.Model): class Meta: app_label = 'askbot' + +class GroupProfile(models.Model): + """stores group profile data""" + group_tag = models.OneToOneField( + Tag, + unique = True, + related_name = 'group_profile' + ) + diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index 1992b635..e1fbe3d2 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -1906,6 +1906,137 @@ QASwapper.prototype.startSwapping = function(){ } }; +/** + * @constructor + */ +var WMD = function(){ + WrappedElement.call(this); +}; +inherits(WMD, WrappedElement); + +WMD.prototype.setEscapeHandler = function(handler){ + this._escape_handler = handler; +}; + +WMD.prototype.setSaveHandler = function(handler){ + this._save_handler = handler; +}; + +WMD.prototype.createDom = function(){ + this._element = this.makeElement(); + + var wmd_buttons = this.makeElement('div') + .attr('id', 'wmd-button-bar') + .setClass('wmd-panel'); + this._element.append(wmd_buttons); + + var editor = this.makeElement('textarea') + .attr('id', 'editor'); + this._element.append(editor); + this._textarea = editor; + + var save_btn = this.makeElement('input') + .attr('type', 'submit') + .attr('value', gettext('Save')); + this._save_btn = save_btn; + this._element.append(save_btn); + + var previewer = this.makeElement('div') + .attr('id', 'previewer') + .setClass('wmd-preview'); + + this._element.append(previewer); +}; + +WMD.prototype.start = function(){ + Attacklab.wmd(); + Attacklab.wmdBase(); + Attacklab.Util.startEditor(); + setupButtonEventHandlers(this._save_btn, this._save_handler); + this._textarea.keyup(27, this._escape_handler); +}; + +/** + * @constructor + */ +var TagWikiEditor = function(){ + WrappedElement.call(this); + this._state = 'display';//'edit' or 'display' + this._content_backup = ''; +}; +inherits(TagWikiEditor, WrappedElement); + +TagWikiEditor.prototype.backupContent = function(){ + this._content_backup = this._content_box.contents(); +}; + +TagWikiEditor.prototype.setContent = function(content){ + this._content_box.empty(); + this._content_box.append(content); +}; + +TagWikiEditor.prototype.restoreContent = function(){ + this._content_box.empty(); + $.each(this._content_backup, function(idx, element){ + this._content_box.append(element); + }); +}; + +TagWikiEditor.prototype.getTagId = function(){ + return this._tag_id; +}; + +TagWikiEditor.prototype.startActivatingEditor = function(){ + var editor = this._editor; + var me = this; + $.ajax({ + type: 'GET', + url: askbot['urls']['load_tag_wiki_text'], + data: {tag_id: me.getTagId()}, + cache: false, + success: function(data){ + me.backupContent(); + editor.setMarkdown(data); + me.setContent(editor.getElement()); + } + }); +}; + +TagWikiEditor.prototype.saveData = function(markdown){ + var me = this; + $.ajax({ + type: 'POST', + dataType: 'json', + url: askbot['urls']['save_tag_wiki_text'], + data: {tag_id: me.getTagId(), text: markdown}, + cache: false, + success: function(data){ + if (data['success']){ + me.setContent(data['html']); + } else { + showMessage(me.getElement(), data['message']); + } + } + }); +}; + +TagWikiEditor.prototype.decorate = function(element){ + //expect
+ this._element = element; + var edit_link = element.find('.edit'); + var editor = new WMD(); + this._edit_link = edit_link; + this._content_box = element.find('.content'); + this._editor = editor; + this._tag_id = element.attr('id').split('-').pop(); + + var me = this; + editor.setEscapeHandler(function(){ me.restoreContent() }); + editor.setSaveHandler(function(markdown){ me.saveData(markdown) }); + + setupButtonEventHandlers(edit_link, function(){ me.startActivatingEditor() }); +}; + $(document).ready(function() { $('[id^="comments-for-"]').each(function(index, element){ var comments = new PostCommentsWidget(); diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 41e42d68..3699d182 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -312,6 +312,10 @@ body.user-messages { .sprites(-125px,-5px) } + #navGroups{ + .sprites(-125px,-5px) + } + #navBadges{ .sprites(-210px,-5px) } diff --git a/askbot/skins/default/templates/groups.html b/askbot/skins/default/templates/groups.html new file mode 100644 index 00000000..9ca49c85 --- /dev/null +++ b/askbot/skins/default/templates/groups.html @@ -0,0 +1,22 @@ +{% extends 'one_column_body.html' %} +{% block title %}{% trans %}Groups{% endtrans %}{% endblock %} +{% block content %} +

{% trans %}Groups{% endtrans %}

+ {% if can_edit %} +

+ {% trans %}Tip: to create a new group - please go to some user profile and add the new group there. That user will be the first member of the group{% endtrans %} +

+ {% endif %} + +{% endblock %} diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html index f2225772..19ce8397 100644 --- a/askbot/skins/default/templates/users.html +++ b/askbot/skins/default/templates/users.html @@ -3,31 +3,37 @@ {% block title %}{% spaceless %}{% trans %}Users{% endtrans %}{% endspaceless %}{% endblock %} {% block content %} -

{% trans %}Users{% endtrans %}

+

+{% if group %} + {% trans name = group.name|escape %}Users in group {{name}}{% endtrans %} +{% else %} + {% trans %}Users{% endtrans %} +{% endif %} +

{% trans %}Sort by »{% endtrans %} {% trans %}karma{% endtrans %} {% trans %}recent{% endtrans %} {% trans %}oldest{% endtrans %} {% trans %}by username{% endtrans %} @@ -42,15 +48,41 @@ {% trans %}Nothing found.{% endtrans %} {% endif %}

+
+
+ {% if group.tag_wiki %} + {{ group.tag_wiki.html }} + {% endif %} +
+ {% if request.user.is_authenticated() and request.user.is_administrator_or_moderator() %} + + {% trans %}edit group description{% endtrans %} + + {% endif %} +
{{ macros.user_list(users.object_list) }}
{{ macros.paginator(paginator_context) }}
{% endblock %} {% block endjs %} + + + + + {%- endmacro -%} -{%- macro post_contributor_avatar_and_credentials(post, user) -%} +{%- macro post_contributor_avatar_and_credentials(post, user, karma_mode = None, badges_mode = None) -%} {% if post.is_anonymous %} {% trans %}anonymous user{% endtrans %}

{{ user.get_anonymous_name() }}

{% else %} {{ gravatar(user, 32) }} {{ user.get_profile_link()}}{{ user_country_flag(user) }}
- {{ user_score_and_badge_summary(user) }}
+ {{ user_score_and_badge_summary(user, karma_mode = karma_mode, badges_mode = badges_mode) }}
{{ user_website_link(user) }} {% endif %} {%- endmacro -%} -{%- macro post_last_updater_and_creator_info(post, min_rep_to_edit_wiki) -%} - {{ post_contributor_info(post, "original_author", post.wiki, min_rep_to_edit_wiki) }} - {{ post_contributor_info(post, "last_updater", post.wiki, min_rep_to_edit_wiki) }} +{%- macro post_last_updater_and_creator_info( + post, min_rep_to_edit_wiki, karma_mode = None, badges_mode = None + ) -%} + {{ post_contributor_info( + post, "original_author", post.wiki, min_rep_to_edit_wiki, + karma_mode = karma_mode, badges_mode = badges_mode + ) + }} + {{ post_contributor_info( + post, "last_updater", post.wiki, min_rep_to_edit_wiki, + karma_mode = karma_mode, badges_mode = badges_mode + ) + }} {%- endmacro -%} -{%- macro post_contributor_info(post, contributor_type, is_wiki, wiki_min_rep) -%} +{%- macro post_contributor_info( + post, contributor_type, is_wiki, wiki_min_rep, + karma_mode = None, badges_mode = None + ) -%} {# there is a whole bunch of trickery here, probably indicative of poor design of the data or methods on data objects #} {% if contributor_type=="original_author" %} @@ -97,7 +110,9 @@ poor design of the data or methods on data objects #} {{post.added_at|diff_date}} {% endif %}

- {{ post_contributor_avatar_and_credentials(post, post.author) }} + {{ post_contributor_avatar_and_credentials( + post, post.author, karma_mode = karma_mode, badges_mode = badges_mode + ) }} {% endif %}
{% elif contributor_type=="last_updater" %} @@ -122,7 +137,12 @@ poor design of the data or methods on data objects #} >{% trans %}updated{% endtrans %} {{ last_edited_at|diff_date }}

{% if original_author != update_author or is_wiki %} - {{ post_contributor_avatar_and_credentials(post, update_author) }} + {{ + post_contributor_avatar_and_credentials( + post, update_author, + karma_mode = karma_mode, badges_mode = badges_mode + ) + }} {% endif %}
{% endif %} @@ -422,7 +442,11 @@ for the purposes of the AJAX comment editor #} answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_id==question.author_id %} answered-by-owner{% endif %} {% if answer.deleted %}deleted{% endif -%} {%- endmacro -%} -{%- macro user_score_and_badge_summary(user) -%} +{%- macro user_score_and_badge_summary( + user, + karma_mode = None, + badges_mode = None +) -%} {%include "widgets/user_score_and_badge_summary.html"%} {%- endmacro -%} @@ -457,7 +481,7 @@ answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_ {% endif %} {%- endmacro -%} -{%- macro user_long_score_and_badge_summary(user) -%} +{%- macro user_long_score_and_badge_summary(user, badges_mode = None) -%} {% include "widgets/user_long_score_and_badge_summary.html" %} {%- endmacro -%} @@ -491,7 +515,10 @@ answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_ {{ user_country_name_and_flag(user) }} {%- endmacro -%} -{%- macro user_list(users, profile_section = None) -%} +{%- macro user_list( + users, profile_section = None, karma_mode = None, badges_mode = None + ) +-%} {% include "widgets/user_list.html"%} {%- endmacro -%} diff --git a/askbot/skins/default/templates/user_profile/user_info.html b/askbot/skins/default/templates/user_profile/user_info.html index 6d286c0a..1c421e9e 100644 --- a/askbot/skins/default/templates/user_profile/user_info.html +++ b/askbot/skins/default/templates/user_profile/user_info.html @@ -21,8 +21,10 @@ {% endif %} {% endif %}
-
{{view_user.reputation|intcomma}}
-

{% trans %}karma{% endtrans %}

+ {% if can_show_karma %} +
{{view_user.reputation|intcomma}}
+

{% trans %}karma{% endtrans %}

+ {% endif %} {% if user_follow_feature_on %} {{ macros.follow_user_toggle(visitor = request.user, subject = view_user) }} {% endif %} diff --git a/askbot/skins/default/templates/user_profile/user_network.html b/askbot/skins/default/templates/user_profile/user_network.html index 1fd2e06a..e6134e0c 100644 --- a/askbot/skins/default/templates/user_profile/user_network.html +++ b/askbot/skins/default/templates/user_profile/user_network.html @@ -8,11 +8,25 @@ {% if followed_users or followers %} {% if followers %}

{% trans count=followers|length %}Followed by {{count}} person{% pluralize count %}Followed by {{count}} people{% endtrans %}

- {{ macros.user_list(followers, profile_section = 'network') }} + {{ + macros.user_list( + followers, + profile_section = 'network', + karma_mode = settings.KARMA_MODE, + badges_mode = settings.BADGES_MODE + ) + }} {% endif %} {% if followed_users %}

{% trans count=followed_users|length %}Following {{count}} person{% pluralize count %}Following {{count}} people{% endtrans %}

- {{ macros.user_list(followed_users, profile_section = 'network') }} + {{ + macros.user_list( + followed_users, + profile_section = 'network', + karma_mode = settings.KARMA_MODE, + badges_mode = settings.BADGES_MODE + ) + }} {% endif %} {% else %} {% if request.user == view_user %} diff --git a/askbot/skins/default/templates/user_profile/user_stats.html b/askbot/skins/default/templates/user_profile/user_stats.html index 50f9e32e..6a1180ed 100644 --- a/askbot/skins/default/templates/user_profile/user_stats.html +++ b/askbot/skins/default/templates/user_profile/user_stats.html @@ -110,6 +110,7 @@ + {% if settings.BADGES_MODE == 'public' %} {% spaceless %}

{% trans counter=total_badges %}{{counter}} Badge{% pluralize %}{{counter}} Badges{% endtrans %}

@@ -149,5 +150,6 @@ + {% endif %} {% endblock %} diff --git a/askbot/skins/default/templates/user_profile/user_tabs.html b/askbot/skins/default/templates/user_profile/user_tabs.html index e6aead31..b8c56479 100644 --- a/askbot/skins/default/templates/user_profile/user_tabs.html +++ b/askbot/skins/default/templates/user_profile/user_tabs.html @@ -17,10 +17,12 @@ href="{% url user_profile view_user.id, view_user.username|slugify %}?sort=network" >{% trans %}network{% endtrans %} {% endif %} + {% if can_show_karma %} {% trans %}karma{% endtrans %} + {% endif %} -
+
{% trans %}Sort by »{% endtrans %} + {% if settings.KARMA_MODE == 'public' %} {% trans %}karma{% endtrans %} + {% endif %} {% endif %}
-{{ macros.user_list(users.object_list) }} +{{ macros.user_list( + users.object_list, + karma_mode = settings.KARMA_MODE, badges_mode = settings.BADGES_MODE + ) +}}
{{ macros.paginator(paginator_context) }}
diff --git a/askbot/skins/default/templates/widgets/meta_nav.html b/askbot/skins/default/templates/widgets/meta_nav.html index c239113c..1b28c787 100644 --- a/askbot/skins/default/templates/widgets/meta_nav.html +++ b/askbot/skins/default/templates/widgets/meta_nav.html @@ -16,8 +16,10 @@ >{% trans %}groups{% endtrans %} {% endif %} +{% if settings.BADGES_MODE == 'public' %} {% trans %}badges{% endtrans %} +{% endif %} diff --git a/askbot/skins/default/templates/widgets/user_list.html b/askbot/skins/default/templates/widgets/user_list.html index 7874946b..11f2ed50 100644 --- a/askbot/skins/default/templates/widgets/user_list.html +++ b/askbot/skins/default/templates/widgets/user_list.html @@ -8,7 +8,13 @@
  • {{ gravatar(user, 32) }}
  • {{user.username}}{{ user_country_flag(user) }}
    • -
  • {{ user_score_and_badge_summary(user) }}
    • +
  • {{ + user_score_and_badge_summary( + user, + karma_mode = karma_mode, + badges_mode = badges_mode + ) + }}
{% if loop.index is divisibleby 7 %} diff --git a/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html b/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html index 121ae48f..da9474fc 100644 --- a/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html +++ b/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html @@ -1,21 +1,23 @@ {% trans %}karma:{% endtrans %} {{user.reputation}} -{%- if user.gold or user.silver or user.bronze %} -{% trans %}badges:{% endtrans %} - {% if user.gold %} - ● - {{user.gold}} - {% endif %} - {% if user.silver %} - ● - {{user.silver}} - {% endif %} - {% if user.bronze %} - ● - {{user.bronze}} +{% if badges_mode == 'public' %} + {%- if user.gold or user.silver or user.bronze %} + {% trans %}badges:{% endtrans %} + {% if user.gold %} + ● + {{user.gold}} + {% endif %} + {% if user.silver %} + ● + {{user.silver}} + {% endif %} + {% if user.bronze %} + ● + {{user.bronze}} + {%- endif -%} + {%- endif -%} - -{%- endif -%} +{% endif %} diff --git a/askbot/skins/default/templates/widgets/user_navigation.html b/askbot/skins/default/templates/widgets/user_navigation.html index e79a482e..e1e445e4 100644 --- a/askbot/skins/default/templates/widgets/user_navigation.html +++ b/askbot/skins/default/templates/widgets/user_navigation.html @@ -3,7 +3,11 @@ {% if settings.USE_ASKBOT_LOGIN_SYSTEM %} {% trans %}sign out{% endtrans %} diff --git a/askbot/skins/default/templates/widgets/user_score_and_badge_summary.html b/askbot/skins/default/templates/widgets/user_score_and_badge_summary.html index 2f55b202..80d140db 100644 --- a/askbot/skins/default/templates/widgets/user_score_and_badge_summary.html +++ b/askbot/skins/default/templates/widgets/user_score_and_badge_summary.html @@ -1,19 +1,23 @@ +{% if karma_mode == 'public' %} {{user.reputation}} -{% if user.gold or user.silver or user.bronze %} - - {% if user.gold %} - ● - {{user.gold}} - {% endif %} - {% if user.silver %} - ● - {{user.silver}} - {% endif %} - {% if user.bronze %} - ● - {{user.bronze}} +{% endif %} +{% if badges_mode == 'public' %} + {% if user.gold or user.silver or user.bronze %} + + {% if user.gold %} + ● + {{user.gold}} + {% endif %} + {% if user.silver %} + ● + {{user.silver}} + {% endif %} + {% if user.bronze %} + ● + {{user.bronze}} + {% endif %} + {% endif %} - {% endif %} diff --git a/askbot/views/meta.py b/askbot/views/meta.py index b2f09cf4..f288e3fe 100644 --- a/askbot/views/meta.py +++ b/askbot/views/meta.py @@ -104,6 +104,8 @@ def privacy(request): def badges(request):#user status/reputation system #todo: supplement database data with the stuff from badges.py + if askbot_settings.BADGES_MODE != 'public': + raise Http404 known_badges = badge_data.BADGES.keys() badges = BadgeData.objects.filter(slug__in = known_badges).order_by('slug') my_badges = [] diff --git a/askbot/views/users.py b/askbot/views/users.py index bcc6e189..11b36b91 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -86,7 +86,11 @@ def users(request, by_group = False, group_id = None, group_slug = None): is_paginated = True + sortby = request.GET.get('sort', 'reputation') + if askbot_settings.KARMA_MODE == 'private' and sortby == 'reputation': + sortby = 'newest' + suser = request.REQUEST.get('query', "") try: page = int(request.GET.get('page', '1')) @@ -832,6 +836,18 @@ def user(request, id, slug=None, tab_name=None): if not tab_name: tab_name = request.GET.get('sort', 'stats') + if askbot_settings.KARMA_MODE == 'public': + can_show_karma = True + else: + if request.user.is_administrator_or_moderator() \ + or request.user == profile_owner: + can_show_karma = True + else: + can_show_karma = False + + if can_show_karma == False and tab_name == 'reputation': + raise Http404 + user_view_func = USER_VIEW_CALL_TABLE.get(tab_name, user_stats) search_state = SearchState( # Non-default SearchState with user data set @@ -846,6 +862,7 @@ def user(request, id, slug=None, tab_name=None): context = { 'view_user': profile_owner, + 'can_show_karma': can_show_karma, 'search_state': search_state, 'user_follow_feature_on': ('followit' in django_settings.INSTALLED_APPS), } -- cgit v1.2.3-1-g7c22 From 16be92eaae3e04162bc5b44bdb4be848cb12587c Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 30 Mar 2012 01:29:28 -0400 Subject: group logo can be saved and displayed --- askbot/forms.py | 5 + ...le_logo_url__add_unique_emailfeedsetting_sub.py | 304 +++++++++++++++++++++ askbot/models/tag.py | 3 + askbot/models/user.py | 6 +- askbot/skins/common/media/js/post.js | 113 ++++++-- askbot/skins/default/templates/users.html | 61 ++++- askbot/urls.py | 5 + askbot/utils/file_utils.py | 3 +- askbot/views/commands.py | 23 ++ askbot/views/writers.py | 10 +- 10 files changed, 491 insertions(+), 42 deletions(-) create mode 100644 askbot/migrations/0116_auto__add_field_groupprofile_logo_url__add_unique_emailfeedsetting_sub.py diff --git a/askbot/forms.py b/askbot/forms.py index ca0d18bd..f71a5520 100644 --- a/askbot/forms.py +++ b/askbot/forms.py @@ -1140,6 +1140,11 @@ class SimpleEmailSubscribeForm(forms.Form): email_settings_form = EFF(initial=EFF.NO_EMAIL_INITIAL) email_settings_form.save(user, save_unbound=True) +class GroupLogoURLForm(forms.Form): + """form for saving group logo url""" + group_id = forms.IntegerField() + image_url = forms.CharField() + class EditGroupMembershipForm(forms.Form): """a form for adding or removing users to and from user groups""" diff --git a/askbot/migrations/0116_auto__add_field_groupprofile_logo_url__add_unique_emailfeedsetting_sub.py b/askbot/migrations/0116_auto__add_field_groupprofile_logo_url__add_unique_emailfeedsetting_sub.py new file mode 100644 index 00000000..12f123b3 --- /dev/null +++ b/askbot/migrations/0116_auto__add_field_groupprofile_logo_url__add_unique_emailfeedsetting_sub.py @@ -0,0 +1,304 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'GroupProfile.logo_url' + db.add_column('askbot_groupprofile', 'logo_url', + self.gf('django.db.models.fields.URLField')(max_length=200, null=True), + keep_default=False) + + # Adding unique constraint on 'EmailFeedSetting', fields ['subscriber', 'feed_type'] + db.create_unique('askbot_emailfeedsetting', ['subscriber_id', 'feed_type']) + + def backwards(self, orm): + # Removing unique constraint on 'EmailFeedSetting', fields ['subscriber', 'feed_type'] + db.delete_unique('askbot_emailfeedsetting', ['subscriber_id', 'feed_type']) + + # Deleting field 'GroupProfile.logo_url' + db.delete_column('askbot_groupprofile', 'logo_url') + + models = { + 'askbot.activity': { + 'Meta': {'object_name': 'Activity', 'db_table': "u'activity'"}, + 'active_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'activity_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_auditted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True'}), + 'receiving_users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'received_activity'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'incoming_activity'", 'symmetrical': 'False', 'through': "orm['askbot.ActivityAuditStatus']", 'to': "orm['auth.User']"}), + 'summary': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.activityauditstatus': { + 'Meta': {'unique_together': "(('user', 'activity'),)", 'object_name': 'ActivityAuditStatus'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Activity']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.anonymousanswer': { + 'Meta': {'object_name': 'AnonymousAnswer'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'anonymous_answers'", 'to': "orm['askbot.Post']"}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.anonymousquestion': { + 'Meta': {'object_name': 'AnonymousQuestion'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.award': { + 'Meta': {'object_name': 'Award', 'db_table': "u'award'"}, + 'awarded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'badge': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_badge'", 'to': "orm['askbot.BadgeData']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'notified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_user'", 'to': "orm['auth.User']"}) + }, + 'askbot.badgedata': { + 'Meta': {'ordering': "('slug',)", 'object_name': 'BadgeData'}, + 'awarded_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'awarded_to': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'badges'", 'symmetrical': 'False', 'through': "orm['askbot.Award']", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) + }, + 'askbot.emailfeedsetting': { + 'Meta': {'unique_together': "(('subscriber', 'feed_type'),)", 'object_name': 'EmailFeedSetting'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'feed_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'frequency': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '8'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reported_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'subscriber': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notification_subscriptions'", 'to': "orm['auth.User']"}) + }, + 'askbot.favoritequestion': { + 'Meta': {'object_name': 'FavoriteQuestion', 'db_table': "u'favorite_question'"}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Thread']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_favorite_questions'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupmembership': { + 'Meta': {'object_name': 'GroupMembership'}, + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_memberships'", 'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_memberships'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupprofile': { + 'Meta': {'object_name': 'GroupProfile'}, + 'group_tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'group_profile'", 'unique': 'True', 'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'logo_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}) + }, + 'askbot.markedtag': { + 'Meta': {'object_name': 'MarkedTag'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reason': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_selections'", 'to': "orm['askbot.Tag']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tag_selections'", 'to': "orm['auth.User']"}) + }, + 'askbot.post': { + 'Meta': {'object_name': 'Post'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'posts'", 'to': "orm['auth.User']"}), + 'comment_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'html': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_edited_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'last_edited_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_edited_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'locked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'locked_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'locked_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locked_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'offensive_flag_count': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'old_answer_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_comment_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_question_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'post_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'posts'", 'null': 'True', 'blank': 'True', 'to': "orm['askbot.Thread']"}), + 'vote_down_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'vote_up_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'wikified_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}) + }, + 'askbot.postrevision': { + 'Meta': {'ordering': "('-revision',)", 'unique_together': "(('post', 'revision'),)", 'object_name': 'PostRevision'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'postrevisions'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisions'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'revised_at': ('django.db.models.fields.DateTimeField', [], {}), + 'revision': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'revision_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '125', 'blank': 'True'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '300', 'blank': 'True'}) + }, + 'askbot.questionview': { + 'Meta': {'object_name': 'QuestionView'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'viewed'", 'to': "orm['askbot.Post']"}), + 'when': ('django.db.models.fields.DateTimeField', [], {}), + 'who': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'question_views'", 'to': "orm['auth.User']"}) + }, + 'askbot.replyaddress': { + 'Meta': {'object_name': 'ReplyAddress'}, + 'address': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '25'}), + 'allowed_from_email': ('django.db.models.fields.EmailField', [], {'max_length': '150'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reply_addresses'", 'to': "orm['askbot.Post']"}), + 'response_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'edit_addresses'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.repute': { + 'Meta': {'object_name': 'Repute', 'db_table': "u'repute'"}, + 'comment': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'negative': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'positive': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'reputation_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'reputed_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.tag': { + 'Meta': {'ordering': "('-used_count', 'name')", 'object_name': 'Tag', 'db_table': "u'tag'"}, + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_tags'", 'to': "orm['auth.User']"}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_tags'", 'null': 'True', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'tag_wiki': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'described_tag'", 'unique': 'True', 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.thread': { + 'Meta': {'object_name': 'Thread'}, + 'accepted_answer': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'answer_accepted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'answer_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'close_reason': ('django.db.models.fields.SmallIntegerField', [], {'null': 'True', 'blank': 'True'}), + 'closed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'closed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'closed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'favorited_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'unused_favorite_threads'", 'symmetrical': 'False', 'through': "orm['askbot.FavoriteQuestion']", 'to': "orm['auth.User']"}), + 'favourite_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'followed_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'followed_threads'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_activity_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_activity_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'unused_last_active_in_threads'", 'to': "orm['auth.User']"}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'threads'", 'symmetrical': 'False', 'to': "orm['askbot.Tag']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'view_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.vote': { + 'Meta': {'unique_together': "(('user', 'voted_post'),)", 'object_name': 'Vote', 'db_table': "u'vote'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['auth.User']"}), + 'vote': ('django.db.models.fields.SmallIntegerField', [], {}), + 'voted_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'voted_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['askbot.Post']"}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}), + 'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}), + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), + 'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}), + 'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), + 'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['askbot'] \ No newline at end of file diff --git a/askbot/models/tag.py b/askbot/models/tag.py index 6e92bab9..06171067 100644 --- a/askbot/models/tag.py +++ b/askbot/models/tag.py @@ -109,6 +109,9 @@ class GroupTagManager(TagManager): except self.model.DoesNotExist: tag = self.model(name = group_name, created_by = user) tag.save() + from askbot.models.user import GroupProfile + group_profile = GroupProfile(group_tag = tag) + group_profile.save() return tag #todo: maybe move this to query set diff --git a/askbot/models/user.py b/askbot/models/user.py index f0d1994e..4127bb64 100644 --- a/askbot/models/user.py +++ b/askbot/models/user.py @@ -292,6 +292,8 @@ class EmailFeedSetting(models.Model): class Meta: #added to make account merges work properly unique_together = ('subscriber', 'feed_type') + app_label = 'askbot' + def __str__(self): if self.reported_at is None: @@ -332,9 +334,6 @@ class EmailFeedSetting(models.Model): self.reported_at = datetime.datetime.now() self.save() - class Meta: - app_label = 'askbot' - class GroupMembership(models.Model): """an explicit model to link users and the tags @@ -354,6 +353,7 @@ class GroupProfile(models.Model): unique = True, related_name = 'group_profile' ) + logo_url = models.URLField(null = True) class Meta: app_label = 'askbot' diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index 17e95455..bf5d539a 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -1965,31 +1965,6 @@ WMD.prototype.getMarkdown = function(){ }; WMD.prototype.start = function(){ - Attacklab.loadEnv = function() - { - var mergeEnv = function(env) - { - if(!env) - { - return; - } - - for(var key in env) - { - Attacklab.wmd_env[key] = env[key]; - } - }; - - mergeEnv(Attacklab.wmd_defaults); - mergeEnv(Attacklab.account_options); - mergeEnv(top["wmd_options"]); - Attacklab.full = true; - - var defaultButtons = "bold italic link blockquote code image ol ul heading hr"; - Attacklab.wmd_env.buttons = Attacklab.wmd_env.buttons || defaultButtons; - }; - Attacklab.loadEnv(); - Attacklab.wmdBase(); Attacklab.Util.startEditor(); setupButtonEventHandlers(this._save_btn, this._save_handler); this._textarea.keyup(makeKeyHandler(27, this._escape_handler)); @@ -2082,6 +2057,94 @@ TagWikiEditor.prototype.decorate = function(element){ setupButtonEventHandlers(edit_link, function(){ me.startActivatingEditor() }); }; +var ImageChanger = function(){ + WrappedElement.call(this); + this._image_element = undefined; +}; +inherits(ImageChanger, WrappedElement); + +ImageChanger.prototype.setImageElement = function(image_element){ + this._image_element = image_element; +}; + +ImageChanger.prototype.setSaveUrl = function(url){ + this._save_url = url; +}; + +ImageChanger.prototype.setAjaxData = function(data){ + this._ajax_data = data; +}; + +ImageChanger.prototype.showImage = function(image_url){ + this._image_element.attr('src', image_url); +}; + +ImageChanger.prototype.saveImageUrl = function(image_url){ + var me = this; + var data = this._ajax_data; + data['image_url'] = image_url; + var save_url = this._save_url; + $.ajax({ + type: 'POST', + dataType: 'json', + url: save_url, + data: data, + cache: false, + success: function(data){ + if (!data['success']){ + showMessage(me.getElement(), data['message'], 'after'); + } + } + }); +}; + +ImageChanger.prototype.startDialog = function(){ + //reusing the wmd's file uploader + var me = this; + Attacklab.Util.prompt( + "

" + gettext('enter the logo url') + '

', + 'http://', + function(image_url){ + me.saveImageUrl(image_url); + me.showImage(image_url); + }, + 'image' + ); +}; + +/** + * decorates an element that will serve as the image changer button + */ +ImageChanger.prototype.decorate = function(element){ + this._element = element; + var me = this; + setupButtonEventHandlers( + element, + function(){ + me.startDialog(); + } + ); +}; + +var UserGroupProfileEditor = function(){ + TagWikiEditor.call(this); +}; +inherits(UserGroupProfileEditor, TagWikiEditor); + +UserGroupProfileEditor.prototype.decorate = function(element){ + UserGroupProfileEditor.superClass_.decorate.call(this, element); + var change_logo_btn = element.find('.change_logo'); + this._change_logo_btn = change_logo_btn; + + var logo_changer = new ImageChanger(); + logo_changer.setImageElement(element.find('.group-logo')); + logo_changer.setAjaxData({ + group_id: this.getTagId() + }); + logo_changer.setSaveUrl(askbot['urls']['save_group_logo_url']); + logo_changer.decorate(change_logo_btn); +}; + $(document).ready(function() { $('[id^="comments-for-"]').each(function(index, element){ var comments = new PostCommentsWidget(); diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html index 6ad2d77c..557c1a77 100644 --- a/askbot/skins/default/templates/users.html +++ b/askbot/skins/default/templates/users.html @@ -50,18 +50,28 @@ {% trans %}Nothing found.{% endtrans %} {% endif %}

-
-
- {% if group.tag_wiki %} - {{ group.tag_wiki.html }} +{% if group %} +
+ +
+ {% if group.tag_wiki %} + {{ group.tag_wiki.html }} + {% endif %} +
+ {% if request.user.is_authenticated() and request.user.is_administrator_or_moderator() %} + + {% trans %}edit group description{% endtrans %} + + {% endif %}
- {% if request.user.is_authenticated() and request.user.is_administrator_or_moderator() %} - - {% trans %}edit group description{% endtrans %} - - {% endif %} -
+{% endif %} {{ macros.user_list( users.object_list, karma_mode = settings.KARMA_MODE, badges_mode = settings.BADGES_MODE @@ -75,9 +85,12 @@ + @@ -86,7 +99,33 @@ //todo move javascript out $().ready(function(){ if (askbot['data']['userIsAdminOrMod'] === true){ - var group_editor = new TagWikiEditor(); + //todo: this is kind of Attacklab.init ... should not be here + Attacklab.loadEnv = function() + { + var mergeEnv = function(env) + { + if(!env) + { + return; + } + + for(var key in env) + { + Attacklab.wmd_env[key] = env[key]; + } + }; + + mergeEnv(Attacklab.wmd_defaults); + mergeEnv(Attacklab.account_options); + mergeEnv(top["wmd_options"]); + Attacklab.full = true; + + var defaultButtons = "bold italic link blockquote code image ol ul heading hr"; + Attacklab.wmd_env.buttons = Attacklab.wmd_env.buttons || defaultButtons; + }; + Attacklab.loadEnv(); + Attacklab.wmdBase(); + var group_editor = new UserGroupProfileEditor(); group_editor.decorate($('#group-wiki-{{group.id}}')); } Hilite.exact = false; diff --git a/askbot/urls.py b/askbot/urls.py index 9a68e646..9d444e8d 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -202,6 +202,11 @@ urlpatterns = patterns('', views.commands.save_tag_wiki_text, name = 'save_tag_wiki_text' ), + url(#ajax only + r'^save-group-logo-url/', + views.commands.save_group_logo_url, + name = 'save_group_logo_url' + ), url( r'^get-groups-list/', views.commands.get_groups_list, diff --git a/askbot/utils/file_utils.py b/askbot/utils/file_utils.py index daca1522..3793b5ce 100644 --- a/askbot/utils/file_utils.py +++ b/askbot/utils/file_utils.py @@ -5,7 +5,7 @@ import time import urlparse from django.core.files.storage import get_storage_class -def store_file(file_object): +def store_file(file_object, file_name_prefix = ''): """Creates an instance of django's file storage object based on the file-like object, returns the storage object, file name, file url @@ -16,6 +16,7 @@ def store_file(file_object): '.', str(random.randint(0,100000)) ) + os.path.splitext(file_object.name)[1].lower() + file_name = file_name_prefix + file_name file_storage = get_storage_class()() # use default storage to store file diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 8416d486..277d4b95 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -682,6 +682,29 @@ def read_message(request):#marks message a read request.user.delete_messages() return HttpResponse('') +@csrf.csrf_exempt +@decorators.ajax_only +@decorators.post_only +def save_group_logo_url(request): + if request.user.is_anonymous(): + raise exceptions.PermissionDenied() + + if not request.user.is_administrator_or_moderator(): + raise exceptions.PermissionDenied( + _('Only moderators and administrators can change user groups') + ) + + form = forms.GroupLogoURLForm(request.POST) + if form.is_valid(): + group_id = form.cleaned_data['group_id'] + image_url = form.cleaned_data['image_url'] + group = models.Tag.group_tags.get(id = group_id) + group.group_profile.logo_url = image_url + group.group_profile.save() + else: + raise ValueError('invalid data found when saving group logo') + + @csrf.csrf_exempt @decorators.ajax_only @decorators.post_only diff --git a/askbot/views/writers.py b/askbot/views/writers.py index d9a6f855..de130ac2 100644 --- a/askbot/views/writers.py +++ b/askbot/views/writers.py @@ -62,9 +62,13 @@ def upload(request):#ajax upload file to a question or answer request.user.assert_can_upload_file() + #todo: build proper form validation + file_name_prefix = request.POST.get('file_name_prefix', '') + if file_name_prefix not in ('', 'group_logo_'): + raise exceptions.PermissionDenied('invalid upload file name prefix') + # check file type f = request.FILES['file-upload'] - #todo: extension checking should be replaced with mimetype checking #and this must be part of the form validation file_extension = os.path.splitext(f.name)[1].lower() @@ -75,7 +79,9 @@ def upload(request):#ajax upload file to a question or answer raise exceptions.PermissionDenied(msg) # generate new file name and storage object - file_storage, new_file_name, file_url = store_file(f) + file_storage, new_file_name, file_url = store_file( + f, file_name_prefix + ) # check file size # byte size = file_storage.size(new_file_name) -- cgit v1.2.3-1-g7c22 From 7d09853c4133e3a473bf2ad1f2501a7a4ca530ba Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 30 Mar 2012 08:41:22 -0400 Subject: made group logo upload look a little smoother --- askbot/skins/common/media/js/post.js | 8 +++-- askbot/skins/common/media/js/wmd/wmd.js | 3 ++ askbot/skins/default/media/style/style.less | 22 ++++++++++++-- askbot/skins/default/templates/users.html | 7 +++-- askbot/views/commands.py | 46 +++++++++++++++-------------- 5 files changed, 55 insertions(+), 31 deletions(-) diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index bf5d539a..5046a13f 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -2102,11 +2102,13 @@ ImageChanger.prototype.startDialog = function(){ //reusing the wmd's file uploader var me = this; Attacklab.Util.prompt( - "

" + gettext('enter the logo url') + '

', + "

" + gettext('Enter the logo url or upload an image') + '

', 'http://', function(image_url){ - me.saveImageUrl(image_url); - me.showImage(image_url); + if (image_url){ + me.saveImageUrl(image_url); + me.showImage(image_url); + } }, 'image' ); diff --git a/askbot/skins/common/media/js/wmd/wmd.js b/askbot/skins/common/media/js/wmd/wmd.js index 1d524361..9f941855 100644 --- a/askbot/skins/common/media/js/wmd/wmd.js +++ b/askbot/skins/common/media/js/wmd/wmd.js @@ -346,6 +346,9 @@ util.prompt = function(text, defaultInputText, makeLinkMarkdown, dialogType){ style.marginLeft = style.marginRight = "auto"; form.appendChild(input); + //EF. fucus at the end of the input box + //putCursorAtEnd($(input)); + // The upload file input if(dialogType == 'image' || dialogType == 'file'){ var upload_container = $('
'); diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 2e260e40..c0719235 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -3409,7 +3409,23 @@ body.anon.lang-es { background: #b32f2f; } -.users-page #editor { - border: 2px #CCE6EC solid; - padding: 0px; +.users-page { + #editor { + border: 2px #CCE6EC solid; + padding: 0px; + } + .wmd-prompt-dialog { + background: #ccc; + } +} + +.group-wiki { + .content { + float: left; + margin-bottom: -12px; + } + .group-logo { + float: left; + margin: 0 5px 3px 0; + } } diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html index 557c1a77..1df8e1ea 100644 --- a/askbot/skins/default/templates/users.html +++ b/askbot/skins/default/templates/users.html @@ -51,7 +51,7 @@ {% endif %}

{% if group %} -
+
+
{% if request.user.is_authenticated() and request.user.is_administrator_or_moderator() %} {% trans %}edit group description{% endtrans %} - + | {% endif %}
diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 277d4b95..9a7ec7d6 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -682,28 +682,6 @@ def read_message(request):#marks message a read request.user.delete_messages() return HttpResponse('') -@csrf.csrf_exempt -@decorators.ajax_only -@decorators.post_only -def save_group_logo_url(request): - if request.user.is_anonymous(): - raise exceptions.PermissionDenied() - - if not request.user.is_administrator_or_moderator(): - raise exceptions.PermissionDenied( - _('Only moderators and administrators can change user groups') - ) - - form = forms.GroupLogoURLForm(request.POST) - if form.is_valid(): - group_id = form.cleaned_data['group_id'] - image_url = form.cleaned_data['image_url'] - group = models.Tag.group_tags.get(id = group_id) - group.group_profile.logo_url = image_url - group.group_profile.save() - else: - raise ValueError('invalid data found when saving group logo') - @csrf.csrf_exempt @decorators.ajax_only @@ -743,3 +721,27 @@ def edit_group_membership(request): raise exceptions.PermissionDenied() else: raise exceptions.PermissionDenied() + + +@csrf.csrf_exempt +@decorators.ajax_only +@decorators.post_only +def save_group_logo_url(request): + if request.user.is_anonymous(): + raise exceptions.PermissionDenied() + + if not request.user.is_administrator_or_moderator(): + raise exceptions.PermissionDenied( + _('Only moderators and administrators can change user groups') + ) + + form = forms.GroupLogoURLForm(request.POST) + if form.is_valid(): + group_id = form.cleaned_data['group_id'] + image_url = form.cleaned_data['image_url'] + group = models.Tag.group_tags.get(id = group_id) + group.group_profile.logo_url = image_url + group.group_profile.save() + else: + raise ValueError('invalid data found when saving group logo') + -- cgit v1.2.3-1-g7c22 From d1c8e444e8f4ba0035eca955ec0426383e6c7660 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sat, 31 Mar 2012 17:03:38 -0400 Subject: made karma completely hideable by configuration --- askbot/conf/karma_and_badges_visibility.py | 3 ++- askbot/doc/source/changelog.rst | 2 +- .../widgets/user_long_score_and_badge_summary.html | 2 ++ .../skins/default/templates/widgets/user_navigation.html | 14 +++++++++----- askbot/views/users.py | 2 ++ 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/askbot/conf/karma_and_badges_visibility.py b/askbot/conf/karma_and_badges_visibility.py index ffa8fe59..4c75cb22 100644 --- a/askbot/conf/karma_and_badges_visibility.py +++ b/askbot/conf/karma_and_badges_visibility.py @@ -21,7 +21,8 @@ settings.register( default = 'public', choices = ( ('public', 'show publicly'), - ('private', 'show to owners only') + ('private', 'show to owners only'), + ('hidden', 'hide completely'), ),#todo: later implement hidden mode description = _("Visibility of karma"), clear_cache = True, diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst index 4a87a5a0..ebc602b3 100644 --- a/askbot/doc/source/changelog.rst +++ b/askbot/doc/source/changelog.rst @@ -4,7 +4,7 @@ Changes in Askbot Future version -------------- * User groups (Evgeny) -* Public/Private reputation (Evgeny) +* Public/Private/Hidden reputation (Evgeny) * Enabling/disabling the badges system (Evgeny) Development version (not released yet) diff --git a/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html b/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html index da9474fc..cf3b8add 100644 --- a/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html +++ b/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html @@ -1,6 +1,8 @@ +{% if karma_mode != 'hidden' %} {% trans %}karma:{% endtrans %} {{user.reputation}} +{% endif %} {% if badges_mode == 'public' %} {%- if user.gold or user.silver or user.bronze %} {{ macros.inbox_link(request.user) }} {{ macros.moderation_items_link(request.user, moderation_items) }} - ({{ macros.user_long_score_and_badge_summary( - user, - badges_mode = settings.BADGES_MODE - ) - }}) + {% + if settings.KARMA_MODE != 'hidden' and settings.BADGES_MODE != 'hidden' + %} + ({{ macros.user_long_score_and_badge_summary( + user, + badges_mode = settings.BADGES_MODE + ) + }}) + {% endif %} {% if settings.USE_ASKBOT_LOGIN_SYSTEM %} {% trans %}sign out{% endtrans %} diff --git a/askbot/views/users.py b/askbot/views/users.py index 11b36b91..a4469e83 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -838,6 +838,8 @@ def user(request, id, slug=None, tab_name=None): if askbot_settings.KARMA_MODE == 'public': can_show_karma = True + elif askbot_settings.KARMA_MODE == 'hidden': + can_show_karma = False else: if request.user.is_administrator_or_moderator() \ or request.user == profile_owner: -- cgit v1.2.3-1-g7c22 From e3f5ad31475a976cfa013e6bee96ac59c4fe9f82 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sat, 31 Mar 2012 18:50:30 -0400 Subject: added the dynamic timeago calculation to the all displayed timestamps --- askbot/skins/common/media/js/post.js | 12 +- askbot/skins/common/media/js/utils.js | 149 +++++++++++++++++++++ .../skins/common/templates/authopenid/signin.html | 3 +- askbot/skins/default/media/style/style.less | 4 +- askbot/skins/default/templates/macros.html | 16 ++- .../default/templates/meta/bottom_scripts.html | 1 + .../skins/default/templates/question/sidebar.html | 4 +- askbot/skins/default/templates/reopen.html | 3 +- .../default/templates/user_profile/user_inbox.html | 4 +- .../default/templates/user_profile/user_info.html | 4 +- .../templates/user_profile/user_recent.html | 3 +- .../templates/user_profile/user_reputation.html | 3 +- .../default/templates/user_profile/user_votes.html | 3 +- .../templates/widgets/question_summary.html | 5 +- askbot/views/writers.py | 4 +- 15 files changed, 190 insertions(+), 28 deletions(-) diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index 5046a13f..39e6aba3 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -1542,9 +1542,11 @@ Comment.prototype.setContent = function(data){ this._comment_body.append(this._user_link); this._comment_body.append(' ('); - this._comment_age = $(''); - this._comment_age.html(this._data['comment_age']); - this._comment_body.append(this._comment_age); + this._comment_added_at = $(''); + this._comment_added_at.html(this._data['comment_added_at']); + this._comment_added_at.attr('title', this._data['comment_added_at']); + this._comment_added_at.timeago(); + this._comment_body.append(this._comment_added_at); this._comment_body.append(')'); if (this._editable){ @@ -1567,8 +1569,8 @@ Comment.prototype.dispose = function(){ if (this._user_link){ this._user_link.remove(); } - if (this._comment_age){ - this._comment_age.remove(); + if (this._comment_added_at){ + this._comment_added_at.remove(); } if (this._delete_icon){ this._delete_icon.dispose(); diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index 3a6fbfe5..9457bea3 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -506,3 +506,152 @@ if(!this.JSON){this.JSON={}}(function(){function f(n){return n<10?"0"+n:n}if(typ //our custom autocompleter var AutoCompleter=function(a){var b={autocompleteMultiple:true,multipleSeparator:" ",inputClass:"acInput",loadingClass:"acLoading",resultsClass:"acResults",selectClass:"acSelect",queryParamName:"q",limitParamName:"limit",extraParams:{},lineSeparator:"\n",cellSeparator:"|",minChars:2,maxItemsToShow:10,delay:400,useCache:true,maxCacheLength:10,matchSubset:true,matchCase:false,matchInside:true,mustMatch:false,preloadData:false,selectFirst:false,stopCharRegex:/\s+/,selectOnly:false,formatItem:null,onItemSelect:false,autoFill:false,filterResults:true,sortResults:true,sortFunction:false,onNoMatch:false};this.options=$.extend({},b,a);this.cacheData_={};this.cacheLength_=0;this.selectClass_="jquery-autocomplete-selected-item";this.keyTimeout_=null;this.lastKeyPressed_=null;this.lastProcessedValue_=null;this.lastSelectedValue_=null;this.active_=false;this.finishOnBlur_=true;this.options.minChars=parseInt(this.options.minChars,10);if(isNaN(this.options.minChars)||this.options.minChars<1){this.options.minChars=2}this.options.maxItemsToShow=parseInt(this.options.maxItemsToShow,10);if(isNaN(this.options.maxItemsToShow)||this.options.maxItemsToShow<1){this.options.maxItemsToShow=10}this.options.maxCacheLength=parseInt(this.options.maxCacheLength,10);if(isNaN(this.options.maxCacheLength)||this.options.maxCacheLength<1){this.options.maxCacheLength=10}if(this.options.preloadData===true){this.fetchRemoteData("",function(){})}};inherits(AutoCompleter,WrappedElement);AutoCompleter.prototype.decorate=function(a){this._element=a;this._element.attr("autocomplete","off");this._results=$("
").hide();if(this.options.resultsClass){this._results.addClass(this.options.resultsClass)}this._results.css({position:"absolute"});$("body").append(this._results);this.setEventHandlers()};AutoCompleter.prototype.setEventHandlers=function(){var a=this;a._element.keydown(function(b){a.lastKeyPressed_=b.keyCode;switch(a.lastKeyPressed_){case 38:b.preventDefault();if(a.active_){a.focusPrev()}else{a.activate()}return false;break;case 40:b.preventDefault();if(a.active_){a.focusNext()}else{a.activate()}return false;break;case 9:case 13:if(a.active_){b.preventDefault();a.selectCurrent();return false}break;case 27:if(a.active_){b.preventDefault();a.finish();return false}break;default:a.activate()}});a._element.blur(function(){if(a.finishOnBlur_){setTimeout(function(){a.finish()},200)}})};AutoCompleter.prototype.position=function(){var a=this._element.offset();this._results.css({top:a.top+this._element.outerHeight(),left:a.left})};AutoCompleter.prototype.cacheRead=function(d){var f,c,b,a,e;if(this.options.useCache){d=String(d);f=d.length;if(this.options.matchSubset){c=1}else{c=f}while(c<=f){if(this.options.matchInside){a=f-c}else{a=0}e=0;while(e<=a){b=d.substr(0,c);if(this.cacheData_[b]!==undefined){return this.cacheData_[b]}e++}c++}}return false};AutoCompleter.prototype.cacheWrite=function(a,b){if(this.options.useCache){if(this.cacheLength_>=this.options.maxCacheLength){this.cacheFlush()}a=String(a);if(this.cacheData_[a]!==undefined){this.cacheLength_++}return this.cacheData_[a]=b}return false};AutoCompleter.prototype.cacheFlush=function(){this.cacheData_={};this.cacheLength_=0};AutoCompleter.prototype.callHook=function(c,b){var a=this.options[c];if(a&&$.isFunction(a)){return a(b,this)}return false};AutoCompleter.prototype.activate=function(){var b=this;var a=function(){b.activateNow()};var c=parseInt(this.options.delay,10);if(isNaN(c)||c<=0){c=250}if(this.keyTimeout_){clearTimeout(this.keyTimeout_)}this.keyTimeout_=setTimeout(a,c)};AutoCompleter.prototype.activateNow=function(){var a=this.getValue();if(a!==this.lastProcessedValue_&&a!==this.lastSelectedValue_){if(a.length>=this.options.minChars){this.active_=true;this.lastProcessedValue_=a;this.fetchData(a)}}};AutoCompleter.prototype.fetchData=function(b){if(this.options.data){this.filterAndShowResults(this.options.data,b)}else{var a=this;this.fetchRemoteData(b,function(c){a.filterAndShowResults(c,b)})}};AutoCompleter.prototype.fetchRemoteData=function(c,e){var d=this.cacheRead(c);if(d){e(d)}else{var a=this;if(this._element){this._element.addClass(this.options.loadingClass)}var b=function(g){var f=false;if(g!==false){f=a.parseRemoteData(g);a.options.data=f;a.cacheWrite(c,f)}if(a._element){a._element.removeClass(a.options.loadingClass)}e(f)};$.ajax({url:this.makeUrl(c),success:b,error:function(){b(false)}})}};AutoCompleter.prototype.setOption=function(a,b){this.options[a]=b};AutoCompleter.prototype.setExtraParam=function(b,c){var a=$.trim(String(b));if(a){if(!this.options.extraParams){this.options.extraParams={}}if(this.options.extraParams[a]!==c){this.options.extraParams[a]=c;this.cacheFlush()}}};AutoCompleter.prototype.makeUrl=function(e){var a=this;var b=this.options.url;var d=$.extend({},this.options.extraParams);if(this.options.queryParamName===false){b+=encodeURIComponent(e)}else{d[this.options.queryParamName]=e}if(this.options.limitParamName&&this.options.maxItemsToShow){d[this.options.limitParamName]=this.options.maxItemsToShow}var c=[];$.each(d,function(f,g){c.push(a.makeUrlParam(f,g))});if(c.length){b+=b.indexOf("?")==-1?"?":"&";b+=c.join("&")}return b};AutoCompleter.prototype.makeUrlParam=function(a,b){return String(a)+"="+encodeURIComponent(b)};AutoCompleter.prototype.splitText=function(a){return String(a).replace(/(\r\n|\r|\n)/g,"\n").split(this.options.lineSeparator)};AutoCompleter.prototype.parseRemoteData=function(c){var h,b,f,d,g;var e=[];var b=this.splitText(c);for(f=0;f""){if(typeof c!=="object"){c={}}if(this.options.filterResults){h=String(b);g=String(l);if(!this.options.matchCase){h=h.toLowerCase();g=g.toLowerCase()}a=g.indexOf(h);if(this.options.matchInside){a=a>-1}else{a=a===0}}else{a=true}if(a){f.push({value:l,data:c})}}}if(this.options.sortResults){f=this.sortResults(f,b)}if(this.options.maxItemsToShow>0&&this.options.maxItemsToShowc){return 1}if(d");var f,l,j,a,h=false,d=false;var c=e.length;for(f=0;f"+this.showResult(l.value,l.data)+"");j.data("value",l.value);j.data("data",l.data);j.click(function(){var i=$(this);k.selectItem(i)}).mousedown(function(){k.finishOnBlur_=false}).mouseup(function(){k.finishOnBlur_=true});g.append(j);if(h===false){h=String(l.value);d=j;j.addClass(this.options.firstItemClass)}if(f==c-1){j.addClass(this.options.lastItemClass)}}this.position();this._results.html(g).show();a=this._results.outerWidth()-this._results.width();this._results.width(this._element.outerWidth()-a);$("li",this._results).hover(function(){k.focusItem(this)},function(){});if(this.autoFill(h,b)){this.focusItem(d)}};AutoCompleter.prototype.showResult=function(b,a){if($.isFunction(this.options.showResult)){return this.options.showResult(b,a)}else{return b}};AutoCompleter.prototype.autoFill=function(e,c){var b,a,d,f;if(this.options.autoFill&&this.lastKeyPressed_!=8){b=String(e).toLowerCase();a=String(c).toLowerCase();d=e.length;f=c.length;if(b.substr(0,f)===a){this._element.val(e);this.selectRange(f,d);return true}}return false};AutoCompleter.prototype.focusNext=function(){this.focusMove(+1)};AutoCompleter.prototype.focusPrev=function(){this.focusMove(-1)};AutoCompleter.prototype.focusMove=function(a){var b,c=$("li",this._results);a=parseInt(a,10);for(var b=0;b=c.length){b=c.length-1}}a=$(c[b])}else{a=$(b)}if(a){a.addClass(this.selectClass_).addClass(this.options.selectClass)}}};AutoCompleter.prototype.selectCurrent=function(){var a=$("li."+this.selectClass_,this._results);if(a.length==1){this.selectItem(a)}else{this.finish()}};AutoCompleter.prototype.selectItem=function(d){var c=d.data("value");var b=d.data("data");var a=this.displayValue(c,b);this.lastProcessedValue_=a;this.lastSelectedValue_=a;this.setValue(a);this.setCaret(a.length);this.callHook("onItemSelect",{value:c,data:b});this.finish()};AutoCompleter.prototype.isContentChar=function(a){if(a.match(this.options.stopCharRegex)){return false}else{if(a===this.options.multipleSeparator){return false}else{return true}}};AutoCompleter.prototype.getValue=function(){var c=this._element.getSelection();var d=this._element.val();var f=c.start;var e=f;for(cpos=f;cpos>=0;cpos=cpos-1){if(cpos===d.length){continue}var b=d.charAt(cpos);if(!this.isContentChar(b)){break}e=cpos}var a=f;for(cpos=f;cpos -0400 + return new Date(s); + }, + datetime: function(elem) { + // jQuery's `is()` doesn't play well with HTML5 in IE + var isTime = $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); + var iso8601 = isTime ? $(elem).attr("datetime") : $(elem).attr("title"); + return $t.parse(iso8601); + } + }); + + $.fn.timeago = function() { + var self = this; + self.each(refresh); + + var $s = $t.settings; + if ($s.refreshMillis > 0) { + setInterval(function() { self.each(refresh); }, $s.refreshMillis); + } + return self; + }; + + function refresh() { + var data = prepareData(this); + if (!isNaN(data.datetime)) { + $(this).text(inWords(data.datetime)); + } + return this; + } + + function prepareData(element) { + element = $(element); + if (!element.data("timeago")) { + element.data("timeago", { datetime: $t.datetime(element) }); + var text = $.trim(element.text()); + if (text.length > 0) { + element.attr("title", text); + } + } + return element.data("timeago"); + } + + function inWords(date) { + return $t.inWords(distance(date)); + } + + function distance(date) { + return (new Date().getTime() - date.getTime()); + } + + // fix for IE6 suckage + document.createElement("abbr"); + document.createElement("time"); +}(jQuery)); diff --git a/askbot/skins/common/templates/authopenid/signin.html b/askbot/skins/common/templates/authopenid/signin.html index f4bf82c9..3b522d9b 100644 --- a/askbot/skins/common/templates/authopenid/signin.html +++ b/askbot/skins/common/templates/authopenid/signin.html @@ -1,5 +1,6 @@ {% extends "two_column_body.html" %} {% import "authopenid/authopenid_macros.html" as login_macros %} +{% from "macros.html" import timeago %} {% block title %}{% spaceless %}{% trans %}User login{% endtrans %}{% endspaceless %}{% endblock %} {% block forestyle %} @@ -162,7 +163,7 @@ {% if login_method.last_used_timestamp %} - {{login_method.last_used_timestamp|diff_date}} + {{ timeago(login_method.last_used_timestamp) }} {% endif %} diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index c0719235..5b24a15c 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -899,7 +899,7 @@ ul#searchTags { } - .userinfo .relativetime, span.anonymous + .userinfo .timeago, span.anonymous { font-size: 11px; clear:both; @@ -2805,7 +2805,7 @@ span.form-error { margin: 0px; } -.relativetime { +.timeago { font-weight: bold; text-decoration: none; } diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html index 603c16f0..ffd51b87 100644 --- a/askbot/skins/default/templates/macros.html +++ b/askbot/skins/default/templates/macros.html @@ -85,7 +85,7 @@ poor design of the data or methods on data objects #} {% else %} {%- trans %}posted{% endtrans %} {% endif %} - {{post.added_at|diff_date}} + {{ timeago(post.added_at) }}

{{post.revised_at|diff_date}} + {{ timeago(post.revised_at) }} {% else %} - {{post.added_at|diff_date}} + {{ timeago(post.added_at) }} {% endif %}

{{ post_contributor_avatar_and_credentials( @@ -134,7 +134,7 @@ poor design of the data or methods on data objects #} {% else %} href="{% url answer_revisions post.id %}" {% endif %} - >{% trans %}updated{% endtrans %} {{ last_edited_at|diff_date }} + >{% trans %}updated{% endtrans %} {{ timeago(last_edited_at) }}

{% if original_author != update_author or is_wiki %} {{ @@ -326,7 +326,7 @@ for the purposes of the AJAX comment editor #}
{{comment.html}} {{comment.author.username}} -  ({{comment.added_at|diff_date}}) +  ({{ timeago(comment.added_at) }}) {% trans %}edit{% endtrans %}
@@ -668,3 +668,9 @@ answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_ {% endif %} {%- endmacro -%} + +{%- macro timeago(datetime_object) -%} + + {{datetime_object.replace(microsecond=0)}} + +{%- endmacro -%} diff --git a/askbot/skins/default/templates/meta/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html index 244cec21..ce688a93 100644 --- a/askbot/skins/default/templates/meta/bottom_scripts.html +++ b/askbot/skins/default/templates/meta/bottom_scripts.html @@ -73,6 +73,7 @@ $('#validate_email_alert').click(function(){notify.close(true)}) notify.show(); {% endif %} + $('abbr.timeago').timeago(); {% if settings.USE_CUSTOM_JS %} - + {% if settings.ENABLE_MATHJAX %} + + diff --git a/askbot/skins/default/templates/user_profile/user_inbox.html b/askbot/skins/default/templates/user_profile/user_inbox.html index cdd73599..2c4d1e23 100644 --- a/askbot/skins/default/templates/user_profile/user_inbox.html +++ b/askbot/skins/default/templates/user_profile/user_inbox.html @@ -1,8 +1,5 @@ {% extends "user_profile/user.html" %} {% import "macros.html" as macros %} -{% block forestyle %} - -{% endblock %} {# This template accepts a list of response list @@ -83,10 +80,7 @@ inbox_section - forum|flags name="title" autocomplete="off" /> - {{ macros.edit_post( - - ) - }} + {{ macros.edit_post() }}
@@ -140,6 +134,5 @@ inbox_section - forum|flags ) {% endfor %} - - diff --git a/askbot/skins/default/templates/user_profile/user_inbox.html b/askbot/skins/default/templates/user_profile/user_inbox.html index 2c4d1e23..8d1a75fd 100644 --- a/askbot/skins/default/templates/user_profile/user_inbox.html +++ b/askbot/skins/default/templates/user_profile/user_inbox.html @@ -1,5 +1,8 @@ {% extends "user_profile/user.html" %} {% import "macros.html" as macros %} +{% block forestyle %} + +{% endblock %} {# This template accepts a list of response list @@ -134,5 +137,6 @@ inbox_section - forum|flags ) {% endfor %} + @@ -98,33 +112,37 @@ +{% endblock %} diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html index de0d5e54..9b7a282e 100644 --- a/askbot/skins/default/templates/users.html +++ b/askbot/skins/default/templates/users.html @@ -8,7 +8,7 @@ {% block content %}

{% if group %} - {% trans name = group.name|escape %}Users in group {{name}}{% endtrans %} + {% trans name = group.name|replace('-', ' ')|escape %}Users in group {{name}}{% endtrans %} {% else %} {% trans %}Users{% endtrans %} {% endif %} diff --git a/askbot/skins/default/templates/widgets/group_snippet.html b/askbot/skins/default/templates/widgets/group_snippet.html new file mode 100644 index 00000000..e9364a7e --- /dev/null +++ b/askbot/skins/default/templates/widgets/group_snippet.html @@ -0,0 +1,2 @@ +{% import "macros.html" as macros %} +{{ macros.user_group(group) }} diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 497505c4..efb50974 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -23,7 +23,7 @@ from askbot.conf import settings as askbot_settings from askbot.utils import decorators from askbot.utils import url_utils from askbot.utils import mail -from askbot.skins.loaders import render_into_skin +from askbot.skins.loaders import render_into_skin, get_template from askbot import const import logging @@ -499,7 +499,7 @@ def save_tag_wiki_text(request): form = forms.EditTagWikiForm(request.POST) if form.is_valid(): tag_id = form.cleaned_data['tag_id'] - text = form.cleaned_data['text'] + text = form.cleaned_data['text'] or ' '#a hack to save blank data tag = models.Tag.objects.get(id = tag_id) if tag.tag_wiki: request.user.edit_post(tag.tag_wiki, body_text = text) @@ -749,6 +749,12 @@ def edit_group_membership(request): group_params = {'group_name': group_name, 'user': user} group = models.Tag.group_tags.get_or_create(**group_params) request.user.edit_group_membership(user, group, 'add') + template = get_template('widgets/group_snippet.html') + return { + 'name': group.name, + 'description': getattr(group.tag_wiki, 'text', ''), + 'html': template.render({'group': group}) + } elif action == 'remove': try: group = models.Tag.group_tags.get_by_name(group_name = group_name) diff --git a/askbot/views/users.py b/askbot/views/users.py index 820f6e84..b6e7d5f7 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -906,6 +906,7 @@ def groups(request, id = None, slug = None): request.user.is_administrator_or_moderator() data = { 'groups': groups, - 'can_edit': can_edit + 'can_edit': can_edit, + 'active_tab': 'users' } return render_into_skin('groups.html', data, request) -- cgit v1.2.3-1-g7c22 From dcae29a053866613612cfc5a74c8b3c5f3f88e8e Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 1 May 2012 21:43:46 -0300 Subject: added group email address, enabled by default --- askbot/lamson_handlers.py | 23 +++++++++++++++++++---- askbot/utils/mail.py | 6 +++++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/askbot/lamson_handlers.py b/askbot/lamson_handlers.py index f121af06..5c86bc98 100644 --- a/askbot/lamson_handlers.py +++ b/askbot/lamson_handlers.py @@ -4,7 +4,7 @@ from lamson.server import Relay from django.utils.translation import ugettext as _ from django.core.files.uploadedfile import SimpleUploadedFile from django.conf import settings -from askbot.models import ReplyAddress +from askbot.models import ReplyAddress, Tag from askbot.utils import mail @@ -113,13 +113,28 @@ def get_parts(message): parts.append((part_type, part_content)) return parts -@route('ask@(host)') +@route('(addr)@(host)') @stateless -def ASK(message, host = None): +def ASK(message, host = None, addr = None): parts = get_parts(message) from_address = message.From subject = message['Subject']#why lamson does not give it normally? - mail.process_emailed_question(from_address, subject, parts) + if addr == 'ask': + mail.process_emailed_question(from_address, subject, parts) + else: + try: + group_tag = Tag.group_tags.get( + deleted = False, + name = addr + ) + mail.process_emailed_question( + from_address, subject, parts, tags = [group_tag.name, ] + ) + except Tag.DoesNotExist: + #do nothing because this handler will match all emails + return + except Tag.MultipleObjectsReturned: + return @route('reply-(address)@(host)', address='.+') @stateless diff --git a/askbot/utils/mail.py b/askbot/utils/mail.py index 744c54de..2d4d80b0 100644 --- a/askbot/utils/mail.py +++ b/askbot/utils/mail.py @@ -251,7 +251,7 @@ def process_parts(parts): return body_markdown.strip(), stored_files -def process_emailed_question(from_address, subject, parts): +def process_emailed_question(from_address, subject, parts, tags = None): """posts question received by email or bounces the message""" #a bunch of imports here, to avoid potential circular import issues from askbot.forms import AskByEmailForm @@ -275,6 +275,10 @@ def process_emailed_question(from_address, subject, parts): title = form.cleaned_data['title'] body_text = form.cleaned_data['body_text'] + #defect - here we might get "too many tags" issue + if tags: + tagnames += ' ' + ' '.join(tags) + user.post_question( title = title, tags = tagnames, -- cgit v1.2.3-1-g7c22 From a4692d9cb97154ee172185efbeedc374def6dcd0 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 1 May 2012 23:47:04 -0300 Subject: allowed admins to decide whether to moderate email posted to groups --- askbot/conf/group_settings.py | 12 + askbot/lamson_handlers.py | 7 +- ...le_moderate_email__add_field_postrevision_em.py | 322 +++++++++++++++++++++ askbot/models/__init__.py | 6 +- askbot/models/post.py | 22 +- askbot/models/question.py | 6 +- askbot/models/user.py | 1 + askbot/skins/common/media/js/post.js | 29 ++ askbot/skins/default/templates/users.html | 12 +- askbot/urls.py | 5 + askbot/utils/mail.py | 3 +- askbot/views/commands.py | 18 ++ askbot/views/users.py | 9 +- 13 files changed, 438 insertions(+), 14 deletions(-) create mode 100644 askbot/migrations/0120_auto__add_field_groupprofile_moderate_email__add_field_postrevision_em.py diff --git a/askbot/conf/group_settings.py b/askbot/conf/group_settings.py index a48fb55d..b3c0069c 100644 --- a/askbot/conf/group_settings.py +++ b/askbot/conf/group_settings.py @@ -18,3 +18,15 @@ settings.register( description = _('Enable user groups'), ) ) + +settings.register( + livesettings.BooleanValue( + GROUP_SETTINGS, + 'GROUP_EMAIL_ADDRESSES_ENABLED', + default = False, + description = _('Enable group email adddresses'), + help_text = _( + 'If selected, users can post to groups by email "group-name@domain.com"' + ) + ) +) diff --git a/askbot/lamson_handlers.py b/askbot/lamson_handlers.py index 5c86bc98..1d4bb1bc 100644 --- a/askbot/lamson_handlers.py +++ b/askbot/lamson_handlers.py @@ -3,9 +3,10 @@ from lamson.routing import route, stateless from lamson.server import Relay from django.utils.translation import ugettext as _ from django.core.files.uploadedfile import SimpleUploadedFile -from django.conf import settings +from django.conf import settings as django_settings from askbot.models import ReplyAddress, Tag from askbot.utils import mail +from askbot.conf import settings as askbot_settings #we might end up needing to use something like this @@ -122,6 +123,8 @@ def ASK(message, host = None, addr = None): if addr == 'ask': mail.process_emailed_question(from_address, subject, parts) else: + if askbot_settings.GROUP_EMAIL_ADDRESSES_ENABLED == False: + return try: group_tag = Tag.group_tags.get( deleted = False, @@ -143,7 +146,7 @@ def PROCESS(message, address = None, host = None): and make a post to askbot based on the contents of the email, including the text body and the file attachments""" try: - for rule in settings.LAMSON_FORWARD: + for rule in django_settings.LAMSON_FORWARD: if re.match(rule['pattern'], message.base['to']): relay = Relay(host=rule['host'], port=rule['port'], debug=1) diff --git a/askbot/migrations/0120_auto__add_field_groupprofile_moderate_email__add_field_postrevision_em.py b/askbot/migrations/0120_auto__add_field_groupprofile_moderate_email__add_field_postrevision_em.py new file mode 100644 index 00000000..4b9efe58 --- /dev/null +++ b/askbot/migrations/0120_auto__add_field_groupprofile_moderate_email__add_field_postrevision_em.py @@ -0,0 +1,322 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'GroupProfile.moderate_email' + db.add_column('askbot_groupprofile', 'moderate_email', + self.gf('django.db.models.fields.BooleanField')(default=True), + keep_default=False) + + # Adding field 'PostRevision.email_address' + db.add_column('askbot_postrevision', 'email_address', + self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True), + keep_default=False) + + def backwards(self, orm): + # Deleting field 'GroupProfile.moderate_email' + db.delete_column('askbot_groupprofile', 'moderate_email') + + # Deleting field 'PostRevision.email_address' + db.delete_column('askbot_postrevision', 'email_address') + + models = { + 'askbot.activity': { + 'Meta': {'object_name': 'Activity', 'db_table': "u'activity'"}, + 'active_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'activity_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_auditted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True'}), + 'receiving_users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'received_activity'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'incoming_activity'", 'symmetrical': 'False', 'through': "orm['askbot.ActivityAuditStatus']", 'to': "orm['auth.User']"}), + 'summary': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.activityauditstatus': { + 'Meta': {'unique_together': "(('user', 'activity'),)", 'object_name': 'ActivityAuditStatus'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Activity']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.anonymousanswer': { + 'Meta': {'object_name': 'AnonymousAnswer'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'anonymous_answers'", 'to': "orm['askbot.Post']"}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.anonymousquestion': { + 'Meta': {'object_name': 'AnonymousQuestion'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.award': { + 'Meta': {'object_name': 'Award', 'db_table': "u'award'"}, + 'awarded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'badge': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_badge'", 'to': "orm['askbot.BadgeData']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'notified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_user'", 'to': "orm['auth.User']"}) + }, + 'askbot.badgedata': { + 'Meta': {'ordering': "('slug',)", 'object_name': 'BadgeData'}, + 'awarded_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'awarded_to': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'badges'", 'symmetrical': 'False', 'through': "orm['askbot.Award']", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) + }, + 'askbot.emailfeedsetting': { + 'Meta': {'unique_together': "(('subscriber', 'feed_type'),)", 'object_name': 'EmailFeedSetting'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'feed_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'frequency': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '8'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reported_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'subscriber': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notification_subscriptions'", 'to': "orm['auth.User']"}) + }, + 'askbot.favoritequestion': { + 'Meta': {'object_name': 'FavoriteQuestion', 'db_table': "u'favorite_question'"}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Thread']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_favorite_questions'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupmembership': { + 'Meta': {'object_name': 'GroupMembership'}, + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_memberships'", 'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_memberships'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupprofile': { + 'Meta': {'object_name': 'GroupProfile'}, + 'group_tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'group_profile'", 'unique': 'True', 'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'logo_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), + 'moderate_email': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'askbot.markedtag': { + 'Meta': {'object_name': 'MarkedTag'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reason': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_selections'", 'to': "orm['askbot.Tag']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tag_selections'", 'to': "orm['auth.User']"}) + }, + 'askbot.post': { + 'Meta': {'object_name': 'Post'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'posts'", 'to': "orm['auth.User']"}), + 'comment_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'html': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_edited_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'last_edited_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_edited_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'locked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'locked_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'locked_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locked_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'offensive_flag_count': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'old_answer_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_comment_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_question_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'post_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'posts'", 'null': 'True', 'blank': 'True', 'to': "orm['askbot.Thread']"}), + 'vote_down_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'vote_up_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'wikified_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}) + }, + 'askbot.postflagreason': { + 'Meta': {'object_name': 'PostFlagReason'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'details': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'post_reject_reasons'", 'to': "orm['askbot.Post']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '128'}) + }, + 'askbot.postrevision': { + 'Meta': {'ordering': "('-revision',)", 'unique_together': "(('post', 'revision'),)", 'object_name': 'PostRevision'}, + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'approved_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'approved_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'postrevisions'", 'to': "orm['auth.User']"}), + 'by_email': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisions'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'revised_at': ('django.db.models.fields.DateTimeField', [], {}), + 'revision': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'revision_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '125', 'blank': 'True'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '300', 'blank': 'True'}) + }, + 'askbot.questionview': { + 'Meta': {'object_name': 'QuestionView'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'viewed'", 'to': "orm['askbot.Post']"}), + 'when': ('django.db.models.fields.DateTimeField', [], {}), + 'who': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'question_views'", 'to': "orm['auth.User']"}) + }, + 'askbot.replyaddress': { + 'Meta': {'object_name': 'ReplyAddress'}, + 'address': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '25'}), + 'allowed_from_email': ('django.db.models.fields.EmailField', [], {'max_length': '150'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reply_addresses'", 'to': "orm['askbot.Post']"}), + 'response_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'edit_addresses'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.repute': { + 'Meta': {'object_name': 'Repute', 'db_table': "u'repute'"}, + 'comment': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'negative': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'positive': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'reputation_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'reputed_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.tag': { + 'Meta': {'ordering': "('-used_count', 'name')", 'object_name': 'Tag', 'db_table': "u'tag'"}, + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_tags'", 'to': "orm['auth.User']"}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_tags'", 'null': 'True', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'tag_wiki': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'described_tag'", 'unique': 'True', 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.thread': { + 'Meta': {'object_name': 'Thread'}, + 'accepted_answer': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'answer_accepted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'answer_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), + 'close_reason': ('django.db.models.fields.SmallIntegerField', [], {'null': 'True', 'blank': 'True'}), + 'closed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'closed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'closed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'favorited_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'unused_favorite_threads'", 'symmetrical': 'False', 'through': "orm['askbot.FavoriteQuestion']", 'to': "orm['auth.User']"}), + 'favourite_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'followed_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'followed_threads'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_activity_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_activity_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'unused_last_active_in_threads'", 'to': "orm['auth.User']"}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'threads'", 'symmetrical': 'False', 'to': "orm['askbot.Tag']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'view_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.vote': { + 'Meta': {'unique_together': "(('user', 'voted_post'),)", 'object_name': 'Vote', 'db_table': "u'vote'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['auth.User']"}), + 'vote': ('django.db.models.fields.SmallIntegerField', [], {}), + 'voted_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'voted_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['askbot.Post']"}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}), + 'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}), + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), + 'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}), + 'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), + 'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['askbot'] \ No newline at end of file diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index e50baf0f..9167974e 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -1342,7 +1342,8 @@ def user_post_question( wiki = False, is_anonymous = False, timestamp = None, - by_email = False + by_email = False, + email_address = None ): """makes an assertion whether user can post the question then posts it and returns the question object""" @@ -1369,7 +1370,8 @@ def user_post_question( added_at = timestamp, wiki = wiki, is_anonymous = is_anonymous, - by_email = by_email + by_email = by_email, + email_address = email_address ) question = thread._question_post() if question.author != self: diff --git a/askbot/models/post.py b/askbot/models/post.py index 89763c1f..c1fc33d6 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -24,7 +24,7 @@ import askbot from askbot.utils.slug import slugify from askbot import const from askbot.models.user import EmailFeedSetting -from askbot.models.tag import MarkedTag, tags_match_some_wildcard +from askbot.models.tag import Tag, MarkedTag, tags_match_some_wildcard from askbot.conf import settings as askbot_settings from askbot import exceptions from askbot.utils import markup @@ -1487,7 +1487,8 @@ class Post(models.Model): text = None, comment = None, revised_at = None, - by_email = False + by_email = False, + email_address = None ): if None in (author, text): raise Exception('author, text and comment are required arguments') @@ -1509,7 +1510,8 @@ class Post(models.Model): tagnames = self.thread.tagnames, summary = comment, text = text, - by_email = by_email + by_email = by_email, + email_address = email_address ) def add_revision(self, *kargs, **kwargs): @@ -1709,9 +1711,10 @@ class PostRevision(models.Model): approved = models.BooleanField(default=False, db_index=True) approved_by = models.ForeignKey(User, null = True, blank = True) - approved_at = models.DateTimeField(null= True, blank = True) + approved_at = models.DateTimeField(null = True, blank = True) - by_email = models.BooleanField(default=False)#true, if edited by email + by_email = models.BooleanField(default = False)#true, if edited by email + email_address = models.EmailField(null = True, blank = True) # Question-specific fields title = models.CharField(max_length=300, blank=True, default='') @@ -1736,6 +1739,15 @@ class PostRevision(models.Model): return False if self.approved: return False + + #if sent by email to group and group does not want moderation + if self.by_email and self.email: + group_name = self.email.split('@')[0] + try: + group = Tag.objects.get(name = group_name, deleted = False) + return group.group.profile.moderate_email + except Tag.DoesNotExist: + pass return True return False diff --git a/askbot/models/question.py b/askbot/models/question.py index de50c0c4..9481d3ac 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -71,7 +71,8 @@ class ThreadManager(models.Manager): text, tagnames = None, is_anonymous = False, - by_email = False + by_email = False, + email_address = None ): # TODO: Some of this code will go to Post.objects.create_new @@ -114,7 +115,8 @@ class ThreadManager(models.Manager): text = text, comment = const.POST_STATUS['default_version'], revised_at = added_at, - by_email = by_email + by_email = by_email, + email_address = email_address ) # INFO: Question has to be saved before update_tags() is called diff --git a/askbot/models/user.py b/askbot/models/user.py index 3c1e0ded..f4c51cdc 100644 --- a/askbot/models/user.py +++ b/askbot/models/user.py @@ -354,6 +354,7 @@ class GroupProfile(models.Model): related_name = 'group_profile' ) logo_url = models.URLField(null = True) + moderate_email = models.BooleanField(default = True) class Meta: app_label = 'askbot' diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index f221536a..e858413d 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -2248,11 +2248,40 @@ var UserGroupProfileEditor = function(){ }; inherits(UserGroupProfileEditor, TagWikiEditor); +UserGroupProfileEditor.prototype.toggleEmailModeration = function(){ + var btn = this._moderate_email_btn; + var group_id = this.getTagId(); + $.ajax({ + type: 'POST', + dataType: 'json', + cache: false, + data: {group_id: group_id}, + url: askbot['urls']['toggle_group_email_moderation'], + success: function(data){ + if (data['success']){ + btn.html(data['new_button_text']); + } else { + showMessage(btn, data['message']); + } + } + }); +}; + UserGroupProfileEditor.prototype.decorate = function(element){ UserGroupProfileEditor.superClass_.decorate.call(this, element); var change_logo_btn = element.find('.change-logo'); this._change_logo_btn = change_logo_btn; + var moderate_email_btn = element.find('.moderate-email'); + this._moderate_email_btn = moderate_email_btn; + var me = this; + setupButtonEventHandlers( + moderate_email_btn, + function(){ + me.toggleEmailModeration(); + } + ) + var logo_changer = new ImageChanger(); logo_changer.setImageElement(element.find('.group-logo')); logo_changer.setAjaxData({ diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html index 9b7a282e..351a6df9 100644 --- a/askbot/skins/default/templates/users.html +++ b/askbot/skins/default/templates/users.html @@ -81,7 +81,16 @@ {% endif %} - + {% if group_email_moderation_enabled %} + | + {% if group.group_profile.moderate_email %} + {% trans %}disable moderation of emailed questions{% endtrans %} + {% else %} + {% trans %}moderate emailed questions{% endtrans %} + {% endif %} + {% endif %}

{% endif %}
@@ -104,6 +113,7 @@ askbot['urls']['save_tag_wiki_text'] = '{% url save_tag_wiki_text %}'; askbot['urls']['save_group_logo_url'] = '{% url save_group_logo_url %}'; askbot['urls']['delete_group_logo_url'] = '{% url delete_group_logo %}'; + askbot['urls']['toggle_group_email_moderation'] = '{% url toggle_group_email_moderation %}'; diff --git a/askbot/urls.py b/askbot/urls.py index e869d3b1..a3f694d9 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -212,6 +212,11 @@ urlpatterns = patterns('', views.commands.delete_group_logo, name = 'delete_group_logo' ), + url(#ajax only + r'^toggle-group-email-moderation/', + views.commands.toggle_group_email_moderation, + name = 'toggle_group_email_moderation' + ), url( r'^get-groups-list/', views.commands.get_groups_list, diff --git a/askbot/utils/mail.py b/askbot/utils/mail.py index 2d4d80b0..37245b5a 100644 --- a/askbot/utils/mail.py +++ b/askbot/utils/mail.py @@ -283,7 +283,8 @@ def process_emailed_question(from_address, subject, parts, tags = None): title = title, tags = tagnames, body_text = body_text, - by_email = True + by_email = True, + email_address = from_address ) else: raise ValidationError() diff --git a/askbot/views/commands.py b/askbot/views/commands.py index efb50974..7eeccabe 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -805,6 +805,24 @@ def delete_post_reject_reason(request): reason = models.PostFlagReason.objects.get(id = reason_id) reason.delete() +@csrf.csrf_exempt +@decorators.ajax_only +@decorators.post_only +@decorators.admins_only +def toggle_group_email_moderation(request): + from django.forms import IntegerField + group_id = IntegerField().clean(int(request.POST['group_id'])) + group = models.Tag.group_tags.get(id = group_id) + group.group_profile.moderate_email = not group.group_profile.moderate_email + group.group_profile.save() + if group.group_profile.moderate_email: + new_button_text = _('moderate emailed questions') + else: + new_button_text = _('disable moderation of emailed questions') + return {'new_button_text': new_button_text} + + + @csrf.csrf_exempt @decorators.ajax_only @decorators.post_only diff --git a/askbot/views/users.py b/askbot/views/users.py index b6e7d5f7..4c83a351 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -59,6 +59,7 @@ def users(request, by_group = False, group_id = None, group_slug = None): """Users view, including listing of users by group""" users = models.User.objects.all() group = None + group_email_moderation_enabled = False if by_group == True: if askbot_settings.GROUPS_ENABLED == False: raise Http404 @@ -68,6 +69,11 @@ def users(request, by_group = False, group_id = None, group_slug = None): else: try: group = models.Tag.group_tags.get(id = group_id) + group_email_moderation_enabled = \ + ( + askbot_settings.GROUP_EMAIL_ADDRESSES_ENABLED \ + and askbot_settings.ENABLE_CONTENT_MODERATION + ) except models.Tag.DoesNotExist: raise Http404 if group_slug == slugify(group.name): @@ -149,7 +155,8 @@ def users(request, by_group = False, group_id = None, group_slug = None): 'suser' : suser, 'keywords' : suser, 'tab_id' : sortby, - 'paginator_context' : paginator_context + 'paginator_context' : paginator_context, + 'group_email_moderation_enabled': group_email_moderation_enabled } return render_into_skin('users.html', data, request) -- cgit v1.2.3-1-g7c22 From da20707172cce592c61ae455a8a89190fb012c92 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 2 May 2012 18:28:20 -0400 Subject: fix to asking by email and another one to prevent creation of "blank" tags --- askbot/lamson_handlers.py | 6 ++++-- askbot/models/question.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/askbot/lamson_handlers.py b/askbot/lamson_handlers.py index 1d4bb1bc..34f93a7b 100644 --- a/askbot/lamson_handlers.py +++ b/askbot/lamson_handlers.py @@ -114,9 +114,11 @@ def get_parts(message): parts.append((part_type, part_content)) return parts -@route('(addr)@(host)') +@route('(addr)@(host)', addr = '.+') @stateless def ASK(message, host = None, addr = None): + if addr.startswith('reply-'): + return parts = get_parts(message) from_address = message.From subject = message['Subject']#why lamson does not give it normally? @@ -128,7 +130,7 @@ def ASK(message, host = None, addr = None): try: group_tag = Tag.group_tags.get( deleted = False, - name = addr + name_iexact = addr ) mail.process_emailed_question( from_address, subject, parts, tags = [group_tag.name, ] diff --git a/askbot/models/question.py b/askbot/models/question.py index 9481d3ac..4e590d94 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -676,7 +676,7 @@ class Thread(models.Model): previous_tags = list(self.tags.all()) previous_tagnames = set([tag.name for tag in previous_tags]) - updated_tagnames = set(t for t in tagnames.split(' ')) + updated_tagnames = set(t for t in tagnames.strip().split(' ')) removed_tagnames = previous_tagnames - updated_tagnames added_tagnames = updated_tagnames - previous_tagnames @@ -751,7 +751,7 @@ class Thread(models.Model): thread_question = self._question_post() - self.tagnames = tagnames + self.tagnames = tagnames.strip() self.save() # Update the Question itself -- cgit v1.2.3-1-g7c22 From 08cf300da0e745b4f8b7dee72253f4d21eb51fe4 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 3 May 2012 09:58:12 -0400 Subject: started working on allowing people to join some groups without administrators approval --- ...le_is_open__add_field_groupprofile_preapprov.py | 333 +++++++++++++++++++++ askbot/models/user.py | 21 ++ askbot/views/users.py | 9 +- 3 files changed, 362 insertions(+), 1 deletion(-) create mode 100644 askbot/migrations/0121_auto__add_field_groupprofile_is_open__add_field_groupprofile_preapprov.py diff --git a/askbot/migrations/0121_auto__add_field_groupprofile_is_open__add_field_groupprofile_preapprov.py b/askbot/migrations/0121_auto__add_field_groupprofile_is_open__add_field_groupprofile_preapprov.py new file mode 100644 index 00000000..9a7ad614 --- /dev/null +++ b/askbot/migrations/0121_auto__add_field_groupprofile_is_open__add_field_groupprofile_preapprov.py @@ -0,0 +1,333 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'GroupProfile.is_open' + db.add_column('askbot_groupprofile', 'is_open', + self.gf('django.db.models.fields.BooleanField')(default=False), + keep_default=False) + + # Adding field 'GroupProfile.preapproved_emails' + db.add_column('askbot_groupprofile', 'preapproved_emails', + self.gf('django.db.models.fields.TextField')(null=True), + keep_default=False) + + # Adding field 'GroupProfile.preapproved_email_domains' + db.add_column('askbot_groupprofile', 'preapproved_email_domains', + self.gf('django.db.models.fields.TextField')(null=True), + keep_default=False) + + def backwards(self, orm): + # Deleting field 'GroupProfile.is_open' + db.delete_column('askbot_groupprofile', 'is_open') + + # Deleting field 'GroupProfile.preapproved_emails' + db.delete_column('askbot_groupprofile', 'preapproved_emails') + + # Deleting field 'GroupProfile.preapproved_email_domains' + db.delete_column('askbot_groupprofile', 'preapproved_email_domains') + + models = { + 'askbot.activity': { + 'Meta': {'object_name': 'Activity', 'db_table': "u'activity'"}, + 'active_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'activity_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_auditted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True'}), + 'receiving_users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'received_activity'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'incoming_activity'", 'symmetrical': 'False', 'through': "orm['askbot.ActivityAuditStatus']", 'to': "orm['auth.User']"}), + 'summary': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.activityauditstatus': { + 'Meta': {'unique_together': "(('user', 'activity'),)", 'object_name': 'ActivityAuditStatus'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Activity']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.anonymousanswer': { + 'Meta': {'object_name': 'AnonymousAnswer'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'anonymous_answers'", 'to': "orm['askbot.Post']"}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.anonymousquestion': { + 'Meta': {'object_name': 'AnonymousQuestion'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.award': { + 'Meta': {'object_name': 'Award', 'db_table': "u'award'"}, + 'awarded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'badge': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_badge'", 'to': "orm['askbot.BadgeData']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'notified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_user'", 'to': "orm['auth.User']"}) + }, + 'askbot.badgedata': { + 'Meta': {'ordering': "('slug',)", 'object_name': 'BadgeData'}, + 'awarded_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'awarded_to': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'badges'", 'symmetrical': 'False', 'through': "orm['askbot.Award']", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) + }, + 'askbot.emailfeedsetting': { + 'Meta': {'unique_together': "(('subscriber', 'feed_type'),)", 'object_name': 'EmailFeedSetting'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'feed_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'frequency': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '8'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reported_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'subscriber': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notification_subscriptions'", 'to': "orm['auth.User']"}) + }, + 'askbot.favoritequestion': { + 'Meta': {'object_name': 'FavoriteQuestion', 'db_table': "u'favorite_question'"}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Thread']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_favorite_questions'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupmembership': { + 'Meta': {'object_name': 'GroupMembership'}, + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_memberships'", 'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_memberships'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupprofile': { + 'Meta': {'object_name': 'GroupProfile'}, + 'group_tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'group_profile'", 'unique': 'True', 'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_open': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'logo_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), + 'moderate_email': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'preapproved_email_domains': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'preapproved_emails': ('django.db.models.fields.TextField', [], {'null': 'True'}) + }, + 'askbot.markedtag': { + 'Meta': {'object_name': 'MarkedTag'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reason': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_selections'", 'to': "orm['askbot.Tag']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tag_selections'", 'to': "orm['auth.User']"}) + }, + 'askbot.post': { + 'Meta': {'object_name': 'Post'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'posts'", 'to': "orm['auth.User']"}), + 'comment_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'html': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_edited_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'last_edited_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_edited_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'locked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'locked_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'locked_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locked_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'offensive_flag_count': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'old_answer_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_comment_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_question_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'post_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'posts'", 'null': 'True', 'blank': 'True', 'to': "orm['askbot.Thread']"}), + 'vote_down_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'vote_up_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'wikified_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}) + }, + 'askbot.postflagreason': { + 'Meta': {'object_name': 'PostFlagReason'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'details': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'post_reject_reasons'", 'to': "orm['askbot.Post']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '128'}) + }, + 'askbot.postrevision': { + 'Meta': {'ordering': "('-revision',)", 'unique_together': "(('post', 'revision'),)", 'object_name': 'PostRevision'}, + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'approved_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'approved_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'postrevisions'", 'to': "orm['auth.User']"}), + 'by_email': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisions'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'revised_at': ('django.db.models.fields.DateTimeField', [], {}), + 'revision': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'revision_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '125', 'blank': 'True'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '300', 'blank': 'True'}) + }, + 'askbot.questionview': { + 'Meta': {'object_name': 'QuestionView'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'viewed'", 'to': "orm['askbot.Post']"}), + 'when': ('django.db.models.fields.DateTimeField', [], {}), + 'who': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'question_views'", 'to': "orm['auth.User']"}) + }, + 'askbot.replyaddress': { + 'Meta': {'object_name': 'ReplyAddress'}, + 'address': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '25'}), + 'allowed_from_email': ('django.db.models.fields.EmailField', [], {'max_length': '150'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reply_addresses'", 'to': "orm['askbot.Post']"}), + 'response_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'edit_addresses'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.repute': { + 'Meta': {'object_name': 'Repute', 'db_table': "u'repute'"}, + 'comment': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'negative': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'positive': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'reputation_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'reputed_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.tag': { + 'Meta': {'ordering': "('-used_count', 'name')", 'object_name': 'Tag', 'db_table': "u'tag'"}, + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_tags'", 'to': "orm['auth.User']"}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_tags'", 'null': 'True', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'tag_wiki': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'described_tag'", 'unique': 'True', 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.thread': { + 'Meta': {'object_name': 'Thread'}, + 'accepted_answer': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'answer_accepted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'answer_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), + 'close_reason': ('django.db.models.fields.SmallIntegerField', [], {'null': 'True', 'blank': 'True'}), + 'closed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'closed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'closed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'favorited_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'unused_favorite_threads'", 'symmetrical': 'False', 'through': "orm['askbot.FavoriteQuestion']", 'to': "orm['auth.User']"}), + 'favourite_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'followed_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'followed_threads'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_activity_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_activity_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'unused_last_active_in_threads'", 'to': "orm['auth.User']"}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'threads'", 'symmetrical': 'False', 'to': "orm['askbot.Tag']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'view_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.vote': { + 'Meta': {'unique_together': "(('user', 'voted_post'),)", 'object_name': 'Vote', 'db_table': "u'vote'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['auth.User']"}), + 'vote': ('django.db.models.fields.SmallIntegerField', [], {}), + 'voted_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'voted_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['askbot.Post']"}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}), + 'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}), + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), + 'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}), + 'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), + 'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['askbot'] \ No newline at end of file diff --git a/askbot/models/user.py b/askbot/models/user.py index f4c51cdc..6f8931a9 100644 --- a/askbot/models/user.py +++ b/askbot/models/user.py @@ -355,6 +355,27 @@ class GroupProfile(models.Model): ) logo_url = models.URLField(null = True) moderate_email = models.BooleanField(default = True) + is_open = models.BooleanField(default = False) + #preapproved email addresses and domain names to auto-join groups + #trick - the field is padded with space and all tokens are space separated + preapproved_emails = models.TextField(null = True) + #only domains - without the '@' or anything before them + preapproved_email_domains = models.TextField(null = True) class Meta: app_label = 'askbot' + + def can_accept_user(self, user): + """True if user is preapproved to join the group""" + if self.is_open: + return True + + if user.is_moderator_or_administrator(): + return True + + #relying on a specific method of storage + if (' %s ' % user.email) in self.preapproved_emails: + return True + + email_domain = user.email.split('@')[1] + return (' %s ' % email_domain) in self.preapproved_email_domains diff --git a/askbot/views/users.py b/askbot/views/users.py index 4c83a351..ebd01001 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -60,6 +60,8 @@ def users(request, by_group = False, group_id = None, group_slug = None): users = models.User.objects.all() group = None group_email_moderation_enabled = False + user_can_join_group = False + user_is_group_member = False if by_group == True: if askbot_settings.GROUPS_ENABLED == False: raise Http404 @@ -74,12 +76,15 @@ def users(request, by_group = False, group_id = None, group_slug = None): askbot_settings.GROUP_EMAIL_ADDRESSES_ENABLED \ and askbot_settings.ENABLE_CONTENT_MODERATION ) + user_can_join_group = group.group_profile.can_accept_user(request.user) except models.Tag.DoesNotExist: raise Http404 if group_slug == slugify(group.name): users = models.User.objects.filter( group_memberships__group__id = group_id ) + if request.user.is_authenticated(): + user_is_group_member = users.filter(id = request.user.id) else: group_page_url = reverse( 'users_by_group', @@ -156,7 +161,9 @@ def users(request, by_group = False, group_id = None, group_slug = None): 'keywords' : suser, 'tab_id' : sortby, 'paginator_context' : paginator_context, - 'group_email_moderation_enabled': group_email_moderation_enabled + 'group_email_moderation_enabled': group_email_moderation_enabled, + 'user_can_join_group': user_can_join_group, + 'user_is_group_member': user_is_group_member } return render_into_skin('users.html', data, request) -- cgit v1.2.3-1-g7c22 From 39b0781a42655bc1d59970ffc780997dc944c0d9 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sat, 5 May 2012 12:45:23 -0400 Subject: moved group wiki to the sidebar and made join/leave group button work --- askbot/models/__init__.py | 4 + askbot/models/user.py | 6 +- askbot/skins/common/media/js/post.js | 30 ++++++ askbot/skins/common/media/js/utils.js | 110 +++++++++++++++++++++ askbot/skins/default/media/style/style.less | 8 +- askbot/skins/default/templates/users.html | 56 +++-------- .../default/templates/widgets/group_info.html | 59 +++++++++++ askbot/urls.py | 5 + askbot/views/commands.py | 38 +++++-- askbot/views/users.py | 2 +- 10 files changed, 263 insertions(+), 55 deletions(-) create mode 100644 askbot/skins/default/templates/widgets/group_info.html diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 9167974e..12e2c97b 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2335,6 +2335,9 @@ def user_edit_group_membership(self, user = None, group = None, action = None): else: raise ValueError('invalid action') +def user_is_group_member(self, group = None): + return self.group_memberships.filter(group = group).count() == 1 + User.add_to_class( 'add_missing_askbot_subscriptions', user_add_missing_askbot_subscriptions @@ -2402,6 +2405,7 @@ User.add_to_class('is_administrator', user_is_administrator) User.add_to_class('is_administrator_or_moderator', user_is_administrator_or_moderator) User.add_to_class('set_admin_status', user_set_admin_status) User.add_to_class('edit_group_membership', user_edit_group_membership) +User.add_to_class('is_group_member', user_is_group_member) User.add_to_class('remove_admin_status', user_remove_admin_status) User.add_to_class('is_moderator', user_is_moderator) User.add_to_class('is_approved', user_is_approved) diff --git a/askbot/models/user.py b/askbot/models/user.py index 6f8931a9..e6bd6e1d 100644 --- a/askbot/models/user.py +++ b/askbot/models/user.py @@ -345,6 +345,7 @@ class GroupMembership(models.Model): class Meta: app_label = 'askbot' + unique_together = ('group', 'user') class GroupProfile(models.Model): """stores group profile data""" @@ -367,10 +368,13 @@ class GroupProfile(models.Model): def can_accept_user(self, user): """True if user is preapproved to join the group""" + if user.is_anonymous(): + return False + if self.is_open: return True - if user.is_moderator_or_administrator(): + if user.is_administrator_or_moderator(): return True #relying on a specific method of storage diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index e858413d..c597e84c 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -2298,6 +2298,36 @@ UserGroupProfileEditor.prototype.decorate = function(element){ logo_changer.decorate(change_logo_btn); }; +var GroupJoinButton = function(group_id){ + FollowToggle.call(this); + this._group_id = group_id; +}; +inherits(GroupJoinButton, FollowToggle); + +GroupJoinButton.prototype.getPostData = function(){ + return { group_id: this._group_id }; +}; + +GroupJoinButton.prototype.getHandler = function(){ + var me = this; + return function(){ + $.ajax({ + type: 'POST', + dataType: 'json', + cache: false, + data: me.getPostData(), + url: askbot['urls']['join_or_leave_group'], + success: function(data){ + if (data['success']){ + me.setOn(data['is_member']); + } else { + showMessage(me.getElement(), data['message']); + } + } + }); + }; +}; + $(document).ready(function() { $('[id^="comments-for-"]').each(function(index, element){ var comments = new PostCommentsWidget(); diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index a466efa5..0c908b5d 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -410,6 +410,10 @@ SimpleControl.prototype.setHandler = function(handler){ } }; +SimpleControl.prototype.getHandler = function(){ + return this._handler; +}; + SimpleControl.prototype.setHandlerInternal = function(){ //default internal setHandler behavior setupButtonEventHandlers(this._element, this._handler); @@ -474,6 +478,112 @@ DeleteIcon.prototype.setContent = function(content){ } } +/** + * A button on which user can click + * and become added to some group (followers, group members, etc.) + * The button has four states on-prompt, off-prompt, on-state and off-state + * on-prompt is activated on mouseover, when user is not part of group + * off-prompt - on mouseover, when user is part of group + * on-state - when user is part of group and mouse is not over the button + * off-state - same as above, but when user is not part of the group + */ +var FollowToggle = function(){ + SimpleControl.call(this); + this._state = null; + this._state_messages = {}; + this._states = [ + 'on-state', + 'off-state', + 'on-prompt', + 'off-prompt' + ]; +}; +inherits(FollowToggle, SimpleControl); + +FollowToggle.prototype.resetStyles = function(){ + var element = this._element; + var states = this._states; + $.each(states, function(idx, state){ + element.removeClass(state); + }); + this._element.html(''); +}; + +FollowToggle.prototype.isOn = function(){ + return this._element.hasClass('on'); +}; + +FollowToggle.prototype.setOn = function(is_on){ + if (is_on){ + this._element.addClass('on'); + this._element.html(this._state_messages['on-state']); + } else { + this._element.removeClass('on'); + this._element.html(this._state_messages['off-state']); + } +}; + +FollowToggle.prototype.setState = function(state){ + this._state = state; + if (this._element){ + this.resetStyles(); + this._element.addClass(state); + this._element.html(this._state_messages[state]); + } +}; + +FollowToggle.prototype.decorate = function(element){ + this._element = element; + //read messages for all states + var messages = {}; + $.each(this._states, function(idx, state){ + if (state === 'off-state'){ + return; + } + messages[state] = element.attr('data-' + state + '-text'); + }); + messages['off-state'] = messages['on-prompt'] + this._state_messages = messages; + + //detect state and save it + var text = $.trim(element.html()); + for (var i = 0; i < this._states.length; i++){ + var state = this._states[i]; + if (text === messages[state]){ + this._state = state; + break; + } + } + + //set mouseover handler + var me = this; + element.mouseover(function(){ + var is_on = me.isOn(); + if (is_on){ + me.setState('off-prompt'); + } else { + me.setState('on-prompt'); + } + element.css('background-color', 'red'); + return false; + }); + element.mouseout(function(){ + var is_on = me.isOn(); + if (is_on){ + me.setState('on-state'); + } else { + me.setState('off-state'); + } + element.css('background-color', 'white'); + return false; + }); + + setupButtonEventHandlers(element, this.getHandler()); +}; + +/** + * A list of items from where one can be selected + */ var SelectBox = function(){ WrappedElement.call(this); this._items = []; diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 88b12ebd..d97de8ab 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -3419,7 +3419,6 @@ body.anon.lang-es { .group-wiki { .content { - float: left; p:last-child { margin-bottom: 5px; } @@ -3428,13 +3427,18 @@ body.anon.lang-es { float: left; margin: 0 5px 3px 0; } + .follow-toggle.group-join-btn { + width: 150px; + margin: 4px auto 10px auto; + display: block; + } .controls { margin: 0 0 10px 0; } } img.group-logo { - height: 64px; + height: 60px;/* important to align with the line spacing */ } #groups-list { diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html index 351a6df9..595bbd72 100644 --- a/askbot/skins/default/templates/users.html +++ b/askbot/skins/default/templates/users.html @@ -51,50 +51,6 @@ {% if not users.object_list %}

{% trans %}Nothing found.{% endtrans %}

{% endif %} -{% if group %} -
- -
- {% if group.tag_wiki %} - {{ group.tag_wiki.html }} - {% endif %} -
-
- {% if request.user.is_authenticated() and request.user.is_administrator_or_moderator() %} -
- {% trans %}edit description{% endtrans %} - {% if group.group_profile.logo_url %} - | - - | - - {% else %} - | - - {% endif %} - {% if group_email_moderation_enabled %} - | - {% if group.group_profile.moderate_email %} - {% trans %}disable moderation of emailed questions{% endtrans %} - {% else %} - {% trans %}moderate emailed questions{% endtrans %} - {% endif %} - {% endif %} -
- {% endif %} -
-{% endif %} {{ macros.user_list( users.object_list, karma_mode = settings.KARMA_MODE, badges_mode = settings.BADGES_MODE @@ -104,6 +60,12 @@ {{ macros.paginator(paginator_context) }}
{% endblock %} +{% block sidebar %} + {% if group %} + {# this widget takes variables: group, user_can_join_group, user_is_group_member #} + {% include "widgets/group_info.html" %} + {% endif %} +{% endblock %} {% block endjs %} @@ -128,6 +91,11 @@ var codeFriendlyMarkdown = false; {% endif %} $().ready(function(){ + {% if group and request.user.is_authenticated() %} + var group_join_btn = new GroupJoinButton({{ group.id }}); + group_join_btn.decorate($('.group-join-btn')); + {% endif %} + //setup WMD editor if (askbot['data']['userIsAdminOrMod'] === true){ //todo: this is kind of Attacklab.init ... should not be here Attacklab.wmd = function(){ diff --git a/askbot/skins/default/templates/widgets/group_info.html b/askbot/skins/default/templates/widgets/group_info.html new file mode 100644 index 00000000..b819db79 --- /dev/null +++ b/askbot/skins/default/templates/widgets/group_info.html @@ -0,0 +1,59 @@ +
+

{% trans %}Group info{% endtrans %}

+ +
+ {% if group.tag_wiki %} + {{ group.tag_wiki.html }} + {% endif %} +
+
+ {% if user_can_join_group or user_is_group_member %} + + {% endif %} + {% if request.user.is_authenticated() and request.user.is_administrator_or_moderator() %} +
+ {% trans %}edit description{% endtrans %} + {% if group.group_profile.logo_url %} + | + + | + + {% else %} + | + + {% endif %} + {% if group_email_moderation_enabled %} + | + {% if group.group_profile.moderate_email %} + {% trans %}disable moderation of emailed questions{% endtrans %} + {% else %} + {% trans %}moderate emailed questions{% endtrans %} + {% endif %} + {% endif %} +
+ {% endif %} +
diff --git a/askbot/urls.py b/askbot/urls.py index a3f694d9..7a3eb248 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -308,6 +308,11 @@ urlpatterns = patterns('', views.commands.edit_group_membership, name='edit_group_membership' ), + url(#ajax only + r'^join-or-leave-group/$', + views.commands.join_or_leave_group, + name='join_or_leave_group' + ), url( r'^feeds/(?P.*)/$', 'django.contrib.syndication.views.feed', diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 7eeccabe..6825461e 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -10,7 +10,7 @@ from django.core import exceptions from django.core.urlresolvers import reverse from django.contrib.auth.decorators import login_required from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponseBadRequest -from django.forms import ValidationError +from django.forms import ValidationError, IntegerField from django.shortcuts import get_object_or_404 from django.views.decorators import csrf from django.utils import simplejson @@ -486,7 +486,7 @@ def get_tag_list(request): def load_tag_wiki_text(request): """returns text of the tag wiki in markdown format""" tag = get_object_or_404(models.Tag, id = request.GET['tag_id']) - tag_wiki_text = getattr(tag.tag_wiki, 'text', '') + tag_wiki_text = getattr(tag.tag_wiki, 'text', '').strip() return HttpResponse(tag_wiki_text, mimetype = 'text/plain') @csrf.csrf_exempt @@ -728,6 +728,32 @@ def read_message(request):#marks message a read return HttpResponse('') +@csrf.csrf_exempt +@decorators.ajax_only +@decorators.post_only +def join_or_leave_group(request): + """only current user can join/leave group""" + if request.user.is_anonymous(): + raise exceptions.PermissionDenied() + + group_id = IntegerField().clean(request.POST['group_id']) + group = models.Tag.objects.get(id = group_id) + + if request.user.is_group_member(group): + action = 'remove' + is_member = False + else: + action = 'add' + is_member = True + request.user.edit_group_membership( + user = request.user, + group = group, + action = action + ) + return {'is_member': is_member} + + + @csrf.csrf_exempt @decorators.ajax_only @decorators.post_only @@ -745,6 +771,7 @@ def edit_group_membership(request): ) action = form.cleaned_data['action'] + #warning: possible race condition if action == 'add': group_params = {'group_name': group_name, 'user': user} group = models.Tag.group_tags.get_or_create(**group_params) @@ -789,7 +816,6 @@ def save_group_logo_url(request): @decorators.post_only @decorators.admins_only def delete_group_logo(request): - from django.forms import IntegerField group_id = IntegerField().clean(int(request.POST['group_id'])) group = models.Tag.group_tags.get(id = group_id) group.group_profile.logo_url = None @@ -800,7 +826,6 @@ def delete_group_logo(request): @decorators.post_only @decorators.admins_only def delete_post_reject_reason(request): - from django.forms import IntegerField reason_id = IntegerField().clean(int(request.POST['reason_id'])) reason = models.PostFlagReason.objects.get(id = reason_id) reason.delete() @@ -810,15 +835,14 @@ def delete_post_reject_reason(request): @decorators.post_only @decorators.admins_only def toggle_group_email_moderation(request): - from django.forms import IntegerField group_id = IntegerField().clean(int(request.POST['group_id'])) group = models.Tag.group_tags.get(id = group_id) group.group_profile.moderate_email = not group.group_profile.moderate_email group.group_profile.save() if group.group_profile.moderate_email: - new_button_text = _('moderate emailed questions') - else: new_button_text = _('disable moderation of emailed questions') + else: + new_button_text = _('moderate emailed questions') return {'new_button_text': new_button_text} diff --git a/askbot/views/users.py b/askbot/views/users.py index ebd01001..ef0aea57 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -84,7 +84,7 @@ def users(request, by_group = False, group_id = None, group_slug = None): group_memberships__group__id = group_id ) if request.user.is_authenticated(): - user_is_group_member = users.filter(id = request.user.id) + user_is_group_member = bool(users.filter(id = request.user.id).count()) else: group_page_url = reverse( 'users_by_group', -- cgit v1.2.3-1-g7c22 From 3cb0e5f86f1a7e06f2af669676dc8e3d2b0feb12 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 6 May 2012 13:09:12 -0400 Subject: the WMD editor can now be sized and previewer can be enabled and disabled --- askbot/skins/common/media/js/post.js | 52 +++- askbot/skins/common/media/js/wmd/wmd.css | 22 +- askbot/skins/common/media/js/wmd/wmd.js | 343 ++++++++++++--------- .../skins/common/templates/widgets/edit_post.html | 6 +- askbot/skins/default/media/style/style.less | 59 ++-- askbot/views/writers.py | 1 + 6 files changed, 296 insertions(+), 187 deletions(-) diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index c597e84c..9f417642 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -1914,24 +1914,44 @@ QASwapper.prototype.startSwapping = function(){ var WMD = function(){ WrappedElement.call(this); this._markdown = undefined; + this._enabled_buttons = 'bold italic link blockquote code ' + + 'image ol ul heading hr'; + this._is_previewer_enabled = true; }; inherits(WMD, WrappedElement); +WMD.prototype.setEnabledButtons = function(buttons){ + this._enabled_buttons = buttons; +}; + +WMD.prototype.setPreviewerEnabled = function(state){ + this._is_previewer_enabled = state; + if (this._previewer){ + this._previewer.hide(); + } +}; + WMD.prototype.setEscapeHandler = function(handler){ this._escape_handler = handler; }; WMD.prototype.createDom = function(){ this._element = this.makeElement('div'); + var clearfix = this.makeElement('div').addClass('clearfix'); + this._element.append(clearfix); + + var wmd_container = this.makeElement('div'); + wmd_container.addClass('wmd-container'); + this._element.append(wmd_container); var wmd_buttons = this.makeElement('div') .attr('id', 'wmd-button-bar') .addClass('wmd-panel'); - this._element.append(wmd_buttons); + wmd_container.append(wmd_buttons); var editor = this.makeElement('textarea') .attr('id', 'editor'); - this._element.append(editor); + wmd_container.append(editor); this._textarea = editor; if (this._markdown){ @@ -1941,8 +1961,11 @@ WMD.prototype.createDom = function(){ var previewer = this.makeElement('div') .attr('id', 'previewer') .addClass('wmd-preview'); - - this._element.append(previewer); + wmd_container.append(previewer); + this._previewer = previewer; + if (this._is_previewer_enabled === false) { + previewer.hide(); + } }; WMD.prototype.setMarkdown = function(text){ @@ -1957,7 +1980,7 @@ WMD.prototype.getMarkdown = function(){ }; WMD.prototype.start = function(){ - Attacklab.Util.startEditor(true); + Attacklab.Util.startEditor(true, this._enabled_buttons); this._textarea.keyup(makeKeyHandler(27, this._escape_handler)); }; @@ -1969,6 +1992,8 @@ var TagWikiEditor = function(){ this._state = 'display';//'edit' or 'display' this._content_backup = ''; this._is_editor_loaded = false; + this._enabled_editor_buttons = null; + this._is_previewer_enabled = false; }; inherits(TagWikiEditor, WrappedElement); @@ -1976,6 +2001,17 @@ TagWikiEditor.prototype.backupContent = function(){ this._content_backup = this._content_box.contents(); }; +TagWikiEditor.prototype.setEnabledEditorButtons = function(buttons){ + this._enabled_editor_buttons = buttons; +}; + +TagWikiEditor.prototype.setPreviewerEnabled = function(state){ + this._is_previewer_enabled = state; + if (this.isEditorLoaded()){ + this._editor.setPreviewerEnabled(this._is_previewer_enabled); + } +}; + TagWikiEditor.prototype.setContent = function(content){ this._content_box.empty(); this._content_box.append(content); @@ -2095,6 +2131,10 @@ TagWikiEditor.prototype.decorate = function(element){ var me = this; var editor = new WMD(); + if (this._enabled_editor_buttons){ + editor.setEnabledButtons(this._enabled_editor_buttons); + } + editor.setPreviewerEnabled(this._is_previewer_enabled); editor.setEscapeHandler(function(){me.cancelEdit()}); this._editor = editor; setupButtonEventHandlers(edit_btn, function(){ me.startActivatingEditor() }); @@ -2268,6 +2308,8 @@ UserGroupProfileEditor.prototype.toggleEmailModeration = function(){ }; UserGroupProfileEditor.prototype.decorate = function(element){ + this.setEnabledEditorButtons('bold italic link ol ul'); + this.setPreviewerEnabled(false); UserGroupProfileEditor.superClass_.decorate.call(this, element); var change_logo_btn = element.find('.change-logo'); this._change_logo_btn = change_logo_btn; diff --git a/askbot/skins/common/media/js/wmd/wmd.css b/askbot/skins/common/media/js/wmd/wmd.css index 3ad615e7..678d70f3 100644 --- a/askbot/skins/common/media/js/wmd/wmd.css +++ b/askbot/skins/common/media/js/wmd/wmd.css @@ -10,12 +10,9 @@ #wmd-button-bar { background: url(images/editor-toolbar-background.png) repeat-x bottom; - height:36px; - border-left:#cce6ec 3px solid; - border-top:#cce6ec 3px solid; - border-right:#cce6ec 3px solid; - float:left; - width:730px; + height: 30px; + border: 0; + display: block; } #wmd-input @@ -39,10 +36,7 @@ #wmd-button-row { position: relative; - margin-left: 5px; - margin-right: 5px; - margin-bottom: 0px; - margin-top: 10px; + margin: 10px 2px 0 2px; padding: 0px; height: 20px; } @@ -51,9 +45,9 @@ { width: 1px; height: 20px; - margin-left: 14px; - - position: absolute; + margin-left: 2px; + margin-right: 4px; + /*position: absolute;*/ background-color: Silver; display: inline-block; list-style: none; @@ -66,7 +60,7 @@ margin-left: 5px; margin-right: 5px; - position: absolute; + /*position: absolute;*/ background-image: url(images/wmd-buttons.png); background-repeat: no-repeat; background-position: 0px 0px; diff --git a/askbot/skins/common/media/js/wmd/wmd.js b/askbot/skins/common/media/js/wmd/wmd.js index 90b59a56..19f32c87 100644 --- a/askbot/skins/common/media/js/wmd/wmd.js +++ b/askbot/skins/common/media/js/wmd/wmd.js @@ -69,7 +69,7 @@ Attacklab.wmdBase = function(){ var helpLink = "http://wmd-editor.com/"; var helpHoverTitle = "WMD website"; var helpTarget = "_blank"; - var localUploadFileName = null; + var localUploadFileName = null; // ------------------------------------------------------------------- // END OF YOUR CHANGES @@ -849,6 +849,11 @@ util.prompt = function(text, defaultInputText, makeLinkMarkdown, dialogType){ var creationHandle; var undoMgr; // The undo manager + + var isButtonUsed = function(button){ + var buttons = $.trim(wmd.wmd_env.buttons).split(/\s+/); + return $.inArray(button, buttons) !== -1; + }; // Perform the button's action. var doClick = function(button){ @@ -971,159 +976,198 @@ util.prompt = function(text, defaultInputText, makeLinkMarkdown, dialogType){ buttonRow.id = "wmd-button-row"; buttonRow = buttonBar.appendChild(buttonRow); + if (isButtonUsed('bold')){ + var boldButton = document.createElement("li"); + boldButton.className = "wmd-button"; + boldButton.id = "wmd-bold-button"; + boldButton.title = toolbar_strong_label; + boldButton.XShift = "0px"; + boldButton.textOp = command.doBold; + setupButton(boldButton, true); + buttonRow.appendChild(boldButton); + } - var boldButton = document.createElement("li"); - boldButton.className = "wmd-button"; - boldButton.id = "wmd-bold-button"; - boldButton.title = toolbar_strong_label; - boldButton.XShift = "0px"; - boldButton.textOp = command.doBold; - setupButton(boldButton, true); - buttonRow.appendChild(boldButton); - - var italicButton = document.createElement("li"); - italicButton.className = "wmd-button"; - italicButton.id = "wmd-italic-button"; - italicButton.title = toolbar_emphasis_label; - italicButton.XShift = "-20px"; - italicButton.textOp = command.doItalic; - setupButton(italicButton, true); - buttonRow.appendChild(italicButton); + if (isButtonUsed('italic')){ + var italicButton = document.createElement("li"); + italicButton.className = "wmd-button"; + italicButton.id = "wmd-italic-button"; + italicButton.title = toolbar_emphasis_label; + italicButton.XShift = "-20px"; + italicButton.textOp = command.doItalic; + setupButton(italicButton, true); + buttonRow.appendChild(italicButton); + } - var spacer1 = document.createElement("li"); - spacer1.className = "wmd-spacer"; - spacer1.id = "wmd-spacer1"; - buttonRow.appendChild(spacer1); + if ( + isButtonUsed('link') || + isButtonUsed('blockquote') || + isButtonUsed('code') || + isButtonUsed('image') || + isButtonUsed('attachment') + ) { + var spacer1 = document.createElement("li"); + spacer1.className = "wmd-spacer"; + spacer1.id = "wmd-spacer1"; + buttonRow.appendChild(spacer1); + } - var linkButton = document.createElement("li"); - linkButton.className = "wmd-button"; - linkButton.id = "wmd-link-button"; - linkButton.title = toolbar_hyperlink_label; - linkButton.XShift = "-40px"; - linkButton.textOp = function(chunk, postProcessing){ - return command.doLinkOrImage(chunk, postProcessing, 'link'); - }; - setupButton(linkButton, true); - buttonRow.appendChild(linkButton); + if (isButtonUsed('link')){ + var linkButton = document.createElement("li"); + linkButton.className = "wmd-button"; + linkButton.id = "wmd-link-button"; + linkButton.title = toolbar_hyperlink_label; + linkButton.XShift = "-40px"; + linkButton.textOp = function(chunk, postProcessing){ + return command.doLinkOrImage(chunk, postProcessing, 'link'); + }; + setupButton(linkButton, true); + buttonRow.appendChild(linkButton); + } - var quoteButton = document.createElement("li"); - quoteButton.className = "wmd-button"; - quoteButton.id = "wmd-quote-button"; - quoteButton.title = toolbar_blockquote_label; - quoteButton.XShift = "-60px"; - quoteButton.textOp = command.doBlockquote; - setupButton(quoteButton, true); - buttonRow.appendChild(quoteButton); - - var codeButton = document.createElement("li"); - codeButton.className = "wmd-button"; - codeButton.id = "wmd-code-button"; - codeButton.title = toolbar_code_label; - codeButton.XShift = "-80px"; - codeButton.textOp = command.doCode; - setupButton(codeButton, true); - buttonRow.appendChild(codeButton); + if (isButtonUsed('blockquote')){ + var quoteButton = document.createElement("li"); + quoteButton.className = "wmd-button"; + quoteButton.id = "wmd-quote-button"; + quoteButton.title = toolbar_blockquote_label; + quoteButton.XShift = "-60px"; + quoteButton.textOp = command.doBlockquote; + setupButton(quoteButton, true); + buttonRow.appendChild(quoteButton); + } + + if (isButtonUsed('code')){ + var codeButton = document.createElement("li"); + codeButton.className = "wmd-button"; + codeButton.id = "wmd-code-button"; + codeButton.title = toolbar_code_label; + codeButton.XShift = "-80px"; + codeButton.textOp = command.doCode; + setupButton(codeButton, true); + buttonRow.appendChild(codeButton); + } - var imageButton = document.createElement("li"); - imageButton.className = "wmd-button"; - imageButton.id = "wmd-image-button"; - imageButton.title = toolbar_image_label; - imageButton.XShift = "-100px"; - imageButton.textOp = function(chunk, postProcessing){ - return command.doLinkOrImage(chunk, postProcessing, 'image'); - }; - setupButton(imageButton, true); - buttonRow.appendChild(imageButton); + if (isButtonUsed('image')){ + var imageButton = document.createElement("li"); + imageButton.className = "wmd-button"; + imageButton.id = "wmd-image-button"; + imageButton.title = toolbar_image_label; + imageButton.XShift = "-100px"; + imageButton.textOp = function(chunk, postProcessing){ + return command.doLinkOrImage(chunk, postProcessing, 'image'); + }; + setupButton(imageButton, true); + buttonRow.appendChild(imageButton); + } - var attachmentButton = document.createElement("li"); - attachmentButton.className = "wmd-button"; - attachmentButton.id = "wmd-attachment-button"; - attachmentButton.title = toolbar_attachment_label; - attachmentButton.XShift = "-120px"; - attachmentButton.textOp = function(chunk, postProcessing){ - return command.doLinkOrImage(chunk, postProcessing, 'file'); - }; - setupButton(attachmentButton, true); - buttonRow.appendChild(attachmentButton); + if (isButtonUsed('attachment')){ + var attachmentButton = document.createElement("li"); + attachmentButton.className = "wmd-button"; + attachmentButton.id = "wmd-attachment-button"; + attachmentButton.title = toolbar_attachment_label; + attachmentButton.XShift = "-120px"; + attachmentButton.textOp = function(chunk, postProcessing){ + return command.doLinkOrImage(chunk, postProcessing, 'file'); + }; + setupButton(attachmentButton, true); + buttonRow.appendChild(attachmentButton); + } - var spacer2 = document.createElement("li"); - spacer2.className = "wmd-spacer"; - spacer2.id = "wmd-spacer2"; - buttonRow.appendChild(spacer2); + if ( + isButtonUsed('ol') || + isButtonUsed('ul') || + isButtonUsed('heading') || + isButtonUsed('hr') + ) { + var spacer2 = document.createElement("li"); + spacer2.className = "wmd-spacer"; + spacer2.id = "wmd-spacer2"; + buttonRow.appendChild(spacer2); + } - var olistButton = document.createElement("li"); - olistButton.className = "wmd-button"; - olistButton.id = "wmd-olist-button"; - olistButton.title = toolbar_numbered_label; - olistButton.XShift = "-140px"; - olistButton.textOp = function(chunk, postProcessing){ - command.doList(chunk, postProcessing, true); - }; - setupButton(olistButton, true); - buttonRow.appendChild(olistButton); - - var ulistButton = document.createElement("li"); - ulistButton.className = "wmd-button"; - ulistButton.id = "wmd-ulist-button"; - ulistButton.title = toolbar_bulleted_label; - ulistButton.XShift = "-160px"; - ulistButton.textOp = function(chunk, postProcessing){ - command.doList(chunk, postProcessing, false); - }; - setupButton(ulistButton, true); - buttonRow.appendChild(ulistButton); - - var headingButton = document.createElement("li"); - headingButton.className = "wmd-button"; - headingButton.id = "wmd-heading-button"; - headingButton.title = toolbar_heading_label; - headingButton.XShift = "-180px"; - headingButton.textOp = command.doHeading; - setupButton(headingButton, true); - buttonRow.appendChild(headingButton); - - var hrButton = document.createElement("li"); - hrButton.className = "wmd-button"; - hrButton.id = "wmd-hr-button"; - hrButton.title = toolbar_horizontal_label; - hrButton.XShift = "-200px"; - hrButton.textOp = command.doHorizontalRule; - setupButton(hrButton, true); - buttonRow.appendChild(hrButton); - - var spacer3 = document.createElement("li"); - spacer3.className = "wmd-spacer"; - spacer3.id = "wmd-spacer3"; - buttonRow.appendChild(spacer3); - - var undoButton = document.createElement("li"); - undoButton.className = "wmd-button"; - undoButton.id = "wmd-undo-button"; - undoButton.title = toolbar_undo_label; - undoButton.XShift = "-220px"; - undoButton.execute = function(manager){ - manager.undo(); - }; - setupButton(undoButton, true); - buttonRow.appendChild(undoButton); + if (isButtonUsed('ol')) { + var olistButton = document.createElement("li"); + olistButton.className = "wmd-button"; + olistButton.id = "wmd-olist-button"; + olistButton.title = toolbar_numbered_label; + olistButton.XShift = "-140px"; + olistButton.textOp = function(chunk, postProcessing){ + command.doList(chunk, postProcessing, true); + }; + setupButton(olistButton, true); + buttonRow.appendChild(olistButton); + } - var redoButton = document.createElement("li"); - redoButton.className = "wmd-button"; - redoButton.id = "wmd-redo-button"; - redoButton.title = toolbar_redo_label; - if (/win/.test(nav.platform.toLowerCase())) { - redoButton.title = toolbar_redo_label; - } - else { - // mac and other non-Windows platforms - redoButton.title = gettext('redo') + " - Ctrl+Shift+Z"; - } - redoButton.XShift = "-240px"; - redoButton.execute = function(manager){ - manager.redo(); - }; - setupButton(redoButton, true); - buttonRow.appendChild(redoButton); + if (isButtonUsed('ul')) { + var ulistButton = document.createElement("li"); + ulistButton.className = "wmd-button"; + ulistButton.id = "wmd-ulist-button"; + ulistButton.title = toolbar_bulleted_label; + ulistButton.XShift = "-160px"; + ulistButton.textOp = function(chunk, postProcessing){ + command.doList(chunk, postProcessing, false); + }; + setupButton(ulistButton, true); + buttonRow.appendChild(ulistButton); + } + + if (isButtonUsed('heading')) { + var headingButton = document.createElement("li"); + headingButton.className = "wmd-button"; + headingButton.id = "wmd-heading-button"; + headingButton.title = toolbar_heading_label; + headingButton.XShift = "-180px"; + headingButton.textOp = command.doHeading; + setupButton(headingButton, true); + buttonRow.appendChild(headingButton); + } + + if (isButtonUsed('hr')) { + var hrButton = document.createElement("li"); + hrButton.className = "wmd-button"; + hrButton.id = "wmd-hr-button"; + hrButton.title = toolbar_horizontal_label; + hrButton.XShift = "-200px"; + hrButton.textOp = command.doHorizontalRule; + setupButton(hrButton, true); + buttonRow.appendChild(hrButton); + } + + if (isButtonUsed('undo')){ + var spacer3 = document.createElement("li"); + spacer3.className = "wmd-spacer"; + spacer3.id = "wmd-spacer3"; + buttonRow.appendChild(spacer3); + + var undoButton = document.createElement("li"); + undoButton.className = "wmd-button"; + undoButton.id = "wmd-undo-button"; + undoButton.title = toolbar_undo_label; + undoButton.XShift = "-220px"; + undoButton.execute = function(manager){ + manager.undo(); + }; + setupButton(undoButton, true); + buttonRow.appendChild(undoButton); + + var redoButton = document.createElement("li"); + redoButton.className = "wmd-button"; + redoButton.id = "wmd-redo-button"; + redoButton.title = toolbar_redo_label; + if (/win/.test(nav.platform.toLowerCase())) { + redoButton.title = toolbar_redo_label; + } + else { + // mac and other non-Windows platforms + redoButton.title = gettext('redo') + " - Ctrl+Shift+Z"; + } + redoButton.XShift = "-240px"; + redoButton.execute = function(manager){ + manager.redo(); + }; + setupButton(redoButton, true); + buttonRow.appendChild(redoButton); + setUndoRedoButtonStates(); + } /* var helpButton = document.createElement("li"); helpButton.className = "wmd-button"; @@ -1140,7 +1184,6 @@ util.prompt = function(text, defaultInputText, makeLinkMarkdown, dialogType){ setupButton(helpButton, true); buttonRow.appendChild(helpButton); */ - setUndoRedoButtonStates(); }; var setupEditor = function(){ @@ -1149,7 +1192,7 @@ util.prompt = function(text, defaultInputText, makeLinkMarkdown, dialogType){ wmd.nativeUndo = true; } - if (!wmd.nativeUndo) { + if (!wmd.nativeUndo && isButtonUsed('undo')) { undoMgr = new wmd.undoManager(function(){ previewRefreshCallback(); setUndoRedoButtonStates(); @@ -1817,13 +1860,17 @@ util.prompt = function(text, defaultInputText, makeLinkMarkdown, dialogType){ wmd.wmd.previewManager = wmd.previewManager; }; - util.startEditor = function(start_now){ + util.startEditor = function(start_now, buttons){ if (wmd.wmd_env.autostart === false) { util.makeAPI(); return; } + if (buttons){ + wmd.wmd_env.buttons = buttons; + } + var edit; // The editor (buttons + input + outputs) - the main object. var previewMgr; // The preview manager. diff --git a/askbot/skins/common/templates/widgets/edit_post.html b/askbot/skins/common/templates/widgets/edit_post.html index ee84f443..66f79237 100644 --- a/askbot/skins/common/templates/widgets/edit_post.html +++ b/askbot/skins/common/templates/widgets/edit_post.html @@ -7,9 +7,11 @@
{% endif %} -
-
+
+
{{ post_form.text }}{# this element is resizable and will be wrapped by js #} +
+
{# need label element for resizable input, b/c form validation won't find span #} diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index d97de8ab..43f5be61 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -1296,11 +1296,11 @@ ul#related-tags li { margin: 0px; padding: 0px 0 0 5px; border:#cce6ec 3px solid; - width:725px; + width:719px; } } -.ask-page, .edit-question-page{ +.ask-page, .edit-question-page { div#question-list { float: none; @@ -1379,18 +1379,37 @@ ul#related-tags li { background: url(../images/medium-button.png) bottom repeat-x; .text-shadow(0px, 1px, 0px, #c6d9dd) } -#editor { /*adjustment for editor preview*/ + +.wmd-container { + border:#cce6ec 3px solid; +} +.users-page .wmd-container { + width: 200px; +} +.ask-page, +.question-page, +.edit-question-page, +.edit-answer-page { + .wmd-container { + width: 723px; + } + #editor { + width: 710px; + padding: 6px; + } +} + +#editor { /* adjustment for editor preview */ + display: block; font-size: 100%; min-height: 200px; line-height: 18px; - margin:0; - border-left:#cce6ec 3px solid; - border-bottom:#cce6ec 3px solid; - border-right:#cce6ec 3px solid; - border-top:0; - padding:10px; - margin-bottom:10px; - width:710px; + margin: 0; + border: 0; +} + +.users-page #editor { + width: 192px; } #id_title { @@ -1398,8 +1417,8 @@ ul#related-tags li { } .wmd-preview { - margin: 3px 0 5px 0; - padding: 6px; + margin: 0; + padding: 5px; background-color: #F5F5F5; min-height: 20px; overflow: auto; @@ -1407,9 +1426,13 @@ ul#related-tags li { font-family:@body-font; p{ - margin-bottom:14px; - line-height:1.4; - font-size:14px; + margin-bottom: 14px; + line-height: 1.4; + font-size: 14px; + } + + p:last-child{ + margin-bottom: 0; } } @@ -1482,7 +1505,7 @@ ul#related-tags li { margin: 0px; padding: 0px 0 0 5px; border:#cce6ec 3px solid; - width:725px; + width: 719px; margin-bottom:10px; } #id_summary{ @@ -3419,7 +3442,7 @@ body.anon.lang-es { .group-wiki { .content { - p:last-child { + > p:last-child { margin-bottom: 5px; } } diff --git a/askbot/views/writers.py b/askbot/views/writers.py index 633c23f2..c77c874f 100644 --- a/askbot/views/writers.py +++ b/askbot/views/writers.py @@ -457,6 +457,7 @@ def edit_answer(request, id): revision_form = forms.RevisionForm(answer, latest_revision) form = forms.EditAnswerForm(answer, latest_revision) data = { + 'page_class': 'edit-answer-page', 'active_tab': 'questions', 'answer': answer, 'revision_form': revision_form, -- cgit v1.2.3-1-g7c22 From 10279a75eeee523dd16db092b9e1da424f9060dc Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 6 May 2012 17:58:32 -0400 Subject: added "anyone can join" control to the group profile editor --- askbot/skins/common/media/js/post.js | 27 ++++-- askbot/skins/common/media/js/utils.js | 103 ++++++++++++++++----- .../default/media/bootstrap/css/bootstrap.css | 8 +- askbot/skins/default/media/style/style.less | 6 +- .../default/templates/user_profile/user_inbox.html | 2 +- askbot/skins/default/templates/users.html | 6 +- .../default/templates/widgets/group_info.html | 30 ++++-- askbot/urls.py | 8 +- askbot/views/commands.py | 71 +++++++------- 9 files changed, 172 insertions(+), 89 deletions(-) diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index 9f417642..e018197c 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -2314,15 +2314,22 @@ UserGroupProfileEditor.prototype.decorate = function(element){ var change_logo_btn = element.find('.change-logo'); this._change_logo_btn = change_logo_btn; - var moderate_email_btn = element.find('.moderate-email'); + var moderate_email_toggle = new TwoStateToggle(); + moderate_email_toggle.setPostData({ + group_id: this.getTagId(), + property_name: 'moderate_email' + }); + var moderate_email_btn = element.find('#moderate-email'); this._moderate_email_btn = moderate_email_btn; - var me = this; - setupButtonEventHandlers( - moderate_email_btn, - function(){ - me.toggleEmailModeration(); - } - ) + moderate_email_toggle.decorate(moderate_email_btn); + + var open_group_toggle = new TwoStateToggle(); + open_group_toggle.setPostData({ + group_id: this.getTagId(), + property_name: 'is_open' + }); + var open_group_btn = element.find('#open-or-close-group'); + open_group_toggle.decorate(open_group_btn); var logo_changer = new ImageChanger(); logo_changer.setImageElement(element.find('.group-logo')); @@ -2341,10 +2348,10 @@ UserGroupProfileEditor.prototype.decorate = function(element){ }; var GroupJoinButton = function(group_id){ - FollowToggle.call(this); + TwoStateToggle.call(this); this._group_id = group_id; }; -inherits(GroupJoinButton, FollowToggle); +inherits(GroupJoinButton, TwoStateToggle); GroupJoinButton.prototype.getPostData = function(){ return { group_id: this._group_id }; diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index 0c908b5d..d69777cd 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -481,13 +481,14 @@ DeleteIcon.prototype.setContent = function(content){ /** * A button on which user can click * and become added to some group (followers, group members, etc.) + * or toggle some state on/off * The button has four states on-prompt, off-prompt, on-state and off-state * on-prompt is activated on mouseover, when user is not part of group * off-prompt - on mouseover, when user is part of group * on-state - when user is part of group and mouse is not over the button * off-state - same as above, but when user is not part of the group */ -var FollowToggle = function(){ +var TwoStateToggle = function(){ SimpleControl.call(this); this._state = null; this._state_messages = {}; @@ -497,10 +498,21 @@ var FollowToggle = function(){ 'on-prompt', 'off-prompt' ]; + this._handler = this.getDefaultHandler(); + this._post_data = {}; + this.toggleUrl = '';//public property }; -inherits(FollowToggle, SimpleControl); +inherits(TwoStateToggle, SimpleControl); -FollowToggle.prototype.resetStyles = function(){ +TwoStateToggle.prototype.setPostData = function(data){ + this._post_data = data; +}; + +TwoStateToggle.prototype.getPostData = function(){ + return this._post_data; +}; + +TwoStateToggle.prototype.resetStyles = function(){ var element = this._element; var states = this._states; $.each(states, function(idx, state){ @@ -509,11 +521,11 @@ FollowToggle.prototype.resetStyles = function(){ this._element.html(''); }; -FollowToggle.prototype.isOn = function(){ +TwoStateToggle.prototype.isOn = function(){ return this._element.hasClass('on'); }; -FollowToggle.prototype.setOn = function(is_on){ +TwoStateToggle.prototype.setOn = function(is_on){ if (is_on){ this._element.addClass('on'); this._element.html(this._state_messages['on-state']); @@ -523,35 +535,78 @@ FollowToggle.prototype.setOn = function(is_on){ } }; -FollowToggle.prototype.setState = function(state){ +TwoStateToggle.prototype.getDefaultHandler = function(){ + var me = this; + return function(){ + var data = me.getPostData(); + data['disable'] = me.isOn(); + $.ajax({ + type: 'POST', + dataType: 'json', + cache: false, + url: me.toggleUrl, + data: data, + success: function(data) { + if (data['success']) { + me.setOn('is_enabled'); + } else { + showMessage(me.getElement(), data['message']); + } + } + }); + }; +}; + +TwoStateToggle.prototype.setState = function(state){ + var element = this._element; this._state = state; - if (this._element){ - this.resetStyles(); - this._element.addClass(state); - this._element.html(this._state_messages[state]); + if (element) { + if ( + element.attr('nodeName') === 'INPUT' && + element.attr('type') === 'checkbox' + ) { + if (state === 'on-state') { + element.attr('checked', true); + } else if (state === 'off-state') { + element.attr('checked', false); + } + } else { + this.resetStyles(); + element.addClass(state); + this._element.html(this._state_messages[state]); + } } }; -FollowToggle.prototype.decorate = function(element){ +TwoStateToggle.prototype.decorate = function(element){ this._element = element; //read messages for all states var messages = {}; - $.each(this._states, function(idx, state){ - if (state === 'off-state'){ - return; - } - messages[state] = element.attr('data-' + state + '-text'); - }); - messages['off-state'] = messages['on-prompt'] + messages['on-state'] = + element.attr('data-on-state-text') || gettext('enabled'); + messages['off-state'] = + element.attr('data-off-state-text') || gettext('disabled'); + messages['on-prompt'] = + element.attr('data-on-prompt-text') || messages['on-state']; + messages['off-prompt'] = + element.attr('data-off-prompt-text') || messages['off-state']; this._state_messages = messages; + this.toggleUrl = element.attr('data-toggle-url'); + //detect state and save it - var text = $.trim(element.html()); - for (var i = 0; i < this._states.length; i++){ - var state = this._states[i]; - if (text === messages[state]){ - this._state = state; - break; + if ( + element.attr('nodeName') === 'INPUT' && element.attr('type', 'checkbox') + ) { + this._state = element.attr('checked') ? 'state-on' : 'state-off'; + } else { + var text = $.trim(element.html()); + for (var i = 0; i < this._states.length; i++){ + var state = this._states[i]; + if (text === messages[state]){ + this._state = state; + break; + } } } diff --git a/askbot/skins/default/media/bootstrap/css/bootstrap.css b/askbot/skins/default/media/bootstrap/css/bootstrap.css index 5ffd980f..9447a9a2 100644 --- a/askbot/skins/default/media/bootstrap/css/bootstrap.css +++ b/askbot/skins/default/media/bootstrap/css/bootstrap.css @@ -570,7 +570,7 @@ pre code { max-height: 340px; overflow-y: scroll; } -.label { +/*.label { padding: 1px 4px 2px; font-size: 10.998px; font-weight: bold; @@ -587,7 +587,7 @@ pre code { .label:hover { color: #ffffff; text-decoration: none; -} +}*/ .label-important { background-color: #b94a48; } @@ -3076,10 +3076,10 @@ input[type="submit"].btn.btn-mini { display: inline-block; padding: 5px 14px; background-color: #fff; - border: 1px solid #ddd; + /*border: 1px solid #ddd; -webkit-border-radius: 15px; -moz-border-radius: 15px; - border-radius: 15px; + border-radius: 15px;*/ } .pager a:hover { text-decoration: none; diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 43f5be61..27424871 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -673,6 +673,11 @@ body.anon { } } +.users-page .box label { + display: inline; + float: none; +} + .statsWidget p{ color:@info-text; font-size:16px; @@ -2133,7 +2138,6 @@ ul#related-tags li { .openid-signin, .meta, -.users-page, .user-profile-edit-page, { font-size:13px; diff --git a/askbot/skins/default/templates/user_profile/user_inbox.html b/askbot/skins/default/templates/user_profile/user_inbox.html index ee7057e3..cda45027 100644 --- a/askbot/skins/default/templates/user_profile/user_inbox.html +++ b/askbot/skins/default/templates/user_profile/user_inbox.html @@ -1,7 +1,7 @@ {% extends "user_profile/user.html" %} {% import "macros.html" as macros %} {% block before_css %} - + {% endblock %} {# diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html index 595bbd72..ec4946bb 100644 --- a/askbot/skins/default/templates/users.html +++ b/askbot/skins/default/templates/users.html @@ -2,6 +2,11 @@ {% import "macros.html" as macros %} {% block title %}{% spaceless %}{% trans %}Users{% endtrans %}{% endspaceless %}{% endblock %} +{% block before_css %} + {% if group and request.user.is_administrator() %} + + {% endif %} +{% endblock %} {% block forestyle %} {% endblock %} @@ -75,7 +80,6 @@ askbot['urls']['save_tag_wiki_text'] = '{% url save_tag_wiki_text %}'; askbot['urls']['save_group_logo_url'] = '{% url save_group_logo_url %}'; askbot['urls']['delete_group_logo_url'] = '{% url delete_group_logo %}'; - askbot['urls']['toggle_group_email_moderation'] = '{% url toggle_group_email_moderation %}'; askbot['urls']['join_or_leave_group'] = '{% url join_or_leave_group %}'; diff --git a/askbot/skins/default/templates/widgets/group_info.html b/askbot/skins/default/templates/widgets/group_info.html index b819db79..7e4b3e1e 100644 --- a/askbot/skins/default/templates/widgets/group_info.html +++ b/askbot/skins/default/templates/widgets/group_info.html @@ -19,6 +19,7 @@ data-off-prompt-text="{% trans %}Leave this group{% endtrans %}" data-on-prompt-text="{% trans %}Join this group{% endtrans %}" data-on-state-text="{% trans %}You are a member{% endtrans %}" + data-off-state-text="{% trans %}Join this group{% endtrans %}" > {% if user_is_group_member %} {% trans %}You are a member{% endtrans %} @@ -29,7 +30,7 @@ {% endif %} {% endif %} - {% if request.user.is_authenticated() and request.user.is_administrator_or_moderator() %} + {% if request.user.is_authenticated() and request.user.is_administrator() %}
{% trans %}edit description{% endtrans %} @@ -44,16 +45,27 @@ {% endif %} +
{% if group_email_moderation_enabled %} - | - {% if group.group_profile.moderate_email %} - {% trans %}disable moderation of emailed questions{% endtrans %} - {% else %} - {% trans %}moderate emailed questions{% endtrans %} - {% endif %} + + +
{% endif %} + + +
{% endif %}
diff --git a/askbot/urls.py b/askbot/urls.py index 7a3eb248..fb9ea977 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -213,9 +213,9 @@ urlpatterns = patterns('', name = 'delete_group_logo' ), url(#ajax only - r'^toggle-group-email-moderation/', - views.commands.toggle_group_email_moderation, - name = 'toggle_group_email_moderation' + r'^toggle-group-profile-property/', + views.commands.toggle_group_profile_property, + name = 'toggle_group_profile_property' ), url( r'^get-groups-list/', @@ -311,7 +311,7 @@ urlpatterns = patterns('', url(#ajax only r'^join-or-leave-group/$', views.commands.join_or_leave_group, - name='join_or_leave_group' + name = 'join_or_leave_group' ), url( r'^feeds/(?P.*)/$', diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 6825461e..4a560f1e 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -10,7 +10,7 @@ from django.core import exceptions from django.core.urlresolvers import reverse from django.contrib.auth.decorators import login_required from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponseBadRequest -from django.forms import ValidationError, IntegerField +from django.forms import ValidationError, IntegerField, CharField from django.shortcuts import get_object_or_404 from django.views.decorators import csrf from django.utils import simplejson @@ -728,32 +728,6 @@ def read_message(request):#marks message a read return HttpResponse('') -@csrf.csrf_exempt -@decorators.ajax_only -@decorators.post_only -def join_or_leave_group(request): - """only current user can join/leave group""" - if request.user.is_anonymous(): - raise exceptions.PermissionDenied() - - group_id = IntegerField().clean(request.POST['group_id']) - group = models.Tag.objects.get(id = group_id) - - if request.user.is_group_member(group): - action = 'remove' - is_member = False - else: - action = 'add' - is_member = True - request.user.edit_group_membership( - user = request.user, - group = group, - action = action - ) - return {'is_member': is_member} - - - @csrf.csrf_exempt @decorators.ajax_only @decorators.post_only @@ -821,6 +795,7 @@ def delete_group_logo(request): group.group_profile.logo_url = None group.group_profile.save() + @csrf.csrf_exempt @decorators.ajax_only @decorators.post_only @@ -830,21 +805,47 @@ def delete_post_reject_reason(request): reason = models.PostFlagReason.objects.get(id = reason_id) reason.delete() + @csrf.csrf_exempt @decorators.ajax_only @decorators.post_only @decorators.admins_only -def toggle_group_email_moderation(request): +def toggle_group_profile_property(request): + #todo: this might be changed to more general "toggle object property" group_id = IntegerField().clean(int(request.POST['group_id'])) - group = models.Tag.group_tags.get(id = group_id) - group.group_profile.moderate_email = not group.group_profile.moderate_email + property_name = CharField().clean(request.POST['property_name']) + assert property_name in ('is_open', 'moderate_email') + + group = models.Tag.objects.get(id = group_id) + new_value = not getattr(group.group_profile, property_name) + setattr(group.group_profile, property_name, new_value) group.group_profile.save() - if group.group_profile.moderate_email: - new_button_text = _('disable moderation of emailed questions') - else: - new_button_text = _('moderate emailed questions') - return {'new_button_text': new_button_text} + return {'is_enabled': new_value} + + +@csrf.csrf_exempt +@decorators.ajax_only +@decorators.post_only +def join_or_leave_group(request): + """only current user can join/leave group""" + if request.user.is_anonymous(): + raise exceptions.PermissionDenied() + group_id = IntegerField().clean(request.POST['group_id']) + group = models.Tag.objects.get(id = group_id) + + if request.user.is_group_member(group): + action = 'remove' + is_member = False + else: + action = 'add' + is_member = True + request.user.edit_group_membership( + user = request.user, + group = group, + action = action + ) + return {'is_member': is_member} @csrf.csrf_exempt -- cgit v1.2.3-1-g7c22 From 0c46a9b987373e5a791cf1c5bd731a682aa652c6 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Mon, 7 May 2012 09:10:27 -0400 Subject: saving pre-approved emails&domains works, but no validation yet --- askbot/skins/common/media/js/post.js | 6 + askbot/skins/common/media/js/utils.js | 204 ++++++++++++++++++++- askbot/skins/default/templates/users.html | 1 + .../default/templates/widgets/group_info.html | 21 +++ askbot/urls.py | 5 + askbot/views/commands.py | 28 +++ 6 files changed, 260 insertions(+), 5 deletions(-) diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index e018197c..f6157848 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -2331,6 +2331,12 @@ UserGroupProfileEditor.prototype.decorate = function(element){ var open_group_btn = element.find('#open-or-close-group'); open_group_toggle.decorate(open_group_btn); + var email_editor = new TextPropertyEditor(); + email_editor.decorate(element.find('#preapproved-emails')); + + var domain_editor = new TextPropertyEditor(); + domain_editor.decorate(element.find('#preapproved-email-domains')); + var logo_changer = new ImageChanger(); logo_changer.setImageElement(element.find('.group-logo')); logo_changer.setAjaxData({ diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index d69777cd..f01f5bcf 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -296,11 +296,13 @@ TippedInput.prototype.getVal = function(){ }; TippedInput.prototype.setVal = function(value){ - this._element.val(value); - if (this.isBlank()){ - this._element.addClass('blank'); - } else { - this._element.removeClass('blank'); + if (value) { + this._element.val(value); + if (this.isBlank()){ + this._element.addClass('blank'); + } else { + this._element.removeClass('blank'); + } } }; @@ -346,6 +348,17 @@ AlertBox.prototype.setClass = function(classes){ } }; +AlertBox.prototype.setError = function(state){ + this._is_error = state; + if (this._element) { + if (state === true) { + this._element.addClass('alert-error'); + } else { + this._element.removeClass('alert-error'); + } + } +}; + AlertBox.prototype.setText = function(text){ this._text = text; if (this._content){ @@ -377,6 +390,10 @@ AlertBox.prototype.createDom = function(){ this._element = this.makeElement('div'); this._element.addClass('alert fade in'); + if (this._is_error) { + this.setError(this._is_error); + } + if (this._classes){ this._element.addClass(this._classes); } @@ -478,6 +495,183 @@ DeleteIcon.prototype.setContent = function(content){ } } +/** + * attaches a modal menu with a text editor + * to a link. The modal menu is from bootstrap.js + */ +var TextPropertyEditor = function(){ + WrappedElement.call(this); + this._editor = null; +}; +inherits(TextPropertyEditor, WrappedElement); + +TextPropertyEditor.prototype.getWidgetData = function(){ + var data = this._element.data(); + return { + object_id: data['objectId'], + model_name: data['modelName'], + property_name: data['propertyName'], + url: data['url'], + help_text: data['helpText'], + editor_heading: data['editorHeading'] + }; +}; + +TextPropertyEditor.prototype.makeEditor = function(){ + if (this._editor) { + return this._editor; + } + var editor = this.makeElement('div') + .addClass('modal'); + this._editor = editor; + + var header = this.makeElement('div') + .addClass('modal-header'); + editor.append(header); + + var close_link = this.makeElement('div') + .addClass('close') + .attr('data-dismiss', 'modal') + .html('x'); + header.append(close_link); + + var title = this.makeElement('h3') + .html(this.getWidgetData()['editor_heading']); + header.append(title); + + var body = this.makeElement('div') + .addClass('modal-body'); + editor.append(body); + + var textarea = this.makeElement('textarea') + .addClass('tipped-input blank') + .val(this.getWidgetData()['help_text']); + body.append(textarea); + + var tipped_input = new TippedInput(); + tipped_input.decorate(textarea); + this._text_input = tipped_input; + + var footer = this.makeElement('div') + .addClass('modal-footer'); + editor.append(footer); + + var save_btn = this.makeElement('button') + .addClass('btn btn-primary') + .html(gettext('Save')); + footer.append(save_btn); + + var cancel_btn = this.makeElement('button') + .addClass('btn cancel') + .html(gettext('Cancel')); + footer.append(cancel_btn); + + var me = this; + setupButtonEventHandlers(save_btn, function(){ + me.saveData(); + }); + setupButtonEventHandlers(cancel_btn, function(){ + editor.modal('hide'); + }); + editor.modal('hide'); + + $(document).append(editor); + return editor; +}; + +TextPropertyEditor.prototype.openEditor = function(){ + this._editor.modal('show'); +}; + +TextPropertyEditor.prototype.clearMessages = function(){ + this._editor.find('.alert').remove(); +}; + +TextPropertyEditor.prototype.getAlert = function(){ + if (this._alert) { + return this._alert; + } else { + var box = new AlertBox(); + this._alert = box; + this._editor.find('.modal-body').prepend(box.getElement()); + return box; + } +}; + +TextPropertyEditor.prototype.showAlert = function(text){ + var box = this.getAlert(); + box.setError(false); + box.setText(text); +}; + +TextPropertyEditor.prototype.showError = function(text){ + var box = this.getAlert(); + box.setError(true); + box.setText(text); +}; + +TextPropertyEditor.prototype.setText = function(text){ + this._text_input.setVal(text); +}; + +TextPropertyEditor.prototype.getText = function(){ + return this._text_input.getVal(); +}; + +TextPropertyEditor.prototype.hideDialog = function(){ + this._editor.modal('hide'); +}; + +TextPropertyEditor.prototype.startOpeningEditor = function(){ + var me = this; + $.ajax({ + type: 'GET', + dataType: 'json', + cache: false, + url: me.getWidgetData()['url'], + data: me.getWidgetData(), + success: function(data){ + if (data['success']) { + me.makeEditor(); + me.setText(data['text']); + me.openEditor(); + } else { + showMessage(me.getElement(), data['message']); + } + } + }); +}; + +TextPropertyEditor.prototype.saveData = function(){ + var data = this.getWidgetData(); + data['text'] = this.getText(); + var me = this; + $.ajax({ + type: 'POST', + dataType: 'json', + cache: false, + url: me.getWidgetData()['url'], + data: data, + success: function(data) { + if (data['success']) { + me.showAlert(gettext('saved')); + setTimeout(function(){ + me.clearMessages(); + me.hideDialog(); + }, 1000); + } else { + me.showError(data['message']); + } + } + }); +}; + +TextPropertyEditor.prototype.decorate = function(element){ + this._element = element; + var me = this; + setupButtonEventHandlers(element, function(){ me.startOpeningEditor() }); +}; + /** * A button on which user can click * and become added to some group (followers, group members, etc.) diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html index ec4946bb..343a3494 100644 --- a/askbot/skins/default/templates/users.html +++ b/askbot/skins/default/templates/users.html @@ -82,6 +82,7 @@ askbot['urls']['delete_group_logo_url'] = '{% url delete_group_logo %}'; askbot['urls']['join_or_leave_group'] = '{% url join_or_leave_group %}'; + diff --git a/askbot/skins/default/templates/widgets/group_info.html b/askbot/skins/default/templates/widgets/group_info.html index 7e4b3e1e..601930af 100644 --- a/askbot/skins/default/templates/widgets/group_info.html +++ b/askbot/skins/default/templates/widgets/group_info.html @@ -66,6 +66,27 @@ {% trans %}anyone can join{% endtrans %}
+ {% trans %}edit preapproved emails{% endtrans %} +
+ {% trans %}edit preapproved email domains{% endtrans %} {% endif %} diff --git a/askbot/urls.py b/askbot/urls.py index fb9ea977..fa29e64e 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -217,6 +217,11 @@ urlpatterns = patterns('', views.commands.toggle_group_profile_property, name = 'toggle_group_profile_property' ), + url(#ajax only + r'^edit-object-property-text/', + views.commands.edit_object_property_text, + name = 'edit_object_property_text' + ), url( r'^get-groups-list/', views.commands.get_groups_list, diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 4a560f1e..62db014f 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -823,6 +823,34 @@ def toggle_group_profile_property(request): return {'is_enabled': new_value} +@csrf.csrf_exempt +@decorators.ajax_only +@decorators.admins_only +def edit_object_property_text(request): + model_name = CharField().clean(request.REQUEST['model_name']) + object_id = IntegerField().clean(request.REQUEST['object_id']) + property_name = CharField().clean(request.REQUEST['property_name']) + + accessible_fields = ( + ('GroupProfile', 'preapproved_emails'), + ('GroupProfile', 'preapproved_email_domains') + ) + + if (model_name, property_name) not in accessible_fields: + raise exceptions.PermissionDenied() + + query_set = models.get_model(model_name).objects.filter(id=object_id) + if request.method == 'POST': + text = CharField().clean(request.POST['text']) + params = dict() + params[str(property_name)] = text #dammit str() + query_set.update(**params) + elif request.method == 'GET': + return {'text': getattr(query_set[0], property_name)} + else: + raise exceptions.PermissionDenied() + + @csrf.csrf_exempt @decorators.ajax_only @decorators.post_only -- cgit v1.2.3-1-g7c22 From f7d0836fef60e876be23cb15747865aadfe27379 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Mon, 7 May 2012 16:31:15 -0400 Subject: added a possibility to have independent set of "subscribed" tags in addition to "favorite/ignored" --- askbot/conf/forum_data_rules.py | 14 + askbot/const/__init__.py | 13 +- askbot/forms.py | 2 +- askbot/management/commands/get_tag_stats.py | 50 +++- .../0122_auth_user__add_subscribed_tag_field.py | 320 +++++++++++++++++++++ askbot/models/__init__.py | 69 +++-- askbot/models/question.py | 15 +- askbot/models/tag.py | 6 +- askbot/skins/common/media/js/tag_selector.js | 64 +++-- .../common/templates/widgets/tag_selector.html | 33 ++- askbot/skins/default/media/style/style.less | 9 +- .../default/templates/main_page/javascript.html | 1 + askbot/urls.py | 7 + askbot/views/commands.py | 2 +- askbot/views/readers.py | 8 +- 15 files changed, 546 insertions(+), 67 deletions(-) create mode 100644 askbot/migrations/0122_auth_user__add_subscribed_tag_field.py diff --git a/askbot/conf/forum_data_rules.py b/askbot/conf/forum_data_rules.py index be23eab7..491ebfa8 100644 --- a/askbot/conf/forum_data_rules.py +++ b/askbot/conf/forum_data_rules.py @@ -186,6 +186,20 @@ settings.register( ) ) +settings.register( + livesettings.BooleanValue( + FORUM_DATA_RULES, + 'SUBSCRIBED_TAG_SELECTOR_ENABLED', + default = False, + description = _('Use separate set for subscribed tags'), + help_text = _( + 'If enabled, users will have a third set of tag selections ' + '- "subscribed" (by email) in additon to "interesting" ' + 'and "ignored"' + ) + ) +) + settings.register( livesettings.IntegerValue( FORUM_DATA_RULES, diff --git a/askbot/const/__init__.py b/askbot/const/__init__.py index 305239f5..7eef91d1 100644 --- a/askbot/const/__init__.py +++ b/askbot/const/__init__.py @@ -249,10 +249,15 @@ POST_STATUS = { INCLUDE_ALL = 0 EXCLUDE_IGNORED = 1 INCLUDE_INTERESTING = 2 -TAG_FILTER_STRATEGY_CHOICES = ( - (INCLUDE_ALL, _('off')), - (EXCLUDE_IGNORED, _('exclude ignored')), - (INCLUDE_INTERESTING, _('only selected')), +TAG_DISPLAY_FILTER_STRATEGY_CHOICES = ( + (INCLUDE_ALL, _('show all tags')), + (EXCLUDE_IGNORED, _('exclude ignored tags')), + (INCLUDE_INTERESTING, _('only interesting tags')), +) +TAG_EMAIL_FILTER_STRATEGY_CHOICES = ( + (INCLUDE_ALL, _('email for all tags')), + (EXCLUDE_IGNORED, _('exclude ignored tags')), + (INCLUDE_INTERESTING, _('only subscribed tags')), ) NOTIFICATION_DELIVERY_SCHEDULE_CHOICES = ( diff --git a/askbot/forms.py b/askbot/forms.py index c5b72365..11df5f8d 100644 --- a/askbot/forms.py +++ b/askbot/forms.py @@ -1020,7 +1020,7 @@ class EditUserForm(forms.Form): class TagFilterSelectionForm(forms.ModelForm): email_tag_filter_strategy = forms.ChoiceField( - choices = const.TAG_FILTER_STRATEGY_CHOICES, + choices = const.TAG_DISPLAY_FILTER_STRATEGY_CHOICES, initial = const.EXCLUDE_IGNORED, label = _('Choose email tag filter'), widget = forms.RadioSelect diff --git a/askbot/management/commands/get_tag_stats.py b/askbot/management/commands/get_tag_stats.py index c30643b3..b065a6a1 100644 --- a/askbot/management/commands/get_tag_stats.py +++ b/askbot/management/commands/get_tag_stats.py @@ -2,6 +2,7 @@ import sys import optparse from django.core.management.base import BaseCommand, CommandError from askbot import models +from askbot import const def get_tag_lines(tag_marks, width = 25): output = list() @@ -120,15 +121,30 @@ class Command(BaseCommand): for bad_tag in user.ignored_tags.split(): ignored_tags.append(bad_tag) + subscribed_tags = list() + subscribed_tags.extend( + tag_marks.filter( + reason='subscribed' + ).values_list( + 'tag__name', flat = True + ) + ) + + for subscribed_tag in user.subscribed_tags.split(): + subscribed_tags.append(subscribed_tag) + followed_count = len(followed_tags) ignored_count = len(ignored_tags) - if followed_count == 0 and ignored_count == 0 and print_empty == False: + subscribed_count = len(subscribed_tags) + total_count = followed_count + ignored_count + subscribed_count + if total_count == 0 and print_empty == False: continue if item_count == 0: - print '%-28s %25s %25s' % ('User (id)', 'Interesting tags', 'Ignored tags') - print '%-28s %25s %25s' % ('=========', '================', '============') + print '%-28s %25s %25s %25s' % ('User (id)', 'Interesting tags', 'Ignored tags', 'Subscribed tags') + print '%-28s %25s %25s %25s' % ('=========', '================', '============', '===============') followed_lines = get_tag_lines(followed_tags, width = 25) ignored_lines = get_tag_lines(ignored_tags, width = 25) + subscribed_lines = get_tag_lines(subscribed_tags, width = 25) follow = '*' if user.email_tag_filter_strategy == const.INCLUDE_INTERESTING: @@ -138,7 +154,8 @@ class Command(BaseCommand): [user_string,], followed_lines, ignored_lines, - format_string = '%-28s %25s %25s' + subscribed_lines, + format_string = '%-28s %25s %25s %25s' ) item_count += 1 for line in output_lines: @@ -163,16 +180,23 @@ class Command(BaseCommand): interesting_tags = models.Tag.objects.get_by_wildcards(wk) for tag in interesting_tags: if tag.name not in wild: - wild[tag.name] = [0, 0] + wild[tag.name] = [0, 0, 0] wild[tag.name][0] += 1 wk = user.ignored_tags.strip().split() ignored_tags = models.Tag.objects.get_by_wildcards(wk) for tag in ignored_tags: if tag.name not in wild: - wild[tag.name] = [0, 0] + wild[tag.name] = [0, 0, 0] wild[tag.name][1] += 1 + wk = user.subscribed_tags.strip().split() + subscribed_tags = models.Tag.objects.get_by_wildcards(wk) + for tag in subscribed_tags: + if tag.name not in wild: + wild[tag.name] = [0, 0, 0] + wild[tag.name][2] += 1 + return wild def print_sub_counts(self, print_empty): @@ -185,6 +209,7 @@ class Command(BaseCommand): for tag in tags: wild_follow = 0 wild_ignore = 0 + wild_sub = 0 if tag.name in wild_tags: (wild_follow, wild_ignore) = wild_tags[tag.name] @@ -193,17 +218,22 @@ class Command(BaseCommand): + wild_follow ignore_count = tag_marks.filter(reason='bad').count() \ + wild_ignore + subscribe_count = tag_marks.filter(reason='subscribe').count() \ + + wild_sub follow_str = '%d (%d)' % (follow_count, wild_follow) ignore_str = '%d (%d)' % (ignore_count, wild_ignore) + subscribe_str = '%d (%d)' % (subscribe_count, wild_sub) + counts = (11-len(subscribe_str)) * ' ' + subscribe_str + ' ' counts = (11-len(follow_str)) * ' ' + follow_str + ' ' counts += (11-len(ignore_str)) * ' ' + ignore_str - if follow_count + ignore_count == 0 and print_empty == False: + total_count = follow_count + ignore_count + subscribe_count + if total_count == 0 and print_empty == False: continue if item_count == 0: - print '%-32s %12s %12s' % ('', 'Interesting', 'Ignored ') - print '%-32s %12s %12s' % ('Tag name', 'Total(wild)', 'Total(wild)') - print '%-32s %12s %12s' % ('========', '===========', '===========') + print '%-32s %12s %12s %12s' % ('', 'Subscribed', 'Ignored ', 'Interesting') + print '%-32s %12s %12s %12s' % ('Tag name', 'Total(wild)', 'Total(wild)', 'Total(wild)') + print '%-32s %12s %12s %12s' % ('========', '===========', '===========', '===========') print '%-32s %s' % (tag.name, counts) item_count += 1 diff --git a/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py b/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py new file mode 100644 index 00000000..50d4c379 --- /dev/null +++ b/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py @@ -0,0 +1,320 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + try: + # Adding field 'User.interesting_tags' + db.add_column(u'auth_user', 'subscribed_tags', self.gf('django.db.models.fields.TextField')(blank=True, default = ''), keep_default=False) + except: + pass + + def backwards(self, orm): + # Deleting field 'User.interesting_tags' + db.delete_column('auth_user', 'subscribed_tags') + + + models = { + 'askbot.activity': { + 'Meta': {'object_name': 'Activity', 'db_table': "u'activity'"}, + 'active_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'activity_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_auditted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True'}), + 'receiving_users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'received_activity'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'incoming_activity'", 'symmetrical': 'False', 'through': "orm['askbot.ActivityAuditStatus']", 'to': "orm['auth.User']"}), + 'summary': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.activityauditstatus': { + 'Meta': {'unique_together': "(('user', 'activity'),)", 'object_name': 'ActivityAuditStatus'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Activity']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.anonymousanswer': { + 'Meta': {'object_name': 'AnonymousAnswer'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'anonymous_answers'", 'to': "orm['askbot.Post']"}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.anonymousquestion': { + 'Meta': {'object_name': 'AnonymousQuestion'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.award': { + 'Meta': {'object_name': 'Award', 'db_table': "u'award'"}, + 'awarded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'badge': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_badge'", 'to': "orm['askbot.BadgeData']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'notified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_user'", 'to': "orm['auth.User']"}) + }, + 'askbot.badgedata': { + 'Meta': {'ordering': "('slug',)", 'object_name': 'BadgeData'}, + 'awarded_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'awarded_to': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'badges'", 'symmetrical': 'False', 'through': "orm['askbot.Award']", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) + }, + 'askbot.emailfeedsetting': { + 'Meta': {'unique_together': "(('subscriber', 'feed_type'),)", 'object_name': 'EmailFeedSetting'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'feed_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'frequency': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '8'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reported_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'subscriber': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notification_subscriptions'", 'to': "orm['auth.User']"}) + }, + 'askbot.favoritequestion': { + 'Meta': {'object_name': 'FavoriteQuestion', 'db_table': "u'favorite_question'"}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Thread']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_favorite_questions'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupmembership': { + 'Meta': {'unique_together': "(('group', 'user'),)", 'object_name': 'GroupMembership'}, + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_memberships'", 'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_memberships'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupprofile': { + 'Meta': {'object_name': 'GroupProfile'}, + 'group_tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'group_profile'", 'unique': 'True', 'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_open': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'logo_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), + 'moderate_email': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'preapproved_email_domains': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'preapproved_emails': ('django.db.models.fields.TextField', [], {'null': 'True'}) + }, + 'askbot.markedtag': { + 'Meta': {'object_name': 'MarkedTag'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reason': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_selections'", 'to': "orm['askbot.Tag']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tag_selections'", 'to': "orm['auth.User']"}) + }, + 'askbot.post': { + 'Meta': {'object_name': 'Post'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'posts'", 'to': "orm['auth.User']"}), + 'comment_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'html': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_edited_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'last_edited_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_edited_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'locked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'locked_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'locked_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locked_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'offensive_flag_count': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'old_answer_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_comment_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_question_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'post_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'posts'", 'null': 'True', 'blank': 'True', 'to': "orm['askbot.Thread']"}), + 'vote_down_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'vote_up_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'wikified_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}) + }, + 'askbot.postflagreason': { + 'Meta': {'object_name': 'PostFlagReason'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'details': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'post_reject_reasons'", 'to': "orm['askbot.Post']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '128'}) + }, + 'askbot.postrevision': { + 'Meta': {'ordering': "('-revision',)", 'unique_together': "(('post', 'revision'),)", 'object_name': 'PostRevision'}, + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'approved_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'approved_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'postrevisions'", 'to': "orm['auth.User']"}), + 'by_email': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisions'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'revised_at': ('django.db.models.fields.DateTimeField', [], {}), + 'revision': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'revision_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '125', 'blank': 'True'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '300', 'blank': 'True'}) + }, + 'askbot.questionview': { + 'Meta': {'object_name': 'QuestionView'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'viewed'", 'to': "orm['askbot.Post']"}), + 'when': ('django.db.models.fields.DateTimeField', [], {}), + 'who': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'question_views'", 'to': "orm['auth.User']"}) + }, + 'askbot.replyaddress': { + 'Meta': {'object_name': 'ReplyAddress'}, + 'address': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '25'}), + 'allowed_from_email': ('django.db.models.fields.EmailField', [], {'max_length': '150'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reply_addresses'", 'to': "orm['askbot.Post']"}), + 'response_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'edit_addresses'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.repute': { + 'Meta': {'object_name': 'Repute', 'db_table': "u'repute'"}, + 'comment': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'negative': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'positive': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'reputation_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'reputed_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.tag': { + 'Meta': {'ordering': "('-used_count', 'name')", 'object_name': 'Tag', 'db_table': "u'tag'"}, + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_tags'", 'to': "orm['auth.User']"}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_tags'", 'null': 'True', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'tag_wiki': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'described_tag'", 'unique': 'True', 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.thread': { + 'Meta': {'object_name': 'Thread'}, + 'accepted_answer': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'answer_accepted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'answer_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), + 'close_reason': ('django.db.models.fields.SmallIntegerField', [], {'null': 'True', 'blank': 'True'}), + 'closed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'closed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'closed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'favorited_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'unused_favorite_threads'", 'symmetrical': 'False', 'through': "orm['askbot.FavoriteQuestion']", 'to': "orm['auth.User']"}), + 'favourite_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'followed_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'followed_threads'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_activity_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_activity_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'unused_last_active_in_threads'", 'to': "orm['auth.User']"}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'threads'", 'symmetrical': 'False', 'to': "orm['askbot.Tag']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'view_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.vote': { + 'Meta': {'unique_together': "(('user', 'voted_post'),)", 'object_name': 'Vote', 'db_table': "u'vote'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['auth.User']"}), + 'vote': ('django.db.models.fields.SmallIntegerField', [], {}), + 'voted_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'voted_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['askbot.Post']"}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}), + 'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}), + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), + 'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}), + 'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), + 'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}), + 'subscribed_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['askbot'] diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 12e2c97b..6513d918 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -99,17 +99,18 @@ User.add_to_class('about', models.TextField(blank=True)) #interesting tags and ignored tags are to store wildcard tag selections only User.add_to_class('interesting_tags', models.TextField(blank = True)) User.add_to_class('ignored_tags', models.TextField(blank = True)) +User.add_to_class('subscribed_tags', models.TextField(blank = True)) User.add_to_class( 'email_tag_filter_strategy', models.SmallIntegerField( - choices=const.TAG_FILTER_STRATEGY_CHOICES, + choices=const.TAG_DISPLAY_FILTER_STRATEGY_CHOICES, default=const.EXCLUDE_IGNORED ) ) User.add_to_class( 'display_tag_filter_strategy', models.SmallIntegerField( - choices=const.TAG_FILTER_STRATEGY_CHOICES, + choices=const.TAG_EMAIL_FILTER_STRATEGY_CHOICES, default=const.INCLUDE_ALL ) ) @@ -210,8 +211,12 @@ def user_has_affinity_to_question(self, question = None, affinity_type = None): affinity_type can be either "like" or "dislike" """ if affinity_type == 'like': - tag_selection_type = 'good' - wildcards = self.interesting_tags.split() + if askbot_settings.SUBSCRIBED_TAG_SELECTOR_ENABLED: + tag_selection_type = 'subscribed' + wildcards = self.subscribed_tags.split() + else: + tag_selection_type = 'good' + wildcards = self.interesting_tags.split() elif affinity_type == 'dislike': tag_selection_type = 'bad' wildcards = self.ignored_tags.split() @@ -1087,7 +1092,10 @@ def user_mark_tags( cleaned_wildcards = list() assert(action in ('add', 'remove')) if action == 'add': - assert(reason in ('good', 'bad')) + if askbot_settings.SUBSCRIBED_TAG_SELECTOR_ENABLED: + assert(reason in ('good', 'bad', 'subscribed')) + else: + assert(reason in ('good', 'bad')) if wildcards: cleaned_wildcards = self.update_wildcard_tag_selections( action = action, @@ -1102,6 +1110,13 @@ def user_mark_tags( user = self, tag__name__in = tagnames ) + #Marks for "good" and "bad" reasons are exclusive, + #to make it impossible to "like" and "dislike" something at the same time + #but the subscribed set is independent - e.g. you can dislike a topic + #and still subscribe for it. + if reason == 'subscribed':#don't touch good/bad marks + marked_ts = marked_ts.filter(reason = 'subscribed') + #todo: use the user api methods here instead of the straight ORM cleaned_tagnames = list() #those that were actually updated if action == 'remove': @@ -1123,7 +1138,8 @@ def user_mark_tags( cleaned_tagnames.extend(marked_names) cleaned_tagnames.extend(new_marks) else: - marked_ts.update(reason=reason) + if reason in ('good', 'bad'):#to maintain exclusivity of 'good' and 'bad' + marked_ts.update(reason=reason) cleaned_tagnames = tagnames return cleaned_tagnames, cleaned_wildcards @@ -1945,20 +1961,26 @@ def user_get_tag_filtered_questions(self, questions = None): thread__tags__in = ignored_tags ).exclude( thread__tags__in = ignored_by_wildcards - ) + ).distinct() elif self.email_tag_filter_strategy == const.INCLUDE_INTERESTING: + if askbot_settings.SUBSCRIBED_TAG_SELECTOR_ENABLED: + reason = 'subscribed' + wk = self.subscribed_tags.strip().split() + else: + reason = 'good' + wk = self.interesting_tags.strip().split() + selected_tags = Tag.objects.filter( - user_selections__reason = 'good', + user_selections__reason = reason, user_selections__user = self ) - wk = self.interesting_tags.strip().split() selected_by_wildcards = Tag.objects.get_by_wildcards(wk) tag_filter = models.Q(thread__tags__in = list(selected_tags)) \ | models.Q(thread__tags__in = list(selected_by_wildcards)) - return questions.filter( tag_filter ) + return questions.filter( tag_filter ).distinct() else: return questions @@ -2293,29 +2315,40 @@ def user_update_wildcard_tag_selections( """updates the user selection of wildcard tags and saves the user object to the database """ + if askbot_settings.SUBSCRIBED_TAG_SELECTOR_ENABLED: + assert reason in ('good', 'bad', 'subscribed') + else: + assert reason in ('good', 'bad') + new_tags = set(wildcards) interesting = set(self.interesting_tags.split()) ignored = set(self.ignored_tags.split()) + subscribed = set(self.subscribed_tags.split()) - target_set = interesting - other_set = ignored if reason == 'good': - pass + target_set = interesting + other_set = ignored elif reason == 'bad': target_set = ignored other_set = interesting + elif reason == 'subscribed': + target_set = subscribed + other_set = None else: assert(action == 'remove') if action == 'add': target_set.update(new_tags) - other_set.difference_update(new_tags) + if reason in ('good', 'bad'): + other_set.difference_update(new_tags) else: target_set.difference_update(new_tags) - other_set.difference_update(new_tags) + if reason in ('good', 'bad'): + other_set.difference_update(new_tags) self.interesting_tags = ' '.join(interesting) self.ignored_tags = ' '.join(ignored) + self.subscribed_tags = ' '.join(subscribed) self.save() return new_tags @@ -2938,10 +2971,14 @@ def complete_pending_tag_subscriptions(sender, request, *args, **kwargs): """save pending tag subscriptions saved in the session""" if 'subscribe_for_tags' in request.session: (pure_tag_names, wildcards) = request.session.pop('subscribe_for_tags') + if askbot_settings.SUBSCRIBED_TAG_SELECTOR_ENABLED: + reason = 'subscribed' + else: + reason = 'good' request.user.mark_tags( pure_tag_names, wildcards, - reason = 'good', + reason = reason, action = 'add' ) request.user.message_set.create( diff --git a/askbot/models/question.py b/askbot/models/question.py index 4e590d94..597a95ae 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -226,8 +226,19 @@ class ThreadManager(models.Manager): if request_user and request_user.is_authenticated(): #mark questions tagged with interesting tags #a kind of fancy annotation, would be nice to avoid it - interesting_tags = Tag.objects.filter(user_selections__user=request_user, user_selections__reason='good') - ignored_tags = Tag.objects.filter(user_selections__user=request_user, user_selections__reason='bad') + interesting_tags = Tag.objects.filter( + user_selections__user = request_user, + user_selections__reason = 'good' + ) + ignored_tags = Tag.objects.filter( + user_selections__user = request_user, + user_selections__reason = 'bad' + ) + if askbot_settings.SUBSCRIBED_TAG_SELECTOR_ENABLED: + meta_data['subscribed_tag_names'] = Tag.objects.filter( + user_selections__user = request_user, + user_selections__reason = 'subscribed' + ).values_list('name', flat = True) meta_data['interesting_tag_names'] = [tag.name for tag in interesting_tags] meta_data['ignored_tag_names'] = [tag.name for tag in ignored_tags] diff --git a/askbot/models/tag.py b/askbot/models/tag.py index 06171067..779c0b68 100644 --- a/askbot/models/tag.py +++ b/askbot/models/tag.py @@ -157,7 +157,11 @@ class Tag(models.Model): return self.name class MarkedTag(models.Model): - TAG_MARK_REASONS = (('good', _('interesting')), ('bad', _('ignored'))) + TAG_MARK_REASONS = ( + ('good', _('interesting')), + ('bad', _('ignored')), + ('subscribed', _('subscribed')), + ) tag = models.ForeignKey('Tag', related_name='user_selections') user = models.ForeignKey(User, related_name='tag_selections') reason = models.CharField(max_length=16, choices=TAG_MARK_REASONS) diff --git a/askbot/skins/common/media/js/tag_selector.js b/askbot/skins/common/media/js/tag_selector.js index 445a1e44..274ac7de 100644 --- a/askbot/skins/common/media/js/tag_selector.js +++ b/askbot/skins/common/media/js/tag_selector.js @@ -1,4 +1,3 @@ - var TagDetailBox = function(box_type){ WrappedElement.call(this); this.box_type = box_type; @@ -101,17 +100,20 @@ function pickedTags(){ var interestingTags = {}; var ignoredTags = {}; + var subscribedTags {}; var interestingTagDetailBox = new TagDetailBox('interesting'); var ignoredTagDetailBox = new TagDetailBox('ignored'); + var subscribedTagDetailBox = new TagDetailBox('subscribed'); var sendAjax = function(tagnames, reason, action, callback){ var url = ''; - if (action == 'add'){ - if (reason == 'good'){ + if (action == 'add') { + if (reason == 'good') { url = askbot['urls']['mark_interesting_tag']; - } - else { + } else if (reason == 'bad') { url = askbot['urls']['mark_ignored_tag']; + } else { + url = askbot['urls']['mark_subscribed_tag']; } } else { @@ -154,19 +156,23 @@ function pickedTags(){ var getTagList = function(reason){ var base_selector = '.marked-tags'; - if (reason === 'good'){ + if (reason === 'good') { var extra_selector = '.interesting'; - } else { + } else if (reason === 'bad') { var extra_selector = '.ignored'; + } else if (reason === 'subscribed') { + var extra_selector = '.subscribed'; } return $(base_selector + extra_selector); }; var getWildcardTagDetailBox = function(reason){ - if (reason === 'good'){ + if (reason === 'good') { return interestingTagDetailBox; - } else { + } else if (reason === 'bad') { return ignoredTagDetailBox; + } else if (reason === 'subscribed') { + return subscribedTagDetailBox; } }; @@ -230,27 +236,29 @@ function pickedTags(){ var to_target = interestingTags; var from_target = ignoredTags; var to_tag_container; - if (reason == 'bad'){ + if (reason === 'bad') { var input_sel = '#ignoredTagInput'; to_target = ignoredTags; from_target = interestingTags; to_tag_container = $('div .tags.ignored'); - } - else if (reason == 'good'){ + } else if (reason === 'good') { var input_sel = '#interestingTagInput'; to_tag_container = $('div .tags.interesting'); - } - else { + } else if (reason === 'subscribed') { + var input_sel = $('div .tags.subscribed'); + } else { return; } var tagnames = getUniqueWords($(input_sel).attr('value')); - $.each(tagnames, function(idx, tagname){ - if (tagname in from_target){ - unpickTag(from_target,tagname,reason,false); - } - }); + if (reason !== 'subscribed') {//for "subscribed" we do not remove + $.each(tagnames, function(idx, tagname){ + if (tagname in from_target){ + unpickTag(from_target,tagname,reason,false); + } + }); + } var clean_tagnames = []; $.each(tagnames, function(idx, tagname){ @@ -281,15 +289,16 @@ function pickedTags(){ }; var collectPickedTags = function(section){ - if (section === 'interesting'){ + if (section === 'interesting') { var reason = 'good'; var tag_store = interestingTags; - } - else if (section === 'ignored'){ + } else if (section === 'ignored') { var reason = 'bad'; var tag_store = ignoredTags; - } - else { + } else if (section === 'subscribed') { + var reason = 'subscribed'; + var tag_store = subscribedTags; + } else { return; } $('.' + section + '.tags.marked-tags .tag-left').each( @@ -344,7 +353,9 @@ function pickedTags(){ init: function(){ collectPickedTags('interesting'); collectPickedTags('ignored'); + collectPickedTags('subscribed'); setupTagFilterControl('display'); + setupTagFilterControl('email'); var ac = new AutoCompleter({ url: askbot['urls']['get_tag_list'], preloadData: true, @@ -364,8 +375,13 @@ function pickedTags(){ ignoredTagAc.decorate($('#ignoredTagInput')); ignoredTagAc.setOption('onItemSelect', getResultCallback('bad')); + var subscribedTagAc = $.extend(true, {}, ac); + subscribedTagAc.decorate($('#subscribedTagInput')); + subscribedTagAc.setOption('onItemSelect', getResultCallback('subscribed')); + $("#interestingTagAdd").click(getResultCallback('good')); $("#ignoredTagAdd").click(getResultCallback('bad')); + $("#subscribedTagAdd").click(getResultCallback('subscribed')); } }; } diff --git a/askbot/skins/common/templates/widgets/tag_selector.html b/askbot/skins/common/templates/widgets/tag_selector.html index ff298488..8d955f25 100644 --- a/askbot/skins/common/templates/widgets/tag_selector.html +++ b/askbot/skins/common/templates/widgets/tag_selector.html @@ -35,14 +35,45 @@   + {% if settings.SUBSCRIBED_TAG_SELECTOR_ENABLED %} +

{% trans %}Subscribed tags{% endtrans %}

+ {{ + macros.tag_list_widget( + subscribed_tag_names, + deletable = True, + css_class = 'ignored marked-tags', + search_state = search_state + ) + }} + {# todo: add this via javascript + "remove '%(tag_name)s' from the list of ignored tags"| + format(tag_name = tag_name) + #} +
+   + +
+ {% endif %}

{% trans %}Display tag filter{% endtrans%}

{{ macros.radio_select( name = "display_tag_filter_strategy", value = request.user.display_tag_filter_strategy, - choices = tag_filter_strategy_choices + choices = display_tag_filter_strategy_choices ) }}
+ {% if settings.SUBSCRIBED_TAG_SELECTOR_ENABLED %} +

{% trans %}Email tag filter{% endtrans%}

+
+ {{ + macros.radio_select( + name = "email_tag_filter_strategy", + value = request.user.email_tag_filter_strategy, + choices = email_tag_filter_strategy_choices + ) + }} +
+ {% endif %} diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 27424871..00c429dc 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -559,7 +559,8 @@ body.anon { margin-right:18px; } - #displayTagFilterControl label { /*Especial width just for the display tag filter box in index page*/ + #displayTagFilterControl label, + #emailTagFilterControl label { /*Especial width just for the tag filter boxes in index page*/ width:160px; } @@ -587,13 +588,13 @@ body.anon { } .inputs{ - #interestingTagInput, #ignoredTagInput{ + #interestingTagInput, #ignoredTagInput, #subscribedTagInput{ width:153px; padding-left:5px; border:#c9c9b5 1px solid; height:25px; } - #interestingTagAdd, #ignoredTagAdd{ + #interestingTagAdd, #ignoredTagAdd, #subscribedTagAdd { background:url(../images/small-button-blue.png) repeat-x top; border:0; color:@button-label; @@ -609,7 +610,7 @@ body.anon { } - #interestingTagAdd:hover, #ignoredTagAdd:hover{ + #interestingTagAdd:hover, #ignoredTagAdd:hover, #subscribedTag:hover { background:url(../images/small-button-blue.png) repeat-x bottom; } } diff --git a/askbot/skins/default/templates/main_page/javascript.html b/askbot/skins/default/templates/main_page/javascript.html index 6a90c758..d968dcd5 100644 --- a/askbot/skins/default/templates/main_page/javascript.html +++ b/askbot/skins/default/templates/main_page/javascript.html @@ -17,6 +17,7 @@ askbot['urls']['mark_interesting_tag'] = '{% url mark_interesting_tag %}'; askbot['urls']['mark_ignored_tag'] = '{% url mark_ignored_tag %}'; + askbot['urls']['mark_subscribed_tag'] = '{% url mark_subscribed_tag %}'; askbot['urls']['unmark_tag'] = '{% url unmark_tag %}'; askbot['urls']['set_tag_filter_strategy'] = '{% url "set_tag_filter_strategy" %}'; askbot['urls']['questions'] = '{% url "questions" %}'; diff --git a/askbot/urls.py b/askbot/urls.py index fa29e64e..f4768412 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -159,6 +159,7 @@ urlpatterns = patterns('', views.readers.tags, name='tags' ), + #todo: collapse these three urls and use an extra json data var url(#ajax only r'^%s%s$' % ('mark-tag/', 'interesting/'), views.commands.mark_tag, @@ -171,6 +172,12 @@ urlpatterns = patterns('', kwargs={'reason':'bad','action':'add'}, name='mark_ignored_tag' ), + url(#ajax only + r'^%s%s$' % ('mark-tag/', 'subscribed/'), + views.commands.mark_tag, + kwargs={'reason':'subscribed','action':'add'}, + name='mark_subscribed_tag' + ), url(#ajax only r'^unmark-tag/', views.commands.mark_tag, diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 62db014f..3d99063b 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -590,7 +590,7 @@ def set_tag_filter_strategy(request): filter_type = request.POST['filter_type'] filter_value = int(request.POST['filter_value']) assert(filter_type == 'display') - assert(filter_value in dict(const.TAG_FILTER_STRATEGY_CHOICES)) + assert(filter_value in dict(const.TAG_DISPLAY_FILTER_STRATEGY_CHOICES)) request.user.display_tag_filter_strategy = filter_value request.user.save() return HttpResponse('', mimetype = "application/json") diff --git a/askbot/views/readers.py b/askbot/views/readers.py index 9bb6495d..613cb3c9 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -182,8 +182,9 @@ def questions(request, **kwargs): 'contributors' : contributors, 'context' : paginator_context, 'is_unanswered' : False,#remove this from template - 'interesting_tag_names': meta_data.get('interesting_tag_names',None), - 'ignored_tag_names': meta_data.get('ignored_tag_names',None), + 'interesting_tag_names': meta_data.get('interesting_tag_names', None), + 'ignored_tag_names': meta_data.get('ignored_tag_names', None), + 'subscribed_tag_names': meta_data.get('subscribed_tag_names', None), 'language_code': translation.get_language(), 'name_of_anonymous_user' : models.get_name_of_anonymous_user(), 'page_class': 'main-page', @@ -200,7 +201,8 @@ def questions(request, **kwargs): 'tags' : related_tags, 'tag_list_type' : tag_list_type, 'font_size' : extra_tags.get_tag_font_size(related_tags), - 'tag_filter_strategy_choices': const.TAG_FILTER_STRATEGY_CHOICES, + 'display_tag_filter_strategy_choices': const.TAG_DISPLAY_FILTER_STRATEGY_CHOICES, + 'email_tag_filter_strategy_choices': const.TAG_EMAIL_FILTER_STRATEGY_CHOICES, 'update_avatar_data': schedules.should_update_avatar_data(request), 'query_string': search_state.query_string(), 'search_state': search_state, -- cgit v1.2.3-1-g7c22 From 53d64b36a768d821387786b044c4ab217aaf5248 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Mon, 7 May 2012 20:35:30 -0400 Subject: tag selector works properly --- askbot/models/__init__.py | 6 +++++- askbot/skins/common/media/js/tag_selector.js | 12 +++++++----- askbot/skins/common/templates/widgets/tag_selector.html | 2 +- askbot/views/commands.py | 12 ++++++++---- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 6513d918..3eca3c0e 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -1114,8 +1114,12 @@ def user_mark_tags( #to make it impossible to "like" and "dislike" something at the same time #but the subscribed set is independent - e.g. you can dislike a topic #and still subscribe for it. - if reason == 'subscribed':#don't touch good/bad marks + if reason == 'subscribed': + #don't touch good/bad marks marked_ts = marked_ts.filter(reason = 'subscribed') + else: + #and in this case don't touch subscribed tags + marked_ts = marked_ts.exclude(reason = 'subscribed') #todo: use the user api methods here instead of the straight ORM cleaned_tagnames = list() #those that were actually updated diff --git a/askbot/skins/common/media/js/tag_selector.js b/askbot/skins/common/media/js/tag_selector.js index 274ac7de..d5482992 100644 --- a/askbot/skins/common/media/js/tag_selector.js +++ b/askbot/skins/common/media/js/tag_selector.js @@ -100,7 +100,7 @@ function pickedTags(){ var interestingTags = {}; var ignoredTags = {}; - var subscribedTags {}; + var subscribedTags = {}; var interestingTagDetailBox = new TagDetailBox('interesting'); var ignoredTagDetailBox = new TagDetailBox('ignored'); var subscribedTagDetailBox = new TagDetailBox('subscribed'); @@ -245,7 +245,9 @@ function pickedTags(){ var input_sel = '#interestingTagInput'; to_tag_container = $('div .tags.interesting'); } else if (reason === 'subscribed') { - var input_sel = $('div .tags.subscribed'); + var input_sel = '#subscribedTagInput'; + to_target = subscribedTags; + to_tag_container = $('div .tags.subscribed'); } else { return; } @@ -253,9 +255,9 @@ function pickedTags(){ var tagnames = getUniqueWords($(input_sel).attr('value')); if (reason !== 'subscribed') {//for "subscribed" we do not remove - $.each(tagnames, function(idx, tagname){ - if (tagname in from_target){ - unpickTag(from_target,tagname,reason,false); + $.each(tagnames, function(idx, tagname) { + if (tagname in from_target) { + unpickTag(from_target, tagname, reason, false); } }); } diff --git a/askbot/skins/common/templates/widgets/tag_selector.html b/askbot/skins/common/templates/widgets/tag_selector.html index 8d955f25..2413a9c3 100644 --- a/askbot/skins/common/templates/widgets/tag_selector.html +++ b/askbot/skins/common/templates/widgets/tag_selector.html @@ -41,7 +41,7 @@ macros.tag_list_widget( subscribed_tag_names, deletable = True, - css_class = 'ignored marked-tags', + css_class = 'subscribed marked-tags', search_state = search_state ) }} diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 3d99063b..2a165934 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -584,14 +584,18 @@ def api_get_questions(request): @decorators.post_only @decorators.ajax_login_required def set_tag_filter_strategy(request): - """saves data in the ``User.display_tag_filter_strategy`` + """saves data in the ``User.[email/display]_tag_filter_strategy`` for the current user """ filter_type = request.POST['filter_type'] filter_value = int(request.POST['filter_value']) - assert(filter_type == 'display') - assert(filter_value in dict(const.TAG_DISPLAY_FILTER_STRATEGY_CHOICES)) - request.user.display_tag_filter_strategy = filter_value + assert(filter_type in 'display', 'email') + if filter_type == 'display': + assert(filter_value in dict(const.TAG_DISPLAY_FILTER_STRATEGY_CHOICES)) + request.user.display_tag_filter_strategy = filter_value + else: + assert(filter_value in dict(const.TAG_EMAIL_FILTER_STRATEGY_CHOICES)) + request.user.email_tag_filter_strategy = filter_value request.user.save() return HttpResponse('', mimetype = "application/json") -- cgit v1.2.3-1-g7c22 From 7ca0c514c2d1fabdcf3d12b0a371d56584f0cb8e Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 8 May 2012 11:51:01 -0400 Subject: preapproved emails and email domains work for the groups --- askbot/forms.py | 17 ++++++++- askbot/models/user.py | 41 +++++++++++++++++++--- askbot/skins/common/media/jquery-openid/openid.css | 2 +- askbot/skins/common/media/js/utils.js | 21 +++++------ askbot/skins/default/media/style/style.less | 4 +++ askbot/utils/decorators.py | 16 +++++++-- askbot/utils/functions.py | 19 ++++++++++ askbot/views/commands.py | 9 +++-- 8 files changed, 103 insertions(+), 26 deletions(-) diff --git a/askbot/forms.py b/askbot/forms.py index c5b72365..f1d8ce55 100644 --- a/askbot/forms.py +++ b/askbot/forms.py @@ -1,6 +1,5 @@ import re from django import forms -from askbot import models from askbot import const from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy, string_concat @@ -143,6 +142,17 @@ class CountedWordsField(forms.CharField): ) return value + +class DomainNameField(forms.CharField): + def clean(self, value): + #find a better regex, taking into account tlds + domain_re = re.compile(r'[a-zA-Z\d]+(\.[a-zA-Z\d]+)+') + if domain_re.match(value): + return value + else: + raise forms.ValidationError('%s is not a valid domain name' % value) + + class TitleField(forms.CharField): def __init__(self, *args, **kwargs): super(TitleField, self).__init__(*args, **kwargs) @@ -245,6 +255,7 @@ class TagNamesField(forms.CharField): def need_mandatory_tags(self): """true, if list of mandatory tags is not empty""" + from askbot import models return askbot_settings.TAGS_ARE_REQUIRED and len(models.tag.get_mandatory_tags()) > 0 def tag_string_matches(self, tag_string, mandatory_tag): @@ -257,6 +268,7 @@ class TagNamesField(forms.CharField): def mandatory_tag_missing(self, tag_strings): """true, if mandatory tag is not present in the list of ``tag_strings``""" + from askbot import models mandatory_tags = models.tag.get_mandatory_tags() for mandatory_tag in mandatory_tags: for tag_string in tag_strings: @@ -265,6 +277,7 @@ class TagNamesField(forms.CharField): return True def clean(self, value): + from askbot import models value = super(TagNamesField, self).clean(value) data = value.strip() if len(data) < 1: @@ -1086,6 +1099,7 @@ class EditUserEmailFeedsForm(forms.Form): ) def set_initial_values(self, user=None): + from askbot import models KEY_MAP = dict([(v, k) for k, v in self.FORM_TO_MODEL_MAP.iteritems()]) if user != None: settings = models.EmailFeedSetting.objects.filter(subscriber=user) @@ -1133,6 +1147,7 @@ class EditUserEmailFeedsForm(forms.Form): """ with save_unbound==True will bypass form validation and save initial values """ + from askbot import models changed = False for form_field, feed_type in self.FORM_TO_MODEL_MAP.items(): s, created = models.EmailFeedSetting.objects.get_or_create( diff --git a/askbot/models/user.py b/askbot/models/user.py index e6bd6e1d..2e4bbda5 100644 --- a/askbot/models/user.py +++ b/askbot/models/user.py @@ -1,15 +1,19 @@ import datetime import logging +import re from django.db import models from django.db.backends.dummy.base import IntegrityError from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes import generic from django.contrib.auth.models import User +from django.core import exceptions +from django.forms import EmailField, URLField from django.utils.translation import ugettext as _ from django.utils.html import strip_tags from askbot import const from askbot.utils import functions from askbot.models.tag import Tag +from askbot.forms import DomainNameField class ResponseAndMentionActivityManager(models.Manager): def get_query_set(self): @@ -359,9 +363,9 @@ class GroupProfile(models.Model): is_open = models.BooleanField(default = False) #preapproved email addresses and domain names to auto-join groups #trick - the field is padded with space and all tokens are space separated - preapproved_emails = models.TextField(null = True) + preapproved_emails = models.TextField(null = True, blank = True) #only domains - without the '@' or anything before them - preapproved_email_domains = models.TextField(null = True) + preapproved_email_domains = models.TextField(null = True, blank = True) class Meta: app_label = 'askbot' @@ -378,8 +382,37 @@ class GroupProfile(models.Model): return True #relying on a specific method of storage - if (' %s ' % user.email) in self.preapproved_emails: + email_match_re = re.compile(r'\s%s\s' % user.email) + if email_match_re.search(self.preapproved_emails): return True email_domain = user.email.split('@')[1] - return (' %s ' % email_domain) in self.preapproved_email_domains + domain_match_re = re.compile(r'\s%s\s' % email_domain) + return domain_match_re.search(self.preapproved_email_domains) + + def clean(self): + """called in `save()` + """ + emails = functions.split_list(self.preapproved_emails) + email_field = EmailField() + try: + map(lambda v: email_field.clean(v), emails) + except exceptions.ValidationError: + raise exceptions.ValidationError( + _('Please give a list of valid email addresses.') + ) + self.preapproved_emails = ' ' + '\n'.join(emails) + ' ' + + domains = functions.split_list(self.preapproved_email_domains) + domain_field = DomainNameField() + try: + map(lambda v: domain_field.clean(v), domains) + except exceptions.ValidationError: + raise exceptions.ValidationError( + _('Please give a list of valid email domain names.') + ) + self.preapproved_email_domains = ' ' + '\n'.join(domains) + ' ' + + def save(self, *args, **kwargs): + self.clean() + super(GroupProfile, self).save(*args, **kwargs) diff --git a/askbot/skins/common/media/jquery-openid/openid.css b/askbot/skins/common/media/jquery-openid/openid.css index f9430108..ec93881d 100644 --- a/askbot/skins/common/media/jquery-openid/openid.css +++ b/askbot/skins/common/media/jquery-openid/openid.css @@ -2,7 +2,7 @@ div#login-icons {padding:20px 0 0 0;} ul.login-icons {width: 450px; margin:0;padding:0;text-align:left; list-style-type:none; display:block;} ul.login-icons li {display:inline;} ul.large input {height: 40px; width: 90px;border:1px solid #ccc;margin:0 5px 5px 0;} -.openid-signin h1 {margin-top: -15px; padding-bottom: 10px;} +.openid-signin h1 {padding-bottom: 10px;} .openid-signin h2 {margin-top:15px;} .openid-signin h2#account-recovery-heading {margin-bottom:2px;} #account-recovery-form p.hint a {color:#1b79bd; text-decoration: none;} diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index f01f5bcf..c82913a8 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -588,26 +588,23 @@ TextPropertyEditor.prototype.clearMessages = function(){ }; TextPropertyEditor.prototype.getAlert = function(){ - if (this._alert) { - return this._alert; - } else { - var box = new AlertBox(); - this._alert = box; - this._editor.find('.modal-body').prepend(box.getElement()); - return box; - } + var box = new AlertBox(); + var modal_body = this._editor.find('.modal-body'); + modal_body.prepend(box.getElement()); + return box; }; TextPropertyEditor.prototype.showAlert = function(text){ + this.clearMessages(); var box = this.getAlert(); - box.setError(false); box.setText(text); + return box; }; TextPropertyEditor.prototype.showError = function(text){ - var box = this.getAlert(); + var box = this.showAlert(text); box.setError(true); - box.setText(text); + return box; }; TextPropertyEditor.prototype.setText = function(text){ @@ -633,7 +630,7 @@ TextPropertyEditor.prototype.startOpeningEditor = function(){ success: function(data){ if (data['success']) { me.makeEditor(); - me.setText(data['text']); + me.setText($.trim(data['text'])); me.openEditor(); } else { showMessage(me.getElement(), data['message']); diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 27424871..5bb0bb11 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -3537,3 +3537,7 @@ textarea.tipped-input { .modal p { font-size: 14px; } +.modal-body > textarea { + width: 515px; + margin-bottom: 0px; +} diff --git a/askbot/utils/decorators.py b/askbot/utils/decorators.py index cfdc0a5d..940c3654 100644 --- a/askbot/utils/decorators.py +++ b/askbot/utils/decorators.py @@ -87,7 +87,17 @@ def ajax_only(view_func): if data is None: data = {} except Exception, e: - message = unicode(e) + if isinstance(e, Exception): + if len(e.messages) > 1: + message = u'
    ' + \ + u''.join( + map(lambda v: u'
  • %s
    • ' % v, e.messages) + ) + \ + u'
' + else: + message = e.messages[0] + else: + message = unicode(e) if message == '': message = _('Oops, apologies - there was some error') logging.debug(message) @@ -225,9 +235,9 @@ def admins_only(view_func): @functools.wraps(view_func) def decorator(request, *args, **kwargs): if request.user.is_anonymous(): - raise exceptions.PermissionDenied() + raise django_exceptions.PermissionDenied() if not request.user.is_administrator_or_moderator(): - raise exceptions.PermissionDenied( + raise django_exceptions.PermissionDenied( _('This function is limited to moderators and administrators') ) return view_func(request, *args, **kwargs) diff --git a/askbot/utils/functions.py b/askbot/utils/functions.py index 6042414c..f9d36534 100644 --- a/askbot/utils/functions.py +++ b/askbot/utils/functions.py @@ -18,6 +18,25 @@ def enumerate_string_list(strings): numbered_strings = enumerate(strings, start = 1) return [ '%d) %s' % item for item in numbered_strings ] +def pad_string(text): + """Inserts one space between words, + including one space before the first word + and after the last word. + String without words is collapsed to '' + """ + words = text.strip().split() + if len(words) > 0: + return ' ' + ' '.join(words) + ' ' + else: + return '' + +def split_list(text): + """Takes text, representing a loosely formatted + list (comma, semicolon, empty space separated + words) and returns a list() of words. + """ + text = text.replace(',', ' ').replace(';', ' ') + return text.strip().split() def is_iterable(thing): if hasattr(thing, '__iter__'): diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 62db014f..59589b62 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -839,14 +839,13 @@ def edit_object_property_text(request): if (model_name, property_name) not in accessible_fields: raise exceptions.PermissionDenied() - query_set = models.get_model(model_name).objects.filter(id=object_id) + obj = models.get_model(model_name).objects.get(id=object_id) if request.method == 'POST': text = CharField().clean(request.POST['text']) - params = dict() - params[str(property_name)] = text #dammit str() - query_set.update(**params) + setattr(obj, property_name, text) + obj.save() elif request.method == 'GET': - return {'text': getattr(query_set[0], property_name)} + return {'text': getattr(obj, property_name)} else: raise exceptions.PermissionDenied() -- cgit v1.2.3-1-g7c22 From 05d4e5d810642102e27d199f3ce8c145654ac8dd Mon Sep 17 00:00:00 2001 From: Adolfo Fitoria Date: Thu, 19 Jan 2012 12:02:37 -0300 Subject: fixed feed issues with cache. --- askbot/feed.py | 25 +++++++++++----------- .../skins/default/templates/main_page/tab_bar.html | 4 ++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/askbot/feed.py b/askbot/feed.py index c1933afe..6df9b8aa 100644 --- a/askbot/feed.py +++ b/askbot/feed.py @@ -26,7 +26,7 @@ class RssIndividualQuestionFeed(Feed): """rss feed class for particular questions """ title = askbot_settings.APP_TITLE + _(' - ')+ _('Individual question feed') - link = askbot_settings.APP_URL + #link = askbot_settings.APP_URL description = askbot_settings.APP_DESCRIPTION copyright = askbot_settings.APP_COPYRIGHT @@ -34,11 +34,11 @@ class RssIndividualQuestionFeed(Feed): if len(bits) != 1: raise ObjectDoesNotExist return Post.objects.get_questions().get(id__exact = bits[0]) - + def item_link(self, item): """get full url to the item """ - return self.link + item.get_absolute_url() + return askbot_settings.APP_URL + item.get_absolute_url() def item_pubdate(self, item): """get date of creation for the item @@ -56,7 +56,6 @@ class RssIndividualQuestionFeed(Feed): chain_elements.append( Post.objects.get_comments().filter(parent=item) ) - answers = Post.objects.get_answers().filter(thread = item.thread) for answer in answers: chain_elements.append([answer,]) @@ -65,7 +64,7 @@ class RssIndividualQuestionFeed(Feed): ) return itertools.chain(*chain_elements) - + def item_title(self, item): """returns the title for the item """ @@ -77,7 +76,7 @@ class RssIndividualQuestionFeed(Feed): elif item.post_type == "comment": title = "Comment by %s for %s" % (item.author, self.title) return title - + def item_description(self, item): """returns the description for the item """ @@ -88,7 +87,7 @@ class RssLastestQuestionsFeed(Feed): """rss feed class for the latest questions """ title = askbot_settings.APP_TITLE + _(' - ')+ _('latest questions') - link = askbot_settings.APP_URL + #link = askbot_settings.APP_URL description = askbot_settings.APP_DESCRIPTION #ttl = 10 copyright = askbot_settings.APP_COPYRIGHT @@ -96,7 +95,7 @@ class RssLastestQuestionsFeed(Feed): def item_link(self, item): """get full url to the item """ - return self.link + item.get_absolute_url() + return askbot_settings.APP_URL + item.get_absolute_url() def item_author_name(self, item): """get name of author @@ -117,8 +116,8 @@ class RssLastestQuestionsFeed(Feed): """returns url without the slug because the slug can change """ - return self.link + item.get_absolute_url(no_slug = True) - + return askbot_settings.APP_URL + item.get_absolute_url(no_slug = True) + def item_description(self, item): """returns the desciption for the item """ @@ -142,12 +141,12 @@ class RssLastestQuestionsFeed(Feed): if tags: #if there are tags in GET, filter the #questions additionally - for tag in tags: + for tag in tags: qs = qs.filter(thread__tags__name = tag) - + return qs.order_by('-thread__last_activity_at')[:30] - + def main(): """main function for use as a script diff --git a/askbot/skins/default/templates/main_page/tab_bar.html b/askbot/skins/default/templates/main_page/tab_bar.html index 8b666155..17ab810e 100644 --- a/askbot/skins/default/templates/main_page/tab_bar.html +++ b/askbot/skins/default/templates/main_page/tab_bar.html @@ -3,9 +3,9 @@ {% cache 0 "scope_sort_tabs" search_tags request.user author_name scope sort query context.page language_code %} {% trans %}RSS{% endtrans %} -- cgit v1.2.3-1-g7c22 From 741edb87ef484865f55f90ab794867c5e56b209f Mon Sep 17 00:00:00 2001 From: Adolfo Fitoria Date: Thu, 19 Jan 2012 14:25:24 -0300 Subject: updated feed class again --- askbot/feed.py | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/askbot/feed.py b/askbot/feed.py index 6df9b8aa..490f494b 100644 --- a/askbot/feed.py +++ b/askbot/feed.py @@ -25,10 +25,16 @@ from askbot.conf import settings as askbot_settings class RssIndividualQuestionFeed(Feed): """rss feed class for particular questions """ - title = askbot_settings.APP_TITLE + _(' - ')+ _('Individual question feed') - #link = askbot_settings.APP_URL - description = askbot_settings.APP_DESCRIPTION - copyright = askbot_settings.APP_COPYRIGHT + + def title(self): + return askbot_settings.APP_TITLE + _(' - ') + \ + _('Individual question feed') + + def feed_copyright(self): + return askbot_settings.APP_COPYRIGHT + + def description(self): + return askbot_settings.APP_DESCRIPTION def get_object(self, bits): if len(bits) != 1: @@ -40,6 +46,9 @@ class RssIndividualQuestionFeed(Feed): """ return askbot_settings.APP_URL + item.get_absolute_url() + def link(self): + return askbot_settings.APP_URL + def item_pubdate(self, item): """get date of creation for the item """ @@ -86,17 +95,25 @@ class RssIndividualQuestionFeed(Feed): class RssLastestQuestionsFeed(Feed): """rss feed class for the latest questions """ - title = askbot_settings.APP_TITLE + _(' - ')+ _('latest questions') - #link = askbot_settings.APP_URL - description = askbot_settings.APP_DESCRIPTION - #ttl = 10 - copyright = askbot_settings.APP_COPYRIGHT + + def title(self): + return askbot_settings.APP_TITLE + _(' - ') + \ + _('Individual question feed') + + def feed_copyright(self): + return askbot_settings.APP_COPYRIGHT + + def description(self): + return askbot_settings.APP_DESCRIPTION def item_link(self, item): """get full url to the item """ return askbot_settings.APP_URL + item.get_absolute_url() + def link(self): + return askbot_settings.APP_URL + def item_author_name(self, item): """get name of author """ @@ -119,7 +136,7 @@ class RssLastestQuestionsFeed(Feed): return askbot_settings.APP_URL + item.get_absolute_url(no_slug = True) def item_description(self, item): - """returns the desciption for the item + """returns the description for the item """ return item.text -- cgit v1.2.3-1-g7c22 From e328b92500fccc63d13808598f6705c9cd323fa3 Mon Sep 17 00:00:00 2001 From: Byron Corrales Date: Tue, 21 Feb 2012 15:32:52 -0600 Subject: Ignoring .DS_Store files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 07a3f84f..08e42e57 100755 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ run recaptcha /.ve /db.sq3 +*.DS_Store -- cgit v1.2.3-1-g7c22 From 6ea226abfa9d05cd53c63846ee230da6a0a6a2b9 Mon Sep 17 00:00:00 2001 From: Byron Corrales Date: Wed, 22 Feb 2012 00:57:40 -0600 Subject: Making the style of the buttons a css style standart easy to customize with less --- askbot/skins/default/media/style/lib_style.css | 22 ++ askbot/skins/default/media/style/lib_style.less | 37 +++ askbot/skins/default/media/style/style.css | 388 ++++++++++++++++++------ askbot/skins/default/media/style/style.less | 144 +++------ 4 files changed, 401 insertions(+), 190 deletions(-) create mode 100644 askbot/skins/default/media/style/lib_style.css diff --git a/askbot/skins/default/media/style/lib_style.css b/askbot/skins/default/media/style/lib_style.css new file mode 100644 index 00000000..a92af477 --- /dev/null +++ b/askbot/skins/default/media/style/lib_style.css @@ -0,0 +1,22 @@ +/* General Predifined classes, read more in lesscss.org */ +/* Variables for Colors*/ +/* Variables for fonts*/ +/* "Trebuchet MS", sans-serif;*/ +/* Buttons */ +.button-style-hover { + background-color: #cde5e9; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); + background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); + background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + text-decoration: none; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; +} +/* General styles for gradients */ +/* Receive exactly positions for background Sprite */ +/* CSS3 Elements */ diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less index 941c83ff..bedd8c60 100644 --- a/askbot/skins/default/media/style/lib_style.less +++ b/askbot/skins/default/media/style/lib_style.less @@ -17,6 +17,43 @@ @main-font:'Yanone Kaffeesatz', sans-serif; @secondary-font:Arial; +/* Buttons */ + +.button-style(@w:100px ,@h:20px, @f:14px){ + width:@w; + height:@h; + font-size:@f; + text-align:center; + text-decoration:none; + cursor:pointer; + color:@button-label; + font-family:@main-font; + .text-shadow(0px,1px,0px,#c6d9dd); + border-top:#eaf2f3 1px solid; + .linear-gradient(#d1e2e5,#a9c2c7); + .rounded-corners(4px); + .box-shadow(1px, 1px, 2px, #636363) +} + +.button-style-hover{ + .linear-gradient(#cde5e9,#94b3ba); + text-decoration:none; + .text-shadow(0px, 1px, 0px, #c6d9dd); +} + +/* General styles for gradients */ + +.linear-gradient(@start:#eee,@end:#fff,@stop:25%){ + background-color: @start; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@start), color-stop(@stop, @start), to(@end)); + background-image: -webkit-linear-gradient(@start, @start @stop, @end); + background-image: -moz-linear-gradient(top, @start, @start @stop, @end); + background-image: -ms-linear-gradient(@start, @start @stop, @end); + background-image: -o-linear-gradient(@start, @start @stop, @end); + background-image: linear-gradient(@start, @start @stop, @end); +} + /* Receive exactly positions for background Sprite */ .sprites(@hor,@vert,@back:url(../images/sprites.png)){ diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index 5752b502..c572b4f7 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -3,6 +3,22 @@ /* Variables for Colors*/ /* Variables for fonts*/ /* "Trebuchet MS", sans-serif;*/ +/* Buttons */ +.button-style-hover { + background-color: #cde5e9; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); + background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); + background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + text-decoration: none; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; +} +/* General styles for gradients */ /* Receive exactly positions for background Sprite */ /* CSS3 Elements */ /* Library of predifined less functions styles */ @@ -427,28 +443,49 @@ body.anon #searchBar .searchInputCancelable { #askButton { /* check blocks/secondary_header.html and widgets/ask_button.html*/ - background: url(../images/bigbutton.png) repeat-x bottom; line-height: 44px; - text-align: center; + margin-top: 6px; + float: right; + text-transform: uppercase; width: 200px; height: 42px; font-size: 23px; + text-align: center; + text-decoration: none; + cursor: pointer; color: #4a757f; - margin-top: 7px; - float: right; - text-transform: uppercase; - border-radius: 5px; - -ms-border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - -khtml-border-radius: 5px; + font-family: 'Yanone Kaffeesatz', sans-serif; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; + border-top: #eaf2f3 1px solid; + background-color: #d1e2e5; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); + background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; -webkit-box-shadow: 1px 1px 2px #636363; -moz-box-shadow: 1px 1px 2px #636363; box-shadow: 1px 1px 2px #636363; } #askButton:hover { + background-color: #cde5e9; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); + background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); + background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); text-decoration: none; - background: url(../images/bigbutton.png) repeat-x top; text-shadow: 0px 1px 0px #c6d9dd; -moz-text-shadow: 0px 1px 0px #c6d9dd; -webkit-text-shadow: 0px 1px 0px #c6d9dd; @@ -555,15 +592,37 @@ body.anon #searchBar .searchInputCancelable { } .box .inputs #interestingTagAdd, .box .inputs #ignoredTagAdd { - background: url(../images/small-button-blue.png) repeat-x top; border: 0; - color: #4a757f; font-weight: bold; - font-size: 12px; + margin-top: -2px; width: 30px; height: 27px; - margin-top: -2px; + font-size: 12px; + text-align: center; + text-decoration: none; cursor: pointer; + color: #4a757f; + font-family: 'Yanone Kaffeesatz', sans-serif; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; + border-top: #eaf2f3 1px solid; + background-color: #d1e2e5; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); + background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; border-radius: 4px; -ms-border-radius: 4px; -moz-border-radius: 4px; @@ -572,32 +631,52 @@ body.anon #searchBar .searchInputCancelable { text-shadow: 0px 1px 0px #e6f6fa; -moz-text-shadow: 0px 1px 0px #e6f6fa; -webkit-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-box-shadow: 1px 1px 2px #808080; - -moz-box-shadow: 1px 1px 2px #808080; - box-shadow: 1px 1px 2px #808080; } .box .inputs #interestingTagAdd:hover, .box .inputs #ignoredTagAdd:hover { - background: url(../images/small-button-blue.png) repeat-x bottom; + background-color: #cde5e9; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); + background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); + background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + text-decoration: none; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; } .box img.gravatar { margin: 1px; } .box a.followed, .box a.follow { - background: url(../images/medium-button.png) top repeat-x; - height: 34px; line-height: 34px; - text-align: center; border: 0; - font-family: 'Yanone Kaffeesatz', sans-serif; - color: #4a757f; font-weight: normal; - font-size: 21px; margin-top: 3px; display: block; width: 120px; + height: 34px; + font-size: 21px; + text-align: center; text-decoration: none; + cursor: pointer; + color: #4a757f; + font-family: 'Yanone Kaffeesatz', sans-serif; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; + border-top: #eaf2f3 1px solid; + background-color: #d1e2e5; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); + background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); border-radius: 4px; -ms-border-radius: 4px; -moz-border-radius: 4px; @@ -611,8 +690,18 @@ body.anon #searchBar .searchInputCancelable { } .box a.followed:hover, .box a.follow:hover { + background-color: #cde5e9; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); + background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); + background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); text-decoration: none; - background: url(../images/medium-button.png) bottom repeat-x; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; text-shadow: 0px 1px 0px #c6d9dd; -moz-text-shadow: 0px 1px 0px #c6d9dd; -webkit-text-shadow: 0px 1px 0px #c6d9dd; @@ -1261,14 +1350,28 @@ ul#related-tags li { .ask-page input.submit, .edit-question-page input.submit { float: left; - background: url(../images/medium-button.png) top repeat-x; - height: 34px; - border: 0; - font-family: 'Yanone Kaffeesatz', sans-serif; - color: #4a757f; font-weight: normal; - font-size: 21px; margin-top: 3px; + width: 160px; + height: 34px; + font-size: 21px; + text-align: center; + text-decoration: none; + cursor: pointer; + color: #4a757f; + font-family: 'Yanone Kaffeesatz', sans-serif; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; + border-top: #eaf2f3 1px solid; + background-color: #d1e2e5; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); + background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); border-radius: 4px; -ms-border-radius: 4px; -moz-border-radius: 4px; @@ -1282,8 +1385,18 @@ ul#related-tags li { #fmanswer input.submit:hover, .ask-page input.submit:hover, .edit-question-page input.submit:hover { + background-color: #cde5e9; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); + background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); + background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); text-decoration: none; - background: url(../images/medium-button.png) bottom repeat-x; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; text-shadow: 0px 1px 0px #c6d9dd; -moz-text-shadow: 0px 1px 0px #c6d9dd; -webkit-text-shadow: 0px 1px 0px #c6d9dd; @@ -1301,7 +1414,12 @@ ul#related-tags li { border-top: 0; padding: 10px; margin-bottom: 10px; - width: 717px; + width: 710px; +} +@media screen and (-webkit-min-device-pixel-ratio: 0) { + #editor { + width: 717px; + } } #id_title { width: 100%; @@ -1700,31 +1818,49 @@ ul#related-tags li { width: 100px; } .question-page .comments button { - background: url(../images/small-button-blue.png) repeat-x top; - border: 0; - color: #4a757f; - font-family: Arial; - font-size: 13px; - width: 100px; - font-weight: bold; - height: 27px; line-height: 25px; margin-bottom: 5px; + width: 100px; + height: 27px; + font-size: 12px; + text-align: center; + text-decoration: none; cursor: pointer; + color: #4a757f; + font-family: 'Yanone Kaffeesatz', sans-serif; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; + border-top: #eaf2f3 1px solid; + background-color: #d1e2e5; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); + background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); border-radius: 4px; -ms-border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; -khtml-border-radius: 4px; - text-shadow: 0px 1px 0px #e6f6fa; - -moz-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-box-shadow: 1px 1px 2px #808080; - -moz-box-shadow: 1px 1px 2px #808080; - box-shadow: 1px 1px 2px #808080; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; + font-family: Arial; + font-weight: bold; } .question-page .comments button:hover { - background: url(../images/small-button-blue.png) bottom repeat-x; + background-color: #cde5e9; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); + background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); + background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + text-decoration: none; text-shadow: 0px 1px 0px #c6d9dd; -moz-text-shadow: 0px 1px 0px #c6d9dd; -webkit-text-shadow: 0px 1px 0px #c6d9dd; @@ -2070,35 +2206,55 @@ ul#related-tags li { .users-page input.submit, .user-profile-edit-page input.submit, .user-profile-page input.submit { - background: url(../images/small-button-blue.png) repeat-x top; - border: 0; - color: #4a757f; - font-weight: bold; - font-size: 13px; - font-family: Arial; - height: 26px; + font-weight: normal; margin: 5px 0px; width: 100px; + height: 26px; + font-size: 15px; + text-align: center; + text-decoration: none; cursor: pointer; + color: #4a757f; + font-family: 'Yanone Kaffeesatz', sans-serif; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; + border-top: #eaf2f3 1px solid; + background-color: #d1e2e5; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); + background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); border-radius: 4px; -ms-border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; -khtml-border-radius: 4px; - text-shadow: 0px 1px 0px #e6f6fa; - -moz-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-box-shadow: 1px 1px 2px #808080; - -moz-box-shadow: 1px 1px 2px #808080; - box-shadow: 1px 1px 2px #808080; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; + font-family: Arial; } .openid-signin input.submit:hover, .meta input.submit:hover, .users-page input.submit:hover, .user-profile-edit-page input.submit:hover, .user-profile-page input.submit:hover { - background: url(../images/small-button-blue.png) repeat-x bottom; + background-color: #cde5e9; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); + background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); + background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); text-decoration: none; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; } .openid-signin .cancel, .meta .cancel, @@ -2145,34 +2301,55 @@ ul#related-tags li { #local_login_buttons .submit-b, #password-fs .submit-b, #openid-fs .submit-b { - background: url(../images/small-button-blue.png) repeat-x top; - border: 0; - color: #4a757f; - font-weight: bold; - font-size: 13px; - font-family: Arial; + width: 100px; height: 24px; - margin-top: -2px; - padding-left: 10px; - padding-right: 10px; + font-size: 15px; + text-align: center; + text-decoration: none; cursor: pointer; + color: #4a757f; + font-family: 'Yanone Kaffeesatz', sans-serif; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; + border-top: #eaf2f3 1px solid; + background-color: #d1e2e5; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); + background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); border-radius: 4px; -ms-border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; -khtml-border-radius: 4px; - text-shadow: 0px 1px 0px #e6f6fa; - -moz-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-box-shadow: 1px 1px 2px #808080; - -moz-box-shadow: 1px 1px 2px #808080; - box-shadow: 1px 1px 2px #808080; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; + font-family: Arial; + font-weight: bold; + padding-right: 10px; + border: 0; } #email-input-fs .submit-b:hover, #local_login_buttons .submit-b:hover, #password-fs .submit-b:hover, #openid-fs .submit-b:hover { - background: url(../images/small-button-blue.png) repeat-x bottom; + background-color: #cde5e9; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); + background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); + background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + text-decoration: none; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; } .openid-input { background: url(../images/openid.gif) no-repeat; @@ -2302,31 +2479,52 @@ a:hover.medal { .follow-toggle, .submit { border: 0 !important; - color: #4a757f; font-weight: bold; - font-size: 12px; - height: 26px; line-height: 26px; margin-top: -2px; - font-size: 15px; + width: 100px; + height: 26px; + font-size: 12px; + text-align: center; + text-decoration: none; cursor: pointer; + color: #4a757f; font-family: 'Yanone Kaffeesatz', sans-serif; - background: url(../images/small-button-blue.png) repeat-x top; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; + border-top: #eaf2f3 1px solid; + background-color: #d1e2e5; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); + background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); + background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); border-radius: 4px; -ms-border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; -khtml-border-radius: 4px; - text-shadow: 0px 1px 0px #e6f6fa; - -moz-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-box-shadow: 1px 1px 2px #808080; - -moz-box-shadow: 1px 1px 2px #808080; - box-shadow: 1px 1px 2px #808080; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; } .follow-toggle:hover, .submit:hover { - background: url(../images/small-button-blue.png) repeat-x bottom; + background-color: #cde5e9; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); + background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); + background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); + text-decoration: none; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; text-decoration: none !important; } .follow-toggle .follow { @@ -3246,3 +3444,11 @@ body.anon.lang-es #searchBar .searchInput { body.anon.lang-es #searchBar .searchInputCancelable { width: 390px; } +a.re_expand { + color: #616161; + text-decoration: none; +} +a.re_expand .re_content { + display: none; + margin-left: 77px; +} diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index e63ff373..57d88c41 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -154,6 +154,7 @@ h1 { padding: 10px 0 5px 0px; } + /* ----- Extra space above for messages ----- */ body.user-messages { @@ -463,24 +464,15 @@ body.anon { #askButton{ /* check blocks/secondary_header.html and widgets/ask_button.html*/ - background: url(../images/bigbutton.png) repeat-x bottom; line-height:44px; - text-align:center; - width:200px; - height:42px; - font-size:23px; - color:@button-label; - margin-top:7px; + margin-top:6px; float:right; text-transform:uppercase; - .rounded-corners(5px); - .box-shadow(1px, 1px, 2px, #636363) + .button-style(200px, 42px, 23px); } #askButton:hover{ - text-decoration:none; - background: url(../images/bigbutton.png) repeat-x top; - .text-shadow(0px, 1px, 0px, #c6d9dd) + .button-style-hover; } /* ----- Content layout, check two_column_body.html or one_column_body.html ----- */ @@ -590,23 +582,15 @@ body.anon { height:25px; } #interestingTagAdd, #ignoredTagAdd{ - background:url(../images/small-button-blue.png) repeat-x top; border:0; - color:@button-label; font-weight:bold; - font-size:12px; - width:30px; - height:27px; margin-top:-2px; - cursor:pointer; + .button-style(30px,27px,12px); .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080); - - + .text-shadow(0px,1px,0px,#E6F6FA); } #interestingTagAdd:hover, #ignoredTagAdd:hover{ - background:url(../images/small-button-blue.png) repeat-x bottom; + .button-style-hover; } } @@ -617,28 +601,17 @@ body.anon { /* widgets for question template */ a.followed, a.follow{ - background: url(../images/medium-button.png) top repeat-x; - height:34px; line-height:34px; - text-align:center; border:0; - font-family:@main-font; - color:@button-label; font-weight:normal; - font-size:21px; margin-top:3px; - display:block; - width:120px; - text-decoration:none; - .rounded-corners(4px); - .box-shadow(1px, 1px, 2px, #636363); + .button-style(120px,34px,21px); .center; } a.followed:hover, a.follow:hover{ - text-decoration:none; - background: url(../images/medium-button.png) bottom repeat-x; + .button-style-hover; .text-shadow(0px, 1px, 0px, #c6d9dd); } @@ -1352,24 +1325,16 @@ ul#related-tags li { .ask-page input.submit, .edit-question-page input.submit { float: left; - background: url(../images/medium-button.png) top repeat-x; - height:34px; - border:0; - font-family:@main-font; - color:@button-label; font-weight:normal; - font-size:21px; margin-top:3px; - .rounded-corners(4px); - .box-shadow(1px, 1px, 2px, #636363); + .button-style(160px,34px,21px); margin-right:7px; } #fmanswer input.submit:hover, .ask-page input.submit:hover, .edit-question-page input.submit:hover{ - text-decoration:none; - background: url(../images/medium-button.png) bottom repeat-x; + .button-style-hover; .text-shadow(0px, 1px, 0px, #c6d9dd) } #editor { /*adjustment for editor preview*/ @@ -1383,7 +1348,13 @@ ul#related-tags li { border-top:0; padding:10px; margin-bottom:10px; - width:717px; + width:710px; +} + +@media screen and (-webkit-min-device-pixel-ratio:0){ + #editor{ + width:717px; + } } #id_title { @@ -1796,24 +1767,14 @@ ul#related-tags li { width: 100px; } button{ - background:url(../images/small-button-blue.png) repeat-x top; - border:0; - color:@button-label; - font-family:@body-font; - font-size:13px; - width:100px; - font-weight:bold; - height:27px; line-height:25px; margin-bottom:5px; - cursor:pointer; - .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080); + .button-style(100px,27px,12px); + font-family:@body-font; + font-weight:bold; } button:hover{ - background: url(../images/small-button-blue.png) bottom repeat-x; - .text-shadow(0px, 1px, 0px, #c6d9dd); + .button-style-hover; } .counter { display: inline-block; @@ -2155,23 +2116,13 @@ ul#related-tags li { font-size:14px; } input.submit{ - background:url(../images/small-button-blue.png) repeat-x top; - border:0; - color:@button-label; - font-weight:bold; - font-size:13px; - font-family:@body-font; - height:26px; + font-weight:normal; margin:5px 0px; - width:100px; - cursor:pointer; - .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080); + .button-style(100px,26px,15px); + font-family:@body-font; } input.submit:hover{ - background:url(../images/small-button-blue.png) repeat-x bottom; - text-decoration:none; + .button-style-hover; } .cancel{ background:url(../images/small-button-cancel.png) repeat-x top !important; @@ -2194,25 +2145,19 @@ ul#related-tags li { width:200px; } .submit-b{ - background:url(../images/small-button-blue.png) repeat-x top; - border:0; - color:@button-label; - font-weight:bold; - font-size:13px; + .button-style(100px,24px,15px); font-family:@body-font; - height:24px; - margin-top:-2px; - padding-left:10px; + font-weight:bold; padding-right:10px; - cursor:pointer; - .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080) + border:0; } + .submit-b:hover{ - background:url(../images/small-button-blue.png) repeat-x bottom; + .button-style-hover; } } + + .openid-input { background: url(../images/openid.gif) no-repeat; padding-left: 15px; @@ -2357,23 +2302,14 @@ a:hover.medal { .follow-toggle,.submit { border:0 !important; - color:@button-label; font-weight:bold; - font-size:12px; - height:26px; line-height:26px; margin-top:-2px; - font-size:15px; - cursor:pointer; - font-family:@main-font; - background:url(../images/small-button-blue.png) repeat-x top; - .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080) + .button-style(100px,26px,12px); } .follow-toggle:hover, .submit:hover { - background:url(../images/small-button-blue.png) repeat-x bottom; + .button-style-hover; text-decoration:none !important; } @@ -3383,3 +3319,13 @@ body.anon.lang-es { } } } + +a.re_expand{ + color: #616161; + text-decoration:none; +} + +a.re_expand .re_content{ + display:none; + margin-left:77px; +} -- cgit v1.2.3-1-g7c22 From 629c67dd986c9d2af4ec966916d922a779824d51 Mon Sep 17 00:00:00 2001 From: Byron Corrales Date: Thu, 23 Feb 2012 01:22:01 -0600 Subject: Fixing vote buttons position on IE browsers --- askbot/skins/default/media/style/style.css | 6 ++++++ askbot/skins/default/media/style/style.less | 5 +++++ askbot/skins/default/templates/question/question_card.html | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index c572b4f7..b3229e4e 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -535,6 +535,7 @@ body.anon #searchBar .searchInputCancelable { padding-right: 10px; margin-bottom: 10px; font-family: 'Yanone Kaffeesatz', sans-serif; + width: 190px; } .box h3 { color: #4a757f; @@ -2001,6 +2002,11 @@ ul#related-tags li { text-align: center; padding-top: 2px; margin: 10px 10px 0px 3px; + /* smalls IE fixes */ + + *margin: 0; + *height: 210px; + *width: 30px; } .question-page .vote-buttons IMG { cursor: pointer; diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 57d88c41..5d10b193 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -523,6 +523,7 @@ body.anon { padding-right:10px; margin-bottom:10px; font-family:@main-font; + width:190px; } h3{ color:#4a757f; @@ -1919,6 +1920,10 @@ ul#related-tags li { text-align: center; padding-top: 2px; margin:10px 10px 0px 3px; + /* smalls IE fixes */ + *margin:0; + *height:210px; + *width:30px; } .vote-buttons IMG { diff --git a/askbot/skins/default/templates/question/question_card.html b/askbot/skins/default/templates/question/question_card.html index 08f7ccee..dd52ea0f 100644 --- a/askbot/skins/default/templates/question/question_card.html +++ b/askbot/skins/default/templates/question/question_card.html @@ -29,4 +29,4 @@ -
+ -- cgit v1.2.3-1-g7c22 From 1a9533b7e8a63af5985447a2930e5b7bbb4a6397 Mon Sep 17 00:00:00 2001 From: Byron Corrales Date: Thu, 1 Mar 2012 19:11:28 -0600 Subject: a little style fix of overlap when tags have big names --- askbot/skins/default/media/style/style.css | 2 +- askbot/skins/default/media/style/style.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index b3229e4e..b218e5eb 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -1139,7 +1139,7 @@ ul#related-tags { ul.tags li { float: left; display: block; - margin: 0 8px 0 0; + margin: 0 8px 8px 0; padding: 0; height: 20px; } diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 5d10b193..b990a893 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -1107,7 +1107,7 @@ ul#related-tags { ul.tags li { float:left; display: block; - margin: 0 8px 0 0; + margin: 0 8px 8px 0; padding: 0; height:20px; } -- cgit v1.2.3-1-g7c22 From 44cebf852fb2fc3f5f844be5c7a9822416bb10ba Mon Sep 17 00:00:00 2001 From: Byron Corrales Date: Sun, 8 Apr 2012 21:11:15 -0600 Subject: adding selector close, missing after merge --- askbot/skins/default/media/style/style.less | 1 - 1 file changed, 1 deletion(-) diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index b990a893..0d1e8112 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -3324,7 +3324,6 @@ body.anon.lang-es { } } } - a.re_expand{ color: #616161; text-decoration:none; -- cgit v1.2.3-1-g7c22 From cb206c7b9d9cd4768fb7eeea49e1026abeb107c9 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 8 May 2012 15:09:50 -0400 Subject: intermediate commit, removed two migrations and fixed bugs --- askbot/models/user.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/askbot/models/user.py b/askbot/models/user.py index 2e4bbda5..70aee263 100644 --- a/askbot/models/user.py +++ b/askbot/models/user.py @@ -363,9 +363,13 @@ class GroupProfile(models.Model): is_open = models.BooleanField(default = False) #preapproved email addresses and domain names to auto-join groups #trick - the field is padded with space and all tokens are space separated - preapproved_emails = models.TextField(null = True, blank = True) + preapproved_emails = models.TextField( + null = True, blank = True, default = '' + ) #only domains - without the '@' or anything before them - preapproved_email_domains = models.TextField(null = True, blank = True) + preapproved_email_domains = models.TextField( + null = True, blank = True, default = '' + ) class Meta: app_label = 'askbot' @@ -382,13 +386,17 @@ class GroupProfile(models.Model): return True #relying on a specific method of storage - email_match_re = re.compile(r'\s%s\s' % user.email) - if email_match_re.search(self.preapproved_emails): - return True + if self.preapproved_emails: + email_match_re = re.compile(r'\s%s\s' % user.email) + if email_match_re.search(self.preapproved_emails): + return True + + if self.preapproved_email_domains: + email_domain = user.email.split('@')[1] + domain_match_re = re.compile(r'\s%s\s' % email_domain) + return domain_match_re.search(self.preapproved_email_domains) - email_domain = user.email.split('@')[1] - domain_match_re = re.compile(r'\s%s\s' % email_domain) - return domain_match_re.search(self.preapproved_email_domains) + return False def clean(self): """called in `save()` -- cgit v1.2.3-1-g7c22 From eccba393b93080c2a8c57b97801c2fc4b105b2f3 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 8 May 2012 15:11:28 -0400 Subject: modified migrations to match the models --- ...le_is_open__add_field_groupprofile_preapprov.py | 17 +- .../0122_auth_user__add_subscribed_tag_field.py | 320 --------------------- 2 files changed, 12 insertions(+), 325 deletions(-) delete mode 100644 askbot/migrations/0122_auth_user__add_subscribed_tag_field.py diff --git a/askbot/migrations/0121_auto__add_field_groupprofile_is_open__add_field_groupprofile_preapprov.py b/askbot/migrations/0121_auto__add_field_groupprofile_is_open__add_field_groupprofile_preapprov.py index 9a7ad614..e875198c 100644 --- a/askbot/migrations/0121_auto__add_field_groupprofile_is_open__add_field_groupprofile_preapprov.py +++ b/askbot/migrations/0121_auto__add_field_groupprofile_is_open__add_field_groupprofile_preapprov.py @@ -15,15 +15,21 @@ class Migration(SchemaMigration): # Adding field 'GroupProfile.preapproved_emails' db.add_column('askbot_groupprofile', 'preapproved_emails', - self.gf('django.db.models.fields.TextField')(null=True), + self.gf('django.db.models.fields.TextField')(default='', null=True, blank=True), keep_default=False) # Adding field 'GroupProfile.preapproved_email_domains' db.add_column('askbot_groupprofile', 'preapproved_email_domains', - self.gf('django.db.models.fields.TextField')(null=True), + self.gf('django.db.models.fields.TextField')(default='', null=True, blank=True), keep_default=False) + # Adding unique constraint on 'GroupMembership', fields ['group', 'user'] + db.create_unique('askbot_groupmembership', ['group_id', 'user_id']) + def backwards(self, orm): + # Removing unique constraint on 'GroupMembership', fields ['group', 'user'] + db.delete_unique('askbot_groupmembership', ['group_id', 'user_id']) + # Deleting field 'GroupProfile.is_open' db.delete_column('askbot_groupprofile', 'is_open') @@ -115,7 +121,7 @@ class Migration(SchemaMigration): 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_favorite_questions'", 'to': "orm['auth.User']"}) }, 'askbot.groupmembership': { - 'Meta': {'object_name': 'GroupMembership'}, + 'Meta': {'unique_together': "(('group', 'user'),)", 'object_name': 'GroupMembership'}, 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_memberships'", 'to': "orm['askbot.Tag']"}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_memberships'", 'to': "orm['auth.User']"}) @@ -127,8 +133,8 @@ class Migration(SchemaMigration): 'is_open': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'logo_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), 'moderate_email': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'preapproved_email_domains': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'preapproved_emails': ('django.db.models.fields.TextField', [], {'null': 'True'}) + 'preapproved_email_domains': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}), + 'preapproved_emails': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}) }, 'askbot.markedtag': { 'Meta': {'object_name': 'MarkedTag'}, @@ -317,6 +323,7 @@ class Migration(SchemaMigration): 'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), 'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}), + 'subscribed_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) diff --git a/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py b/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py deleted file mode 100644 index 50d4c379..00000000 --- a/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py +++ /dev/null @@ -1,320 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - try: - # Adding field 'User.interesting_tags' - db.add_column(u'auth_user', 'subscribed_tags', self.gf('django.db.models.fields.TextField')(blank=True, default = ''), keep_default=False) - except: - pass - - def backwards(self, orm): - # Deleting field 'User.interesting_tags' - db.delete_column('auth_user', 'subscribed_tags') - - - models = { - 'askbot.activity': { - 'Meta': {'object_name': 'Activity', 'db_table': "u'activity'"}, - 'active_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'activity_type': ('django.db.models.fields.SmallIntegerField', [], {}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_auditted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True'}), - 'receiving_users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'received_activity'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), - 'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'incoming_activity'", 'symmetrical': 'False', 'through': "orm['askbot.ActivityAuditStatus']", 'to': "orm['auth.User']"}), - 'summary': ('django.db.models.fields.TextField', [], {'default': "''"}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) - }, - 'askbot.activityauditstatus': { - 'Meta': {'unique_together': "(('user', 'activity'),)", 'object_name': 'ActivityAuditStatus'}, - 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Activity']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) - }, - 'askbot.anonymousanswer': { - 'Meta': {'object_name': 'AnonymousAnswer'}, - 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), - 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'anonymous_answers'", 'to': "orm['askbot.Post']"}), - 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), - 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - }, - 'askbot.anonymousquestion': { - 'Meta': {'object_name': 'AnonymousQuestion'}, - 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), - 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), - 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), - 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), - 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - }, - 'askbot.award': { - 'Meta': {'object_name': 'Award', 'db_table': "u'award'"}, - 'awarded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'badge': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_badge'", 'to': "orm['askbot.BadgeData']"}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'notified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_user'", 'to': "orm['auth.User']"}) - }, - 'askbot.badgedata': { - 'Meta': {'ordering': "('slug',)", 'object_name': 'BadgeData'}, - 'awarded_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'awarded_to': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'badges'", 'symmetrical': 'False', 'through': "orm['askbot.Award']", 'to': "orm['auth.User']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) - }, - 'askbot.emailfeedsetting': { - 'Meta': {'unique_together': "(('subscriber', 'feed_type'),)", 'object_name': 'EmailFeedSetting'}, - 'added_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'feed_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'frequency': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '8'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'reported_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'subscriber': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notification_subscriptions'", 'to': "orm['auth.User']"}) - }, - 'askbot.favoritequestion': { - 'Meta': {'object_name': 'FavoriteQuestion', 'db_table': "u'favorite_question'"}, - 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Thread']"}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_favorite_questions'", 'to': "orm['auth.User']"}) - }, - 'askbot.groupmembership': { - 'Meta': {'unique_together': "(('group', 'user'),)", 'object_name': 'GroupMembership'}, - 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_memberships'", 'to': "orm['askbot.Tag']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_memberships'", 'to': "orm['auth.User']"}) - }, - 'askbot.groupprofile': { - 'Meta': {'object_name': 'GroupProfile'}, - 'group_tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'group_profile'", 'unique': 'True', 'to': "orm['askbot.Tag']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_open': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'logo_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), - 'moderate_email': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'preapproved_email_domains': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'preapproved_emails': ('django.db.models.fields.TextField', [], {'null': 'True'}) - }, - 'askbot.markedtag': { - 'Meta': {'object_name': 'MarkedTag'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'reason': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_selections'", 'to': "orm['askbot.Tag']"}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tag_selections'", 'to': "orm['auth.User']"}) - }, - 'askbot.post': { - 'Meta': {'object_name': 'Post'}, - 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), - 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'posts'", 'to': "orm['auth.User']"}), - 'comment_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_posts'", 'null': 'True', 'to': "orm['auth.User']"}), - 'html': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_edited_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'last_edited_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_edited_posts'", 'null': 'True', 'to': "orm['auth.User']"}), - 'locked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'locked_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'locked_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locked_posts'", 'null': 'True', 'to': "orm['auth.User']"}), - 'offensive_flag_count': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'old_answer_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), - 'old_comment_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), - 'old_question_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), - 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'to': "orm['askbot.Post']"}), - 'post_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), - 'text': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'posts'", 'null': 'True', 'blank': 'True', 'to': "orm['askbot.Thread']"}), - 'vote_down_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'vote_up_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'wikified_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}) - }, - 'askbot.postflagreason': { - 'Meta': {'object_name': 'PostFlagReason'}, - 'added_at': ('django.db.models.fields.DateTimeField', [], {}), - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), - 'details': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'post_reject_reasons'", 'to': "orm['askbot.Post']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '128'}) - }, - 'askbot.postrevision': { - 'Meta': {'ordering': "('-revision',)", 'unique_together': "(('post', 'revision'),)", 'object_name': 'PostRevision'}, - 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'approved_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'approved_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), - 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'postrevisions'", 'to': "orm['auth.User']"}), - 'by_email': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'post': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisions'", 'null': 'True', 'to': "orm['askbot.Post']"}), - 'revised_at': ('django.db.models.fields.DateTimeField', [], {}), - 'revision': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'revision_type': ('django.db.models.fields.SmallIntegerField', [], {}), - 'summary': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'}), - 'tagnames': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '125', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '300', 'blank': 'True'}) - }, - 'askbot.questionview': { - 'Meta': {'object_name': 'QuestionView'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'viewed'", 'to': "orm['askbot.Post']"}), - 'when': ('django.db.models.fields.DateTimeField', [], {}), - 'who': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'question_views'", 'to': "orm['auth.User']"}) - }, - 'askbot.replyaddress': { - 'Meta': {'object_name': 'ReplyAddress'}, - 'address': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '25'}), - 'allowed_from_email': ('django.db.models.fields.EmailField', [], {'max_length': '150'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reply_addresses'", 'to': "orm['askbot.Post']"}), - 'response_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'edit_addresses'", 'null': 'True', 'to': "orm['askbot.Post']"}), - 'used_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) - }, - 'askbot.repute': { - 'Meta': {'object_name': 'Repute', 'db_table': "u'repute'"}, - 'comment': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'negative': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'positive': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True', 'blank': 'True'}), - 'reputation': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'reputation_type': ('django.db.models.fields.SmallIntegerField', [], {}), - 'reputed_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) - }, - 'askbot.tag': { - 'Meta': {'ordering': "('-used_count', 'name')", 'object_name': 'Tag', 'db_table': "u'tag'"}, - 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_tags'", 'to': "orm['auth.User']"}), - 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_tags'", 'null': 'True', 'to': "orm['auth.User']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'tag_wiki': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'described_tag'", 'unique': 'True', 'null': 'True', 'to': "orm['askbot.Post']"}), - 'used_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) - }, - 'askbot.thread': { - 'Meta': {'object_name': 'Thread'}, - 'accepted_answer': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['askbot.Post']"}), - 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'answer_accepted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'answer_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), - 'close_reason': ('django.db.models.fields.SmallIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'closed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'closed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'closed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), - 'favorited_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'unused_favorite_threads'", 'symmetrical': 'False', 'through': "orm['askbot.FavoriteQuestion']", 'to': "orm['auth.User']"}), - 'favourite_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'followed_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'followed_threads'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'last_activity_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_activity_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'unused_last_active_in_threads'", 'to': "orm['auth.User']"}), - 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'threads'", 'symmetrical': 'False', 'to': "orm['askbot.Tag']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), - 'view_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) - }, - 'askbot.vote': { - 'Meta': {'unique_together': "(('user', 'voted_post'),)", 'object_name': 'Vote', 'db_table': "u'vote'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['auth.User']"}), - 'vote': ('django.db.models.fields.SmallIntegerField', [], {}), - 'voted_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'voted_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['askbot.Post']"}) - }, - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}), - 'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}), - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), - 'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), - 'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}), - 'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), - 'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), - 'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}), - 'subscribed_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), - 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - } - } - - complete_apps = ['askbot'] -- cgit v1.2.3-1-g7c22 From fa03dbcf627b8024994d77663692b6fcfdd18895 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 8 May 2012 15:21:54 -0400 Subject: reintroduced lost migration for adding subscribed tag field --- .../0122_auth_user__add_subscribed_tag_field.py | 312 +++++++++++++++++++++ 1 file changed, 312 insertions(+) create mode 100644 askbot/migrations/0122_auth_user__add_subscribed_tag_field.py diff --git a/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py b/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py new file mode 100644 index 00000000..32070c37 --- /dev/null +++ b/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py @@ -0,0 +1,312 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): +pass + def backwards(self, orm): +pass + models = { + 'askbot.activity': { + 'Meta': {'object_name': 'Activity', 'db_table': "u'activity'"}, + 'active_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'activity_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_auditted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True'}), + 'receiving_users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'received_activity'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'incoming_activity'", 'symmetrical': 'False', 'through': "orm['askbot.ActivityAuditStatus']", 'to': "orm['auth.User']"}), + 'summary': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.activityauditstatus': { + 'Meta': {'unique_together': "(('user', 'activity'),)", 'object_name': 'ActivityAuditStatus'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Activity']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.anonymousanswer': { + 'Meta': {'object_name': 'AnonymousAnswer'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'anonymous_answers'", 'to': "orm['askbot.Post']"}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.anonymousquestion': { + 'Meta': {'object_name': 'AnonymousQuestion'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip_addr': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'askbot.award': { + 'Meta': {'object_name': 'Award', 'db_table': "u'award'"}, + 'awarded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'badge': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_badge'", 'to': "orm['askbot.BadgeData']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'notified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_user'", 'to': "orm['auth.User']"}) + }, + 'askbot.badgedata': { + 'Meta': {'ordering': "('slug',)", 'object_name': 'BadgeData'}, + 'awarded_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'awarded_to': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'badges'", 'symmetrical': 'False', 'through': "orm['askbot.Award']", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) + }, + 'askbot.emailfeedsetting': { + 'Meta': {'unique_together': "(('subscriber', 'feed_type'),)", 'object_name': 'EmailFeedSetting'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'feed_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'frequency': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '8'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reported_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'subscriber': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notification_subscriptions'", 'to': "orm['auth.User']"}) + }, + 'askbot.favoritequestion': { + 'Meta': {'object_name': 'FavoriteQuestion', 'db_table': "u'favorite_question'"}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Thread']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_favorite_questions'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupmembership': { + 'Meta': {'unique_together': "(('group', 'user'),)", 'object_name': 'GroupMembership'}, + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_memberships'", 'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_memberships'", 'to': "orm['auth.User']"}) + }, + 'askbot.groupprofile': { + 'Meta': {'object_name': 'GroupProfile'}, + 'group_tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'group_profile'", 'unique': 'True', 'to': "orm['askbot.Tag']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_open': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'logo_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), + 'moderate_email': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'preapproved_email_domains': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}), + 'preapproved_emails': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}) + }, + 'askbot.markedtag': { + 'Meta': {'object_name': 'MarkedTag'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reason': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_selections'", 'to': "orm['askbot.Tag']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tag_selections'", 'to': "orm['auth.User']"}) + }, + 'askbot.post': { + 'Meta': {'object_name': 'Post'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'posts'", 'to': "orm['auth.User']"}), + 'comment_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'html': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_edited_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'last_edited_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_edited_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'locked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'locked_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'locked_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locked_posts'", 'null': 'True', 'to': "orm['auth.User']"}), + 'offensive_flag_count': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'old_answer_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_comment_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'old_question_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'post_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '180'}), + 'text': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'posts'", 'null': 'True', 'blank': 'True', 'to': "orm['askbot.Thread']"}), + 'vote_down_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'vote_up_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'wiki': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'wikified_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}) + }, + 'askbot.postflagreason': { + 'Meta': {'object_name': 'PostFlagReason'}, + 'added_at': ('django.db.models.fields.DateTimeField', [], {}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'details': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'post_reject_reasons'", 'to': "orm['askbot.Post']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '128'}) + }, + 'askbot.postrevision': { + 'Meta': {'ordering': "('-revision',)", 'unique_together': "(('post', 'revision'),)", 'object_name': 'PostRevision'}, + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'approved_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'approved_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'postrevisions'", 'to': "orm['auth.User']"}), + 'by_email': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisions'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'revised_at': ('django.db.models.fields.DateTimeField', [], {}), + 'revision': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'revision_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '125', 'blank': 'True'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '300', 'blank': 'True'}) + }, + 'askbot.questionview': { + 'Meta': {'object_name': 'QuestionView'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'viewed'", 'to': "orm['askbot.Post']"}), + 'when': ('django.db.models.fields.DateTimeField', [], {}), + 'who': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'question_views'", 'to': "orm['auth.User']"}) + }, + 'askbot.replyaddress': { + 'Meta': {'object_name': 'ReplyAddress'}, + 'address': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '25'}), + 'allowed_from_email': ('django.db.models.fields.EmailField', [], {'max_length': '150'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reply_addresses'", 'to': "orm['askbot.Post']"}), + 'response_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'edit_addresses'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.repute': { + 'Meta': {'object_name': 'Repute', 'db_table': "u'repute'"}, + 'comment': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'negative': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'positive': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['askbot.Post']", 'null': 'True', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'reputation_type': ('django.db.models.fields.SmallIntegerField', [], {}), + 'reputed_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'askbot.tag': { + 'Meta': {'ordering': "('-used_count', 'name')", 'object_name': 'Tag', 'db_table': "u'tag'"}, + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_tags'", 'to': "orm['auth.User']"}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'deleted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'deleted_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'deleted_tags'", 'null': 'True', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'tag_wiki': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'described_tag'", 'unique': 'True', 'null': 'True', 'to': "orm['askbot.Post']"}), + 'used_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.thread': { + 'Meta': {'object_name': 'Thread'}, + 'accepted_answer': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['askbot.Post']"}), + 'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'answer_accepted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'answer_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), + 'close_reason': ('django.db.models.fields.SmallIntegerField', [], {'null': 'True', 'blank': 'True'}), + 'closed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'closed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'closed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'favorited_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'unused_favorite_threads'", 'symmetrical': 'False', 'through': "orm['askbot.FavoriteQuestion']", 'to': "orm['auth.User']"}), + 'favourite_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'followed_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'followed_threads'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_activity_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_activity_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'unused_last_active_in_threads'", 'to': "orm['auth.User']"}), + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'tagnames': ('django.db.models.fields.CharField', [], {'max_length': '125'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'threads'", 'symmetrical': 'False', 'to': "orm['askbot.Tag']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'view_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) + }, + 'askbot.vote': { + 'Meta': {'unique_together': "(('user', 'voted_post'),)", 'object_name': 'Vote', 'db_table': "u'vote'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['auth.User']"}), + 'vote': ('django.db.models.fields.SmallIntegerField', [], {}), + 'voted_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'voted_post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': "orm['askbot.Post']"}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}), + 'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}), + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), + 'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}), + 'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), + 'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}), + 'subscribed_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['askbot'] \ No newline at end of file -- cgit v1.2.3-1-g7c22 From 5f26975cc42b012fba086b69f54fc81219bd3ff7 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 8 May 2012 15:29:18 -0400 Subject: fixed the migration --- .../0122_auth_user__add_subscribed_tag_field.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py b/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py index 32070c37..d84666fb 100644 --- a/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py +++ b/askbot/migrations/0122_auth_user__add_subscribed_tag_field.py @@ -4,13 +4,19 @@ from south.db import db from south.v2 import SchemaMigration from django.db import models - class Migration(SchemaMigration): - + def forwards(self, orm): -pass + try: + # Adding field 'User.interesting_tags' + db.add_column(u'auth_user', 'subscribed_tags', self.gf('django.db.models.fields.TextField')(blank=True, default = ''), keep_default=False) + except: + pass + def backwards(self, orm): -pass + # Deleting field 'User.interesting_tags' + db.delete_column('auth_user', 'subscribed_tags') + models = { 'askbot.activity': { 'Meta': {'object_name': 'Activity', 'db_table': "u'activity'"}, @@ -309,4 +315,4 @@ pass } } - complete_apps = ['askbot'] \ No newline at end of file + complete_apps = ['askbot'] -- cgit v1.2.3-1-g7c22 From 34c01db1df6297c8ef46bb0d667b219774ecd1ea Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 9 May 2012 16:05:33 -0400 Subject: added optional tag search box --- askbot/conf/forum_data_rules.py | 9 ++ askbot/models/question.py | 27 ++++- askbot/search/state_manager.py | 9 +- askbot/skins/common/media/js/live_search.js | 125 ++++++++++++++++++++- askbot/skins/common/media/js/utils.js | 1 - askbot/skins/default/media/style/style.less | 25 ++++- .../skins/default/templates/main_page/sidebar.html | 4 + .../default/templates/main_page/tag_search.html | 7 ++ askbot/views/readers.py | 9 +- 9 files changed, 200 insertions(+), 16 deletions(-) create mode 100644 askbot/skins/default/templates/main_page/tag_search.html diff --git a/askbot/conf/forum_data_rules.py b/askbot/conf/forum_data_rules.py index 491ebfa8..7d98c9e8 100644 --- a/askbot/conf/forum_data_rules.py +++ b/askbot/conf/forum_data_rules.py @@ -200,6 +200,15 @@ settings.register( ) ) +settings.register( + livesettings.BooleanValue( + FORUM_DATA_RULES, + 'TAG_SEARCH_INPUT_ENABLED', + default = False, + description = _('Enable separate tag search box on main page') + ) +) + settings.register( livesettings.IntegerValue( FORUM_DATA_RULES, diff --git a/askbot/models/question.py b/askbot/models/question.py index 597a95ae..7d1c3758 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -190,8 +190,31 @@ class ThreadManager(models.Manager): qs = qs.filter(posts__post_type='question', posts__author__in=query_users) # TODO: unify with search_state.author ? tags = search_state.unified_tags() - for tag in tags: - qs = qs.filter(tags__name=tag) # Tags or AND-ed here, not OR-ed (i.e. we fetch only threads with all tags) + if len(tags) > 0: + + if askbot_settings.TAG_SEARCH_INPUT_ENABLED: + #todo: this may be gone or disabled per option + #"tag_search_box_enabled" + existing_tags = set( + Tag.objects.filter( + name__in = tags + ).values_list( + 'name', + flat = True + ) + ) + + non_existing_tags = set(tags) - existing_tags + meta_data['non_existing_tags'] = list(non_existing_tags) + tags = existing_tags + else: + meta_data['non_existing_tags'] = list() + + #construct filter for the tag search + for tag in tags: + qs = qs.filter(tags__name=tag) # Tags or AND-ed here, not OR-ed (i.e. we fetch only threads with all tags) + else: + meta_data['non_existing_tags'] = list() if search_state.scope == 'unanswered': qs = qs.filter(closed = False) # Do not show closed questions in unanswered section diff --git a/askbot/search/state_manager.py b/askbot/search/state_manager.py index 8096cbdd..f8154865 100644 --- a/askbot/search/state_manager.py +++ b/askbot/search/state_manager.py @@ -216,9 +216,14 @@ class SearchState(object): ss.page = 1 return ss - def remove_tags(self): + def remove_tags(self, tags = None): ss = self.deepcopy() - ss.tags = [] + if tags: + ss.tags = list( + set(ss.tags) - set(tags) + ) + else: + ss.tags = [] ss.page = 1 return ss diff --git a/askbot/skins/common/media/js/live_search.js b/askbot/skins/common/media/js/live_search.js index 100c3f67..f33862a1 100644 --- a/askbot/skins/common/media/js/live_search.js +++ b/askbot/skins/common/media/js/live_search.js @@ -1,3 +1,55 @@ +var TagWarningBox = function(){ + WrappedElement.call(this); + this._tags = []; +}; +inherits(TagWarningBox, WrappedElement); + +TagWarningBox.prototype.createDom = function(){ + this._element = this.makeElement('div'); + this._element + .css('display', 'block') + .css('margin', '0 0 13px 2px'); + this._element.addClass('non-existing-tags'); + this._warning = this.makeElement('p'); + this._element.append(this._warning); + this._tag_container = this.makeElement('ul'); + this._tag_container.addClass('tags'); + this._element.append(this._tag_container); + this._element.append($('
')); + this._element.hide(); +}; + +TagWarningBox.prototype.clear = function(){ + this._tags = []; + if (this._tag_container){ + this._tag_container.empty(); + } + this._warning.hide(); + this._element.hide(); +}; + +TagWarningBox.prototype.addTag = function(tag_name){ + var tag = new Tag(); + tag.setName(tag_name); + tag.setLinkable(false); + tag.setDeletable(false); + var elem = this.getElement(); + this._tag_container.append(tag.getElement()); + this._tag_container.css('display', 'block'); + this._tags.push(tag); + elem.show(); +}; + +TagWarningBox.prototype.showWarning = function(){ + this._warning.html( + ngettext( + 'Sorry, this tag does not exist', + 'Sorry, these tags do not exist', + this._tags.length + ) + ); + this._warning.show(); +}; var liveSearch = function(query_string) { var query = $('input#keywords'); @@ -7,6 +59,70 @@ var liveSearch = function(query_string) { var q_list_sel = 'question-list';//id of question listing div var search_url = askbot['urls']['questions']; var x_button = $('input[name=reset_query]'); + var tag_warning_box = new TagWarningBox(); + + //the tag search input is optional in askbot + $('#ab-tag-search').parent().before( + tag_warning_box.getElement() + ); + + var run_tag_search = function(){ + var search_tags = $('#ab-tag-search').val().split(/\s+/); + if (search_tags.length === 0) { + return; + } + /** @todo: the questions/ might need translation... */ + query_string = '/questions/scope:all/sort:activity-desc/page:1/' + $.each(search_tags, function(idx, tag) { + query_string = QSutils.add_search_tag(query_string, search_tags); + }); + var url = search_url + query_string; + $.ajax({ + url: url, + dataType: 'json', + success: function(data, text_status, xhr){ + render_result(data, text_status, xhr); + $('#ab-tag-search').val(''); + }, + }); + updateHistory(url); + }; + + var activate_tag_search_input = function(){ + //the autocomplete is set up in tag_selector.js + var button = $('#ab-tag-search-add'); + if (button.length === 0){//may be absent + return; + } + var ac = new AutoCompleter({ + url: askbot['urls']['get_tag_list'], + preloadData: true, + minChars: 1, + useCache: true, + matchInside: true, + maxCacheLength: 100, + maxItemsToShow: 20, + onItemSelect: run_tag_search, + delay: 10 + }); + ac.decorate($('#ab-tag-search')); + setupButtonEventHandlers(button, run_tag_search); + //var tag_search_input = $('#ab-tag-search'); + //tag_search_input.keydown( + // makeKeyHandler(13, run_tag_search) + //); + }; + + var render_tag_warning = function(tag_list){ + if ( !tag_list ) { + return; + } + tag_warning_box.clear(); + $.each(tag_list, function(idx, tag_name){ + tag_warning_box.addTag(tag_name); + }); + tag_warning_box.showWarning(); + }; var refresh_x_button = function(){ if(query_val().length > 0){ @@ -69,6 +185,10 @@ var liveSearch = function(query_string) { }, cache: false }); + updateHistory(url); + }; + + var updateHistory = function(url) { var context = { state:1, rand:Math.random() }; History.pushState( context, "Questions", url ); setTimeout(function (){ @@ -195,6 +315,7 @@ var liveSearch = function(query_string) { } render_related_tags(data['related_tags'], data['query_string']); render_relevance_sort_tab(data['query_string']); + render_tag_warning(data['non_existing_tags']); set_active_sort_tab(data['query_data']['sort_order'], data['query_string']); if(data['feed_url']){ // Change RSS URL @@ -214,11 +335,11 @@ var liveSearch = function(query_string) { var askHrefBase = askButton.attr('href').split('?')[0]; askButton.attr('href', askHrefBase + data['query_data']['ask_query_string']); /* INFO: ask_query_string should already be URL-encoded! */ - query.focus(); var old_list = $('#' + q_list_sel); var new_list = $('
').hide().html(data['questions']); + new_list.find('.timeago').timeago(); old_list.stop(true).after(new_list).fadeOut(200, function() { //show new div with a fadeIn effect old_list.remove(); @@ -260,6 +381,8 @@ var liveSearch = function(query_string) { } }); + activate_tag_search_input(); + $("form#searchForm").submit(function(event) { // if user clicks the button the s(h)e probably wants page reload, // so provide that experience but first update the query string diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index c82913a8..47d0f880 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -216,7 +216,6 @@ QSutils.add_search_tag = function(query_string, tag){ return this.patch_query_string(query_string, 'tags:' + tag_string); }; - /* **************************************************** */ /* some google closure-like code for the ui elements */ diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 0c540698..ba50e42e 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -516,6 +516,8 @@ body.anon { p { margin-bottom: 4px; + color: @info-text; + font-family:@main-font; } p.info-box-follow-up-links { @@ -588,13 +590,22 @@ body.anon { } .inputs{ - #interestingTagInput, #ignoredTagInput, #subscribedTagInput{ + #interestingTagInput, + #ignoredTagInput, + #subscribedTagInput, + #ab-tag-search { width:153px; padding-left:5px; border:#c9c9b5 1px solid; height:25px; } - #interestingTagAdd, #ignoredTagAdd, #subscribedTagAdd { + #ab-tag-search { + width: 135px; + } + #interestingTagAdd, + #ignoredTagAdd, + #subscribedTagAdd, + #ab-tag-search-add { background:url(../images/small-button-blue.png) repeat-x top; border:0; color:@button-label; @@ -605,10 +616,12 @@ body.anon { margin-top:-2px; cursor:pointer; .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080); - - + .text-shadow(0px,1px,0px,#E6F6FA); + .box-shadow(1px, 1px, 2px, #808080); + } + #ab-tag-search-add { + width: 47px; + margin-left: 3px; } #interestingTagAdd:hover, #ignoredTagAdd:hover, #subscribedTag:hover { background:url(../images/small-button-blue.png) repeat-x bottom; diff --git a/askbot/skins/default/templates/main_page/sidebar.html b/askbot/skins/default/templates/main_page/sidebar.html index fbfbdeb8..7acbe091 100644 --- a/askbot/skins/default/templates/main_page/sidebar.html +++ b/askbot/skins/default/templates/main_page/sidebar.html @@ -10,6 +10,10 @@ {% include "widgets/contributors.html" %} {% endif %} +{% if settings.TAG_SEARCH_INPUT_ENABLED %} + {% include "main_page/tag_search.html" %} +{% endif %} + {% if request.user.is_authenticated() and settings.SIDEBAR_MAIN_SHOW_TAG_SELECTOR %} {% include "widgets/tag_selector.html" %} {% endif %} diff --git a/askbot/skins/default/templates/main_page/tag_search.html b/askbot/skins/default/templates/main_page/tag_search.html new file mode 100644 index 00000000..45f12b2f --- /dev/null +++ b/askbot/skins/default/templates/main_page/tag_search.html @@ -0,0 +1,7 @@ +
+

{% trans %}Tag search{% endtrans %}

+
+ + +
+
diff --git a/askbot/views/readers.py b/askbot/views/readers.py index 613cb3c9..a75a8967 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -76,6 +76,9 @@ def questions(request, **kwargs): qs, meta_data = models.Thread.objects.run_advanced_search(request_user=request.user, search_state=search_state) + if meta_data['non_existing_tags']: + search_state = search_state.remove_tags(meta_data['non_existing_tags']) + paginator = Paginator(qs, page_size) if paginator.num_pages < search_state.page: search_state.page = 1 @@ -129,10 +132,7 @@ def questions(request, **kwargs): if request.is_ajax(): q_count = paginator.count - if search_state.tags: - question_counter = ungettext('%(q_num)s question, tagged', '%(q_num)s questions, tagged', q_count) - else: - question_counter = ungettext('%(q_num)s question', '%(q_num)s questions', q_count) + question_counter = ungettext('%(q_num)s question', '%(q_num)s questions', q_count) question_counter = question_counter % {'q_num': humanize.intcomma(q_count),} if q_count > page_size: @@ -166,6 +166,7 @@ def questions(request, **kwargs): 'query_string': search_state.query_string(), 'page_size' : page_size, 'questions': questions_html.replace('\n',''), + 'non_existing_tags': meta_data['non_existing_tags'] } ajax_data['related_tags'] = [{ 'name': tag.name, -- cgit v1.2.3-1-g7c22 From bea37ea9663c5e827adb22d4dc0f001ab051a360 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 9 May 2012 17:08:22 -0400 Subject: fixed bugs: lost attachment button, text floating over group control checkboxes, group logo failed to upload --- askbot/skins/common/media/js/post.js | 2 +- askbot/skins/common/media/js/utils.js | 35 ++++++++++++++++--------------- askbot/skins/common/media/js/wmd/wmd.js | 2 +- askbot/skins/default/templates/users.html | 4 ++-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index f6157848..0f349fd8 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -1915,7 +1915,7 @@ var WMD = function(){ WrappedElement.call(this); this._markdown = undefined; this._enabled_buttons = 'bold italic link blockquote code ' + - 'image ol ul heading hr'; + 'image attachment ol ul heading hr'; this._is_previewer_enabled = true; }; inherits(WMD, WrappedElement); diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index 47d0f880..297e3f9a 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -715,16 +715,6 @@ TwoStateToggle.prototype.isOn = function(){ return this._element.hasClass('on'); }; -TwoStateToggle.prototype.setOn = function(is_on){ - if (is_on){ - this._element.addClass('on'); - this._element.html(this._state_messages['on-state']); - } else { - this._element.removeClass('on'); - this._element.html(this._state_messages['off-state']); - } -}; - TwoStateToggle.prototype.getDefaultHandler = function(){ var me = this; return function(){ @@ -738,7 +728,11 @@ TwoStateToggle.prototype.getDefaultHandler = function(){ data: data, success: function(data) { if (data['success']) { - me.setOn('is_enabled'); + if ( data['is_enabled'] ) { + me.setState('on-state'); + } else { + me.setState('off-state'); + } } else { showMessage(me.getElement(), data['message']); } @@ -747,22 +741,29 @@ TwoStateToggle.prototype.getDefaultHandler = function(){ }; }; +TwoStateToggle.prototype.isCheckBox = function(){ + var element = this._element; + return element.attr('type') === 'checkbox'; +}; + TwoStateToggle.prototype.setState = function(state){ var element = this._element; this._state = state; if (element) { - if ( - element.attr('nodeName') === 'INPUT' && - element.attr('type') === 'checkbox' - ) { + this.resetStyles(); + element.addClass(state); + if (state === 'on-state') { + element.addClass('on'); + } else if (state === 'off-state') { + element.removeClass('on'); + } + if ( this.isCheckBox() ) { if (state === 'on-state') { element.attr('checked', true); } else if (state === 'off-state') { element.attr('checked', false); } } else { - this.resetStyles(); - element.addClass(state); this._element.html(this._state_messages[state]); } } diff --git a/askbot/skins/common/media/js/wmd/wmd.js b/askbot/skins/common/media/js/wmd/wmd.js index 19f32c87..98af264f 100644 --- a/askbot/skins/common/media/js/wmd/wmd.js +++ b/askbot/skins/common/media/js/wmd/wmd.js @@ -2478,7 +2478,7 @@ if(!Attacklab.wmd) mergeEnv(top["wmd_options"]); Attacklab.full = true; - var defaultButtons = "bold italic link blockquote code image ol ul heading hr"; + var defaultButtons = "bold italic link blockquote code image attachment ol ul heading hr"; Attacklab.wmd_env.buttons = Attacklab.wmd_env.buttons || defaultButtons; }; Attacklab.loadEnv(); diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html index 343a3494..3fa35643 100644 --- a/askbot/skins/default/templates/users.html +++ b/askbot/skins/default/templates/users.html @@ -3,7 +3,7 @@ {% block title %}{% spaceless %}{% trans %}Users{% endtrans %}{% endspaceless %}{% endblock %} {% block before_css %} - {% if group and request.user.is_administrator() %} + {% if group and request.user.is_authenticated() and request.user.is_administrator() %} {% endif %} {% endblock %} @@ -82,7 +82,7 @@ askbot['urls']['delete_group_logo_url'] = '{% url delete_group_logo %}'; askbot['urls']['join_or_leave_group'] = '{% url join_or_leave_group %}'; - -- cgit v1.2.3-1-g7c22 From 4856a77e634aba169aae0db9861e1737049faff6 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 9 May 2012 17:18:34 -0400 Subject: fixed the timezone issue in the newly posted comments --- askbot/views/writers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/askbot/views/writers.py b/askbot/views/writers.py index c77c874f..7727eb04 100644 --- a/askbot/views/writers.py +++ b/askbot/views/writers.py @@ -540,9 +540,10 @@ def __generate_comments_json(obj, user):#non-view generates json data for the po comment_owner = comment.author + tz = template_filters.TIMEZONE_STR comment_data = {'id' : comment.id, 'object_id': obj.id, - 'comment_added_at': str(comment.added_at.replace(microsecond = 0)), + 'comment_added_at': str(comment.added_at.replace(microsecond = 0)) + tz, 'html': comment.html, 'user_display_name': comment_owner.username, 'user_url': comment_owner.get_profile_url(), -- cgit v1.2.3-1-g7c22 From d589c9cd76693c4cb86c1d6878e51c2fc463ab28 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 9 May 2012 20:05:44 -0400 Subject: fixed question page urls and updated test cases --- askbot/models/post.py | 8 +++++--- askbot/tests/page_load_tests.py | 31 +++++++++++++++---------------- askbot/tests/post_model_tests.py | 10 +++++----- askbot/urls.py | 2 ++ askbot/views/readers.py | 4 ++-- 5 files changed, 29 insertions(+), 26 deletions(-) diff --git a/askbot/models/post.py b/askbot/models/post.py index c1fc33d6..daf7757b 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -518,12 +518,14 @@ class Post(models.Model): def get_absolute_url(self, no_slug = False, question_post=None, thread=None): from askbot.utils.slug import slugify + #todo: the url generation function is pretty bad - + #the trailing slash is entered in three places here + in urls.py if not hasattr(self, '_thread_cache') and thread: self._thread_cache = thread if self.is_answer(): if not question_post: question_post = self.thread._question_post() - return u'%(base)s%(slug)s?answer=%(id)d#post-id-%(id)d' % { + return u'%(base)s%(slug)s/?answer=%(id)d#post-id-%(id)d' % { 'base': urlresolvers.reverse('question', args=[question_post.id]), 'slug': django_urlquote(slugify(self.thread.title)), 'id': self.id @@ -531,9 +533,9 @@ class Post(models.Model): elif self.is_question(): url = urlresolvers.reverse('question', args=[self.id]) if thread: - url += django_urlquote(slugify(thread.title)) + url += django_urlquote(slugify(thread.title)) + '/' elif no_slug is False: - url += django_urlquote(self.slug) + url += django_urlquote(self.slug) + '/' return url elif self.is_comment(): origin_post = self.get_origin_post() diff --git a/askbot/tests/page_load_tests.py b/askbot/tests/page_load_tests.py index 558ee617..ebfba0c3 100644 --- a/askbot/tests/page_load_tests.py +++ b/askbot/tests/page_load_tests.py @@ -553,19 +553,17 @@ class QuestionPageRedirectTests(AskbotTestCase): url = reverse('question', kwargs={'id': self.q.id}) resp = self.client.get(url) - url = url + self.q.slug - self.assertRedirects(resp, expected_url=url) - - resp = self.client.get(url) - self.assertEqual(200, resp.status_code) - self.assertEqual(self.q, resp.context['question']) + self.assertRedirects( + resp, + expected_url=self.q.get_absolute_url() + ) url = reverse('question', kwargs={'id': 101}) resp = self.client.get(url) - url = reverse('question', kwargs={'id': self.q.id}) + self.q.slug # redirect uses the new question.id ! + url = reverse('question', kwargs={'id': self.q.id}) + self.q.slug + '/'# redirect uses the new question.id ! self.assertRedirects(resp, expected_url=url) - url = reverse('question', kwargs={'id': 101}) + self.q.slug + url = reverse('question', kwargs={'id': 101}) + self.q.slug + '/' resp = self.client.get(url) self.assertEqual(200, resp.status_code) self.assertEqual(self.q, resp.context['question']) @@ -578,7 +576,7 @@ class QuestionPageRedirectTests(AskbotTestCase): url = reverse('question', kwargs={'id': self.q.id}) resp = self.client.get(url, data={'answer': self.a.id}) - url = url + self.q.slug + url = self.q.get_absolute_url() self.assertRedirects(resp, expected_url=url + '?answer=%d' % self.a.id) resp = self.client.get(url, data={'answer': self.a.id}) @@ -586,7 +584,8 @@ class QuestionPageRedirectTests(AskbotTestCase): self.assertEqual(self.q, resp.context['question']) self.assertEqual(self.a, resp.context['show_post']) - url = reverse('question', kwargs={'id': 101}) + self.q.slug + #test redirect from old question + url = reverse('question', kwargs={'id': 101}) + self.q.slug + '/' resp = self.client.get(url, data={'answer': 201}) self.assertRedirects(resp, expected_url=self.a.get_absolute_url()) @@ -597,10 +596,9 @@ class QuestionPageRedirectTests(AskbotTestCase): self.assertEqual(self.a, resp.context['show_post']) self.assertEqual(self.c, resp.context['show_comment']) - url = reverse('question', kwargs={'id': self.q.id}) + url = self.q.get_absolute_url() resp = self.client.get(url, data={'comment': self.c.id}) - url = url + self.q.slug - self.assertRedirects(resp, expected_url=url + '?comment=%d' % self.c.id) + self.assertEqual(200, resp.status_code) resp = self.client.get(url, data={'comment': self.c.id}) self.assertEqual(200, resp.status_code) @@ -608,6 +606,7 @@ class QuestionPageRedirectTests(AskbotTestCase): self.assertEqual(self.a, resp.context['show_post']) self.assertEqual(self.c, resp.context['show_comment']) - url = reverse('question', kwargs={'id': 101}) + self.q.slug - resp = self.client.get(url, data={'comment': 301}) - self.assertRedirects(resp, expected_url=self.c.get_absolute_url()) + url = self.q.get_absolute_url() + #point to a non-existing comment + resp = self.client.get(url, data={'comment': 100301}) + self.assertRedirects(resp, expected_url = self.q.get_absolute_url()) diff --git a/askbot/tests/post_model_tests.py b/askbot/tests/post_model_tests.py index 06bceca1..dd1399c1 100644 --- a/askbot/tests/post_model_tests.py +++ b/askbot/tests/post_model_tests.py @@ -167,17 +167,17 @@ class PostModelTests(AskbotTestCase): th.title = 'lala-x-lala' p = Post(id=3, post_type='question') p._thread_cache = th # cannot assign non-Thread instance directly - self.assertEqual('/question/3/lala-x-lala', p.get_absolute_url(thread=th)) + self.assertEqual('/question/3/lala-x-lala/', p.get_absolute_url(thread=th)) self.assertTrue(p._thread_cache is th) - self.assertEqual('/question/3/lala-x-lala', p.get_absolute_url(thread=th)) + self.assertEqual('/question/3/lala-x-lala/', p.get_absolute_url(thread=th)) def test_cached_get_absolute_url_2(self): p = Post(id=3, post_type='question') th = lambda:1 th.title = 'lala-x-lala' - self.assertEqual('/question/3/lala-x-lala', p.get_absolute_url(thread=th)) + self.assertEqual('/question/3/lala-x-lala/', p.get_absolute_url(thread=th)) self.assertTrue(p._thread_cache is th) - self.assertEqual('/question/3/lala-x-lala', p.get_absolute_url(thread=th)) + self.assertEqual('/question/3/lala-x-lala/', p.get_absolute_url(thread=th)) class ThreadTagModelsTests(AskbotTestCase): @@ -673,4 +673,4 @@ class ThreadRenderCacheUpdateTests(AskbotTestCase): # TODO: (in spare time - those cases should pass without changing anything in code but we should have them eventually for completness) # - Publishing anonymous questions / answers # - Re-posting question as answer and vice versa -# - Management commands (like post_emailed_questions) \ No newline at end of file +# - Management commands (like post_emailed_questions) diff --git a/askbot/urls.py b/askbot/urls.py index f4768412..799cc346 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -367,6 +367,8 @@ urlpatterns = patterns('', ), ) +#todo - this url below won't work, because it is defined above +#therefore the stackexchange urls feature won't work if getattr(settings, 'ASKBOT_USE_STACKEXCHANGE_URLS', False): urlpatterns += (url( r'^%s(?P\d+)/' % _('questions/'), diff --git a/askbot/views/readers.py b/askbot/views/readers.py index a75a8967..3259cddd 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -359,7 +359,7 @@ def question(request, id):#refactor - long subroutine. display question body, an return HttpResponseRedirect(reverse('index')) #redirect if slug in the url is wrong - if request.path.split('/')[-1] != question_post.slug: + if request.path.split('/')[-2] != question_post.slug: logging.debug('no slug match!') question_url = '?'.join(( question_post.get_absolute_url(), @@ -392,7 +392,7 @@ def question(request, id):#refactor - long subroutine. display question body, an 'deleted and is no longer accessible' ) request.user.message_set.create(message = error_message) - return HttpResponseRedirect(reverse('question', kwargs = {'id': id})) + return HttpResponseRedirect(question_post.thread.get_absolute_url()) if str(show_comment.thread._question_post().id) != str(id): return HttpResponseRedirect(show_comment.get_absolute_url()) -- cgit v1.2.3-1-g7c22 From 72020e42a221bdf6d7af1591e0addaac6ba9b2c5 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 9 May 2012 20:27:39 -0400 Subject: fixed css on the login and signup pages --- askbot/skins/common/media/jquery-openid/openid.css | 3 +-- askbot/skins/common/templates/authopenid/signup_with_password.html | 6 +++--- askbot/skins/default/media/style/style.less | 4 ++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/askbot/skins/common/media/jquery-openid/openid.css b/askbot/skins/common/media/jquery-openid/openid.css index ec93881d..9a1db85f 100644 --- a/askbot/skins/common/media/jquery-openid/openid.css +++ b/askbot/skins/common/media/jquery-openid/openid.css @@ -1,9 +1,8 @@ -div#login-icons {padding:20px 0 0 0;} +div#login-icons {padding: 0;} ul.login-icons {width: 450px; margin:0;padding:0;text-align:left; list-style-type:none; display:block;} ul.login-icons li {display:inline;} ul.large input {height: 40px; width: 90px;border:1px solid #ccc;margin:0 5px 5px 0;} .openid-signin h1 {padding-bottom: 10px;} -.openid-signin h2 {margin-top:15px;} .openid-signin h2#account-recovery-heading {margin-bottom:2px;} #account-recovery-form p.hint a {color:#1b79bd; text-decoration: none;} #account-recovery-form p.hint a:hover {text-decoration: underline;} diff --git a/askbot/skins/common/templates/authopenid/signup_with_password.html b/askbot/skins/common/templates/authopenid/signup_with_password.html index e79263d2..e65cd518 100644 --- a/askbot/skins/common/templates/authopenid/signup_with_password.html +++ b/askbot/skins/common/templates/authopenid/signup_with_password.html @@ -22,12 +22,12 @@

{% trans %}or create a new user name and password here{% endtrans %}

{% else %} -

{% trans %}Create login name and password{% endtrans %}

-

{% trans %}If you prefer, create your forum login name and +

{% trans %}Create login name and password{% endtrans %}

+ {%endif%}
{% csrf_token %} {{form.login_provider}} diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index ba50e42e..09d008d2 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -2227,6 +2227,10 @@ ul#related-tags li { } } +.openid-signin form { + margin-bottom: 5px; +} + #email-input-fs,#local_login_buttons,#password-fs,#openid-fs{ margin-top:10px; #id_email,#id_username,#id_password{ -- cgit v1.2.3-1-g7c22 From 21f93886df3a622623d19c1cbf4fd88ae8dc8fb8 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 9 May 2012 22:08:21 -0400 Subject: fixed a bug in an assertion statement and recompiled the css file --- askbot/askbot | 0 .../default/media/style/node_modules/.bin/lessc | 1 + .../media/style/node_modules/less/.npmignore | 2 + .../media/style/node_modules/less/CHANGELOG | 26 + .../default/media/style/node_modules/less/LICENSE | 179 +++ .../default/media/style/node_modules/less/Makefile | 75 ++ .../media/style/node_modules/less/README.md | 20 + .../node_modules/less/benchmark/less-benchmark.js | 47 + .../media/style/node_modules/less/bin/lessc | 139 +++ .../media/style/node_modules/less/index.html | 10 + .../style/node_modules/less/lib/less/browser.js | 380 ++++++ .../style/node_modules/less/lib/less/colors.js | 151 +++ .../style/node_modules/less/lib/less/cssmin.js | 355 ++++++ .../style/node_modules/less/lib/less/functions.js | 228 ++++ .../style/node_modules/less/lib/less/index.js | 148 +++ .../style/node_modules/less/lib/less/parser.js | 1305 ++++++++++++++++++++ .../style/node_modules/less/lib/less/rhino.js | 62 + .../media/style/node_modules/less/lib/less/tree.js | 17 + .../style/node_modules/less/lib/less/tree/alpha.js | 17 + .../node_modules/less/lib/less/tree/anonymous.js | 13 + .../node_modules/less/lib/less/tree/assignment.js | 17 + .../style/node_modules/less/lib/less/tree/call.js | 48 + .../style/node_modules/less/lib/less/tree/color.js | 101 ++ .../node_modules/less/lib/less/tree/comment.js | 14 + .../node_modules/less/lib/less/tree/condition.js | 42 + .../node_modules/less/lib/less/tree/dimension.js | 49 + .../node_modules/less/lib/less/tree/directive.js | 35 + .../node_modules/less/lib/less/tree/element.js | 47 + .../node_modules/less/lib/less/tree/expression.js | 23 + .../node_modules/less/lib/less/tree/import.js | 79 ++ .../node_modules/less/lib/less/tree/javascript.js | 51 + .../node_modules/less/lib/less/tree/keyword.js | 19 + .../style/node_modules/less/lib/less/tree/media.js | 114 ++ .../style/node_modules/less/lib/less/tree/mixin.js | 135 ++ .../node_modules/less/lib/less/tree/operation.js | 32 + .../style/node_modules/less/lib/less/tree/paren.js | 16 + .../node_modules/less/lib/less/tree/quoted.js | 29 + .../style/node_modules/less/lib/less/tree/rule.js | 42 + .../node_modules/less/lib/less/tree/ruleset.js | 216 ++++ .../node_modules/less/lib/less/tree/selector.js | 42 + .../style/node_modules/less/lib/less/tree/url.js | 25 + .../style/node_modules/less/lib/less/tree/value.js | 24 + .../node_modules/less/lib/less/tree/variable.js | 26 + .../media/style/node_modules/less/package.json | 36 + .../style/node_modules/less/test/css/colors.css | 58 + .../style/node_modules/less/test/css/comments.css | 56 + .../style/node_modules/less/test/css/css-3.css | 58 + .../node_modules/less/test/css/css-escapes.css | 20 + .../media/style/node_modules/less/test/css/css.css | 89 ++ .../style/node_modules/less/test/css/functions.css | 43 + .../node_modules/less/test/css/ie-filters.css | 5 + .../style/node_modules/less/test/css/import.css | 23 + .../node_modules/less/test/css/javascript.css | 22 + .../style/node_modules/less/test/css/lazy-eval.css | 3 + .../style/node_modules/less/test/css/media.css | 79 ++ .../node_modules/less/test/css/mixins-args.css | 76 ++ .../node_modules/less/test/css/mixins-closure.css | 9 + .../node_modules/less/test/css/mixins-guards.css | 58 + .../less/test/css/mixins-important.css | 17 + .../node_modules/less/test/css/mixins-nested.css | 14 + .../node_modules/less/test/css/mixins-pattern.css | 47 + .../style/node_modules/less/test/css/mixins.css | 71 ++ .../node_modules/less/test/css/operations.css | 49 + .../style/node_modules/less/test/css/parens.css | 20 + .../style/node_modules/less/test/css/rulesets.css | 33 + .../style/node_modules/less/test/css/scope.css | 15 + .../style/node_modules/less/test/css/selectors.css | 69 ++ .../style/node_modules/less/test/css/strings.css | 40 + .../style/node_modules/less/test/css/variables.css | 27 + .../node_modules/less/test/css/whitespace.css | 38 + .../style/node_modules/less/test/less-test.js | 73 ++ .../less/test/less/import/import-test-d.css | 1 + askbot/skins/default/media/style/style.css | 284 +++-- askbot/views/commands.py | 2 +- 74 files changed, 5765 insertions(+), 71 deletions(-) create mode 100644 askbot/askbot create mode 120000 askbot/skins/default/media/style/node_modules/.bin/lessc create mode 100644 askbot/skins/default/media/style/node_modules/less/.npmignore create mode 100644 askbot/skins/default/media/style/node_modules/less/CHANGELOG create mode 100644 askbot/skins/default/media/style/node_modules/less/LICENSE create mode 100644 askbot/skins/default/media/style/node_modules/less/Makefile create mode 100644 askbot/skins/default/media/style/node_modules/less/README.md create mode 100644 askbot/skins/default/media/style/node_modules/less/benchmark/less-benchmark.js create mode 100755 askbot/skins/default/media/style/node_modules/less/bin/lessc create mode 100644 askbot/skins/default/media/style/node_modules/less/index.html create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/browser.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/colors.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/cssmin.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/functions.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/index.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/parser.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/rhino.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/alpha.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/anonymous.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/assignment.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/call.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/color.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/comment.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/condition.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/dimension.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/directive.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/element.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/expression.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/import.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/javascript.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/keyword.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/media.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/mixin.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/operation.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/paren.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/quoted.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/rule.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/ruleset.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/selector.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/url.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/value.js create mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/variable.js create mode 100644 askbot/skins/default/media/style/node_modules/less/package.json create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/colors.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/comments.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/css-3.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/css-escapes.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/css.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/functions.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/ie-filters.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/import.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/javascript.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/lazy-eval.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/media.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-args.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-closure.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-guards.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-important.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-nested.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-pattern.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/operations.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/parens.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/rulesets.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/scope.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/selectors.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/strings.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/variables.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/whitespace.css create mode 100644 askbot/skins/default/media/style/node_modules/less/test/less-test.js create mode 100644 askbot/skins/default/media/style/node_modules/less/test/less/import/import-test-d.css diff --git a/askbot/askbot b/askbot/askbot new file mode 100644 index 00000000..e69de29b diff --git a/askbot/skins/default/media/style/node_modules/.bin/lessc b/askbot/skins/default/media/style/node_modules/.bin/lessc new file mode 120000 index 00000000..87a5294c --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/.bin/lessc @@ -0,0 +1 @@ +../less/bin/lessc \ No newline at end of file diff --git a/askbot/skins/default/media/style/node_modules/less/.npmignore b/askbot/skins/default/media/style/node_modules/less/.npmignore new file mode 100644 index 00000000..320faecc --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/.npmignore @@ -0,0 +1,2 @@ + +*.less diff --git a/askbot/skins/default/media/style/node_modules/less/CHANGELOG b/askbot/skins/default/media/style/node_modules/less/CHANGELOG new file mode 100644 index 00000000..9269555d --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/CHANGELOG @@ -0,0 +1,26 @@ +1.2.1 + +fix imports on browser +improve error reporting on browser +fix Runtime error reports from imported files +fix 'File not found' import error reporting + +1.2.0 + +- mixin guards +- new function `percentage` +- new `color` function to parse hex color strings +- new type-checking stylesheet functions +- fix Rhino support +- fix bug in string arguments to mixin call +- fix error reporting when index is 0 +- fix browser support in webkit and IE +- fix string interpolation bug when var is empty +- support '!important' after mixin calls +- support vanilla @keyframes directive +- support variables in certain css selectors, like 'nth-child' +- support @media and @import features properly +- improve @import support with media features +- improve error reports from imported files +- improve function call error reporting +- improve error-reporting diff --git a/askbot/skins/default/media/style/node_modules/less/LICENSE b/askbot/skins/default/media/style/node_modules/less/LICENSE new file mode 100644 index 00000000..40f3b781 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/LICENSE @@ -0,0 +1,179 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +Copyright (c) 2009-2010 Alexis Sellier diff --git a/askbot/skins/default/media/style/node_modules/less/Makefile b/askbot/skins/default/media/style/node_modules/less/Makefile new file mode 100644 index 00000000..32d7cc04 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/Makefile @@ -0,0 +1,75 @@ +# +# Run all tests +# +test: + node test/less-test.js + +# +# Run benchmark +# +benchmark: + node benchmark/less-benchmark.js + +# +# Build less.js +# +SRC = lib/less +HEADER = build/header.js +VERSION = `cat package.json | grep version \ + | grep -o '[0-9]\.[0-9]\.[0-9]\+'` +DIST = dist/less-${VERSION}.js +RHINO = dist/less-rhino-${VERSION}.js +DIST_MIN = dist/less-${VERSION}.min.js + +less: + @@mkdir -p dist + @@touch ${DIST} + @@cat ${HEADER} | sed s/@VERSION/${VERSION}/ > ${DIST} + @@echo "(function (window, undefined) {" >> ${DIST} + @@cat build/require.js\ + build/amd.js\ + build/ecma-5.js\ + ${SRC}/parser.js\ + ${SRC}/functions.js\ + ${SRC}/colors.js\ + ${SRC}/tree/*.js\ + ${SRC}/tree.js\ + ${SRC}/browser.js >> ${DIST} + @@echo "})(window);" >> ${DIST} + @@echo ${DIST} built. + +rhino: + @@mkdir -p dist + @@touch ${RHINO} + @@cat build/require-rhino.js\ + build/ecma-5.js\ + ${SRC}/parser.js\ + ${SRC}/functions.js\ + ${SRC}/tree/*.js\ + ${SRC}/tree.js\ + ${SRC}/rhino.js > ${RHINO} + @@echo ${RHINO} built. + +min: less + @@echo minifying... + @@uglifyjs ${DIST} > ${DIST_MIN} + @@echo ${DIST_MIN} built. + +server: less + cp dist/less-${VERSION}.js test/html/ + cd test/html && python -m SimpleHTTPServer + +clean: + git rm dist/* + +dist: clean min + git add dist/* + git commit -a -m "(dist) build ${VERSION}" + git archive master --prefix=less/ -o less-${VERSION}.tar.gz + npm publish less-${VERSION}.tar.gz + +stable: + npm tag less ${VERSION} stable + + +.PHONY: test benchmark diff --git a/askbot/skins/default/media/style/node_modules/less/README.md b/askbot/skins/default/media/style/node_modules/less/README.md new file mode 100644 index 00000000..726d6910 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/README.md @@ -0,0 +1,20 @@ +less.js +======= + +The **dynamic** stylesheet language. + + + +about +----- + +This is the JavaScript, and now official, stable version of LESS. + +For more information, visit . + +license +------- + +See `LICENSE` file. + +> Copyright (c) 2009-2011 Alexis Sellier diff --git a/askbot/skins/default/media/style/node_modules/less/benchmark/less-benchmark.js b/askbot/skins/default/media/style/node_modules/less/benchmark/less-benchmark.js new file mode 100644 index 00000000..68fe1ad4 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/benchmark/less-benchmark.js @@ -0,0 +1,47 @@ +var path = require('path'), + fs = require('fs'), + sys = require('util'); + +var less = require('../lib/less'); +var file = path.join(__dirname, 'benchmark.less'); + +if (process.argv[2]) { file = path.join(process.cwd(), process.argv[2]) } + +fs.readFile(file, 'utf8', function (e, data) { + var tree, css, start, end, total; + + sys.puts("Benchmarking...\n", path.basename(file) + " (" + + parseInt(data.length / 1024) + " KB)", ""); + + start = new(Date); + + new(less.Parser)({ optimization: 2 }).parse(data, function (err, tree) { + end = new(Date); + + total = end - start; + + sys.puts("Parsing: " + + total + " ms (" + + parseInt(1000 / total * + data.length / 1024) + " KB\/s)"); + + start = new(Date); + css = tree.toCSS(); + end = new(Date); + + sys.puts("Generation: " + (end - start) + " ms (" + + parseInt(1000 / (end - start) * + data.length / 1024) + " KB\/s)"); + + total += end - start; + + sys.puts("Total: " + total + "ms (" + + parseInt(1000 / total * data.length / 1024) + " KB/s)"); + + if (err) { + less.writeError(err); + process.exit(3); + } + }); +}); + diff --git a/askbot/skins/default/media/style/node_modules/less/bin/lessc b/askbot/skins/default/media/style/node_modules/less/bin/lessc new file mode 100755 index 00000000..30ae3520 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/bin/lessc @@ -0,0 +1,139 @@ +#!/usr/bin/env node + +var path = require('path'), + fs = require('fs'), + sys = require('util'), + os = require('os'); + +var less = require('../lib/less'); +var args = process.argv.slice(1); +var options = { + compress: false, + yuicompress: false, + optimization: 1, + silent: false, + paths: [], + color: true, + strictImports: false +}; + +args = args.filter(function (arg) { + var match; + + if (match = arg.match(/^-I(.+)$/)) { + options.paths.push(match[1]); + return false; + } + + if (match = arg.match(/^--?([a-z][0-9a-z-]*)(?:=([^\s]+))?$/i)) { arg = match[1] } + else { return arg } + + switch (arg) { + case 'v': + case 'version': + sys.puts("lessc " + less.version.join('.') + " (LESS Compiler) [JavaScript]"); + process.exit(0); + case 'verbose': + options.verbose = true; + break; + case 's': + case 'silent': + options.silent = true; + break; + case 'strict-imports': + options.strictImports = true; + break; + case 'h': + case 'help': + sys.puts("usage: lessc source [destination]"); + process.exit(0); + case 'x': + case 'compress': + options.compress = true; + break; + case 'yui-compress': + options.yuicompress = true; + break; + case 'no-color': + options.color = false; + break; + case 'include-path': + options.paths = match[2].split(os.type().match(/Windows/) ? ';' : ':') + .map(function(p) { + if (p) { + return path.resolve(process.cwd(), p); + } + }); + break; + case 'O0': options.optimization = 0; break; + case 'O1': options.optimization = 1; break; + case 'O2': options.optimization = 2; break; + } +}); + +var input = args[1]; +if (input && input != '-') { + input = path.resolve(process.cwd(), input); +} +var output = args[2]; +if (output) { + output = path.resolve(process.cwd(), output); +} + +var css, fd, tree; + +if (! input) { + sys.puts("lessc: no input files"); + process.exit(1); +} + +var parseLessFile = function (e, data) { + if (e) { + sys.puts("lessc: " + e.message); + process.exit(1); + } + + new(less.Parser)({ + paths: [path.dirname(input)].concat(options.paths), + optimization: options.optimization, + filename: input, + strictImports: options.strictImports + }).parse(data, function (err, tree) { + if (err) { + less.writeError(err, options); + process.exit(1); + } else { + try { + css = tree.toCSS({ + compress: options.compress, + yuicompress: options.yuicompress + }); + if (output) { + fd = fs.openSync(output, "w"); + fs.writeSync(fd, css, 0, "utf8"); + } else { + sys.print(css); + } + } catch (e) { + less.writeError(e, options); + process.exit(2); + } + } + }); +}; + +if (input != '-') { + fs.readFile(input, 'utf-8', parseLessFile); +} else { + process.stdin.resume(); + process.stdin.setEncoding('utf8'); + + var buffer = ''; + process.stdin.on('data', function(data) { + buffer += data; + }); + + process.stdin.on('end', function() { + parseLessFile(false, buffer); + }); +} diff --git a/askbot/skins/default/media/style/node_modules/less/index.html b/askbot/skins/default/media/style/node_modules/less/index.html new file mode 100644 index 00000000..a62c6b6a --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/index.html @@ -0,0 +1,10 @@ + + + + + + + + HELLO + + diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/browser.js b/askbot/skins/default/media/style/node_modules/less/lib/less/browser.js new file mode 100644 index 00000000..cab913be --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/browser.js @@ -0,0 +1,380 @@ +// +// browser.js - client-side engine +// + +var isFileProtocol = (location.protocol === 'file:' || + location.protocol === 'chrome:' || + location.protocol === 'chrome-extension:' || + location.protocol === 'resource:'); + +less.env = less.env || (location.hostname == '127.0.0.1' || + location.hostname == '0.0.0.0' || + location.hostname == 'localhost' || + location.port.length > 0 || + isFileProtocol ? 'development' + : 'production'); + +// Load styles asynchronously (default: false) +// +// This is set to `false` by default, so that the body +// doesn't start loading before the stylesheets are parsed. +// Setting this to `true` can result in flickering. +// +less.async = false; + +// Interval between watch polls +less.poll = less.poll || (isFileProtocol ? 1000 : 1500); + +// +// Watch mode +// +less.watch = function () { return this.watchMode = true }; +less.unwatch = function () { return this.watchMode = false }; + +if (less.env === 'development') { + less.optimization = 0; + + if (/!watch/.test(location.hash)) { + less.watch(); + } + less.watchTimer = setInterval(function () { + if (less.watchMode) { + loadStyleSheets(function (e, root, _, sheet, env) { + if (root) { + createCSS(root.toCSS(), sheet, env.lastModified); + } + }); + } + }, less.poll); +} else { + less.optimization = 3; +} + +var cache; + +try { + cache = (typeof(window.localStorage) === 'undefined') ? null : window.localStorage; +} catch (_) { + cache = null; +} + +// +// Get all tags with the 'rel' attribute set to "stylesheet/less" +// +var links = document.getElementsByTagName('link'); +var typePattern = /^text\/(x-)?less$/; + +less.sheets = []; + +for (var i = 0; i < links.length; i++) { + if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) && + (links[i].type.match(typePattern)))) { + less.sheets.push(links[i]); + } +} + + +less.refresh = function (reload) { + var startTime, endTime; + startTime = endTime = new(Date); + + loadStyleSheets(function (e, root, _, sheet, env) { + if (env.local) { + log("loading " + sheet.href + " from cache."); + } else { + log("parsed " + sheet.href + " successfully."); + createCSS(root.toCSS(), sheet, env.lastModified); + } + log("css for " + sheet.href + " generated in " + (new(Date) - endTime) + 'ms'); + (env.remaining === 0) && log("css generated in " + (new(Date) - startTime) + 'ms'); + endTime = new(Date); + }, reload); + + loadStyles(); +}; +less.refreshStyles = loadStyles; + +less.refresh(less.env === 'development'); + +function loadStyles() { + var styles = document.getElementsByTagName('style'); + for (var i = 0; i < styles.length; i++) { + if (styles[i].type.match(typePattern)) { + new(less.Parser)().parse(styles[i].innerHTML || '', function (e, tree) { + var css = tree.toCSS(); + var style = styles[i]; + style.type = 'text/css'; + if (style.styleSheet) { + style.styleSheet.cssText = css; + } else { + style.innerHTML = css; + } + }); + } + } +} + +function loadStyleSheets(callback, reload) { + for (var i = 0; i < less.sheets.length; i++) { + loadStyleSheet(less.sheets[i], callback, reload, less.sheets.length - (i + 1)); + } +} + +function loadStyleSheet(sheet, callback, reload, remaining) { + var url = window.location.href.replace(/[#?].*$/, ''); + var href = sheet.href.replace(/\?.*$/, ''); + var css = cache && cache.getItem(href); + var timestamp = cache && cache.getItem(href + ':timestamp'); + var styles = { css: css, timestamp: timestamp }; + + // Stylesheets in IE don't always return the full path + if (! /^(https?|file):/.test(href)) { + if (href.charAt(0) == "/") { + href = window.location.protocol + "//" + window.location.host + href; + } else { + href = url.slice(0, url.lastIndexOf('/') + 1) + href; + } + } + var filename = href.match(/([^\/]+)$/)[1]; + + xhr(sheet.href, sheet.type, function (data, lastModified) { + if (!reload && styles && lastModified && + (new(Date)(lastModified).valueOf() === + new(Date)(styles.timestamp).valueOf())) { + // Use local copy + createCSS(styles.css, sheet); + callback(null, null, data, sheet, { local: true, remaining: remaining }); + } else { + // Use remote copy (re-parse) + try { + new(less.Parser)({ + optimization: less.optimization, + paths: [href.replace(/[\w\.-]+$/, '')], + mime: sheet.type, + filename: filename + }).parse(data, function (e, root) { + if (e) { return error(e, href) } + try { + callback(e, root, data, sheet, { local: false, lastModified: lastModified, remaining: remaining }); + removeNode(document.getElementById('less-error-message:' + extractId(href))); + } catch (e) { + error(e, href); + } + }); + } catch (e) { + error(e, href); + } + } + }, function (status, url) { + throw new(Error)("Couldn't load " + url + " (" + status + ")"); + }); +} + +function extractId(href) { + return href.replace(/^[a-z]+:\/\/?[^\/]+/, '' ) // Remove protocol & domain + .replace(/^\//, '' ) // Remove root / + .replace(/\?.*$/, '' ) // Remove query + .replace(/\.[^\.\/]+$/, '' ) // Remove file extension + .replace(/[^\.\w-]+/g, '-') // Replace illegal characters + .replace(/\./g, ':'); // Replace dots with colons(for valid id) +} + +function createCSS(styles, sheet, lastModified) { + var css; + + // Strip the query-string + var href = sheet.href ? sheet.href.replace(/\?.*$/, '') : ''; + + // If there is no title set, use the filename, minus the extension + var id = 'less:' + (sheet.title || extractId(href)); + + // If the stylesheet doesn't exist, create a new node + if ((css = document.getElementById(id)) === null) { + css = document.createElement('style'); + css.type = 'text/css'; + css.media = sheet.media || 'screen'; + css.id = id; + document.getElementsByTagName('head')[0].appendChild(css); + } + + if (css.styleSheet) { // IE + try { + css.styleSheet.cssText = styles; + } catch (e) { + throw new(Error)("Couldn't reassign styleSheet.cssText."); + } + } else { + (function (node) { + if (css.childNodes.length > 0) { + if (css.firstChild.nodeValue !== node.nodeValue) { + css.replaceChild(node, css.firstChild); + } + } else { + css.appendChild(node); + } + })(document.createTextNode(styles)); + } + + // Don't update the local store if the file wasn't modified + if (lastModified && cache) { + log('saving ' + href + ' to cache.'); + cache.setItem(href, styles); + cache.setItem(href + ':timestamp', lastModified); + } +} + +function xhr(url, type, callback, errback) { + var xhr = getXMLHttpRequest(); + var async = isFileProtocol ? false : less.async; + + if (typeof(xhr.overrideMimeType) === 'function') { + xhr.overrideMimeType('text/css'); + } + xhr.open('GET', url, async); + xhr.setRequestHeader('Accept', type || 'text/x-less, text/css; q=0.9, */*; q=0.5'); + xhr.send(null); + + if (isFileProtocol) { + if (xhr.status === 0 || (xhr.status >= 200 && xhr.status < 300)) { + callback(xhr.responseText); + } else { + errback(xhr.status, url); + } + } else if (async) { + xhr.onreadystatechange = function () { + if (xhr.readyState == 4) { + handleResponse(xhr, callback, errback); + } + }; + } else { + handleResponse(xhr, callback, errback); + } + + function handleResponse(xhr, callback, errback) { + if (xhr.status >= 200 && xhr.status < 300) { + callback(xhr.responseText, + xhr.getResponseHeader("Last-Modified")); + } else if (typeof(errback) === 'function') { + errback(xhr.status, url); + } + } +} + +function getXMLHttpRequest() { + if (window.XMLHttpRequest) { + return new(XMLHttpRequest); + } else { + try { + return new(ActiveXObject)("MSXML2.XMLHTTP.3.0"); + } catch (e) { + log("browser doesn't support AJAX."); + return null; + } + } +} + +function removeNode(node) { + return node && node.parentNode.removeChild(node); +} + +function log(str) { + if (less.env == 'development' && typeof(console) !== "undefined") { console.log('less: ' + str) } +} + +function error(e, href) { + var id = 'less-error-message:' + extractId(href); + var template = '
  • {content}
    • '; + var elem = document.createElement('div'), timer, content, error = []; + var filename = e.filename || href; + + elem.id = id; + elem.className = "less-error-message"; + + content = '

    ' + (e.message || 'There is an error in your .less file') + + '

    ' + '

    in ' + filename + " "; + + var errorline = function (e, i, classname) { + if (e.extract[i]) { + error.push(template.replace(/\{line\}/, parseInt(e.line) + (i - 1)) + .replace(/\{class\}/, classname) + .replace(/\{content\}/, e.extract[i])); + } + }; + + if (e.stack) { + content += '
    ' + e.stack.split('\n').slice(1).join('
    '); + } else if (e.extract) { + errorline(e, 0, ''); + errorline(e, 1, 'line'); + errorline(e, 2, ''); + content += 'on line ' + e.line + ', column ' + (e.column + 1) + ':

    ' + + '
      ' + error.join('') + '
    '; + } + elem.innerHTML = content; + + // CSS for error messages + createCSS([ + '.less-error-message ul, .less-error-message li {', + 'list-style-type: none;', + 'margin-right: 15px;', + 'padding: 4px 0;', + 'margin: 0;', + '}', + '.less-error-message label {', + 'font-size: 12px;', + 'margin-right: 15px;', + 'padding: 4px 0;', + 'color: #cc7777;', + '}', + '.less-error-message pre {', + 'color: #dd6666;', + 'padding: 4px 0;', + 'margin: 0;', + 'display: inline-block;', + '}', + '.less-error-message pre.line {', + 'color: #ff0000;', + '}', + '.less-error-message h3 {', + 'font-size: 20px;', + 'font-weight: bold;', + 'padding: 15px 0 5px 0;', + 'margin: 0;', + '}', + '.less-error-message a {', + 'color: #10a', + '}', + '.less-error-message .error {', + 'color: red;', + 'font-weight: bold;', + 'padding-bottom: 2px;', + 'border-bottom: 1px dashed red;', + '}' + ].join('\n'), { title: 'error-message' }); + + elem.style.cssText = [ + "font-family: Arial, sans-serif", + "border: 1px solid #e00", + "background-color: #eee", + "border-radius: 5px", + "-webkit-border-radius: 5px", + "-moz-border-radius: 5px", + "color: #e00", + "padding: 15px", + "margin-bottom: 15px" + ].join(';'); + + if (less.env == 'development') { + timer = setInterval(function () { + if (document.body) { + if (document.getElementById(id)) { + document.body.replaceChild(elem, document.getElementById(id)); + } else { + document.body.insertBefore(elem, document.body.firstChild); + } + clearInterval(timer); + } + }, 10); + } +} + diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/colors.js b/askbot/skins/default/media/style/node_modules/less/lib/less/colors.js new file mode 100644 index 00000000..e509b602 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/colors.js @@ -0,0 +1,151 @@ +(function (tree) { + tree.colors = { + 'aliceblue':'#f0f8ff', + 'antiquewhite':'#faebd7', + 'aqua':'#00ffff', + 'aquamarine':'#7fffd4', + 'azure':'#f0ffff', + 'beige':'#f5f5dc', + 'bisque':'#ffe4c4', + 'black':'#000000', + 'blanchedalmond':'#ffebcd', + 'blue':'#0000ff', + 'blueviolet':'#8a2be2', + 'brown':'#a52a2a', + 'burlywood':'#deb887', + 'cadetblue':'#5f9ea0', + 'chartreuse':'#7fff00', + 'chocolate':'#d2691e', + 'coral':'#ff7f50', + 'cornflowerblue':'#6495ed', + 'cornsilk':'#fff8dc', + 'crimson':'#dc143c', + 'cyan':'#00ffff', + 'darkblue':'#00008b', + 'darkcyan':'#008b8b', + 'darkgoldenrod':'#b8860b', + 'darkgray':'#a9a9a9', + 'darkgrey':'#a9a9a9', + 'darkgreen':'#006400', + 'darkkhaki':'#bdb76b', + 'darkmagenta':'#8b008b', + 'darkolivegreen':'#556b2f', + 'darkorange':'#ff8c00', + 'darkorchid':'#9932cc', + 'darkred':'#8b0000', + 'darksalmon':'#e9967a', + 'darkseagreen':'#8fbc8f', + 'darkslateblue':'#483d8b', + 'darkslategray':'#2f4f4f', + 'darkslategrey':'#2f4f4f', + 'darkturquoise':'#00ced1', + 'darkviolet':'#9400d3', + 'deeppink':'#ff1493', + 'deepskyblue':'#00bfff', + 'dimgray':'#696969', + 'dimgrey':'#696969', + 'dodgerblue':'#1e90ff', + 'firebrick':'#b22222', + 'floralwhite':'#fffaf0', + 'forestgreen':'#228b22', + 'fuchsia':'#ff00ff', + 'gainsboro':'#dcdcdc', + 'ghostwhite':'#f8f8ff', + 'gold':'#ffd700', + 'goldenrod':'#daa520', + 'gray':'#808080', + 'grey':'#808080', + 'green':'#008000', + 'greenyellow':'#adff2f', + 'honeydew':'#f0fff0', + 'hotpink':'#ff69b4', + 'indianred':'#cd5c5c', + 'indigo':'#4b0082', + 'ivory':'#fffff0', + 'khaki':'#f0e68c', + 'lavender':'#e6e6fa', + 'lavenderblush':'#fff0f5', + 'lawngreen':'#7cfc00', + 'lemonchiffon':'#fffacd', + 'lightblue':'#add8e6', + 'lightcoral':'#f08080', + 'lightcyan':'#e0ffff', + 'lightgoldenrodyellow':'#fafad2', + 'lightgray':'#d3d3d3', + 'lightgrey':'#d3d3d3', + 'lightgreen':'#90ee90', + 'lightpink':'#ffb6c1', + 'lightsalmon':'#ffa07a', + 'lightseagreen':'#20b2aa', + 'lightskyblue':'#87cefa', + 'lightslategray':'#778899', + 'lightslategrey':'#778899', + 'lightsteelblue':'#b0c4de', + 'lightyellow':'#ffffe0', + 'lime':'#00ff00', + 'limegreen':'#32cd32', + 'linen':'#faf0e6', + 'magenta':'#ff00ff', + 'maroon':'#800000', + 'mediumaquamarine':'#66cdaa', + 'mediumblue':'#0000cd', + 'mediumorchid':'#ba55d3', + 'mediumpurple':'#9370d8', + 'mediumseagreen':'#3cb371', + 'mediumslateblue':'#7b68ee', + 'mediumspringgreen':'#00fa9a', + 'mediumturquoise':'#48d1cc', + 'mediumvioletred':'#c71585', + 'midnightblue':'#191970', + 'mintcream':'#f5fffa', + 'mistyrose':'#ffe4e1', + 'moccasin':'#ffe4b5', + 'navajowhite':'#ffdead', + 'navy':'#000080', + 'oldlace':'#fdf5e6', + 'olive':'#808000', + 'olivedrab':'#6b8e23', + 'orange':'#ffa500', + 'orangered':'#ff4500', + 'orchid':'#da70d6', + 'palegoldenrod':'#eee8aa', + 'palegreen':'#98fb98', + 'paleturquoise':'#afeeee', + 'palevioletred':'#d87093', + 'papayawhip':'#ffefd5', + 'peachpuff':'#ffdab9', + 'peru':'#cd853f', + 'pink':'#ffc0cb', + 'plum':'#dda0dd', + 'powderblue':'#b0e0e6', + 'purple':'#800080', + 'red':'#ff0000', + 'rosybrown':'#bc8f8f', + 'royalblue':'#4169e1', + 'saddlebrown':'#8b4513', + 'salmon':'#fa8072', + 'sandybrown':'#f4a460', + 'seagreen':'#2e8b57', + 'seashell':'#fff5ee', + 'sienna':'#a0522d', + 'silver':'#c0c0c0', + 'skyblue':'#87ceeb', + 'slateblue':'#6a5acd', + 'slategray':'#708090', + 'slategrey':'#708090', + 'snow':'#fffafa', + 'springgreen':'#00ff7f', + 'steelblue':'#4682b4', + 'tan':'#d2b48c', + 'teal':'#008080', + 'thistle':'#d8bfd8', + 'tomato':'#ff6347', + 'turquoise':'#40e0d0', + 'violet':'#ee82ee', + 'wheat':'#f5deb3', + 'white':'#ffffff', + 'whitesmoke':'#f5f5f5', + 'yellow':'#ffff00', + 'yellowgreen':'#9acd32' + }; +})(require('./tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/cssmin.js b/askbot/skins/default/media/style/node_modules/less/lib/less/cssmin.js new file mode 100644 index 00000000..427de71c --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/cssmin.js @@ -0,0 +1,355 @@ +/** + * cssmin.js + * Author: Stoyan Stefanov - http://phpied.com/ + * This is a JavaScript port of the CSS minification tool + * distributed with YUICompressor, itself a port + * of the cssmin utility by Isaac Schlueter - http://foohack.com/ + * Permission is hereby granted to use the JavaScript version under the same + * conditions as the YUICompressor (original YUICompressor note below). + */ + +/* +* YUI Compressor +* http://developer.yahoo.com/yui/compressor/ +* Author: Julien Lecomte - http://www.julienlecomte.net/ +* Copyright (c) 2011 Yahoo! Inc. All rights reserved. +* The copyrights embodied in the content of this file are licensed +* by Yahoo! Inc. under the BSD (revised) open source license. +*/ +var YAHOO = YAHOO || {}; +YAHOO.compressor = YAHOO.compressor || {}; + +/** + * Utility method to replace all data urls with tokens before we start + * compressing, to avoid performance issues running some of the subsequent + * regexes against large strings chunks. + * + * @private + * @method _extractDataUrls + * @param {String} css The input css + * @param {Array} The global array of tokens to preserve + * @returns String The processed css + */ +YAHOO.compressor._extractDataUrls = function (css, preservedTokens) { + + // Leave data urls alone to increase parse performance. + var maxIndex = css.length - 1, + appendIndex = 0, + startIndex, + endIndex, + terminator, + foundTerminator, + sb = [], + m, + preserver, + token, + pattern = /url\(\s*(["']?)data\:/g; + + // Since we need to account for non-base64 data urls, we need to handle + // ' and ) being part of the data string. Hence switching to indexOf, + // to determine whether or not we have matching string terminators and + // handling sb appends directly, instead of using matcher.append* methods. + + while ((m = pattern.exec(css)) !== null) { + + startIndex = m.index + 4; // "url(".length() + terminator = m[1]; // ', " or empty (not quoted) + + if (terminator.length === 0) { + terminator = ")"; + } + + foundTerminator = false; + + endIndex = pattern.lastIndex - 1; + + while(foundTerminator === false && endIndex+1 <= maxIndex) { + endIndex = css.indexOf(terminator, endIndex + 1); + + // endIndex == 0 doesn't really apply here + if ((endIndex > 0) && (css.charAt(endIndex - 1) !== '\\')) { + foundTerminator = true; + if (")" != terminator) { + endIndex = css.indexOf(")", endIndex); + } + } + } + + // Enough searching, start moving stuff over to the buffer + sb.push(css.substring(appendIndex, m.index)); + + if (foundTerminator) { + token = css.substring(startIndex, endIndex); + token = token.replace(/\s+/g, ""); + preservedTokens.push(token); + + preserver = "url(___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___)"; + sb.push(preserver); + + appendIndex = endIndex + 1; + } else { + // No end terminator found, re-add the whole match. Should we throw/warn here? + sb.push(css.substring(m.index, pattern.lastIndex)); + appendIndex = pattern.lastIndex; + } + } + + sb.push(css.substring(appendIndex)); + + return sb.join(""); +}; + +/** + * Utility method to compress hex color values of the form #AABBCC to #ABC. + * + * DOES NOT compress CSS ID selectors which match the above pattern (which would break things). + * e.g. #AddressForm { ... } + * + * DOES NOT compress IE filters, which have hex color values (which would break things). + * e.g. filter: chroma(color="#FFFFFF"); + * + * DOES NOT compress invalid hex values. + * e.g. background-color: #aabbccdd + * + * @private + * @method _compressHexColors + * @param {String} css The input css + * @returns String The processed css + */ +YAHOO.compressor._compressHexColors = function(css) { + + // Look for hex colors inside { ... } (to avoid IDs) and which don't have a =, or a " in front of them (to avoid filters) + var pattern = /(\=\s*?["']?)?#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])(\}|[^0-9a-f{][^{]*?\})/gi, + m, + index = 0, + isFilter, + sb = []; + + while ((m = pattern.exec(css)) !== null) { + + sb.push(css.substring(index, m.index)); + + isFilter = m[1]; + + if (isFilter) { + // Restore, maintain case, otherwise filter will break + sb.push(m[1] + "#" + (m[2] + m[3] + m[4] + m[5] + m[6] + m[7])); + } else { + if (m[2].toLowerCase() == m[3].toLowerCase() && + m[4].toLowerCase() == m[5].toLowerCase() && + m[6].toLowerCase() == m[7].toLowerCase()) { + + // Compress. + sb.push("#" + (m[3] + m[5] + m[7]).toLowerCase()); + } else { + // Non compressible color, restore but lower case. + sb.push("#" + (m[2] + m[3] + m[4] + m[5] + m[6] + m[7]).toLowerCase()); + } + } + + index = pattern.lastIndex = pattern.lastIndex - m[8].length; + } + + sb.push(css.substring(index)); + + return sb.join(""); +}; + +YAHOO.compressor.cssmin = function (css, linebreakpos) { + + var startIndex = 0, + endIndex = 0, + i = 0, max = 0, + preservedTokens = [], + comments = [], + token = '', + totallen = css.length, + placeholder = ''; + + css = this._extractDataUrls(css, preservedTokens); + + // collect all comment blocks... + while ((startIndex = css.indexOf("/*", startIndex)) >= 0) { + endIndex = css.indexOf("*/", startIndex + 2); + if (endIndex < 0) { + endIndex = totallen; + } + token = css.slice(startIndex + 2, endIndex); + comments.push(token); + css = css.slice(0, startIndex + 2) + "___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + (comments.length - 1) + "___" + css.slice(endIndex); + startIndex += 2; + } + + // preserve strings so their content doesn't get accidentally minified + css = css.replace(/("([^\\"]|\\.|\\)*")|('([^\\']|\\.|\\)*')/g, function (match) { + var i, max, quote = match.substring(0, 1); + + match = match.slice(1, -1); + + // maybe the string contains a comment-like substring? + // one, maybe more? put'em back then + if (match.indexOf("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_") >= 0) { + for (i = 0, max = comments.length; i < max; i = i + 1) { + match = match.replace("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___", comments[i]); + } + } + + // minify alpha opacity in filter strings + match = match.replace(/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/gi, "alpha(opacity="); + + preservedTokens.push(match); + return quote + "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___" + quote; + }); + + // strings are safe, now wrestle the comments + for (i = 0, max = comments.length; i < max; i = i + 1) { + + token = comments[i]; + placeholder = "___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___"; + + // ! in the first position of the comment means preserve + // so push to the preserved tokens keeping the ! + if (token.charAt(0) === "!") { + preservedTokens.push(token); + css = css.replace(placeholder, "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___"); + continue; + } + + // \ in the last position looks like hack for Mac/IE5 + // shorten that to /*\*/ and the next one to /**/ + if (token.charAt(token.length - 1) === "\\") { + preservedTokens.push("\\"); + css = css.replace(placeholder, "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___"); + i = i + 1; // attn: advancing the loop + preservedTokens.push(""); + css = css.replace("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___", "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___"); + continue; + } + + // keep empty comments after child selectors (IE7 hack) + // e.g. html >/**/ body + if (token.length === 0) { + startIndex = css.indexOf(placeholder); + if (startIndex > 2) { + if (css.charAt(startIndex - 3) === '>') { + preservedTokens.push(""); + css = css.replace(placeholder, "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___"); + } + } + } + + // in all other cases kill the comment + css = css.replace("/*" + placeholder + "*/", ""); + } + + + // Normalize all whitespace strings to single spaces. Easier to work with that way. + css = css.replace(/\s+/g, " "); + + // Remove the spaces before the things that should not have spaces before them. + // But, be careful not to turn "p :link {...}" into "p:link{...}" + // Swap out any pseudo-class colons with the token, and then swap back. + css = css.replace(/(^|\})(([^\{:])+:)+([^\{]*\{)/g, function (m) { + return m.replace(":", "___YUICSSMIN_PSEUDOCLASSCOLON___"); + }); + css = css.replace(/\s+([!{};:>+\(\)\],])/g, '$1'); + css = css.replace(/___YUICSSMIN_PSEUDOCLASSCOLON___/g, ":"); + + // retain space for special IE6 cases + css = css.replace(/:first-(line|letter)(\{|,)/g, ":first-$1 $2"); + + // no space after the end of a preserved comment + css = css.replace(/\*\/ /g, '*/'); + + + // If there is a @charset, then only allow one, and push to the top of the file. + css = css.replace(/^(.*)(@charset "[^"]*";)/gi, '$2$1'); + css = css.replace(/^(\s*@charset [^;]+;\s*)+/gi, '$1'); + + // Put the space back in some cases, to support stuff like + // @media screen and (-webkit-min-device-pixel-ratio:0){ + css = css.replace(/\band\(/gi, "and ("); + + + // Remove the spaces after the things that should not have spaces after them. + css = css.replace(/([!{}:;>+\(\[,])\s+/g, '$1'); + + // remove unnecessary semicolons + css = css.replace(/;+\}/g, "}"); + + // Replace 0(px,em,%) with 0. + css = css.replace(/([\s:])(0)(px|em|%|in|cm|mm|pc|pt|ex)/gi, "$1$2"); + + // Replace 0 0 0 0; with 0. + css = css.replace(/:0 0 0 0(;|\})/g, ":0$1"); + css = css.replace(/:0 0 0(;|\})/g, ":0$1"); + css = css.replace(/:0 0(;|\})/g, ":0$1"); + + // Replace background-position:0; with background-position:0 0; + // same for transform-origin + css = css.replace(/(background-position|transform-origin|webkit-transform-origin|moz-transform-origin|o-transform-origin|ms-transform-origin):0(;|\})/gi, function(all, prop, tail) { + return prop.toLowerCase() + ":0 0" + tail; + }); + + // Replace 0.6 to .6, but only when preceded by : or a white-space + css = css.replace(/(:|\s)0+\.(\d+)/g, "$1.$2"); + + // Shorten colors from rgb(51,102,153) to #336699 + // This makes it more likely that it'll get further compressed in the next step. + css = css.replace(/rgb\s*\(\s*([0-9,\s]+)\s*\)/gi, function () { + var i, rgbcolors = arguments[1].split(','); + for (i = 0; i < rgbcolors.length; i = i + 1) { + rgbcolors[i] = parseInt(rgbcolors[i], 10).toString(16); + if (rgbcolors[i].length === 1) { + rgbcolors[i] = '0' + rgbcolors[i]; + } + } + return '#' + rgbcolors.join(''); + }); + + // Shorten colors from #AABBCC to #ABC. + css = this._compressHexColors(css); + + // border: none -> border:0 + css = css.replace(/(border|border-top|border-right|border-bottom|border-right|outline|background):none(;|\})/gi, function(all, prop, tail) { + return prop.toLowerCase() + ":0" + tail; + }); + + // shorter opacity IE filter + css = css.replace(/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/gi, "alpha(opacity="); + + // Remove empty rules. + css = css.replace(/[^\};\{\/]+\{\}/g, ""); + + if (linebreakpos >= 0) { + // Some source control tools don't like it when files containing lines longer + // than, say 8000 characters, are checked in. The linebreak option is used in + // that case to split long lines after a specific column. + startIndex = 0; + i = 0; + while (i < css.length) { + i = i + 1; + if (css[i - 1] === '}' && i - startIndex > linebreakpos) { + css = css.slice(0, i) + '\n' + css.slice(i); + startIndex = i; + } + } + } + + // Replace multiple semi-colons in a row by a single one + // See SF bug #1980989 + css = css.replace(/;;+/g, ";"); + + // restore preserved comments and strings + for (i = 0, max = preservedTokens.length; i < max; i = i + 1) { + css = css.replace("___YUICSSMIN_PRESERVED_TOKEN_" + i + "___", preservedTokens[i]); + } + + // Trim the final string (for any leading or trailing white spaces) + css = css.replace(/^\s+|\s+$/g, ""); + + return css; + +}; + +exports.compressor = YAHOO.compressor; diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/functions.js b/askbot/skins/default/media/style/node_modules/less/lib/less/functions.js new file mode 100644 index 00000000..6eb34bac --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/functions.js @@ -0,0 +1,228 @@ +(function (tree) { + +tree.functions = { + rgb: function (r, g, b) { + return this.rgba(r, g, b, 1.0); + }, + rgba: function (r, g, b, a) { + var rgb = [r, g, b].map(function (c) { return number(c) }), + a = number(a); + return new(tree.Color)(rgb, a); + }, + hsl: function (h, s, l) { + return this.hsla(h, s, l, 1.0); + }, + hsla: function (h, s, l, a) { + h = (number(h) % 360) / 360; + s = number(s); l = number(l); a = number(a); + + var m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s; + var m1 = l * 2 - m2; + + return this.rgba(hue(h + 1/3) * 255, + hue(h) * 255, + hue(h - 1/3) * 255, + a); + + function hue(h) { + h = h < 0 ? h + 1 : (h > 1 ? h - 1 : h); + if (h * 6 < 1) return m1 + (m2 - m1) * h * 6; + else if (h * 2 < 1) return m2; + else if (h * 3 < 2) return m1 + (m2 - m1) * (2/3 - h) * 6; + else return m1; + } + }, + hue: function (color) { + return new(tree.Dimension)(Math.round(color.toHSL().h)); + }, + saturation: function (color) { + return new(tree.Dimension)(Math.round(color.toHSL().s * 100), '%'); + }, + lightness: function (color) { + return new(tree.Dimension)(Math.round(color.toHSL().l * 100), '%'); + }, + alpha: function (color) { + return new(tree.Dimension)(color.toHSL().a); + }, + saturate: function (color, amount) { + var hsl = color.toHSL(); + + hsl.s += amount.value / 100; + hsl.s = clamp(hsl.s); + return hsla(hsl); + }, + desaturate: function (color, amount) { + var hsl = color.toHSL(); + + hsl.s -= amount.value / 100; + hsl.s = clamp(hsl.s); + return hsla(hsl); + }, + lighten: function (color, amount) { + var hsl = color.toHSL(); + + hsl.l += amount.value / 100; + hsl.l = clamp(hsl.l); + return hsla(hsl); + }, + darken: function (color, amount) { + var hsl = color.toHSL(); + + hsl.l -= amount.value / 100; + hsl.l = clamp(hsl.l); + return hsla(hsl); + }, + fadein: function (color, amount) { + var hsl = color.toHSL(); + + hsl.a += amount.value / 100; + hsl.a = clamp(hsl.a); + return hsla(hsl); + }, + fadeout: function (color, amount) { + var hsl = color.toHSL(); + + hsl.a -= amount.value / 100; + hsl.a = clamp(hsl.a); + return hsla(hsl); + }, + fade: function (color, amount) { + var hsl = color.toHSL(); + + hsl.a = amount.value / 100; + hsl.a = clamp(hsl.a); + return hsla(hsl); + }, + spin: function (color, amount) { + var hsl = color.toHSL(); + var hue = (hsl.h + amount.value) % 360; + + hsl.h = hue < 0 ? 360 + hue : hue; + + return hsla(hsl); + }, + // + // Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein + // http://sass-lang.com + // + mix: function (color1, color2, weight) { + var p = weight.value / 100.0; + var w = p * 2 - 1; + var a = color1.toHSL().a - color2.toHSL().a; + + var w1 = (((w * a == -1) ? w : (w + a) / (1 + w * a)) + 1) / 2.0; + var w2 = 1 - w1; + + var rgb = [color1.rgb[0] * w1 + color2.rgb[0] * w2, + color1.rgb[1] * w1 + color2.rgb[1] * w2, + color1.rgb[2] * w1 + color2.rgb[2] * w2]; + + var alpha = color1.alpha * p + color2.alpha * (1 - p); + + return new(tree.Color)(rgb, alpha); + }, + greyscale: function (color) { + return this.desaturate(color, new(tree.Dimension)(100)); + }, + e: function (str) { + return new(tree.Anonymous)(str instanceof tree.JavaScript ? str.evaluated : str); + }, + escape: function (str) { + return new(tree.Anonymous)(encodeURI(str.value).replace(/=/g, "%3D").replace(/:/g, "%3A").replace(/#/g, "%23").replace(/;/g, "%3B").replace(/\(/g, "%28").replace(/\)/g, "%29")); + }, + '%': function (quoted /* arg, arg, ...*/) { + var args = Array.prototype.slice.call(arguments, 1), + str = quoted.value; + + for (var i = 0; i < args.length; i++) { + str = str.replace(/%[sda]/i, function(token) { + var value = token.match(/s/i) ? args[i].value : args[i].toCSS(); + return token.match(/[A-Z]$/) ? encodeURIComponent(value) : value; + }); + } + str = str.replace(/%%/g, '%'); + return new(tree.Quoted)('"' + str + '"', str); + }, + round: function (n) { + return this._math('round', n); + }, + ceil: function (n) { + return this._math('ceil', n); + }, + floor: function (n) { + return this._math('floor', n); + }, + _math: function (fn, n) { + if (n instanceof tree.Dimension) { + return new(tree.Dimension)(Math[fn](number(n)), n.unit); + } else if (typeof(n) === 'number') { + return Math[fn](n); + } else { + throw { type: "Argument", message: "argument must be a number" }; + } + }, + argb: function (color) { + return new(tree.Anonymous)(color.toARGB()); + + }, + percentage: function (n) { + return new(tree.Dimension)(n.value * 100, '%'); + }, + color: function (n) { + if (n instanceof tree.Quoted) { + return new(tree.Color)(n.value.slice(1)); + } else { + throw { type: "Argument", message: "argument must be a string" }; + } + }, + iscolor: function (n) { + return this._isa(n, tree.Color); + }, + isnumber: function (n) { + return this._isa(n, tree.Dimension); + }, + isstring: function (n) { + return this._isa(n, tree.Quoted); + }, + iskeyword: function (n) { + return this._isa(n, tree.Keyword); + }, + isurl: function (n) { + return this._isa(n, tree.URL); + }, + ispixel: function (n) { + return (n instanceof tree.Dimension) && n.unit === 'px' ? tree.True : tree.False; + }, + ispercentage: function (n) { + return (n instanceof tree.Dimension) && n.unit === '%' ? tree.True : tree.False; + }, + isem: function (n) { + return (n instanceof tree.Dimension) && n.unit === 'em' ? tree.True : tree.False; + }, + _isa: function (n, Type) { + return (n instanceof Type) ? tree.True : tree.False; + } +}; + +function hsla(hsla) { + return tree.functions.hsla(hsla.h, hsla.s, hsla.l, hsla.a); +} + +function number(n) { + if (n instanceof tree.Dimension) { + return parseFloat(n.unit == '%' ? n.value / 100 : n.value); + } else if (typeof(n) === 'number') { + return n; + } else { + throw { + error: "RuntimeError", + message: "color functions take numbers as parameters" + }; + } +} + +function clamp(val) { + return Math.min(1, Math.max(0, val)); +} + +})(require('./tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/index.js b/askbot/skins/default/media/style/node_modules/less/lib/less/index.js new file mode 100644 index 00000000..a11fa998 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/index.js @@ -0,0 +1,148 @@ +var path = require('path'), + sys = require('util'), + fs = require('fs'); + +var less = { + version: [1, 3, 0], + Parser: require('./parser').Parser, + importer: require('./parser').importer, + tree: require('./tree'), + render: function (input, options, callback) { + options = options || {}; + + if (typeof(options) === 'function') { + callback = options, options = {}; + } + + var parser = new(less.Parser)(options), + ee; + + if (callback) { + parser.parse(input, function (e, root) { + callback(e, root && root.toCSS && root.toCSS(options)); + }); + } else { + ee = new(require('events').EventEmitter); + + process.nextTick(function () { + parser.parse(input, function (e, root) { + if (e) { ee.emit('error', e) } + else { ee.emit('success', root.toCSS(options)) } + }); + }); + return ee; + } + }, + writeError: function (ctx, options) { + options = options || {}; + + var message = ""; + var extract = ctx.extract; + var error = []; + var stylize = options.color ? less.stylize : function (str) { return str }; + + if (options.silent) { return } + + if (ctx.stack) { return sys.error(stylize(ctx.stack, 'red')) } + + if (!ctx.hasOwnProperty('index')) { + return sys.error(ctx.stack || ctx.message); + } + + if (typeof(extract[0]) === 'string') { + error.push(stylize((ctx.line - 1) + ' ' + extract[0], 'grey')); + } + + if (extract[1]) { + error.push(ctx.line + ' ' + extract[1].slice(0, ctx.column) + + stylize(stylize(stylize(extract[1][ctx.column], 'bold') + + extract[1].slice(ctx.column + 1), 'red'), 'inverse')); + } + + if (typeof(extract[2]) === 'string') { + error.push(stylize((ctx.line + 1) + ' ' + extract[2], 'grey')); + } + error = error.join('\n') + '\033[0m\n'; + + message += stylize(ctx.type + 'Error: ' + ctx.message, 'red'); + ctx.filename && (message += stylize(' in ', 'red') + ctx.filename + + stylize(':' + ctx.line + ':' + ctx.column, 'grey')); + + sys.error(message, error); + + if (ctx.callLine) { + sys.error(stylize('from ', 'red') + (ctx.filename || '')); + sys.error(stylize(ctx.callLine, 'grey') + ' ' + ctx.callExtract); + } + } +}; + +['color', 'directive', 'operation', 'dimension', + 'keyword', 'variable', 'ruleset', 'element', + 'selector', 'quoted', 'expression', 'rule', + 'call', 'url', 'alpha', 'import', + 'mixin', 'comment', 'anonymous', 'value', + 'javascript', 'assignment', 'condition', 'paren', + 'media' +].forEach(function (n) { + require('./tree/' + n); +}); + +less.Parser.importer = function (file, paths, callback, env) { + var pathname; + + // TODO: Undo this at some point, + // or use different approach. + paths.unshift('.'); + + for (var i = 0; i < paths.length; i++) { + try { + pathname = path.join(paths[i], file); + fs.statSync(pathname); + break; + } catch (e) { + pathname = null; + } + } + + if (pathname) { + fs.readFile(pathname, 'utf-8', function(e, data) { + if (e) return callback(e); + + new(less.Parser)({ + paths: [path.dirname(pathname)].concat(paths), + filename: pathname + }).parse(data, function (e, root) { + callback(e, root, data); + }); + }); + } else { + if (typeof(env.errback) === "function") { + env.errback(file, paths, callback); + } else { + callback({ type: 'File', message: "'" + file + "' wasn't found.\n" }); + } + } +} + +require('./functions'); +require('./colors'); + +for (var k in less) { exports[k] = less[k] } + +// Stylize a string +function stylize(str, style) { + var styles = { + 'bold' : [1, 22], + 'inverse' : [7, 27], + 'underline' : [4, 24], + 'yellow' : [33, 39], + 'green' : [32, 39], + 'red' : [31, 39], + 'grey' : [90, 39] + }; + return '\033[' + styles[style][0] + 'm' + str + + '\033[' + styles[style][1] + 'm'; +} +less.stylize = stylize; + diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/parser.js b/askbot/skins/default/media/style/node_modules/less/lib/less/parser.js new file mode 100644 index 00000000..6ea4f8be --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/parser.js @@ -0,0 +1,1305 @@ +var less, tree; + +if (typeof environment === "object" && ({}).toString.call(environment) === "[object Environment]") { + // Rhino + // Details on how to detect Rhino: https://github.com/ringo/ringojs/issues/88 + if (typeof(window) === 'undefined') { less = {} } + else { less = window.less = {} } + tree = less.tree = {}; + less.mode = 'rhino'; +} else if (typeof(window) === 'undefined') { + // Node.js + less = exports, + tree = require('./tree'); + less.mode = 'node'; +} else { + // Browser + if (typeof(window.less) === 'undefined') { window.less = {} } + less = window.less, + tree = window.less.tree = {}; + less.mode = 'browser'; +} +// +// less.js - parser +// +// A relatively straight-forward predictive parser. +// There is no tokenization/lexing stage, the input is parsed +// in one sweep. +// +// To make the parser fast enough to run in the browser, several +// optimization had to be made: +// +// - Matching and slicing on a huge input is often cause of slowdowns. +// The solution is to chunkify the input into smaller strings. +// The chunks are stored in the `chunks` var, +// `j` holds the current chunk index, and `current` holds +// the index of the current chunk in relation to `input`. +// This gives us an almost 4x speed-up. +// +// - In many cases, we don't need to match individual tokens; +// for example, if a value doesn't hold any variables, operations +// or dynamic references, the parser can effectively 'skip' it, +// treating it as a literal. +// An example would be '1px solid #000' - which evaluates to itself, +// we don't need to know what the individual components are. +// The drawback, of course is that you don't get the benefits of +// syntax-checking on the CSS. This gives us a 50% speed-up in the parser, +// and a smaller speed-up in the code-gen. +// +// +// Token matching is done with the `$` function, which either takes +// a terminal string or regexp, or a non-terminal function to call. +// It also takes care of moving all the indices forwards. +// +// +less.Parser = function Parser(env) { + var input, // LeSS input string + i, // current index in `input` + j, // current chunk + temp, // temporarily holds a chunk's state, for backtracking + memo, // temporarily holds `i`, when backtracking + furthest, // furthest index the parser has gone to + chunks, // chunkified input + current, // index of current chunk, in `input` + parser; + + var that = this; + + // This function is called after all files + // have been imported through `@import`. + var finish = function () {}; + + var imports = this.imports = { + paths: env && env.paths || [], // Search paths, when importing + queue: [], // Files which haven't been imported yet + files: {}, // Holds the imported parse trees + contents: {}, // Holds the imported file contents + mime: env && env.mime, // MIME type of .less files + error: null, // Error in parsing/evaluating an import + push: function (path, callback) { + var that = this; + this.queue.push(path); + + // + // Import a file asynchronously + // + less.Parser.importer(path, this.paths, function (e, root, contents) { + that.queue.splice(that.queue.indexOf(path), 1); // Remove the path from the queue + that.files[path] = root; // Store the root + that.contents[path] = contents; + + if (e && !that.error) { that.error = e } + callback(e, root); + + if (that.queue.length === 0) { finish() } // Call `finish` if we're done importing + }, env); + } + }; + + function save() { temp = chunks[j], memo = i, current = i } + function restore() { chunks[j] = temp, i = memo, current = i } + + function sync() { + if (i > current) { + chunks[j] = chunks[j].slice(i - current); + current = i; + } + } + // + // Parse from a token, regexp or string, and move forward if match + // + function $(tok) { + var match, args, length, c, index, endIndex, k, mem; + + // + // Non-terminal + // + if (tok instanceof Function) { + return tok.call(parser.parsers); + // + // Terminal + // + // Either match a single character in the input, + // or match a regexp in the current chunk (chunk[j]). + // + } else if (typeof(tok) === 'string') { + match = input.charAt(i) === tok ? tok : null; + length = 1; + sync (); + } else { + sync (); + + if (match = tok.exec(chunks[j])) { + length = match[0].length; + } else { + return null; + } + } + + // The match is confirmed, add the match length to `i`, + // and consume any extra white-space characters (' ' || '\n') + // which come after that. The reason for this is that LeSS's + // grammar is mostly white-space insensitive. + // + if (match) { + mem = i += length; + endIndex = i + chunks[j].length - length; + + while (i < endIndex) { + c = input.charCodeAt(i); + if (! (c === 32 || c === 10 || c === 9)) { break } + i++; + } + chunks[j] = chunks[j].slice(length + (i - mem)); + current = i; + + if (chunks[j].length === 0 && j < chunks.length - 1) { j++ } + + if(typeof(match) === 'string') { + return match; + } else { + return match.length === 1 ? match[0] : match; + } + } + } + + function expect(arg, msg) { + var result = $(arg); + if (! result) { + error(msg || (typeof(arg) === 'string' ? "expected '" + arg + "' got '" + input.charAt(i) + "'" + : "unexpected token")); + } else { + return result; + } + } + + function error(msg, type) { + throw { index: i, type: type || 'Syntax', message: msg }; + } + + // Same as $(), but don't change the state of the parser, + // just return the match. + function peek(tok) { + if (typeof(tok) === 'string') { + return input.charAt(i) === tok; + } else { + if (tok.test(chunks[j])) { + return true; + } else { + return false; + } + } + } + + function basename(pathname) { + if (less.mode === 'node') { + return require('path').basename(pathname); + } else { + return pathname.match(/[^\/]+$/)[0]; + } + } + + function getInput(e, env) { + if (e.filename && env.filename && (e.filename !== env.filename)) { + return parser.imports.contents[basename(e.filename)]; + } else { + return input; + } + } + + function getLocation(index, input) { + for (var n = index, column = -1; + n >= 0 && input.charAt(n) !== '\n'; + n--) { column++ } + + return { line: typeof(index) === 'number' ? (input.slice(0, index).match(/\n/g) || "").length : null, + column: column }; + } + + function LessError(e, env) { + var input = getInput(e, env), + loc = getLocation(e.index, input), + line = loc.line, + col = loc.column, + lines = input.split('\n'); + + this.type = e.type || 'Syntax'; + this.message = e.message; + this.filename = e.filename || env.filename; + this.index = e.index; + this.line = typeof(line) === 'number' ? line + 1 : null; + this.callLine = e.call && (getLocation(e.call, input).line + 1); + this.callExtract = lines[getLocation(e.call, input).line]; + this.stack = e.stack; + this.column = col; + this.extract = [ + lines[line - 1], + lines[line], + lines[line + 1] + ]; + } + + this.env = env = env || {}; + + // The optimization level dictates the thoroughness of the parser, + // the lower the number, the less nodes it will create in the tree. + // This could matter for debugging, or if you want to access + // the individual nodes in the tree. + this.optimization = ('optimization' in this.env) ? this.env.optimization : 1; + + this.env.filename = this.env.filename || null; + + // + // The Parser + // + return parser = { + + imports: imports, + // + // Parse an input string into an abstract syntax tree, + // call `callback` when done. + // + parse: function (str, callback) { + var root, start, end, zone, line, lines, buff = [], c, error = null; + + i = j = current = furthest = 0; + input = str.replace(/\r\n/g, '\n'); + + // Split the input into chunks. + chunks = (function (chunks) { + var j = 0, + skip = /[^"'`\{\}\/\(\)\\]+/g, + comment = /\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g, + string = /"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'|`((?:[^`\\\r\n]|\\.)*)`/g, + level = 0, + match, + chunk = chunks[0], + inParam; + + for (var i = 0, c, cc; i < input.length; i++) { + skip.lastIndex = i; + if (match = skip.exec(input)) { + if (match.index === i) { + i += match[0].length; + chunk.push(match[0]); + } + } + c = input.charAt(i); + comment.lastIndex = string.lastIndex = i; + + if (match = string.exec(input)) { + if (match.index === i) { + i += match[0].length; + chunk.push(match[0]); + c = input.charAt(i); + } + } + + if (!inParam && c === '/') { + cc = input.charAt(i + 1); + if (cc === '/' || cc === '*') { + if (match = comment.exec(input)) { + if (match.index === i) { + i += match[0].length; + chunk.push(match[0]); + c = input.charAt(i); + } + } + } + } + + switch (c) { + case '{': if (! inParam) { level ++; chunk.push(c); break } + case '}': if (! inParam) { level --; chunk.push(c); chunks[++j] = chunk = []; break } + case '(': if (! inParam) { inParam = true; chunk.push(c); break } + case ')': if ( inParam) { inParam = false; chunk.push(c); break } + default: chunk.push(c); + } + } + if (level > 0) { + error = new(LessError)({ + index: i, + type: 'Parse', + message: "missing closing `}`", + filename: env.filename + }, env); + } + + return chunks.map(function (c) { return c.join('') });; + })([[]]); + + if (error) { + return callback(error); + } + + // Start with the primary rule. + // The whole syntax tree is held under a Ruleset node, + // with the `root` property set to true, so no `{}` are + // output. The callback is called when the input is parsed. + try { + root = new(tree.Ruleset)([], $(this.parsers.primary)); + root.root = true; + } catch (e) { + return callback(new(LessError)(e, env)); + } + + root.toCSS = (function (evaluate) { + var line, lines, column; + + return function (options, variables) { + var frames = [], importError; + + options = options || {}; + // + // Allows setting variables with a hash, so: + // + // `{ color: new(tree.Color)('#f01') }` will become: + // + // new(tree.Rule)('@color', + // new(tree.Value)([ + // new(tree.Expression)([ + // new(tree.Color)('#f01') + // ]) + // ]) + // ) + // + if (typeof(variables) === 'object' && !Array.isArray(variables)) { + variables = Object.keys(variables).map(function (k) { + var value = variables[k]; + + if (! (value instanceof tree.Value)) { + if (! (value instanceof tree.Expression)) { + value = new(tree.Expression)([value]); + } + value = new(tree.Value)([value]); + } + return new(tree.Rule)('@' + k, value, false, 0); + }); + frames = [new(tree.Ruleset)(null, variables)]; + } + + try { + var css = evaluate.call(this, { frames: frames }) + .toCSS([], { compress: options.compress || false }); + } catch (e) { + throw new(LessError)(e, env); + } + + if ((importError = parser.imports.error)) { // Check if there was an error during importing + if (importError instanceof LessError) throw importError; + else throw new(LessError)(importError, env); + } + + if (options.yuicompress && less.mode === 'node') { + return require('./cssmin').compressor.cssmin(css); + } else if (options.compress) { + return css.replace(/(\s)+/g, "$1"); + } else { + return css; + } + }; + })(root.eval); + + // If `i` is smaller than the `input.length - 1`, + // it means the parser wasn't able to parse the whole + // string, so we've got a parsing error. + // + // We try to extract a \n delimited string, + // showing the line where the parse error occured. + // We split it up into two parts (the part which parsed, + // and the part which didn't), so we can color them differently. + if (i < input.length - 1) { + i = furthest; + lines = input.split('\n'); + line = (input.slice(0, i).match(/\n/g) || "").length + 1; + + for (var n = i, column = -1; n >= 0 && input.charAt(n) !== '\n'; n--) { column++ } + + error = { + type: "Parse", + message: "Syntax Error on line " + line, + index: i, + filename: env.filename, + line: line, + column: column, + extract: [ + lines[line - 2], + lines[line - 1], + lines[line] + ] + }; + } + + if (this.imports.queue.length > 0) { + finish = function () { callback(error, root) }; + } else { + callback(error, root); + } + }, + + // + // Here in, the parsing rules/functions + // + // The basic structure of the syntax tree generated is as follows: + // + // Ruleset -> Rule -> Value -> Expression -> Entity + // + // Here's some LESS code: + // + // .class { + // color: #fff; + // border: 1px solid #000; + // width: @w + 4px; + // > .child {...} + // } + // + // And here's what the parse tree might look like: + // + // Ruleset (Selector '.class', [ + // Rule ("color", Value ([Expression [Color #fff]])) + // Rule ("border", Value ([Expression [Dimension 1px][Keyword "solid"][Color #000]])) + // Rule ("width", Value ([Expression [Operation "+" [Variable "@w"][Dimension 4px]]])) + // Ruleset (Selector [Element '>', '.child'], [...]) + // ]) + // + // In general, most rules will try to parse a token with the `$()` function, and if the return + // value is truly, will return a new node, of the relevant type. Sometimes, we need to check + // first, before parsing, that's when we use `peek()`. + // + parsers: { + // + // The `primary` rule is the *entry* and *exit* point of the parser. + // The rules here can appear at any level of the parse tree. + // + // The recursive nature of the grammar is an interplay between the `block` + // rule, which represents `{ ... }`, the `ruleset` rule, and this `primary` rule, + // as represented by this simplified grammar: + // + // primary → (ruleset | rule)+ + // ruleset → selector+ block + // block → '{' primary '}' + // + // Only at one point is the primary rule not called from the + // block rule: at the root level. + // + primary: function () { + var node, root = []; + + while ((node = $(this.mixin.definition) || $(this.rule) || $(this.ruleset) || + $(this.mixin.call) || $(this.comment) || $(this.directive)) + || $(/^[\s\n]+/)) { + node && root.push(node); + } + return root; + }, + + // We create a Comment node for CSS comments `/* */`, + // but keep the LeSS comments `//` silent, by just skipping + // over them. + comment: function () { + var comment; + + if (input.charAt(i) !== '/') return; + + if (input.charAt(i + 1) === '/') { + return new(tree.Comment)($(/^\/\/.*/), true); + } else if (comment = $(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/)) { + return new(tree.Comment)(comment); + } + }, + + // + // Entities are tokens which can be found inside an Expression + // + entities: { + // + // A string, which supports escaping " and ' + // + // "milky way" 'he\'s the one!' + // + quoted: function () { + var str, j = i, e; + + if (input.charAt(j) === '~') { j++, e = true } // Escaped strings + if (input.charAt(j) !== '"' && input.charAt(j) !== "'") return; + + e && $('~'); + + if (str = $(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/)) { + return new(tree.Quoted)(str[0], str[1] || str[2], e); + } + }, + + // + // A catch-all word, such as: + // + // black border-collapse + // + keyword: function () { + var k; + + if (k = $(/^[_A-Za-z-][_A-Za-z0-9-]*/)) { + if (tree.colors.hasOwnProperty(k)) { + // detect named color + return new(tree.Color)(tree.colors[k].slice(1)); + } else { + return new(tree.Keyword)(k); + } + } + }, + + // + // A function call + // + // rgb(255, 0, 255) + // + // We also try to catch IE's `alpha()`, but let the `alpha` parser + // deal with the details. + // + // The arguments are parsed with the `entities.arguments` parser. + // + call: function () { + var name, args, index = i; + + if (! (name = /^([\w-]+|%|progid:[\w\.]+)\(/.exec(chunks[j]))) return; + + name = name[1].toLowerCase(); + + if (name === 'url') { return null } + else { i += name.length } + + if (name === 'alpha') { return $(this.alpha) } + + $('('); // Parse the '(' and consume whitespace. + + args = $(this.entities.arguments); + + if (! $(')')) return; + + if (name) { return new(tree.Call)(name, args, index, env.filename) } + }, + arguments: function () { + var args = [], arg; + + while (arg = $(this.entities.assignment) || $(this.expression)) { + args.push(arg); + if (! $(',')) { break } + } + return args; + }, + literal: function () { + return $(this.entities.dimension) || + $(this.entities.color) || + $(this.entities.quoted); + }, + + // Assignments are argument entities for calls. + // They are present in ie filter properties as shown below. + // + // filter: progid:DXImageTransform.Microsoft.Alpha( *opacity=50* ) + // + + assignment: function () { + var key, value; + if ((key = $(/^\w+(?=\s?=)/i)) && $('=') && (value = $(this.entity))) { + return new(tree.Assignment)(key, value); + } + }, + + // + // Parse url() tokens + // + // We use a specific rule for urls, because they don't really behave like + // standard function calls. The difference is that the argument doesn't have + // to be enclosed within a string, so it can't be parsed as an Expression. + // + url: function () { + var value; + + if (input.charAt(i) !== 'u' || !$(/^url\(/)) return; + value = $(this.entities.quoted) || $(this.entities.variable) || + $(this.entities.dataURI) || $(/^[-\w%@$\/.&=:;#+?~]+/) || ""; + + expect(')'); + + return new(tree.URL)((value.value || value.data || value instanceof tree.Variable) + ? value : new(tree.Anonymous)(value), imports.paths); + }, + + dataURI: function () { + var obj; + + if ($(/^data:/)) { + obj = {}; + obj.mime = $(/^[^\/]+\/[^,;)]+/) || ''; + obj.charset = $(/^;\s*charset=[^,;)]+/) || ''; + obj.base64 = $(/^;\s*base64/) || ''; + obj.data = $(/^,\s*[^)]+/); + + if (obj.data) { return obj } + } + }, + + // + // A Variable entity, such as `@fink`, in + // + // width: @fink + 2px + // + // We use a different parser for variable definitions, + // see `parsers.variable`. + // + variable: function () { + var name, index = i; + + if (input.charAt(i) === '@' && (name = $(/^@@?[\w-]+/))) { + return new(tree.Variable)(name, index, env.filename); + } + }, + + // + // A Hexadecimal color + // + // #4F3C2F + // + // `rgb` and `hsl` colors are parsed through the `entities.call` parser. + // + color: function () { + var rgb; + + if (input.charAt(i) === '#' && (rgb = $(/^#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})/))) { + return new(tree.Color)(rgb[1]); + } + }, + + // + // A Dimension, that is, a number and a unit + // + // 0.5em 95% + // + dimension: function () { + var value, c = input.charCodeAt(i); + if ((c > 57 || c < 45) || c === 47) return; + + if (value = $(/^(-?\d*\.?\d+)(px|%|em|rem|pc|ex|in|deg|s|ms|pt|cm|mm|rad|grad|turn)?/)) { + return new(tree.Dimension)(value[1], value[2]); + } + }, + + // + // JavaScript code to be evaluated + // + // `window.location.href` + // + javascript: function () { + var str, j = i, e; + + if (input.charAt(j) === '~') { j++, e = true } // Escaped strings + if (input.charAt(j) !== '`') { return } + + e && $('~'); + + if (str = $(/^`([^`]*)`/)) { + return new(tree.JavaScript)(str[1], i, e); + } + } + }, + + // + // The variable part of a variable definition. Used in the `rule` parser + // + // @fink: + // + variable: function () { + var name; + + if (input.charAt(i) === '@' && (name = $(/^(@[\w-]+)\s*:/))) { return name[1] } + }, + + // + // A font size/line-height shorthand + // + // small/12px + // + // We need to peek first, or we'll match on keywords and dimensions + // + shorthand: function () { + var a, b; + + if (! peek(/^[@\w.%-]+\/[@\w.-]+/)) return; + + if ((a = $(this.entity)) && $('/') && (b = $(this.entity))) { + return new(tree.Shorthand)(a, b); + } + }, + + // + // Mixins + // + mixin: { + // + // A Mixin call, with an optional argument list + // + // #mixins > .square(#fff); + // .rounded(4px, black); + // .button; + // + // The `while` loop is there because mixins can be + // namespaced, but we only support the child and descendant + // selector for now. + // + call: function () { + var elements = [], e, c, args, index = i, s = input.charAt(i), important = false; + + if (s !== '.' && s !== '#') { return } + + while (e = $(/^[#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/)) { + elements.push(new(tree.Element)(c, e, i)); + c = $('>'); + } + $('(') && (args = $(this.entities.arguments)) && $(')'); + + if ($(this.important)) { + important = true; + } + + if (elements.length > 0 && ($(';') || peek('}'))) { + return new(tree.mixin.Call)(elements, args || [], index, env.filename, important); + } + }, + + // + // A Mixin definition, with a list of parameters + // + // .rounded (@radius: 2px, @color) { + // ... + // } + // + // Until we have a finer grained state-machine, we have to + // do a look-ahead, to make sure we don't have a mixin call. + // See the `rule` function for more information. + // + // We start by matching `.rounded (`, and then proceed on to + // the argument list, which has optional default values. + // We store the parameters in `params`, with a `value` key, + // if there is a value, such as in the case of `@radius`. + // + // Once we've got our params list, and a closing `)`, we parse + // the `{...}` block. + // + definition: function () { + var name, params = [], match, ruleset, param, value, cond, variadic = false; + if ((input.charAt(i) !== '.' && input.charAt(i) !== '#') || + peek(/^[^{]*(;|})/)) return; + + save(); + + if (match = $(/^([#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+)\s*\(/)) { + name = match[1]; + + do { + if (input.charAt(i) === '.' && $(/^\.{3}/)) { + variadic = true; + break; + } else if (param = $(this.entities.variable) || $(this.entities.literal) + || $(this.entities.keyword)) { + // Variable + if (param instanceof tree.Variable) { + if ($(':')) { + value = expect(this.expression, 'expected expression'); + params.push({ name: param.name, value: value }); + } else if ($(/^\.{3}/)) { + params.push({ name: param.name, variadic: true }); + variadic = true; + break; + } else { + params.push({ name: param.name }); + } + } else { + params.push({ value: param }); + } + } else { + break; + } + } while ($(',')) + + expect(')'); + + if ($(/^when/)) { // Guard + cond = expect(this.conditions, 'expected condition'); + } + + ruleset = $(this.block); + + if (ruleset) { + return new(tree.mixin.Definition)(name, params, ruleset, cond, variadic); + } else { + restore(); + } + } + } + }, + + // + // Entities are the smallest recognized token, + // and can be found inside a rule's value. + // + entity: function () { + return $(this.entities.literal) || $(this.entities.variable) || $(this.entities.url) || + $(this.entities.call) || $(this.entities.keyword) || $(this.entities.javascript) || + $(this.comment); + }, + + // + // A Rule terminator. Note that we use `peek()` to check for '}', + // because the `block` rule will be expecting it, but we still need to make sure + // it's there, if ';' was ommitted. + // + end: function () { + return $(';') || peek('}'); + }, + + // + // IE's alpha function + // + // alpha(opacity=88) + // + alpha: function () { + var value; + + if (! $(/^\(opacity=/i)) return; + if (value = $(/^\d+/) || $(this.entities.variable)) { + expect(')'); + return new(tree.Alpha)(value); + } + }, + + // + // A Selector Element + // + // div + // + h1 + // #socks + // input[type="text"] + // + // Elements are the building blocks for Selectors, + // they are made out of a `Combinator` (see combinator rule), + // and an element name, such as a tag a class, or `*`. + // + element: function () { + var e, t, c, v; + + c = $(this.combinator); + e = $(/^(?:\d+\.\d+|\d+)%/) || $(/^(?:[.#]?|:*)(?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/) || + $('*') || $(this.attribute) || $(/^\([^)@]+\)/); + + if (! e) { + $('(') && (v = $(this.entities.variable)) && $(')') && (e = new(tree.Paren)(v)); + } + + if (e) { return new(tree.Element)(c, e, i) } + + if (c.value && c.value.charAt(0) === '&') { + return new(tree.Element)(c, null, i); + } + }, + + // + // Combinators combine elements together, in a Selector. + // + // Because our parser isn't white-space sensitive, special care + // has to be taken, when parsing the descendant combinator, ` `, + // as it's an empty space. We have to check the previous character + // in the input, to see if it's a ` ` character. More info on how + // we deal with this in *combinator.js*. + // + combinator: function () { + var match, c = input.charAt(i); + + if (c === '>' || c === '+' || c === '~') { + i++; + while (input.charAt(i) === ' ') { i++ } + return new(tree.Combinator)(c); + } else if (c === '&') { + match = '&'; + i++; + if(input.charAt(i) === ' ') { + match = '& '; + } + while (input.charAt(i) === ' ') { i++ } + return new(tree.Combinator)(match); + } else if (input.charAt(i - 1) === ' ') { + return new(tree.Combinator)(" "); + } else { + return new(tree.Combinator)(null); + } + }, + + // + // A CSS Selector + // + // .class > div + h1 + // li a:hover + // + // Selectors are made out of one or more Elements, see above. + // + selector: function () { + var sel, e, elements = [], c, match; + + if ($('(')) { + sel = $(this.entity); + expect(')'); + return new(tree.Selector)([new(tree.Element)('', sel, i)]); + } + + while (e = $(this.element)) { + c = input.charAt(i); + elements.push(e) + if (c === '{' || c === '}' || c === ';' || c === ',') { break } + } + + if (elements.length > 0) { return new(tree.Selector)(elements) } + }, + tag: function () { + return $(/^[a-zA-Z][a-zA-Z-]*[0-9]?/) || $('*'); + }, + attribute: function () { + var attr = '', key, val, op; + + if (! $('[')) return; + + if (key = $(/^[a-zA-Z-]+/) || $(this.entities.quoted)) { + if ((op = $(/^[|~*$^]?=/)) && + (val = $(this.entities.quoted) || $(/^[\w-]+/))) { + attr = [key, op, val.toCSS ? val.toCSS() : val].join(''); + } else { attr = key } + } + + if (! $(']')) return; + + if (attr) { return "[" + attr + "]" } + }, + + // + // The `block` rule is used by `ruleset` and `mixin.definition`. + // It's a wrapper around the `primary` rule, with added `{}`. + // + block: function () { + var content; + + if ($('{') && (content = $(this.primary)) && $('}')) { + return content; + } + }, + + // + // div, .class, body > p {...} + // + ruleset: function () { + var selectors = [], s, rules, match; + save(); + + while (s = $(this.selector)) { + selectors.push(s); + $(this.comment); + if (! $(',')) { break } + $(this.comment); + } + + if (selectors.length > 0 && (rules = $(this.block))) { + return new(tree.Ruleset)(selectors, rules, env.strictImports); + } else { + // Backtrack + furthest = i; + restore(); + } + }, + rule: function () { + var name, value, c = input.charAt(i), important, match; + save(); + + if (c === '.' || c === '#' || c === '&') { return } + + if (name = $(this.variable) || $(this.property)) { + if ((name.charAt(0) != '@') && (match = /^([^@+\/'"*`(;{}-]*);/.exec(chunks[j]))) { + i += match[0].length - 1; + value = new(tree.Anonymous)(match[1]); + } else if (name === "font") { + value = $(this.font); + } else { + value = $(this.value); + } + important = $(this.important); + + if (value && $(this.end)) { + return new(tree.Rule)(name, value, important, memo); + } else { + furthest = i; + restore(); + } + } + }, + + // + // An @import directive + // + // @import "lib"; + // + // Depending on our environemnt, importing is done differently: + // In the browser, it's an XHR request, in Node, it would be a + // file-system operation. The function used for importing is + // stored in `import`, which we pass to the Import constructor. + // + "import": function () { + var path, features, index = i; + if ($(/^@import\s+/) && + (path = $(this.entities.quoted) || $(this.entities.url))) { + features = $(this.mediaFeatures); + if ($(';')) { + return new(tree.Import)(path, imports, features, index); + } + } + }, + + mediaFeature: function () { + var e, p, nodes = []; + + do { + if (e = $(this.entities.keyword)) { + nodes.push(e); + } else if ($('(')) { + p = $(this.property); + e = $(this.entity); + if ($(')')) { + if (p && e) { + nodes.push(new(tree.Paren)(new(tree.Rule)(p, e, null, i, true))); + } else if (e) { + nodes.push(new(tree.Paren)(e)); + } else { + return null; + } + } else { return null } + } + } while (e); + + if (nodes.length > 0) { + return new(tree.Expression)(nodes); + } + }, + + mediaFeatures: function () { + var e, features = []; + + do { + if (e = $(this.mediaFeature)) { + features.push(e); + if (! $(',')) { break } + } else if (e = $(this.entities.variable)) { + features.push(e); + if (! $(',')) { break } + } + } while (e); + + return features.length > 0 ? features : null; + }, + + media: function () { + var features, rules; + + if ($(/^@media/)) { + features = $(this.mediaFeatures); + + if (rules = $(this.block)) { + return new(tree.Media)(rules, features); + } + } + }, + + // + // A CSS Directive + // + // @charset "utf-8"; + // + directive: function () { + var name, value, rules, types, e, nodes; + + if (input.charAt(i) !== '@') return; + + if (value = $(this['import']) || $(this.media)) { + return value; + } else if (name = $(/^@page|@keyframes/) || $(/^@(?:-webkit-|-moz-|-o-|-ms-)[a-z0-9-]+/)) { + types = ($(/^[^{]+/) || '').trim(); + if (rules = $(this.block)) { + return new(tree.Directive)(name + " " + types, rules); + } + } else if (name = $(/^@[-a-z]+/)) { + if (name === '@font-face') { + if (rules = $(this.block)) { + return new(tree.Directive)(name, rules); + } + } else if ((value = $(this.entity)) && $(';')) { + return new(tree.Directive)(name, value); + } + } + }, + font: function () { + var value = [], expression = [], weight, shorthand, font, e; + + while (e = $(this.shorthand) || $(this.entity)) { + expression.push(e); + } + value.push(new(tree.Expression)(expression)); + + if ($(',')) { + while (e = $(this.expression)) { + value.push(e); + if (! $(',')) { break } + } + } + return new(tree.Value)(value); + }, + + // + // A Value is a comma-delimited list of Expressions + // + // font-family: Baskerville, Georgia, serif; + // + // In a Rule, a Value represents everything after the `:`, + // and before the `;`. + // + value: function () { + var e, expressions = [], important; + + while (e = $(this.expression)) { + expressions.push(e); + if (! $(',')) { break } + } + + if (expressions.length > 0) { + return new(tree.Value)(expressions); + } + }, + important: function () { + if (input.charAt(i) === '!') { + return $(/^! *important/); + } + }, + sub: function () { + var e; + + if ($('(') && (e = $(this.expression)) && $(')')) { + return e; + } + }, + multiplication: function () { + var m, a, op, operation; + if (m = $(this.operand)) { + while (!peek(/^\/\*/) && (op = ($('/') || $('*'))) && (a = $(this.operand))) { + operation = new(tree.Operation)(op, [operation || m, a]); + } + return operation || m; + } + }, + addition: function () { + var m, a, op, operation; + if (m = $(this.multiplication)) { + while ((op = $(/^[-+]\s+/) || (input.charAt(i - 1) != ' ' && ($('+') || $('-')))) && + (a = $(this.multiplication))) { + operation = new(tree.Operation)(op, [operation || m, a]); + } + return operation || m; + } + }, + conditions: function () { + var a, b, index = i, condition; + + if (a = $(this.condition)) { + while ($(',') && (b = $(this.condition))) { + condition = new(tree.Condition)('or', condition || a, b, index); + } + return condition || a; + } + }, + condition: function () { + var a, b, c, op, index = i, negate = false; + + if ($(/^not/)) { negate = true } + expect('('); + if (a = $(this.addition) || $(this.entities.keyword) || $(this.entities.quoted)) { + if (op = $(/^(?:>=|=<|[<=>])/)) { + if (b = $(this.addition) || $(this.entities.keyword) || $(this.entities.quoted)) { + c = new(tree.Condition)(op, a, b, index, negate); + } else { + error('expected expression'); + } + } else { + c = new(tree.Condition)('=', a, new(tree.Keyword)('true'), index, negate); + } + expect(')'); + return $(/^and/) ? new(tree.Condition)('and', c, $(this.condition)) : c; + } + }, + + // + // An operand is anything that can be part of an operation, + // such as a Color, or a Variable + // + operand: function () { + var negate, p = input.charAt(i + 1); + + if (input.charAt(i) === '-' && (p === '@' || p === '(')) { negate = $('-') } + var o = $(this.sub) || $(this.entities.dimension) || + $(this.entities.color) || $(this.entities.variable) || + $(this.entities.call); + return negate ? new(tree.Operation)('*', [new(tree.Dimension)(-1), o]) + : o; + }, + + // + // Expressions either represent mathematical operations, + // or white-space delimited Entities. + // + // 1px solid black + // @var * 2 + // + expression: function () { + var e, delim, entities = [], d; + + while (e = $(this.addition) || $(this.entity)) { + entities.push(e); + } + if (entities.length > 0) { + return new(tree.Expression)(entities); + } + }, + property: function () { + var name; + + if (name = $(/^(\*?-?[-a-z_0-9]+)\s*:/)) { + return name[1]; + } + } + } + }; +}; + +if (less.mode === 'browser' || less.mode === 'rhino') { + // + // Used by `@import` directives + // + less.Parser.importer = function (path, paths, callback, env) { + if (!/^([a-z]+:)?\//.test(path) && paths.length > 0) { + path = paths[0] + path; + } + // We pass `true` as 3rd argument, to force the reload of the import. + // This is so we can get the syntax tree as opposed to just the CSS output, + // as we need this to evaluate the current stylesheet. + loadStyleSheet({ href: path, title: path, type: env.mime }, function (e) { + if (e && typeof(env.errback) === "function") { + env.errback.call(null, path, paths, callback, env); + } else { + callback.apply(null, arguments); + } + }, true); + }; +} + diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/rhino.js b/askbot/skins/default/media/style/node_modules/less/lib/less/rhino.js new file mode 100644 index 00000000..a2c5662f --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/rhino.js @@ -0,0 +1,62 @@ +var name; + +function loadStyleSheet(sheet, callback, reload, remaining) { + var sheetName = name.slice(0, name.lastIndexOf('/') + 1) + sheet.href; + var input = readFile(sheetName); + var parser = new less.Parser({ + paths: [sheet.href.replace(/[\w\.-]+$/, '')] + }); + parser.parse(input, function (e, root) { + if (e) { + print("Error: " + e); + quit(1); + } + callback(root, sheet, { local: false, lastModified: 0, remaining: remaining }); + }); + + // callback({}, sheet, { local: true, remaining: remaining }); +} + +function writeFile(filename, content) { + var fstream = new java.io.FileWriter(filename); + var out = new java.io.BufferedWriter(fstream); + out.write(content); + out.close(); +} + +// Command line integration via Rhino +(function (args) { + name = args[0]; + var output = args[1]; + + if (!name) { + print('No files present in the fileset; Check your pattern match in build.xml'); + quit(1); + } + path = name.split("/");path.pop();path=path.join("/") + + var input = readFile(name); + + if (!input) { + print('lesscss: couldn\'t open file ' + name); + quit(1); + } + + var result; + var parser = new less.Parser(); + parser.parse(input, function (e, root) { + if (e) { + quit(1); + } else { + result = root.toCSS(); + if (output) { + writeFile(output, result); + print("Written to " + output); + } else { + print(result); + } + quit(0); + } + }); + print("done"); +}(arguments)); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree.js new file mode 100644 index 00000000..24ecd712 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree.js @@ -0,0 +1,17 @@ +(function (tree) { + +tree.find = function (obj, fun) { + for (var i = 0, r; i < obj.length; i++) { + if (r = fun.call(obj, obj[i])) { return r } + } + return null; +}; +tree.jsify = function (obj) { + if (Array.isArray(obj.value) && (obj.value.length > 1)) { + return '[' + obj.value.map(function (v) { return v.toCSS(false) }).join(', ') + ']'; + } else { + return obj.toCSS(false); + } +}; + +})(require('./tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/alpha.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/alpha.js new file mode 100644 index 00000000..139ae920 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/alpha.js @@ -0,0 +1,17 @@ +(function (tree) { + +tree.Alpha = function (val) { + this.value = val; +}; +tree.Alpha.prototype = { + toCSS: function () { + return "alpha(opacity=" + + (this.value.toCSS ? this.value.toCSS() : this.value) + ")"; + }, + eval: function (env) { + if (this.value.eval) { this.value = this.value.eval(env) } + return this; + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/anonymous.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/anonymous.js new file mode 100644 index 00000000..460c9ec7 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/anonymous.js @@ -0,0 +1,13 @@ +(function (tree) { + +tree.Anonymous = function (string) { + this.value = string.value || string; +}; +tree.Anonymous.prototype = { + toCSS: function () { + return this.value; + }, + eval: function () { return this } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/assignment.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/assignment.js new file mode 100644 index 00000000..70ce6e2f --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/assignment.js @@ -0,0 +1,17 @@ +(function (tree) { + +tree.Assignment = function (key, val) { + this.key = key; + this.value = val; +}; +tree.Assignment.prototype = { + toCSS: function () { + return this.key + '=' + (this.value.toCSS ? this.value.toCSS() : this.value); + }, + eval: function (env) { + if (this.value.eval) { this.value = this.value.eval(env) } + return this; + } +}; + +})(require('../tree')); \ No newline at end of file diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/call.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/call.js new file mode 100644 index 00000000..c1465dd4 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/call.js @@ -0,0 +1,48 @@ +(function (tree) { + +// +// A function call node. +// +tree.Call = function (name, args, index, filename) { + this.name = name; + this.args = args; + this.index = index; + this.filename = filename; +}; +tree.Call.prototype = { + // + // When evaluating a function call, + // we either find the function in `tree.functions` [1], + // in which case we call it, passing the evaluated arguments, + // or we simply print it out as it appeared originally [2]. + // + // The *functions.js* file contains the built-in functions. + // + // The reason why we evaluate the arguments, is in the case where + // we try to pass a variable to a function, like: `saturate(@color)`. + // The function should receive the value, not the variable. + // + eval: function (env) { + var args = this.args.map(function (a) { return a.eval(env) }); + + if (this.name in tree.functions) { // 1. + try { + return tree.functions[this.name].apply(tree.functions, args); + } catch (e) { + throw { type: e.type || "Runtime", + message: "error evaluating function `" + this.name + "`" + + (e.message ? ': ' + e.message : ''), + index: this.index, filename: this.filename }; + } + } else { // 2. + return new(tree.Anonymous)(this.name + + "(" + args.map(function (a) { return a.toCSS() }).join(', ') + ")"); + } + }, + + toCSS: function (env) { + return this.eval(env).toCSS(); + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/color.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/color.js new file mode 100644 index 00000000..37ce1781 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/color.js @@ -0,0 +1,101 @@ +(function (tree) { +// +// RGB Colors - #ff0014, #eee +// +tree.Color = function (rgb, a) { + // + // The end goal here, is to parse the arguments + // into an integer triplet, such as `128, 255, 0` + // + // This facilitates operations and conversions. + // + if (Array.isArray(rgb)) { + this.rgb = rgb; + } else if (rgb.length == 6) { + this.rgb = rgb.match(/.{2}/g).map(function (c) { + return parseInt(c, 16); + }); + } else { + this.rgb = rgb.split('').map(function (c) { + return parseInt(c + c, 16); + }); + } + this.alpha = typeof(a) === 'number' ? a : 1; +}; +tree.Color.prototype = { + eval: function () { return this }, + + // + // If we have some transparency, the only way to represent it + // is via `rgba`. Otherwise, we use the hex representation, + // which has better compatibility with older browsers. + // Values are capped between `0` and `255`, rounded and zero-padded. + // + toCSS: function () { + if (this.alpha < 1.0) { + return "rgba(" + this.rgb.map(function (c) { + return Math.round(c); + }).concat(this.alpha).join(', ') + ")"; + } else { + return '#' + this.rgb.map(function (i) { + i = Math.round(i); + i = (i > 255 ? 255 : (i < 0 ? 0 : i)).toString(16); + return i.length === 1 ? '0' + i : i; + }).join(''); + } + }, + + // + // Operations have to be done per-channel, if not, + // channels will spill onto each other. Once we have + // our result, in the form of an integer triplet, + // we create a new Color node to hold the result. + // + operate: function (op, other) { + var result = []; + + if (! (other instanceof tree.Color)) { + other = other.toColor(); + } + + for (var c = 0; c < 3; c++) { + result[c] = tree.operate(op, this.rgb[c], other.rgb[c]); + } + return new(tree.Color)(result, this.alpha + other.alpha); + }, + + toHSL: function () { + var r = this.rgb[0] / 255, + g = this.rgb[1] / 255, + b = this.rgb[2] / 255, + a = this.alpha; + + var max = Math.max(r, g, b), min = Math.min(r, g, b); + var h, s, l = (max + min) / 2, d = max - min; + + if (max === min) { + h = s = 0; + } else { + s = l > 0.5 ? d / (2 - max - min) : d / (max + min); + + switch (max) { + case r: h = (g - b) / d + (g < b ? 6 : 0); break; + case g: h = (b - r) / d + 2; break; + case b: h = (r - g) / d + 4; break; + } + h /= 6; + } + return { h: h * 360, s: s, l: l, a: a }; + }, + toARGB: function () { + var argb = [Math.round(this.alpha * 255)].concat(this.rgb); + return '#' + argb.map(function (i) { + i = Math.round(i); + i = (i > 255 ? 255 : (i < 0 ? 0 : i)).toString(16); + return i.length === 1 ? '0' + i : i; + }).join(''); + } +}; + + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/comment.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/comment.js new file mode 100644 index 00000000..f4a33840 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/comment.js @@ -0,0 +1,14 @@ +(function (tree) { + +tree.Comment = function (value, silent) { + this.value = value; + this.silent = !!silent; +}; +tree.Comment.prototype = { + toCSS: function (env) { + return env.compress ? '' : this.value; + }, + eval: function () { return this } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/condition.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/condition.js new file mode 100644 index 00000000..6b79dc96 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/condition.js @@ -0,0 +1,42 @@ +(function (tree) { + +tree.Condition = function (op, l, r, i, negate) { + this.op = op.trim(); + this.lvalue = l; + this.rvalue = r; + this.index = i; + this.negate = negate; +}; +tree.Condition.prototype.eval = function (env) { + var a = this.lvalue.eval(env), + b = this.rvalue.eval(env); + + var i = this.index, result; + + var result = (function (op) { + switch (op) { + case 'and': + return a && b; + case 'or': + return a || b; + default: + if (a.compare) { + result = a.compare(b); + } else if (b.compare) { + result = b.compare(a); + } else { + throw { type: "Type", + message: "Unable to perform comparison", + index: i }; + } + switch (result) { + case -1: return op === '<' || op === '=<'; + case 0: return op === '=' || op === '>=' || op === '=<'; + case 1: return op === '>' || op === '>='; + } + } + })(this.op); + return this.negate ? !result : result; +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/dimension.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/dimension.js new file mode 100644 index 00000000..9a6fce3d --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/dimension.js @@ -0,0 +1,49 @@ +(function (tree) { + +// +// A number with a unit +// +tree.Dimension = function (value, unit) { + this.value = parseFloat(value); + this.unit = unit || null; +}; + +tree.Dimension.prototype = { + eval: function () { return this }, + toColor: function () { + return new(tree.Color)([this.value, this.value, this.value]); + }, + toCSS: function () { + var css = this.value + this.unit; + return css; + }, + + // In an operation between two Dimensions, + // we default to the first Dimension's unit, + // so `1px + 2em` will yield `3px`. + // In the future, we could implement some unit + // conversions such that `100cm + 10mm` would yield + // `101cm`. + operate: function (op, other) { + return new(tree.Dimension) + (tree.operate(op, this.value, other.value), + this.unit || other.unit); + }, + + // TODO: Perform unit conversion before comparing + compare: function (other) { + if (other instanceof tree.Dimension) { + if (other.value > this.value) { + return -1; + } else if (other.value < this.value) { + return 1; + } else { + return 0; + } + } else { + return -1; + } + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/directive.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/directive.js new file mode 100644 index 00000000..27538332 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/directive.js @@ -0,0 +1,35 @@ +(function (tree) { + +tree.Directive = function (name, value, features) { + this.name = name; + + if (Array.isArray(value)) { + this.ruleset = new(tree.Ruleset)([], value); + this.ruleset.allowImports = true; + } else { + this.value = value; + } +}; +tree.Directive.prototype = { + toCSS: function (ctx, env) { + if (this.ruleset) { + this.ruleset.root = true; + return this.name + (env.compress ? '{' : ' {\n ') + + this.ruleset.toCSS(ctx, env).trim().replace(/\n/g, '\n ') + + (env.compress ? '}': '\n}\n'); + } else { + return this.name + ' ' + this.value.toCSS() + ';\n'; + } + }, + eval: function (env) { + env.frames.unshift(this); + this.ruleset = this.ruleset && this.ruleset.eval(env); + env.frames.shift(); + return this; + }, + variable: function (name) { return tree.Ruleset.prototype.variable.call(this.ruleset, name) }, + find: function () { return tree.Ruleset.prototype.find.apply(this.ruleset, arguments) }, + rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.ruleset) } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/element.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/element.js new file mode 100644 index 00000000..4736857e --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/element.js @@ -0,0 +1,47 @@ +(function (tree) { + +tree.Element = function (combinator, value, index) { + this.combinator = combinator instanceof tree.Combinator ? + combinator : new(tree.Combinator)(combinator); + + if (typeof(value) === 'string') { + this.value = value.trim(); + } else if (value) { + this.value = value; + } else { + this.value = ""; + } + this.index = index; +}; +tree.Element.prototype.eval = function (env) { + return new(tree.Element)(this.combinator, + this.value.eval ? this.value.eval(env) : this.value, + this.index); +}; +tree.Element.prototype.toCSS = function (env) { + return this.combinator.toCSS(env || {}) + (this.value.toCSS ? this.value.toCSS(env) : this.value); +}; + +tree.Combinator = function (value) { + if (value === ' ') { + this.value = ' '; + } else if (value === '& ') { + this.value = '& '; + } else { + this.value = value ? value.trim() : ""; + } +}; +tree.Combinator.prototype.toCSS = function (env) { + return { + '' : '', + ' ' : ' ', + '&' : '', + '& ' : ' ', + ':' : ' :', + '+' : env.compress ? '+' : ' + ', + '~' : env.compress ? '~' : ' ~ ', + '>' : env.compress ? '>' : ' > ' + }[this.value]; +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/expression.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/expression.js new file mode 100644 index 00000000..fbfa9c5b --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/expression.js @@ -0,0 +1,23 @@ +(function (tree) { + +tree.Expression = function (value) { this.value = value }; +tree.Expression.prototype = { + eval: function (env) { + if (this.value.length > 1) { + return new(tree.Expression)(this.value.map(function (e) { + return e.eval(env); + })); + } else if (this.value.length === 1) { + return this.value[0].eval(env); + } else { + return this; + } + }, + toCSS: function (env) { + return this.value.map(function (e) { + return e.toCSS ? e.toCSS(env) : ''; + }).join(' '); + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/import.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/import.js new file mode 100644 index 00000000..c3b0b009 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/import.js @@ -0,0 +1,79 @@ +(function (tree) { +// +// CSS @import node +// +// The general strategy here is that we don't want to wait +// for the parsing to be completed, before we start importing +// the file. That's because in the context of a browser, +// most of the time will be spent waiting for the server to respond. +// +// On creation, we push the import path to our import queue, though +// `import,push`, we also pass it a callback, which it'll call once +// the file has been fetched, and parsed. +// +tree.Import = function (path, imports, features, index) { + var that = this; + + this.index = index; + this._path = path; + this.features = features && new(tree.Value)(features); + + // The '.less' extension is optional + if (path instanceof tree.Quoted) { + this.path = /\.(le?|c)ss(\?.*)?$/.test(path.value) ? path.value : path.value + '.less'; + } else { + this.path = path.value.value || path.value; + } + + this.css = /css(\?.*)?$/.test(this.path); + + // Only pre-compile .less files + if (! this.css) { + imports.push(this.path, function (e, root) { + if (e) { e.index = index } + that.root = root || new(tree.Ruleset)([], []); + }); + } +}; + +// +// The actual import node doesn't return anything, when converted to CSS. +// The reason is that it's used at the evaluation stage, so that the rules +// it imports can be treated like any other rules. +// +// In `eval`, we make sure all Import nodes get evaluated, recursively, so +// we end up with a flat structure, which can easily be imported in the parent +// ruleset. +// +tree.Import.prototype = { + toCSS: function (env) { + var features = this.features ? ' ' + this.features.toCSS(env) : ''; + + if (this.css) { + return "@import " + this._path.toCSS() + features + ';\n'; + } else { + return ""; + } + }, + eval: function (env) { + var ruleset, features = this.features && this.features.eval(env); + + if (this.css) { + return this; + } else { + ruleset = new(tree.Ruleset)([], this.root.rules.slice(0)); + + for (var i = 0; i < ruleset.rules.length; i++) { + if (ruleset.rules[i] instanceof tree.Import) { + Array.prototype + .splice + .apply(ruleset.rules, + [i, 1].concat(ruleset.rules[i].eval(env))); + } + } + return this.features ? new(tree.Media)(ruleset.rules, this.features.value) : ruleset.rules; + } + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/javascript.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/javascript.js new file mode 100644 index 00000000..772a31dd --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/javascript.js @@ -0,0 +1,51 @@ +(function (tree) { + +tree.JavaScript = function (string, index, escaped) { + this.escaped = escaped; + this.expression = string; + this.index = index; +}; +tree.JavaScript.prototype = { + eval: function (env) { + var result, + that = this, + context = {}; + + var expression = this.expression.replace(/@\{([\w-]+)\}/g, function (_, name) { + return tree.jsify(new(tree.Variable)('@' + name, that.index).eval(env)); + }); + + try { + expression = new(Function)('return (' + expression + ')'); + } catch (e) { + throw { message: "JavaScript evaluation error: `" + expression + "`" , + index: this.index }; + } + + for (var k in env.frames[0].variables()) { + context[k.slice(1)] = { + value: env.frames[0].variables()[k].value, + toJS: function () { + return this.value.eval(env).toCSS(); + } + }; + } + + try { + result = expression.call(context); + } catch (e) { + throw { message: "JavaScript evaluation error: '" + e.name + ': ' + e.message + "'" , + index: this.index }; + } + if (typeof(result) === 'string') { + return new(tree.Quoted)('"' + result + '"', result, this.escaped, this.index); + } else if (Array.isArray(result)) { + return new(tree.Anonymous)(result.join(', ')); + } else { + return new(tree.Anonymous)(result); + } + } +}; + +})(require('../tree')); + diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/keyword.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/keyword.js new file mode 100644 index 00000000..701b79e5 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/keyword.js @@ -0,0 +1,19 @@ +(function (tree) { + +tree.Keyword = function (value) { this.value = value }; +tree.Keyword.prototype = { + eval: function () { return this }, + toCSS: function () { return this.value }, + compare: function (other) { + if (other instanceof tree.Keyword) { + return other.value === this.value ? 0 : 1; + } else { + return -1; + } + } +}; + +tree.True = new(tree.Keyword)('true'); +tree.False = new(tree.Keyword)('false'); + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/media.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/media.js new file mode 100644 index 00000000..2b7b26e5 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/media.js @@ -0,0 +1,114 @@ +(function (tree) { + +tree.Media = function (value, features) { + var el = new(tree.Element)('&', null, 0), + selectors = [new(tree.Selector)([el])]; + + this.features = new(tree.Value)(features); + this.ruleset = new(tree.Ruleset)(selectors, value); + this.ruleset.allowImports = true; +}; +tree.Media.prototype = { + toCSS: function (ctx, env) { + var features = this.features.toCSS(env); + + this.ruleset.root = (ctx.length === 0 || ctx[0].multiMedia); + return '@media ' + features + (env.compress ? '{' : ' {\n ') + + this.ruleset.toCSS(ctx, env).trim().replace(/\n/g, '\n ') + + (env.compress ? '}': '\n}\n'); + }, + eval: function (env) { + if (!env.mediaBlocks) { + env.mediaBlocks = []; + env.mediaPath = []; + } + + var blockIndex = env.mediaBlocks.length; + env.mediaPath.push(this); + env.mediaBlocks.push(this); + + var media = new(tree.Media)([], []); + media.features = this.features.eval(env); + + env.frames.unshift(this.ruleset); + media.ruleset = this.ruleset.eval(env); + env.frames.shift(); + + env.mediaBlocks[blockIndex] = media; + env.mediaPath.pop(); + + return env.mediaPath.length === 0 ? media.evalTop(env) : + media.evalNested(env) + }, + variable: function (name) { return tree.Ruleset.prototype.variable.call(this.ruleset, name) }, + find: function () { return tree.Ruleset.prototype.find.apply(this.ruleset, arguments) }, + rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.ruleset) }, + + evalTop: function (env) { + var result = this; + + // Render all dependent Media blocks. + if (env.mediaBlocks.length > 1) { + var el = new(tree.Element)('&', null, 0); + var selectors = [new(tree.Selector)([el])]; + result = new(tree.Ruleset)(selectors, env.mediaBlocks); + result.multiMedia = true; + } + + delete env.mediaBlocks; + delete env.mediaPath; + + return result; + }, + evalNested: function (env) { + var i, value, + path = env.mediaPath.concat([this]); + + // Extract the media-query conditions separated with `,` (OR). + for (i = 0; i < path.length; i++) { + value = path[i].features instanceof tree.Value ? + path[i].features.value : path[i].features; + path[i] = Array.isArray(value) ? value : [value]; + } + + // Trace all permutations to generate the resulting media-query. + // + // (a, b and c) with nested (d, e) -> + // a and d + // a and e + // b and c and d + // b and c and e + this.features = new(tree.Value)(this.permute(path).map(function (path) { + path = path.map(function (fragment) { + return fragment.toCSS ? fragment : new(tree.Anonymous)(fragment); + }); + + for(i = path.length - 1; i > 0; i--) { + path.splice(i, 0, new(tree.Anonymous)("and")); + } + + return new(tree.Expression)(path); + })); + + // Fake a tree-node that doesn't output anything. + return new(tree.Ruleset)([], []); + }, + permute: function (arr) { + if (arr.length === 0) { + return []; + } else if (arr.length === 1) { + return arr[0]; + } else { + var result = []; + var rest = this.permute(arr.slice(1)); + for (var i = 0; i < rest.length; i++) { + for (var j = 0; j < arr[0].length; j++) { + result.push([arr[0][j]].concat(rest[i])); + } + } + return result; + } + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/mixin.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/mixin.js new file mode 100644 index 00000000..4464bc6c --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/mixin.js @@ -0,0 +1,135 @@ +(function (tree) { + +tree.mixin = {}; +tree.mixin.Call = function (elements, args, index, filename, important) { + this.selector = new(tree.Selector)(elements); + this.arguments = args; + this.index = index; + this.filename = filename; + this.important = important; +}; +tree.mixin.Call.prototype = { + eval: function (env) { + var mixins, args, rules = [], match = false; + + for (var i = 0; i < env.frames.length; i++) { + if ((mixins = env.frames[i].find(this.selector)).length > 0) { + args = this.arguments && this.arguments.map(function (a) { return a.eval(env) }); + for (var m = 0; m < mixins.length; m++) { + if (mixins[m].match(args, env)) { + try { + Array.prototype.push.apply( + rules, mixins[m].eval(env, this.arguments, this.important).rules); + match = true; + } catch (e) { + throw { message: e.message, index: this.index, filename: this.filename, stack: e.stack }; + } + } + } + if (match) { + return rules; + } else { + throw { type: 'Runtime', + message: 'No matching definition was found for `' + + this.selector.toCSS().trim() + '(' + + this.arguments.map(function (a) { + return a.toCSS(); + }).join(', ') + ")`", + index: this.index, filename: this.filename }; + } + } + } + throw { type: 'Name', + message: this.selector.toCSS().trim() + " is undefined", + index: this.index, filename: this.filename }; + } +}; + +tree.mixin.Definition = function (name, params, rules, condition, variadic) { + this.name = name; + this.selectors = [new(tree.Selector)([new(tree.Element)(null, name)])]; + this.params = params; + this.condition = condition; + this.variadic = variadic; + this.arity = params.length; + this.rules = rules; + this._lookups = {}; + this.required = params.reduce(function (count, p) { + if (!p.name || (p.name && !p.value)) { return count + 1 } + else { return count } + }, 0); + this.parent = tree.Ruleset.prototype; + this.frames = []; +}; +tree.mixin.Definition.prototype = { + toCSS: function () { return "" }, + variable: function (name) { return this.parent.variable.call(this, name) }, + variables: function () { return this.parent.variables.call(this) }, + find: function () { return this.parent.find.apply(this, arguments) }, + rulesets: function () { return this.parent.rulesets.apply(this) }, + + evalParams: function (env, args) { + var frame = new(tree.Ruleset)(null, []), varargs; + + for (var i = 0, val, name; i < this.params.length; i++) { + if (name = this.params[i].name) { + if (this.params[i].variadic && args) { + varargs = []; + for (var j = i; j < args.length; j++) { + varargs.push(args[j].eval(env)); + } + frame.rules.unshift(new(tree.Rule)(name, new(tree.Expression)(varargs).eval(env))); + } else if (val = (args && args[i]) || this.params[i].value) { + frame.rules.unshift(new(tree.Rule)(name, val.eval(env))); + } else { + throw { type: 'Runtime', message: "wrong number of arguments for " + this.name + + ' (' + args.length + ' for ' + this.arity + ')' }; + } + } + } + return frame; + }, + eval: function (env, args, important) { + var frame = this.evalParams(env, args), context, _arguments = [], rules, start; + + for (var i = 0; i < Math.max(this.params.length, args && args.length); i++) { + _arguments.push(args[i] || this.params[i].value); + } + frame.rules.unshift(new(tree.Rule)('@arguments', new(tree.Expression)(_arguments).eval(env))); + + rules = important ? + this.rules.map(function (r) { + return new(tree.Rule)(r.name, r.value, '!important', r.index); + }) : this.rules.slice(0); + + return new(tree.Ruleset)(null, rules).eval({ + frames: [this, frame].concat(this.frames, env.frames) + }); + }, + match: function (args, env) { + var argsLength = (args && args.length) || 0, len, frame; + + if (! this.variadic) { + if (argsLength < this.required) { return false } + if (argsLength > this.params.length) { return false } + if ((this.required > 0) && (argsLength > this.params.length)) { return false } + } + + if (this.condition && !this.condition.eval({ + frames: [this.evalParams(env, args)].concat(env.frames) + })) { return false } + + len = Math.min(argsLength, this.arity); + + for (var i = 0; i < len; i++) { + if (!this.params[i].name) { + if (args[i].eval(env).toCSS() != this.params[i].value.eval(env).toCSS()) { + return false; + } + } + } + return true; + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/operation.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/operation.js new file mode 100644 index 00000000..1ce22fb0 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/operation.js @@ -0,0 +1,32 @@ +(function (tree) { + +tree.Operation = function (op, operands) { + this.op = op.trim(); + this.operands = operands; +}; +tree.Operation.prototype.eval = function (env) { + var a = this.operands[0].eval(env), + b = this.operands[1].eval(env), + temp; + + if (a instanceof tree.Dimension && b instanceof tree.Color) { + if (this.op === '*' || this.op === '+') { + temp = b, b = a, a = temp; + } else { + throw { name: "OperationError", + message: "Can't substract or divide a color from a number" }; + } + } + return a.operate(this.op, b); +}; + +tree.operate = function (op, a, b) { + switch (op) { + case '+': return a + b; + case '-': return a - b; + case '*': return a * b; + case '/': return a / b; + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/paren.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/paren.js new file mode 100644 index 00000000..384a43c7 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/paren.js @@ -0,0 +1,16 @@ + +(function (tree) { + +tree.Paren = function (node) { + this.value = node; +}; +tree.Paren.prototype = { + toCSS: function (env) { + return '(' + this.value.toCSS(env) + ')'; + }, + eval: function (env) { + return new(tree.Paren)(this.value.eval(env)); + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/quoted.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/quoted.js new file mode 100644 index 00000000..794bf4ce --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/quoted.js @@ -0,0 +1,29 @@ +(function (tree) { + +tree.Quoted = function (str, content, escaped, i) { + this.escaped = escaped; + this.value = content || ''; + this.quote = str.charAt(0); + this.index = i; +}; +tree.Quoted.prototype = { + toCSS: function () { + if (this.escaped) { + return this.value; + } else { + return this.quote + this.value + this.quote; + } + }, + eval: function (env) { + var that = this; + var value = this.value.replace(/`([^`]+)`/g, function (_, exp) { + return new(tree.JavaScript)(exp, that.index, true).eval(env).value; + }).replace(/@\{([\w-]+)\}/g, function (_, name) { + var v = new(tree.Variable)('@' + name, that.index).eval(env); + return ('value' in v) ? v.value : v.toCSS(); + }); + return new(tree.Quoted)(this.quote + value + this.quote, value, this.escaped, this.index); + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/rule.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/rule.js new file mode 100644 index 00000000..9e4e54a3 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/rule.js @@ -0,0 +1,42 @@ +(function (tree) { + +tree.Rule = function (name, value, important, index, inline) { + this.name = name; + this.value = (value instanceof tree.Value) ? value : new(tree.Value)([value]); + this.important = important ? ' ' + important.trim() : ''; + this.index = index; + this.inline = inline || false; + + if (name.charAt(0) === '@') { + this.variable = true; + } else { this.variable = false } +}; +tree.Rule.prototype.toCSS = function (env) { + if (this.variable) { return "" } + else { + return this.name + (env.compress ? ':' : ': ') + + this.value.toCSS(env) + + this.important + (this.inline ? "" : ";"); + } +}; + +tree.Rule.prototype.eval = function (context) { + return new(tree.Rule)(this.name, + this.value.eval(context), + this.important, + this.index, this.inline); +}; + +tree.Shorthand = function (a, b) { + this.a = a; + this.b = b; +}; + +tree.Shorthand.prototype = { + toCSS: function (env) { + return this.a.toCSS(env) + "/" + this.b.toCSS(env); + }, + eval: function () { return this } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/ruleset.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/ruleset.js new file mode 100644 index 00000000..7d6283ea --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/ruleset.js @@ -0,0 +1,216 @@ +(function (tree) { + +tree.Ruleset = function (selectors, rules, strictImports) { + this.selectors = selectors; + this.rules = rules; + this._lookups = {}; + this.strictImports = strictImports; +}; +tree.Ruleset.prototype = { + eval: function (env) { + var selectors = this.selectors && this.selectors.map(function (s) { return s.eval(env) }); + var ruleset = new(tree.Ruleset)(selectors, this.rules.slice(0), this.strictImports); + + ruleset.root = this.root; + ruleset.allowImports = this.allowImports; + + // push the current ruleset to the frames stack + env.frames.unshift(ruleset); + + // Evaluate imports + if (ruleset.root || ruleset.allowImports || !ruleset.strictImports) { + for (var i = 0; i < ruleset.rules.length; i++) { + if (ruleset.rules[i] instanceof tree.Import) { + Array.prototype.splice + .apply(ruleset.rules, [i, 1].concat(ruleset.rules[i].eval(env))); + } + } + } + + // Store the frames around mixin definitions, + // so they can be evaluated like closures when the time comes. + for (var i = 0; i < ruleset.rules.length; i++) { + if (ruleset.rules[i] instanceof tree.mixin.Definition) { + ruleset.rules[i].frames = env.frames.slice(0); + } + } + + // Evaluate mixin calls. + for (var i = 0; i < ruleset.rules.length; i++) { + if (ruleset.rules[i] instanceof tree.mixin.Call) { + Array.prototype.splice + .apply(ruleset.rules, [i, 1].concat(ruleset.rules[i].eval(env))); + } + } + + // Evaluate everything else + for (var i = 0, rule; i < ruleset.rules.length; i++) { + rule = ruleset.rules[i]; + + if (! (rule instanceof tree.mixin.Definition)) { + ruleset.rules[i] = rule.eval ? rule.eval(env) : rule; + } + } + + // Pop the stack + env.frames.shift(); + + return ruleset; + }, + match: function (args) { + return !args || args.length === 0; + }, + variables: function () { + if (this._variables) { return this._variables } + else { + return this._variables = this.rules.reduce(function (hash, r) { + if (r instanceof tree.Rule && r.variable === true) { + hash[r.name] = r; + } + return hash; + }, {}); + } + }, + variable: function (name) { + return this.variables()[name]; + }, + rulesets: function () { + if (this._rulesets) { return this._rulesets } + else { + return this._rulesets = this.rules.filter(function (r) { + return (r instanceof tree.Ruleset) || (r instanceof tree.mixin.Definition); + }); + } + }, + find: function (selector, self) { + self = self || this; + var rules = [], rule, match, + key = selector.toCSS(); + + if (key in this._lookups) { return this._lookups[key] } + + this.rulesets().forEach(function (rule) { + if (rule !== self) { + for (var j = 0; j < rule.selectors.length; j++) { + if (match = selector.match(rule.selectors[j])) { + if (selector.elements.length > rule.selectors[j].elements.length) { + Array.prototype.push.apply(rules, rule.find( + new(tree.Selector)(selector.elements.slice(1)), self)); + } else { + rules.push(rule); + } + break; + } + } + } + }); + return this._lookups[key] = rules; + }, + // + // Entry point for code generation + // + // `context` holds an array of arrays. + // + toCSS: function (context, env) { + var css = [], // The CSS output + rules = [], // node.Rule instances + rulesets = [], // node.Ruleset instances + paths = [], // Current selectors + selector, // The fully rendered selector + rule; + + if (! this.root) { + if (context.length === 0) { + paths = this.selectors.map(function (s) { return [s] }); + } else { + this.joinSelectors(paths, context, this.selectors); + } + } + + // Compile rules and rulesets + for (var i = 0; i < this.rules.length; i++) { + rule = this.rules[i]; + + if (rule.rules || (rule instanceof tree.Directive) || (rule instanceof tree.Media)) { + rulesets.push(rule.toCSS(paths, env)); + } else if (rule instanceof tree.Comment) { + if (!rule.silent) { + if (this.root) { + rulesets.push(rule.toCSS(env)); + } else { + rules.push(rule.toCSS(env)); + } + } + } else { + if (rule.toCSS && !rule.variable) { + rules.push(rule.toCSS(env)); + } else if (rule.value && !rule.variable) { + rules.push(rule.value.toString()); + } + } + } + + rulesets = rulesets.join(''); + + // If this is the root node, we don't render + // a selector, or {}. + // Otherwise, only output if this ruleset has rules. + if (this.root) { + css.push(rules.join(env.compress ? '' : '\n')); + } else { + if (rules.length > 0) { + selector = paths.map(function (p) { + return p.map(function (s) { + return s.toCSS(env); + }).join('').trim(); + }).join( env.compress ? ',' : ',\n'); + + css.push(selector, + (env.compress ? '{' : ' {\n ') + + rules.join(env.compress ? '' : '\n ') + + (env.compress ? '}' : '\n}\n')); + } + } + css.push(rulesets); + + return css.join('') + (env.compress ? '\n' : ''); + }, + + joinSelectors: function (paths, context, selectors) { + for (var s = 0; s < selectors.length; s++) { + this.joinSelector(paths, context, selectors[s]); + } + }, + + joinSelector: function (paths, context, selector) { + var before = [], after = [], beforeElements = [], + afterElements = [], hasParentSelector = false, el; + + for (var i = 0; i < selector.elements.length; i++) { + el = selector.elements[i]; + if (el.combinator.value.charAt(0) === '&') { + hasParentSelector = true; + } + if (hasParentSelector) afterElements.push(el); + else beforeElements.push(el); + } + + if (! hasParentSelector) { + afterElements = beforeElements; + beforeElements = []; + } + + if (beforeElements.length > 0) { + before.push(new(tree.Selector)(beforeElements)); + } + + if (afterElements.length > 0) { + after.push(new(tree.Selector)(afterElements)); + } + + for (var c = 0; c < context.length; c++) { + paths.push(before.concat(context[c]).concat(after)); + } + } +}; +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/selector.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/selector.js new file mode 100644 index 00000000..65abbb69 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/selector.js @@ -0,0 +1,42 @@ +(function (tree) { + +tree.Selector = function (elements) { + this.elements = elements; + if (this.elements[0].combinator.value === "") { + this.elements[0].combinator.value = ' '; + } +}; +tree.Selector.prototype.match = function (other) { + var len = this.elements.length, + olen = other.elements.length, + max = Math.min(len, olen); + + if (len < olen) { + return false; + } else { + for (var i = 0; i < max; i++) { + if (this.elements[i].value !== other.elements[i].value) { + return false; + } + } + } + return true; +}; +tree.Selector.prototype.eval = function (env) { + return new(tree.Selector)(this.elements.map(function (e) { + return e.eval(env); + })); +}; +tree.Selector.prototype.toCSS = function (env) { + if (this._css) { return this._css } + + return this._css = this.elements.map(function (e) { + if (typeof(e) === 'string') { + return ' ' + e.trim(); + } else { + return e.toCSS(env); + } + }).join(''); +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/url.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/url.js new file mode 100644 index 00000000..0caec345 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/url.js @@ -0,0 +1,25 @@ +(function (tree) { + +tree.URL = function (val, paths) { + if (val.data) { + this.attrs = val; + } else { + // Add the base path if the URL is relative and we are in the browser + if (typeof(window) !== 'undefined' && !/^(?:https?:\/\/|file:\/\/|data:|\/)/.test(val.value) && paths.length > 0) { + val.value = paths[0] + (val.value.charAt(0) === '/' ? val.value.slice(1) : val.value); + } + this.value = val; + this.paths = paths; + } +}; +tree.URL.prototype = { + toCSS: function () { + return "url(" + (this.attrs ? 'data:' + this.attrs.mime + this.attrs.charset + this.attrs.base64 + this.attrs.data + : this.value.toCSS()) + ")"; + }, + eval: function (ctx) { + return this.attrs ? this : new(tree.URL)(this.value.eval(ctx), this.paths); + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/value.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/value.js new file mode 100644 index 00000000..3c1eb29a --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/value.js @@ -0,0 +1,24 @@ +(function (tree) { + +tree.Value = function (value) { + this.value = value; + this.is = 'value'; +}; +tree.Value.prototype = { + eval: function (env) { + if (this.value.length === 1) { + return this.value[0].eval(env); + } else { + return new(tree.Value)(this.value.map(function (v) { + return v.eval(env); + })); + } + }, + toCSS: function (env) { + return this.value.map(function (e) { + return e.toCSS(env); + }).join(env.compress ? ',' : ', '); + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/variable.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/variable.js new file mode 100644 index 00000000..ee557e1d --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/variable.js @@ -0,0 +1,26 @@ +(function (tree) { + +tree.Variable = function (name, index, file) { this.name = name, this.index = index, this.file = file }; +tree.Variable.prototype = { + eval: function (env) { + var variable, v, name = this.name; + + if (name.indexOf('@@') == 0) { + name = '@' + new(tree.Variable)(name.slice(1)).eval(env).value; + } + + if (variable = tree.find(env.frames, function (frame) { + if (v = frame.variable(name)) { + return v.value.eval(env); + } + })) { return variable } + else { + throw { type: 'Name', + message: "variable " + name + " is undefined", + filename: this.file, + index: this.index }; + } + } +}; + +})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/package.json b/askbot/skins/default/media/style/node_modules/less/package.json new file mode 100644 index 00000000..c35300b1 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/package.json @@ -0,0 +1,36 @@ +{ + "name": "less", + "description": "Leaner CSS", + "url": "http://lesscss.org", + "keywords": [ + "css", + "parser", + "lesscss", + "browser" + ], + "author": { + "name": "Alexis Sellier", + "email": "self@cloudhead.net" + }, + "contributors": [], + "version": "1.3.0", + "bin": { + "lessc": "./bin/lessc" + }, + "main": "./lib/less/index", + "directories": { + "test": "./test" + }, + "engines": { + "node": ">=0.4.0" + }, + "_id": "less@1.3.0", + "dependencies": {}, + "devDependencies": {}, + "optionalDependencies": {}, + "_engineSupported": true, + "_npmVersion": "1.1.18", + "_nodeVersion": "v0.7.9-pre", + "_defaultsLoaded": true, + "_from": "less" +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/colors.css b/askbot/skins/default/media/style/node_modules/less/test/css/colors.css new file mode 100644 index 00000000..b4516425 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/colors.css @@ -0,0 +1,58 @@ +#yelow #short { + color: #fea; +} +#yelow #long { + color: #ffeeaa; +} +#yelow #rgba { + color: rgba(255, 238, 170, 0.1); +} +#yelow #argb { + color: #1affeeaa; +} +#blue #short { + color: #00f; +} +#blue #long { + color: #0000ff; +} +#blue #rgba { + color: rgba(0, 0, 255, 0.1); +} +#blue #argb { + color: #1a0000ff; +} +#alpha #hsla { + color: rgba(61, 45, 41, 0.6); +} +#overflow .a { + color: #000000; +} +#overflow .b { + color: #ffffff; +} +#overflow .c { + color: #ffffff; +} +#overflow .d { + color: #00ff00; +} +#grey { + color: #c8c8c8; +} +#808080 { + color: #808080; +} +#00ff00 { + color: #00ff00; +} +.lightenblue { + color: #3333ff; +} +.darkenblue { + color: #0000cc; +} +.unknowncolors { + color: blue2; + border: 2px solid superred; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/comments.css b/askbot/skins/default/media/style/node_modules/less/test/css/comments.css new file mode 100644 index 00000000..352dd48e --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/comments.css @@ -0,0 +1,56 @@ +/******************\ +* * +* Comment Header * +* * +\******************/ +/* + + Comment + +*/ +/* + * Comment Test + * + * - cloudhead (http://cloudhead.net) + * + */ +/* Colors + * ------ + * #EDF8FC (background blue) + * #166C89 (darkest blue) + * + * Text: + * #333 (standard text) // A comment within a comment! + * #1F9EC9 (standard link) + * + */ +/* @group Variables +------------------- */ +#comments { + /**/ + color: red; + /* A C-style comment */ + + background-color: orange; + font-size: 12px; + /* lost comment */ + content: "content"; + border: 1px solid black; + padding: 0; + margin: 2em; +} +/* commented out + #more-comments { + color: grey; + } +*/ +.selector, +.lots, +.comments { + color: #808080, /* blue */ #ffa500; + -webkit-border-radius: 2px /* webkit only */; + -moz-border-radius: 8px /* moz only with operation */; +} +#last { + color: #0000ff; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/css-3.css b/askbot/skins/default/media/style/node_modules/less/test/css/css-3.css new file mode 100644 index 00000000..45bdc40d --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/css-3.css @@ -0,0 +1,58 @@ +.comma-delimited { + background: url(bg.jpg) no-repeat, url(bg.png) repeat-x top left, url(bg); + text-shadow: -1px -1px 1px #ff0000, 6px 5px 5px #ffff00; + -moz-box-shadow: 0pt 0pt 2px rgba(255, 255, 255, 0.4) inset, 0pt 4px 6px rgba(255, 255, 255, 0.4) inset; +} +@font-face { + font-family: Headline; + src: local(Futura-Medium), url(fonts.svg#MyGeometricModern) format("svg"); +} +.other { + -moz-transform: translate(0, 11em) rotate(-90deg); +} +p:not([class*="lead"]) { + color: black; +} +input[type="text"].class#id[attr=32]:not(1) { + color: white; +} +div#id.class[a=1][b=2].class:not(1) { + color: white; +} +ul.comma > li:not(:only-child)::after { + color: white; +} +ol.comma > li:nth-last-child(2)::after { + color: white; +} +li:nth-child(4n+1), +li:nth-child(-5n), +li:nth-child(-n+2) { + color: white; +} +a[href^="http://"] { + color: black; +} +a[href$="http://"] { + color: black; +} +form[data-disabled] { + color: black; +} +p::before { + color: black; +} +#issue322 { + -webkit-animation: anim2 7s infinite ease-in-out; +} +@-webkit-keyframes frames { + 0% { + border: 1px; + } + 5.5% { + border: 2px; + } + 100% { + border: 3px; + } +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/css-escapes.css b/askbot/skins/default/media/style/node_modules/less/test/css/css-escapes.css new file mode 100644 index 00000000..278d5576 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/css-escapes.css @@ -0,0 +1,20 @@ +.escape\|random\|char { + color: red; +} +.mixin\!tUp { + font-weight: bold; +} +.\34 04 { + background: red; +} +.\34 04 strong { + color: #ff00ff; + font-weight: bold; +} +.trailingTest\+ { + color: red; +} +/* This hideous test of hideousness checks for the selector "blockquote" with various permutations of hex escapes */ +\62\6c\6f \63 \6B \0071 \000075o\74 e { + color: silver; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/css.css b/askbot/skins/default/media/style/node_modules/less/test/css/css.css new file mode 100644 index 00000000..63d20ec4 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/css.css @@ -0,0 +1,89 @@ +@charset "utf-8"; +div { + color: black; +} +div { + width: 99%; +} +* { + min-width: 45em; +} +h1, +h2 > a > p, +h3 { + color: none; +} +div.class { + color: blue; +} +div#id { + color: green; +} +.class#id { + color: purple; +} +.one.two.three { + color: grey; +} +@media print { + font-size: 3em; +} +@media screen { + font-size: 10px; +} +@font-face { + font-family: 'Garamond Pro'; + src: url("/fonts/garamond-pro.ttf"); +} +a:hover, +a:link { + color: #999; +} +p, +p:first-child { + text-transform: none; +} +q:lang(no) { + quotes: none; +} +p + h1 { + font-size: 2.2em; +} +#shorthands { + border: 1px solid #000; + font: 12px/16px Arial; + font: 100%/16px Arial; + margin: 1px 0; + padding: 0 auto; + background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px; +} +#more-shorthands { + margin: 0; + padding: 1px 0 2px 0; + font: normal small/20px 'Trebuchet MS', Verdana, sans-serif; +} +.misc { + -moz-border-radius: 2px; + display: -moz-inline-stack; + width: .1em; + background-color: #009998; + background-image: url(images/image.jpg); + background: -webkit-gradient(linear, left top, left bottom, from(#ff0000), to(#0000ff)); + margin: ; + filter: alpha(opacity=100); +} +#important { + color: red !important; + width: 100%!important; + height: 20px ! important; +} +#data-uri { + background: url(data:image/png;charset=utf-8;base64, + kiVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD/ + k//+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4U + kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC); + background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==); +} +#svg-data-uri { + background: transparent url('data:image/svg+xml, '); +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/functions.css b/askbot/skins/default/media/style/node_modules/less/test/css/functions.css new file mode 100644 index 00000000..82328145 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/functions.css @@ -0,0 +1,43 @@ +#functions { + color: #660000; + width: 16; + height: undefined("self"); + border-width: 5; + variable: 11; +} +#built-in { + escaped: -Some::weird(#thing, y); + lighten: #ffcccc; + darken: #330000; + saturate: #203c31; + desaturate: #29332f; + greyscale: #2e2e2e; + spin-p: #bf6a40; + spin-n: #bf4055; + format: "rgb(32, 128, 64)"; + format-string: "hello world"; + format-multiple: "hello earth 2"; + format-url-encode: "red is %23ff0000"; + eformat: rgb(32, 128, 64); + hue: 98; + saturation: 12%; + lightness: 95%; + rounded: 11; + roundedpx: 3px; + percentage: 20%; + color: #ff0011; +} +#built-in .is-a { + color: true; + color: true; + color: true; + keyword: true; + number: true; + string: true; + pixel: true; + percent: true; + em: true; +} +#alpha { + alpha: rgba(153, 94, 51, 0.6); +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/ie-filters.css b/askbot/skins/default/media/style/node_modules/less/test/css/ie-filters.css new file mode 100644 index 00000000..933318ab --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/ie-filters.css @@ -0,0 +1,5 @@ +.nav { + filter: progid:dximagetransform.microsoft.alpha(opacity=20); + filter: progid:dximagetransform.microsoft.alpha(opacity=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr="#333333", endColorstr="#000000", GradientType=0); +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/import.css b/askbot/skins/default/media/style/node_modules/less/test/css/import.css new file mode 100644 index 00000000..89dc162c --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/import.css @@ -0,0 +1,23 @@ +@import "import-test-d.css"; + +@import url(http://fonts.googleapis.com/css?family=Open+Sans); + +@import url(something.css) screen and (color) and (max-width: 600px); +#import { + color: #ff0000; +} +.mixin { + height: 10px; + color: #ff0000; +} +#import-test { + height: 10px; + color: #ff0000; + width: 10px; + height: 30%; +} +@media screen and (max-width: 600px) { + body { + width: 100%; + } +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/javascript.css b/askbot/skins/default/media/style/node_modules/less/test/css/javascript.css new file mode 100644 index 00000000..5a3f8223 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/javascript.css @@ -0,0 +1,22 @@ +.eval { + js: 42; + js: 2; + js: "hello world"; + js: 1, 2, 3; + title: "node"; + ternary: true; +} +.scope { + var: 42; + escaped: 7px; +} +.vars { + width: 8; +} +.escape-interpol { + width: hello world; +} +.arrays { + ary: "1, 2, 3"; + ary: "1, 2, 3"; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/lazy-eval.css b/askbot/skins/default/media/style/node_modules/less/test/css/lazy-eval.css new file mode 100644 index 00000000..1adfb8f3 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/lazy-eval.css @@ -0,0 +1,3 @@ +.lazy-eval { + width: 100%; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/media.css b/askbot/skins/default/media/style/node_modules/less/test/css/media.css new file mode 100644 index 00000000..61d169df --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/media.css @@ -0,0 +1,79 @@ +@media print { + .class { + color: blue; + } + .class .sub { + width: 42; + } + .top, + header > h1 { + color: #444444; + } +} +@media screen { + body { + max-width: 480; + } +} +@media all and (orientation: portrait) { + aside { + float: none; + } +} +@media handheld and (min-width: 42), screen and (min-width: 20em) { + body { + max-width: 480px; + } +} +@media print { + body { + padding: 20px; + } + body header { + background-color: red; + } +} +@media print and (orientation: landscape) { + body { + margin-left: 20px; + } +} +@media a, b and c { + body { + width: 95%; + } +} +@media a and x, b and c and x, a and y, b and c and y { + body { + width: 100%; + } +} +.a { + background: black; +} +@media handheld { + .a { + background: white; + } +} +@media handheld and (max-width: 100px) { + .a { + background: red; + } +} +.b { + background: black; +} +@media handheld { + .b { + background: white; + } +} +@media handheld and (max-width: 200px) { + .b { + background: red; + } +} +@media only screen and (max-width: 200px) { + width: 480px; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-args.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-args.css new file mode 100644 index 00000000..8e544ba0 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-args.css @@ -0,0 +1,76 @@ +#hidden { + color: transparent; + color: transparent; +} +.two-args { + color: blue; + width: 10px; + height: 99%; + border: 2px dotted #000000; +} +.one-arg { + width: 15px; + height: 49%; +} +.no-parens { + width: 5px; + height: 49%; +} +.no-args { + width: 5px; + height: 49%; +} +.var-args { + width: 45; + height: 17%; +} +.multi-mix { + width: 10px; + height: 29%; + margin: 4; + padding: 5; +} +body { + padding: 30px; + color: #ff0000; +} +.scope-mix { + width: 8; +} +.content { + width: 600px; +} +.content .column { + margin: 600px; +} +#same-var-name { + radius: 5px; +} +#var-inside { + width: 10px; +} +.id-class { + color: red; + color: red; +} +.arguments { + border: 1px solid #000000; + width: 1px; +} +.arguments2 { + border: 0px; + width: 0px; +} +.arguments3 { + border: 0px; + width: 0px; +} +.arguments4 { + border: 0 1 2 3 4; + rest: 1 2 3 4; + width: 0; +} +.edge-case { + border: "{"; + width: "{"; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-closure.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-closure.css new file mode 100644 index 00000000..b1021b6f --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-closure.css @@ -0,0 +1,9 @@ +.class { + width: 99px; +} +.overwrite { + width: 99px; +} +.nested .class { + width: 5px; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-guards.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-guards.css new file mode 100644 index 00000000..0c563e52 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-guards.css @@ -0,0 +1,58 @@ +.light1 { + color: white; + margin: 1px; +} +.light2 { + color: black; + margin: 1px; +} +.max1 { + width: 6; +} +.max2 { + width: 8; +} +.glob1 { + margin: auto auto; +} +.ops1 { + height: gt-or-eq; + height: lt-or-eq; +} +.ops2 { + height: gt-or-eq; + height: not-eq; +} +.ops3 { + height: lt-or-eq; + height: not-eq; +} +.default1 { + content: default; +} +.test1 { + content: "true."; +} +.test2 { + content: "false."; +} +.test3 { + content: "false."; +} +.test4 { + content: "false."; +} +.test5 { + content: "false."; +} +.bool1 { + content: true and true; + content: true; + content: false, true; + content: false and true and true, true; + content: false, true and true; + content: false, false, true; + content: false, true and true and true, false; + content: not false; + content: not false and false, not false; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-important.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-important.css new file mode 100644 index 00000000..2f74c647 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-important.css @@ -0,0 +1,17 @@ +.class { + border: 1; + boxer: 1; + border: 2 !important; + boxer: 2 !important; + border: 3; + boxer: 3; + border: 4 !important; + boxer: 4 !important; + border: 5; + boxer: 5; + border: 0 !important; + boxer: 0 !important; + border: 9 !important; + border: 9; + boxer: 9; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-nested.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-nested.css new file mode 100644 index 00000000..6378c475 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-nested.css @@ -0,0 +1,14 @@ +.class .inner { + height: 300; +} +.class .inner .innest { + width: 30; + border-width: 60; +} +.class2 .inner { + height: 600; +} +.class2 .inner .innest { + width: 60; + border-width: 120; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-pattern.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-pattern.css new file mode 100644 index 00000000..8b828335 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-pattern.css @@ -0,0 +1,47 @@ +.zero { + variadic: true; + zero: 0; + one: 1; + two: 2; + three: 3; +} +.one { + variadic: true; + one: 1; + one-req: 1; + two: 2; + three: 3; +} +.two { + variadic: true; + two: 2; + three: 3; +} +.three { + variadic: true; + three-req: 3; + three: 3; +} +.left { + left: 1; +} +.right { + right: 1; +} +.border-right { + color: black; + border-right: 4px; +} +.border-left { + color: black; + border-left: 4px; +} +.only-right { + right: 33; +} +.only-left { + left: 33; +} +.left-right { + both: 330; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins.css new file mode 100644 index 00000000..45d51793 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/mixins.css @@ -0,0 +1,71 @@ +.mixin { + border: 1px solid black; +} +.mixout { + border-color: orange; +} +.borders { + border-style: dashed; +} +#namespace .borders { + border-style: dotted; +} +#namespace .biohazard { + content: "death"; +} +#namespace .biohazard .man { + color: transparent; +} +#theme > .mixin { + background-color: grey; +} +#container { + color: black; + border: 1px solid black; + border-color: orange; + background-color: grey; +} +#header .milk { + color: white; + border: 1px solid black; + background-color: grey; +} +#header #cookie { + border-style: dashed; +} +#header #cookie .chips { + border-style: dotted; +} +#header #cookie .chips .calories { + color: black; + border: 1px solid black; + border-color: orange; + background-color: grey; +} +.secure-zone { + color: transparent; +} +.direct { + border-style: dotted; +} +.bo, +.bar { + width: 100%; +} +.bo { + border: 1px; +} +.ar.bo.ca { + color: black; +} +.jo.ki { + background: none; +} +.extended { + width: 100%; + border: 1px; + background: none; +} +.foo .bar { + width: 100%; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/operations.css b/askbot/skins/default/media/style/node_modules/less/test/css/operations.css new file mode 100644 index 00000000..fb9e0aff --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/operations.css @@ -0,0 +1,49 @@ +#operations { + color: #111111; + height: 9px; + width: 3em; + substraction: 0; + division: 1; +} +#operations .spacing { + height: 9px; + width: 3em; +} +.with-variables { + height: 16em; + width: 24em; + size: 1cm; +} +.with-functions { + color: #646464; + color: #ff8080; + color: #c94a4a; +} +.negative { + height: 0px; + width: 4px; +} +.shorthands { + padding: -1px 2px 0 -4px; +} +.rem-dimensions { + font-size: 5.5rem; +} +.colors { + color: #123; + border-color: #334455; + background-color: #000000; +} +.colors .other { + color: #222222; + border-color: #222222; +} +.negations { + variable: -4px; + variable1: 0px; + variable2: 0px; + variable3: 8px; + variable4: 0px; + paren: -4px; + paren2: 16px; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/parens.css b/askbot/skins/default/media/style/node_modules/less/test/css/parens.css new file mode 100644 index 00000000..36487fe5 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/parens.css @@ -0,0 +1,20 @@ +.parens { + border: 2px solid #000000; + margin: 1px 3px 16 3; + width: 36; + padding: 2px 36px; +} +.more-parens { + padding: 8 4 4 4px; + width: 96; + height: 113; + margin: 12; +} +.nested-parens { + width: 71; + height: 6; +} +.mixed-units { + margin: 2px 4em 1 5pc; + padding: 6px 1em 2px 2; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/rulesets.css b/askbot/skins/default/media/style/node_modules/less/test/css/rulesets.css new file mode 100644 index 00000000..408c76aa --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/rulesets.css @@ -0,0 +1,33 @@ +#first > .one { + font-size: 2em; +} +#first > .one > #second .two > #deux { + width: 50%; +} +#first > .one > #second .two > #deux #third { + height: 100%; +} +#first > .one > #second .two > #deux #third:focus { + color: black; +} +#first > .one > #second .two > #deux #third:focus #fifth > #sixth .seventh #eighth + #ninth { + color: purple; +} +#first > .one > #second .two > #deux #fourth, +#first > .one > #second .two > #deux #five, +#first > .one > #second .two > #deux #six { + color: #110000; +} +#first > .one > #second .two > #deux #fourth .seven, +#first > .one > #second .two > #deux #five .seven, +#first > .one > #second .two > #deux #six .seven, +#first > .one > #second .two > #deux #fourth .eight > #nine, +#first > .one > #second .two > #deux #five .eight > #nine, +#first > .one > #second .two > #deux #six .eight > #nine { + border: 1px solid black; +} +#first > .one > #second .two > #deux #fourth #ten, +#first > .one > #second .two > #deux #five #ten, +#first > .one > #second .two > #deux #six #ten { + color: red; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/scope.css b/askbot/skins/default/media/style/node_modules/less/test/css/scope.css new file mode 100644 index 00000000..11feda89 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/scope.css @@ -0,0 +1,15 @@ +.tiny-scope { + color: #998899; +} +.scope1 { + color: #0000ff; + border-color: #000000; +} +.scope1 .scope2 { + color: #0000ff; +} +.scope1 .scope2 .scope3 { + color: #ff0000; + border-color: #000000; + background-color: #ffffff; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/selectors.css b/askbot/skins/default/media/style/node_modules/less/test/css/selectors.css new file mode 100644 index 00000000..6f69a8c9 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/selectors.css @@ -0,0 +1,69 @@ +h1 a:hover, +h2 a:hover, +h3 a:hover, +h1 p:hover, +h2 p:hover, +h3 p:hover { + color: red; +} +#all { + color: blue; +} +#the { + color: blue; +} +#same { + color: blue; +} +ul, +li, +div, +q, +blockquote, +textarea { + margin: 0; +} +td { + margin: 0; + padding: 0; +} +td, +input { + line-height: 1em; +} +a { + color: red; +} +a:hover { + color: blue; +} +div a { + color: green; +} +p a span { + color: yellow; +} +.foo .bar .qux, +.foo .baz .qux { + display: block; +} +.qux .foo .bar, +.qux .foo .baz { + display: inline; +} +.qux .foo .bar .biz, +.qux .foo .baz .biz { + display: none; +} +.other ::fnord { + color: #ff0000; +} +.other::fnord { + color: #ff0000; +} +.other ::bnord { + color: #ff0000; +} +.other::bnord { + color: #ff0000; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/strings.css b/askbot/skins/default/media/style/node_modules/less/test/css/strings.css new file mode 100644 index 00000000..80e115c0 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/strings.css @@ -0,0 +1,40 @@ +#strings { + background-image: url("http://son-of-a-banana.com"); + quotes: "~" "~"; + content: "#*%:&^,)!.(~*})"; + empty: ""; + brackets: "{" "}"; + escapes: "\"hello\" \\world"; + escapes2: "\"llo"; +} +#comments { + content: "/* hello */ // not-so-secret"; +} +#single-quote { + quotes: "'" "'"; + content: '""#!&""'; + empty: ''; + semi-colon: ';'; +} +#escaped { + filter: DX.Transform.MS.BS.filter(opacity=50); +} +#one-line { + image: url(http://tooks.com); +} +#crazy { + image: url(http://), "}", url("http://}"); +} +#interpolation { + url: "http://lesscss.org/dev/image.jpg"; + url2: "http://lesscss.org/image-256.jpg"; + url3: "http://lesscss.org#445566"; + url4: "http://lesscss.org/hello"; + url5: "http://lesscss.org/54.4"; +} +.mix-mul-class { + color: #0000ff; + color: #ff0000; + color: #0000ff; + color: #ffa500; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/variables.css b/askbot/skins/default/media/style/node_modules/less/test/css/variables.css new file mode 100644 index 00000000..961fe695 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/variables.css @@ -0,0 +1,27 @@ +.variables { + width: 14cm; +} +.variables { + height: 24px; + color: #888888; + font-family: "Trebuchet MS", Verdana, sans-serif; + quotes: "~" "~"; +} +.redefinition { + three: 3; +} +.values { + font-family: 'Trebuchet', 'Trebuchet', 'Trebuchet'; + color: #888888 !important; + url: url('Trebuchet'); + multi: something 'A', B, C, 'Trebuchet'; +} +.variable-names { + name: 'hello'; +} +.alpha { + filter: alpha(opacity=42); +} +a:nth-child(2) { + border: 1px; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/whitespace.css b/askbot/skins/default/media/style/node_modules/less/test/css/whitespace.css new file mode 100644 index 00000000..56e067fc --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/css/whitespace.css @@ -0,0 +1,38 @@ +.whitespace { + color: white; +} +.whitespace { + color: white; +} +.whitespace { + color: white; +} +.whitespace { + color: white; +} +.whitespace { + color: white ; +} +.white, +.space, +.mania { + color: white; +} +.no-semi-column { + color: #ffffff; +} +.no-semi-column { + color: white; + white-space: pre; +} +.no-semi-column { + border: 2px solid #ffffff; +} +.newlines { + background: the, + great, + wall; + border: 2px + solid + black; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/less-test.js b/askbot/skins/default/media/style/node_modules/less/test/less-test.js new file mode 100644 index 00000000..46412e01 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/less-test.js @@ -0,0 +1,73 @@ +var path = require('path'), + fs = require('fs'), + sys = require('util'); + +var less = require('../lib/less'); + +less.tree.functions.add = function (a, b) { + return new(less.tree.Dimension)(a.value + b.value); +} +less.tree.functions.increment = function (a) { + return new(less.tree.Dimension)(a.value + 1); +} +less.tree.functions._color = function (str) { + if (str.value === "evil red") { return new(less.tree.Color)("600") } +} + +sys.puts("\n" + stylize("LESS", 'underline') + "\n"); + +fs.readdirSync('test/less').forEach(function (file) { + if (! /\.less/.test(file)) { return } + + toCSS('test/less/' + file, function (err, less) { + var name = path.basename(file, '.less'); + + fs.readFile(path.join('test/css', name) + '.css', 'utf-8', function (e, css) { + sys.print("- " + name + ": ") + if (less === css) { sys.print(stylize('OK', 'green')) } + else if (err) { + sys.print(stylize("ERROR: " + (err && err.message), 'red')); + } else { + sys.print(stylize("FAIL", 'yellow')); + } + sys.puts(""); + }); + }); +}); + +function toCSS(path, callback) { + var tree, css; + fs.readFile(path, 'utf-8', function (e, str) { + if (e) { return callback(e) } + + new(less.Parser)({ + paths: [require('path').dirname(path)], + optimization: 0 + }).parse(str, function (err, tree) { + if (err) { + callback(err); + } else { + try { + css = tree.toCSS(); + callback(null, css); + } catch (e) { + callback(e); + } + } + }); + }); +} + +// Stylize a string +function stylize(str, style) { + var styles = { + 'bold' : [1, 22], + 'inverse' : [7, 27], + 'underline' : [4, 24], + 'yellow' : [33, 39], + 'green' : [32, 39], + 'red' : [31, 39] + }; + return '\033[' + styles[style][0] + 'm' + str + + '\033[' + styles[style][1] + 'm'; +} diff --git a/askbot/skins/default/media/style/node_modules/less/test/less/import/import-test-d.css b/askbot/skins/default/media/style/node_modules/less/test/less/import/import-test-d.css new file mode 100644 index 00000000..30575f01 --- /dev/null +++ b/askbot/skins/default/media/style/node_modules/less/test/less/import/import-test-d.css @@ -0,0 +1 @@ +#css { color: yellow; } diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index 73664c57..8d3f7769 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -148,7 +148,7 @@ a:hover { } h1 { font-size: 24px; - padding: 10px 0 5px 0px; + padding: 0px 0 5px 0px; } /* ----- Extra space above for messages ----- */ body.user-messages { @@ -179,7 +179,7 @@ body.user-messages { text-align: center; background-color: #f5dd69; border-top: #fff 1px solid; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .notify p.notification { margin-top: 6px; @@ -206,7 +206,7 @@ body.user-messages { #header { margin-top: 0px; background: #16160f; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .content-wrapper { /* wrapper positioning class */ @@ -295,6 +295,9 @@ body.user-messages { #metaNav #navUsers { background: -125px -5px url(../images/sprites.png) no-repeat; } +#metaNav #navGroups { + background: -125px -5px url(../images/sprites.png) no-repeat; +} #metaNav #navBadges { background: -210px -5px url(../images/sprites.png) no-repeat; } @@ -318,7 +321,7 @@ body.user-messages { border-bottom: #d3d3c2 1px solid; border-top: #fcfcfc 1px solid; margin-bottom: 10px; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } #secondaryHeader #homeButton { border-right: #afaf9e 1px solid; @@ -481,6 +484,8 @@ body.anon #searchBar .searchInputCancelable { } .box p { margin-bottom: 4px; + color: #707070; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .box p.info-box-follow-up-links { text-align: right; @@ -497,14 +502,14 @@ body.anon #searchBar .searchInputCancelable { color: #656565; padding-right: 10px; margin-bottom: 10px; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .box h3 { color: #4a757f; font-size: 18px; text-align: left; font-weight: normal; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; padding-left: 0px; } .box .contributorback { @@ -516,12 +521,13 @@ body.anon #searchBar .searchInputCancelable { display: block; float: right; text-align: left; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; width: 80px; margin-right: 18px; } -.box #displayTagFilterControl label { - /*Especial width just for the display tag filter box in index page*/ +.box #displayTagFilterControl label, +.box #emailTagFilterControl label { + /*Especial width just for the tag filter boxes in index page*/ width: 160px; } @@ -547,14 +553,21 @@ body.anon #searchBar .searchInputCancelable { font-size: 15px; } .box .inputs #interestingTagInput, -.box .inputs #ignoredTagInput { +.box .inputs #ignoredTagInput, +.box .inputs #subscribedTagInput, +.box .inputs #ab-tag-search { width: 153px; padding-left: 5px; border: #c9c9b5 1px solid; height: 25px; } +.box .inputs #ab-tag-search { + width: 135px; +} .box .inputs #interestingTagAdd, -.box .inputs #ignoredTagAdd { +.box .inputs #ignoredTagAdd, +.box .inputs #subscribedTagAdd, +.box .inputs #ab-tag-search-add { background: url(../images/small-button-blue.png) repeat-x top; border: 0; color: #4a757f; @@ -576,8 +589,13 @@ body.anon #searchBar .searchInputCancelable { -moz-box-shadow: 1px 1px 2px #808080; box-shadow: 1px 1px 2px #808080; } +.box .inputs #ab-tag-search-add { + width: 47px; + margin-left: 3px; +} .box .inputs #interestingTagAdd:hover, -.box .inputs #ignoredTagAdd:hover { +.box .inputs #ignoredTagAdd:hover, +.box .inputs #subscribedTag:hover { background: url(../images/small-button-blue.png) repeat-x bottom; } .box img.gravatar { @@ -590,7 +608,7 @@ body.anon #searchBar .searchInputCancelable { line-height: 34px; text-align: center; border: 0; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; color: #4a757f; font-weight: normal; font-size: 21px; @@ -638,6 +656,10 @@ body.anon #searchBar .searchInputCancelable { .box .notify-sidebar #question-subscribe-sidebar { margin: 7px 0 0 3px; } +.users-page .box label { + display: inline; + float: none; +} .statsWidget p { color: #707070; font-size: 16px; @@ -730,8 +752,7 @@ body.anon #searchBar .searchInputCancelable { .tabsC .label { float: left; color: #646464; - margin-top: 4px; - margin-right: 5px; + margin: 4px 5px 0px 8px; } .main-page .tabsA .label { margin-left: 8px; @@ -776,14 +797,14 @@ body.anon #searchBar .searchInputCancelable { float: left; margin-bottom: 8px; padding-top: 6px; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } #listSearchTags { float: left; margin-top: 3px; color: #707070; font-size: 16px; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } ul#searchTags { margin-left: 10px; @@ -797,7 +818,7 @@ ul#searchTags { margin: 5px 0 10px 0; padding: 0px; float: left; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .search-tips a { text-decoration: underline; @@ -811,6 +832,9 @@ ul#searchTags { padding: 0; width: 100%; } +.main-page #question-list { + margin-top: 10px; +} .short-summary { position: relative; filter: inherit; @@ -829,7 +853,7 @@ ul#searchTags { padding-left: 0; margin-bottom: 6px; display: block; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .short-summary a { color: #464646; @@ -840,7 +864,7 @@ ul#searchTags { font-family: Arial; padding-right: 4px; } -.short-summary .userinfo .relativetime, +.short-summary .userinfo .timeago, .short-summary span.anonymous { font-size: 11px; clear: both; @@ -854,12 +878,12 @@ ul#searchTags { .short-summary .counts { float: right; margin: 4px 0 0 5px; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .short-summary .counts .item-count { padding: 0px 5px 0px 5px; font-size: 25px; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .short-summary .counts .votes div, .short-summary .counts .views div, @@ -1173,7 +1197,7 @@ ul#related-tags li { /* ----- Ask and Edit Question Form template----- */ .section-title { color: #7ea9b3; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; font-weight: bold; font-size: 24px; } @@ -1199,7 +1223,7 @@ ul#related-tags li { margin: 0px; padding: 0px 0 0 5px; border: #cce6ec 3px solid; - width: 725px; + width: 719px; } .ask-page div#question-list, .edit-question-page div#question-list { @@ -1264,7 +1288,7 @@ ul#related-tags li { background: url(../images/medium-button.png) top repeat-x; height: 34px; border: 0; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; color: #4a757f; font-weight: normal; font-size: 21px; @@ -1288,27 +1312,44 @@ ul#related-tags li { -moz-text-shadow: 0px 1px 0px #c6d9dd; -webkit-text-shadow: 0px 1px 0px #c6d9dd; } +.wmd-container { + border: #cce6ec 3px solid; +} +.users-page .wmd-container { + width: 200px; +} +.ask-page .wmd-container, +.question-page .wmd-container, +.edit-question-page .wmd-container, +.edit-answer-page .wmd-container { + width: 723px; +} +.ask-page #editor, +.question-page #editor, +.edit-question-page #editor, +.edit-answer-page #editor { + width: 710px; + padding: 6px; +} #editor { - /*adjustment for editor preview*/ + /* adjustment for editor preview */ + display: block; font-size: 100%; min-height: 200px; line-height: 18px; margin: 0; - border-left: #cce6ec 3px solid; - border-bottom: #cce6ec 3px solid; - border-right: #cce6ec 3px solid; - border-top: 0; - padding: 10px; - margin-bottom: 10px; - width: 717px; + border: 0; +} +.users-page #editor { + width: 192px; } #id_title { width: 100%; } .wmd-preview { - margin: 3px 0 5px 0; - padding: 6px; + margin: 0; + padding: 5px; background-color: #F5F5F5; min-height: 20px; overflow: auto; @@ -1320,6 +1361,9 @@ ul#related-tags li { line-height: 1.4; font-size: 14px; } +.wmd-preview p:last-child { + margin-bottom: 0; +} .wmd-preview pre { background-color: #E7F1F8; } @@ -1329,6 +1373,9 @@ ul#related-tags li { .wmd-preview IMG { max-width: 600px; } +.user-page .wmd-buttons { + width: 725px; +} .preview-toggle { width: 100%; color: #b6a475; @@ -1383,7 +1430,7 @@ ul#related-tags li { margin: 0px; padding: 0px 0 0 5px; border: #cce6ec 3px solid; - width: 725px; + width: 719px; margin-bottom: 10px; } .edit-question-page #id_summary, @@ -1403,7 +1450,7 @@ ul#related-tags li { /* ----- Question template ----- */ .question-page h1 { padding-top: 0px; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .question-page h1 a { color: #464646; @@ -1421,7 +1468,7 @@ ul#related-tags li { margin-left: 0px !important; } .question-page p.rss a { - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; vertical-align: top; } .question-page .question-content { @@ -1586,7 +1633,7 @@ ul#related-tags li { } .question-page #questionCount { float: left; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; line-height: 15px; } .question-page .question-img-upvote, @@ -1632,13 +1679,11 @@ ul#related-tags li { color: #7ea9b3; width: 200px; float: left; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .question-page .comments { font-size: 12px; clear: both; - /* A small hack to solve 1px problem on webkit browsers */ - } .question-page .comments div.controls { clear: both; @@ -1688,11 +1733,6 @@ ul#related-tags li { padding-top: 3px; border: #cce6ec 3px solid; } -@media screen and (-webkit-min-device-pixel-ratio: 0) { - .question-page .comments textarea { - padding-left: 3px !important; - } -} .question-page .comments input { margin-left: 10px; margin-top: 1px; @@ -1870,7 +1910,7 @@ ul#related-tags li { cursor: pointer; } .question-page .vote-number { - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; padding: 0px 0 5px 0; font-size: 25px; font-weight: bold; @@ -1948,7 +1988,7 @@ ul#related-tags li { margin-top: 10px; } .question-page #fmanswer h2 { - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; color: #7ea9b3; font-size: 24px; } @@ -1993,7 +2033,6 @@ ul#related-tags li { /* -----Content pages, Login, About, FAQ, Users----- */ .openid-signin, .meta, -.users-page, .user-profile-edit-page { font-size: 13px; line-height: 1.3; @@ -2001,7 +2040,6 @@ ul#related-tags li { } .openid-signin p, .meta p, -.users-page p, .user-profile-edit-page p { font-size: 13px; color: #707070; @@ -2012,7 +2050,6 @@ ul#related-tags li { } .openid-signin h2, .meta h2, -.users-page h2, .user-profile-edit-page h2 { color: #525252; padding-left: 0px; @@ -2115,6 +2152,9 @@ ul#related-tags li { .user-profile-page .cancel:hover { background: url(../images/small-button-cancel.png) repeat-x bottom !important; } +.openid-signin form { + margin-bottom: 5px; +} #email-input-fs, #local_login_buttons, #password-fs, @@ -2199,20 +2239,15 @@ ul#related-tags li { font-size: 120%; } /* People page */ -.tabBar-user { - width: 375px; -} +/*.users-page .tabBar{ + width:375px; +}*/ .user { - padding: 5px; + padding: 5px 10px 5px 0; line-height: 140%; width: 166px; - border: #eee 1px solid; + height: 32px; margin-bottom: 5px; - border-radius: 3px; - -ms-border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - -khtml-border-radius: 3px; } .user .user-micro-info { color: #525252; @@ -2280,7 +2315,7 @@ a:hover.medal { } .user-profile-page h2 { padding: 10px 0px 10px 0px; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } .user-details { font-size: 13px; @@ -2310,7 +2345,7 @@ a:hover.medal { margin-top: -2px; font-size: 15px; cursor: pointer; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; background: url(../images/small-button-blue.png) repeat-x top; border-radius: 4px; -ms-border-radius: 4px; @@ -2346,13 +2381,13 @@ a:hover.medal { display: none; } .count { - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; font-size: 200%; font-weight: 700; color: #777777; } .scoreNumber { - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; font-size: 35px; font-weight: 800; color: #777; @@ -2463,7 +2498,7 @@ a:hover.medal { color: #525252; } .revision h3 { - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; font-size: 21px; padding-left: 0px; } @@ -2570,7 +2605,7 @@ ins { padding: 6px 0 0 0; background: #16160f; font-size: 16px; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: 'Yanone Kaffeesatz', Arial, sans-serif; } #ground p { margin-bottom: 0; @@ -2714,7 +2749,7 @@ span.form-error { padding: 0px; margin: 0px; } -.relativetime { +.timeago { font-weight: bold; text-decoration: none; } @@ -2935,6 +2970,9 @@ button::-moz-focus-inner { -khtml-border-radius: 5px; -webkit-border-radius: 5px; } +.list-table { + border-spacing: 0; +} .list-table td { vertical-align: top; } @@ -3144,7 +3182,6 @@ img.flag { .main-page img.flag { vertical-align: text-bottom; } - /* Pretty printing styles. Used with prettify.js. */ a.edit { padding-left: 3px; @@ -3247,3 +3284,110 @@ body.anon.lang-es #searchBar .searchInput { body.anon.lang-es #searchBar .searchInputCancelable { width: 390px; } +/* user groups */ +#user-groups ul { + margin-bottom: 0px; +} +#user-groups .delete-icon { + float: none; + display: inline; + color: #525252; + padding: 0 3px 0 3px; + background: #ccc; + border-radius: 4px; + line-height: inherit; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-border-radius: 4px; +} +#user-groups .delete-icon:hover { + color: white; + background: #b32f2f; +} +.users-page .wmd-prompt-dialog { + background: #ccc; +} +.group-wiki .content > p:last-child { + margin-bottom: 5px; +} +.group-wiki .group-logo { + float: left; + margin: 0 5px 3px 0; +} +.group-wiki .follow-toggle.group-join-btn { + width: 150px; + margin: 4px auto 10px auto; + display: block; +} +.group-wiki .controls { + margin: 0 0 10px 0; +} +img.group-logo { + height: 60px; + /* important to align with the line spacing */ + +} +#groups-list { + margin-left: 0px; +} +#groups-list li { + display: inline; + list-style-type: none; + list-style-position: inside; + float: left; + text-align: center; +} +#groups-list .group-logo, +#groups-list .group-name { + display: block; +} +#reject-edit-modal input, +#reject-edit-modal textarea { + width: 514px; +} +input.tipped-input, +textarea.tipped-input { + padding-left: 5px; +} +.tipped-input.blank { + color: #707070; +} +.select-box { + margin: 0; +} +.select-box li { + list-style-type: none; + list-style-position: inside; + padding-left: 7px; + font-size: 14px; + line-height: 25px; +} +.select-box li.selected, +.select-box li.selected:hover { + background-color: #fcf8e3; + color: #c09853; +} +.select-box li:hover { + background-color: #cecece; + color: white; +} +/* fixes for bootstrap */ +.caret { + margin-bottom: 7px; +} +.btn-group { + text-align: left; +} +.btn-toolbar { + margin: 0; +} +.modal-footer { + text-align: left; +} +.modal p { + font-size: 14px; +} +.modal-body > textarea { + width: 515px; + margin-bottom: 0px; +} diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 2cad834e..0bb64475 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -589,7 +589,7 @@ def set_tag_filter_strategy(request): """ filter_type = request.POST['filter_type'] filter_value = int(request.POST['filter_value']) - assert(filter_type in 'display', 'email') + assert(filter_type in ('display', 'email')) if filter_type == 'display': assert(filter_value in dict(const.TAG_DISPLAY_FILTER_STRATEGY_CHOICES)) request.user.display_tag_filter_strategy = filter_value -- cgit v1.2.3-1-g7c22 From 2986c05f2f34e3878ecfce235c795f22bdf982ab Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 9 May 2012 22:09:30 -0400 Subject: removed mistakenly committed lessc --- .../default/media/style/node_modules/.bin/lessc | 1 - .../media/style/node_modules/less/.npmignore | 2 - .../media/style/node_modules/less/CHANGELOG | 26 - .../default/media/style/node_modules/less/LICENSE | 179 --- .../default/media/style/node_modules/less/Makefile | 75 -- .../media/style/node_modules/less/README.md | 20 - .../node_modules/less/benchmark/less-benchmark.js | 47 - .../media/style/node_modules/less/bin/lessc | 139 --- .../media/style/node_modules/less/index.html | 10 - .../style/node_modules/less/lib/less/browser.js | 380 ------ .../style/node_modules/less/lib/less/colors.js | 151 --- .../style/node_modules/less/lib/less/cssmin.js | 355 ------ .../style/node_modules/less/lib/less/functions.js | 228 ---- .../style/node_modules/less/lib/less/index.js | 148 --- .../style/node_modules/less/lib/less/parser.js | 1305 -------------------- .../style/node_modules/less/lib/less/rhino.js | 62 - .../media/style/node_modules/less/lib/less/tree.js | 17 - .../style/node_modules/less/lib/less/tree/alpha.js | 17 - .../node_modules/less/lib/less/tree/anonymous.js | 13 - .../node_modules/less/lib/less/tree/assignment.js | 17 - .../style/node_modules/less/lib/less/tree/call.js | 48 - .../style/node_modules/less/lib/less/tree/color.js | 101 -- .../node_modules/less/lib/less/tree/comment.js | 14 - .../node_modules/less/lib/less/tree/condition.js | 42 - .../node_modules/less/lib/less/tree/dimension.js | 49 - .../node_modules/less/lib/less/tree/directive.js | 35 - .../node_modules/less/lib/less/tree/element.js | 47 - .../node_modules/less/lib/less/tree/expression.js | 23 - .../node_modules/less/lib/less/tree/import.js | 79 -- .../node_modules/less/lib/less/tree/javascript.js | 51 - .../node_modules/less/lib/less/tree/keyword.js | 19 - .../style/node_modules/less/lib/less/tree/media.js | 114 -- .../style/node_modules/less/lib/less/tree/mixin.js | 135 -- .../node_modules/less/lib/less/tree/operation.js | 32 - .../style/node_modules/less/lib/less/tree/paren.js | 16 - .../node_modules/less/lib/less/tree/quoted.js | 29 - .../style/node_modules/less/lib/less/tree/rule.js | 42 - .../node_modules/less/lib/less/tree/ruleset.js | 216 ---- .../node_modules/less/lib/less/tree/selector.js | 42 - .../style/node_modules/less/lib/less/tree/url.js | 25 - .../style/node_modules/less/lib/less/tree/value.js | 24 - .../node_modules/less/lib/less/tree/variable.js | 26 - .../media/style/node_modules/less/package.json | 36 - .../style/node_modules/less/test/css/colors.css | 58 - .../style/node_modules/less/test/css/comments.css | 56 - .../style/node_modules/less/test/css/css-3.css | 58 - .../node_modules/less/test/css/css-escapes.css | 20 - .../media/style/node_modules/less/test/css/css.css | 89 -- .../style/node_modules/less/test/css/functions.css | 43 - .../node_modules/less/test/css/ie-filters.css | 5 - .../style/node_modules/less/test/css/import.css | 23 - .../node_modules/less/test/css/javascript.css | 22 - .../style/node_modules/less/test/css/lazy-eval.css | 3 - .../style/node_modules/less/test/css/media.css | 79 -- .../node_modules/less/test/css/mixins-args.css | 76 -- .../node_modules/less/test/css/mixins-closure.css | 9 - .../node_modules/less/test/css/mixins-guards.css | 58 - .../less/test/css/mixins-important.css | 17 - .../node_modules/less/test/css/mixins-nested.css | 14 - .../node_modules/less/test/css/mixins-pattern.css | 47 - .../style/node_modules/less/test/css/mixins.css | 71 -- .../node_modules/less/test/css/operations.css | 49 - .../style/node_modules/less/test/css/parens.css | 20 - .../style/node_modules/less/test/css/rulesets.css | 33 - .../style/node_modules/less/test/css/scope.css | 15 - .../style/node_modules/less/test/css/selectors.css | 69 -- .../style/node_modules/less/test/css/strings.css | 40 - .../style/node_modules/less/test/css/variables.css | 27 - .../node_modules/less/test/css/whitespace.css | 38 - .../style/node_modules/less/test/less-test.js | 73 -- .../less/test/less/import/import-test-d.css | 1 - 71 files changed, 5550 deletions(-) delete mode 120000 askbot/skins/default/media/style/node_modules/.bin/lessc delete mode 100644 askbot/skins/default/media/style/node_modules/less/.npmignore delete mode 100644 askbot/skins/default/media/style/node_modules/less/CHANGELOG delete mode 100644 askbot/skins/default/media/style/node_modules/less/LICENSE delete mode 100644 askbot/skins/default/media/style/node_modules/less/Makefile delete mode 100644 askbot/skins/default/media/style/node_modules/less/README.md delete mode 100644 askbot/skins/default/media/style/node_modules/less/benchmark/less-benchmark.js delete mode 100755 askbot/skins/default/media/style/node_modules/less/bin/lessc delete mode 100644 askbot/skins/default/media/style/node_modules/less/index.html delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/browser.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/colors.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/cssmin.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/functions.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/index.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/parser.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/rhino.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/alpha.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/anonymous.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/assignment.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/call.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/color.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/comment.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/condition.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/dimension.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/directive.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/element.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/expression.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/import.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/javascript.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/keyword.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/media.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/mixin.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/operation.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/paren.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/quoted.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/rule.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/ruleset.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/selector.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/url.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/value.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/lib/less/tree/variable.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/package.json delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/colors.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/comments.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/css-3.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/css-escapes.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/css.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/functions.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/ie-filters.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/import.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/javascript.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/lazy-eval.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/media.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-args.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-closure.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-guards.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-important.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-nested.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins-pattern.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/mixins.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/operations.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/parens.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/rulesets.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/scope.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/selectors.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/strings.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/variables.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/css/whitespace.css delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/less-test.js delete mode 100644 askbot/skins/default/media/style/node_modules/less/test/less/import/import-test-d.css diff --git a/askbot/skins/default/media/style/node_modules/.bin/lessc b/askbot/skins/default/media/style/node_modules/.bin/lessc deleted file mode 120000 index 87a5294c..00000000 --- a/askbot/skins/default/media/style/node_modules/.bin/lessc +++ /dev/null @@ -1 +0,0 @@ -../less/bin/lessc \ No newline at end of file diff --git a/askbot/skins/default/media/style/node_modules/less/.npmignore b/askbot/skins/default/media/style/node_modules/less/.npmignore deleted file mode 100644 index 320faecc..00000000 --- a/askbot/skins/default/media/style/node_modules/less/.npmignore +++ /dev/null @@ -1,2 +0,0 @@ - -*.less diff --git a/askbot/skins/default/media/style/node_modules/less/CHANGELOG b/askbot/skins/default/media/style/node_modules/less/CHANGELOG deleted file mode 100644 index 9269555d..00000000 --- a/askbot/skins/default/media/style/node_modules/less/CHANGELOG +++ /dev/null @@ -1,26 +0,0 @@ -1.2.1 - -fix imports on browser -improve error reporting on browser -fix Runtime error reports from imported files -fix 'File not found' import error reporting - -1.2.0 - -- mixin guards -- new function `percentage` -- new `color` function to parse hex color strings -- new type-checking stylesheet functions -- fix Rhino support -- fix bug in string arguments to mixin call -- fix error reporting when index is 0 -- fix browser support in webkit and IE -- fix string interpolation bug when var is empty -- support '!important' after mixin calls -- support vanilla @keyframes directive -- support variables in certain css selectors, like 'nth-child' -- support @media and @import features properly -- improve @import support with media features -- improve error reports from imported files -- improve function call error reporting -- improve error-reporting diff --git a/askbot/skins/default/media/style/node_modules/less/LICENSE b/askbot/skins/default/media/style/node_modules/less/LICENSE deleted file mode 100644 index 40f3b781..00000000 --- a/askbot/skins/default/media/style/node_modules/less/LICENSE +++ /dev/null @@ -1,179 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -Copyright (c) 2009-2010 Alexis Sellier diff --git a/askbot/skins/default/media/style/node_modules/less/Makefile b/askbot/skins/default/media/style/node_modules/less/Makefile deleted file mode 100644 index 32d7cc04..00000000 --- a/askbot/skins/default/media/style/node_modules/less/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# -# Run all tests -# -test: - node test/less-test.js - -# -# Run benchmark -# -benchmark: - node benchmark/less-benchmark.js - -# -# Build less.js -# -SRC = lib/less -HEADER = build/header.js -VERSION = `cat package.json | grep version \ - | grep -o '[0-9]\.[0-9]\.[0-9]\+'` -DIST = dist/less-${VERSION}.js -RHINO = dist/less-rhino-${VERSION}.js -DIST_MIN = dist/less-${VERSION}.min.js - -less: - @@mkdir -p dist - @@touch ${DIST} - @@cat ${HEADER} | sed s/@VERSION/${VERSION}/ > ${DIST} - @@echo "(function (window, undefined) {" >> ${DIST} - @@cat build/require.js\ - build/amd.js\ - build/ecma-5.js\ - ${SRC}/parser.js\ - ${SRC}/functions.js\ - ${SRC}/colors.js\ - ${SRC}/tree/*.js\ - ${SRC}/tree.js\ - ${SRC}/browser.js >> ${DIST} - @@echo "})(window);" >> ${DIST} - @@echo ${DIST} built. - -rhino: - @@mkdir -p dist - @@touch ${RHINO} - @@cat build/require-rhino.js\ - build/ecma-5.js\ - ${SRC}/parser.js\ - ${SRC}/functions.js\ - ${SRC}/tree/*.js\ - ${SRC}/tree.js\ - ${SRC}/rhino.js > ${RHINO} - @@echo ${RHINO} built. - -min: less - @@echo minifying... - @@uglifyjs ${DIST} > ${DIST_MIN} - @@echo ${DIST_MIN} built. - -server: less - cp dist/less-${VERSION}.js test/html/ - cd test/html && python -m SimpleHTTPServer - -clean: - git rm dist/* - -dist: clean min - git add dist/* - git commit -a -m "(dist) build ${VERSION}" - git archive master --prefix=less/ -o less-${VERSION}.tar.gz - npm publish less-${VERSION}.tar.gz - -stable: - npm tag less ${VERSION} stable - - -.PHONY: test benchmark diff --git a/askbot/skins/default/media/style/node_modules/less/README.md b/askbot/skins/default/media/style/node_modules/less/README.md deleted file mode 100644 index 726d6910..00000000 --- a/askbot/skins/default/media/style/node_modules/less/README.md +++ /dev/null @@ -1,20 +0,0 @@ -less.js -======= - -The **dynamic** stylesheet language. - - - -about ------ - -This is the JavaScript, and now official, stable version of LESS. - -For more information, visit . - -license -------- - -See `LICENSE` file. - -> Copyright (c) 2009-2011 Alexis Sellier diff --git a/askbot/skins/default/media/style/node_modules/less/benchmark/less-benchmark.js b/askbot/skins/default/media/style/node_modules/less/benchmark/less-benchmark.js deleted file mode 100644 index 68fe1ad4..00000000 --- a/askbot/skins/default/media/style/node_modules/less/benchmark/less-benchmark.js +++ /dev/null @@ -1,47 +0,0 @@ -var path = require('path'), - fs = require('fs'), - sys = require('util'); - -var less = require('../lib/less'); -var file = path.join(__dirname, 'benchmark.less'); - -if (process.argv[2]) { file = path.join(process.cwd(), process.argv[2]) } - -fs.readFile(file, 'utf8', function (e, data) { - var tree, css, start, end, total; - - sys.puts("Benchmarking...\n", path.basename(file) + " (" + - parseInt(data.length / 1024) + " KB)", ""); - - start = new(Date); - - new(less.Parser)({ optimization: 2 }).parse(data, function (err, tree) { - end = new(Date); - - total = end - start; - - sys.puts("Parsing: " + - total + " ms (" + - parseInt(1000 / total * - data.length / 1024) + " KB\/s)"); - - start = new(Date); - css = tree.toCSS(); - end = new(Date); - - sys.puts("Generation: " + (end - start) + " ms (" + - parseInt(1000 / (end - start) * - data.length / 1024) + " KB\/s)"); - - total += end - start; - - sys.puts("Total: " + total + "ms (" + - parseInt(1000 / total * data.length / 1024) + " KB/s)"); - - if (err) { - less.writeError(err); - process.exit(3); - } - }); -}); - diff --git a/askbot/skins/default/media/style/node_modules/less/bin/lessc b/askbot/skins/default/media/style/node_modules/less/bin/lessc deleted file mode 100755 index 30ae3520..00000000 --- a/askbot/skins/default/media/style/node_modules/less/bin/lessc +++ /dev/null @@ -1,139 +0,0 @@ -#!/usr/bin/env node - -var path = require('path'), - fs = require('fs'), - sys = require('util'), - os = require('os'); - -var less = require('../lib/less'); -var args = process.argv.slice(1); -var options = { - compress: false, - yuicompress: false, - optimization: 1, - silent: false, - paths: [], - color: true, - strictImports: false -}; - -args = args.filter(function (arg) { - var match; - - if (match = arg.match(/^-I(.+)$/)) { - options.paths.push(match[1]); - return false; - } - - if (match = arg.match(/^--?([a-z][0-9a-z-]*)(?:=([^\s]+))?$/i)) { arg = match[1] } - else { return arg } - - switch (arg) { - case 'v': - case 'version': - sys.puts("lessc " + less.version.join('.') + " (LESS Compiler) [JavaScript]"); - process.exit(0); - case 'verbose': - options.verbose = true; - break; - case 's': - case 'silent': - options.silent = true; - break; - case 'strict-imports': - options.strictImports = true; - break; - case 'h': - case 'help': - sys.puts("usage: lessc source [destination]"); - process.exit(0); - case 'x': - case 'compress': - options.compress = true; - break; - case 'yui-compress': - options.yuicompress = true; - break; - case 'no-color': - options.color = false; - break; - case 'include-path': - options.paths = match[2].split(os.type().match(/Windows/) ? ';' : ':') - .map(function(p) { - if (p) { - return path.resolve(process.cwd(), p); - } - }); - break; - case 'O0': options.optimization = 0; break; - case 'O1': options.optimization = 1; break; - case 'O2': options.optimization = 2; break; - } -}); - -var input = args[1]; -if (input && input != '-') { - input = path.resolve(process.cwd(), input); -} -var output = args[2]; -if (output) { - output = path.resolve(process.cwd(), output); -} - -var css, fd, tree; - -if (! input) { - sys.puts("lessc: no input files"); - process.exit(1); -} - -var parseLessFile = function (e, data) { - if (e) { - sys.puts("lessc: " + e.message); - process.exit(1); - } - - new(less.Parser)({ - paths: [path.dirname(input)].concat(options.paths), - optimization: options.optimization, - filename: input, - strictImports: options.strictImports - }).parse(data, function (err, tree) { - if (err) { - less.writeError(err, options); - process.exit(1); - } else { - try { - css = tree.toCSS({ - compress: options.compress, - yuicompress: options.yuicompress - }); - if (output) { - fd = fs.openSync(output, "w"); - fs.writeSync(fd, css, 0, "utf8"); - } else { - sys.print(css); - } - } catch (e) { - less.writeError(e, options); - process.exit(2); - } - } - }); -}; - -if (input != '-') { - fs.readFile(input, 'utf-8', parseLessFile); -} else { - process.stdin.resume(); - process.stdin.setEncoding('utf8'); - - var buffer = ''; - process.stdin.on('data', function(data) { - buffer += data; - }); - - process.stdin.on('end', function() { - parseLessFile(false, buffer); - }); -} diff --git a/askbot/skins/default/media/style/node_modules/less/index.html b/askbot/skins/default/media/style/node_modules/less/index.html deleted file mode 100644 index a62c6b6a..00000000 --- a/askbot/skins/default/media/style/node_modules/less/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - HELLO - - diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/browser.js b/askbot/skins/default/media/style/node_modules/less/lib/less/browser.js deleted file mode 100644 index cab913be..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/browser.js +++ /dev/null @@ -1,380 +0,0 @@ -// -// browser.js - client-side engine -// - -var isFileProtocol = (location.protocol === 'file:' || - location.protocol === 'chrome:' || - location.protocol === 'chrome-extension:' || - location.protocol === 'resource:'); - -less.env = less.env || (location.hostname == '127.0.0.1' || - location.hostname == '0.0.0.0' || - location.hostname == 'localhost' || - location.port.length > 0 || - isFileProtocol ? 'development' - : 'production'); - -// Load styles asynchronously (default: false) -// -// This is set to `false` by default, so that the body -// doesn't start loading before the stylesheets are parsed. -// Setting this to `true` can result in flickering. -// -less.async = false; - -// Interval between watch polls -less.poll = less.poll || (isFileProtocol ? 1000 : 1500); - -// -// Watch mode -// -less.watch = function () { return this.watchMode = true }; -less.unwatch = function () { return this.watchMode = false }; - -if (less.env === 'development') { - less.optimization = 0; - - if (/!watch/.test(location.hash)) { - less.watch(); - } - less.watchTimer = setInterval(function () { - if (less.watchMode) { - loadStyleSheets(function (e, root, _, sheet, env) { - if (root) { - createCSS(root.toCSS(), sheet, env.lastModified); - } - }); - } - }, less.poll); -} else { - less.optimization = 3; -} - -var cache; - -try { - cache = (typeof(window.localStorage) === 'undefined') ? null : window.localStorage; -} catch (_) { - cache = null; -} - -// -// Get all tags with the 'rel' attribute set to "stylesheet/less" -// -var links = document.getElementsByTagName('link'); -var typePattern = /^text\/(x-)?less$/; - -less.sheets = []; - -for (var i = 0; i < links.length; i++) { - if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) && - (links[i].type.match(typePattern)))) { - less.sheets.push(links[i]); - } -} - - -less.refresh = function (reload) { - var startTime, endTime; - startTime = endTime = new(Date); - - loadStyleSheets(function (e, root, _, sheet, env) { - if (env.local) { - log("loading " + sheet.href + " from cache."); - } else { - log("parsed " + sheet.href + " successfully."); - createCSS(root.toCSS(), sheet, env.lastModified); - } - log("css for " + sheet.href + " generated in " + (new(Date) - endTime) + 'ms'); - (env.remaining === 0) && log("css generated in " + (new(Date) - startTime) + 'ms'); - endTime = new(Date); - }, reload); - - loadStyles(); -}; -less.refreshStyles = loadStyles; - -less.refresh(less.env === 'development'); - -function loadStyles() { - var styles = document.getElementsByTagName('style'); - for (var i = 0; i < styles.length; i++) { - if (styles[i].type.match(typePattern)) { - new(less.Parser)().parse(styles[i].innerHTML || '', function (e, tree) { - var css = tree.toCSS(); - var style = styles[i]; - style.type = 'text/css'; - if (style.styleSheet) { - style.styleSheet.cssText = css; - } else { - style.innerHTML = css; - } - }); - } - } -} - -function loadStyleSheets(callback, reload) { - for (var i = 0; i < less.sheets.length; i++) { - loadStyleSheet(less.sheets[i], callback, reload, less.sheets.length - (i + 1)); - } -} - -function loadStyleSheet(sheet, callback, reload, remaining) { - var url = window.location.href.replace(/[#?].*$/, ''); - var href = sheet.href.replace(/\?.*$/, ''); - var css = cache && cache.getItem(href); - var timestamp = cache && cache.getItem(href + ':timestamp'); - var styles = { css: css, timestamp: timestamp }; - - // Stylesheets in IE don't always return the full path - if (! /^(https?|file):/.test(href)) { - if (href.charAt(0) == "/") { - href = window.location.protocol + "//" + window.location.host + href; - } else { - href = url.slice(0, url.lastIndexOf('/') + 1) + href; - } - } - var filename = href.match(/([^\/]+)$/)[1]; - - xhr(sheet.href, sheet.type, function (data, lastModified) { - if (!reload && styles && lastModified && - (new(Date)(lastModified).valueOf() === - new(Date)(styles.timestamp).valueOf())) { - // Use local copy - createCSS(styles.css, sheet); - callback(null, null, data, sheet, { local: true, remaining: remaining }); - } else { - // Use remote copy (re-parse) - try { - new(less.Parser)({ - optimization: less.optimization, - paths: [href.replace(/[\w\.-]+$/, '')], - mime: sheet.type, - filename: filename - }).parse(data, function (e, root) { - if (e) { return error(e, href) } - try { - callback(e, root, data, sheet, { local: false, lastModified: lastModified, remaining: remaining }); - removeNode(document.getElementById('less-error-message:' + extractId(href))); - } catch (e) { - error(e, href); - } - }); - } catch (e) { - error(e, href); - } - } - }, function (status, url) { - throw new(Error)("Couldn't load " + url + " (" + status + ")"); - }); -} - -function extractId(href) { - return href.replace(/^[a-z]+:\/\/?[^\/]+/, '' ) // Remove protocol & domain - .replace(/^\//, '' ) // Remove root / - .replace(/\?.*$/, '' ) // Remove query - .replace(/\.[^\.\/]+$/, '' ) // Remove file extension - .replace(/[^\.\w-]+/g, '-') // Replace illegal characters - .replace(/\./g, ':'); // Replace dots with colons(for valid id) -} - -function createCSS(styles, sheet, lastModified) { - var css; - - // Strip the query-string - var href = sheet.href ? sheet.href.replace(/\?.*$/, '') : ''; - - // If there is no title set, use the filename, minus the extension - var id = 'less:' + (sheet.title || extractId(href)); - - // If the stylesheet doesn't exist, create a new node - if ((css = document.getElementById(id)) === null) { - css = document.createElement('style'); - css.type = 'text/css'; - css.media = sheet.media || 'screen'; - css.id = id; - document.getElementsByTagName('head')[0].appendChild(css); - } - - if (css.styleSheet) { // IE - try { - css.styleSheet.cssText = styles; - } catch (e) { - throw new(Error)("Couldn't reassign styleSheet.cssText."); - } - } else { - (function (node) { - if (css.childNodes.length > 0) { - if (css.firstChild.nodeValue !== node.nodeValue) { - css.replaceChild(node, css.firstChild); - } - } else { - css.appendChild(node); - } - })(document.createTextNode(styles)); - } - - // Don't update the local store if the file wasn't modified - if (lastModified && cache) { - log('saving ' + href + ' to cache.'); - cache.setItem(href, styles); - cache.setItem(href + ':timestamp', lastModified); - } -} - -function xhr(url, type, callback, errback) { - var xhr = getXMLHttpRequest(); - var async = isFileProtocol ? false : less.async; - - if (typeof(xhr.overrideMimeType) === 'function') { - xhr.overrideMimeType('text/css'); - } - xhr.open('GET', url, async); - xhr.setRequestHeader('Accept', type || 'text/x-less, text/css; q=0.9, */*; q=0.5'); - xhr.send(null); - - if (isFileProtocol) { - if (xhr.status === 0 || (xhr.status >= 200 && xhr.status < 300)) { - callback(xhr.responseText); - } else { - errback(xhr.status, url); - } - } else if (async) { - xhr.onreadystatechange = function () { - if (xhr.readyState == 4) { - handleResponse(xhr, callback, errback); - } - }; - } else { - handleResponse(xhr, callback, errback); - } - - function handleResponse(xhr, callback, errback) { - if (xhr.status >= 200 && xhr.status < 300) { - callback(xhr.responseText, - xhr.getResponseHeader("Last-Modified")); - } else if (typeof(errback) === 'function') { - errback(xhr.status, url); - } - } -} - -function getXMLHttpRequest() { - if (window.XMLHttpRequest) { - return new(XMLHttpRequest); - } else { - try { - return new(ActiveXObject)("MSXML2.XMLHTTP.3.0"); - } catch (e) { - log("browser doesn't support AJAX."); - return null; - } - } -} - -function removeNode(node) { - return node && node.parentNode.removeChild(node); -} - -function log(str) { - if (less.env == 'development' && typeof(console) !== "undefined") { console.log('less: ' + str) } -} - -function error(e, href) { - var id = 'less-error-message:' + extractId(href); - var template = '
  • {content}
    • '; - var elem = document.createElement('div'), timer, content, error = []; - var filename = e.filename || href; - - elem.id = id; - elem.className = "less-error-message"; - - content = '

    ' + (e.message || 'There is an error in your .less file') + - '

    ' + '

    in ' + filename + " "; - - var errorline = function (e, i, classname) { - if (e.extract[i]) { - error.push(template.replace(/\{line\}/, parseInt(e.line) + (i - 1)) - .replace(/\{class\}/, classname) - .replace(/\{content\}/, e.extract[i])); - } - }; - - if (e.stack) { - content += '
    ' + e.stack.split('\n').slice(1).join('
    '); - } else if (e.extract) { - errorline(e, 0, ''); - errorline(e, 1, 'line'); - errorline(e, 2, ''); - content += 'on line ' + e.line + ', column ' + (e.column + 1) + ':

    ' + - '
      ' + error.join('') + '
    '; - } - elem.innerHTML = content; - - // CSS for error messages - createCSS([ - '.less-error-message ul, .less-error-message li {', - 'list-style-type: none;', - 'margin-right: 15px;', - 'padding: 4px 0;', - 'margin: 0;', - '}', - '.less-error-message label {', - 'font-size: 12px;', - 'margin-right: 15px;', - 'padding: 4px 0;', - 'color: #cc7777;', - '}', - '.less-error-message pre {', - 'color: #dd6666;', - 'padding: 4px 0;', - 'margin: 0;', - 'display: inline-block;', - '}', - '.less-error-message pre.line {', - 'color: #ff0000;', - '}', - '.less-error-message h3 {', - 'font-size: 20px;', - 'font-weight: bold;', - 'padding: 15px 0 5px 0;', - 'margin: 0;', - '}', - '.less-error-message a {', - 'color: #10a', - '}', - '.less-error-message .error {', - 'color: red;', - 'font-weight: bold;', - 'padding-bottom: 2px;', - 'border-bottom: 1px dashed red;', - '}' - ].join('\n'), { title: 'error-message' }); - - elem.style.cssText = [ - "font-family: Arial, sans-serif", - "border: 1px solid #e00", - "background-color: #eee", - "border-radius: 5px", - "-webkit-border-radius: 5px", - "-moz-border-radius: 5px", - "color: #e00", - "padding: 15px", - "margin-bottom: 15px" - ].join(';'); - - if (less.env == 'development') { - timer = setInterval(function () { - if (document.body) { - if (document.getElementById(id)) { - document.body.replaceChild(elem, document.getElementById(id)); - } else { - document.body.insertBefore(elem, document.body.firstChild); - } - clearInterval(timer); - } - }, 10); - } -} - diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/colors.js b/askbot/skins/default/media/style/node_modules/less/lib/less/colors.js deleted file mode 100644 index e509b602..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/colors.js +++ /dev/null @@ -1,151 +0,0 @@ -(function (tree) { - tree.colors = { - 'aliceblue':'#f0f8ff', - 'antiquewhite':'#faebd7', - 'aqua':'#00ffff', - 'aquamarine':'#7fffd4', - 'azure':'#f0ffff', - 'beige':'#f5f5dc', - 'bisque':'#ffe4c4', - 'black':'#000000', - 'blanchedalmond':'#ffebcd', - 'blue':'#0000ff', - 'blueviolet':'#8a2be2', - 'brown':'#a52a2a', - 'burlywood':'#deb887', - 'cadetblue':'#5f9ea0', - 'chartreuse':'#7fff00', - 'chocolate':'#d2691e', - 'coral':'#ff7f50', - 'cornflowerblue':'#6495ed', - 'cornsilk':'#fff8dc', - 'crimson':'#dc143c', - 'cyan':'#00ffff', - 'darkblue':'#00008b', - 'darkcyan':'#008b8b', - 'darkgoldenrod':'#b8860b', - 'darkgray':'#a9a9a9', - 'darkgrey':'#a9a9a9', - 'darkgreen':'#006400', - 'darkkhaki':'#bdb76b', - 'darkmagenta':'#8b008b', - 'darkolivegreen':'#556b2f', - 'darkorange':'#ff8c00', - 'darkorchid':'#9932cc', - 'darkred':'#8b0000', - 'darksalmon':'#e9967a', - 'darkseagreen':'#8fbc8f', - 'darkslateblue':'#483d8b', - 'darkslategray':'#2f4f4f', - 'darkslategrey':'#2f4f4f', - 'darkturquoise':'#00ced1', - 'darkviolet':'#9400d3', - 'deeppink':'#ff1493', - 'deepskyblue':'#00bfff', - 'dimgray':'#696969', - 'dimgrey':'#696969', - 'dodgerblue':'#1e90ff', - 'firebrick':'#b22222', - 'floralwhite':'#fffaf0', - 'forestgreen':'#228b22', - 'fuchsia':'#ff00ff', - 'gainsboro':'#dcdcdc', - 'ghostwhite':'#f8f8ff', - 'gold':'#ffd700', - 'goldenrod':'#daa520', - 'gray':'#808080', - 'grey':'#808080', - 'green':'#008000', - 'greenyellow':'#adff2f', - 'honeydew':'#f0fff0', - 'hotpink':'#ff69b4', - 'indianred':'#cd5c5c', - 'indigo':'#4b0082', - 'ivory':'#fffff0', - 'khaki':'#f0e68c', - 'lavender':'#e6e6fa', - 'lavenderblush':'#fff0f5', - 'lawngreen':'#7cfc00', - 'lemonchiffon':'#fffacd', - 'lightblue':'#add8e6', - 'lightcoral':'#f08080', - 'lightcyan':'#e0ffff', - 'lightgoldenrodyellow':'#fafad2', - 'lightgray':'#d3d3d3', - 'lightgrey':'#d3d3d3', - 'lightgreen':'#90ee90', - 'lightpink':'#ffb6c1', - 'lightsalmon':'#ffa07a', - 'lightseagreen':'#20b2aa', - 'lightskyblue':'#87cefa', - 'lightslategray':'#778899', - 'lightslategrey':'#778899', - 'lightsteelblue':'#b0c4de', - 'lightyellow':'#ffffe0', - 'lime':'#00ff00', - 'limegreen':'#32cd32', - 'linen':'#faf0e6', - 'magenta':'#ff00ff', - 'maroon':'#800000', - 'mediumaquamarine':'#66cdaa', - 'mediumblue':'#0000cd', - 'mediumorchid':'#ba55d3', - 'mediumpurple':'#9370d8', - 'mediumseagreen':'#3cb371', - 'mediumslateblue':'#7b68ee', - 'mediumspringgreen':'#00fa9a', - 'mediumturquoise':'#48d1cc', - 'mediumvioletred':'#c71585', - 'midnightblue':'#191970', - 'mintcream':'#f5fffa', - 'mistyrose':'#ffe4e1', - 'moccasin':'#ffe4b5', - 'navajowhite':'#ffdead', - 'navy':'#000080', - 'oldlace':'#fdf5e6', - 'olive':'#808000', - 'olivedrab':'#6b8e23', - 'orange':'#ffa500', - 'orangered':'#ff4500', - 'orchid':'#da70d6', - 'palegoldenrod':'#eee8aa', - 'palegreen':'#98fb98', - 'paleturquoise':'#afeeee', - 'palevioletred':'#d87093', - 'papayawhip':'#ffefd5', - 'peachpuff':'#ffdab9', - 'peru':'#cd853f', - 'pink':'#ffc0cb', - 'plum':'#dda0dd', - 'powderblue':'#b0e0e6', - 'purple':'#800080', - 'red':'#ff0000', - 'rosybrown':'#bc8f8f', - 'royalblue':'#4169e1', - 'saddlebrown':'#8b4513', - 'salmon':'#fa8072', - 'sandybrown':'#f4a460', - 'seagreen':'#2e8b57', - 'seashell':'#fff5ee', - 'sienna':'#a0522d', - 'silver':'#c0c0c0', - 'skyblue':'#87ceeb', - 'slateblue':'#6a5acd', - 'slategray':'#708090', - 'slategrey':'#708090', - 'snow':'#fffafa', - 'springgreen':'#00ff7f', - 'steelblue':'#4682b4', - 'tan':'#d2b48c', - 'teal':'#008080', - 'thistle':'#d8bfd8', - 'tomato':'#ff6347', - 'turquoise':'#40e0d0', - 'violet':'#ee82ee', - 'wheat':'#f5deb3', - 'white':'#ffffff', - 'whitesmoke':'#f5f5f5', - 'yellow':'#ffff00', - 'yellowgreen':'#9acd32' - }; -})(require('./tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/cssmin.js b/askbot/skins/default/media/style/node_modules/less/lib/less/cssmin.js deleted file mode 100644 index 427de71c..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/cssmin.js +++ /dev/null @@ -1,355 +0,0 @@ -/** - * cssmin.js - * Author: Stoyan Stefanov - http://phpied.com/ - * This is a JavaScript port of the CSS minification tool - * distributed with YUICompressor, itself a port - * of the cssmin utility by Isaac Schlueter - http://foohack.com/ - * Permission is hereby granted to use the JavaScript version under the same - * conditions as the YUICompressor (original YUICompressor note below). - */ - -/* -* YUI Compressor -* http://developer.yahoo.com/yui/compressor/ -* Author: Julien Lecomte - http://www.julienlecomte.net/ -* Copyright (c) 2011 Yahoo! Inc. All rights reserved. -* The copyrights embodied in the content of this file are licensed -* by Yahoo! Inc. under the BSD (revised) open source license. -*/ -var YAHOO = YAHOO || {}; -YAHOO.compressor = YAHOO.compressor || {}; - -/** - * Utility method to replace all data urls with tokens before we start - * compressing, to avoid performance issues running some of the subsequent - * regexes against large strings chunks. - * - * @private - * @method _extractDataUrls - * @param {String} css The input css - * @param {Array} The global array of tokens to preserve - * @returns String The processed css - */ -YAHOO.compressor._extractDataUrls = function (css, preservedTokens) { - - // Leave data urls alone to increase parse performance. - var maxIndex = css.length - 1, - appendIndex = 0, - startIndex, - endIndex, - terminator, - foundTerminator, - sb = [], - m, - preserver, - token, - pattern = /url\(\s*(["']?)data\:/g; - - // Since we need to account for non-base64 data urls, we need to handle - // ' and ) being part of the data string. Hence switching to indexOf, - // to determine whether or not we have matching string terminators and - // handling sb appends directly, instead of using matcher.append* methods. - - while ((m = pattern.exec(css)) !== null) { - - startIndex = m.index + 4; // "url(".length() - terminator = m[1]; // ', " or empty (not quoted) - - if (terminator.length === 0) { - terminator = ")"; - } - - foundTerminator = false; - - endIndex = pattern.lastIndex - 1; - - while(foundTerminator === false && endIndex+1 <= maxIndex) { - endIndex = css.indexOf(terminator, endIndex + 1); - - // endIndex == 0 doesn't really apply here - if ((endIndex > 0) && (css.charAt(endIndex - 1) !== '\\')) { - foundTerminator = true; - if (")" != terminator) { - endIndex = css.indexOf(")", endIndex); - } - } - } - - // Enough searching, start moving stuff over to the buffer - sb.push(css.substring(appendIndex, m.index)); - - if (foundTerminator) { - token = css.substring(startIndex, endIndex); - token = token.replace(/\s+/g, ""); - preservedTokens.push(token); - - preserver = "url(___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___)"; - sb.push(preserver); - - appendIndex = endIndex + 1; - } else { - // No end terminator found, re-add the whole match. Should we throw/warn here? - sb.push(css.substring(m.index, pattern.lastIndex)); - appendIndex = pattern.lastIndex; - } - } - - sb.push(css.substring(appendIndex)); - - return sb.join(""); -}; - -/** - * Utility method to compress hex color values of the form #AABBCC to #ABC. - * - * DOES NOT compress CSS ID selectors which match the above pattern (which would break things). - * e.g. #AddressForm { ... } - * - * DOES NOT compress IE filters, which have hex color values (which would break things). - * e.g. filter: chroma(color="#FFFFFF"); - * - * DOES NOT compress invalid hex values. - * e.g. background-color: #aabbccdd - * - * @private - * @method _compressHexColors - * @param {String} css The input css - * @returns String The processed css - */ -YAHOO.compressor._compressHexColors = function(css) { - - // Look for hex colors inside { ... } (to avoid IDs) and which don't have a =, or a " in front of them (to avoid filters) - var pattern = /(\=\s*?["']?)?#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])(\}|[^0-9a-f{][^{]*?\})/gi, - m, - index = 0, - isFilter, - sb = []; - - while ((m = pattern.exec(css)) !== null) { - - sb.push(css.substring(index, m.index)); - - isFilter = m[1]; - - if (isFilter) { - // Restore, maintain case, otherwise filter will break - sb.push(m[1] + "#" + (m[2] + m[3] + m[4] + m[5] + m[6] + m[7])); - } else { - if (m[2].toLowerCase() == m[3].toLowerCase() && - m[4].toLowerCase() == m[5].toLowerCase() && - m[6].toLowerCase() == m[7].toLowerCase()) { - - // Compress. - sb.push("#" + (m[3] + m[5] + m[7]).toLowerCase()); - } else { - // Non compressible color, restore but lower case. - sb.push("#" + (m[2] + m[3] + m[4] + m[5] + m[6] + m[7]).toLowerCase()); - } - } - - index = pattern.lastIndex = pattern.lastIndex - m[8].length; - } - - sb.push(css.substring(index)); - - return sb.join(""); -}; - -YAHOO.compressor.cssmin = function (css, linebreakpos) { - - var startIndex = 0, - endIndex = 0, - i = 0, max = 0, - preservedTokens = [], - comments = [], - token = '', - totallen = css.length, - placeholder = ''; - - css = this._extractDataUrls(css, preservedTokens); - - // collect all comment blocks... - while ((startIndex = css.indexOf("/*", startIndex)) >= 0) { - endIndex = css.indexOf("*/", startIndex + 2); - if (endIndex < 0) { - endIndex = totallen; - } - token = css.slice(startIndex + 2, endIndex); - comments.push(token); - css = css.slice(0, startIndex + 2) + "___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + (comments.length - 1) + "___" + css.slice(endIndex); - startIndex += 2; - } - - // preserve strings so their content doesn't get accidentally minified - css = css.replace(/("([^\\"]|\\.|\\)*")|('([^\\']|\\.|\\)*')/g, function (match) { - var i, max, quote = match.substring(0, 1); - - match = match.slice(1, -1); - - // maybe the string contains a comment-like substring? - // one, maybe more? put'em back then - if (match.indexOf("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_") >= 0) { - for (i = 0, max = comments.length; i < max; i = i + 1) { - match = match.replace("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___", comments[i]); - } - } - - // minify alpha opacity in filter strings - match = match.replace(/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/gi, "alpha(opacity="); - - preservedTokens.push(match); - return quote + "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___" + quote; - }); - - // strings are safe, now wrestle the comments - for (i = 0, max = comments.length; i < max; i = i + 1) { - - token = comments[i]; - placeholder = "___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___"; - - // ! in the first position of the comment means preserve - // so push to the preserved tokens keeping the ! - if (token.charAt(0) === "!") { - preservedTokens.push(token); - css = css.replace(placeholder, "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___"); - continue; - } - - // \ in the last position looks like hack for Mac/IE5 - // shorten that to /*\*/ and the next one to /**/ - if (token.charAt(token.length - 1) === "\\") { - preservedTokens.push("\\"); - css = css.replace(placeholder, "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___"); - i = i + 1; // attn: advancing the loop - preservedTokens.push(""); - css = css.replace("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___", "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___"); - continue; - } - - // keep empty comments after child selectors (IE7 hack) - // e.g. html >/**/ body - if (token.length === 0) { - startIndex = css.indexOf(placeholder); - if (startIndex > 2) { - if (css.charAt(startIndex - 3) === '>') { - preservedTokens.push(""); - css = css.replace(placeholder, "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.length - 1) + "___"); - } - } - } - - // in all other cases kill the comment - css = css.replace("/*" + placeholder + "*/", ""); - } - - - // Normalize all whitespace strings to single spaces. Easier to work with that way. - css = css.replace(/\s+/g, " "); - - // Remove the spaces before the things that should not have spaces before them. - // But, be careful not to turn "p :link {...}" into "p:link{...}" - // Swap out any pseudo-class colons with the token, and then swap back. - css = css.replace(/(^|\})(([^\{:])+:)+([^\{]*\{)/g, function (m) { - return m.replace(":", "___YUICSSMIN_PSEUDOCLASSCOLON___"); - }); - css = css.replace(/\s+([!{};:>+\(\)\],])/g, '$1'); - css = css.replace(/___YUICSSMIN_PSEUDOCLASSCOLON___/g, ":"); - - // retain space for special IE6 cases - css = css.replace(/:first-(line|letter)(\{|,)/g, ":first-$1 $2"); - - // no space after the end of a preserved comment - css = css.replace(/\*\/ /g, '*/'); - - - // If there is a @charset, then only allow one, and push to the top of the file. - css = css.replace(/^(.*)(@charset "[^"]*";)/gi, '$2$1'); - css = css.replace(/^(\s*@charset [^;]+;\s*)+/gi, '$1'); - - // Put the space back in some cases, to support stuff like - // @media screen and (-webkit-min-device-pixel-ratio:0){ - css = css.replace(/\band\(/gi, "and ("); - - - // Remove the spaces after the things that should not have spaces after them. - css = css.replace(/([!{}:;>+\(\[,])\s+/g, '$1'); - - // remove unnecessary semicolons - css = css.replace(/;+\}/g, "}"); - - // Replace 0(px,em,%) with 0. - css = css.replace(/([\s:])(0)(px|em|%|in|cm|mm|pc|pt|ex)/gi, "$1$2"); - - // Replace 0 0 0 0; with 0. - css = css.replace(/:0 0 0 0(;|\})/g, ":0$1"); - css = css.replace(/:0 0 0(;|\})/g, ":0$1"); - css = css.replace(/:0 0(;|\})/g, ":0$1"); - - // Replace background-position:0; with background-position:0 0; - // same for transform-origin - css = css.replace(/(background-position|transform-origin|webkit-transform-origin|moz-transform-origin|o-transform-origin|ms-transform-origin):0(;|\})/gi, function(all, prop, tail) { - return prop.toLowerCase() + ":0 0" + tail; - }); - - // Replace 0.6 to .6, but only when preceded by : or a white-space - css = css.replace(/(:|\s)0+\.(\d+)/g, "$1.$2"); - - // Shorten colors from rgb(51,102,153) to #336699 - // This makes it more likely that it'll get further compressed in the next step. - css = css.replace(/rgb\s*\(\s*([0-9,\s]+)\s*\)/gi, function () { - var i, rgbcolors = arguments[1].split(','); - for (i = 0; i < rgbcolors.length; i = i + 1) { - rgbcolors[i] = parseInt(rgbcolors[i], 10).toString(16); - if (rgbcolors[i].length === 1) { - rgbcolors[i] = '0' + rgbcolors[i]; - } - } - return '#' + rgbcolors.join(''); - }); - - // Shorten colors from #AABBCC to #ABC. - css = this._compressHexColors(css); - - // border: none -> border:0 - css = css.replace(/(border|border-top|border-right|border-bottom|border-right|outline|background):none(;|\})/gi, function(all, prop, tail) { - return prop.toLowerCase() + ":0" + tail; - }); - - // shorter opacity IE filter - css = css.replace(/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/gi, "alpha(opacity="); - - // Remove empty rules. - css = css.replace(/[^\};\{\/]+\{\}/g, ""); - - if (linebreakpos >= 0) { - // Some source control tools don't like it when files containing lines longer - // than, say 8000 characters, are checked in. The linebreak option is used in - // that case to split long lines after a specific column. - startIndex = 0; - i = 0; - while (i < css.length) { - i = i + 1; - if (css[i - 1] === '}' && i - startIndex > linebreakpos) { - css = css.slice(0, i) + '\n' + css.slice(i); - startIndex = i; - } - } - } - - // Replace multiple semi-colons in a row by a single one - // See SF bug #1980989 - css = css.replace(/;;+/g, ";"); - - // restore preserved comments and strings - for (i = 0, max = preservedTokens.length; i < max; i = i + 1) { - css = css.replace("___YUICSSMIN_PRESERVED_TOKEN_" + i + "___", preservedTokens[i]); - } - - // Trim the final string (for any leading or trailing white spaces) - css = css.replace(/^\s+|\s+$/g, ""); - - return css; - -}; - -exports.compressor = YAHOO.compressor; diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/functions.js b/askbot/skins/default/media/style/node_modules/less/lib/less/functions.js deleted file mode 100644 index 6eb34bac..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/functions.js +++ /dev/null @@ -1,228 +0,0 @@ -(function (tree) { - -tree.functions = { - rgb: function (r, g, b) { - return this.rgba(r, g, b, 1.0); - }, - rgba: function (r, g, b, a) { - var rgb = [r, g, b].map(function (c) { return number(c) }), - a = number(a); - return new(tree.Color)(rgb, a); - }, - hsl: function (h, s, l) { - return this.hsla(h, s, l, 1.0); - }, - hsla: function (h, s, l, a) { - h = (number(h) % 360) / 360; - s = number(s); l = number(l); a = number(a); - - var m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s; - var m1 = l * 2 - m2; - - return this.rgba(hue(h + 1/3) * 255, - hue(h) * 255, - hue(h - 1/3) * 255, - a); - - function hue(h) { - h = h < 0 ? h + 1 : (h > 1 ? h - 1 : h); - if (h * 6 < 1) return m1 + (m2 - m1) * h * 6; - else if (h * 2 < 1) return m2; - else if (h * 3 < 2) return m1 + (m2 - m1) * (2/3 - h) * 6; - else return m1; - } - }, - hue: function (color) { - return new(tree.Dimension)(Math.round(color.toHSL().h)); - }, - saturation: function (color) { - return new(tree.Dimension)(Math.round(color.toHSL().s * 100), '%'); - }, - lightness: function (color) { - return new(tree.Dimension)(Math.round(color.toHSL().l * 100), '%'); - }, - alpha: function (color) { - return new(tree.Dimension)(color.toHSL().a); - }, - saturate: function (color, amount) { - var hsl = color.toHSL(); - - hsl.s += amount.value / 100; - hsl.s = clamp(hsl.s); - return hsla(hsl); - }, - desaturate: function (color, amount) { - var hsl = color.toHSL(); - - hsl.s -= amount.value / 100; - hsl.s = clamp(hsl.s); - return hsla(hsl); - }, - lighten: function (color, amount) { - var hsl = color.toHSL(); - - hsl.l += amount.value / 100; - hsl.l = clamp(hsl.l); - return hsla(hsl); - }, - darken: function (color, amount) { - var hsl = color.toHSL(); - - hsl.l -= amount.value / 100; - hsl.l = clamp(hsl.l); - return hsla(hsl); - }, - fadein: function (color, amount) { - var hsl = color.toHSL(); - - hsl.a += amount.value / 100; - hsl.a = clamp(hsl.a); - return hsla(hsl); - }, - fadeout: function (color, amount) { - var hsl = color.toHSL(); - - hsl.a -= amount.value / 100; - hsl.a = clamp(hsl.a); - return hsla(hsl); - }, - fade: function (color, amount) { - var hsl = color.toHSL(); - - hsl.a = amount.value / 100; - hsl.a = clamp(hsl.a); - return hsla(hsl); - }, - spin: function (color, amount) { - var hsl = color.toHSL(); - var hue = (hsl.h + amount.value) % 360; - - hsl.h = hue < 0 ? 360 + hue : hue; - - return hsla(hsl); - }, - // - // Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein - // http://sass-lang.com - // - mix: function (color1, color2, weight) { - var p = weight.value / 100.0; - var w = p * 2 - 1; - var a = color1.toHSL().a - color2.toHSL().a; - - var w1 = (((w * a == -1) ? w : (w + a) / (1 + w * a)) + 1) / 2.0; - var w2 = 1 - w1; - - var rgb = [color1.rgb[0] * w1 + color2.rgb[0] * w2, - color1.rgb[1] * w1 + color2.rgb[1] * w2, - color1.rgb[2] * w1 + color2.rgb[2] * w2]; - - var alpha = color1.alpha * p + color2.alpha * (1 - p); - - return new(tree.Color)(rgb, alpha); - }, - greyscale: function (color) { - return this.desaturate(color, new(tree.Dimension)(100)); - }, - e: function (str) { - return new(tree.Anonymous)(str instanceof tree.JavaScript ? str.evaluated : str); - }, - escape: function (str) { - return new(tree.Anonymous)(encodeURI(str.value).replace(/=/g, "%3D").replace(/:/g, "%3A").replace(/#/g, "%23").replace(/;/g, "%3B").replace(/\(/g, "%28").replace(/\)/g, "%29")); - }, - '%': function (quoted /* arg, arg, ...*/) { - var args = Array.prototype.slice.call(arguments, 1), - str = quoted.value; - - for (var i = 0; i < args.length; i++) { - str = str.replace(/%[sda]/i, function(token) { - var value = token.match(/s/i) ? args[i].value : args[i].toCSS(); - return token.match(/[A-Z]$/) ? encodeURIComponent(value) : value; - }); - } - str = str.replace(/%%/g, '%'); - return new(tree.Quoted)('"' + str + '"', str); - }, - round: function (n) { - return this._math('round', n); - }, - ceil: function (n) { - return this._math('ceil', n); - }, - floor: function (n) { - return this._math('floor', n); - }, - _math: function (fn, n) { - if (n instanceof tree.Dimension) { - return new(tree.Dimension)(Math[fn](number(n)), n.unit); - } else if (typeof(n) === 'number') { - return Math[fn](n); - } else { - throw { type: "Argument", message: "argument must be a number" }; - } - }, - argb: function (color) { - return new(tree.Anonymous)(color.toARGB()); - - }, - percentage: function (n) { - return new(tree.Dimension)(n.value * 100, '%'); - }, - color: function (n) { - if (n instanceof tree.Quoted) { - return new(tree.Color)(n.value.slice(1)); - } else { - throw { type: "Argument", message: "argument must be a string" }; - } - }, - iscolor: function (n) { - return this._isa(n, tree.Color); - }, - isnumber: function (n) { - return this._isa(n, tree.Dimension); - }, - isstring: function (n) { - return this._isa(n, tree.Quoted); - }, - iskeyword: function (n) { - return this._isa(n, tree.Keyword); - }, - isurl: function (n) { - return this._isa(n, tree.URL); - }, - ispixel: function (n) { - return (n instanceof tree.Dimension) && n.unit === 'px' ? tree.True : tree.False; - }, - ispercentage: function (n) { - return (n instanceof tree.Dimension) && n.unit === '%' ? tree.True : tree.False; - }, - isem: function (n) { - return (n instanceof tree.Dimension) && n.unit === 'em' ? tree.True : tree.False; - }, - _isa: function (n, Type) { - return (n instanceof Type) ? tree.True : tree.False; - } -}; - -function hsla(hsla) { - return tree.functions.hsla(hsla.h, hsla.s, hsla.l, hsla.a); -} - -function number(n) { - if (n instanceof tree.Dimension) { - return parseFloat(n.unit == '%' ? n.value / 100 : n.value); - } else if (typeof(n) === 'number') { - return n; - } else { - throw { - error: "RuntimeError", - message: "color functions take numbers as parameters" - }; - } -} - -function clamp(val) { - return Math.min(1, Math.max(0, val)); -} - -})(require('./tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/index.js b/askbot/skins/default/media/style/node_modules/less/lib/less/index.js deleted file mode 100644 index a11fa998..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/index.js +++ /dev/null @@ -1,148 +0,0 @@ -var path = require('path'), - sys = require('util'), - fs = require('fs'); - -var less = { - version: [1, 3, 0], - Parser: require('./parser').Parser, - importer: require('./parser').importer, - tree: require('./tree'), - render: function (input, options, callback) { - options = options || {}; - - if (typeof(options) === 'function') { - callback = options, options = {}; - } - - var parser = new(less.Parser)(options), - ee; - - if (callback) { - parser.parse(input, function (e, root) { - callback(e, root && root.toCSS && root.toCSS(options)); - }); - } else { - ee = new(require('events').EventEmitter); - - process.nextTick(function () { - parser.parse(input, function (e, root) { - if (e) { ee.emit('error', e) } - else { ee.emit('success', root.toCSS(options)) } - }); - }); - return ee; - } - }, - writeError: function (ctx, options) { - options = options || {}; - - var message = ""; - var extract = ctx.extract; - var error = []; - var stylize = options.color ? less.stylize : function (str) { return str }; - - if (options.silent) { return } - - if (ctx.stack) { return sys.error(stylize(ctx.stack, 'red')) } - - if (!ctx.hasOwnProperty('index')) { - return sys.error(ctx.stack || ctx.message); - } - - if (typeof(extract[0]) === 'string') { - error.push(stylize((ctx.line - 1) + ' ' + extract[0], 'grey')); - } - - if (extract[1]) { - error.push(ctx.line + ' ' + extract[1].slice(0, ctx.column) - + stylize(stylize(stylize(extract[1][ctx.column], 'bold') - + extract[1].slice(ctx.column + 1), 'red'), 'inverse')); - } - - if (typeof(extract[2]) === 'string') { - error.push(stylize((ctx.line + 1) + ' ' + extract[2], 'grey')); - } - error = error.join('\n') + '\033[0m\n'; - - message += stylize(ctx.type + 'Error: ' + ctx.message, 'red'); - ctx.filename && (message += stylize(' in ', 'red') + ctx.filename + - stylize(':' + ctx.line + ':' + ctx.column, 'grey')); - - sys.error(message, error); - - if (ctx.callLine) { - sys.error(stylize('from ', 'red') + (ctx.filename || '')); - sys.error(stylize(ctx.callLine, 'grey') + ' ' + ctx.callExtract); - } - } -}; - -['color', 'directive', 'operation', 'dimension', - 'keyword', 'variable', 'ruleset', 'element', - 'selector', 'quoted', 'expression', 'rule', - 'call', 'url', 'alpha', 'import', - 'mixin', 'comment', 'anonymous', 'value', - 'javascript', 'assignment', 'condition', 'paren', - 'media' -].forEach(function (n) { - require('./tree/' + n); -}); - -less.Parser.importer = function (file, paths, callback, env) { - var pathname; - - // TODO: Undo this at some point, - // or use different approach. - paths.unshift('.'); - - for (var i = 0; i < paths.length; i++) { - try { - pathname = path.join(paths[i], file); - fs.statSync(pathname); - break; - } catch (e) { - pathname = null; - } - } - - if (pathname) { - fs.readFile(pathname, 'utf-8', function(e, data) { - if (e) return callback(e); - - new(less.Parser)({ - paths: [path.dirname(pathname)].concat(paths), - filename: pathname - }).parse(data, function (e, root) { - callback(e, root, data); - }); - }); - } else { - if (typeof(env.errback) === "function") { - env.errback(file, paths, callback); - } else { - callback({ type: 'File', message: "'" + file + "' wasn't found.\n" }); - } - } -} - -require('./functions'); -require('./colors'); - -for (var k in less) { exports[k] = less[k] } - -// Stylize a string -function stylize(str, style) { - var styles = { - 'bold' : [1, 22], - 'inverse' : [7, 27], - 'underline' : [4, 24], - 'yellow' : [33, 39], - 'green' : [32, 39], - 'red' : [31, 39], - 'grey' : [90, 39] - }; - return '\033[' + styles[style][0] + 'm' + str + - '\033[' + styles[style][1] + 'm'; -} -less.stylize = stylize; - diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/parser.js b/askbot/skins/default/media/style/node_modules/less/lib/less/parser.js deleted file mode 100644 index 6ea4f8be..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/parser.js +++ /dev/null @@ -1,1305 +0,0 @@ -var less, tree; - -if (typeof environment === "object" && ({}).toString.call(environment) === "[object Environment]") { - // Rhino - // Details on how to detect Rhino: https://github.com/ringo/ringojs/issues/88 - if (typeof(window) === 'undefined') { less = {} } - else { less = window.less = {} } - tree = less.tree = {}; - less.mode = 'rhino'; -} else if (typeof(window) === 'undefined') { - // Node.js - less = exports, - tree = require('./tree'); - less.mode = 'node'; -} else { - // Browser - if (typeof(window.less) === 'undefined') { window.less = {} } - less = window.less, - tree = window.less.tree = {}; - less.mode = 'browser'; -} -// -// less.js - parser -// -// A relatively straight-forward predictive parser. -// There is no tokenization/lexing stage, the input is parsed -// in one sweep. -// -// To make the parser fast enough to run in the browser, several -// optimization had to be made: -// -// - Matching and slicing on a huge input is often cause of slowdowns. -// The solution is to chunkify the input into smaller strings. -// The chunks are stored in the `chunks` var, -// `j` holds the current chunk index, and `current` holds -// the index of the current chunk in relation to `input`. -// This gives us an almost 4x speed-up. -// -// - In many cases, we don't need to match individual tokens; -// for example, if a value doesn't hold any variables, operations -// or dynamic references, the parser can effectively 'skip' it, -// treating it as a literal. -// An example would be '1px solid #000' - which evaluates to itself, -// we don't need to know what the individual components are. -// The drawback, of course is that you don't get the benefits of -// syntax-checking on the CSS. This gives us a 50% speed-up in the parser, -// and a smaller speed-up in the code-gen. -// -// -// Token matching is done with the `$` function, which either takes -// a terminal string or regexp, or a non-terminal function to call. -// It also takes care of moving all the indices forwards. -// -// -less.Parser = function Parser(env) { - var input, // LeSS input string - i, // current index in `input` - j, // current chunk - temp, // temporarily holds a chunk's state, for backtracking - memo, // temporarily holds `i`, when backtracking - furthest, // furthest index the parser has gone to - chunks, // chunkified input - current, // index of current chunk, in `input` - parser; - - var that = this; - - // This function is called after all files - // have been imported through `@import`. - var finish = function () {}; - - var imports = this.imports = { - paths: env && env.paths || [], // Search paths, when importing - queue: [], // Files which haven't been imported yet - files: {}, // Holds the imported parse trees - contents: {}, // Holds the imported file contents - mime: env && env.mime, // MIME type of .less files - error: null, // Error in parsing/evaluating an import - push: function (path, callback) { - var that = this; - this.queue.push(path); - - // - // Import a file asynchronously - // - less.Parser.importer(path, this.paths, function (e, root, contents) { - that.queue.splice(that.queue.indexOf(path), 1); // Remove the path from the queue - that.files[path] = root; // Store the root - that.contents[path] = contents; - - if (e && !that.error) { that.error = e } - callback(e, root); - - if (that.queue.length === 0) { finish() } // Call `finish` if we're done importing - }, env); - } - }; - - function save() { temp = chunks[j], memo = i, current = i } - function restore() { chunks[j] = temp, i = memo, current = i } - - function sync() { - if (i > current) { - chunks[j] = chunks[j].slice(i - current); - current = i; - } - } - // - // Parse from a token, regexp or string, and move forward if match - // - function $(tok) { - var match, args, length, c, index, endIndex, k, mem; - - // - // Non-terminal - // - if (tok instanceof Function) { - return tok.call(parser.parsers); - // - // Terminal - // - // Either match a single character in the input, - // or match a regexp in the current chunk (chunk[j]). - // - } else if (typeof(tok) === 'string') { - match = input.charAt(i) === tok ? tok : null; - length = 1; - sync (); - } else { - sync (); - - if (match = tok.exec(chunks[j])) { - length = match[0].length; - } else { - return null; - } - } - - // The match is confirmed, add the match length to `i`, - // and consume any extra white-space characters (' ' || '\n') - // which come after that. The reason for this is that LeSS's - // grammar is mostly white-space insensitive. - // - if (match) { - mem = i += length; - endIndex = i + chunks[j].length - length; - - while (i < endIndex) { - c = input.charCodeAt(i); - if (! (c === 32 || c === 10 || c === 9)) { break } - i++; - } - chunks[j] = chunks[j].slice(length + (i - mem)); - current = i; - - if (chunks[j].length === 0 && j < chunks.length - 1) { j++ } - - if(typeof(match) === 'string') { - return match; - } else { - return match.length === 1 ? match[0] : match; - } - } - } - - function expect(arg, msg) { - var result = $(arg); - if (! result) { - error(msg || (typeof(arg) === 'string' ? "expected '" + arg + "' got '" + input.charAt(i) + "'" - : "unexpected token")); - } else { - return result; - } - } - - function error(msg, type) { - throw { index: i, type: type || 'Syntax', message: msg }; - } - - // Same as $(), but don't change the state of the parser, - // just return the match. - function peek(tok) { - if (typeof(tok) === 'string') { - return input.charAt(i) === tok; - } else { - if (tok.test(chunks[j])) { - return true; - } else { - return false; - } - } - } - - function basename(pathname) { - if (less.mode === 'node') { - return require('path').basename(pathname); - } else { - return pathname.match(/[^\/]+$/)[0]; - } - } - - function getInput(e, env) { - if (e.filename && env.filename && (e.filename !== env.filename)) { - return parser.imports.contents[basename(e.filename)]; - } else { - return input; - } - } - - function getLocation(index, input) { - for (var n = index, column = -1; - n >= 0 && input.charAt(n) !== '\n'; - n--) { column++ } - - return { line: typeof(index) === 'number' ? (input.slice(0, index).match(/\n/g) || "").length : null, - column: column }; - } - - function LessError(e, env) { - var input = getInput(e, env), - loc = getLocation(e.index, input), - line = loc.line, - col = loc.column, - lines = input.split('\n'); - - this.type = e.type || 'Syntax'; - this.message = e.message; - this.filename = e.filename || env.filename; - this.index = e.index; - this.line = typeof(line) === 'number' ? line + 1 : null; - this.callLine = e.call && (getLocation(e.call, input).line + 1); - this.callExtract = lines[getLocation(e.call, input).line]; - this.stack = e.stack; - this.column = col; - this.extract = [ - lines[line - 1], - lines[line], - lines[line + 1] - ]; - } - - this.env = env = env || {}; - - // The optimization level dictates the thoroughness of the parser, - // the lower the number, the less nodes it will create in the tree. - // This could matter for debugging, or if you want to access - // the individual nodes in the tree. - this.optimization = ('optimization' in this.env) ? this.env.optimization : 1; - - this.env.filename = this.env.filename || null; - - // - // The Parser - // - return parser = { - - imports: imports, - // - // Parse an input string into an abstract syntax tree, - // call `callback` when done. - // - parse: function (str, callback) { - var root, start, end, zone, line, lines, buff = [], c, error = null; - - i = j = current = furthest = 0; - input = str.replace(/\r\n/g, '\n'); - - // Split the input into chunks. - chunks = (function (chunks) { - var j = 0, - skip = /[^"'`\{\}\/\(\)\\]+/g, - comment = /\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g, - string = /"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'|`((?:[^`\\\r\n]|\\.)*)`/g, - level = 0, - match, - chunk = chunks[0], - inParam; - - for (var i = 0, c, cc; i < input.length; i++) { - skip.lastIndex = i; - if (match = skip.exec(input)) { - if (match.index === i) { - i += match[0].length; - chunk.push(match[0]); - } - } - c = input.charAt(i); - comment.lastIndex = string.lastIndex = i; - - if (match = string.exec(input)) { - if (match.index === i) { - i += match[0].length; - chunk.push(match[0]); - c = input.charAt(i); - } - } - - if (!inParam && c === '/') { - cc = input.charAt(i + 1); - if (cc === '/' || cc === '*') { - if (match = comment.exec(input)) { - if (match.index === i) { - i += match[0].length; - chunk.push(match[0]); - c = input.charAt(i); - } - } - } - } - - switch (c) { - case '{': if (! inParam) { level ++; chunk.push(c); break } - case '}': if (! inParam) { level --; chunk.push(c); chunks[++j] = chunk = []; break } - case '(': if (! inParam) { inParam = true; chunk.push(c); break } - case ')': if ( inParam) { inParam = false; chunk.push(c); break } - default: chunk.push(c); - } - } - if (level > 0) { - error = new(LessError)({ - index: i, - type: 'Parse', - message: "missing closing `}`", - filename: env.filename - }, env); - } - - return chunks.map(function (c) { return c.join('') });; - })([[]]); - - if (error) { - return callback(error); - } - - // Start with the primary rule. - // The whole syntax tree is held under a Ruleset node, - // with the `root` property set to true, so no `{}` are - // output. The callback is called when the input is parsed. - try { - root = new(tree.Ruleset)([], $(this.parsers.primary)); - root.root = true; - } catch (e) { - return callback(new(LessError)(e, env)); - } - - root.toCSS = (function (evaluate) { - var line, lines, column; - - return function (options, variables) { - var frames = [], importError; - - options = options || {}; - // - // Allows setting variables with a hash, so: - // - // `{ color: new(tree.Color)('#f01') }` will become: - // - // new(tree.Rule)('@color', - // new(tree.Value)([ - // new(tree.Expression)([ - // new(tree.Color)('#f01') - // ]) - // ]) - // ) - // - if (typeof(variables) === 'object' && !Array.isArray(variables)) { - variables = Object.keys(variables).map(function (k) { - var value = variables[k]; - - if (! (value instanceof tree.Value)) { - if (! (value instanceof tree.Expression)) { - value = new(tree.Expression)([value]); - } - value = new(tree.Value)([value]); - } - return new(tree.Rule)('@' + k, value, false, 0); - }); - frames = [new(tree.Ruleset)(null, variables)]; - } - - try { - var css = evaluate.call(this, { frames: frames }) - .toCSS([], { compress: options.compress || false }); - } catch (e) { - throw new(LessError)(e, env); - } - - if ((importError = parser.imports.error)) { // Check if there was an error during importing - if (importError instanceof LessError) throw importError; - else throw new(LessError)(importError, env); - } - - if (options.yuicompress && less.mode === 'node') { - return require('./cssmin').compressor.cssmin(css); - } else if (options.compress) { - return css.replace(/(\s)+/g, "$1"); - } else { - return css; - } - }; - })(root.eval); - - // If `i` is smaller than the `input.length - 1`, - // it means the parser wasn't able to parse the whole - // string, so we've got a parsing error. - // - // We try to extract a \n delimited string, - // showing the line where the parse error occured. - // We split it up into two parts (the part which parsed, - // and the part which didn't), so we can color them differently. - if (i < input.length - 1) { - i = furthest; - lines = input.split('\n'); - line = (input.slice(0, i).match(/\n/g) || "").length + 1; - - for (var n = i, column = -1; n >= 0 && input.charAt(n) !== '\n'; n--) { column++ } - - error = { - type: "Parse", - message: "Syntax Error on line " + line, - index: i, - filename: env.filename, - line: line, - column: column, - extract: [ - lines[line - 2], - lines[line - 1], - lines[line] - ] - }; - } - - if (this.imports.queue.length > 0) { - finish = function () { callback(error, root) }; - } else { - callback(error, root); - } - }, - - // - // Here in, the parsing rules/functions - // - // The basic structure of the syntax tree generated is as follows: - // - // Ruleset -> Rule -> Value -> Expression -> Entity - // - // Here's some LESS code: - // - // .class { - // color: #fff; - // border: 1px solid #000; - // width: @w + 4px; - // > .child {...} - // } - // - // And here's what the parse tree might look like: - // - // Ruleset (Selector '.class', [ - // Rule ("color", Value ([Expression [Color #fff]])) - // Rule ("border", Value ([Expression [Dimension 1px][Keyword "solid"][Color #000]])) - // Rule ("width", Value ([Expression [Operation "+" [Variable "@w"][Dimension 4px]]])) - // Ruleset (Selector [Element '>', '.child'], [...]) - // ]) - // - // In general, most rules will try to parse a token with the `$()` function, and if the return - // value is truly, will return a new node, of the relevant type. Sometimes, we need to check - // first, before parsing, that's when we use `peek()`. - // - parsers: { - // - // The `primary` rule is the *entry* and *exit* point of the parser. - // The rules here can appear at any level of the parse tree. - // - // The recursive nature of the grammar is an interplay between the `block` - // rule, which represents `{ ... }`, the `ruleset` rule, and this `primary` rule, - // as represented by this simplified grammar: - // - // primary → (ruleset | rule)+ - // ruleset → selector+ block - // block → '{' primary '}' - // - // Only at one point is the primary rule not called from the - // block rule: at the root level. - // - primary: function () { - var node, root = []; - - while ((node = $(this.mixin.definition) || $(this.rule) || $(this.ruleset) || - $(this.mixin.call) || $(this.comment) || $(this.directive)) - || $(/^[\s\n]+/)) { - node && root.push(node); - } - return root; - }, - - // We create a Comment node for CSS comments `/* */`, - // but keep the LeSS comments `//` silent, by just skipping - // over them. - comment: function () { - var comment; - - if (input.charAt(i) !== '/') return; - - if (input.charAt(i + 1) === '/') { - return new(tree.Comment)($(/^\/\/.*/), true); - } else if (comment = $(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/)) { - return new(tree.Comment)(comment); - } - }, - - // - // Entities are tokens which can be found inside an Expression - // - entities: { - // - // A string, which supports escaping " and ' - // - // "milky way" 'he\'s the one!' - // - quoted: function () { - var str, j = i, e; - - if (input.charAt(j) === '~') { j++, e = true } // Escaped strings - if (input.charAt(j) !== '"' && input.charAt(j) !== "'") return; - - e && $('~'); - - if (str = $(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/)) { - return new(tree.Quoted)(str[0], str[1] || str[2], e); - } - }, - - // - // A catch-all word, such as: - // - // black border-collapse - // - keyword: function () { - var k; - - if (k = $(/^[_A-Za-z-][_A-Za-z0-9-]*/)) { - if (tree.colors.hasOwnProperty(k)) { - // detect named color - return new(tree.Color)(tree.colors[k].slice(1)); - } else { - return new(tree.Keyword)(k); - } - } - }, - - // - // A function call - // - // rgb(255, 0, 255) - // - // We also try to catch IE's `alpha()`, but let the `alpha` parser - // deal with the details. - // - // The arguments are parsed with the `entities.arguments` parser. - // - call: function () { - var name, args, index = i; - - if (! (name = /^([\w-]+|%|progid:[\w\.]+)\(/.exec(chunks[j]))) return; - - name = name[1].toLowerCase(); - - if (name === 'url') { return null } - else { i += name.length } - - if (name === 'alpha') { return $(this.alpha) } - - $('('); // Parse the '(' and consume whitespace. - - args = $(this.entities.arguments); - - if (! $(')')) return; - - if (name) { return new(tree.Call)(name, args, index, env.filename) } - }, - arguments: function () { - var args = [], arg; - - while (arg = $(this.entities.assignment) || $(this.expression)) { - args.push(arg); - if (! $(',')) { break } - } - return args; - }, - literal: function () { - return $(this.entities.dimension) || - $(this.entities.color) || - $(this.entities.quoted); - }, - - // Assignments are argument entities for calls. - // They are present in ie filter properties as shown below. - // - // filter: progid:DXImageTransform.Microsoft.Alpha( *opacity=50* ) - // - - assignment: function () { - var key, value; - if ((key = $(/^\w+(?=\s?=)/i)) && $('=') && (value = $(this.entity))) { - return new(tree.Assignment)(key, value); - } - }, - - // - // Parse url() tokens - // - // We use a specific rule for urls, because they don't really behave like - // standard function calls. The difference is that the argument doesn't have - // to be enclosed within a string, so it can't be parsed as an Expression. - // - url: function () { - var value; - - if (input.charAt(i) !== 'u' || !$(/^url\(/)) return; - value = $(this.entities.quoted) || $(this.entities.variable) || - $(this.entities.dataURI) || $(/^[-\w%@$\/.&=:;#+?~]+/) || ""; - - expect(')'); - - return new(tree.URL)((value.value || value.data || value instanceof tree.Variable) - ? value : new(tree.Anonymous)(value), imports.paths); - }, - - dataURI: function () { - var obj; - - if ($(/^data:/)) { - obj = {}; - obj.mime = $(/^[^\/]+\/[^,;)]+/) || ''; - obj.charset = $(/^;\s*charset=[^,;)]+/) || ''; - obj.base64 = $(/^;\s*base64/) || ''; - obj.data = $(/^,\s*[^)]+/); - - if (obj.data) { return obj } - } - }, - - // - // A Variable entity, such as `@fink`, in - // - // width: @fink + 2px - // - // We use a different parser for variable definitions, - // see `parsers.variable`. - // - variable: function () { - var name, index = i; - - if (input.charAt(i) === '@' && (name = $(/^@@?[\w-]+/))) { - return new(tree.Variable)(name, index, env.filename); - } - }, - - // - // A Hexadecimal color - // - // #4F3C2F - // - // `rgb` and `hsl` colors are parsed through the `entities.call` parser. - // - color: function () { - var rgb; - - if (input.charAt(i) === '#' && (rgb = $(/^#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})/))) { - return new(tree.Color)(rgb[1]); - } - }, - - // - // A Dimension, that is, a number and a unit - // - // 0.5em 95% - // - dimension: function () { - var value, c = input.charCodeAt(i); - if ((c > 57 || c < 45) || c === 47) return; - - if (value = $(/^(-?\d*\.?\d+)(px|%|em|rem|pc|ex|in|deg|s|ms|pt|cm|mm|rad|grad|turn)?/)) { - return new(tree.Dimension)(value[1], value[2]); - } - }, - - // - // JavaScript code to be evaluated - // - // `window.location.href` - // - javascript: function () { - var str, j = i, e; - - if (input.charAt(j) === '~') { j++, e = true } // Escaped strings - if (input.charAt(j) !== '`') { return } - - e && $('~'); - - if (str = $(/^`([^`]*)`/)) { - return new(tree.JavaScript)(str[1], i, e); - } - } - }, - - // - // The variable part of a variable definition. Used in the `rule` parser - // - // @fink: - // - variable: function () { - var name; - - if (input.charAt(i) === '@' && (name = $(/^(@[\w-]+)\s*:/))) { return name[1] } - }, - - // - // A font size/line-height shorthand - // - // small/12px - // - // We need to peek first, or we'll match on keywords and dimensions - // - shorthand: function () { - var a, b; - - if (! peek(/^[@\w.%-]+\/[@\w.-]+/)) return; - - if ((a = $(this.entity)) && $('/') && (b = $(this.entity))) { - return new(tree.Shorthand)(a, b); - } - }, - - // - // Mixins - // - mixin: { - // - // A Mixin call, with an optional argument list - // - // #mixins > .square(#fff); - // .rounded(4px, black); - // .button; - // - // The `while` loop is there because mixins can be - // namespaced, but we only support the child and descendant - // selector for now. - // - call: function () { - var elements = [], e, c, args, index = i, s = input.charAt(i), important = false; - - if (s !== '.' && s !== '#') { return } - - while (e = $(/^[#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/)) { - elements.push(new(tree.Element)(c, e, i)); - c = $('>'); - } - $('(') && (args = $(this.entities.arguments)) && $(')'); - - if ($(this.important)) { - important = true; - } - - if (elements.length > 0 && ($(';') || peek('}'))) { - return new(tree.mixin.Call)(elements, args || [], index, env.filename, important); - } - }, - - // - // A Mixin definition, with a list of parameters - // - // .rounded (@radius: 2px, @color) { - // ... - // } - // - // Until we have a finer grained state-machine, we have to - // do a look-ahead, to make sure we don't have a mixin call. - // See the `rule` function for more information. - // - // We start by matching `.rounded (`, and then proceed on to - // the argument list, which has optional default values. - // We store the parameters in `params`, with a `value` key, - // if there is a value, such as in the case of `@radius`. - // - // Once we've got our params list, and a closing `)`, we parse - // the `{...}` block. - // - definition: function () { - var name, params = [], match, ruleset, param, value, cond, variadic = false; - if ((input.charAt(i) !== '.' && input.charAt(i) !== '#') || - peek(/^[^{]*(;|})/)) return; - - save(); - - if (match = $(/^([#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+)\s*\(/)) { - name = match[1]; - - do { - if (input.charAt(i) === '.' && $(/^\.{3}/)) { - variadic = true; - break; - } else if (param = $(this.entities.variable) || $(this.entities.literal) - || $(this.entities.keyword)) { - // Variable - if (param instanceof tree.Variable) { - if ($(':')) { - value = expect(this.expression, 'expected expression'); - params.push({ name: param.name, value: value }); - } else if ($(/^\.{3}/)) { - params.push({ name: param.name, variadic: true }); - variadic = true; - break; - } else { - params.push({ name: param.name }); - } - } else { - params.push({ value: param }); - } - } else { - break; - } - } while ($(',')) - - expect(')'); - - if ($(/^when/)) { // Guard - cond = expect(this.conditions, 'expected condition'); - } - - ruleset = $(this.block); - - if (ruleset) { - return new(tree.mixin.Definition)(name, params, ruleset, cond, variadic); - } else { - restore(); - } - } - } - }, - - // - // Entities are the smallest recognized token, - // and can be found inside a rule's value. - // - entity: function () { - return $(this.entities.literal) || $(this.entities.variable) || $(this.entities.url) || - $(this.entities.call) || $(this.entities.keyword) || $(this.entities.javascript) || - $(this.comment); - }, - - // - // A Rule terminator. Note that we use `peek()` to check for '}', - // because the `block` rule will be expecting it, but we still need to make sure - // it's there, if ';' was ommitted. - // - end: function () { - return $(';') || peek('}'); - }, - - // - // IE's alpha function - // - // alpha(opacity=88) - // - alpha: function () { - var value; - - if (! $(/^\(opacity=/i)) return; - if (value = $(/^\d+/) || $(this.entities.variable)) { - expect(')'); - return new(tree.Alpha)(value); - } - }, - - // - // A Selector Element - // - // div - // + h1 - // #socks - // input[type="text"] - // - // Elements are the building blocks for Selectors, - // they are made out of a `Combinator` (see combinator rule), - // and an element name, such as a tag a class, or `*`. - // - element: function () { - var e, t, c, v; - - c = $(this.combinator); - e = $(/^(?:\d+\.\d+|\d+)%/) || $(/^(?:[.#]?|:*)(?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/) || - $('*') || $(this.attribute) || $(/^\([^)@]+\)/); - - if (! e) { - $('(') && (v = $(this.entities.variable)) && $(')') && (e = new(tree.Paren)(v)); - } - - if (e) { return new(tree.Element)(c, e, i) } - - if (c.value && c.value.charAt(0) === '&') { - return new(tree.Element)(c, null, i); - } - }, - - // - // Combinators combine elements together, in a Selector. - // - // Because our parser isn't white-space sensitive, special care - // has to be taken, when parsing the descendant combinator, ` `, - // as it's an empty space. We have to check the previous character - // in the input, to see if it's a ` ` character. More info on how - // we deal with this in *combinator.js*. - // - combinator: function () { - var match, c = input.charAt(i); - - if (c === '>' || c === '+' || c === '~') { - i++; - while (input.charAt(i) === ' ') { i++ } - return new(tree.Combinator)(c); - } else if (c === '&') { - match = '&'; - i++; - if(input.charAt(i) === ' ') { - match = '& '; - } - while (input.charAt(i) === ' ') { i++ } - return new(tree.Combinator)(match); - } else if (input.charAt(i - 1) === ' ') { - return new(tree.Combinator)(" "); - } else { - return new(tree.Combinator)(null); - } - }, - - // - // A CSS Selector - // - // .class > div + h1 - // li a:hover - // - // Selectors are made out of one or more Elements, see above. - // - selector: function () { - var sel, e, elements = [], c, match; - - if ($('(')) { - sel = $(this.entity); - expect(')'); - return new(tree.Selector)([new(tree.Element)('', sel, i)]); - } - - while (e = $(this.element)) { - c = input.charAt(i); - elements.push(e) - if (c === '{' || c === '}' || c === ';' || c === ',') { break } - } - - if (elements.length > 0) { return new(tree.Selector)(elements) } - }, - tag: function () { - return $(/^[a-zA-Z][a-zA-Z-]*[0-9]?/) || $('*'); - }, - attribute: function () { - var attr = '', key, val, op; - - if (! $('[')) return; - - if (key = $(/^[a-zA-Z-]+/) || $(this.entities.quoted)) { - if ((op = $(/^[|~*$^]?=/)) && - (val = $(this.entities.quoted) || $(/^[\w-]+/))) { - attr = [key, op, val.toCSS ? val.toCSS() : val].join(''); - } else { attr = key } - } - - if (! $(']')) return; - - if (attr) { return "[" + attr + "]" } - }, - - // - // The `block` rule is used by `ruleset` and `mixin.definition`. - // It's a wrapper around the `primary` rule, with added `{}`. - // - block: function () { - var content; - - if ($('{') && (content = $(this.primary)) && $('}')) { - return content; - } - }, - - // - // div, .class, body > p {...} - // - ruleset: function () { - var selectors = [], s, rules, match; - save(); - - while (s = $(this.selector)) { - selectors.push(s); - $(this.comment); - if (! $(',')) { break } - $(this.comment); - } - - if (selectors.length > 0 && (rules = $(this.block))) { - return new(tree.Ruleset)(selectors, rules, env.strictImports); - } else { - // Backtrack - furthest = i; - restore(); - } - }, - rule: function () { - var name, value, c = input.charAt(i), important, match; - save(); - - if (c === '.' || c === '#' || c === '&') { return } - - if (name = $(this.variable) || $(this.property)) { - if ((name.charAt(0) != '@') && (match = /^([^@+\/'"*`(;{}-]*);/.exec(chunks[j]))) { - i += match[0].length - 1; - value = new(tree.Anonymous)(match[1]); - } else if (name === "font") { - value = $(this.font); - } else { - value = $(this.value); - } - important = $(this.important); - - if (value && $(this.end)) { - return new(tree.Rule)(name, value, important, memo); - } else { - furthest = i; - restore(); - } - } - }, - - // - // An @import directive - // - // @import "lib"; - // - // Depending on our environemnt, importing is done differently: - // In the browser, it's an XHR request, in Node, it would be a - // file-system operation. The function used for importing is - // stored in `import`, which we pass to the Import constructor. - // - "import": function () { - var path, features, index = i; - if ($(/^@import\s+/) && - (path = $(this.entities.quoted) || $(this.entities.url))) { - features = $(this.mediaFeatures); - if ($(';')) { - return new(tree.Import)(path, imports, features, index); - } - } - }, - - mediaFeature: function () { - var e, p, nodes = []; - - do { - if (e = $(this.entities.keyword)) { - nodes.push(e); - } else if ($('(')) { - p = $(this.property); - e = $(this.entity); - if ($(')')) { - if (p && e) { - nodes.push(new(tree.Paren)(new(tree.Rule)(p, e, null, i, true))); - } else if (e) { - nodes.push(new(tree.Paren)(e)); - } else { - return null; - } - } else { return null } - } - } while (e); - - if (nodes.length > 0) { - return new(tree.Expression)(nodes); - } - }, - - mediaFeatures: function () { - var e, features = []; - - do { - if (e = $(this.mediaFeature)) { - features.push(e); - if (! $(',')) { break } - } else if (e = $(this.entities.variable)) { - features.push(e); - if (! $(',')) { break } - } - } while (e); - - return features.length > 0 ? features : null; - }, - - media: function () { - var features, rules; - - if ($(/^@media/)) { - features = $(this.mediaFeatures); - - if (rules = $(this.block)) { - return new(tree.Media)(rules, features); - } - } - }, - - // - // A CSS Directive - // - // @charset "utf-8"; - // - directive: function () { - var name, value, rules, types, e, nodes; - - if (input.charAt(i) !== '@') return; - - if (value = $(this['import']) || $(this.media)) { - return value; - } else if (name = $(/^@page|@keyframes/) || $(/^@(?:-webkit-|-moz-|-o-|-ms-)[a-z0-9-]+/)) { - types = ($(/^[^{]+/) || '').trim(); - if (rules = $(this.block)) { - return new(tree.Directive)(name + " " + types, rules); - } - } else if (name = $(/^@[-a-z]+/)) { - if (name === '@font-face') { - if (rules = $(this.block)) { - return new(tree.Directive)(name, rules); - } - } else if ((value = $(this.entity)) && $(';')) { - return new(tree.Directive)(name, value); - } - } - }, - font: function () { - var value = [], expression = [], weight, shorthand, font, e; - - while (e = $(this.shorthand) || $(this.entity)) { - expression.push(e); - } - value.push(new(tree.Expression)(expression)); - - if ($(',')) { - while (e = $(this.expression)) { - value.push(e); - if (! $(',')) { break } - } - } - return new(tree.Value)(value); - }, - - // - // A Value is a comma-delimited list of Expressions - // - // font-family: Baskerville, Georgia, serif; - // - // In a Rule, a Value represents everything after the `:`, - // and before the `;`. - // - value: function () { - var e, expressions = [], important; - - while (e = $(this.expression)) { - expressions.push(e); - if (! $(',')) { break } - } - - if (expressions.length > 0) { - return new(tree.Value)(expressions); - } - }, - important: function () { - if (input.charAt(i) === '!') { - return $(/^! *important/); - } - }, - sub: function () { - var e; - - if ($('(') && (e = $(this.expression)) && $(')')) { - return e; - } - }, - multiplication: function () { - var m, a, op, operation; - if (m = $(this.operand)) { - while (!peek(/^\/\*/) && (op = ($('/') || $('*'))) && (a = $(this.operand))) { - operation = new(tree.Operation)(op, [operation || m, a]); - } - return operation || m; - } - }, - addition: function () { - var m, a, op, operation; - if (m = $(this.multiplication)) { - while ((op = $(/^[-+]\s+/) || (input.charAt(i - 1) != ' ' && ($('+') || $('-')))) && - (a = $(this.multiplication))) { - operation = new(tree.Operation)(op, [operation || m, a]); - } - return operation || m; - } - }, - conditions: function () { - var a, b, index = i, condition; - - if (a = $(this.condition)) { - while ($(',') && (b = $(this.condition))) { - condition = new(tree.Condition)('or', condition || a, b, index); - } - return condition || a; - } - }, - condition: function () { - var a, b, c, op, index = i, negate = false; - - if ($(/^not/)) { negate = true } - expect('('); - if (a = $(this.addition) || $(this.entities.keyword) || $(this.entities.quoted)) { - if (op = $(/^(?:>=|=<|[<=>])/)) { - if (b = $(this.addition) || $(this.entities.keyword) || $(this.entities.quoted)) { - c = new(tree.Condition)(op, a, b, index, negate); - } else { - error('expected expression'); - } - } else { - c = new(tree.Condition)('=', a, new(tree.Keyword)('true'), index, negate); - } - expect(')'); - return $(/^and/) ? new(tree.Condition)('and', c, $(this.condition)) : c; - } - }, - - // - // An operand is anything that can be part of an operation, - // such as a Color, or a Variable - // - operand: function () { - var negate, p = input.charAt(i + 1); - - if (input.charAt(i) === '-' && (p === '@' || p === '(')) { negate = $('-') } - var o = $(this.sub) || $(this.entities.dimension) || - $(this.entities.color) || $(this.entities.variable) || - $(this.entities.call); - return negate ? new(tree.Operation)('*', [new(tree.Dimension)(-1), o]) - : o; - }, - - // - // Expressions either represent mathematical operations, - // or white-space delimited Entities. - // - // 1px solid black - // @var * 2 - // - expression: function () { - var e, delim, entities = [], d; - - while (e = $(this.addition) || $(this.entity)) { - entities.push(e); - } - if (entities.length > 0) { - return new(tree.Expression)(entities); - } - }, - property: function () { - var name; - - if (name = $(/^(\*?-?[-a-z_0-9]+)\s*:/)) { - return name[1]; - } - } - } - }; -}; - -if (less.mode === 'browser' || less.mode === 'rhino') { - // - // Used by `@import` directives - // - less.Parser.importer = function (path, paths, callback, env) { - if (!/^([a-z]+:)?\//.test(path) && paths.length > 0) { - path = paths[0] + path; - } - // We pass `true` as 3rd argument, to force the reload of the import. - // This is so we can get the syntax tree as opposed to just the CSS output, - // as we need this to evaluate the current stylesheet. - loadStyleSheet({ href: path, title: path, type: env.mime }, function (e) { - if (e && typeof(env.errback) === "function") { - env.errback.call(null, path, paths, callback, env); - } else { - callback.apply(null, arguments); - } - }, true); - }; -} - diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/rhino.js b/askbot/skins/default/media/style/node_modules/less/lib/less/rhino.js deleted file mode 100644 index a2c5662f..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/rhino.js +++ /dev/null @@ -1,62 +0,0 @@ -var name; - -function loadStyleSheet(sheet, callback, reload, remaining) { - var sheetName = name.slice(0, name.lastIndexOf('/') + 1) + sheet.href; - var input = readFile(sheetName); - var parser = new less.Parser({ - paths: [sheet.href.replace(/[\w\.-]+$/, '')] - }); - parser.parse(input, function (e, root) { - if (e) { - print("Error: " + e); - quit(1); - } - callback(root, sheet, { local: false, lastModified: 0, remaining: remaining }); - }); - - // callback({}, sheet, { local: true, remaining: remaining }); -} - -function writeFile(filename, content) { - var fstream = new java.io.FileWriter(filename); - var out = new java.io.BufferedWriter(fstream); - out.write(content); - out.close(); -} - -// Command line integration via Rhino -(function (args) { - name = args[0]; - var output = args[1]; - - if (!name) { - print('No files present in the fileset; Check your pattern match in build.xml'); - quit(1); - } - path = name.split("/");path.pop();path=path.join("/") - - var input = readFile(name); - - if (!input) { - print('lesscss: couldn\'t open file ' + name); - quit(1); - } - - var result; - var parser = new less.Parser(); - parser.parse(input, function (e, root) { - if (e) { - quit(1); - } else { - result = root.toCSS(); - if (output) { - writeFile(output, result); - print("Written to " + output); - } else { - print(result); - } - quit(0); - } - }); - print("done"); -}(arguments)); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree.js deleted file mode 100644 index 24ecd712..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree.js +++ /dev/null @@ -1,17 +0,0 @@ -(function (tree) { - -tree.find = function (obj, fun) { - for (var i = 0, r; i < obj.length; i++) { - if (r = fun.call(obj, obj[i])) { return r } - } - return null; -}; -tree.jsify = function (obj) { - if (Array.isArray(obj.value) && (obj.value.length > 1)) { - return '[' + obj.value.map(function (v) { return v.toCSS(false) }).join(', ') + ']'; - } else { - return obj.toCSS(false); - } -}; - -})(require('./tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/alpha.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/alpha.js deleted file mode 100644 index 139ae920..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/alpha.js +++ /dev/null @@ -1,17 +0,0 @@ -(function (tree) { - -tree.Alpha = function (val) { - this.value = val; -}; -tree.Alpha.prototype = { - toCSS: function () { - return "alpha(opacity=" + - (this.value.toCSS ? this.value.toCSS() : this.value) + ")"; - }, - eval: function (env) { - if (this.value.eval) { this.value = this.value.eval(env) } - return this; - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/anonymous.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/anonymous.js deleted file mode 100644 index 460c9ec7..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/anonymous.js +++ /dev/null @@ -1,13 +0,0 @@ -(function (tree) { - -tree.Anonymous = function (string) { - this.value = string.value || string; -}; -tree.Anonymous.prototype = { - toCSS: function () { - return this.value; - }, - eval: function () { return this } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/assignment.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/assignment.js deleted file mode 100644 index 70ce6e2f..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/assignment.js +++ /dev/null @@ -1,17 +0,0 @@ -(function (tree) { - -tree.Assignment = function (key, val) { - this.key = key; - this.value = val; -}; -tree.Assignment.prototype = { - toCSS: function () { - return this.key + '=' + (this.value.toCSS ? this.value.toCSS() : this.value); - }, - eval: function (env) { - if (this.value.eval) { this.value = this.value.eval(env) } - return this; - } -}; - -})(require('../tree')); \ No newline at end of file diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/call.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/call.js deleted file mode 100644 index c1465dd4..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/call.js +++ /dev/null @@ -1,48 +0,0 @@ -(function (tree) { - -// -// A function call node. -// -tree.Call = function (name, args, index, filename) { - this.name = name; - this.args = args; - this.index = index; - this.filename = filename; -}; -tree.Call.prototype = { - // - // When evaluating a function call, - // we either find the function in `tree.functions` [1], - // in which case we call it, passing the evaluated arguments, - // or we simply print it out as it appeared originally [2]. - // - // The *functions.js* file contains the built-in functions. - // - // The reason why we evaluate the arguments, is in the case where - // we try to pass a variable to a function, like: `saturate(@color)`. - // The function should receive the value, not the variable. - // - eval: function (env) { - var args = this.args.map(function (a) { return a.eval(env) }); - - if (this.name in tree.functions) { // 1. - try { - return tree.functions[this.name].apply(tree.functions, args); - } catch (e) { - throw { type: e.type || "Runtime", - message: "error evaluating function `" + this.name + "`" + - (e.message ? ': ' + e.message : ''), - index: this.index, filename: this.filename }; - } - } else { // 2. - return new(tree.Anonymous)(this.name + - "(" + args.map(function (a) { return a.toCSS() }).join(', ') + ")"); - } - }, - - toCSS: function (env) { - return this.eval(env).toCSS(); - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/color.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/color.js deleted file mode 100644 index 37ce1781..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/color.js +++ /dev/null @@ -1,101 +0,0 @@ -(function (tree) { -// -// RGB Colors - #ff0014, #eee -// -tree.Color = function (rgb, a) { - // - // The end goal here, is to parse the arguments - // into an integer triplet, such as `128, 255, 0` - // - // This facilitates operations and conversions. - // - if (Array.isArray(rgb)) { - this.rgb = rgb; - } else if (rgb.length == 6) { - this.rgb = rgb.match(/.{2}/g).map(function (c) { - return parseInt(c, 16); - }); - } else { - this.rgb = rgb.split('').map(function (c) { - return parseInt(c + c, 16); - }); - } - this.alpha = typeof(a) === 'number' ? a : 1; -}; -tree.Color.prototype = { - eval: function () { return this }, - - // - // If we have some transparency, the only way to represent it - // is via `rgba`. Otherwise, we use the hex representation, - // which has better compatibility with older browsers. - // Values are capped between `0` and `255`, rounded and zero-padded. - // - toCSS: function () { - if (this.alpha < 1.0) { - return "rgba(" + this.rgb.map(function (c) { - return Math.round(c); - }).concat(this.alpha).join(', ') + ")"; - } else { - return '#' + this.rgb.map(function (i) { - i = Math.round(i); - i = (i > 255 ? 255 : (i < 0 ? 0 : i)).toString(16); - return i.length === 1 ? '0' + i : i; - }).join(''); - } - }, - - // - // Operations have to be done per-channel, if not, - // channels will spill onto each other. Once we have - // our result, in the form of an integer triplet, - // we create a new Color node to hold the result. - // - operate: function (op, other) { - var result = []; - - if (! (other instanceof tree.Color)) { - other = other.toColor(); - } - - for (var c = 0; c < 3; c++) { - result[c] = tree.operate(op, this.rgb[c], other.rgb[c]); - } - return new(tree.Color)(result, this.alpha + other.alpha); - }, - - toHSL: function () { - var r = this.rgb[0] / 255, - g = this.rgb[1] / 255, - b = this.rgb[2] / 255, - a = this.alpha; - - var max = Math.max(r, g, b), min = Math.min(r, g, b); - var h, s, l = (max + min) / 2, d = max - min; - - if (max === min) { - h = s = 0; - } else { - s = l > 0.5 ? d / (2 - max - min) : d / (max + min); - - switch (max) { - case r: h = (g - b) / d + (g < b ? 6 : 0); break; - case g: h = (b - r) / d + 2; break; - case b: h = (r - g) / d + 4; break; - } - h /= 6; - } - return { h: h * 360, s: s, l: l, a: a }; - }, - toARGB: function () { - var argb = [Math.round(this.alpha * 255)].concat(this.rgb); - return '#' + argb.map(function (i) { - i = Math.round(i); - i = (i > 255 ? 255 : (i < 0 ? 0 : i)).toString(16); - return i.length === 1 ? '0' + i : i; - }).join(''); - } -}; - - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/comment.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/comment.js deleted file mode 100644 index f4a33840..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/comment.js +++ /dev/null @@ -1,14 +0,0 @@ -(function (tree) { - -tree.Comment = function (value, silent) { - this.value = value; - this.silent = !!silent; -}; -tree.Comment.prototype = { - toCSS: function (env) { - return env.compress ? '' : this.value; - }, - eval: function () { return this } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/condition.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/condition.js deleted file mode 100644 index 6b79dc96..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/condition.js +++ /dev/null @@ -1,42 +0,0 @@ -(function (tree) { - -tree.Condition = function (op, l, r, i, negate) { - this.op = op.trim(); - this.lvalue = l; - this.rvalue = r; - this.index = i; - this.negate = negate; -}; -tree.Condition.prototype.eval = function (env) { - var a = this.lvalue.eval(env), - b = this.rvalue.eval(env); - - var i = this.index, result; - - var result = (function (op) { - switch (op) { - case 'and': - return a && b; - case 'or': - return a || b; - default: - if (a.compare) { - result = a.compare(b); - } else if (b.compare) { - result = b.compare(a); - } else { - throw { type: "Type", - message: "Unable to perform comparison", - index: i }; - } - switch (result) { - case -1: return op === '<' || op === '=<'; - case 0: return op === '=' || op === '>=' || op === '=<'; - case 1: return op === '>' || op === '>='; - } - } - })(this.op); - return this.negate ? !result : result; -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/dimension.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/dimension.js deleted file mode 100644 index 9a6fce3d..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/dimension.js +++ /dev/null @@ -1,49 +0,0 @@ -(function (tree) { - -// -// A number with a unit -// -tree.Dimension = function (value, unit) { - this.value = parseFloat(value); - this.unit = unit || null; -}; - -tree.Dimension.prototype = { - eval: function () { return this }, - toColor: function () { - return new(tree.Color)([this.value, this.value, this.value]); - }, - toCSS: function () { - var css = this.value + this.unit; - return css; - }, - - // In an operation between two Dimensions, - // we default to the first Dimension's unit, - // so `1px + 2em` will yield `3px`. - // In the future, we could implement some unit - // conversions such that `100cm + 10mm` would yield - // `101cm`. - operate: function (op, other) { - return new(tree.Dimension) - (tree.operate(op, this.value, other.value), - this.unit || other.unit); - }, - - // TODO: Perform unit conversion before comparing - compare: function (other) { - if (other instanceof tree.Dimension) { - if (other.value > this.value) { - return -1; - } else if (other.value < this.value) { - return 1; - } else { - return 0; - } - } else { - return -1; - } - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/directive.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/directive.js deleted file mode 100644 index 27538332..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/directive.js +++ /dev/null @@ -1,35 +0,0 @@ -(function (tree) { - -tree.Directive = function (name, value, features) { - this.name = name; - - if (Array.isArray(value)) { - this.ruleset = new(tree.Ruleset)([], value); - this.ruleset.allowImports = true; - } else { - this.value = value; - } -}; -tree.Directive.prototype = { - toCSS: function (ctx, env) { - if (this.ruleset) { - this.ruleset.root = true; - return this.name + (env.compress ? '{' : ' {\n ') + - this.ruleset.toCSS(ctx, env).trim().replace(/\n/g, '\n ') + - (env.compress ? '}': '\n}\n'); - } else { - return this.name + ' ' + this.value.toCSS() + ';\n'; - } - }, - eval: function (env) { - env.frames.unshift(this); - this.ruleset = this.ruleset && this.ruleset.eval(env); - env.frames.shift(); - return this; - }, - variable: function (name) { return tree.Ruleset.prototype.variable.call(this.ruleset, name) }, - find: function () { return tree.Ruleset.prototype.find.apply(this.ruleset, arguments) }, - rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.ruleset) } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/element.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/element.js deleted file mode 100644 index 4736857e..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/element.js +++ /dev/null @@ -1,47 +0,0 @@ -(function (tree) { - -tree.Element = function (combinator, value, index) { - this.combinator = combinator instanceof tree.Combinator ? - combinator : new(tree.Combinator)(combinator); - - if (typeof(value) === 'string') { - this.value = value.trim(); - } else if (value) { - this.value = value; - } else { - this.value = ""; - } - this.index = index; -}; -tree.Element.prototype.eval = function (env) { - return new(tree.Element)(this.combinator, - this.value.eval ? this.value.eval(env) : this.value, - this.index); -}; -tree.Element.prototype.toCSS = function (env) { - return this.combinator.toCSS(env || {}) + (this.value.toCSS ? this.value.toCSS(env) : this.value); -}; - -tree.Combinator = function (value) { - if (value === ' ') { - this.value = ' '; - } else if (value === '& ') { - this.value = '& '; - } else { - this.value = value ? value.trim() : ""; - } -}; -tree.Combinator.prototype.toCSS = function (env) { - return { - '' : '', - ' ' : ' ', - '&' : '', - '& ' : ' ', - ':' : ' :', - '+' : env.compress ? '+' : ' + ', - '~' : env.compress ? '~' : ' ~ ', - '>' : env.compress ? '>' : ' > ' - }[this.value]; -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/expression.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/expression.js deleted file mode 100644 index fbfa9c5b..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/expression.js +++ /dev/null @@ -1,23 +0,0 @@ -(function (tree) { - -tree.Expression = function (value) { this.value = value }; -tree.Expression.prototype = { - eval: function (env) { - if (this.value.length > 1) { - return new(tree.Expression)(this.value.map(function (e) { - return e.eval(env); - })); - } else if (this.value.length === 1) { - return this.value[0].eval(env); - } else { - return this; - } - }, - toCSS: function (env) { - return this.value.map(function (e) { - return e.toCSS ? e.toCSS(env) : ''; - }).join(' '); - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/import.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/import.js deleted file mode 100644 index c3b0b009..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/import.js +++ /dev/null @@ -1,79 +0,0 @@ -(function (tree) { -// -// CSS @import node -// -// The general strategy here is that we don't want to wait -// for the parsing to be completed, before we start importing -// the file. That's because in the context of a browser, -// most of the time will be spent waiting for the server to respond. -// -// On creation, we push the import path to our import queue, though -// `import,push`, we also pass it a callback, which it'll call once -// the file has been fetched, and parsed. -// -tree.Import = function (path, imports, features, index) { - var that = this; - - this.index = index; - this._path = path; - this.features = features && new(tree.Value)(features); - - // The '.less' extension is optional - if (path instanceof tree.Quoted) { - this.path = /\.(le?|c)ss(\?.*)?$/.test(path.value) ? path.value : path.value + '.less'; - } else { - this.path = path.value.value || path.value; - } - - this.css = /css(\?.*)?$/.test(this.path); - - // Only pre-compile .less files - if (! this.css) { - imports.push(this.path, function (e, root) { - if (e) { e.index = index } - that.root = root || new(tree.Ruleset)([], []); - }); - } -}; - -// -// The actual import node doesn't return anything, when converted to CSS. -// The reason is that it's used at the evaluation stage, so that the rules -// it imports can be treated like any other rules. -// -// In `eval`, we make sure all Import nodes get evaluated, recursively, so -// we end up with a flat structure, which can easily be imported in the parent -// ruleset. -// -tree.Import.prototype = { - toCSS: function (env) { - var features = this.features ? ' ' + this.features.toCSS(env) : ''; - - if (this.css) { - return "@import " + this._path.toCSS() + features + ';\n'; - } else { - return ""; - } - }, - eval: function (env) { - var ruleset, features = this.features && this.features.eval(env); - - if (this.css) { - return this; - } else { - ruleset = new(tree.Ruleset)([], this.root.rules.slice(0)); - - for (var i = 0; i < ruleset.rules.length; i++) { - if (ruleset.rules[i] instanceof tree.Import) { - Array.prototype - .splice - .apply(ruleset.rules, - [i, 1].concat(ruleset.rules[i].eval(env))); - } - } - return this.features ? new(tree.Media)(ruleset.rules, this.features.value) : ruleset.rules; - } - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/javascript.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/javascript.js deleted file mode 100644 index 772a31dd..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/javascript.js +++ /dev/null @@ -1,51 +0,0 @@ -(function (tree) { - -tree.JavaScript = function (string, index, escaped) { - this.escaped = escaped; - this.expression = string; - this.index = index; -}; -tree.JavaScript.prototype = { - eval: function (env) { - var result, - that = this, - context = {}; - - var expression = this.expression.replace(/@\{([\w-]+)\}/g, function (_, name) { - return tree.jsify(new(tree.Variable)('@' + name, that.index).eval(env)); - }); - - try { - expression = new(Function)('return (' + expression + ')'); - } catch (e) { - throw { message: "JavaScript evaluation error: `" + expression + "`" , - index: this.index }; - } - - for (var k in env.frames[0].variables()) { - context[k.slice(1)] = { - value: env.frames[0].variables()[k].value, - toJS: function () { - return this.value.eval(env).toCSS(); - } - }; - } - - try { - result = expression.call(context); - } catch (e) { - throw { message: "JavaScript evaluation error: '" + e.name + ': ' + e.message + "'" , - index: this.index }; - } - if (typeof(result) === 'string') { - return new(tree.Quoted)('"' + result + '"', result, this.escaped, this.index); - } else if (Array.isArray(result)) { - return new(tree.Anonymous)(result.join(', ')); - } else { - return new(tree.Anonymous)(result); - } - } -}; - -})(require('../tree')); - diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/keyword.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/keyword.js deleted file mode 100644 index 701b79e5..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/keyword.js +++ /dev/null @@ -1,19 +0,0 @@ -(function (tree) { - -tree.Keyword = function (value) { this.value = value }; -tree.Keyword.prototype = { - eval: function () { return this }, - toCSS: function () { return this.value }, - compare: function (other) { - if (other instanceof tree.Keyword) { - return other.value === this.value ? 0 : 1; - } else { - return -1; - } - } -}; - -tree.True = new(tree.Keyword)('true'); -tree.False = new(tree.Keyword)('false'); - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/media.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/media.js deleted file mode 100644 index 2b7b26e5..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/media.js +++ /dev/null @@ -1,114 +0,0 @@ -(function (tree) { - -tree.Media = function (value, features) { - var el = new(tree.Element)('&', null, 0), - selectors = [new(tree.Selector)([el])]; - - this.features = new(tree.Value)(features); - this.ruleset = new(tree.Ruleset)(selectors, value); - this.ruleset.allowImports = true; -}; -tree.Media.prototype = { - toCSS: function (ctx, env) { - var features = this.features.toCSS(env); - - this.ruleset.root = (ctx.length === 0 || ctx[0].multiMedia); - return '@media ' + features + (env.compress ? '{' : ' {\n ') + - this.ruleset.toCSS(ctx, env).trim().replace(/\n/g, '\n ') + - (env.compress ? '}': '\n}\n'); - }, - eval: function (env) { - if (!env.mediaBlocks) { - env.mediaBlocks = []; - env.mediaPath = []; - } - - var blockIndex = env.mediaBlocks.length; - env.mediaPath.push(this); - env.mediaBlocks.push(this); - - var media = new(tree.Media)([], []); - media.features = this.features.eval(env); - - env.frames.unshift(this.ruleset); - media.ruleset = this.ruleset.eval(env); - env.frames.shift(); - - env.mediaBlocks[blockIndex] = media; - env.mediaPath.pop(); - - return env.mediaPath.length === 0 ? media.evalTop(env) : - media.evalNested(env) - }, - variable: function (name) { return tree.Ruleset.prototype.variable.call(this.ruleset, name) }, - find: function () { return tree.Ruleset.prototype.find.apply(this.ruleset, arguments) }, - rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.ruleset) }, - - evalTop: function (env) { - var result = this; - - // Render all dependent Media blocks. - if (env.mediaBlocks.length > 1) { - var el = new(tree.Element)('&', null, 0); - var selectors = [new(tree.Selector)([el])]; - result = new(tree.Ruleset)(selectors, env.mediaBlocks); - result.multiMedia = true; - } - - delete env.mediaBlocks; - delete env.mediaPath; - - return result; - }, - evalNested: function (env) { - var i, value, - path = env.mediaPath.concat([this]); - - // Extract the media-query conditions separated with `,` (OR). - for (i = 0; i < path.length; i++) { - value = path[i].features instanceof tree.Value ? - path[i].features.value : path[i].features; - path[i] = Array.isArray(value) ? value : [value]; - } - - // Trace all permutations to generate the resulting media-query. - // - // (a, b and c) with nested (d, e) -> - // a and d - // a and e - // b and c and d - // b and c and e - this.features = new(tree.Value)(this.permute(path).map(function (path) { - path = path.map(function (fragment) { - return fragment.toCSS ? fragment : new(tree.Anonymous)(fragment); - }); - - for(i = path.length - 1; i > 0; i--) { - path.splice(i, 0, new(tree.Anonymous)("and")); - } - - return new(tree.Expression)(path); - })); - - // Fake a tree-node that doesn't output anything. - return new(tree.Ruleset)([], []); - }, - permute: function (arr) { - if (arr.length === 0) { - return []; - } else if (arr.length === 1) { - return arr[0]; - } else { - var result = []; - var rest = this.permute(arr.slice(1)); - for (var i = 0; i < rest.length; i++) { - for (var j = 0; j < arr[0].length; j++) { - result.push([arr[0][j]].concat(rest[i])); - } - } - return result; - } - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/mixin.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/mixin.js deleted file mode 100644 index 4464bc6c..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/mixin.js +++ /dev/null @@ -1,135 +0,0 @@ -(function (tree) { - -tree.mixin = {}; -tree.mixin.Call = function (elements, args, index, filename, important) { - this.selector = new(tree.Selector)(elements); - this.arguments = args; - this.index = index; - this.filename = filename; - this.important = important; -}; -tree.mixin.Call.prototype = { - eval: function (env) { - var mixins, args, rules = [], match = false; - - for (var i = 0; i < env.frames.length; i++) { - if ((mixins = env.frames[i].find(this.selector)).length > 0) { - args = this.arguments && this.arguments.map(function (a) { return a.eval(env) }); - for (var m = 0; m < mixins.length; m++) { - if (mixins[m].match(args, env)) { - try { - Array.prototype.push.apply( - rules, mixins[m].eval(env, this.arguments, this.important).rules); - match = true; - } catch (e) { - throw { message: e.message, index: this.index, filename: this.filename, stack: e.stack }; - } - } - } - if (match) { - return rules; - } else { - throw { type: 'Runtime', - message: 'No matching definition was found for `' + - this.selector.toCSS().trim() + '(' + - this.arguments.map(function (a) { - return a.toCSS(); - }).join(', ') + ")`", - index: this.index, filename: this.filename }; - } - } - } - throw { type: 'Name', - message: this.selector.toCSS().trim() + " is undefined", - index: this.index, filename: this.filename }; - } -}; - -tree.mixin.Definition = function (name, params, rules, condition, variadic) { - this.name = name; - this.selectors = [new(tree.Selector)([new(tree.Element)(null, name)])]; - this.params = params; - this.condition = condition; - this.variadic = variadic; - this.arity = params.length; - this.rules = rules; - this._lookups = {}; - this.required = params.reduce(function (count, p) { - if (!p.name || (p.name && !p.value)) { return count + 1 } - else { return count } - }, 0); - this.parent = tree.Ruleset.prototype; - this.frames = []; -}; -tree.mixin.Definition.prototype = { - toCSS: function () { return "" }, - variable: function (name) { return this.parent.variable.call(this, name) }, - variables: function () { return this.parent.variables.call(this) }, - find: function () { return this.parent.find.apply(this, arguments) }, - rulesets: function () { return this.parent.rulesets.apply(this) }, - - evalParams: function (env, args) { - var frame = new(tree.Ruleset)(null, []), varargs; - - for (var i = 0, val, name; i < this.params.length; i++) { - if (name = this.params[i].name) { - if (this.params[i].variadic && args) { - varargs = []; - for (var j = i; j < args.length; j++) { - varargs.push(args[j].eval(env)); - } - frame.rules.unshift(new(tree.Rule)(name, new(tree.Expression)(varargs).eval(env))); - } else if (val = (args && args[i]) || this.params[i].value) { - frame.rules.unshift(new(tree.Rule)(name, val.eval(env))); - } else { - throw { type: 'Runtime', message: "wrong number of arguments for " + this.name + - ' (' + args.length + ' for ' + this.arity + ')' }; - } - } - } - return frame; - }, - eval: function (env, args, important) { - var frame = this.evalParams(env, args), context, _arguments = [], rules, start; - - for (var i = 0; i < Math.max(this.params.length, args && args.length); i++) { - _arguments.push(args[i] || this.params[i].value); - } - frame.rules.unshift(new(tree.Rule)('@arguments', new(tree.Expression)(_arguments).eval(env))); - - rules = important ? - this.rules.map(function (r) { - return new(tree.Rule)(r.name, r.value, '!important', r.index); - }) : this.rules.slice(0); - - return new(tree.Ruleset)(null, rules).eval({ - frames: [this, frame].concat(this.frames, env.frames) - }); - }, - match: function (args, env) { - var argsLength = (args && args.length) || 0, len, frame; - - if (! this.variadic) { - if (argsLength < this.required) { return false } - if (argsLength > this.params.length) { return false } - if ((this.required > 0) && (argsLength > this.params.length)) { return false } - } - - if (this.condition && !this.condition.eval({ - frames: [this.evalParams(env, args)].concat(env.frames) - })) { return false } - - len = Math.min(argsLength, this.arity); - - for (var i = 0; i < len; i++) { - if (!this.params[i].name) { - if (args[i].eval(env).toCSS() != this.params[i].value.eval(env).toCSS()) { - return false; - } - } - } - return true; - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/operation.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/operation.js deleted file mode 100644 index 1ce22fb0..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/operation.js +++ /dev/null @@ -1,32 +0,0 @@ -(function (tree) { - -tree.Operation = function (op, operands) { - this.op = op.trim(); - this.operands = operands; -}; -tree.Operation.prototype.eval = function (env) { - var a = this.operands[0].eval(env), - b = this.operands[1].eval(env), - temp; - - if (a instanceof tree.Dimension && b instanceof tree.Color) { - if (this.op === '*' || this.op === '+') { - temp = b, b = a, a = temp; - } else { - throw { name: "OperationError", - message: "Can't substract or divide a color from a number" }; - } - } - return a.operate(this.op, b); -}; - -tree.operate = function (op, a, b) { - switch (op) { - case '+': return a + b; - case '-': return a - b; - case '*': return a * b; - case '/': return a / b; - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/paren.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/paren.js deleted file mode 100644 index 384a43c7..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/paren.js +++ /dev/null @@ -1,16 +0,0 @@ - -(function (tree) { - -tree.Paren = function (node) { - this.value = node; -}; -tree.Paren.prototype = { - toCSS: function (env) { - return '(' + this.value.toCSS(env) + ')'; - }, - eval: function (env) { - return new(tree.Paren)(this.value.eval(env)); - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/quoted.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/quoted.js deleted file mode 100644 index 794bf4ce..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/quoted.js +++ /dev/null @@ -1,29 +0,0 @@ -(function (tree) { - -tree.Quoted = function (str, content, escaped, i) { - this.escaped = escaped; - this.value = content || ''; - this.quote = str.charAt(0); - this.index = i; -}; -tree.Quoted.prototype = { - toCSS: function () { - if (this.escaped) { - return this.value; - } else { - return this.quote + this.value + this.quote; - } - }, - eval: function (env) { - var that = this; - var value = this.value.replace(/`([^`]+)`/g, function (_, exp) { - return new(tree.JavaScript)(exp, that.index, true).eval(env).value; - }).replace(/@\{([\w-]+)\}/g, function (_, name) { - var v = new(tree.Variable)('@' + name, that.index).eval(env); - return ('value' in v) ? v.value : v.toCSS(); - }); - return new(tree.Quoted)(this.quote + value + this.quote, value, this.escaped, this.index); - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/rule.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/rule.js deleted file mode 100644 index 9e4e54a3..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/rule.js +++ /dev/null @@ -1,42 +0,0 @@ -(function (tree) { - -tree.Rule = function (name, value, important, index, inline) { - this.name = name; - this.value = (value instanceof tree.Value) ? value : new(tree.Value)([value]); - this.important = important ? ' ' + important.trim() : ''; - this.index = index; - this.inline = inline || false; - - if (name.charAt(0) === '@') { - this.variable = true; - } else { this.variable = false } -}; -tree.Rule.prototype.toCSS = function (env) { - if (this.variable) { return "" } - else { - return this.name + (env.compress ? ':' : ': ') + - this.value.toCSS(env) + - this.important + (this.inline ? "" : ";"); - } -}; - -tree.Rule.prototype.eval = function (context) { - return new(tree.Rule)(this.name, - this.value.eval(context), - this.important, - this.index, this.inline); -}; - -tree.Shorthand = function (a, b) { - this.a = a; - this.b = b; -}; - -tree.Shorthand.prototype = { - toCSS: function (env) { - return this.a.toCSS(env) + "/" + this.b.toCSS(env); - }, - eval: function () { return this } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/ruleset.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/ruleset.js deleted file mode 100644 index 7d6283ea..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/ruleset.js +++ /dev/null @@ -1,216 +0,0 @@ -(function (tree) { - -tree.Ruleset = function (selectors, rules, strictImports) { - this.selectors = selectors; - this.rules = rules; - this._lookups = {}; - this.strictImports = strictImports; -}; -tree.Ruleset.prototype = { - eval: function (env) { - var selectors = this.selectors && this.selectors.map(function (s) { return s.eval(env) }); - var ruleset = new(tree.Ruleset)(selectors, this.rules.slice(0), this.strictImports); - - ruleset.root = this.root; - ruleset.allowImports = this.allowImports; - - // push the current ruleset to the frames stack - env.frames.unshift(ruleset); - - // Evaluate imports - if (ruleset.root || ruleset.allowImports || !ruleset.strictImports) { - for (var i = 0; i < ruleset.rules.length; i++) { - if (ruleset.rules[i] instanceof tree.Import) { - Array.prototype.splice - .apply(ruleset.rules, [i, 1].concat(ruleset.rules[i].eval(env))); - } - } - } - - // Store the frames around mixin definitions, - // so they can be evaluated like closures when the time comes. - for (var i = 0; i < ruleset.rules.length; i++) { - if (ruleset.rules[i] instanceof tree.mixin.Definition) { - ruleset.rules[i].frames = env.frames.slice(0); - } - } - - // Evaluate mixin calls. - for (var i = 0; i < ruleset.rules.length; i++) { - if (ruleset.rules[i] instanceof tree.mixin.Call) { - Array.prototype.splice - .apply(ruleset.rules, [i, 1].concat(ruleset.rules[i].eval(env))); - } - } - - // Evaluate everything else - for (var i = 0, rule; i < ruleset.rules.length; i++) { - rule = ruleset.rules[i]; - - if (! (rule instanceof tree.mixin.Definition)) { - ruleset.rules[i] = rule.eval ? rule.eval(env) : rule; - } - } - - // Pop the stack - env.frames.shift(); - - return ruleset; - }, - match: function (args) { - return !args || args.length === 0; - }, - variables: function () { - if (this._variables) { return this._variables } - else { - return this._variables = this.rules.reduce(function (hash, r) { - if (r instanceof tree.Rule && r.variable === true) { - hash[r.name] = r; - } - return hash; - }, {}); - } - }, - variable: function (name) { - return this.variables()[name]; - }, - rulesets: function () { - if (this._rulesets) { return this._rulesets } - else { - return this._rulesets = this.rules.filter(function (r) { - return (r instanceof tree.Ruleset) || (r instanceof tree.mixin.Definition); - }); - } - }, - find: function (selector, self) { - self = self || this; - var rules = [], rule, match, - key = selector.toCSS(); - - if (key in this._lookups) { return this._lookups[key] } - - this.rulesets().forEach(function (rule) { - if (rule !== self) { - for (var j = 0; j < rule.selectors.length; j++) { - if (match = selector.match(rule.selectors[j])) { - if (selector.elements.length > rule.selectors[j].elements.length) { - Array.prototype.push.apply(rules, rule.find( - new(tree.Selector)(selector.elements.slice(1)), self)); - } else { - rules.push(rule); - } - break; - } - } - } - }); - return this._lookups[key] = rules; - }, - // - // Entry point for code generation - // - // `context` holds an array of arrays. - // - toCSS: function (context, env) { - var css = [], // The CSS output - rules = [], // node.Rule instances - rulesets = [], // node.Ruleset instances - paths = [], // Current selectors - selector, // The fully rendered selector - rule; - - if (! this.root) { - if (context.length === 0) { - paths = this.selectors.map(function (s) { return [s] }); - } else { - this.joinSelectors(paths, context, this.selectors); - } - } - - // Compile rules and rulesets - for (var i = 0; i < this.rules.length; i++) { - rule = this.rules[i]; - - if (rule.rules || (rule instanceof tree.Directive) || (rule instanceof tree.Media)) { - rulesets.push(rule.toCSS(paths, env)); - } else if (rule instanceof tree.Comment) { - if (!rule.silent) { - if (this.root) { - rulesets.push(rule.toCSS(env)); - } else { - rules.push(rule.toCSS(env)); - } - } - } else { - if (rule.toCSS && !rule.variable) { - rules.push(rule.toCSS(env)); - } else if (rule.value && !rule.variable) { - rules.push(rule.value.toString()); - } - } - } - - rulesets = rulesets.join(''); - - // If this is the root node, we don't render - // a selector, or {}. - // Otherwise, only output if this ruleset has rules. - if (this.root) { - css.push(rules.join(env.compress ? '' : '\n')); - } else { - if (rules.length > 0) { - selector = paths.map(function (p) { - return p.map(function (s) { - return s.toCSS(env); - }).join('').trim(); - }).join( env.compress ? ',' : ',\n'); - - css.push(selector, - (env.compress ? '{' : ' {\n ') + - rules.join(env.compress ? '' : '\n ') + - (env.compress ? '}' : '\n}\n')); - } - } - css.push(rulesets); - - return css.join('') + (env.compress ? '\n' : ''); - }, - - joinSelectors: function (paths, context, selectors) { - for (var s = 0; s < selectors.length; s++) { - this.joinSelector(paths, context, selectors[s]); - } - }, - - joinSelector: function (paths, context, selector) { - var before = [], after = [], beforeElements = [], - afterElements = [], hasParentSelector = false, el; - - for (var i = 0; i < selector.elements.length; i++) { - el = selector.elements[i]; - if (el.combinator.value.charAt(0) === '&') { - hasParentSelector = true; - } - if (hasParentSelector) afterElements.push(el); - else beforeElements.push(el); - } - - if (! hasParentSelector) { - afterElements = beforeElements; - beforeElements = []; - } - - if (beforeElements.length > 0) { - before.push(new(tree.Selector)(beforeElements)); - } - - if (afterElements.length > 0) { - after.push(new(tree.Selector)(afterElements)); - } - - for (var c = 0; c < context.length; c++) { - paths.push(before.concat(context[c]).concat(after)); - } - } -}; -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/selector.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/selector.js deleted file mode 100644 index 65abbb69..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/selector.js +++ /dev/null @@ -1,42 +0,0 @@ -(function (tree) { - -tree.Selector = function (elements) { - this.elements = elements; - if (this.elements[0].combinator.value === "") { - this.elements[0].combinator.value = ' '; - } -}; -tree.Selector.prototype.match = function (other) { - var len = this.elements.length, - olen = other.elements.length, - max = Math.min(len, olen); - - if (len < olen) { - return false; - } else { - for (var i = 0; i < max; i++) { - if (this.elements[i].value !== other.elements[i].value) { - return false; - } - } - } - return true; -}; -tree.Selector.prototype.eval = function (env) { - return new(tree.Selector)(this.elements.map(function (e) { - return e.eval(env); - })); -}; -tree.Selector.prototype.toCSS = function (env) { - if (this._css) { return this._css } - - return this._css = this.elements.map(function (e) { - if (typeof(e) === 'string') { - return ' ' + e.trim(); - } else { - return e.toCSS(env); - } - }).join(''); -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/url.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/url.js deleted file mode 100644 index 0caec345..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/url.js +++ /dev/null @@ -1,25 +0,0 @@ -(function (tree) { - -tree.URL = function (val, paths) { - if (val.data) { - this.attrs = val; - } else { - // Add the base path if the URL is relative and we are in the browser - if (typeof(window) !== 'undefined' && !/^(?:https?:\/\/|file:\/\/|data:|\/)/.test(val.value) && paths.length > 0) { - val.value = paths[0] + (val.value.charAt(0) === '/' ? val.value.slice(1) : val.value); - } - this.value = val; - this.paths = paths; - } -}; -tree.URL.prototype = { - toCSS: function () { - return "url(" + (this.attrs ? 'data:' + this.attrs.mime + this.attrs.charset + this.attrs.base64 + this.attrs.data - : this.value.toCSS()) + ")"; - }, - eval: function (ctx) { - return this.attrs ? this : new(tree.URL)(this.value.eval(ctx), this.paths); - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/value.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/value.js deleted file mode 100644 index 3c1eb29a..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/value.js +++ /dev/null @@ -1,24 +0,0 @@ -(function (tree) { - -tree.Value = function (value) { - this.value = value; - this.is = 'value'; -}; -tree.Value.prototype = { - eval: function (env) { - if (this.value.length === 1) { - return this.value[0].eval(env); - } else { - return new(tree.Value)(this.value.map(function (v) { - return v.eval(env); - })); - } - }, - toCSS: function (env) { - return this.value.map(function (e) { - return e.toCSS(env); - }).join(env.compress ? ',' : ', '); - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/variable.js b/askbot/skins/default/media/style/node_modules/less/lib/less/tree/variable.js deleted file mode 100644 index ee557e1d..00000000 --- a/askbot/skins/default/media/style/node_modules/less/lib/less/tree/variable.js +++ /dev/null @@ -1,26 +0,0 @@ -(function (tree) { - -tree.Variable = function (name, index, file) { this.name = name, this.index = index, this.file = file }; -tree.Variable.prototype = { - eval: function (env) { - var variable, v, name = this.name; - - if (name.indexOf('@@') == 0) { - name = '@' + new(tree.Variable)(name.slice(1)).eval(env).value; - } - - if (variable = tree.find(env.frames, function (frame) { - if (v = frame.variable(name)) { - return v.value.eval(env); - } - })) { return variable } - else { - throw { type: 'Name', - message: "variable " + name + " is undefined", - filename: this.file, - index: this.index }; - } - } -}; - -})(require('../tree')); diff --git a/askbot/skins/default/media/style/node_modules/less/package.json b/askbot/skins/default/media/style/node_modules/less/package.json deleted file mode 100644 index c35300b1..00000000 --- a/askbot/skins/default/media/style/node_modules/less/package.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "less", - "description": "Leaner CSS", - "url": "http://lesscss.org", - "keywords": [ - "css", - "parser", - "lesscss", - "browser" - ], - "author": { - "name": "Alexis Sellier", - "email": "self@cloudhead.net" - }, - "contributors": [], - "version": "1.3.0", - "bin": { - "lessc": "./bin/lessc" - }, - "main": "./lib/less/index", - "directories": { - "test": "./test" - }, - "engines": { - "node": ">=0.4.0" - }, - "_id": "less@1.3.0", - "dependencies": {}, - "devDependencies": {}, - "optionalDependencies": {}, - "_engineSupported": true, - "_npmVersion": "1.1.18", - "_nodeVersion": "v0.7.9-pre", - "_defaultsLoaded": true, - "_from": "less" -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/colors.css b/askbot/skins/default/media/style/node_modules/less/test/css/colors.css deleted file mode 100644 index b4516425..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/colors.css +++ /dev/null @@ -1,58 +0,0 @@ -#yelow #short { - color: #fea; -} -#yelow #long { - color: #ffeeaa; -} -#yelow #rgba { - color: rgba(255, 238, 170, 0.1); -} -#yelow #argb { - color: #1affeeaa; -} -#blue #short { - color: #00f; -} -#blue #long { - color: #0000ff; -} -#blue #rgba { - color: rgba(0, 0, 255, 0.1); -} -#blue #argb { - color: #1a0000ff; -} -#alpha #hsla { - color: rgba(61, 45, 41, 0.6); -} -#overflow .a { - color: #000000; -} -#overflow .b { - color: #ffffff; -} -#overflow .c { - color: #ffffff; -} -#overflow .d { - color: #00ff00; -} -#grey { - color: #c8c8c8; -} -#808080 { - color: #808080; -} -#00ff00 { - color: #00ff00; -} -.lightenblue { - color: #3333ff; -} -.darkenblue { - color: #0000cc; -} -.unknowncolors { - color: blue2; - border: 2px solid superred; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/comments.css b/askbot/skins/default/media/style/node_modules/less/test/css/comments.css deleted file mode 100644 index 352dd48e..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/comments.css +++ /dev/null @@ -1,56 +0,0 @@ -/******************\ -* * -* Comment Header * -* * -\******************/ -/* - - Comment - -*/ -/* - * Comment Test - * - * - cloudhead (http://cloudhead.net) - * - */ -/* Colors - * ------ - * #EDF8FC (background blue) - * #166C89 (darkest blue) - * - * Text: - * #333 (standard text) // A comment within a comment! - * #1F9EC9 (standard link) - * - */ -/* @group Variables -------------------- */ -#comments { - /**/ - color: red; - /* A C-style comment */ - - background-color: orange; - font-size: 12px; - /* lost comment */ - content: "content"; - border: 1px solid black; - padding: 0; - margin: 2em; -} -/* commented out - #more-comments { - color: grey; - } -*/ -.selector, -.lots, -.comments { - color: #808080, /* blue */ #ffa500; - -webkit-border-radius: 2px /* webkit only */; - -moz-border-radius: 8px /* moz only with operation */; -} -#last { - color: #0000ff; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/css-3.css b/askbot/skins/default/media/style/node_modules/less/test/css/css-3.css deleted file mode 100644 index 45bdc40d..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/css-3.css +++ /dev/null @@ -1,58 +0,0 @@ -.comma-delimited { - background: url(bg.jpg) no-repeat, url(bg.png) repeat-x top left, url(bg); - text-shadow: -1px -1px 1px #ff0000, 6px 5px 5px #ffff00; - -moz-box-shadow: 0pt 0pt 2px rgba(255, 255, 255, 0.4) inset, 0pt 4px 6px rgba(255, 255, 255, 0.4) inset; -} -@font-face { - font-family: Headline; - src: local(Futura-Medium), url(fonts.svg#MyGeometricModern) format("svg"); -} -.other { - -moz-transform: translate(0, 11em) rotate(-90deg); -} -p:not([class*="lead"]) { - color: black; -} -input[type="text"].class#id[attr=32]:not(1) { - color: white; -} -div#id.class[a=1][b=2].class:not(1) { - color: white; -} -ul.comma > li:not(:only-child)::after { - color: white; -} -ol.comma > li:nth-last-child(2)::after { - color: white; -} -li:nth-child(4n+1), -li:nth-child(-5n), -li:nth-child(-n+2) { - color: white; -} -a[href^="http://"] { - color: black; -} -a[href$="http://"] { - color: black; -} -form[data-disabled] { - color: black; -} -p::before { - color: black; -} -#issue322 { - -webkit-animation: anim2 7s infinite ease-in-out; -} -@-webkit-keyframes frames { - 0% { - border: 1px; - } - 5.5% { - border: 2px; - } - 100% { - border: 3px; - } -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/css-escapes.css b/askbot/skins/default/media/style/node_modules/less/test/css/css-escapes.css deleted file mode 100644 index 278d5576..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/css-escapes.css +++ /dev/null @@ -1,20 +0,0 @@ -.escape\|random\|char { - color: red; -} -.mixin\!tUp { - font-weight: bold; -} -.\34 04 { - background: red; -} -.\34 04 strong { - color: #ff00ff; - font-weight: bold; -} -.trailingTest\+ { - color: red; -} -/* This hideous test of hideousness checks for the selector "blockquote" with various permutations of hex escapes */ -\62\6c\6f \63 \6B \0071 \000075o\74 e { - color: silver; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/css.css b/askbot/skins/default/media/style/node_modules/less/test/css/css.css deleted file mode 100644 index 63d20ec4..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/css.css +++ /dev/null @@ -1,89 +0,0 @@ -@charset "utf-8"; -div { - color: black; -} -div { - width: 99%; -} -* { - min-width: 45em; -} -h1, -h2 > a > p, -h3 { - color: none; -} -div.class { - color: blue; -} -div#id { - color: green; -} -.class#id { - color: purple; -} -.one.two.three { - color: grey; -} -@media print { - font-size: 3em; -} -@media screen { - font-size: 10px; -} -@font-face { - font-family: 'Garamond Pro'; - src: url("/fonts/garamond-pro.ttf"); -} -a:hover, -a:link { - color: #999; -} -p, -p:first-child { - text-transform: none; -} -q:lang(no) { - quotes: none; -} -p + h1 { - font-size: 2.2em; -} -#shorthands { - border: 1px solid #000; - font: 12px/16px Arial; - font: 100%/16px Arial; - margin: 1px 0; - padding: 0 auto; - background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px; -} -#more-shorthands { - margin: 0; - padding: 1px 0 2px 0; - font: normal small/20px 'Trebuchet MS', Verdana, sans-serif; -} -.misc { - -moz-border-radius: 2px; - display: -moz-inline-stack; - width: .1em; - background-color: #009998; - background-image: url(images/image.jpg); - background: -webkit-gradient(linear, left top, left bottom, from(#ff0000), to(#0000ff)); - margin: ; - filter: alpha(opacity=100); -} -#important { - color: red !important; - width: 100%!important; - height: 20px ! important; -} -#data-uri { - background: url(data:image/png;charset=utf-8;base64, - kiVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD/ - k//+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4U - kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC); - background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==); -} -#svg-data-uri { - background: transparent url('data:image/svg+xml, '); -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/functions.css b/askbot/skins/default/media/style/node_modules/less/test/css/functions.css deleted file mode 100644 index 82328145..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/functions.css +++ /dev/null @@ -1,43 +0,0 @@ -#functions { - color: #660000; - width: 16; - height: undefined("self"); - border-width: 5; - variable: 11; -} -#built-in { - escaped: -Some::weird(#thing, y); - lighten: #ffcccc; - darken: #330000; - saturate: #203c31; - desaturate: #29332f; - greyscale: #2e2e2e; - spin-p: #bf6a40; - spin-n: #bf4055; - format: "rgb(32, 128, 64)"; - format-string: "hello world"; - format-multiple: "hello earth 2"; - format-url-encode: "red is %23ff0000"; - eformat: rgb(32, 128, 64); - hue: 98; - saturation: 12%; - lightness: 95%; - rounded: 11; - roundedpx: 3px; - percentage: 20%; - color: #ff0011; -} -#built-in .is-a { - color: true; - color: true; - color: true; - keyword: true; - number: true; - string: true; - pixel: true; - percent: true; - em: true; -} -#alpha { - alpha: rgba(153, 94, 51, 0.6); -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/ie-filters.css b/askbot/skins/default/media/style/node_modules/less/test/css/ie-filters.css deleted file mode 100644 index 933318ab..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/ie-filters.css +++ /dev/null @@ -1,5 +0,0 @@ -.nav { - filter: progid:dximagetransform.microsoft.alpha(opacity=20); - filter: progid:dximagetransform.microsoft.alpha(opacity=0); - filter: progid:dximagetransform.microsoft.gradient(startColorstr="#333333", endColorstr="#000000", GradientType=0); -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/import.css b/askbot/skins/default/media/style/node_modules/less/test/css/import.css deleted file mode 100644 index 89dc162c..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/import.css +++ /dev/null @@ -1,23 +0,0 @@ -@import "import-test-d.css"; - -@import url(http://fonts.googleapis.com/css?family=Open+Sans); - -@import url(something.css) screen and (color) and (max-width: 600px); -#import { - color: #ff0000; -} -.mixin { - height: 10px; - color: #ff0000; -} -#import-test { - height: 10px; - color: #ff0000; - width: 10px; - height: 30%; -} -@media screen and (max-width: 600px) { - body { - width: 100%; - } -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/javascript.css b/askbot/skins/default/media/style/node_modules/less/test/css/javascript.css deleted file mode 100644 index 5a3f8223..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/javascript.css +++ /dev/null @@ -1,22 +0,0 @@ -.eval { - js: 42; - js: 2; - js: "hello world"; - js: 1, 2, 3; - title: "node"; - ternary: true; -} -.scope { - var: 42; - escaped: 7px; -} -.vars { - width: 8; -} -.escape-interpol { - width: hello world; -} -.arrays { - ary: "1, 2, 3"; - ary: "1, 2, 3"; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/lazy-eval.css b/askbot/skins/default/media/style/node_modules/less/test/css/lazy-eval.css deleted file mode 100644 index 1adfb8f3..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/lazy-eval.css +++ /dev/null @@ -1,3 +0,0 @@ -.lazy-eval { - width: 100%; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/media.css b/askbot/skins/default/media/style/node_modules/less/test/css/media.css deleted file mode 100644 index 61d169df..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/media.css +++ /dev/null @@ -1,79 +0,0 @@ -@media print { - .class { - color: blue; - } - .class .sub { - width: 42; - } - .top, - header > h1 { - color: #444444; - } -} -@media screen { - body { - max-width: 480; - } -} -@media all and (orientation: portrait) { - aside { - float: none; - } -} -@media handheld and (min-width: 42), screen and (min-width: 20em) { - body { - max-width: 480px; - } -} -@media print { - body { - padding: 20px; - } - body header { - background-color: red; - } -} -@media print and (orientation: landscape) { - body { - margin-left: 20px; - } -} -@media a, b and c { - body { - width: 95%; - } -} -@media a and x, b and c and x, a and y, b and c and y { - body { - width: 100%; - } -} -.a { - background: black; -} -@media handheld { - .a { - background: white; - } -} -@media handheld and (max-width: 100px) { - .a { - background: red; - } -} -.b { - background: black; -} -@media handheld { - .b { - background: white; - } -} -@media handheld and (max-width: 200px) { - .b { - background: red; - } -} -@media only screen and (max-width: 200px) { - width: 480px; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-args.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-args.css deleted file mode 100644 index 8e544ba0..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-args.css +++ /dev/null @@ -1,76 +0,0 @@ -#hidden { - color: transparent; - color: transparent; -} -.two-args { - color: blue; - width: 10px; - height: 99%; - border: 2px dotted #000000; -} -.one-arg { - width: 15px; - height: 49%; -} -.no-parens { - width: 5px; - height: 49%; -} -.no-args { - width: 5px; - height: 49%; -} -.var-args { - width: 45; - height: 17%; -} -.multi-mix { - width: 10px; - height: 29%; - margin: 4; - padding: 5; -} -body { - padding: 30px; - color: #ff0000; -} -.scope-mix { - width: 8; -} -.content { - width: 600px; -} -.content .column { - margin: 600px; -} -#same-var-name { - radius: 5px; -} -#var-inside { - width: 10px; -} -.id-class { - color: red; - color: red; -} -.arguments { - border: 1px solid #000000; - width: 1px; -} -.arguments2 { - border: 0px; - width: 0px; -} -.arguments3 { - border: 0px; - width: 0px; -} -.arguments4 { - border: 0 1 2 3 4; - rest: 1 2 3 4; - width: 0; -} -.edge-case { - border: "{"; - width: "{"; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-closure.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-closure.css deleted file mode 100644 index b1021b6f..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-closure.css +++ /dev/null @@ -1,9 +0,0 @@ -.class { - width: 99px; -} -.overwrite { - width: 99px; -} -.nested .class { - width: 5px; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-guards.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-guards.css deleted file mode 100644 index 0c563e52..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-guards.css +++ /dev/null @@ -1,58 +0,0 @@ -.light1 { - color: white; - margin: 1px; -} -.light2 { - color: black; - margin: 1px; -} -.max1 { - width: 6; -} -.max2 { - width: 8; -} -.glob1 { - margin: auto auto; -} -.ops1 { - height: gt-or-eq; - height: lt-or-eq; -} -.ops2 { - height: gt-or-eq; - height: not-eq; -} -.ops3 { - height: lt-or-eq; - height: not-eq; -} -.default1 { - content: default; -} -.test1 { - content: "true."; -} -.test2 { - content: "false."; -} -.test3 { - content: "false."; -} -.test4 { - content: "false."; -} -.test5 { - content: "false."; -} -.bool1 { - content: true and true; - content: true; - content: false, true; - content: false and true and true, true; - content: false, true and true; - content: false, false, true; - content: false, true and true and true, false; - content: not false; - content: not false and false, not false; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-important.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-important.css deleted file mode 100644 index 2f74c647..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-important.css +++ /dev/null @@ -1,17 +0,0 @@ -.class { - border: 1; - boxer: 1; - border: 2 !important; - boxer: 2 !important; - border: 3; - boxer: 3; - border: 4 !important; - boxer: 4 !important; - border: 5; - boxer: 5; - border: 0 !important; - boxer: 0 !important; - border: 9 !important; - border: 9; - boxer: 9; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-nested.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-nested.css deleted file mode 100644 index 6378c475..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-nested.css +++ /dev/null @@ -1,14 +0,0 @@ -.class .inner { - height: 300; -} -.class .inner .innest { - width: 30; - border-width: 60; -} -.class2 .inner { - height: 600; -} -.class2 .inner .innest { - width: 60; - border-width: 120; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-pattern.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins-pattern.css deleted file mode 100644 index 8b828335..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/mixins-pattern.css +++ /dev/null @@ -1,47 +0,0 @@ -.zero { - variadic: true; - zero: 0; - one: 1; - two: 2; - three: 3; -} -.one { - variadic: true; - one: 1; - one-req: 1; - two: 2; - three: 3; -} -.two { - variadic: true; - two: 2; - three: 3; -} -.three { - variadic: true; - three-req: 3; - three: 3; -} -.left { - left: 1; -} -.right { - right: 1; -} -.border-right { - color: black; - border-right: 4px; -} -.border-left { - color: black; - border-left: 4px; -} -.only-right { - right: 33; -} -.only-left { - left: 33; -} -.left-right { - both: 330; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/mixins.css b/askbot/skins/default/media/style/node_modules/less/test/css/mixins.css deleted file mode 100644 index 45d51793..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/mixins.css +++ /dev/null @@ -1,71 +0,0 @@ -.mixin { - border: 1px solid black; -} -.mixout { - border-color: orange; -} -.borders { - border-style: dashed; -} -#namespace .borders { - border-style: dotted; -} -#namespace .biohazard { - content: "death"; -} -#namespace .biohazard .man { - color: transparent; -} -#theme > .mixin { - background-color: grey; -} -#container { - color: black; - border: 1px solid black; - border-color: orange; - background-color: grey; -} -#header .milk { - color: white; - border: 1px solid black; - background-color: grey; -} -#header #cookie { - border-style: dashed; -} -#header #cookie .chips { - border-style: dotted; -} -#header #cookie .chips .calories { - color: black; - border: 1px solid black; - border-color: orange; - background-color: grey; -} -.secure-zone { - color: transparent; -} -.direct { - border-style: dotted; -} -.bo, -.bar { - width: 100%; -} -.bo { - border: 1px; -} -.ar.bo.ca { - color: black; -} -.jo.ki { - background: none; -} -.extended { - width: 100%; - border: 1px; - background: none; -} -.foo .bar { - width: 100%; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/operations.css b/askbot/skins/default/media/style/node_modules/less/test/css/operations.css deleted file mode 100644 index fb9e0aff..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/operations.css +++ /dev/null @@ -1,49 +0,0 @@ -#operations { - color: #111111; - height: 9px; - width: 3em; - substraction: 0; - division: 1; -} -#operations .spacing { - height: 9px; - width: 3em; -} -.with-variables { - height: 16em; - width: 24em; - size: 1cm; -} -.with-functions { - color: #646464; - color: #ff8080; - color: #c94a4a; -} -.negative { - height: 0px; - width: 4px; -} -.shorthands { - padding: -1px 2px 0 -4px; -} -.rem-dimensions { - font-size: 5.5rem; -} -.colors { - color: #123; - border-color: #334455; - background-color: #000000; -} -.colors .other { - color: #222222; - border-color: #222222; -} -.negations { - variable: -4px; - variable1: 0px; - variable2: 0px; - variable3: 8px; - variable4: 0px; - paren: -4px; - paren2: 16px; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/parens.css b/askbot/skins/default/media/style/node_modules/less/test/css/parens.css deleted file mode 100644 index 36487fe5..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/parens.css +++ /dev/null @@ -1,20 +0,0 @@ -.parens { - border: 2px solid #000000; - margin: 1px 3px 16 3; - width: 36; - padding: 2px 36px; -} -.more-parens { - padding: 8 4 4 4px; - width: 96; - height: 113; - margin: 12; -} -.nested-parens { - width: 71; - height: 6; -} -.mixed-units { - margin: 2px 4em 1 5pc; - padding: 6px 1em 2px 2; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/rulesets.css b/askbot/skins/default/media/style/node_modules/less/test/css/rulesets.css deleted file mode 100644 index 408c76aa..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/rulesets.css +++ /dev/null @@ -1,33 +0,0 @@ -#first > .one { - font-size: 2em; -} -#first > .one > #second .two > #deux { - width: 50%; -} -#first > .one > #second .two > #deux #third { - height: 100%; -} -#first > .one > #second .two > #deux #third:focus { - color: black; -} -#first > .one > #second .two > #deux #third:focus #fifth > #sixth .seventh #eighth + #ninth { - color: purple; -} -#first > .one > #second .two > #deux #fourth, -#first > .one > #second .two > #deux #five, -#first > .one > #second .two > #deux #six { - color: #110000; -} -#first > .one > #second .two > #deux #fourth .seven, -#first > .one > #second .two > #deux #five .seven, -#first > .one > #second .two > #deux #six .seven, -#first > .one > #second .two > #deux #fourth .eight > #nine, -#first > .one > #second .two > #deux #five .eight > #nine, -#first > .one > #second .two > #deux #six .eight > #nine { - border: 1px solid black; -} -#first > .one > #second .two > #deux #fourth #ten, -#first > .one > #second .two > #deux #five #ten, -#first > .one > #second .two > #deux #six #ten { - color: red; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/scope.css b/askbot/skins/default/media/style/node_modules/less/test/css/scope.css deleted file mode 100644 index 11feda89..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/scope.css +++ /dev/null @@ -1,15 +0,0 @@ -.tiny-scope { - color: #998899; -} -.scope1 { - color: #0000ff; - border-color: #000000; -} -.scope1 .scope2 { - color: #0000ff; -} -.scope1 .scope2 .scope3 { - color: #ff0000; - border-color: #000000; - background-color: #ffffff; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/selectors.css b/askbot/skins/default/media/style/node_modules/less/test/css/selectors.css deleted file mode 100644 index 6f69a8c9..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/selectors.css +++ /dev/null @@ -1,69 +0,0 @@ -h1 a:hover, -h2 a:hover, -h3 a:hover, -h1 p:hover, -h2 p:hover, -h3 p:hover { - color: red; -} -#all { - color: blue; -} -#the { - color: blue; -} -#same { - color: blue; -} -ul, -li, -div, -q, -blockquote, -textarea { - margin: 0; -} -td { - margin: 0; - padding: 0; -} -td, -input { - line-height: 1em; -} -a { - color: red; -} -a:hover { - color: blue; -} -div a { - color: green; -} -p a span { - color: yellow; -} -.foo .bar .qux, -.foo .baz .qux { - display: block; -} -.qux .foo .bar, -.qux .foo .baz { - display: inline; -} -.qux .foo .bar .biz, -.qux .foo .baz .biz { - display: none; -} -.other ::fnord { - color: #ff0000; -} -.other::fnord { - color: #ff0000; -} -.other ::bnord { - color: #ff0000; -} -.other::bnord { - color: #ff0000; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/strings.css b/askbot/skins/default/media/style/node_modules/less/test/css/strings.css deleted file mode 100644 index 80e115c0..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/strings.css +++ /dev/null @@ -1,40 +0,0 @@ -#strings { - background-image: url("http://son-of-a-banana.com"); - quotes: "~" "~"; - content: "#*%:&^,)!.(~*})"; - empty: ""; - brackets: "{" "}"; - escapes: "\"hello\" \\world"; - escapes2: "\"llo"; -} -#comments { - content: "/* hello */ // not-so-secret"; -} -#single-quote { - quotes: "'" "'"; - content: '""#!&""'; - empty: ''; - semi-colon: ';'; -} -#escaped { - filter: DX.Transform.MS.BS.filter(opacity=50); -} -#one-line { - image: url(http://tooks.com); -} -#crazy { - image: url(http://), "}", url("http://}"); -} -#interpolation { - url: "http://lesscss.org/dev/image.jpg"; - url2: "http://lesscss.org/image-256.jpg"; - url3: "http://lesscss.org#445566"; - url4: "http://lesscss.org/hello"; - url5: "http://lesscss.org/54.4"; -} -.mix-mul-class { - color: #0000ff; - color: #ff0000; - color: #0000ff; - color: #ffa500; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/variables.css b/askbot/skins/default/media/style/node_modules/less/test/css/variables.css deleted file mode 100644 index 961fe695..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/variables.css +++ /dev/null @@ -1,27 +0,0 @@ -.variables { - width: 14cm; -} -.variables { - height: 24px; - color: #888888; - font-family: "Trebuchet MS", Verdana, sans-serif; - quotes: "~" "~"; -} -.redefinition { - three: 3; -} -.values { - font-family: 'Trebuchet', 'Trebuchet', 'Trebuchet'; - color: #888888 !important; - url: url('Trebuchet'); - multi: something 'A', B, C, 'Trebuchet'; -} -.variable-names { - name: 'hello'; -} -.alpha { - filter: alpha(opacity=42); -} -a:nth-child(2) { - border: 1px; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/css/whitespace.css b/askbot/skins/default/media/style/node_modules/less/test/css/whitespace.css deleted file mode 100644 index 56e067fc..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/css/whitespace.css +++ /dev/null @@ -1,38 +0,0 @@ -.whitespace { - color: white; -} -.whitespace { - color: white; -} -.whitespace { - color: white; -} -.whitespace { - color: white; -} -.whitespace { - color: white ; -} -.white, -.space, -.mania { - color: white; -} -.no-semi-column { - color: #ffffff; -} -.no-semi-column { - color: white; - white-space: pre; -} -.no-semi-column { - border: 2px solid #ffffff; -} -.newlines { - background: the, - great, - wall; - border: 2px - solid - black; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/less-test.js b/askbot/skins/default/media/style/node_modules/less/test/less-test.js deleted file mode 100644 index 46412e01..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/less-test.js +++ /dev/null @@ -1,73 +0,0 @@ -var path = require('path'), - fs = require('fs'), - sys = require('util'); - -var less = require('../lib/less'); - -less.tree.functions.add = function (a, b) { - return new(less.tree.Dimension)(a.value + b.value); -} -less.tree.functions.increment = function (a) { - return new(less.tree.Dimension)(a.value + 1); -} -less.tree.functions._color = function (str) { - if (str.value === "evil red") { return new(less.tree.Color)("600") } -} - -sys.puts("\n" + stylize("LESS", 'underline') + "\n"); - -fs.readdirSync('test/less').forEach(function (file) { - if (! /\.less/.test(file)) { return } - - toCSS('test/less/' + file, function (err, less) { - var name = path.basename(file, '.less'); - - fs.readFile(path.join('test/css', name) + '.css', 'utf-8', function (e, css) { - sys.print("- " + name + ": ") - if (less === css) { sys.print(stylize('OK', 'green')) } - else if (err) { - sys.print(stylize("ERROR: " + (err && err.message), 'red')); - } else { - sys.print(stylize("FAIL", 'yellow')); - } - sys.puts(""); - }); - }); -}); - -function toCSS(path, callback) { - var tree, css; - fs.readFile(path, 'utf-8', function (e, str) { - if (e) { return callback(e) } - - new(less.Parser)({ - paths: [require('path').dirname(path)], - optimization: 0 - }).parse(str, function (err, tree) { - if (err) { - callback(err); - } else { - try { - css = tree.toCSS(); - callback(null, css); - } catch (e) { - callback(e); - } - } - }); - }); -} - -// Stylize a string -function stylize(str, style) { - var styles = { - 'bold' : [1, 22], - 'inverse' : [7, 27], - 'underline' : [4, 24], - 'yellow' : [33, 39], - 'green' : [32, 39], - 'red' : [31, 39] - }; - return '\033[' + styles[style][0] + 'm' + str + - '\033[' + styles[style][1] + 'm'; -} diff --git a/askbot/skins/default/media/style/node_modules/less/test/less/import/import-test-d.css b/askbot/skins/default/media/style/node_modules/less/test/less/import/import-test-d.css deleted file mode 100644 index 30575f01..00000000 --- a/askbot/skins/default/media/style/node_modules/less/test/less/import/import-test-d.css +++ /dev/null @@ -1 +0,0 @@ -#css { color: yellow; } -- cgit v1.2.3-1-g7c22 From d228b8fee95a073e67749227d80c75e31dd43096 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 9 May 2012 22:28:06 -0400 Subject: made a "safe" version of setting update function --- askbot/conf/settings_wrapper.py | 10 ++++++++-- askbot/skins/utils.py | 23 ++--------------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/askbot/conf/settings_wrapper.py b/askbot/conf/settings_wrapper.py index 78d16397..b6b5f302 100644 --- a/askbot/conf/settings_wrapper.py +++ b/askbot/conf/settings_wrapper.py @@ -58,8 +58,14 @@ class ConfigSettings(object): self.update(key, self.get_default(key)) def update(self, key, value): - setting = config_get(self.__group_map[key], key) - setting.update(value) + try: + setting = config_get(self.__group_map[key], key) + setting.update(value) + except: + from askbot.deps.livesettings.models import Setting + setting = Setting.objects.get(key=key) + setting.value = value + setting.save() #self.prime_cache() def register(self, value): diff --git a/askbot/skins/utils.py b/askbot/skins/utils.py index 4f8e1992..2bd11147 100644 --- a/askbot/skins/utils.py +++ b/askbot/skins/utils.py @@ -192,25 +192,6 @@ def update_media_revision(skin = None): current_hash = hasher.get_hash_of_dirs(media_dirs) if current_hash != askbot_settings.MEDIA_RESOURCE_REVISION_HASH: - try: - askbot_settings.update('MEDIA_RESOURCE_REVISION', resource_revision + 1) - logging.debug('media revision worked for MEDIA_RESOURCE_REVISION') - except Exception, e: - logging.critical(e.message) - safe_settings_update('MEDIA_RESOURCE_REVISION', resource_revision + 1) - - try: - askbot_settings.update('MEDIA_RESOURCE_REVISION_HASH', current_hash) - logging.debug('media revision worked for MEDIA_RESOURCE_REVISION_HASH') - except Exception, e: - logging.critical(e.message) - safe_settings_update('MEDIA_RESOURCE_REVISION_HASH', current_hash) + askbot_settings.update('MEDIA_RESOURCE_REVISION', resource_revision + 1) + askbot_settings.update('MEDIA_RESOURCE_REVISION_HASH', current_hash) logging.debug('MEDIA_RESOURCE_REVISION changed') - - -def safe_settings_update(key, value): - '''Fallback when IntegrityError bug raises''' - from askbot.deps.livesettings.models import Setting - setting = Setting.objects.get(key=key) - setting.value = value - setting.save() -- cgit v1.2.3-1-g7c22 From 6b11c5d8c80a52767fdaf77234cafa67008fd47e Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 9 May 2012 22:31:30 -0400 Subject: temporarily disabled the language selector feature --- askbot/conf/skin_general_settings.py | 2 ++ askbot/setup_templates/settings.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/askbot/conf/skin_general_settings.py b/askbot/conf/skin_general_settings.py index 6abee90a..9c6ee745 100644 --- a/askbot/conf/skin_general_settings.py +++ b/askbot/conf/skin_general_settings.py @@ -54,6 +54,7 @@ LANGUAGE_CHOICES = ( ('zh_TW', _("Chinese (Taiwan)")), ) +""" settings.register( values.StringValue( GENERAL_SKIN_SETTINGS, @@ -63,6 +64,7 @@ settings.register( description = _('Select Language'), ) ) +""" settings.register( values.BooleanValue( diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index b326ea85..32af9920 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -98,7 +98,7 @@ TEMPLATE_LOADERS = ( MIDDLEWARE_CLASSES = ( #'django.middleware.gzip.GZipMiddleware', - 'askbot.middleware.locale.LocaleMiddleware', + #'askbot.middleware.locale.LocaleMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', #'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', -- cgit v1.2.3-1-g7c22 From b35abc3d919191fc0dc30ffd0820b1bffcd36e5b Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Mon, 14 May 2012 13:30:55 -0400 Subject: recompiled style.css --- askbot/skins/default/media/style/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index 4e802991..6ca0bc5c 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -655,9 +655,9 @@ body.anon #searchBar .searchInputCancelable { background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); text-decoration: none; - text-shadow: 0px 1px 0px #e6f6fa; - -moz-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-text-shadow: 0px 1px 0px #e6f6fa; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; } .box .inputs #ab-tag-search-add { width: 47px; -- cgit v1.2.3-1-g7c22 From d4778e5eba9b5861611492eb6166eb6d8c8eec96 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Mon, 14 May 2012 13:45:27 -0400 Subject: fixed label size on interesting and ignored tag buttons --- askbot/skins/default/media/style/style.css | 2 +- askbot/skins/default/media/style/style.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index 6ca0bc5c..3d53eba8 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -611,7 +611,7 @@ body.anon #searchBar .searchInputCancelable { margin-top: -2px; width: 30px; height: 27px; - font-size: 12px; + font-size: 14px; text-align: center; text-decoration: none; cursor: pointer; diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index b6f0754a..a98bcdbe 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -602,7 +602,7 @@ body.anon { border:0; font-weight:bold; margin-top:-2px; - .button-style(30px,27px,12px); + .button-style(30px, 27px, 14px); .rounded-corners(4px); } #interestingTagAdd:hover, -- cgit v1.2.3-1-g7c22 From 4cf3ec3998b1f067a7f0c76eae4a90c274024986 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Mon, 14 May 2012 15:35:47 -0400 Subject: bumped version and updated changelog and the contributor list --- askbot/__init__.py | 2 +- askbot/doc/source/changelog.rst | 6 ++++-- askbot/doc/source/contributors.rst | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/askbot/__init__.py b/askbot/__init__.py index 12517182..859b2695 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -9,7 +9,7 @@ import smtplib import sys import logging -VERSION = (0, 7, 42) +VERSION = (0, 7, 43) #keys are module names used by python imports, #values - the package qualifier to use for pip diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst index 25d96e88..e005e019 100644 --- a/askbot/doc/source/changelog.rst +++ b/askbot/doc/source/changelog.rst @@ -1,13 +1,15 @@ Changes in Askbot ================= -Future version --------------- +0.7.43 (May 14, 2012) +--------------------- * User groups (Evgeny) * Public/Private/Hidden reputation (Evgeny) * Enabling/disabling the badges system (Evgeny) * Created a basic post moderation feature (Evgeny) * Created a way to specify reasons for rejecting posts in a modal dialog (Evgeny) +* A number of bug fixes (Adolfo Fitoria, Jim Tittsler, + Evgeny Fadeev, Robin Stocker, Radim Řehůřek, Silvio Heuberger) 0.7.41, 0.7.42 (April 21, 2012) ------------------------------- diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst index 71bc5cc9..81729979 100644 --- a/askbot/doc/source/contributors.rst +++ b/askbot/doc/source/contributors.rst @@ -38,6 +38,7 @@ Programming and documentation * `Radim Řehůřek `_ * `monkut `_ * `Jim Tittsler `_ +* Silvio Heuberger Translations ------------ -- cgit v1.2.3-1-g7c22