opendev
/
askbot-theme
Code Issues Proposed changes

finished the footer and fixed up the user navigation

This commit is contained in:
Evgeny Fadeev 2013-03-20 01:07:47 -04:00
parent 4d96d0a29e
commit d3edd95106
5 changed files with 233 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
os/media/images/favicon.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

57
os/media/sass/extra.scss
View File

@ -28,6 +28,12 @@ h1.section-title,
border-top: 3px solid #255e6e;
@include box-shadow(1px 1px 1px 1px #ccc);
}
.openid-signin {
#metaNav a.signin {
background: none;
@include box-shadow(0 0 0 0);
}
}
#metaNav {
position: absolute;
left: 200px;
@ -41,6 +47,13 @@ h1.section-title,
@include text-shadow(#fff 0 1px 1px);
}
a.signin {
background: #e8d895;
padding: 5px 8px;
@include border-radius(4px);
@include box-shadow(0 0 2px 2px white);
}
a.on {
font-weight: normal;
color: #e4eef1;
@ -81,8 +94,8 @@ h1.section-title,
border-left: 1px solid #e4eef1;
display: block;
left: -1px;
padding: 0 0 10px 0;
top: 32px;
padding: 4px 0 10px 0;
top: 36px;
}
}
.dropdown-menu {
@ -92,9 +105,13 @@ h1.section-title,
li {
line-height: 1.7;
padding-left: 13px;
img {
margin-bottom: 3px;
}
}
li:hover {
display: block !important;
background: white !important;
margin: 0;
padding: 0;
width: 100% !important;
@ -172,6 +189,9 @@ body.anon .search-drop-menu {
margin-top: -56px;
margin-bottom: 56px;
}
#ContentLeft {
padding-bottom: 0;
}
.box {
h2,
@ -223,17 +243,44 @@ input[type="reset"],
}
#footer {
.span-8,
.span-4 {
margin-top: 10px;
.span-4,
.span-8 {
margin: 0;
padding-right: 10px;
}
.span-4 {
width: 17%;
}
.span-8 {
width: 32%
}
a,
a:active,
a:hover,
a:visited,
p {
color: #666;
font-size: 12px;
line-height: 18px;
}
h3 {
color: #de0000;
font-size: 16px;
margin: 0 0 8px 0;
padding: 0;
}
ul {
list-style: none;
margin: 0;
}
textarea {
display: block;
margin: 12px 0 10px;
width: 80%;
}
}
.pager,
.paginator {
margin-bottom: 0;
padding-bottom: 0;
}

147
os/media/style/extra.css
View File

@ -32,13 +32,21 @@ h1.section-title,
box-shadow: 1px 1px 1px 1px #cccccc;
}
/* line 31, ../sass/extra.scss */
/* line 32, ../sass/extra.scss */
.openid-signin #metaNav a.signin {
background: none;
-webkit-box-shadow: 0 0 0 0;
-moz-box-shadow: 0 0 0 0;
box-shadow: 0 0 0 0;
}
/* line 37, ../sass/extra.scss */
#metaNav {
position: absolute;
left: 200px;
bottom: 22px;
}
/* line 36, ../sass/extra.scss */
/* line 42, ../sass/extra.scss */
#metaNav a {
color: #255e6e;
font-size: 16px;
@ -46,7 +54,20 @@ h1.section-title,
height: 16px;
text-shadow: white 0 1px 1px;
}
/* line 44, ../sass/extra.scss */
/* line 50, ../sass/extra.scss */
#metaNav a.signin {
background: #e8d895;
padding: 5px 8px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-ms-border-radius: 4px;
-o-border-radius: 4px;
border-radius: 4px;
-webkit-box-shadow: 0 0 2px 2px white;
-moz-box-shadow: 0 0 2px 2px white;
box-shadow: 0 0 2px 2px white;
}
/* line 57, ../sass/extra.scss */
#metaNav a.on {
font-weight: normal;
color: #e4eef1;
@ -61,7 +82,7 @@ h1.section-title,
-moz-box-shadow: 0 0 2px 2px white;
box-shadow: 0 0 2px 2px white;
}
/* line 57, ../sass/extra.scss */
/* line 70, ../sass/extra.scss */
#metaNav #navTags,
#metaNav #navBadges,
#metaNav #navUsers,
@ -71,7 +92,7 @@ h1.section-title,
padding: 3px 10px 6px 10px;
margin: 0 0 0 30px;
}
/* line 64, ../sass/extra.scss */
/* line 77, ../sass/extra.scss */
#metaNav .dropdown,
#metaNav a {
display: inline;
@ -79,75 +100,80 @@ h1.section-title,
padding: 0;
margin: 5px 0 0 0;
}
/* line 70, ../sass/extra.scss */
/* line 83, ../sass/extra.scss */
#metaNav span.dropdown-toggle {
padding: 10px;
border-left: 1px solid #e4eef1;
/*background: url(../images/sprites.png) no-repeat -7px -242px;*/
position: relative;
}
/* line 76, ../sass/extra.scss */
/* line 89, ../sass/extra.scss */
#metaNav span.dropdown-toggle:hover {
background: #e4eef1;
/*background: url(../images/sprites.png) no-repeat -7px -274px;*/
}
/* line 79, ../sass/extra.scss */
/* line 92, ../sass/extra.scss */
#metaNav span.dropdown-toggle:hover .dropdown-menu {
background: #e4eef1;
border-left: 1px solid #e4eef1;
display: block;
left: -1px;
padding: 0 0 10px 0;
top: 32px;
padding: 4px 0 10px 0;
top: 36px;
}
/* line 88, ../sass/extra.scss */
/* line 101, ../sass/extra.scss */
#metaNav .dropdown-menu {
background: #e4eef1;
left: 26px;
top: 22px;
}
/* line 92, ../sass/extra.scss */
/* line 105, ../sass/extra.scss */
#metaNav .dropdown-menu li {
line-height: 1.7;
padding-left: 13px;
}
/* line 96, ../sass/extra.scss */
/* line 108, ../sass/extra.scss */
#metaNav .dropdown-menu li img {
margin-bottom: 3px;
}
/* line 112, ../sass/extra.scss */
#metaNav .dropdown-menu li:hover {
display: block !important;
background: white !important;
margin: 0;
padding: 0;
width: 100% !important;
}
/* line 102, ../sass/extra.scss */
/* line 119, ../sass/extra.scss */
#metaNav .dropdown-menu a {
margin: 0;
padding: 0;
}
/* line 106, ../sass/extra.scss */
/* line 123, ../sass/extra.scss */
#metaNav .dropdown-menu a:hover {
text-decoration: underline;
}
/* line 111, ../sass/extra.scss */
/* line 128, ../sass/extra.scss */
#header.with-logo #userToolsNav {
bottom: 19px;
right: -100px;
}
/* line 115, ../sass/extra.scss */
/* line 132, ../sass/extra.scss */
#secondaryHeader {
background: #fff;
border: none;
margin-bottom: 7px;
}
/* line 120, ../sass/extra.scss */
/* line 137, ../sass/extra.scss */
.scope-selector {
font-size: 16px;
height: 37px;
border-bottom: 3px solid white;
}
/* line 125, ../sass/extra.scss */
/* line 142, ../sass/extra.scss */
.scope-selector.on, .scope-selector:hover {
background: none;
border-bottom: 3px solid;
@ -158,33 +184,33 @@ h1.section-title,
-o-transition: 0.07s, ease;
transition: 0.07s, ease;
}
/* line 132, ../sass/extra.scss */
/* line 149, ../sass/extra.scss */
.scope-selector:hover {
color: #264D69;
}
/* line 135, ../sass/extra.scss */
/* line 152, ../sass/extra.scss */
.scope-selector:first-child {
margin-left: 0;
}
/* line 140, ../sass/extra.scss */
/* line 157, ../sass/extra.scss */
#askButton,
#homeButton {
display: none;
}
/* line 143, ../sass/extra.scss */
/* line 160, ../sass/extra.scss */
.tabBar {
background: none;
}
/* line 146, ../sass/extra.scss */
/* line 163, ../sass/extra.scss */
#logo img {
height: 56px;
margin-left: -10px;
}
/* line 150, ../sass/extra.scss */
/* line 167, ../sass/extra.scss */
#searchBar {
-webkit-box-shadow: inset #eeeeee 1px 1px 2px 1px;
-moz-box-shadow: inset #eeeeee 1px 1px 2px 1px;
@ -193,12 +219,12 @@ h1.section-title,
margin-top: -33px;
}
/* line 155, ../sass/extra.scss */
/* line 172, ../sass/extra.scss */
.search-drop-menu {
margin-left: 255px;
}
/* line 158, ../sass/extra.scss */
/* line 175, ../sass/extra.scss */
.search-drop-menu .footer button {
padding: 2px 6px 3px;
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(5%, #f3f3f3), color-stop(100%, #f5850c));
@ -212,25 +238,30 @@ h1.section-title,
text-shadow: 0 0 0;
}
/* line 167, ../sass/extra.scss */
/* line 184, ../sass/extra.scss */
body.anon #searchBar,
body.anon .search-drop-menu {
margin-left: 158px;
}
/* line 171, ../sass/extra.scss */
/* line 188, ../sass/extra.scss */
#ContentRight {
margin-top: -56px;
margin-bottom: 56px;
}
/* line 178, ../sass/extra.scss */
/* line 192, ../sass/extra.scss */
#ContentLeft {
padding-bottom: 0;
}
/* line 198, ../sass/extra.scss */
.box h2,
.box .contributorback {
background: none;
text-align: left;
}
/* line 186, ../sass/extra.scss */
/* line 206, ../sass/extra.scss */
.box .inputs #interestingTagInput,
.box .inputs #ignoredTagInput,
.box .inputs #subscribedTagInput,
@ -240,7 +271,7 @@ body.anon .search-drop-menu {
line-height: 23px;
}
/* line 195, ../sass/extra.scss */
/* line 215, ../sass/extra.scss */
input[type="submit"].searchBtn,
input.cancelSearchBtn {
border: 0;
@ -251,7 +282,7 @@ input.cancelSearchBtn {
right: -500px;
}
/* line 207, ../sass/extra.scss */
/* line 227, ../sass/extra.scss */
button,
input[type="submit"],
input[type="button"],
@ -284,19 +315,55 @@ input[type="reset"],
border-left-color: #bababa !important;
}
/* line 227, ../sass/extra.scss */
#footer .span-8,
#footer .span-4 {
margin: 0;
padding-right: 10px;
/* line 245, ../sass/extra.scss */
#footer {
margin-top: 10px;
}
/* line 231, ../sass/extra.scss */
/* line 248, ../sass/extra.scss */
#footer .span-4,
#footer .span-8 {
margin: 0;
}
/* line 251, ../sass/extra.scss */
#footer .span-4 {
width: 17%;
}
/* line 254, ../sass/extra.scss */
#footer .span-8 {
width: 32%;
}
/* line 261, ../sass/extra.scss */
#footer a,
#footer a:active,
#footer a:hover,
#footer a:visited,
#footer p {
color: #666;
font-size: 12px;
line-height: 18px;
}
/* line 266, ../sass/extra.scss */
#footer h3 {
color: #de0000;
font-size: 16px;
margin: 0 0 8px 0;
padding: 0;
}
/* line 235, ../sass/extra.scss */
/* line 272, ../sass/extra.scss */
#footer ul {
list-style: none;
margin: 0;
}
/* line 276, ../sass/extra.scss */
#footer textarea {
display: block;
margin: 12px 0 10px;
width: 80%;
}
/* line 283, ../sass/extra.scss */
.pager,
.paginator {
margin-bottom: 0;
padding-bottom: 0;
}

