made group logo upload look a little smoother

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(
-        "<p style='margin-top: 0px'>" + gettext('enter the logo url') + '</p>',
+        "<h3>" + gettext('Enter the logo url or upload an image') + '</h3>',
         '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 = $('<div></div>');
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 %}
 </p>
 {% if group %}
-    <div id="group-wiki-{{group.id}}">
+    <div id="group-wiki-{{group.id}}" class="group-wiki">
         <img class="group-logo" 
             {% if group.group_profile.logo_url %}
                 src="{{ group.group_profile.logo_url }}"
@@ -62,12 +62,13 @@
                 {{ group.tag_wiki.html }}
             {% endif %}
         </div>
+        <div class="clearfix"></div>
         {% if request.user.is_authenticated() and request.user.is_administrator_or_moderator() %}
         <a class="edit">
             {% trans %}edit group description{% endtrans %}
-        </a>
+        </a> |
         <a class="change_logo">
-            {% trans %}add/change logo{% endtrans %}
+            {% trans %}change logo{% endtrans %}
         </a>
         {% endif %}
     </div>
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')
+