diff options
-rw-r--r-- | askbot/media/style/style.css | 49 | ||||
-rw-r--r-- | askbot/media/style/style.less | 66 | ||||
-rw-r--r-- | askbot/templates/authopenid/verify_email.html | 2 | ||||
-rw-r--r-- | askbot/templates/close.html | 4 | ||||
-rw-r--r-- | askbot/templates/embed/widget_form.html | 2 | ||||
-rw-r--r-- | askbot/templates/feedback.html | 4 | ||||
-rw-r--r-- | askbot/templates/question_retag.html | 4 | ||||
-rw-r--r-- | askbot/templates/reopen.html | 4 | ||||
-rw-r--r-- | askbot/templates/tags/form_bulk_tag_subscription.html | 2 | ||||
-rw-r--r-- | askbot/templates/user_profile/user.html | 1 | ||||
-rw-r--r-- | askbot/templates/user_profile/user_edit.html | 4 | ||||
-rw-r--r-- | askbot/templates/user_profile/user_email_subscriptions.html | 25 | ||||
-rw-r--r-- | askbot/templates/user_profile/user_moderate.html | 8 | ||||
-rw-r--r-- | askbot/templates/user_profile/user_stats.html | 1 | ||||
-rw-r--r-- | askbot/views/users.py | 2 |
15 files changed, 95 insertions, 83 deletions
diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css index a1c0751f..d86b8fc7 100644 --- a/askbot/media/style/style.css +++ b/askbot/media/style/style.css @@ -330,6 +330,9 @@ body.user-messages { background: white; display: block; } +.select-language { + margin-top: 6px; +} #userToolsNav { /* Navigation bar containing login link or user information, check widgets/user_navigation.html*/ @@ -3005,19 +3008,26 @@ a:hover.medal { border: #eee 1px solid; padding: 5px; } +.user-profile-page form { + margin-bottom: 0; +} .user-profile-page h2 { - padding: 30px 0px 10px 0px; + padding: 4px 0px 10px 0px; font-family: 'Open Sans Condensed', Arial, sans-serif; } +.user-profile-page h3 { + padding: 0; + margin-top: -3px; +} +.user-profile-page .submit-row { + margin-bottom: 0; +} .user-profile-page .user-stats-table h2 { padding-top: 10px; } .user-profile-page .user-stats-table.badges { margin-bottom: 30px; } -.user-profile-page select { - margin-bottom: 12px; -} .user-profile-page .up-votes, .user-profile-page .down-votes { display: inline-block; @@ -3048,6 +3058,18 @@ a:hover.medal { .user-profile-page .users-questions { margin-top: -10px; } +.user-profile-page .avatar p { + margin-bottom: 0px; +} +.user-profile-page .tabBar a#stats { + margin-left: 0; +} +.user-profile-page img.gravatar { + margin: 2px 0 3px 0; +} +.user-profile-page .vote-notification h3 { + padding: 10px; +} .user-details { font-size: 13px; } @@ -3872,25 +3894,6 @@ p.signup_p { .avatar-page li { display: inline; } -.user-profile-page .avatar p { - margin-bottom: 0px; -} -.user-profile-page .tabBar a#stats { - margin-left: 0; -} -.user-profile-page img.gravatar { - margin: 2px 0 3px 0; -} -.user-profile-page h3 { - padding: 0; - margin-top: -3px; -} -.user-profile-page .vote-notification h3 { - padding: 10px; -} -.user-profile-page ul.tags { - margin-left: 5px; -} .userList { font-size: 13px; } diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index 26f73627..09b2810f 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -338,6 +338,9 @@ body.user-messages { display: block; } } +.select-language { + margin-top: 6px; +} #userToolsNav {/* Navigation bar containing login link or user information, check widgets/user_navigation.html*/ height: 20px; @@ -2938,13 +2941,13 @@ ul#related-tags li { .users-page, .user-profile-edit-page, .user-profile-page { - form{ + form { margin-bottom:15px; } input[type="text"], input[type="password"], - select{ + select { height:25px; line-height: 25px; padding-left:5px; @@ -3136,7 +3139,7 @@ a:hover.medal { /* profile page */ -.tabBar-profile{ +.tabBar-profile { width:100%; margin-bottom:5px; float:left; @@ -3145,7 +3148,7 @@ a:hover.medal { .user-profile-page { color:@info-text-dark; - p{ + p { font-size:13px; line-height:1.3; color:@info-text-dark; @@ -3155,11 +3158,24 @@ a:hover.medal { padding:5px; } + form { + margin-bottom: 0; + } + h2 { - padding: 30px 0px 10px 0px; + padding: 4px 0px 10px 0px; font-family: @main-font; } + h3 { + padding: 0; + margin-top: -3px; + } + + .submit-row { + margin-bottom: 0; + } + .user-stats-table h2 { padding-top: 10px; } @@ -3168,9 +3184,6 @@ a:hover.medal { margin-bottom: 30px; } - select { - margin-bottom: 12px; - } .up-votes, .down-votes { display: inline-block; @@ -3181,9 +3194,11 @@ a:hover.medal { line-height: 22px; margin: 0 15px 0 2px; } + .up-votes { background: url(../images/vote-arrow-up-on.png) no-repeat; } + .down-votes { background: url(../images/vote-arrow-down-on.png) no-repeat; } @@ -3202,6 +3217,19 @@ a:hover.medal { .users-questions { margin-top: -10px; } + + .avatar p { + margin-bottom: 0px; + } + .tabBar a#stats { + margin-left: 0; + } + img.gravatar { + margin: 2px 0 3px 0; + } + .vote-notification h3 { + padding: 10px; + } } .user-details { @@ -4134,28 +4162,6 @@ p.signup_p { display: inline; } -.user-profile-page { - .avatar p { - margin-bottom: 0px; - } - .tabBar a#stats { - margin-left: 0; - } - img.gravatar { - margin: 2px 0 3px 0; - } - h3 { - padding: 0; - margin-top: -3px; - } - .vote-notification h3 { - padding: 10px; - } - ul.tags { - margin-left: 5px; - } -} - .userList { font-size: 13px; } diff --git a/askbot/templates/authopenid/verify_email.html b/askbot/templates/authopenid/verify_email.html index 613ca589..1312658b 100644 --- a/askbot/templates/authopenid/verify_email.html +++ b/askbot/templates/authopenid/verify_email.html @@ -8,7 +8,7 @@ </label> <form method="post">{% csrf_token %} <input id="validation-code" type="text" name="validation_code" /> - <input type="submit" class="submit" value="{% trans %}Confirm email{% endtrans %}" /> + <input type="submit" value="{% trans %}Confirm email{% endtrans %}" /> </form> {% endblock %} <!-- end changeemail.html --> diff --git a/askbot/templates/close.html b/askbot/templates/close.html index 70d7cc8b..b0c239e4 100644 --- a/askbot/templates/close.html +++ b/askbot/templates/close.html @@ -12,8 +12,8 @@ {{ form.reason }} </p> <p> - <input type="submit" value="{% trans %}OK to close{% endtrans %}" class="submit" /> - <input id="btBack" type="button" class="submit" value="{% trans %}Cancel{% endtrans %}" /> + <input type="submit" value="{% trans %}OK to close{% endtrans %}"/> + <input id="btBack" type="button" value="{% trans %}Cancel{% endtrans %}"/> </p> </form> {% endblock %} diff --git a/askbot/templates/embed/widget_form.html b/askbot/templates/embed/widget_form.html index ad1562aa..a03aba29 100644 --- a/askbot/templates/embed/widget_form.html +++ b/askbot/templates/embed/widget_form.html @@ -11,7 +11,7 @@ {{ form.as_table() }} <tr> <td colspan="2" style="text-align: center"> - <input type="submit" class="submit" value={% trans %}Save{% endtrans %} /> + <input type="submit" value={% trans %}Save{% endtrans %} /> </td> </tr> </table> diff --git a/askbot/templates/feedback.html b/askbot/templates/feedback.html index 00453734..040566c6 100644 --- a/askbot/templates/feedback.html +++ b/askbot/templates/feedback.html @@ -57,8 +57,8 @@ {% endif %} {{form.next}} <div class="submit-row"> - <input type="submit" class="submit" value="{% trans %}Send Feedback{% endtrans %}"/> - <input type="submit" class="submit cancel" name="cancel" value="{% trans %}Cancel{% endtrans %}"/> + <input type="submit" value="{% trans %}Send Feedback{% endtrans %}"/> + <input type="submit" class="cancel" name="cancel" value="{% trans %}Cancel{% endtrans %}"/> </div> </form> {% endblock %} diff --git a/askbot/templates/question_retag.html b/askbot/templates/question_retag.html index e1341f7a..df8dc584 100644 --- a/askbot/templates/question_retag.html +++ b/askbot/templates/question_retag.html @@ -18,8 +18,8 @@ </div> </div> <div class="error" ></div> - <input type="submit" value="{% trans %}Retag{% endtrans %}" class="submit" /> - <input type="button" value="{% trans %}Cancel{% endtrans %}" class="submit" onclick="history.back(-1);" /> + <input type="submit" value="{% trans %}Retag{% endtrans %}"/> + <input type="button" value="{% trans %}Cancel{% endtrans %}" onclick="history.back(-1);" /> </form> {% endblock %} diff --git a/askbot/templates/reopen.html b/askbot/templates/reopen.html index 9c617403..07208793 100644 --- a/askbot/templates/reopen.html +++ b/askbot/templates/reopen.html @@ -22,8 +22,8 @@ <p>{{ settings.WORDS_REOPEN_QUESTION|escape }}?</p> <form id="fmclose" action="{% url reopen question.id %}" method="post" >{% csrf_token %} <div id="" style="padding:20px 0 20px 0"> - <input type="submit" value="{{ settings.WORDS_REOPEN_QUESTION|escape }}" class="submit" /> - <input id="btBack" type="button" value="{% trans %}Cancel{% endtrans %}" class="submit" /> + <input type="submit" value="{{ settings.WORDS_REOPEN_QUESTION|escape }}"/> + <input id="btBack" type="button" value="{% trans %}Cancel{% endtrans %}"/> </div> </form> {% endblock %} diff --git a/askbot/templates/tags/form_bulk_tag_subscription.html b/askbot/templates/tags/form_bulk_tag_subscription.html index 95168e45..b6e72a96 100644 --- a/askbot/templates/tags/form_bulk_tag_subscription.html +++ b/askbot/templates/tags/form_bulk_tag_subscription.html @@ -9,7 +9,7 @@ <form action="." method="POST" accept-charset="utf-8"> <table border="0"> {{form.as_table()}} -<tr><td/><td><input type="submit" class="submit" value="Save"></td></tr> +<tr><td/><td><input type="submit" value="Save"></td></tr> </table> </form> {% endblock %} diff --git a/askbot/templates/user_profile/user.html b/askbot/templates/user_profile/user.html index 8164784d..1f939d11 100644 --- a/askbot/templates/user_profile/user.html +++ b/askbot/templates/user_profile/user.html @@ -23,7 +23,6 @@ var viewUserID = {{view_user.id}}; askbot['data']['viewUserName'] = '{{ view_user.username|escape }}'; askbot['data']['viewUserId'] = {{ view_user.id }}; - askbot['data']['userPostsPageSize'] = {{ page_size }}; askbot['urls']['edit_group_membership'] = '{% url edit_group_membership %}'; askbot['urls']['getGroupsList'] = '{% url get_groups_list %}'; askbot['urls']['getTopAnswers'] = '{% url get_top_answers %}'; diff --git a/askbot/templates/user_profile/user_edit.html b/askbot/templates/user_profile/user_edit.html index c95bf815..fa9ecfdd 100644 --- a/askbot/templates/user_profile/user_edit.html +++ b/askbot/templates/user_profile/user_edit.html @@ -106,8 +106,8 @@ {% endif %} </table> <div style="margin:30px 0 60px 0"> - <input type="submit" value="{% trans %}Update{% endtrans %}" class="submit" > - <input id="cancel" type="button" value="{% trans %}Cancel{% endtrans %}" class="submit" > + <input type="submit" value="{% trans %}Update{% endtrans %}"/> + <input id="cancel" type="button" value="{% trans %}Cancel{% endtrans %}"/> </div> </div> </form> diff --git a/askbot/templates/user_profile/user_email_subscriptions.html b/askbot/templates/user_profile/user_email_subscriptions.html index fdda03b7..100ce789 100644 --- a/askbot/templates/user_profile/user_email_subscriptions.html +++ b/askbot/templates/user_profile/user_email_subscriptions.html @@ -20,8 +20,8 @@ {{tag_filter_selection_form}} </table> <div class="submit-row text-align-right"> - <input type="submit" class="submit" name="save" value="{% trans %}Update{% endtrans %}"/> - <input type="submit" class="submit" name="stop_email" value="{% trans %}Stop Email{% endtrans %}"/> + <input type="submit" name="save" value="{% trans %}Update{% endtrans %}"/> + <input type="submit" name="stop_email" value="{% trans %}Stop Email{% endtrans %}"/> </div> </form> </div> @@ -53,7 +53,7 @@ css_class = 'subscribed marked-tags special', ) }} - <br/> + <div class="clearfix"></div> <div class="inputs"> <input id="subscribedTagInput" autocomplete="off" type="text"/> <input id="subscribedTagAdd" type="submit" value="{% trans %}add{% endtrans%}"/> @@ -61,14 +61,15 @@ </div> {%endif%} {% endblock %} -{%block userjs%} - <script type='text/javascript'> - search = new FullTextSearch(); - askbot['controllers'] = askbot['controllers'] || {} - askbot['controllers']['fullTextSearch'] = search; - askbot['urls']['mark_subscribed_tag'] = '{% url mark_subscribed_tag %}'; - askbot['urls']['unmark_tag'] = '{% url unmark_tag %}'; - </script> - <script type='text/javascript' src='{{"/js/tag_selector.js"|media}}'></script> +{% block userjs %} + <script type='text/javascript'> + search = new FullTextSearch(); + askbot['controllers'] = askbot['controllers'] || {} + askbot['controllers']['fullTextSearch'] = search; + askbot['urls']['mark_subscribed_tag'] = '{% url mark_subscribed_tag %}'; + askbot['urls']['unmark_tag'] = '{% url unmark_tag %}'; + askbot['settings']['tag_editor'] = '{{ tag_editor_settings|escapejs }}'; + </script> + <script type='text/javascript' src='{{"/js/tag_selector.js"|media}}'></script> {% endblock %} <!-- end user_email_subscriptions.html --> diff --git a/askbot/templates/user_profile/user_moderate.html b/askbot/templates/user_profile/user_moderate.html index a7f05b1c..75c6d6fe 100644 --- a/askbot/templates/user_profile/user_moderate.html +++ b/askbot/templates/user_profile/user_moderate.html @@ -17,7 +17,7 @@ </table> <p id="id_user_status_info"> </p> - <input type="submit" class="submit" name="change_status" value="{% trans %}Save{% endtrans %}" /> + <input type="submit" name="change_status" value="{% trans %}Save{% endtrans %}" /> </form> {% endif %} <h3> @@ -35,8 +35,8 @@ <table class="form-as-table"> {{ change_user_reputation_form.as_table() }} </table> - <input type="submit" class="submit" name="subtract_reputation" value="{% trans %}Subtract{% endtrans %}" /> - <input type="submit" class="submit" name="add_reputation" value="{% trans %}Add{% endtrans %}" /> + <input type="submit" name="subtract_reputation" value="{% trans %}Subtract{% endtrans %}" /> + <input type="submit" name="add_reputation" value="{% trans %}Add{% endtrans %}" /> </form> {% if request.user != view_user %} <hr/> @@ -61,7 +61,7 @@ {% endif %} {{ send_message_form.body_text}} </div> - <input type="submit" class="submit" name="send_message" value="{% trans %}Send message{% endtrans %}" /> + <input type="submit" name="send_message" value="{% trans %}Send message{% endtrans %}" /> </form> {% endif %} {% endblock %} diff --git a/askbot/templates/user_profile/user_stats.html b/askbot/templates/user_profile/user_stats.html index 7bb97d88..344051af 100644 --- a/askbot/templates/user_profile/user_stats.html +++ b/askbot/templates/user_profile/user_stats.html @@ -101,6 +101,7 @@ {% block endjs %} {{ super() }} <script type="text/javascript"> + askbot['data']['userPostsPageSize'] = {{ page_size }}; askbot['urls']['join_or_leave_group'] = '{% url join_or_leave_group %}'; $(document).ready(function(){ setup_badge_details_toggle(); diff --git a/askbot/views/users.py b/askbot/views/users.py index 1b6eeca8..91f210d9 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -998,6 +998,8 @@ def user_email_subscriptions(request, user, context): 'user_languages': user.languages.split() } context.update(data) + #todo: really need only if subscribed tags are enabled + context.update(view_context.get_for_tag_editor()) return render( request, 'user_profile/user_email_subscriptions.html', |