30
os/templates/widgets/footer.html
View File

@ -1,9 +1,9 @@
<div class="clearfix"></div>
<div class="content-wrapper">
<div id="footer">
<hr />
<div class="span-8">
<h3>My Feedback About This Page</h3>
<form id="FeedbackForm_FeedbackForm" action="/home/FeedbackForm" method="post" enctype="application/x-www-form-urlencoded">
<form id="FeedbackForm_FeedbackForm" action="http://www.openstack.org/home/FeedbackForm" method="post" enctype="application/x-www-form-urlencoded">
<textarea id="FeedbackForm_FeedbackForm_Content" name="Content" rows="5" cols="20"></textarea>
<input class="action button" id="FeedbackForm_FeedbackForm_action_submitFeedback" type="submit" name="action_submitFeedback" value="Tell Us" title="Tell Us" />
</form>
@ -12,19 +12,19 @@
<div class="span-4">
<h3>OpenStack</h3>
<ul>
<li><a href="/projects/">Projects</a></li>
<li><a href="/openstack-security/">OpenStack Security</a></li>
<li><a href="/projects/openstack-faq/">Common Questions</a></li>
<li><a href="/blog/">Blog</a></li>
<li><a href="http://www.openstack.org/projects/">Projects</a></li>
<li><a href="http://www.openstack.org/openstack-security/">OpenStack Security</a></li>
<li><a href="http://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
<li><a href="http://www.openstack.org/blog/">Blog</a></li>
</ul>
</div>
<div class="span-4">
<h3>Community</h3>
<ul>
<li><a href="/community/">User Groups</a></li>
<li><a href="/events/">Events</a></li>
<li><a href="/jobs/">Jobs</a></li>
<li><a href="/companies/">Companies</a></li>
<li><a href="http://www.openstack.org/community/">User Groups</a></li>
<li><a href="http://www.openstack.org/events/">Events</a></li>
<li><a href="http://www.openstack.org/jobs/">Jobs</a></li>
<li><a href="http://www.openstack.org/companies/">Companies</a></li>
<li><a href="http://wiki.openstack.org/HowToContribute">Contribute</a></li>
</ul>
</div>
@ -40,13 +40,13 @@
<div class="span-4 last">
<h3>Branding &amp; Legal</h3>
<ul>
<li><a href="/brand/">Logos &amp; Guidelines</a></li>
<li><a href="/brand/openstack-trademark-policy/">Trademark Policy</a></li>
<li><a href="/privacy/">Privacy Policy</a></li>
<li><a href="http://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
<li><a href="http://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
<li><a href="http://www.openstack.org/privacy/">Privacy Policy</a></li>
<li><a href="http://wiki.openstack.org/CLA">OpenStack CLA</a></li>
</ul>
</div>
<hr />
<p>The OpenStack project is provided under the Apache 2.0 license. Openstack.org is powered by <a href="http://www.rackspacecloud.com/">Rackspace Cloud Computing</a>.</p>
<div class="clearfix"></div>
<p>The OpenStack project is provided under the Apache 2.0 license. Openstack.org is powered by <a href="http://www.rackspacecloud.com/">Rackspace Cloud Computing</a>. This site is powered by <a href="http://askbot.com">Askbot</a>.</p>
</div>
</div>

