diff options
-rw-r--r-- | askbot/skins/common/templates/question/answer_controls.html | 6 | ||||
-rw-r--r-- | askbot/skins/common/templates/question/question_controls.html | 12 | ||||
-rw-r--r-- | askbot/skins/default/media/images/background-user-info.png | bin | 0 -> 361 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/close.png | bin | 0 -> 469 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/delete.png | bin | 0 -> 434 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/edit2.png | bin | 0 -> 498 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/flag.png | bin | 0 -> 515 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/retag.png | bin | 0 -> 474 bytes | |||
-rw-r--r-- | askbot/skins/default/media/style/style.css | 669 | ||||
-rw-r--r-- | askbot/skins/default/templates/macros.html | 2 | ||||
-rw-r--r-- | askbot/skins/default/templates/question/answer_card.html | 7 | ||||
-rw-r--r-- | askbot/skins/default/templates/question/answer_tab_bar.html | 18 | ||||
-rw-r--r-- | askbot/skins/default/templates/question/question_card.html | 40 |
13 files changed, 398 insertions, 356 deletions
diff --git a/askbot/skins/common/templates/question/answer_controls.html b/askbot/skins/common/templates/question/answer_controls.html index 4309e10c..87c39066 100644 --- a/askbot/skins/common/templates/question/answer_controls.html +++ b/askbot/skins/common/templates/question/answer_controls.html @@ -7,12 +7,12 @@ </a> </span> {% if request.user|can_edit_post(answer) %}{{ pipe() }} -<span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans %}edit{% endtrans %}</a></span> +<span class="action-link"><a class="question-edit" href="{% url edit_answer answer.id %}">{% trans %}edit{% endtrans %}</a></span> {% endif %} {% if request.user|can_flag_offensive(answer) %}{{ pipe() }} <span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}"> - <a>{% trans %}flag offensive{% endtrans %}</a> + <a class="question-flag">{% trans %}flag offensive{% endtrans %}</a> {% if request.user|can_see_offensive_flags(answer) %} <span class="darkred">{% if answer.offensive_flag_count > 0 %}({{ answer.offensive_flag_count }}){% endif %}</span> {% endif %} @@ -21,7 +21,7 @@ {% if request.user|can_delete_post(answer) %}{{ pipe() }} {% spaceless %} <span class="action-link"> - <a id="answer-delete-link-{{answer.id}}"> + <a class="question-delete" id="answer-delete-link-{{answer.id}}"> {% if answer.deleted %}{% trans %}undelete{% endtrans %}{% else %}{% trans %}delete{% endtrans %}{% endif %}</a> </span> {% endspaceless %} diff --git a/askbot/skins/common/templates/question/question_controls.html b/askbot/skins/common/templates/question/question_controls.html index 257ce870..9de54526 100644 --- a/askbot/skins/common/templates/question/question_controls.html +++ b/askbot/skins/common/templates/question/question_controls.html @@ -1,31 +1,31 @@ {% set pipe=joiner('<span class="sep">|</span>') %} {% if request.user|can_edit_post(question) %}{{ pipe() }} - <a href="{% url edit_question question.id %}">{% trans %}edit{% endtrans %}</a> + <a class="question-edit" href="{% url edit_question question.id %}">{% trans %}edit{% endtrans %}</a> {% endif %} {% if request.user|can_retag_question(question) %}{{ pipe() }} - <a id="retag" href="{% url retag_question question.id %}">{% trans %}retag{% endtrans %}</a> + <a id="retag" class="question-retag"href="{% url retag_question question.id %}">{% trans %}retag{% endtrans %}</a> <script type="text/javascript"> var retagUrl = "{% url retag_question question.id %}"; </script> {% endif %} {% if question.closed %} {% if request.user|can_reopen_question(question) %}{{ pipe() }} - <a href="{% url reopen question.id %}">{% trans %}reopen{% endtrans %}</a> + <a class="question-close" href="{% url reopen question.id %}">{% trans %}reopen{% endtrans %}</a> {% endif %} {% else %} {% if request.user|can_close_question(question) %}{{ pipe() }} - <a href="{% url close question.id %}">{% trans %}close{% endtrans %}</a> + <a class="question-close" href="{% url close question.id %}">{% trans %}close{% endtrans %}</a> {% endif %} {% endif %} {% if request.user|can_flag_offensive(question) %}{{ pipe() }} <span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}"> - <a>{% trans %}flag offensive{% endtrans %}</a> + <a class="question-flag">{% trans %}flag offensive{% endtrans %}</a> {% if request.user|can_see_offensive_flags(question) %} <span class="darkred">{% if question.offensive_flag_count > 0 %}({{ question.offensive_flag_count }}){% endif %}</span> {% endif %} </span> {% endif %} {% if request.user|can_delete_post(question) %}{{ pipe() }} - <a id="question-delete-link-{{question.id}}">{% if question.deleted %}{% trans %}undelete{% endtrans %}{% else %}{% trans %}delete{% endtrans %}{% endif %}</a> + <a id="question-delete-link-{{question.id}}" class="question-delete">{% if question.deleted %}{% trans %}undelete{% endtrans %}{% else %}{% trans %}delete{% endtrans %}{% endif %}</a> {% endif %} diff --git a/askbot/skins/default/media/images/background-user-info.png b/askbot/skins/default/media/images/background-user-info.png Binary files differnew file mode 100644 index 00000000..b681cb37 --- /dev/null +++ b/askbot/skins/default/media/images/background-user-info.png diff --git a/askbot/skins/default/media/images/close.png b/askbot/skins/default/media/images/close.png Binary files differnew file mode 100644 index 00000000..cfe209ff --- /dev/null +++ b/askbot/skins/default/media/images/close.png diff --git a/askbot/skins/default/media/images/delete.png b/askbot/skins/default/media/images/delete.png Binary files differnew file mode 100644 index 00000000..9263eae3 --- /dev/null +++ b/askbot/skins/default/media/images/delete.png diff --git a/askbot/skins/default/media/images/edit2.png b/askbot/skins/default/media/images/edit2.png Binary files differnew file mode 100644 index 00000000..f142a68c --- /dev/null +++ b/askbot/skins/default/media/images/edit2.png diff --git a/askbot/skins/default/media/images/flag.png b/askbot/skins/default/media/images/flag.png Binary files differnew file mode 100644 index 00000000..fc302335 --- /dev/null +++ b/askbot/skins/default/media/images/flag.png diff --git a/askbot/skins/default/media/images/retag.png b/askbot/skins/default/media/images/retag.png Binary files differnew file mode 100644 index 00000000..836c043c --- /dev/null +++ b/askbot/skins/default/media/images/retag.png diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index ded24542..5145d4ae 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -456,7 +456,7 @@ h1 { .box { background: #fff; padding: 4px 0px 10px 0px; - + width:200px; p { margin-bottom: 4px; @@ -595,7 +595,6 @@ h1 { color: #777; text-align: left; } - } .statsWidget p{ @@ -1368,48 +1367,374 @@ span.delete-icon:hover { font-family:@yanone; vertical-align: top; } -} -.question-body, .answer-body { - min-height: 39px; - line-height: 20px; - overflow: auto; - width: 660px; - font-family:@trebuchet; - color:#4b4b4b; + .question-content{ + float:right; + width:690px; + } + + #question-table{ + float:left; + border-top:#f0f0f0 1px solid; + } + + #question-table, + .answer-table { + margin: 6px 0 10px 0; + border-spacing: 0px; + width: 100%; + } + + .answer-table { + border-bottom: 1px solid #bbb; + clear: both; + } + + .answer-table td, + #question-table td { + width:30px; + vertical-align:top; + } + .question-body, .answer-body { + overflow: auto; + margin-top:10px; + font-family:@trebuchet; + color:#4b4b4b; + + p{ + margin-bottom:15px; + line-height:1.4; + font-size:13px; + } + } + + .question-body IMG, .answer-body IMG { + max-width: 600px; + } + + .post-update-info-container { + float: right; + width: 190px; + } + + .post-update-info { + background: #fff url(../images/background-user-info.png) repeat-x bottom; + float: right; + font-size: 9px; + font-family:@arial; + width: 173px; + padding:4px; + margin:0px 0px 5px 5px; + line-height: 14px; + .rounded-corners(4px); + .box-shadow (0px, 2px,1px,#bfbfbf); + + p { + line-height: 13px; + font-size: 11px; + margin: 0 0 2px 1px; + padding: 0; + } + a{ + color:#444; + } + .gravatar { + float: left; + margin-right: 4px; + } + + p.tip { + color: #444; + line-height: 13px; + font-size: 10px; + } + } + + .post-controls{ + font-size: 11px; + line-height: 12px; + min-width: 200px; + padding-left: 5px; + text-align:right; + clear: left; + float: right; + margin-top:10px; + + a { + color: #777; + padding: 0px 3px 3px 22px; + cursor: pointer; + border: none; + font-size:12px; + font-family:@trebuchet; + text-decoration: none; + height:18px; + display:block; + float:left; + line-height:18px; + margin-top:-2px; + margin-left:4px; + } + + a:hover { + background-color: #f5f0c9; + + } + .sep { + color: #ccc; + float:left; + height:18px; + font-size:18px; + } + } + .post-controls,.answer-controls{ + .question-delete{ + background: url(../images/delete.png) no-repeat center left; + padding-left:16px; + } + .question-flag{ + background: url(../images/flag.png) no-repeat center left; + } + .question-edit{ + background: url(../images/edit2.png) no-repeat center left; + } + .question-retag{ + background: url(../images/retag.png) no-repeat center left; + } + .question-close{ + background: url(../images/close.png) no-repeat center left; + } + } + .tabBar{ + width:100%; + } + + #questionCount{ + float:left; + font-family:@yanone; + line-height:15px; + } + + div.comments { + padding: 0; + } + + .comments .button { + color: black; + font-size: 11px; + background: #eeeeee; + padding: 3px; + cursor: pointer; + } + + .comment a { + background-color: inherit; + color: blue; + padding: 0; + } + + .comment a.author, a.author:hover { + background-color: inherit; + color: blue; + padding: 0; + } + + .comment a.author:hover { + text-decoration: underline; + } + + .comments { + font-size: 12px; + width: 650px; + clear: both; + } + + .comments .comment { + border-top: 1px dotted #cccccc; + margin: 0; + overflow: auto; + } + + .comments .content { + margin-bottom: 7px; + } + + .comments div.comment { + min-height: 25px; + } + + .comments div.comment:hover { + background-color: #eee; + } + + div.comment .comment-votes { + float: left; + width: 37px; + line-height: 130%; + padding: 6px 5px 6px 3px; + } + + div.comment .comment-body { + line-height: 140%; + margin: 3px 26px 0 46px; + padding: 5px 3px; + color: #666; + } + + div.comment .comment-body p{ + font-size:inherit; + margin-bottom: 3px; + padding: 0; + } + + div.comment .comment-delete { + float: right; + width: 14px; + line-height: 130%; + padding: 8px 6px; + } + + div.comment .upvote { + margin: 0px; + padding-right: 17px; + padding-top: 2px; + text-align: right; + height: 20px; + font-size: 13px; + font-weight: bold; + color: #777; + } + + div.comment .upvote.upvoted { + color: #d64000; + } + + div.comment .upvote.hover { + background: url(../images/go-up-grey.png) no-repeat; + background-position: right 1px; + } + + div.comment .upvote:hover { + background: url(../images/go-up-orange.png) no-repeat; + background-position: right 1px; + } + + .comments div.controls { + clear: both; + background: url(../images/gray-up-arrow-h18px.png) no-repeat; + width: 100%; + padding-left: 12px; + margin: 3px 0 20px 5px; + } + + .comments form.post-comments { + width: 560px; + margin: 3px 30px 4px 45px; + } + + .comments textarea { + display: block; + height: 42px; + width: 572px; + margin: 6px 0 5px 1px; + font-family: sans-serif; + outline: none; + overflow:auto; + font-size: 12px; + line-height: 140%; + padding-left:2px; + } + + .comments input { + margin-left: 10px; + margin-top: 1px; + vertical-align: top; + width: 100px; + } + + .comments .counter { + display: inline-block; + width: 245px; + vertical-align: top; + } + + .comments .controls a { + color: #888888; + padding: 0 3px 2px; + } + + .comments .controls a:hover { + background-color: #777777; + color: white; + text-decoration: none; + } + + .comments .help-text{ + float: right; + text-align:right; + color: gray; + margin-bottom: 0px; + margin-top: 0px; + line-height: 50%; + } } -.question-body p, .answer-body p{ - font-size:13px; +#questionTools { + font-size: 22px; + margin-top: 11px; + text-align: left; } -.question-body IMG, .answer-body IMG { - max-width: 600px; + + +.question-status { + margin-top: 10px; + margin-bottom:15px + padding: 20px; + background-color: #F5F5F5; + text-align: center; } +.question-status h3 { + font-size: 125%; +} -#question-table, -.answer-table { - margin: 2px 0 10px 0; - border-spacing: 0px; - width: 100%; +.vote-buttons { + float: left; + text-align: center; + padding-top: 2px; } -.answer-table { - border-bottom: 1px solid #bbb; - clear: both; +.vote-buttons IMG { + cursor: pointer; } -.answer-table td, -#question-table td { - width:30px; - vertical-align:top; +.vote-number { + font-family: Arial; + padding: 0px 0 3px 0; + font-size: 140%; + font-weight: bold; + color: #777; } -#questionTools { - font-size: 22px; - margin-top: 11px; +.vote-buttons .notify-sidebar { text-align: left; } +.vote-buttons .notify-sidebar label { + vertical-align: top; +} + +.question-img-upvote:hover { + background: url(../images/vote-arrow-up-on.png) +} + +.question-img-downvote:hover { + background: url(../images/vote-arrow-down-on.png) +} + +.question-img-favorite:hover { + background: url(../images/vote-favorite-on.png) +} + /* ----- Footer links , check blocks/footer.html----- */ @@ -1486,72 +1811,10 @@ a:hover.medal { border-right: 1px solid #D1CA3D; } - -.question-status { - margin-top: 10px; - margin-bottom:15px - padding: 20px; - background-color: #F5F5F5; - text-align: center; -} - -.question-status h3 { - font-size: 125%; -} - -.vote-buttons { - float: left; - text-align: center; - padding-top: 2px; -} - -.vote-buttons IMG { - cursor: pointer; -} - -.vote-number { - font-family: Arial; - padding: 0px 0 3px 0; - font-size: 140%; - font-weight: bold; - color: #777; -} - -.vote-buttons .notify-sidebar { - text-align: left; -} -.vote-buttons .notify-sidebar label { - vertical-align: top; -} - -.question-img-upvote:hover { - background: url(../images/vote-arrow-up-on.png) -} - -.question-img-downvote:hover { - background: url(../images/vote-arrow-down-on.png) -} - -.question-img-favorite:hover { - background: url(../images/vote-favorite-on.png) -} - - .notify-me { float: left; } -.offensive-flag a { - color: #777; - padding: 3px; - cursor: pointer; -} - -.offensive-flag a:hover { - background-color: #777; - text-decoration: none; - color: #fff; -} .linksopt a { color: #777; @@ -1565,158 +1828,6 @@ a:hover.medal { color: #fff; } -.post-controls a { - color: #777; - padding: 3px; - cursor: pointer; - border: none; - background: none; - text-decoration: none; -} - -.post-controls a:hover { - background-color: #777; - color: #fff; -} - -.post-controls .sep { - color: #ccc; -} - -.comments { - font-size: 12px; - width: 650px; - clear: both; -} - -.comments .comment { - border-top: 1px dotted #cccccc; - margin: 0; - overflow: auto; -} - -.comments .content { - margin-bottom: 7px; -} - -.comments div.comment { - min-height: 25px; -} - -.comments div.comment:hover { - background-color: #eee; -} - -div.comment .comment-votes { - float: left; - width: 37px; - line-height: 130%; - padding: 6px 5px 6px 3px; -} - -div.comment .comment-body { - line-height: 140%; - margin: 3px 26px 0 46px; - padding: 5px 3px; - color: #666; -} - -div.comment .comment-body p{ - font-size:inherit; - margin-bottom: 3px; - padding: 0; -} - -div.comment .comment-delete { - float: right; - width: 14px; - line-height: 130%; - padding: 8px 6px; -} - -div.comment .upvote { - margin: 0px; - padding-right: 17px; - padding-top: 2px; - text-align: right; - height: 20px; - font-size: 13px; - font-weight: bold; - color: #777; -} - -div.comment .upvote.upvoted { - color: #d64000; -} - -div.comment .upvote.hover { - background: url(../images/go-up-grey.png) no-repeat; - background-position: right 1px; -} - -div.comment .upvote:hover { - background: url(../images/go-up-orange.png) no-repeat; - background-position: right 1px; -} - -.comments div.controls { - clear: both; - background: url(../images/gray-up-arrow-h18px.png) no-repeat; - width: 100%; - padding-left: 12px; - margin: 3px 0 20px 5px; -} - -.comments form.post-comments { - width: 560px; - margin: 3px 30px 4px 45px; -} - -.comments textarea { - display: block; - height: 42px; - width: 572px; - margin: 6px 0 5px 1px; - font-family: sans-serif; - outline: none; - overflow:auto; - font-size: 12px; - line-height: 140%; - padding-left:2px; -} - -.comments input { - margin-left: 10px; - margin-top: 1px; - vertical-align: top; - width: 100px; -} - -.comments .counter { - display: inline-block; - width: 245px; - vertical-align: top; -} - -.comments .controls a { - color: #888888; - padding: 0 3px 2px; -} - -.comments .controls a:hover { - background-color: #777777; - color: white; - text-decoration: none; -} - -.comments .help-text{ - float: right; - text-align:right; - color: gray; - margin-bottom: 0px; - margin-top: 0px; - line-height: 50%; -} span.text-counter { margin-right: 20px; @@ -1732,33 +1843,6 @@ p.form-item { margin: 0px; } -div.comments { - padding: 0; -} - -.comments .button { - color: black; - font-size: 11px; - background: #eeeeee; - padding: 3px; - cursor: pointer; -} - -.comment a { - background-color: inherit; - color: blue; - padding: 0; -} - -.comment a.author, a.author:hover { - background-color: inherit; - color: blue; - padding: 0; -} - -.comment a.author:hover { - text-decoration: underline; -} .accepted-answer { background-color: #EBFFE6; @@ -1808,8 +1892,6 @@ div.comments { } - - /* openid styles */ .form-row { line-height: 25px; @@ -2464,18 +2546,6 @@ ul.form-horizontal-rows li input { vertical-align: top; } -.post-controls, .post-tags { - font-size: 11px; - line-height: 12px; - min-width: 200px; - padding-left: 5px; - margin-bottom: 5px; -} - -.post-controls { - clear: left; - float: left; -} ul.post-tags { margin-left: 7px; @@ -2494,37 +2564,6 @@ ul.post-retag { margin: 0 0 3px 0; } -.post-update-info-container { - float: right; - min-width: 85px; -} - -.post-update-info { - display: inline-block; - float: right; - font-size: 11px; - width: 190px; - margin-bottom: 5px; - line-height: 14px -} - -.post-update-info p { - line-height: 13px; - font-size: 11px; - margin: 0 0 2px 1px; - padding: 0; -} - -.post-update-info .gravatar { - float: left; - margin-right: 4px; -} - - -.post-update-info p.tip { - color: #444; -} - #tagSelector { padding-bottom: 2px; margin-bottom: 0; diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html index c13595f4..c90458a1 100644 --- a/askbot/skins/default/templates/macros.html +++ b/askbot/skins/default/templates/macros.html @@ -49,7 +49,7 @@ poor design of the data or methods on data objects #} {% endif %} <strong>{{post.added_at|diff_date}}</strong> </p> - <img + <img width="35" height="35" src="{{'/images/wiki.png'|media}}" alt="{% trans %}this post is marked as community wiki{% endtrans %}" style="float:left" diff --git a/askbot/skins/default/templates/question/answer_card.html b/askbot/skins/default/templates/question/answer_card.html index 097dbbfd..f2786e54 100644 --- a/askbot/skins/default/templates/question/answer_card.html +++ b/askbot/skins/default/templates/question/answer_card.html @@ -12,14 +12,15 @@ <td> <div class="item-right"> <div class="answer-body"> + <div class="post-update-info-container"> + {% include "question/answer_author_info.html" %} + </div> {{ answer.html }} </div> <div class="answer-controls post-controls"> {% include "question/answer_controls.html" %} </div> - <div class="post-update-info-container"> - {% include "question/answer_author_info.html" %} - </div> + {% include "question/answer_comments.html" %} </div> </td> diff --git a/askbot/skins/default/templates/question/answer_tab_bar.html b/askbot/skins/default/templates/question/answer_tab_bar.html index 227a9f81..ebb4dec5 100644 --- a/askbot/skins/default/templates/question/answer_tab_bar.html +++ b/askbot/skins/default/templates/question/answer_tab_bar.html @@ -1,12 +1,16 @@ <div class="tabBar"> - <h2 id="sort-top"> - {% trans counter=answers|length %} - {{counter}} Answer: - {% pluralize %} - {{counter}} Answers: - {% endtrans %} - </h2> + <h1 id="questionCount"> + {% trans counter=answers|length %} + {{counter}} Answer + {% pluralize %} + {{counter}} Answers + {% endtrans %} + </h1> <div class="tabsA"> + + <span class="label"> + Sort by ยป + </span> <a id="oldest" href="{{ question.get_absolute_url() }}?sort=oldest#sort-top" title="{% trans %}oldest answers will be shown first{% endtrans %}" ><span>{% trans %}oldest answers{% endtrans %}</span></a> diff --git a/askbot/skins/default/templates/question/question_card.html b/askbot/skins/default/templates/question/question_card.html index 9364d3fd..b1fa1743 100644 --- a/askbot/skins/default/templates/question/question_card.html +++ b/askbot/skins/default/templates/question/question_card.html @@ -1,24 +1,22 @@ -<h1><a href="{{ question.get_absolute_url() }}">{{ question.get_question_title() }}</a></h1> -{% include "question/question_tags.html" %} -<table id="question-table" {% if question.deleted %}class="deleted"{%endif%}> - <tr> - <td> - <div class="vote-buttons"> - {% include "question/question_vote_buttons.html"%} - {% include "question/share_buttons.html"%} - </div> - </td> - <td> - <div class="question-body"> - {{question.html}} - </div> - <div id="question-controls" class="post-controls"> - {% include "question/question_controls.html" %} - </div> +<div class="vote-buttons"> + {% include "question/question_vote_buttons.html"%} + {% include "question/share_buttons.html"%} +</div> +<div class="question-content"> + + <h1><a href="{{ question.get_absolute_url() }}">{{ question.get_question_title() }}</a></h1> + {% include "question/question_tags.html" %} + <div id="question-table" {% if question.deleted %}class="deleted"{%endif%}> + <div class="question-body"> <div class="post-update-info-container"> {% include "question/question_author_info.html" %} </div> - {% include "question/question_comments.html" %} - </td> - </tr> -</table> + {{question.html}} + </div> + <div id="question-controls" class="post-controls"> + {% include "question/question_controls.html" %} + </div> + {% include "question/question_comments.html" %} + </div> +</div> +<div class="clean"></div> |