[damned-lies] Update header to match the gnome.org design
- From: Claude Paroz <claudep src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [damned-lies] Update header to match the gnome.org design
- Date: Sat, 18 Feb 2017 10:28:06 +0000 (UTC)
commit df7a40ab934930e8569f60d1dcea6d35bb692ead
Author: Tom Tryfonidis <tomtryf gnome org>
Date: Tue Feb 14 14:21:20 2017 +0200
Update header to match the gnome.org design
common/static/css/responsive.css | 93 +++-----
common/static/css/template.css | 406 ++++++++++++++-------------------
common/static/img/avatar-default.svg | 152 ++++++++++++
common/static/img/gnome-l10n.svg | 139 +++++++++++
templates/base.html | 177 +++++++--------
templates/login/login_popup_form.html | 37 +++-
templates/login/login_usermenu.html | 27 +--
7 files changed, 613 insertions(+), 418 deletions(-)
---
diff --git a/common/static/css/responsive.css b/common/static/css/responsive.css
index 2db81aa..57599bf 100644
--- a/common/static/css/responsive.css
+++ b/common/static/css/responsive.css
@@ -8,73 +8,50 @@
padding: 0 !important;
margin: 0 !important;
}
-.mobile-menu {
- display: none;
- visibility: hidden;
-}
-.normal-menu {
- display: block;
-}
-.navbar-toggle, .navbar-toggle:hover, .navbar-toggle:focus, .navbar-toggle:active, .navbar-toggle.active,
.navbar-toggle.disabled, .navbar-toggle[disabled]{
- margin-top: 40px;
- background-image: none;
- background-color: #2e3436;
+.no-decoration {
+ text-decoration: none;
}
.table-responsive {
border: none;
}
-.navbar-default .navbar-nav > li > a {
- text-decoration: none;
-}
-/*----------------Smartphones-------------------*/
-@media (max-width: 767px) {
+@media screen and (max-width: 767px) {
+
header {
padding-bottom: 40px;
}
- .navbar-default,
- .navbar-default .navbar-collapse {
- background-color: transparent;
- border-color: transparent;
- }
- .mobile-menu {
- cursor: pointer;
- display: inline-block;
- float: right;
- visibility: visible;
- width:100%;
+
+ h1, #content h1 {
+ font-size: 23px;
}
- .normal-menu {
- display: none;
- }
- .top_bar {
- padding-top: 50px;
- }
- .top_bar ul li {
- display: block !important;
- }
- h1, #content h1 {
- font-size: 23px;
- }
- h2 {
- font-size: 20px;
- }
-}
-/*-----------------Tablets------------------------*/
-@media (min-width:767px) and (max-width: 990px){
- header {
- padding-bottom: 30px;
+ h2 {
+ font-size: 20px;
+ }
+
+ .dropdown-menu.login_popup_form li a {
+ color: #ffffff;
+
+ }
+ .dropdown-menu.login_popup_form li{
+ color: #ffffff;
+
+ }
+
+ .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+ color: #ffffff;
+ }
+ .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
+ .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+ color: #ffffff;
+ }
+ .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
+ .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
+ .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+ color: #ffffff;
+ background-color: #3968a1;
+ }
+ .navbar-default .btn-link {
+ color: #fff;
}
- #globalnav {
- margin: 0 auto;
- }
- .top_bar {
- margin:0 auto;
- float: none;
- }
- .normal-menu #gnome_header {
- height: auto;
- padding: 0 33%;
- }
}
diff --git a/common/static/css/template.css b/common/static/css/template.css
index eaaf374..afdfc6f 100644
--- a/common/static/css/template.css
+++ b/common/static/css/template.css
@@ -5,9 +5,6 @@
/* Base information */
/* ========================================================================== */
-html {
- background: #fff url(../img/html-bg.png) 0 10px repeat-x;
-}
a {
color: #204a87;
}
@@ -27,278 +24,207 @@ a:hover {
clear: both;
}
-/* Global Domain Bar */
+/* GNOME Header */
/* ========================================================================== */
-#global_domain_bar {
- background: #fff;
- height: 10px;
- position: relative;
-}
-#global_domain_bar .maxwidth {
- position: relative;
+.gnome-header {
+ margin-bottom: 90px;
}
-
-/* Tab */
-
-#global_domain_bar .tab {
- background: #fff;
- position: absolute;
- right: 0;
- float: right;
- padding: 6px 8px;
- font-size: 12px;
- line-height: 16px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
- -moz-box-shadow: 0 4px 2px -2px #8fb3d9;
- -webkit-box-shadow: 0 4px 2px -2px #8fb3d9;
- box-shadow: 0 4px 2px -2px #8fb3d9;
- white-space: nowrap;
- z-index: 10;
+.gnome-header .avatar img {
+ width: 14px;
+ height: 14px;
}
-#global_domain_bar .tab a.root {
- color: #555753 !important;
- font-weight: bold;
+.gnome-navbar-brand {
+ height: 50px;
+ padding: 6px;
+ float: left;
+ outline: 0;
+ margin-left: 7px;
+ font-weight: 700;
+ text-transform: uppercase;
+ font-size: 80%;
+ color: #ffffff;
text-decoration: none;
- background: #fff url(../img/favicon.png) 0 0 no-repeat;
- padding-left: 18px;
- border-right: 1px solid #ccc;
- padding-right: 6px;
- margin-right: 3px;
-}
-#global_domain_bar .tab a.root:last-child {
- border-right: 0;
- padding-right: 0;
- margin-right: 0;
-}
-#global_domain_bar .tab a.root:hover {
- text-decoration: underline;
+ opacity: 1;
+ transition: opacity .2s;
}
-#global_domain_bar .tab a.user {
- padding: 2px 14px 2px 4px;
- margin: -2px -4px -2px -2px;
- color: inherit !important;
+.gnome-navbar-brand:hover,
+.gnome-navbar-brand:active {
+ color: #ffffff;
text-decoration: none;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius: 4px;
- background: url(../img/globaldomain-user-arrow.png) right center no-repeat;
- outline: none;
-}
-#global_domain_bar .tab a.user:hover,
-#global_domain_bar .tab a.user:focus {
- background-color: #ececec;
+ opacity: 7;
+
}
-#global_domain_bar .tab a.user.active {
- background-color: #ececec;
- -moz-box-shadow: inset 0 1px 3px rgba(0,0,0,0.2);
- -webkit-box-shadow: inset 0 1px 3px rgba(0,0,0,0.2);
- box-shadow: inset 0 1px 3px rgba(0,0,0,0.2);
+.gnome-navbar-brand img {
+ max-height: 35px;
+ min-height: 35px;
+ min-width: 35px;
+ vertical-align: middle !important;
}
-/* User settings */
+/* Main Navigation Menu */
+/* ========================================================================== */
-#global_domain_bar .user_popup:before {
- width: 20px;
- height: 10px;
- margin-top: -17px;
- pointer-events: none;
- right: 10px;
- position: absolute;
- content: url(../img/globaldomain-popup-arrow.png);
-}
-#global_domain_bar .user_popup {
- display: none;
- z-index: 10;
- position: absolute;
- background: #2e3436;
- border: 2px solid rgba(100%, 100%, 100%, 0.2);
- right: 0;
- top: -10px;
- margin: 32px 0 0 0;
- min-width: 140px;
- border-radius: 10px;
+.navbar-default {
+ background-color: #4a86cf;
+ border-color: #3968a1;
}
-#global_domain_bar .user_popup img {
- display: block;
- margin: 0 auto;
- width: 80px;
- height: 80px;
+.navbar-default .navbar-brand {
+ color: #ffffff;
}
-#global_domain_bar .user_popup a.text {
- color: #fff;
+.navbar-default .navbar-brand:hover,
+.navbar-default .navbar-brand:focus {
+ color: #ffffff;
+}
+.navbar-default .navbar-text {
+ color: #ffffff;
+}
+.navbar-default .navbar-nav > li {
+ margin-left: 10px;
+}
+.navbar-default .navbar-nav > li > a {
+ color: #ffffff;
text-decoration: none;
- display: block;
- padding: 3px 30px;
}
-#global_domain_bar .user_settings a.text:hover {
+.navbar-default .navbar-nav > li > a:hover,
+.navbar-default .navbar-nav > li > a:focus {
+ color: #ffffff;
background: rgba(100%, 100%, 100%, 0.2);
}
-#global_domain_bar .user_settings ul {
- margin: 14px 0;
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus {
+ color: #ffffff;
+ background-color: #3968a1;
}
-#global_domain_bar .user_settings li {
- list-style-type: none;
- margin-left: 0;
+.navbar-default .navbar-nav > .open > a,
+.navbar-default .navbar-nav > .open > a:hover,
+.navbar-default .navbar-nav > .open > a:focus {
+ color: #ffffff;
+ background-color: #3968a1;
}
-
-/* Login Area */
-/* ==================================================================== */
-
-#global_domain_bar .login_popup_form input[type=submit],
-#global_domain_bar .login_popup_form a {
- color: #fff;
- display: block;
- margin: 0;
- border: 0;
- background: none;
- font-size: 100%;
- font-weight: normal;
- padding: 3px 0;
- border-radius: 0;
- width: 100%;
- text-decoration: none;
- text-align: center;
+.navbar-default .navbar-toggle {
+ border-color: #3968a1;
}
-
-#global_domain_bar .login_popup_form input[type=submit]:hover,
-#global_domain_bar .login_popup_form a:hover {
- background: rgba(100%, 100%, 100%, 0.2);
+.navbar-default .navbar-toggle:hover,
+.navbar-default .navbar-toggle:focus {
+ background-color: #3968a1;
}
-#global_domain_bar .login_popup_form * {
- display: block;
- margin: 10px 5px;
+.navbar-default .navbar-toggle .icon-bar {
+ background-color: #ffffff;
}
-#global_domain_bar .login_popup_form input {
- padding: 3px;
- border: 1px solid #999;
- border-radius: 4px;
- background-color: #fff;
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+ border-color: transparent;
+}
+.navbar-default .navbar-link {
+ color: #ffffff;
}
-#global_domain_bar .avatar {
+.navbar-default .navbar-link:hover {
+ color: #ffffff;
+}
+.navbar-default .navbar-header .icons{
display: block;
- margin: 14px auto 0px;
- width: 80px;
- height: 80px;
- background-color: #FFF;
- background-size: contain;
- border: 2px solid #8B8B8B;
- border-radius: 5px;
+ float: right;
+ margin: 5px 20px !important;
}
-#global_domain_bar .avatar:hover {
- border: 2px solid #BBB;
+.navbar-default .navbar-header .icons li{
+ display: inline-block !important;
+
}
-/* GNOME Header */
-/* ========================================================================== */
+/* User settings */
-#gnome_header {
- margin: 0;
- padding: 6px auto;
+.login_popup_form {
+ padding: 15px 15px 5px; /* bottom: 5px */
+ min-width: 220px;
}
-#gnome_header h1 {
- margin: 0;
- padding: 20px 0;
- font-size: 34px;
- line-height: 54px;
- color: #2e3436;
- font-family: "Copse";
- font-weight: bold;
- text-shadow: 0 1px 0 #fff;
- float: left;
-}
-#gnome_header h1 a {
- color: inherit;
- text-decoration: none;
+.navbar-nav>li>.dropdown-menu {
+ margin-top: 18px;
}
-#gnome_header h1 a img {
- vertical-align: bottom;
+.navbar-nav>li>.dropdown-menu, ul.dropdown-menu {
+ border-radius: 6px;
}
+.navbar-nav>li>.dropdown-menu li {
+ margin-left: 0px;
+}
+
+@media screen and (min-width:750px) {
+ .dropdown-menu:after {
+ position: absolute;
+ top: -11px;
+ left: 83%;
+ display: inline-block;
+ border-right: 11px solid transparent;
+ border-bottom: 11px solid #ffffff;
+ border-left: 11px solid transparent;
+ content:'';
+ }
+ .dropdown-menu:before {
+ position: absolute;
+ top: -12px;
+ left: 83%;
+ display: inline-block;
+ border-right: 11px solid transparent;
+ border-bottom: 11px solid #ccc;
+ border-left: 11px solid transparent;
+ border-bottom-color: rgba(0, 0, 0, 0.2);
+ content:'';
+ }
+}
+
+/* Animated "Close" icon on Navbar */
+/* ========================================================================== */
-#gnome_header .right {
- margin-top: 38px;
+.navbar-toggle {
+ border: none;
+ background: transparent !important;
}
-#gnome_header #search_input {
- border: 1px solid #999;
- padding: 4px 28px 4px 9px;
- background: #fff url(images/search-icon.png) 172px 5px no-repeat;
- width: 160px;
- -moz-border-radius: 25px;
- -webkit-border-radius: 25px;
- border-radius: 25px;
- -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.2);
- -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.2);
- box-shadow: inset 0 1px 1px rgba(0,0,0,0.2);
+.navbar-toggle:hover {
+ background: transparent !important;
}
-#gnome_header #search_input:focus {
- -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.2), 0 0 3px #0489B7;
- -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.2), 0 0 3px #0489B7;
- box-shadow: inset 0 1px 1px rgba(0,0,0,0.2), 0 0 3px #0489B7;
- outline: none;
+.navbar-toggle .icon-bar {
+ width: 22px;
+ transition: all 0.2s;
}
-
-/* Global Navigation */
-/* ========================================================================== */
-
-#globalnav {
- background: #2e3436 url("../img/top_bar-bg.png") top repeat-x;
- list-style: none;
- float: left;
- padding: 8px 0;
- margin: 50px 0 0 45px;
- font-size: 13px;
- -moz-border-radius: 6px;
- -webkit-border-radius: 6px;
- border-radius: 6px;
- -moz-box-shadow: 0 2px 4px rgba(0,0,0,0.2);
- -webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.2);
- box-shadow: 0 2px 4px rgba(0,0,0,0.2);
+.navbar-toggle .top-bar {
+ transform: rotate(45deg);
+ -webkit-transform: rotate(45deg);
+ -ms-transform: rotate(45deg);
+ transform-origin: 10% 10%;
+ -webkit-transform-origin: 10% 10%;
+ -ms-transform-origin: 10% 10%;
}
-#globalnav li {
- float: left;
- display: inline;
- margin: 0 5px 0 5px;
+.navbar-toggle .middle-bar {
+ opacity: 0;
}
-#globalnav li a {
- color: #fff;
- text-decoration: none;
- padding: 4px 8px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius: 4px;
- outline: none;
- -webkit-transition: background 100ms linear;
- -moz-transition: background 100ms linear;
- transition: background 100ms linear;
- text-shadow: 0 1px 0 #000;
-}
-#globalnav li a:hover {
- background: #64696d;
- background: rgba(100%, 100%, 100%, 0.2);
+.navbar-toggle .bottom-bar {
+ transform: rotate(-45deg);
+ -webkit-transform: rotate(-45deg);
+ -ms-transform: rotate(-45deg);
+ transform-origin: 10% 90%;
+ -webkit-transform-origin: 10% 90%;
+ -ms-transform-origin: 10% 90%;
}
-#globalnav li a:focus {
- background: rgba(100%, 100%, 100%, 0.15);
+.navbar-toggle.collapsed .top-bar {
+ transform: rotate(0);
+ -webkit-transform: rotate(0);
+ -ms-transform: rotate(0);
}
-#globalnav li a:active {
- background: #1c2021 url("../img/top_bar-item-bg.png") top repeat-x;
- -moz-box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
- -webkit-box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
- box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
+.navbar-toggle.collapsed .middle-bar {
+ opacity: 1;
}
-#globalnav li.active a {
- color: #fff;
- text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
- background: #1c2021 url("../img/top_bar-item-bg.png") top repeat-x;
- -moz-box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
- -webkit-box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
- box-shadow: inset 0 -1px 0 rgba(100%,100%,100%, 0.4), inset 0 1px 3px rgba(0,0,0,0.4);
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
+.navbar-toggle.collapsed .bottom-bar {
+ transform: rotate(0);
+ -webkit-transform: rotate(0);
+ -ms-transform: rotate(0);
}
+.navbar-form,
+.navbar-collapse {
+ box-shadow: none;
+}
+
/* Page Title */
/* ========================================================================== */
diff --git a/common/static/img/avatar-default.svg b/common/static/img/avatar-default.svg
new file mode 100644
index 0000000..9cb7fc9
--- /dev/null
+++ b/common/static/img/avatar-default.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ sodipodi:docname="avatar-default.svg"
+ inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ height="16"
+ id="svg7384"
+ version="1.1"
+ inkscape:version="0.92.0 r"
+ width="16">
+ <metadata
+ id="metadata90">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>Gnome Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ inkscape:bbox-nodes="false"
+ inkscape:bbox-paths="true"
+ bordercolor="#666666"
+ borderopacity="1"
+ inkscape:current-layer="layer9"
+ inkscape:cx="48.900326"
+ inkscape:cy="-9.5721192"
+ gridtolerance="10"
+ inkscape:guide-bbox="true"
+ guidetolerance="10"
+ id="namedview88"
+ inkscape:object-nodes="false"
+ inkscape:object-paths="false"
+ objecttolerance="10"
+ pagecolor="#3a3b39"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ showborder="false"
+ showgrid="false"
+ showguides="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-bbox-midpoints="false"
+ inkscape:snap-global="true"
+ inkscape:snap-grids="true"
+ inkscape:snap-nodes="true"
+ inkscape:snap-others="false"
+ inkscape:snap-to-guides="true"
+ inkscape:window-height="961"
+ inkscape:window-maximized="1"
+ inkscape:window-width="1280"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:zoom="9.1743808">
+ <inkscape:grid
+ empspacing="2"
+ enabled="true"
+ id="grid4866"
+ originx="200"
+ originy="120"
+ snapvisiblegridlinesonly="true"
+ spacingx="1"
+ spacingy="1"
+ type="xygrid"
+ visible="true" />
+ </sodipodi:namedview>
+ <title
+ id="title9167">Gnome Symbolic Icon Theme</title>
+ <defs
+ id="defs7386" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer9"
+ inkscape:label="status"
+ style="display:inline"
+ transform="translate(-41.0002,-337)">
+ <path
+ inkscape:connector-curvature="0"
+ d="m 51.55489,345.09373 c -0.70541,0.62353 -1.53918,0.90625 -2.55469,0.90625 -1.01551,0
-1.85318,-0.29053 -2.55859,-0.91406 -1.10938,0.36328 -2.43603,1.28775 -2.4375,2.90234 l -0.0039,3.01172 c
-7.2e-4,0.554 0.446,1.00002 1,1.00002 l 8,0 c 0.554,0 1,-0.44602 1,-1.00002 l 0,-3 c 0,-1.38672
-1.10231,-2.5558 -2.44531,-2.90625 z"
+ id="path3940-5"
+ sodipodi:nodetypes="csccsssscc"
+ style="fill:#ffffff;fill-opacity:1;stroke:none" />
+ <path
+ sodipodi:cx="49.5"
+ sodipodi:cy="342.5"
+ d="M 52,342.5 A 2.5,2.5 0 0 1 49.5,345 2.5,2.5 0 0 1 47,342.5 2.5,2.5 0 0 1 49.5,340 2.5,2.5 0 0 1
52,342.5 Z"
+ id="path3942-6"
+ sodipodi:rx="2.5"
+ sodipodi:ry="2.5"
+
style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ transform="matrix(1.2,0,0,1.2,-10.3998,-69.00003)"
+ sodipodi:type="arc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer10"
+ inkscape:label="devices"
+ style="display:inline"
+ transform="translate(-41.0002,-337)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer11"
+ inkscape:label="apps"
+ transform="translate(-41.0002,-337)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer13"
+ inkscape:label="places"
+ style="display:inline"
+ transform="translate(-41.0002,-337)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer14"
+ inkscape:label="mimetypes"
+ transform="translate(-41.0002,-337)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer15"
+ inkscape:label="emblems"
+ style="display:inline"
+ transform="translate(-41.0002,-337)" />
+ <g
+ inkscape:groupmode="layer"
+ id="g71291"
+ inkscape:label="emotes"
+ style="display:inline"
+ transform="translate(-41.0002,-337)" />
+ <g
+ inkscape:groupmode="layer"
+ id="g4953"
+ inkscape:label="categories"
+ style="display:inline"
+ transform="translate(-41.0002,-337)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer12"
+ inkscape:label="actions"
+ style="display:inline"
+ transform="translate(-41.0002,-337)" />
+</svg>
diff --git a/common/static/img/gnome-l10n.svg b/common/static/img/gnome-l10n.svg
new file mode 100644
index 0000000..a777088
--- /dev/null
+++ b/common/static/img/gnome-l10n.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.0"
+ width="1062.9567"
+ height="408.40155"
+ id="svg3642"
+ inkscape:version="0.92.0 r"
+ sodipodi:docname="gnome-l10n.svg"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ <metadata
+ id="metadata24">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#000000"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="961"
+ id="namedview22"
+ showgrid="false"
+ inkscape:zoom="1"
+ inkscape:cx="568.90706"
+ inkscape:cy="117.1725"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g15041"
+ showborder="true"
+ borderlayer="false"
+ inkscape:showpageshadow="false" />
+ <defs
+ id="defs3644" />
+ <g
+ transform="translate(162.8693,-197.3138)"
+ id="layer1">
+ <g
+ transform="matrix(1.293235,0,0,1.293235,-4878.321,-1224.915)"
+ id="g15041">
+ <g
+ transform="matrix(2.438586,0,0,2.438586,3659.952,1113.451)"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+ id="g15043">
+ <g
+ style="fill:#ffffff;fill-opacity:1"
+ id="g15045">
+ <path
+ d="M 86.068,0 C 61.466,0 56.851,35.041 70.691,35.041 84.529,35.041 110.671,0 86.068,0 Z"
+ style="fill:#ffffff;fill-opacity:1"
+ id="path15047"
+ inkscape:connector-curvature="0" />
+ <path
+ d="M 45.217,30.699 C 52.586,31.149 60.671,2.577 46.821,4.374 32.976,6.171 37.845,30.249
45.217,30.699 Z"
+ style="fill:#ffffff;fill-opacity:1"
+ id="path15049"
+ inkscape:connector-curvature="0" />
+ <path
+ d="M 11.445,48.453 C 16.686,46.146 12.12,23.581 3.208,29.735 -5.7,35.89 6.204,50.759
11.445,48.453 Z"
+ style="fill:#ffffff;fill-opacity:1"
+ id="path15051"
+ inkscape:connector-curvature="0" />
+ <path
+ d="M 26.212,36.642 C 32.451,35.37 32.793,9.778 21.667,14.369 10.539,18.961 19.978,37.916
26.212,36.642 l 0,0 z"
+ style="fill:#ffffff;fill-opacity:1"
+ id="path15053"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 58.791,93.913 c 1.107,8.454 -6.202,12.629 -13.36,7.179 C 22.644,83.743 83.16,75.088
79.171,51.386 75.86,31.712 15.495,37.769 8.621,68.553 3.968,89.374 27.774,118.26 52.614,118.26 c 12.22,0
26.315,-11.034 28.952,-25.012 C 83.58,82.589 57.867,86.86 58.791,93.913 l 0,0 z"
+ style="fill:#ffffff;fill-opacity:1"
+ id="path15055"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ <g
+ id="g15057"
+ style="fill:#ffffff">
+ <path
+ d="m 4176.2963,1214.4401 c -15.1078,0.4069 -27.0386,5.8367 -35.8126,16.25 -9.0861,10.8369
-13.6562,25.8104 -13.6562,44.9063 0,19.0432 4.5703,33.9757 13.6562,44.8124 9.1305,10.8369 21.6664,16.25
37.6563,16.25 16.034,0 28.6014,-5.4131 37.6875,-16.25 9.0859,-10.8367 13.6251,-25.7692 13.625,-44.8124
-1e-4,-19.0959 -4.5391,-34.0694 -13.625,-44.9063 -9.0861,-10.8366 -21.6536,-16.2499 -37.6875,-16.25 -0.6246,0
-1.2296,-0.016 -1.8437,0 z m 1.125,22 c 0.2415,-0.01 0.4737,0 0.7187,0 7.8833,10e-5 13.9919,3.4114
18.3125,10.25 4.3203,6.8388 6.4999,16.4913 6.5,28.9063 0,12.3623 -2.1799,21.9427 -6.5,28.7812 -4.3204,6.8389
-10.4293,10.2812 -18.3125,10.2812 -7.8391,0 -13.8983,-3.4423 -18.2187,-10.2812 -4.3204,-6.8385
-6.4999,-16.4189 -6.5,-28.7812 0,-12.4149 2.1798,-22.0675 6.5,-28.9063 4.1852,-6.6249 10.0123,-10.0428
17.5,-10.25 z"
+
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:148.699646px;line-height:125%;font-family:'Bitstream
Vera
Sans';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path15059"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 4005.6293,1325.612 c -13.3076,11.1757 -33.1067,11.0472 -41.3549,11.0472 -16.6133,0
-29.7747,-5.471 -39.4842,-16.413 -9.7097,-10.9946 -14.5644,-25.8819 -14.5644,-44.6622 0,-18.9906
4.9438,-33.9305 14.8316,-44.82 9.8878,-10.8892 23.4277,-16.3339 40.62,-16.334 6.6363,10e-5 12.9831,0.7366
19.0406,2.2094 6.1019,1.473 11.8475,3.6562 17.2368,6.5494 l -6.921,20.4608 c -3.0298,-1.6586 -6.4987,-3.2932
-9.7145,-4.4424 -5.4784,-1.8411 -10.979,-2.7617 -16.5018,-2.7618 -10.2442,10e-5 -18.15,3.3932
-23.7173,10.1792 -5.523,6.7336 -8.2844,16.3867 -8.2844,28.9594 0,12.4676 2.6723,22.0945 8.0172,28.8806
5.3446,6.7861 13.3768,10.1791 22.7818,10.1791 9.5548,0 15.4728,-2.4084 18.6291,-4.9461 l 0,-20.3835
-20.7001,0 0,-20.3584 40.0855,0"
+
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:148.699646px;line-height:125%;font-family:'Bitstream
Vera
Sans';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path15061"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 4023.2108,1216.5605 16.2279,0 51.2775,70.8022 0,-70.8022 21.8853,0 0,117.8103 -16.2279,0
-51.2774,-70.8022 0,70.8022 -21.8854,0 0,-117.8103"
+
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:148.699646px;line-height:125%;font-family:'Bitstream
Vera
Sans';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path15063"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 4246.3361,1216.5605 32.7366,0 22.7151,73.5479 22.8487,-73.5479 27.6698,0 12.5,117.8103
-24.3186,0 -7.5,-73.668 -22.9823,74.0213 -16.3015,0 -22.9824,-76.5213 -7.5,76.168 -24.3854,0 12.5,-117.8103"
+
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:148.699646px;line-height:125%;font-family:'Bitstream
Vera
Sans';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path15065"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 4382.3597,1216.5605 69.4147,0 0,22.9624 -43.6933,0 0,24.4365 33.5877,0 0,20.4623 -33.5877,0
0,26.9868 45.1631,0 0,22.9623 -70.8845,0 0,-117.8103"
+
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:148.699646px;line-height:125%;font-family:'Bitstream
Vera
Sans';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path15067"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ aria-label="DAMNED LIES"
+ transform="matrix(0.7654879,0,0,0.77325467,3655.8308,1136.7538)"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:25px;font-family:Cantarell;-inkscape-font-specification:Cantarell;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.00506032"
+ id="flowRoot826">
+ <path
+ id="path4518"
+
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:82.66666412px;font-family:'Bitstream
Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans,
Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1.00506032"
+ d="m 1037.1184,284.00912 v 12.7552 q -5.5458,-2.22005 -10.821,-3.35026 -5.2752,-1.1302
-9.9643,-1.1302 -6.222,0 -9.1979,1.53385 -2.9756,1.53385 -2.9756,4.76302 0,2.42187 1.9837,3.79427
2.029,1.33203 7.3042,2.30078 l 7.3944,1.33203 q 11.2267,2.01823 15.9609,6.13542 4.7341,4.11719
4.7341,11.70573 0,9.97005 -6.6279,14.85416 -6.5826,4.84375 -20.1539,4.84375 -6.4024,0 -12.85,-1.08984
-6.4475,-1.08984 -12.89497,-3.22917 v -13.11849 q 6.44747,3.06771 12.44417,4.64193 6.0417,1.53386
11.6326,1.53386 5.681,0 8.7018,-1.69532 3.0209,-1.69531 3.0209,-4.84375 0,-2.82552 -2.074,-4.35937
-2.029,-1.53386 -8.1609,-2.74479 l -6.718,-1.33203 q -10.09964,-1.9375 -14.78872,-6.17579 -4.64399,-4.23828
-4.64399,-11.42317 0,-9.0013 6.49258,-13.84505 6.49263,-4.84375 18.66633,-4.84375 5.5456,0 11.407,0.76692
5.8614,0.72657 12.1285,2.22006 z m -109.96816,-1.89714 h 46.84577 v 11.74609 h -29.48714 v 11.22136 h
27.72873 v 11.74609 h -27.72873 v 13.80469 h 30.47906 v 11.74609 h -47.83769 z m -3
4.4467,0 h 17.35863 v 60.26432 h -17.35863 z m -58.79395,0 h 17.35863 v 48.51823 h 30.47906 v 11.74609 h
-47.83769 z m -91.39209,11.74609 v 36.77214 h 6.22205 q 10.64062,0 16.23146,-4.72266 5.63592,-4.72265
5.63592,-13.72396 0,-8.96093 -5.59083,-13.64322 -5.59083,-4.6823 -16.27655,-4.6823 z m -17.35863,-11.74609 h
18.30547 q 15.3297,0 22.8142,1.97786 7.52959,1.9375 12.89499,6.6198 4.73418,4.07682 7.03363,9.40494
2.29945,5.32813 2.29945,12.06901 0,6.82162 -2.29945,12.19011 -2.29945,5.32812 -7.03363,9.40495
-5.41049,4.68229 -12.98516,6.66015 -7.57469,1.9375 -22.72403,1.9375 h -18.30547 z m -63.1223,0 h 46.84577 v
11.74609 H 679.3952 v 11.22136 h 27.72873 v 11.74609 H 679.3952 v 13.80469 h 30.47906 v 11.74609 h -47.83769
z m -77.36992,0 h 19.38756 l 24.48245,41.33333 v -41.33333 h 16.45688 v 60.26432 h -19.38757 l
-24.48243,-41.33333 v 41.33333 h -16.45689 z m -91.97822,0 h 22.09281 l 15.32971,32.2513 15.41987,-32.2513 h
22.04772 v 60.26432 h -16.4118 v -44.07812 l -15.51006,32
.49349 h -11.00131 l -15.51004,-32.49349 v 44.07812 h -16.4569 z m -30.56923,49.28516 h -27.14259 l
-4.2833,10.97916 H 413.2445 l 24.93331,-60.26432 h 20.6951 l 24.93332,60.26432 h -17.44881 z m
-22.81421,-11.18099 h 18.44074 l -9.19783,-23.97657 z m -77.32481,-26.35808 v 36.77214 h 6.22205 q 10.64062,0
16.23145,-4.72266 5.63592,-4.72265 5.63592,-13.72396 0,-8.96093 -5.59084,-13.64322 -5.59083,-4.6823
-16.27653,-4.6823 z m -17.35864,-11.74609 h 18.30547 q 15.3297,0 22.8142,1.97786 7.5296,1.9375
12.89498,6.6198 4.73418,4.07682 7.03364,9.40494 2.29945,5.32813 2.29945,12.06901 0,6.82162 -2.29945,12.19011
-2.29946,5.32812 -7.03364,9.40495 -5.41048,4.68229 -12.98516,6.66015 -7.57467,1.9375 -22.72402,1.9375 h
-18.30547 z"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/templates/base.html b/templates/base.html
index b76e4aa..bba4e6f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n people %}
{% load stats_extras %}
<!DOCTYPE html>
<html lang="{{ LANGUAGE_CODE }}">
@@ -31,72 +31,57 @@
</head>
<body>
-<div class="container">
- <!-- global gnome.org domain bar -->
- <div id="global_domain_bar">
- <div class="maxwidth">
- <div class="tab">
- <a class="root" href="https://www.gnome.org/";>GNOME.org</a>
+<header class="gnome-header">
+ <div class="navbar navbar-fixed-top navbar-default affix-top">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
data-target="#navbar-wrapper" aria-expanded="false">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar top-bar"></span>
+ <span class="icon-bar middle-bar"></span>
+ <span class="icon-bar bottom-bar"></span>
+ </button>
+ <a class="gnome-navbar-brand" title="{% trans "Back to Damned Lies home page" %}"
href="/"><img src="{{ STATIC_URL }}img/gnome-l10n.svg" alt="GNOME - Damned Lies" /></a>
+ <ul class="nav navbar-nav icons visible-xs">
+ <li class="dropdown">
+ {% if user.is_authenticated %}
+ <a data-target="#userDropdownMenu" class="dropdown-toggle avatar"
data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ user.person|people_image
}}</a>
+ {% else %}
+ <a href="#userDropdownMenu" class="dropdown-toggle" data-toggle="dropdown"
role="button" aria-haspopup="true" aria-expanded="false"><img src="{{ STATIC_URL }}img/avatar-default.svg"
alt="GNOME - Damned Lies" /></a>
+ {% endif %}
+ </li>
+ </ul>
+ </div>
+ <ul class="nav navbar-nav navbar-right no-padding">
+ <li id="userDropdownMenu" class="dropdown">
{% if user.is_authenticated %}
- <a class="user" href="{% url 'person_detail_username' user.username %}">{{ user.person
}}</a>
+ <a href="{% url 'person_detail_username' user.username %}" class="dropdown-toggle
hidden-xs avatar" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{
user.person|people_image }}</a>
{% else %}
- <a class="user" href="{% url 'login' %}">{% trans "Log in" %}</a>
+ <a href="{% url 'login' %}" class="dropdown-toggle hidden-xs" data-toggle="dropdown"
role="button" aria-haspopup="true" aria-expanded="false">{% trans "Log in" %} <span class="caret"></span></a>
{% endif %}
+ <ul class="dropdown-menu login_popup_form">
+ <li>
+ {% include "login/login_usermenu.html" %}
+ </li>
+ </ul>
+ </li>
+ </ul>
+ <div id="navbar-wrapper" class="collapse navbar-collapse">
+ <ul class="nav navbar-nav">
+ <li{% if pageSection == "teams" %} class="active"{% endif %}><a href="{% url 'teams'
%}"><span>{% trans "Teams" %}</span></a></li>
+ <li{% if pageSection == "languages" %} class="active"{% endif %}><a href="{% url
'languages' %}"><span>{% trans "Languages" %}</span></a></li>
+ <li{% if pageSection == "releases" %} class="active"{% endif %}><a href="{% url
'releases' %}"><span>{% trans "Release sets" %}</span></a></li>
+ <li{% if pageSection == "module" %} class="active"{% endif %}><a href="{% url 'modules'
%}"><span>{% trans "Modules" %}</span></a></li>
+ </ul>
</div>
- {% include "login/login_usermenu.html" %}
</div>
</div>
+</header>
- <header class="col-md-12">
- <div class="mobile-menu">
- <div class="navbar navbar-default">
- <div class="container-fluid">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed"
data-toggle="collapse" data-target=".navbar-collapse" >
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" title="{% trans "Back to Damned Lies
home page" %}" href="/"><img src="{{ STATIC_URL }}img/logo.png" alt="GNOME" /></a>
- </div>
-
- <div class="collapse navbar-collapse">
- <div class="top_bar">
- <ul class="nav navbar-nav text-center">
- <li{% if pageSection == "home" %} class="active"{%
endif %}><a href="{% url 'home' %}" title="{% trans "Back to Damned Lies home page" %}"><span>{% trans "Home"
%}</span></a></li>
- <li{% if pageSection == "teams" %} class="active"{%
endif %}><a href="{% url 'teams' %}"><span>{% trans "Teams" %}</span></a></li>
- <li{% if pageSection == "languages" %}
class="active"{% endif %}><a href="{% url 'languages' %}"><span>{% trans "Languages" %}</span></a></li>
- <li{% if pageSection == "releases" %}
class="active"{% endif %}><a href="{% url 'releases' %}"><span>{% trans "Release sets" %}</span></a></li>
- <li{% if pageSection == "module" %} class="active"{%
endif %}><a href="{% url 'modules' %}"><span>{% trans "Modules" %}</span></a></li>
- </ul>
- </div>
- </div>
- </div>
- </div>
- </div> <!-- mobile-menu end -->
-
- <div class="normal-menu">
- <div id="gnome_header" class="col-sm-4 col-md-3">
- <h1><a title="{% trans "Back to Damned Lies home page" %}" href="/"><img
src="{{ STATIC_URL }}img/logo.png" alt="GNOME" /></a></h1>
- </div>
+<div class="clearfix"></div>
- <div class="top_bar col-sm-8 col-md-9">
- <ul id="globalnav">
- <li{% if pageSection == "home" %} class="active"{% endif
%}><a href="{% url 'home' %}" title="{% trans "Back to Damned Lies home page" %}"><span>{% trans "Home"
%}</span></a></li>
- <li{% if pageSection == "teams" %} class="active"{% endif
%}><a href="{% url 'teams' %}"><span>{% trans "Teams" %}</span></a></li>
- <li{% if pageSection == "languages" %} class="active"{% endif
%}><a href="{% url 'languages' %}"><span>{% trans "Languages" %}</span></a></li>
- <li{% if pageSection == "releases" %} class="active"{% endif
%}><a href="{% url 'releases' %}"><span>{% trans "Release sets" %}</span></a></li>
- <li{% if pageSection == "module" %} class="active"{% endif
%}><a href="{% url 'modules' %}"><span>{% trans "Modules" %}</span></a></li>
- </ul>
- </div>
- </div> <!-- normal-menu end -->
- <div class="clearfix"></div>
- </header>
-
- <div class="clearfix"></div>
-
- <div id="content">
+<div id="content">
+ <div class="container">
{% if messages %}
{% for message in messages %}
<p class="errornote">{{ message|safe }}</p>
@@ -114,43 +99,43 @@
<div id="footer">
<div class="links container">
- <div>
- <ul id="menu-footer" class="menu">
- <li><a href="https://www.gnome.org";>{% trans "The GNOME Project" %}</a>
- <ul class="sub-menu">
- <li><a href="https://www.gnome.org/about/";>{% trans "About Us" %}</a></li>
- <li><a href="https://www.gnome.org/get-involved/";>{% trans "Get Involved"
%}</a></li>
- <li><a href="https://www.gnome.org/teams/";>{% trans "Teams" %}</a></li>
- <li><a href="https://www.gnome.org/support-gnome/";>{% trans "Support GNOME"
%}</a></li>
- <li><a href="https://www.gnome.org/contact/";>{% trans "Contact Us" %}</a></li>
- <li><a href="https://www.gnome.org/foundation/";>{% trans "The GNOME
Foundation" %}</a></li>
- </ul>
- </li>
- <li><a href="#">{% trans "Resources" %}</a>
- <ul class="sub-menu">
- <li><a href="https://developer.gnome.org";>{% trans "Developer Center"
%}</a></li>
- <li><a href="https://help.gnome.org";>{% trans "Documentation" %}</a></li>
- <li><a href="https://wiki.gnome.org/";>{% trans "Wiki" %}</a></li>
- <li><a href="https://mail.gnome.org/mailman/listinfo";>{% trans "Mailing
Lists" %}</a></li>
- <li><a href="https://wiki.gnome.org/GnomeIrcChannels";>{% trans "IRC Channels"
%}</a></li>
- <li><a href="https://bugzilla.gnome.org/";>{% trans "Bug Tracker" %}</a></li>
- <li><a href="https://git.gnome.org/browse/";>{% trans "Development Code"
%}</a></li>
- <li><a href="https://wiki.gnome.org/Jhbuild";>{% trans "Build Tool" %}</a></li>
- </ul>
- </li>
- <li><a href="https://www.gnome.org/news/";>{% trans "News" %}</a>
- <ul class="sub-menu">
- <li><a href="https://www.gnome.org/press/";>{% trans "Press Releases" %}</a></li>
- <li><a href="https://www.gnome.org/start/stable";>{% trans "Latest Release" %}</a></li>
- <li><a href="https://planet.gnome.org";>{% trans "Planet GNOME" %}</a></li>
- <li><a href="https://news.gnome.org";>{% trans "Development News" %}</a></li>
- <li><a href="https://identi.ca/gnome";>{% trans "Identi.ca" %}</a></li>
- <li><a href="https://twitter.com/gnome";>{% trans "Twitter" %}</a></li>
- </ul>
- </li>
- </ul>
- </div>
- </div> <!-- end of div.links -->
+ <div>
+ <ul id="menu-footer" class="menu">
+ <li><a href="https://www.gnome.org";>{% trans "The GNOME Project" %}</a>
+ <ul class="sub-menu">
+ <li><a href="https://www.gnome.org/about/";>{% trans "About Us" %}</a></li>
+ <li><a href="https://www.gnome.org/get-involved/";>{% trans "Get Involved" %}</a></li>
+ <li><a href="https://www.gnome.org/teams/";>{% trans "Teams" %}</a></li>
+ <li><a href="https://www.gnome.org/support-gnome/";>{% trans "Support GNOME" %}</a></li>
+ <li><a href="https://www.gnome.org/contact/";>{% trans "Contact Us" %}</a></li>
+ <li><a href="https://www.gnome.org/foundation/";>{% trans "The GNOME Foundation" %}</a></li>
+ </ul>
+ </li>
+ <li><a href="#">{% trans "Resources" %}</a>
+ <ul class="sub-menu">
+ <li><a href="https://developer.gnome.org";>{% trans "Developer Center" %}</a></li>
+ <li><a href="https://help.gnome.org";>{% trans "Documentation" %}</a></li>
+ <li><a href="https://wiki.gnome.org/";>{% trans "Wiki" %}</a></li>
+ <li><a href="https://mail.gnome.org/mailman/listinfo";>{% trans "Mailing Lists" %}</a></li>
+ <li><a href="https://wiki.gnome.org/GnomeIrcChannels";>{% trans "IRC Channels" %}</a></li>
+ <li><a href="https://bugzilla.gnome.org/";>{% trans "Bug Tracker" %}</a></li>
+ <li><a href="https://git.gnome.org/browse/";>{% trans "Development Code" %}</a></li>
+ <li><a href="https://wiki.gnome.org/Jhbuild";>{% trans "Build Tool" %}</a></li>
+ </ul>
+ </li>
+ <li><a href="https://www.gnome.org/news/";>{% trans "News" %}</a>
+ <ul class="sub-menu">
+ <li><a href="https://www.gnome.org/press/";>{% trans "Press Releases" %}</a></li>
+ <li><a href="https://www.gnome.org/start/stable";>{% trans "Latest Release" %}</a></li>
+ <li><a href="https://planet.gnome.org";>{% trans "Planet GNOME" %}</a></li>
+ <li><a href="https://news.gnome.org";>{% trans "Development News" %}</a></li>
+ <li><a href="https://identi.ca/gnome";>{% trans "Identi.ca" %}</a></li>
+ <li><a href="https://twitter.com/gnome";>{% trans "Twitter" %}</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div> <!-- end of div.links -->
<div id="footnotes" class="container">
{% trans "Copyright © 2006" %}-{% now "Y" %} <strong><a href="https://www.gnome.org/";>{% trans
"The GNOME Project" %}</a></strong>.
diff --git a/templates/login/login_popup_form.html b/templates/login/login_popup_form.html
index d5c4159..3a78dc5 100644
--- a/templates/login/login_popup_form.html
+++ b/templates/login/login_popup_form.html
@@ -1,12 +1,29 @@
{% load i18n %}
-<form action="{% url 'login' %}" method="post" class="login_popup_form user_popup">
- {% csrf_token %}
- <input type="text" name="username" id="id_username" placeholder="{% trans 'Username' %}"/>
- <input type="password" name="password" id="id_password" placeholder="{% trans 'Password' %}"/>
- <input type="hidden" name="this_is_the_login_form" value="1" />
- <input type="hidden" name="post_data" value="{{ post_data }}" />
- <input type="hidden" name="referer" value="{{ referer|default:"" }}" />
- <input type="submit" value="{% trans "Log in" %}">
- <a href="{% url 'register' %}">{% trans "Register" %}</a>
-</form>
+<div class="row">
+ <div class="col-sm-12">
+ <form action="{% url 'login' %}" method="post" class="form">
+ {% csrf_token %}
+ <div class="form-group">
+ <input type="text" name="username" id="id_username" class="form-control" placeholder="{%
trans 'Username' %}"/>
+ </div>
+ <div class="form-group">
+ <input type="password" name="password" id="id_password" class="form-control" placeholder="{%
trans 'Password' %}"/>
+ </div>
+ <input type="hidden" name="this_is_the_login_form" value="1" />
+ <input type="hidden" name="post_data" value="{{ post_data }}" />
+ <input type="hidden" name="referer" value="{{ referer|default:"" }}" />
+ <div class="form-group">
+ <button type="submit" class="btn btn-primary btn-block">{% trans "Log in" %}</button>
+ </div>
+ <div class="form-group">
+ <a href="/password_reset/" class="">{% trans 'Forgot your password?' %}</a>
+ </div>
+ <li class="divider"></li>
+ <p>{% trans "Don't have an account?" %}</p>
+ <div class="form-group">
+ <a href="{% url 'register' %}" class="btn btn-success btn-block no-decoration">{% trans
"Register" %}</a>
+ </div>
+ </form>
+ </div>
+</div>
diff --git a/templates/login/login_usermenu.html b/templates/login/login_usermenu.html
index c294d96..596c17f 100644
--- a/templates/login/login_usermenu.html
+++ b/templates/login/login_usermenu.html
@@ -1,19 +1,18 @@
{% load i18n people %}
{% if user.is_authenticated %}
- <div class="user_settings user_popup">
- <a class="avatar" href="{% url 'person_detail_username' user.username %}"
title="Profile">
- {{ user.person|people_image }}
- </a>
- <ul>
- <li><a class="text" href="{% url 'person_detail_username' user.username %}">{% trans
'User Settings' %}</a></li>
- <li><form action="{% url 'login' %}" method="post" class="login_popup_form">
- {% csrf_token %}
- <input type="hidden" name="logout" value="1">
- <input type="submit" value="{% trans 'Log out' %}">
- </form></li>
- </ul>
- </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <a class="btn btn-link no-decoration" href="{% url 'person_detail_username' user.username %}">{%
trans 'User Settings' %}</a>
+ <form action="{% url 'login' %}" method="post" class="form">
+ {% csrf_token %}
+ <input type="hidden" name="logout" value="1">
+ <div class="form-group">
+ <button type="submit" class="btn btn-link">{% trans 'Log out' %}</button>
+ </div>
+ </form>
+ </div>
+ </div>
{% else %}
- {% include "login/login_popup_form.html" %}
+ {% include "login/login_popup_form.html" %}
{% endif %}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
