Skip to content

W
website
Commit ac9aef2a authored by Giuseppe Terrasi's avatar Giuseppe Terrasi
Browse files
Options

merge from lp:~ricki-padovani/ubuntu-it-ask/questions 

update layout of questions page
new icon for answer in list of questions
various fix
parents 0f29efbb 8c235f32
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 60 deletions
forum/skins/light/media/style/style.css
View file @ ac9aef2a
......@@ -12,14 +12,6 @@ body {
min-width: 985px;
margin: 0 1px 0 0;
padding: 0;
scrollbar-3dlight-color: orange;
scrollbar-arrow-color: #313131;
scrollbar-base-color: red;
scrollbar-darkshadow-color: #80FFFF;
scrollbar-face-color: red;
scrollbar-highlight-color: rgb(50,0,1);
scrollbar-shadow-color: rgb(112,22,21);
scrollbar-track-color: black;
}
div {
......@@ -438,11 +430,10 @@ padding-top: 4px;
color: black;
}
#listA {
float: left;
padding: 0 0;
width: auto;
width: 100%;
}
.thousand {
......@@ -496,13 +487,10 @@ padding-top: 4px;
.short-summary .question-summary-wrapper {
float: left;
width: 565px;
width: 100%;
}
.short-summary .votes, .short-summary .status, .short-summary .views {
-moz-border-radius: 5px 5px 5px 5px;
border-bottom: 1px solid #CCCCCC;
border-right: 1px solid #CCCCCC;
float: left;
font-size: 11px;
height: 42px;
......@@ -619,31 +607,36 @@ padding-top: 4px;
}
.paginator .page, .paginator .page a:visited, .paginator .curr {
background-color: #FFFFFF;
border: 1px solid #CCCCCC;
color: #777777;
font: 0.875em verdana;
background-color: white;
border: 1px solid #DD4818;
color: #DD4818;
font: 0.875em Ubuntu;
margin: 0 0.25em;
padding: 0.25em;
}
.paginator .curr {
background-color: #777777;
border: 1px solid #777777;
background-color: #DD4818;
border: 1px solid #DD4818;
color: #FFFFFF;
font-weight: bold;
}
.paginator .page:hover, .paginator .prev a:hover, .paginator .next a:hover {
background-color: #777777;
border: 1px solid #777777;
color: #FFFFFF;
background-color: #DD4818;
border: 1px solid #DD4818;
color: white !important;
text-decoration: none;
}
.paginator .page:hover a {
color: white;
text-decoration: none;
}
.paginator .text {
color: #777777;
font: bold 100% sans-serif;
font: bold 100% Ubuntu;
padding: 0.3em;
}
......@@ -671,7 +664,7 @@ padding-top: 4px;
}
.tags a:hover {
background-color: #356FCB;
background-color: #DD4818;
color: #FFFFFF;
}
......@@ -754,7 +747,7 @@ a.medal:hover {
.tabsA a.on, .tabsA a:hover {
background: none repeat scroll 0 0 #FFFFFF;
color: #A40000;
color: #DD4818;
}
.tabsA a:hover {
......@@ -822,7 +815,8 @@ a.medal:hover {
font-weight: 800;
margin-bottom: 12px;
padding: 5px;
text-align: left;
float: left;
width: auto;
}
.questions-related {
......@@ -896,18 +890,21 @@ div.question-body p, div.answer-body p {
}
.answered {
background: none repeat scroll 0 0 #E5EBF8;
color: #314362;
background-image: url(../images/light/answered.png);
background-repeat: none;
color: black;
}
.answered-accepted, .answer-votes.answered-accepted {
background: none repeat scroll 0 0 #E6F8DD;
color: #3A6231;
background-image: url(../images/light/answered-accepted.png);
background-repeat: none;
color: white;
}
.unanswered {
background: none repeat scroll 0 0 #F3E3E1;
color: #6B2B28;
background: url(../images/light/unanswered.png);
background-repeat: none;
color: white;
}
.focusedAnswer {
......@@ -1166,6 +1163,7 @@ ins {
.relativetime {
text-decoration: none;
float: right;
}
.answer-summary {
......@@ -2029,9 +2027,9 @@ div.dialog.prompt .dialog-content select, div.dialog.prompt .dialog-content text
}
.feed-icon {
width: 14px;
height: 14px;
display: inline-block;
width: 28px;
height: 28px;
float: left;
}
div#subscription_list {
......
forum/skins/light/templates/question_list/item.html
View file @ ac9aef2a
{% load i18n humanize extra_filters extra_tags user_tags %}
<div class="short-summary">
<div class="counts">{% if favorite_count %}
<div class="favorites">
<span class="favorite-mark{% if question.favourite_count %} on{% endif %}"></span>
<div class="item-count">{{question.favourite_count|intcomma}}</div>
</div>
{% endif %}
<div class="votes">
<div class="item-count">{{question.score|intcomma}}</div>
<div>{% ifequal question.score 1 %}{% trans "vote" %}{% else %}{% trans "votes" %}{% endifequal %}</div>
</div >
<div {% if question.accepted_count %}title="{% trans "this question has an accepted answer" %}"{% endif %} class="status {% if question.accepted_count %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
<div class="item-count">{{question.answer_count|intcomma}}</div>
<div>{% ifequal question.answer_count 1 %}{% trans "answer" %}{% else %}{% trans "answers" %}{% endifequal %}</div>
</div>
<div class="views">
<div class="item-count">{{question.view_count|decorated_int|safe}}</div>
<div>{% ifequal question.view_count 1 %}{% trans "view" %}{% else %}{% trans "views" %}{% endifequal %}</div>
<div class="question-summary-wrapper">
<div class="counts">{% if favorite_count %}
<div class="favorites">
<span class="favorite-mark{% if question.favourite_count %} on{% endif %}"></span>
<div class="item-count">{{question.favourite_count|intcomma}}</div>
</div>
{% endif %}
<div class="votes">
<div class="item-count">{{question.score|intcomma}}</div>
<div>{% ifequal question.score 1 %}{% trans "vote" %}{% else %}{% trans "votes" %}{% endifequal %}</div>
</div >
<div {% if question.accepted_count %}title="{% trans "this question has an accepted answer" %}"{% endif %} class="status {% if question.accepted_count %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
<div class="item-count">{{question.answer_count|intcomma}}</div>
<div>{% ifequal question.answer_count 1 %}{% trans "answer" %}{% else %}{% trans "answers" %}{% endifequal %}</div>
</div>
<div class="views">
<div class="item-count">{{question.view_count|decorated_int|safe}}</div>
<div>{% ifequal question.view_count 1 %}{% trans "view" %}{% else %}{% trans "views" %}{% endifequal %}</div>
</div>
</div>
</div>
<div class="question-summary-wrapper">
<h2><a {% if not question_summary %}title="{{ question.summary }}"{% endif %} href="{{ question.get_absolute_url }}">{{question.headline}}</a></h2>
{% if question_summary %}
<div class="summary">
......@@ -28,8 +28,8 @@
</div>
{% endif %}
<div class="userinfo">
{% if question.last_activity_by %}{% user_signature question.last_activity_by signature_type %}{% endif %} <br/>
<span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>
{% if question.last_activity_by %}{% user_signature question.last_activity_by signature_type %}{% endif %}
</div>
<div class="tags">{% for tag in question.tagname_list %}
......@@ -37,4 +37,4 @@
</div>
</div>
</div>
\ No newline at end of file
</div>
forum/skins/light/templates/question_list/title.html
View file @ ac9aef2a
{% load i18n %}
<div class="headQuestions">
<div class="headUser">
{% if searchtag %}
{% trans "Found by tags" %}
{% else %}
......@@ -22,4 +22,4 @@
{% endif %}
{% endif %}
{% endif %}
</div>
\ No newline at end of file
</div>
forum/skins/light/templates/questions.html
View file @ ac9aef2a
......@@ -21,7 +21,7 @@
<div class="tabBar">
{% include "question_list/title.html" %}
<a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');" href="{{ feed_url }}" title="{% trans "subscribe to question RSS feed" %}"></a>
<a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon.png" %}');" href="{{ feed_url }}" title="{% trans "subscribe to question RSS feed" %}"></a>
{{ questions.paginator.sort_tabs }}
</div>
<div id="listA">{% for question in questions.paginator.page %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment