{% for user in users %}

diff --git a/elections/templates/elections/election_detail.html b/elections/templates/elections/election_detail.html index 86f1c2d989d9520e60fc402808fcdc2e14c402ce..f40ba1f2a277c81802f068f653db7d30ec6c8100 100644 --- a/elections/templates/elections/election_detail.html +++ b/elections/templates/elections/election_detail.html @@ -221,9 +221,9 @@ {% elif state.code == 'F' %} {% with log=object.get_log %}

{% trans "Results" %}

{% for user in log.candidates %} -

{% if user.winner %} diff --git a/inkscape/context_processors.py b/inkscape/context_processors.py index 907e05c879292f5a83742f08811abeee12e8290f..1f4f8f2af4362e05860ca091f7bed2199633b199 100644 --- a/inkscape/context_processors.py +++ b/inkscape/context_processors.py @@ -25,7 +25,7 @@ import logging from os.path import isfile, join from collections import OrderedDict - +from menus.utils import DefaultLanguageChanger from django.conf import settings def tracker_data(request): @@ -35,6 +35,34 @@ def tracker_data(request): 'TRACKER_SIDE_ID': getattr(settings, 'PIWIK_SIDE_ID', 1), } +def englishslug(request): + if hasattr(request, "_language_changer"): + try: + url = request._language_changer("en") + except NoReverseMatch: + url = DefaultLanguageChanger(request)("en") + else: + # use the default language changer + url = DefaultLanguageChanger(request)("en") + url_parts = url.split('/') + return { + 'englishslug': url_parts[len(url_parts)-2], + } + +def englishslug(request): + if hasattr(request, "_language_changer"): + try: + url = request._language_changer("en") + except NoReverseMatch: + url = DefaultLanguageChanger(request)("en") + else: + # use the default language changer + url = DefaultLanguageChanger(request)("en") + url_parts = url.split('/') + return { + 'englishslug': url_parts[len(url_parts)-2], + } + PATH = settings.PROJECT_PATH INKSCAPE_VERSION = '' WEBSITE_VERSION = '' diff --git a/inkscape/settings.py b/inkscape/settings.py index a52c6d38f4f5b75d2a42057ff45c30bfca71809d..9c59baa510f5b2abee70d812eba3c243d6f491d2 100644 --- a/inkscape/settings.py +++ b/inkscape/settings.py @@ -108,6 +108,7 @@ TEMPLATES = [{ 'django.template.loaders.app_directories.Loader', ], 'context_processors': ( + 'inkscape.context_processors.englishslug', 'inkscape.context_processors.version', 'inkscape.context_processors.tracker_data', 'social_django.context_processors.backends', diff --git a/inkscape/static/css/main.css b/inkscape/static/css/main.css index eeddeb8495b1fa63458a5947ffbc08b71fb3e9b9..5c45f65d34f3d832aec7b0576855a35dbe308f01 100644 --- a/inkscape/static/css/main.css +++ b/inkscape/static/css/main.css @@ -667,9 +667,6 @@ div.toc ol, list-style: none; text-align: left; } -#menu > li { - margin: 0 -3px 0 0; -} #menu :link, #menu :link:hover, #menu :link:active, @@ -695,13 +692,13 @@ div.toc ol, #menu > li > a { background: #4d4d4d; background-image: linear-gradient(to bottom, #4d4d4d 0%, #1a1a1a 100%); - border-radius: 10px; + border-radius: 4px; padding: 17px 8px; white-space: nowrap; border-left: 1px solid #5a5a5a; border-right: 1px solid #333333; font-size: 14px; - margin: 0 3px 3px 0; + margin: 0 4px 4px 0; text-transform: uppercase; text-align: center; } @@ -721,16 +718,14 @@ div.toc ol, } #menu > li:last-child > a { border-right: 0; - border-top-right-radius: 10px; } #menu > li:first-child > a { border-left: 0; - border-top-left-radius: 10px; } #menu li ul { display: none; position: absolute; - top: 52px; + top: 100%; left: 0; z-index: 1; margin: 0; @@ -768,6 +763,9 @@ div.toc ol, border-radius: 10px 10px 0 0; border-bottom: 1px solid #262626; } + #menu > li { + margin: 0 -3px 0 0; + } #menu > li > a { border-radius: 0; margin: 0; @@ -778,6 +776,12 @@ div.toc ol, background: #333333; background-image: linear-gradient(to bottom, #333, #444, #333); } + #menu > li:first-child > a { + border-top-left-radius: 10px; + } + #menu > li:last-child > a { + border-top-right-radius: 10px; + } } /* Content wrappers */ @@ -798,8 +802,8 @@ div.toc ol, margin-bottom: 10px; } #content > div.wrapper { - margin: -20px; - padding: 20px; + margin: 0 -20px -20px -20px; + padding: 0 20px 20px 20px; min-height: 500px; } @@ -1724,3 +1728,4 @@ li#tab_hackfest p a:hover { text-decoration: none; background-image: linear-gradient(to bottom, #ff4646, #cc1d1d); } + diff --git a/inkscape/static/css/mobile-device.css b/inkscape/static/css/mobile-device.css index d09a38775b17302aca3342fe1a765e09fa0f8491..8b3163ff6ae89826f046464bfedaa6da7a62703d 100644 --- a/inkscape/static/css/mobile-device.css +++ b/inkscape/static/css/mobile-device.css @@ -42,6 +42,7 @@ div.cms .cms-toolbar-trigger { position: absolute; top: 30px; margin: 0; + display:block; right: 0; opacity: .8; } @@ -74,9 +75,6 @@ div.cms .cms-toolbar-trigger { padding: 9px 14px; border: 1px solid #5a5a5a; } -#menu > li:last-child > a { - border-radius: 0; -} #menu li li.main { display: list-item; } @@ -152,7 +150,7 @@ ol { #content { margin-bottom: 0; - padding: 20px 12px; + padding: 0px 12px; background: transparent; word-wrap: break-word; } @@ -309,12 +307,13 @@ div.toc, position: relative; height: 172px; text-align: center; + } #logo { display: inline-block; float: none; margin: 0; - padding-top: 44px; + padding-top: 58px; white-space: nowrap; text-align: left; } @@ -329,14 +328,26 @@ div.toc, position: static; float: none; margin-left: -5px; + /*HACKFEST*/ + margin-top:26px; + /*HACKFEST*/ } #tabs > li.dropdown > div { text-align: left; + } - #tabs > #tab_hackfest { + #tab_hackfest { + position:absolute !important; + white-space: normal; - left: 4px; - right: 4px; + top:0; + left: 0px; + right: -10px; + display:block; + border-radius:0 !important;; + } + #tab_hackfest p { + border-radius:0 !important;; } #tabs > #tab_languages > div { left: 0; @@ -443,3 +454,5 @@ div.toc, border-radius: 0 0 5px 5px; } } + + diff --git a/inkscape/static/mime/banner/code.svg b/inkscape/static/mime/banner/code.svg index d3532c2673abc43d12d6dce790bcc29d00c47369..f06440a3888373e702660df51548cfbcf291d21d 100644 --- a/inkscape/static/mime/banner/code.svg +++ b/inkscape/static/mime/banner/code.svg @@ -1,29 +1,109 @@ -

{{ instance.source }}

{% trans "Results" %}

{% trans "Draw Freely." %}

{% trans "Resources" %}