Skip to content

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

parents ac9aef2a f195ddc8
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 57 deletions
forum/skins/light/media/style/style.css
View file @ 6f8f63cc
......@@ -157,6 +157,10 @@ blockquote blockquote {
padding: 0;
}
#main-body {
clear: both;
}
.shadowed {
box-shadow: 0 1px 3px #989898;
-webkit-box-shadow: 0 1px 3px #989898;
......@@ -363,6 +367,7 @@ padding-top: 4px;
-webkit-box-shadow: 0 1px 1px #DFDFDF;
-moz-box-shadow: 0 1px 1px #DFDFDF;
font-size: 12px;
min-width: 974px;
}
#top {
......@@ -461,6 +466,7 @@ padding-top: 4px;
color: #DD4814;
font-family: "Trebuchet MS", "segoe ui", arial, sans-serif;
font-size: 17px;
float: left;
}
.short-summary .userinfo {
......@@ -485,9 +491,13 @@ padding-top: 4px;
font-weight: bold;
}
.short-summary .question-summary-wrapper {
/*.short-summary .question-summary-wrapper {
float: left;
width: 100%;
}*/
.short-summary-title {
float: left;
}
.short-summary .votes, .short-summary .status, .short-summary .views {
......@@ -651,7 +661,12 @@ padding-top: 4px;
margin-top: 5px;
}
.tags a, span.tag {
.tags-summary {
font-family: sans-serif;
float: left;
}
.tags a, span.tag, .tags-summary a {
background-color: #EEEEEE;
border-bottom: 1px solid #CCCCCC;
border-right: 1px solid #CCCCCC;
......@@ -663,7 +678,7 @@ padding-top: 4px;
white-space: nowrap;
}
.tags a:hover {
.tags a:hover, .tags-summary a:hover {
background-color: #DD4818;
color: #FFFFFF;
}
......@@ -671,6 +686,7 @@ padding-top: 4px;
.tag-number {
font-family: sans-serif;
font-weight: 700;
margin-right: 25px;
}
.marked-tags {
......@@ -891,22 +907,30 @@ div.question-body p, div.answer-body p {
.answered {
background-image: url(../images/light/answered.png);
background-repeat: none;
background-repeat: no-repeat;
color: black;
}
.answered-accepted, .answer-votes.answered-accepted {
background-image: url(../images/light/answered-accepted.png);
background-repeat: none;
background-repeat: no-repeat;
color: white;
}
.unanswered {
background: url(../images/light/unanswered.png);
background-repeat: none;
background-repeat: no-repeat;
color: white;
}
.answer-summary .answered {
background-color: #DD4818;
}
.answer-summary .answered-accepted {
background-color: #2DB651;
}
.focusedAnswer {
background: #FFFFCC;
}
......@@ -958,7 +982,7 @@ div.question-body p, div.answer-body p {
}
#medalList .intoMyBadges {
float: left;
min-width: 5%;
min-width: 25px;
text-align: right;
height:30px;
}
......@@ -2027,6 +2051,12 @@ div.dialog.prompt .dialog-content select, div.dialog.prompt .dialog-content text
}
.feed-icon {
width: 14px;
height: 14px;
float: left;
}
.feed-icon-big {
width: 28px;
height: 28px;
float: left;
......
forum/skins/light/templates/ask.html
View file @ 6f8f63cc
......@@ -89,10 +89,10 @@
{% endblock %}
{% block content %}
<div id="main-bar" class="headNormal">
<div id="main-bar" class="headUser" >
{% trans "Ask a question" %}
</div>
<div id="main-body" class="ask-body">
<div id="main-body" class="ask-body" style="clear:both;">
<div id="askform">
<form id="fmask" action="" method="post" accept-charset="utf-8">
{% csrf_token %}
......
forum/skins/light/templates/auth/signin.html
View file @ 6f8f63cc
......@@ -20,7 +20,7 @@
{{ provider.pre_code|safe }}
{% endif %}
{% endfor %}
<div class="headNormal">
<div class="headUser">
{% trans "User login" %}
</div>
{% if msg %}
......@@ -36,7 +36,7 @@
{% if top_stackitem_providers %}
<h3 class="or_label">{% trans 'Or...' %}</h3>
{% endif %}
<div style="width:600px;float:left;margin-bottom:5px;">
<div style="width:600px;float:left;margin-bottom:5px;clear:both;">
{% blocktrans %}
External login services use <b><a href="http://openid.net/">OpenID</a></b> technology, where your password always stays confidential between
you and your login provider and you don't have to remember another one.
......
forum/skins/light/templates/badges.html
View file @ 6f8f63cc
......@@ -8,7 +8,7 @@
<div class="headUser">
{% trans "Badges" %}
</div>
<div class="badges" id="main-body" style="width:100%">
<div class="badges" id="main-body" style="width:100%; clear: both;">
<p>
{% trans "Community gives you awards for your questions, answers and votes." %}
{% blocktrans %}Below is the list of available badges and number of times each type of badge has been awarded.
......
forum/skins/light/templates/question_list/item.html
View file @ 6f8f63cc
{% load i18n humanize extra_filters extra_tags user_tags %}
<div class="short-summary">
<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 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>
<h2><a {% if not question_summary %}title="{{ question.summary }}"{% endif %} href="{{ question.get_absolute_url }}">{{question.headline}}</a></h2>
{% 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 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>
</div>
<div class="short-summary-title">
<h2><a {% if not question_summary %}title="{{ question.summary }}"{% endif %} href="{{ question.get_absolute_url }}">{% if question.headline|wordcount >= 10 %} {{ question.headline|truncatewords:10 }} {% else %} {{ question.headline }} {% endif %} </a></h2>
{% if question_summary %}
<div class="summary">
{{ question.summary }}
</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>
</div>
<div class="tags">{% for tag in question.tagname_list %}
<a class="tag-link-{{ tag }}" href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}'" rel="tag">{{ tag }}</a>{% endfor %}
</div>
</div>
<br/><br/>
<div class="tags-summary">{% for tag in question.tagname_list %}
<a class="tag-link-{{ tag }}" href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}'" rel="tag">{{ tag }}</a>{% endfor %}
</div>
</div>
forum/skins/light/templates/questions.html
View file @ 6f8f63cc
......@@ -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.png" %}');" href="{{ feed_url }}" title="{% trans "subscribe to question RSS feed" %}"></a>
<a class="feed-icon-big" 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 %}
......
forum/skins/light/templates/tags.html
View file @ 6f8f63cc
......@@ -26,7 +26,7 @@
{% block content %}
<!-- Tabs -->
<div class="tabBar">
<div class="headQuestions">{% trans "Tag list" %}</div>
<div class="headUser">{% trans "Tag list" %}</div>
{{ tags.paginator.sort_tabs }}
</div>
<div id="searchtags">
......
forum/skins/light/templates/users/stats.html
View file @ 6f8f63cc
......@@ -6,6 +6,8 @@
{% load humanize %}
{% load question_list_tags %}
{% block usercontent %}
<a class="feed-icon-big" style="background-image:url('{% media "media/images/feed-icon.png" %}');"
href="{{ view_user.get_asked_url }}?type=rss" title="{% trans "subscribe to question RSS feed" %}"></a>
<div id="questionsBlock" class="userSection">
<a name="questions"></a>
{% spaceless %}
......@@ -15,12 +17,10 @@
{% plural %}
<span class="count">{{counter}}</span> Questions
{% endblocktrans %}
<a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');"
href="{{ view_user.get_asked_url }}?type=rss" title="{% trans "subscribe to question RSS feed" %}"></a>
</h2>
{% endspaceless %}
<div id="questionTabs">{{ questions.paginator.sort_tabs }}</div>
<div id="listA" class="user-stats-table">
<div id="listA">
{% for question in questions.paginator.page %}
{% question_list_item question favorite_count=yes signature_type=badges %}
{% endfor %}
......@@ -42,7 +42,6 @@
</h2>
{% endspaceless %}
<div id="answerTabs">{{ answers.paginator.sort_tabs }}</div>
<div class="user-stats-table">
{% for answer in answers.paginator.page %}
<div class="answer-summary">
<a title="{{answer.question.title}}"
......@@ -59,7 +58,6 @@
</div>
</div>
{% endfor %}
</div>
<br clear="all"/>
<div class="pager">{{ answers.paginator.page_numbers }}</div>
<br clear="all"/>
......@@ -76,7 +74,6 @@
{% endblocktrans %}
</h2>
{% endspaceless %}
<div class="user-stats-table">
<table>
<tr>
<td width="60">
......@@ -91,7 +88,6 @@
</td>
</tr>
</table>
</div>
<a name="tags"></a>
{% spaceless %}
<h2>
......@@ -102,7 +98,6 @@
{% endblocktrans %}
</h2>
{% endspaceless %}
<div class="user-stats-table">
<table class="tags">
<tr style="vertical-align: top;">
<td valign="top" style="padding-right: 20px;">
......@@ -111,16 +106,17 @@
class="tag-link-{{ tag.name }}"
title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}"
href="{% url tag_questions tag|urlencode %}?user={{view_user.username}}">{{tag.name}}</a>
<span class="tag-number">&#215; {{ tag.user_tag_usage_count|intcomma }}</span><br/>
{% if forloop.counter|divisibleby:"10" %}
<span class="tag-number">&#215; {{ tag.user_tag_usage_count|intcomma }}</span>
{% if forloop.counter|divisibleby:"5" %}
</td>
</tr>
<tr>
<td width="180" valign="top">
{% endif %}
{% endfor %}
</td>
</tr>
</table>
</div>
<a name="badges"></a>
{% spaceless %}
<h2>
......@@ -131,7 +127,6 @@
{% endblocktrans %}
</h2>
{% endspaceless %}
<div class="user-stats-table">
<table>
<tr style="vertical-align: top;">
<td style="line-height:35px; padding-right: 20px;">
......@@ -152,6 +147,5 @@
</td>
</tr>
</table>
</div>
{% endblock %}
<!-- end user_stats.html -->
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