diff options
Diffstat (limited to 'askbot/skins/default')
8 files changed, 96 insertions, 28 deletions
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 4f096bd0..e63ff373 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -3359,3 +3359,27 @@ pre.prettyprint { clear:both;padding: 3px; border: 0px solid #888; } #leading-sidebar { float: left; } + +/* language-specific fixes */ +body.lang-es { + #searchBar { + width: 398px; + .searchInput { + width: 337px; + } + .searchInputCancelable { + width: 302px; + } + } +} +body.anon.lang-es { + #searchBar { + width: 485px; + .searchInput { + width: 425px; + } + .searchInputCancelable { + width: 390px; + } + } +} diff --git a/askbot/skins/default/templates/instant_notification_reply_by_email.html b/askbot/skins/default/templates/instant_notification_reply_by_email.html new file mode 100644 index 00000000..ffb43110 --- /dev/null +++ b/askbot/skins/default/templates/instant_notification_reply_by_email.html @@ -0,0 +1,14 @@ + +{% if can_reply %} +{% trans %} +{# Don't change the following line in the template. #} +======= Reply above this line. ====-=-= +{% 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' %}
\ No newline at end of file diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html index e0de6bb6..20e2055c 100644 --- a/askbot/skins/default/templates/macros.html +++ b/askbot/skins/default/templates/macros.html @@ -603,7 +603,7 @@ answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_ alt="{% trans username=user.username %}responses for {{username}}{% endtrans %}" {% if user.new_response_count > 0 %} src="{{ "/images/mail-envelope-full.png"|media }}" - title="{% trans response_count=user.new_response_count %}you have a new response{% pluralize %}you have {{response_count}} new responses{% endtrans %}" + title="{% trans response_count=user.new_response_count %}you have {{response_count}} new response{% pluralize %}you have {{response_count}} new responses{% endtrans %}" {% elif user.seen_response_count > 0 %} src="{{ "/images/mail-envelope-empty.png"|media }}" title="{% trans %}no new responses yet{% endtrans %}" diff --git a/askbot/skins/default/templates/main_page/tab_bar.html b/askbot/skins/default/templates/main_page/tab_bar.html index 3ed59f6e..17ab810e 100644 --- a/askbot/skins/default/templates/main_page/tab_bar.html +++ b/askbot/skins/default/templates/main_page/tab_bar.html @@ -1,6 +1,6 @@ {% import "macros.html" as macros %} {% load extra_filters_jinja %} -{% cache 0 "scope_sort_tabs" search_tags request.user scope sort query context.page language_code %} +{% cache 0 "scope_sort_tabs" search_tags request.user author_name scope sort query context.page language_code %} <a class="rss" {% if feed_url %} href="{{feed_url}}" diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html index bc0dbdeb..f22796db 100644 --- a/askbot/skins/default/templates/question.html +++ b/askbot/skins/default/templates/question.html @@ -56,14 +56,11 @@ if (data['userIsAdminOrMod']){ return;//all functions on } - var edit_btn = document.getElementById( - 'post-' + post_id + '-edit' - ) if (post_id in data['user_posts']){ //todo: remove edit button from older comments return;//same here } - if ( + if (//maybe remove "delete" button data['userReputation'] < {{settings.MIN_REP_TO_DELETE_OTHERS_COMMENTS}} ) { @@ -72,7 +69,22 @@ ); delete_btn.parentNode.removeChild(delete_btn); } - edit_btn.parentNode.removeChild(edit_btn); + if (//maybe remove "edit" button + data['userReputation'] < + {{settings.MIN_REP_TO_EDIT_OTHERS_POSTS}} + ){ + var edit_btn = document.getElementById( + 'post-' + post_id + '-edit' + ) + edit_btn.parentNode.removeChild(edit_btn); + } + if (//maybe remove retag button + data['userReputation'] < + {{settings.MIN_REP_TO_RETAG_OTHERS_QUESTIONS}} + ){ + var retag_btn = document.getElementById('retag'); + retag_btn.parentNode.removeChild(retag_btn); + } } function render_add_comment_button(post_id, extra_comment_count){ var can_add = false; @@ -114,10 +126,32 @@ } } } + function render_add_answer_button(){ + var add_answer_btn = document.getElementById('add-answer-btn'); + if (askbot['data']['userIsAuthenticated']){ + if (askbot['data']['userId'] == {{question.author_id}}){ + add_answer_btn.setAttribute( + 'value', + '{% trans %}Answer Your Own Question{% endtrans %}' + ) + } else { + add_answer_btn.setAttribute( + 'value', + '{% trans %}Post Your Answer{% endtrans %}' + ) + } + } else { + add_answer_btn.setAttribute( + 'value', + '{% trans %}Login/Signup to Post{% endtrans %}' + ); + } + } askbot['functions'] = askbot['functions'] || {}; askbot['functions']['renderPostVoteButtons'] = render_vote_buttons; askbot['functions']['renderPostControls'] = render_post_controls; askbot['functions']['renderAddCommentButton'] = render_add_comment_button; + askbot['functions']['renderAddAnswerButton'] = render_add_answer_button; })(); </script> {% endblock %} diff --git a/askbot/skins/default/templates/question/new_answer_form.html b/askbot/skins/default/templates/question/new_answer_form.html index b2901e2a..68af8afb 100644 --- a/askbot/skins/default/templates/question/new_answer_form.html +++ b/askbot/skins/default/templates/question/new_answer_form.html @@ -40,17 +40,10 @@ </p> {% endif %} {{ macros.edit_post(answer) }} - <input type="submit" - {% if user.is_anonymous() %} - value="{% trans %}Login/Signup to Post{% endtrans %}" - {% else %} - {% if user == question.author %} - value="{% trans %}Answer Your Own Question{% endtrans %}" - {% else %} - value="{% trans %}Post Your Answer{% endtrans %}" - {% endif %} - {% endif %} - class="submit after-editor" style="float:left"/> + <input id="add-answer-btn" type="submit" class="submit after-editor" style="float:left"/> + <script type="text/javascript"> + askbot['functions']['renderAddAnswerButton'](); + </script> {% if settings.WIKI_ON %} {{ macros.checkbox_in_div(answer.wiki) }} {% endif %} diff --git a/askbot/skins/default/templates/reply_by_email_error.html b/askbot/skins/default/templates/reply_by_email_error.html new file mode 100644 index 00000000..53648184 --- /dev/null +++ b/askbot/skins/default/templates/reply_by_email_error.html @@ -0,0 +1,4 @@ +{% trans %} +<p>The system was unable to process your message successfully, the reason being:<p> +{% endtrans %} +{{error}} diff --git a/askbot/skins/default/templates/user_profile/user_edit.html b/askbot/skins/default/templates/user_profile/user_edit.html index 94a1d58d..7735ba93 100644 --- a/askbot/skins/default/templates/user_profile/user_edit.html +++ b/askbot/skins/default/templates/user_profile/user_edit.html @@ -40,7 +40,7 @@ <td> {% if settings.EDITABLE_SCREEN_NAME %} {{ form.username }} - <span class="form-error"></span> {{ form.username.errors }} </td> + <span class="form-error"> {{ form.username.errors }} </span></td> {% else %} {{ view_user.username }} {% endif %} @@ -53,8 +53,7 @@ <td> {% if settings.EDITABLE_EMAIL %} {{ form.email }} - <span class="form-error"></span> - {{ form.email.errors }} + <span class="form-error">{{ form.email.errors }}</span> {% else %} {{ view_user.email }} {% trans %}(cannot be changed){% endtrans %} @@ -63,27 +62,27 @@ </tr> <tr> <td>{{ form.realname.label_tag() }}:</td> - <td>{{ form.realname }} <span class="form-error"></span> {{ form.realname.errors }} </td> + <td>{{ form.realname }} <span class="form-error"> {{ form.realname.errors }} </span></td> </tr> <tr> <td>{{ form.website.label_tag() }}:</td> - <td>{{ form.website }} <span class="form-error"></span> {{ form.website.errors }} </td> + <td>{{ form.website }} <span class="form-error"> {{ form.website.errors }} </span></td> </tr> <tr> <td>{{ form.city.label_tag() }}:</td> - <td>{{ form.city }} <span class="form-error"></span> {{ form.city.errors }} </td> + <td>{{ form.city }} <span class="form-error"> {{ form.city.errors }} </span></td> </tr> <tr> <td>{{ form.country.label_tag() }}:</td> - <td>{{ form.country }} <span class="form-error"></span> {{ form.country.errors }} </td> + <td>{{ form.country }} <span class="form-error"> {{ form.country.errors }} </span></td> </tr> <tr> <td>{{ form.show_country.label_tag() }}:</td> - <td>{{ form.show_country }} <span class="form-error"></span> {{ form.show_country.errors }} </td> + <td>{{ form.show_country }} <span class="form-error"> {{ form.show_country.errors }} </span></td> </tr> <tr> <td>{{ form.birthday.label_tag() }}:</td> - <td>{{ form.birthday }} <span class="form-error"></span> {{ form.birthday.errors }} </td> + <td>{{ form.birthday }} <span class="form-error"> {{ form.birthday.errors }} </span></td> </tr> <tr> <td></td> @@ -95,7 +94,7 @@ </tr> <tr> <td style="vertical-align:top">{{ form.about.label_tag() }}:</td> - <td>{{ form.about }} <span class="form-error"></span> {{ form.about.errors }} </td> + <td>{{ form.about }} <span class="form-error"> {{ form.about.errors }} </span></td> </tr> </table> <div style="margin:30px 0 60px 0"> |