Differential D409

Show version in footer (resultsdb_frontend)
ClosedPublic
Actions

Authored by jskladan on Jul 1 2015, 12:07 PM.

Details

Reviewers
kparal
tflink
mkrizek
Maniphest Tasks
T474: Show version at ResultsDB and ResultsDB_Frontend landing pages
Commits
rRSFE2e3f678ebd4e: Show version in footer
Summary

Added a global variable accessible in the Jinja templates that shares the init__.py's version__ variable, which is then shown in footer

Test Plan

tested locally

Diff Detail

Repository
rRSFE resultsdb_frontend
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
jskladan retitled this revision from to Show version in footer (resultsdb_frontend).Jul 1 2015, 12:07 PM
jskladan updated this object.
jskladan edited the test plan for this revision. (Show Details)
jskladan added reviewers: kparal, tflink, mkrizek.
tflink accepted this revision.Jul 2 2015, 6:49 AM
This revision is now accepted and ready to land.Jul 2 2015, 6:49 AM
Closed by commit rRSFE2e3f678ebd4e: Show version in footer (authored by Josef Skladanka <jskladan@redhat.com>). · Explain WhyJul 2 2015, 1:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1091

View Options

resultsdb_frontend/__init__.py

Show All 29 Lines
30__version__ = "1.1.4" 30​__version__ = "1.1.4"
31 31​
32# Flask App 32​# Flask App
33app = Flask(__name__) 33​app = Flask(__name__)
34app.secret_key = 'not-really-a-secret' 34​app.secret_key = 'not-really-a-secret'
35 35​
36app.wsgi_app = proxy.ReverseProxied(app.wsgi_app) 36​app.wsgi_app = proxy.ReverseProxied(app.wsgi_app)
37 37​
38​# Expose the __version__ variable in templates
39​app.jinja_env.globals['app_version'] = __version__
40​
38# Load default config, then override that with a config file 41​# Load default config, then override that with a config file
39if os.getenv('PROD') == 'true': 42​if os.getenv('PROD') == 'true':
40 default_config_obj = 'resultsdb_frontend.config.ProductionConfig' 43​ default_config_obj = 'resultsdb_frontend.config.ProductionConfig'
41 default_config_file = '/etc/resultsdb/settings.py' 44​ default_config_file = '/etc/resultsdb/settings.py'
42elif os.getenv('TEST') == 'true': 45​elif os.getenv('TEST') == 'true':
43 default_config_obj = 'resultsdb_frontend.config.TestingConfig' 46​ default_config_obj = 'resultsdb_frontend.config.TestingConfig'
44 default_config_file = os.getcwd() + '/conf/settings.py' 47​ default_config_file = os.getcwd() + '/conf/settings.py'
45else: 48​else:
▲ Show 20 Lines • Show All 55 Lines • Show Last 20 Lines
View Options

resultsdb_frontend/static/css/style.css

1body { padding-top: 70px; } 1​html, body {
2​ margin:0;
3​ padding:0;
4​ height:100%;
5​}
6​
7​body > .container {
8​ min-height:100%;
9​ position:relative;
10​ padding-top: 70px;
11​ padding-bottom: 30px;
12​}
13​.footer {
14​ position: absolute;
15​ bottom: 0;
16​ width: 100%;
17​ height: 30px;
18​ background-color: #f5f5f5;
19​}
2 20​
3.popover { 21​.popover {
4 z-index: 9000; 22​ z-index: 9000;
5} 23​}
6 24​
View Options

resultsdb_frontend/templates/layout.html

Show All 40 Lines11 <body>
41 41​
42 <div class="container"> 42​ <div class="container">
43 {% for message in get_flashed_messages() %} 43​ {% for message in get_flashed_messages() %}
44 <div class="alert alert-info"> 44​ <div class="alert alert-info">
45 <button type="button" class="close" data-dismiss="alert">&times;</button> 45​ <button type="button" class="close" data-dismiss="alert">&times;</button>
46 {{ message }} 46​ {{ message }}
47 </div> 47​ </div>
48 {% endfor %} 48​ {% endfor %}
49 </div> ​
50 ​
51 49​
52 ​
53 <div class="container"> ​
54 {% block body %} 50​ {% block body %}
55 <h1> My First Flask Application! </h1> 51​ <h1> My First Flask Application! </h1>
56 {% endblock %} 52​ {% endblock %}
57 </div> 53​ </div>
58 54​
59 ​
60 ​
61 {% block footer %} 55​ {% block footer %}
56​ <footer class="footer">
57​ <div class="container text-right">
58​ <p class="text-muted">Version: {{app_version}}</p>
59​ </div>
60​ </footer>
62 {% endblock %} 61​ {% endblock %}
63 62​
64 <!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> 63​ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
65 <script src="//code.jquery.com/jquery.js"></script> 64​ <script src="//code.jquery.com/jquery.js"></script>
66 <!-- Include all compiled plugins --> 65​ <!-- Include all compiled plugins -->
67 <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script> 66​ <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
68 <!-- Progressbar eyecandy (https://github.com/kimmobrunfeldt/progressbar.js) 67​ <!-- Progressbar eyecandy (https://github.com/kimmobrunfeldt/progressbar.js)
69 <script src="waiting for reliable CND or own hosting"></script> 68​ <script src="waiting for reliable CND or own hosting"></script>
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines