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 %}
-
+
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