69
os/templates/widgets/meta_nav.html
View File

@ -1,26 +1,75 @@
{% import "macros.html" as macros%}
{%- if request.user.is_authenticated() -%}
{% set user=request.user %}
<span class="dropdown-toggle">
<ul class="dropdown-menu">
<li>
{{ macros.inbox_link(request.user) }}
<a>{% trans %}responses{% endtrans %}</a>
<a id='ab-responses' href="{{user.get_absolute_url()}}?sort=inbox&section=forum">
<img
alt="{% trans username=user.username|escape %}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 {{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 %}"
{% endif %}
/>
{% trans %}responses{% endtrans %}
</a>
</li>
{% if moderation_items %}
<li>
{{ macros.moderation_items_link(request.user, moderation_items) }}
<a>{% trans %}moderation{% endtrans %}</a>
<a id="ab-responses" href="{{user.get_absolute_url()}}?sort=inbox&section=flags">
{% if moderation_items['new_count'] > 0 %}
<img src="{{'/images/dialog-warning.png'|media}}"
{% if moderation_items['seen_count'] > 0 %}
alt="{% trans new=moderation_items['new_count'], seen=moderation_items['seen_count']%}{{new}} new flagged posts and {{seen}} previous{% endtrans %}"
title="{% trans new=moderation_items['new_count'], seen=moderation_items['seen_count']%}{{new}} new flagged posts and {{seen}} previous{% endtrans %}"
{% else %}
alt="{% trans new=moderation_items['new_count'] %}{{new}} new flagged posts{% endtrans %}"
title="{% trans new=moderation_items['new_count'] %}{{new}} new flagged posts{% endtrans %}"
{% endif %}
/>
{% elif moderation_items['seen_count'] > 0 %}
<img src={{'/images/dialog-warning-off.png'|media}}
alt="{% trans seen=moderation_items['seen_count'] %}{{seen}} flagged posts{% endtrans %}"
title="{% trans seen=moderation_items['seen_count'] %}{{seen}} flagged posts{% endtrans %}"
/>
{% endif %}
{% trans %}moderation{% endtrans %}
</a>
</li>
{% endif %}
{%-
if settings.KARMA_MODE != 'hidden' and settings.BADGES_MODE != 'hidden'
-%}
<li>
{{ macros.user_long_score_and_badge_summary(
user,
badges_mode = settings.BADGES_MODE
)
}}
<a class="user-micro-info"
href="{{user.get_absolute_url()}}?sort=reputation"
>{% trans %}karma:{% endtrans %} {{user.reputation}}</a>
</li>
{%- endif -%}
{% if settings.BADGES_MODE != 'hidden' %}
<li>
<a class="user-micro-info"
href="{{user.get_absolute_url()}}#badges"
><span title="{{user.get_badge_summary}}">{% trans %}badges:{% endtrans %}
{% if user.gold %}
<span class='badge1'>&#9679;</span>
<span class="badgecount">{{user.gold}}</span>
{% endif %}
{% if user.silver %}
<span class='badge2'>&#9679;</span>
<span class="badgecount">{{user.silver}}</span>
{% endif %}
{% if user.bronze %}
<span class='badge3'>&#9679;</span>
<span class="badgecount">{{user.bronze}}</span>
{%- endif -%}
</span></a>
</li>
{% endif %}
{% if request.user.is_administrator() %}
<li>
<a class="settings" href="{% url site_settings %}">{% trans %}settings{% endtrans %}</a>
@ -39,7 +88,7 @@
<a href="{{ request.user.get_absolute_url() }}">{{ request.user.username|escape }}</a>
</span>
{% elif settings.USE_ASKBOT_LOGIN_SYSTEM %}
<a href="{{ settings.LOGIN_URL }}?next={{request.path|clean_login_url|escape}}">{% trans %}Hi there! Please sign in{% endtrans %}</a>
<a class="signin" href="{{ settings.LOGIN_URL }}?next={{request.path|clean_login_url|escape}}">{% trans %}Hi there! Please sign in{% endtrans %}</a>
{% endif %}
<a
id="navTags"