[odrs-web/oscp] Migrate to Deneb theme
- From: Andrea Veri <averi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [odrs-web/oscp] Migrate to Deneb theme
- Date: Mon, 17 Dec 2018 13:31:01 +0000 (UTC)
commit 71eeaeb0bad41eb901d039ce9b4e330f5dc4255d
Author: Tom Tryfonidis <tomtryf gmail com>
Date: Tue Nov 27 00:18:43 2018 +0200
Migrate to Deneb theme
app_data/app/static/bar.png | Bin 154 -> 0 bytes
app_data/app/static/favicon.ico | Bin 2550 -> 0 bytes
app_data/app/static/foot.png | Bin 699 -> 0 bytes
app_data/app/static/general_bg.png | Bin 178 -> 0 bytes
app_data/app/static/general_separator.png | Bin 212 -> 0 bytes
app_data/app/static/gnome-16.png | Bin 650 -> 0 bytes
app_data/app/static/gnome-logo.svg | 126 ++++++
app_data/app/static/gnome-odrs.png | Bin 14485 -> 0 bytes
app_data/app/static/layout.css | 697 ------------------------------
app_data/app/static/search-icon.png | Bin 395 -> 0 bytes
app_data/app/static/style.css | 189 --------
app_data/app/static/t.png | Bin 317 -> 0 bytes
app_data/app/static/top_bar-bg.png | Bin 185 -> 0 bytes
app_data/app/templates/default.html | 337 ++++++---------
app_data/app/templates/delete.html | 2 +-
app_data/app/templates/index.html | 2 +-
app_data/app/templates/login.html | 38 +-
app_data/app/templates/mods.html | 6 +-
app_data/app/templates/show-all.html | 24 +-
app_data/app/templates/show.html | 294 +++++++------
app_data/app/templates/stats.html | 2 +-
app_data/app/templates/users.html | 4 +-
22 files changed, 468 insertions(+), 1253 deletions(-)
---
diff --git a/app_data/app/static/gnome-logo.svg b/app_data/app/static/gnome-logo.svg
new file mode 100644
index 0000000..0534b66
--- /dev/null
+++ b/app_data/app/static/gnome-logo.svg
@@ -0,0 +1,126 @@
+<?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.91 r13725"
+ sodipodi:docname="gnome-logo.svg">
+ <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></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="519.63537"
+ inkscape:cy="203.3948"
+ 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>
+ </g>
+</svg>
diff --git a/app_data/app/static/style.css b/app_data/app/static/style.css
index 8a156e4..8f9f692 100644
--- a/app_data/app/static/style.css
+++ b/app_data/app/static/style.css
@@ -7,190 +7,13 @@
* Decoration
* Separators
*/
-body {
- margin: 0;
- padding: 0;
-}
-
-div#content a {
- color: #3465a4;
- border-bottom: 1px #888;
- text-decoration: none;
-}
-
-div#content a:hover {
- text-decoration: underline;
-}
-
-
-h1.first {
- margin-top: 0;
- padding-top: 0;
-}
-
-h2, h3, h4, h5, h6 {
- color: #3f3f3f;
-}
-
-h1 {
- font-size: 1.4em;
-}
-
-h2 {
- font-size: 25px;
-}
-
-h3, dt {
- font-size: 21px;
- margin: 0.4em 0 0.5em;
- color: #2E3436;
-}
-
-p, dd, .action_box, ul, ol {
- margin: 0.4em 0 1em;
-}
-
-/* lists */
-.list {
- margin-top:.5em;
-}
-.list tr td {
- padding:.2em;
- text-align:left;
-}
-.list td label {
- border-bottom:1px dashed #999;
- font-weight:normal;
-}
-.list th {
- background: #ccf;
- border: 1px solid #000;
- font-weight: bold;
- padding: 2px;
-}
-.list th a {
- display: block;
- padding:.2em 1.2em .2em .2em;
- text-align: left;
-}
-.list th a:hover {
- background-color: #fff;
-}
-.row1 {
- background-color: #eee;
-}
-.row2 {
- background-color: #ddd;
-}
-.row1:hover, .row2:hover {
- background-color: #fff;
-}
-
-.record th {
- text-align: right;
-}
-
-/* styling page content */
-
-h1 {
- font-size: 1.5em;
- color: #3f3f3f;
-}
-
-/* styling form widgets like bugzilla.gnome.org */
-input,textarea {
- border: 1px solid #6f6f6f;
-/* background: #dddddd; */
-}
-
-input.login_small {
- border-style: none;
-}
-
-input:focus,textarea:focus {
- background-color: #f7f2d0;
- color: #000000;
-}
-
-/* select {
- border: groove
-} */
-
-option {
- border: 0px none #ffffff;
-}
-
-input[type=radio] {
- margin-left: 1em;
-}
-
-/* footer */
-
-#footer {
- background: none repeat scroll 0 0 #D3D7CF;
- clear: left;
- color: #555753;
- padding: 14px 0 195px;
- margin-bottom: 0;
-}
-
-#footer {
- font-size: 12px;
- line-height: 1.4em;
-}
-
-#footer ul {
- list-style: none outside none;
- margin: 0;
- padding: 0;
-}
-#footer li {
- display: inline;
- padding: 0 0;
-}
-
-#footer a {
- color: #3465a4;
- text-decoration: none;
-}
-
-#footer #footnotes small {
- font-size: 88%;
-}
-#footer div.links div a:hover{
- display: block;
- text-decoration: underline;
-}
-h1 {
- margin: auto;
- width: 960px;
-}
-
-h2 {
- font-size: 25px;
-}
-h3, dt {
- font-size: 21px;
- margin: 0.4em 0 0.5em;
- color: #2E3436;
-}
dt {
color: #E36615;
}
dt a:hover {
color: #fa7721;
}
-h4 {
- font-size: 16px;
- color: #ce5c00;
-}
-h5 {
- font-size: 14px;
-}
-h6 {
- font-size: 12px;
-}
ol {
list-style:decimal;
}
@@ -198,18 +21,6 @@ ul {
list-style:square;
}
-dl,dt,h2,h3,h4,h5,h6,pre,table,address,fieldset {
- margin: 0.8em 0 0.4em;
-}
-p, dd, .action_box, ul, ol {
- margin: 0.4em 0 1em;
-}
-code {
- background: #ececec;
- background: rgba(0,0,0,0.1);
- padding: 1px;
-}
-
/* added for ODRS */
th {
diff --git a/app_data/app/templates/default.html b/app_data/app/templates/default.html
index 668c79b..fabbaf3 100644
--- a/app_data/app/templates/default.html
+++ b/app_data/app/templates/default.html
@@ -6,205 +6,156 @@
<head>
<title>{% block title %}{% endblock %}</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
- <link href="/layout.css" rel="stylesheet" type="text/css" media="screen" />
+ <meta content="width=device-width, initial-scale=1" name="viewport">
+ <meta content="#4a86cf" name="theme-color">
+ <meta content="GNOME: Open Desktop Review Server" name="application-name">
+ <link href="https://static.gnome.org/img/favicon.ico"; rel="shortcut icon" />
+ <link href="https://static.gnome.org/css/deneb.min.css"; media="all" rel="stylesheet" type="text/css">
<link href="/style.css" rel="stylesheet" type="text/css" media="all" />
- <link rel="icon" type="image/png" href="https://www.gnome.org/img/logo/foot-16.png"; />
- <link rel="SHORTCUT ICON" type="image/png" href=
- "https://www.gnome.org/img/logo/foot-16.png"; />
</head>
-<body>
-<body id="mail_gnome">
- <div id="except_footer">
- <div id="header" class="container_12">
- <div id="global_domain_bar">
- <div class="maxwidth">
- <div class="tab">
- <a class="root" href="https://www.gnome.org/";>GNOME.org</a>
- </div>
+<body class="gnome-body">
+ <header class="gnome-header">
+ <nav 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 href="/" class="gnome-navbar-brand" title="Go to home page">
+ <img src="src/images/gnome-logo.svg" alt="GNOME: Open Desktop Review Server">
+ </a>
+ </div>
+ <div class="navbar-collapse collapse" id="navbar-wrapper">
+ <ul class="nav navbar-nav">
+ <li><a href="/admin/show/all">All Reviews</a></li>
+ {% if current_user.is_authenticated %}
+ <li><a href="/admin/show/unmoderated">Queue</a></li>
+ <li><a href="/admin/show/reported">Reported</a></li>
+ {% endif %}
+ {% if current_user.is_admin %}
+ <li><a href="/admin/stats">Statistics</a></li>
+ <li><a href="/admin/users/all">Users</a></li>
+ <li><a href="/admin/moderators/all">Moderators</a></li>
+ <li><a href="/admin/distros">Distributions</a></li>
+ <li><a href="/admin/graph_month">Usage</a></li>
+ {% endif %}
+ {% if not current_user.is_admin and current_user.is_authenticated %}
+ <li><a href="/admin/moderator/{{current_user.username}}/admin">Profile</a></li>
+ {% endif %}
+ </ul>
+ <ul class="nav navbar-nav navbar-right">
+ {% if current_user.is_authenticated %}
+ <li><a href="/logout">Logout</a></li>
+ {% else %}
+ <li><a href="/login">Login</a></li>
+ {% endif %}
+ </ul>
+ </div>
+ </div>
+ </nav>
+ </header> <!-- gnome-header -->
+
+ <div class="gnome-content">
+ <div class="container">
+ <div class="row">
+ <div class="col-xs-12">
+ {% block navigation %}
+ {% endblock %}
+
+ <!-- any flashed messages -->
+ <div id="messages">
+ {% for category, msg in get_flashed_messages(with_categories=true) %}
+ <p class="alert alert-info message flash-{{ category }}">{{ msg }}</p>
+ {% endfor %}
+ </div>
+
+ {% block content %}{% endblock %}
+ </div>
+ </div>
</div>
- </div>
- </div><!-- header -->
-
- <div id="logo_bar" class="container_12">
- <div id="logo" class="grid_3">
- <a title="Go to home page" href="https://odrs.gnome.org/";><img src="/gnome-odrs.png" alt="GNOME:
Open Desktop Review Server" /></a>
- </div>
-
- <div id="top_bar" class="grid_9">
- <div class="left">
- <div class="menu-globalnav-container">
- <ul id="menu-globalnav" class="menu">
- <li><a href="/">Home</a></li>
- <li><a href="/admin/show/all">All Reviews</a></li>
-{% if current_user.is_authenticated %}
- <li><a href="/admin/show/unmoderated">Queue</a></li>
- <li><a href="/admin/show/reported">Reported</a></li>
-{% endif %}
-{% if current_user.is_admin %}
- <li><a href="/admin/stats">Statistics</a></li>
- <li><a href="/admin/users/all">Users</a></li>
- <li><a href="/admin/moderators/all">Moderators</a></li>
- <li><a href="/admin/distros">Distributions</a></li>
- <li><a href="/admin/graph_month">Usage</a></li>
-{% endif %}
- </ul>
- </div>
- </div>
- <div class="right">
- <div class="menu-globalnav-container">
- <ul id="menu-globalnav" class="menu">
-{% if not current_user.is_admin and current_user.is_authenticated %}
- <li><a href="/admin/moderator/{{current_user.username}}/admin">Profile</a></li>
-{% endif %}
-{% if current_user.is_authenticated %}
- <li class="navigation2"><a href="/logout">Logout</a></li>
-{% else %}
- <li class="navigation2"><a href="/login">Login</a></li>
-{% endif %}
- </ul>
- </div>
+ </div><!-- end of gnome-content -->
+
+ <div class="footer">
+ <div class="container">
+ <div class="row">
+ <div class="col-xs-12 col-sm-2">
+ <h4><a href="https://www.gnome.org";>The GNOME Project</a></h4>
+ <ul>
+ <li>
+ <a href="https://www.gnome.org/about/";>About Us</a>
+ </li>
+ <li>
+ <a href="https://www.gnome.org/get-involved/";>Get Involved</a>
+ </li>
+ <li>
+ <a href="https://www.gnome.org/teams/";>Teams</a>
+ </li>
+ <li>
+ <a href="https://www.gnome.org/support-gnome/";>Support GNOME</a>
+ </li>
+ <li>
+ <a href="https://www.gnome.org/contact/";>Contact Us</a>
+ </li>
+ <li>
+ <a href="https://www.gnome.org/foundation/";>The GNOME Foundation</a>
+ </li>
+ </ul>
+ </div>
+ <div class="col-xs-12 col-sm-2">
+ <h4><a href="#">Resources</a></h4>
+ <ul class="sub-menu">
+ <li>
+ <a href="https://developer.gnome.org";>Developer Center</a>
+ </li>
+ <li>
+ <a href="https://help.gnome.org";>Documentation</a>
+ </li>
+ <li>
+ <a href="https://wiki.gnome.org";>Wiki</a>
+ </li>
+ <li>
+ <a href="https://mail.gnome.org/mailman/listinfo";>Mailing Lists</a>
+ </li>
+ <li>
+ <a href="https://wiki.gnome.org/GettingInTouch/IRC";>IRC Channels</a>
+ </li>
+ <li>
+ <a href="https://gitlab.gnome.org/";>Bug Tracker</a>
+ </li>
+ <li>
+ <a href="https://gitlab.gnome.org/";>Development Code</a>
+ </li>
+ </ul>
+ </div>
+ <div class="col-xs-12 col-sm-2">
+ <h4><a href="https://www.gnome.org/news/";>News</a></h4>
+ <ul class="sub-menu">
+ <li>
+ <a href="https://www.gnome.org/press/";>Press Releases</a>
+ </li>
+ <li>
+ <a href="https://www.gnome.org/start/stable";>Latest Release</a>
+ </li>
+ <li>
+ <a href="https://planet.gnome.org";>Planet GNOME</a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-xs-12">
+ <p>© <a href="https://www.gnome.org/";>The GNOME Project</a>.</p>
+ <p>GNOME: Open Desktop Review Server. Hosted by <a href="https://www.redhat.com/";>Red
Hat</a>.
+ </div>
+ </div>
</div>
- </div>
</div>
- <div class="body">
- <div id="content">
-
-{% block navigation %}
-{% endblock %}
-
-<!-- any flashed messages -->
-<div id="messages">
- {% for category, msg in get_flashed_messages(with_categories=true) %}
- <p class="message flash-{{ category }}">{{ msg }}</p>
- {% endfor %}
-</div>
-
-{% block content %}{% endblock %}
-
- </div><!-- end of content --> </div>
- </div><!--end of except_footer-->
-
- <div id="footer_community"></div>
-
- <div id="footer_grass"></div>
-
- <div id="footer">
- <div class="container_12" id="container_12">
- <div class="links grid_9">
- <div class="menu-footer-container">
- <ul id="menu-footer" class="menu">
- <li id="menu-item-1048" class=
- "menu-item menu-item-type-custom menu-item-object-custom current-menu-item current_page_item
menu-item-1048">
- <a href="/">The GNOME Project</a>
-
- <ul class="sub-menu">
- <li id="menu-item-1049" class=
- "menu-item menu-item-type-post_type menu-item-object-page menu-item-1049">
- <a href="https://www.gnome.org/about/";>About Us</a></li>
-
- <li id="menu-item-1050" class=
- "menu-item menu-item-type-post_type menu-item-object-page menu-item-1050">
- <a href="https://www.gnome.org/get-involved/";>Get Involved</a></li>
-
- <li id="menu-item-1051" class=
- "menu-item menu-item-type-post_type menu-item-object-page menu-item-1051">
- <a href="https://www.gnome.org/teams/";>Teams</a></li>
-
- <li id="menu-item-1053" class=
- "menu-item menu-item-type-post_type menu-item-object-page menu-item-1053">
- <a href="https://www.gnome.org/support-gnome/";>Support GNOME</a></li>
-
- <li id="menu-item-1054" class=
- "menu-item menu-item-type-post_type menu-item-object-page menu-item-1054">
- <a href="https://www.gnome.org/contact/";>Contact Us</a></li>
-
- <li id="menu-item-2246" class=
- "menu-item menu-item-type-post_type menu-item-object-page menu-item-2246">
- <a href="https://www.gnome.org/foundation/";>The GNOME Foundation</a></li>
- </ul>
- </li>
-
- <li id="menu-item-1047" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1047">
- <a href="#">Resources</a>
-
- <ul class="sub-menu">
- <li id="menu-item-1055" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1055">
- <a href="https://developer.gnome.org";>Developer Center</a></li>
-
- <li id="menu-item-1056" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1056">
- <a href="https://help.gnome.org";>Documentation</a></li>
-
- <li id="menu-item-1057" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1057">
- <a href="https://wiki.gnome.org";>Wiki</a></li>
-
- <li id="menu-item-1058" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1058">
- <a href="https://mail.gnome.org/mailman/listinfo";>Mailing Lists</a></li>
-
- <li id="menu-item-1059" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1059">
- <a href="https://wiki.gnome.org/GnomeIrcChannels";>IRC Channels</a></li>
-
- <li id="menu-item-1060" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1060">
- <a href="https://bugzilla.gnome.org/";>Bug Tracker</a></li>
-
- <li id="menu-item-1061" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1061">
- <a href="https://git.gnome.org/browse/";>Development Code</a></li>
-
- <li id="menu-item-1062" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1062">
- <a href="https://wiki.gnome.org/Jhbuild";>Build Tool</a></li>
- </ul>
- </li>
-
- <li id="menu-item-1046" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1046">
- <a href="/news">News</a>
-
- <ul class="sub-menu">
- <li id="menu-item-1063" class=
- "menu-item menu-item-type-post_type menu-item-object-page menu-item-1063">
- <a href="https://www.gnome.org/press/";>Press Releases</a></li>
-
- <li id="menu-item-1064" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1064">
- <a href="https://www.gnome.org/start/stable";>Latest Release</a></li>
-
- <li id="menu-item-1065" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1065">
- <a href="https://planet.gnome.org";>Planet GNOME</a></li>
-
- <li id="menu-item-1067" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1067">
- <a href="https://news.gnome.org";>Development News</a></li>
-
- <li id="menu-item-1068" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1068">
- <a href="https://identi.ca/gnome";>Identi.ca</a></li>
-
- <li id="menu-item-1069" class=
- "menu-item menu-item-type-custom menu-item-object-custom menu-item-1069">
- <a href="https://twitter.com/gnome";>Twitter</a></li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
-
- <div id="footnotes" class="grid_9">
- <p> Copyright © 2015 - 2016 <a href="https://www.gnome.org/";><strong>The GNOME
Project</strong></a>.<br />
- <small><a href="http://validator.w3.org/check/referer";>Optimised</a> for <a href=
- "http://www.w3.org/";>standards</a>. Hosted by <a href="http://www.redhat.com/";>Red Hat</a>.
- </div>
- </div>
- </div>
+ <script src="https://static.gnome.org/js/jquery-2.1.4.min.js";></script>
+ <script src="https://static.gnome.org/js/deneb.min.js";></script>
</body>
</html>
diff --git a/app_data/app/templates/delete.html b/app_data/app/templates/delete.html
index 591e1c0..84661f8 100644
--- a/app_data/app/templates/delete.html
+++ b/app_data/app/templates/delete.html
@@ -8,7 +8,7 @@ Once deleted, reviews are gone <b>forever</b>.
</p>
<a href="/admin/delete/{{ review_id }}/force">
-<button class="destructive-action" type="submit">Irrevocably Remove Review</button>
+<button class="btn btn-danger" type="submit">Irrevocably Remove Review</button>
</a>
{% endblock %}
diff --git a/app_data/app/templates/index.html b/app_data/app/templates/index.html
index 92fea65..e04c002 100644
--- a/app_data/app/templates/index.html
+++ b/app_data/app/templates/index.html
@@ -3,7 +3,7 @@
{% block content %}
-<h2>GNOME Open Desktop Ratings</h2>
+<h1>GNOME Open Desktop Ratings</h1>
<p>
Choosing an application to install is hard when there are lots of
possible projects matching a specific search term.
diff --git a/app_data/app/templates/login.html b/app_data/app/templates/login.html
index 4db6db6..27bfb1d 100644
--- a/app_data/app/templates/login.html
+++ b/app_data/app/templates/login.html
@@ -2,23 +2,25 @@
{% block title %}Login{% endblock %}
{% block content %}
-<p>
-You can request an account if you think it is required.
-</p>
-<form method="POST" action="">
-<table>
-<tr>
-<th><label for="username">Username:</label></td>
-<td><input type="text" name="username" required></td>
-</tr>
-<tr>
-<th><label for="password">Password:</label></td>
-<td><input type="password" name="password" required></td>
-</tr>
-</table>
-<input type="submit" class="submit" value="Login">
-</form>
-</body>
-</html>
+
+<div class="col-sm-8 col-md-6 col-centered">
+ <form class="form" method="POST" action="">
+ <h1>User Login</h1>
+ <div class="form-group">
+ <label for="username" class="control-label">Username:</label>
+ <input type="text" class="form-control" id="username" name="username" required>
+ </div>
+ <div class="form-group">
+ <label for="password" class="control-label">Password:</label>
+ <input type="password" class="form-control" id="password" name="password" required>
+ </div>
+ <div class="form-group">
+ <button class="btn btn-action btn-block" type="submit">Log in</button>
+ </div>
+ <hr>
+ <p class="text-center main_feature" style="margin-bottom: 30px;">Don't have an account?</p>
+ <p class="text-center">You can request an account if you think it is required.</p>
+ </form>
+</div>
{% endblock %}
diff --git a/app_data/app/templates/mods.html b/app_data/app/templates/mods.html
index a6b0e0b..ac998c7 100644
--- a/app_data/app/templates/mods.html
+++ b/app_data/app/templates/mods.html
@@ -4,7 +4,7 @@
{% block content %}
<h2>Moderators</h2>
-<table>
+<table class="table table-hover table-responsive">
<tr>
<th>ID</th>
<th>Username</th>
@@ -27,7 +27,7 @@
{% endfor %}
</table>
-<h2>Create new</h2>
+<h3>Create new</h3>
<form method="post" action="/admin/moderator/add" class="form">
<table>
<tr>
@@ -47,7 +47,7 @@
<td><input type="text" class="form-control" name="email" required></td>
</tr>
</table>
- <input type="submit" value="Add">
+ <button class="btn btn-action btn-large" type="submit">Add</button>
</form>
diff --git a/app_data/app/templates/show-all.html b/app_data/app/templates/show-all.html
index ab55c9b..3ffb7b0 100644
--- a/app_data/app/templates/show-all.html
+++ b/app_data/app/templates/show-all.html
@@ -8,7 +8,7 @@
There are no results for this query.
</p>
{% else %}
-<table>
+<table class="table table-hover table-responsive">
<tr>
<th>#</th>
<th>Created / Deleted</th>
@@ -56,31 +56,31 @@
</table>
{% macro render_pagination(pagination) %}
- <div class=pagination>
+ <ul class=pagination>
{% if pagination.has_prev %}
- <a href="{{ url_for_other_page(pagination.page - 1) }}">
- «</a>
+ <li><a href="{{ url_for_other_page(pagination.page - 1) }}">
+ «</a></li>
{% else %}
- «
+ <li><span>«</span></li>
{% endif %}
{%- for page in pagination.iter_pages() %}
{% if page %}
{% if page != pagination.page %}
- <a href="{{ url_for_other_page(page) }}">{{ page }}</a>
+ <li><a href="{{ url_for_other_page(page) }}">{{ page }}</a></li>
{% else %}
- <strong>{{ page }}</strong>
+ <li class="active"><span>{{ page }}</span></li>
{% endif %}
{% else %}
- <span class=ellipsis>…</span>
+ <li class="disabled"><span>…</span></li>
{% endif %}
{%- endfor %}
{% if pagination.has_next %}
- <a href="{{ url_for_other_page(pagination.page + 1)
- }}">»</a>
+ <li><a href="{{ url_for_other_page(pagination.page + 1)
+ }}">»</a></li>
{% else %}
- »
+ <li><span>»</span></li>
{% endif %}
- </div>
+ </ul>
{% endmacro %}
{% if pagination %}
diff --git a/app_data/app/templates/show.html b/app_data/app/templates/show.html
index 0607b60..19de6a7 100644
--- a/app_data/app/templates/show.html
+++ b/app_data/app/templates/show.html
@@ -3,157 +3,179 @@
{% block content %}
-<a href="/admin/review/{{ r.review_id - 1 }}">
- <button class="action" type="button"><<</button>
-</a>
-<a href="/admin/review/{{ r.review_id + 1 }}">
- <button class="action" type="button">>></button>
-</a>
+<ul class="pagination">
+ <li><a href="/admin/review/{{ r.review_id - 1 }}"><<</a></li>
+ <li><a href="/admin/review/{{ r.review_id + 1 }}">>></a></li>
+</ul>
-<form name="myform" action="/admin/modify/{{ r.review_id }}" method="POST">
-<table>
+<form class="form" name="myform" action="/admin/modify/{{ r.review_id }}" method="POST">
-<br/>
{% if current_user.is_authenticated %}
- <tr>
- <th>Actions</th>
- <td colspan="5">
+<div class="row form-group">
+ <div class="col-sm-1">
+ <strong>Actions</strong>
+ </div>
+ <div class="col-sm-11">
{% if current_user.user_hash and not vote_exists %}
<a href="/admin/vote/{{r.review_id}}/up">
- <button class="action" type="button">Vote Up</button>
+ <button class="btn btn-action" type="button">Vote Up</button>
</a>
<a href="/admin/vote/{{r.review_id}}/down">
- <button class="action" type="button">Vote Down</button>
+ <button class="btn btn-action" type="button">Vote Down</button>
</a>
<a href="/admin/vote/{{r.review_id}}/meh">
- <button class="action" type="button">Meh</button>
+ <button class="btn btn-action" type="button">Meh</button>
</a>
{% endif %}
<a href="/admin/delete/{{r.review_id}}">
- <button class="destructive-action" type="button">Remove Forever</button>
+ <button class="btn btn-danger" type="button">Remove Forever</button>
</a>
- </td>
- </tr>
-{% endif %}
- <tr>
- <th>Application</th>
- <td colspan="5">
- <textarea cols="75" rows="1" name="app_id">{{ r.app_id }}</textarea>
-{% if current_user.is_authenticated %}
- <a href="/admin/show/app/{{ r.app_id }}">
- <button class="inline" type="button">All</button>
- </a>
-{% endif %}
- </td>
- </tr>
- <tr>
- <th>Rating</th>
- <td>{{ format_rating(r.rating) }}</td>
- <th>Karma</th>
- <td>
+ </div>
+</div>
+{% endif %}
+<div class="row form-group">
+ <div class="col-sm-1">
+ <strong>Application</strong>
+ </div>
+ <div class="col-sm-11">
+ <div class="input-group">
+ <textarea class="form-control" rows="1" name="app_id">{{ r.app_id }}</textarea>
+ {% if current_user.is_authenticated %}
+ <span class="input-group-addon btn btn-action">
+ <a href="/admin/show/app/{{ r.app_id }}">All</a>
+ </span>
+ {% endif %}
+ </div>
+ </div>
+</div>
+<div class="row form-group">
+ <div class="col-sm-1">
+ <strong>Rating</strong>
+ </div>
+ <div class="col-sm-1">
+ {{ format_rating(r.rating) }}
+ </div>
+ <div class="col-sm-1">
+ <strong>Karma</strong>
+ </div>
+ <div class="col-sm-4">
{{ r.karma_up }}↑, {{ r.karma_down }}↓
-{% if r.reported > 0 %}
- (reported {{ r.reported }})
-{% if current_user.is_authenticated %}
- <a href="/admin/unreport/{{ r.review_id }}">
- <button class="inline" type="button">Unreport</button>
- </a>
-{% endif %}
-{% endif %}
- </td>
- <th>Created</th>
- <td>
+ {% if r.reported > 0 %}
+ (reported {{ r.reported }})
+ {% if current_user.is_authenticated %}
+ <a href="/admin/unreport/{{ r.review_id }}">
+ <button class="btn btn-action" type="button">Unreport</button>
+ </a>
+ {% endif %}
+ {% endif %}
+ </div>
+ <div class="col-sm-1">
+ <strong>Created</strong>
+ </div>
+ <div class="col-sm-4">
{{ format_timestamp(r.date_created) }}
-{% if r.date_deleted %}
- (deleted {{ format_timestamp(r.date_deleted) }})
-{% if current_user.is_authenticated %}
- <a href="/admin/unremove/{{ r.review_id }}">
- <button class="inline" type="button">Unremove</button>
- </a>
-{% endif %}
-{% endif %}
- </td>
- </tr>
- <tr>
- <th>User Display</th>
- <td colspan="5">
-{% if r.user_display %}
-{% if current_user.is_authenticated %}
- <em>Names cannot be offensive or trademarks<br/></em>
-{% endif %}
- <textarea cols="60" rows="1" name="user_display">{{ r.user_display }}</textarea>
-{% if current_user.is_authenticated %}
- <a href="/admin/anonify/{{ r.review_id }}">
- <button class="inline" type="button">Anonify</button>
- </a>
-{% endif %}
-{% else %}
- <textarea cols="20" rows="1" name="user_display"></textarea>
-{% endif %}
-{% if current_user.is_authenticated %}
- <a href="/admin/show/user/{{ r.user_hash }}">
- <button class="inline" type="button">All</button>
- </a>
- <a href="/admin/user_ban/{{ r.user_hash }}">
- <button class="inline" type="button">Ban</button>
- </a>
-{% endif %}
- </td>
- </tr>
- <tr>
- <th>Locale</th>
- <td>
- <textarea cols="10" rows="1" name="locale">{{ r.locale }}</textarea>
-{% if current_user.is_authenticated %}
- <a href="/admin/show/lang/{{ r.locale }}">
- <button class="inline" type="button">All</button>
- </a>
-{% if not r.locale.startswith('en_') %}
- <a href="/admin/englishify/{{ r.review_id }}">
- <button class="inline" type="button">Englishify</button>
- </a>
-{% endif %}
-{% endif %}
- </td>
- <th>Version</th>
- <td>
- <textarea cols="15" rows="1" name="version">{{ r.version }}</textarea>
- </td>
-<!--
- </tr>
- <tr>
--->
- <th>Distro</th>
- <td>
- <textarea cols="15" rows="1" name="distro">{{ r.distro }}</textarea>
- </td>
- </tr>
- <tr>
- <th>Summary</th>
- <td colspan="5">
-{% if current_user.is_authenticated %}
- <em>This should start with a capital letter and not end with a full stop</em><br/>
-{% endif %}
- <textarea cols="80" rows="1" name="summary">{{ r.summary }}</textarea>
- </td>
- </tr>
- <tr>
- <th>Description</th>
- <td colspan="5">
-{% if current_user.is_authenticated %}
- <em>
- This should start with a capital letter and each sentance should end with a full stop.<br/>
- Please remove any incorrect content, and correct spelling, and grammar where required.
- </em><br/>
-{% endif %}
- <textarea cols="80" rows="20" name="description">{{ r.description }}</textarea>
- <br/>
-{% if current_user.is_authenticated %}
- <button class="action" type="submit">Modify</button>
-{% endif %}
- </td>
- </tr>
-</table>
+ {% if r.date_deleted %}
+ (deleted {{ format_timestamp(r.date_deleted) }})
+ {% if current_user.is_authenticated %}
+ <a href="/admin/unremove/{{ r.review_id }}">
+ <button class="btn btn-action" type="button">Unremove</button>
+ </a>
+ {% endif %}
+ {% endif %}
+ </div>
+</div>
+<div class="row form-group">
+ <div class="col-sm-1">
+ <strong>User Display</strong>
+ </div>
+ <div class="col-sm-11">
+ {% if r.user_display %}
+ {% if current_user.is_authenticated %}
+ <span class="help-block"><em>Names cannot be offensive or trademarks</em></span>
+ {% endif %}
+ <div class="input-group">
+ <textarea class="form-control" rows="1" name="user_display">{{ r.user_display }}</textarea>
+ {% if current_user.is_authenticated %}
+ <span class="input-group-addon btn btn-action">
+ <a href="/admin/anonify/{{ r.review_id }}">Anonify</a>
+ </span>
+ {% endif %}
+ {% else %}
+ <textarea class="form-control" rows="1" name="user_display"></textarea>
+ {% endif %}
+ {% if current_user.is_authenticated %}
+ <span class="input-group-addon btn btn-action">
+ <a href="/admin/show/user/{{ r.user_hash }}">All</a>
+ </span>
+ <span class="input-group-addon btn btn-action">
+ <a href="/admin/user_ban/{{ r.user_hash }}">Ban</a>
+ </span>
+ {% endif %}
+ </div>
+ </div>
+</div>
+
+<div class="row form-group">
+ <div class="col-sm-1">
+ <strong>Locale</strong>
+ </div>
+ <div class="col-sm-5">
+ <div class="input-group">
+ <textarea class="form-control" rows="1" name="locale">{{ r.locale }}</textarea>
+ {% if current_user.is_authenticated %}
+ <span class="input-group-addon btn btn-action">
+ <a href="/admin/show/lang/{{ r.locale }}">All</a>
+ </span>
+ {% if not r.locale.startswith('en_') %}
+ <span class="input-group-addon btn btn-action">
+ <a href="/admin/englishify/{{ r.review_id }}">Englishify</a>
+ </span>
+ {% endif %}
+ {% endif %}
+ </div>
+ </div>
+ <div class="col-sm-1">
+ <strong>Version</strong>
+ </div>
+ <div class="col-sm-2">
+ <textarea class="form-control" rows="1" name="version">{{ r.version }}</textarea>
+ </div>
+ <div class="col-sm-1">
+ <strong>Distro</strong>
+ </div>
+ <div class="col-sm-2">
+ <textarea class="form-control" rows="1" name="distro">{{ r.distro }}</textarea>
+ </div>
+</div>
+<div class="row form-group">
+ <div class="col-sm-1">
+ <strong>Summary</strong>
+ </div>
+ <div class="col-sm-11">
+ {% if current_user.is_authenticated %}
+ <span class="help-block"><em>This should start with a capital letter and not end with a full
stop</em></span>
+ {% endif %}
+ <textarea class="form-control" rows="1" name="summary">{{ r.summary }}</textarea>
+ </div>
+</div>
+<div class="row form-group">
+ <div class="col-sm-1">
+ <strong>Description</strong>
+ </div>
+ <div class="col-sm-11">
+ {% if current_user.is_authenticated %}
+ <span class="help-block"><em>
+ This should start with a capital letter and each sentance should end with a full stop.<br/>
+ Please remove any incorrect content, and correct spelling, and grammar where required.
+ </em></span>
+ {% endif %}
+ <textarea class="form-control" rows="20" name="description">{{ r.description }}</textarea>
+ <br/>
+ {% if current_user.is_authenticated %}
+ <button class="btn btn-action" type="submit">Modify</button>
+ {% endif %}
+ </div>
+</div>
</form>
{% endblock %}
diff --git a/app_data/app/templates/stats.html b/app_data/app/templates/stats.html
index 2b85ca0..d0f5ed2 100644
--- a/app_data/app/templates/stats.html
+++ b/app_data/app/templates/stats.html
@@ -4,7 +4,7 @@
{% block content %}
<h2>Web Service Statistics</h2>
-<table>
+<table class="table table-hover table-responsive">
{% for key, value in results_stats %}
<tr>
<td> {{ key }} </td>
diff --git a/app_data/app/templates/users.html b/app_data/app/templates/users.html
index df18abf..d100080 100644
--- a/app_data/app/templates/users.html
+++ b/app_data/app/templates/users.html
@@ -4,7 +4,7 @@
{% block content %}
<h2>Most Awesome Users</h2>
-<table>
+<table class="table table-hover table-responsive">
<tr>
<th>User</th>
<th>Karma</th>
@@ -32,7 +32,7 @@
</table>
<h2>Haters Gonna Hate</h2>
-<table>
+<table class="table table-hover table-responsive">
<tr>
<th>User</th>
<th>Karma</th>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]