Differential D388

Add fedmenu
ClosedPublic
Actions

Authored by mkrizek on Jun 11 2015, 11:21 AM.

Details

Reviewers
tflink
pingou
Maniphest Tasks
T466: Proposed fedmenu integration
Commits
rBLKR051c12e1d552: Add fedmenu
Summary

After the patch is merged. Add the config values into ansible.

Test Plan

Tested locally

Diff Detail

Repository
rBLKR blockerbugs
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek retitled this revision from to Add fedmenu.Jun 11 2015, 11:21 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added reviewers: tflink, pingou.
tflink accepted this revision.Jun 26 2015, 3:10 PM

I don't really see the point in putting this in the blockerbugs code other than conformity but it shouldn't hurt anything.

Tested it locally, everything works fine once settings are updated

This revision is now accepted and ready to land.Jun 26 2015, 3:10 PM
pingou added a comment.Jun 26 2015, 3:28 PM

Thanks tflink, as for the reason, we are trying to use this little widget as a way to navigate through all our apps, and that does include blockerbugs :)

Closed by commit rBLKR051c12e1d552: Add fedmenu (authored by mkrizek). · Explain WhyJul 2 2015, 7:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1096

View Options

blockerbugs/config.py

Show All 31 Lines24class Config(object):
32 FAS_HTTPS_REQUIRED = False 32​ FAS_HTTPS_REQUIRED = False
33 FAS_CHECK_CERT = False 33​ FAS_CHECK_CERT = False
34 FAS_BASE_URL = 'https://admin.stg.fedoraproject.org/accounts/' 34​ FAS_BASE_URL = 'https://admin.stg.fedoraproject.org/accounts/'
35 LOGFILE = '/var/log/blockerbugs/blockerbugs.log' 35​ LOGFILE = '/var/log/blockerbugs/blockerbugs.log'
36 FILE_LOGGING = False 36​ FILE_LOGGING = False
37 SYSLOG_LOGGING = False 37​ SYSLOG_LOGGING = False
38 STREAM_LOGGING = True 38​ STREAM_LOGGING = True
39 PRODUCTION = False 39​ PRODUCTION = False
40​ FEDMENU_URL = ""
41​ FEDMENU_DATA_URL = ""
40 42​
41 43​
42class ProductionConfig(Config): 44​class ProductionConfig(Config):
43 DEBUG = False 45​ DEBUG = False
44 BUGZILLA_URL = 'https://bugzilla.redhat.com/' 46​ BUGZILLA_URL = 'https://bugzilla.redhat.com/'
45 BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi' 47​ BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi'
46 KOJI_URL = 'http://koji.fedoraproject.org/' 48​ KOJI_URL = 'http://koji.fedoraproject.org/'
47 BODHI_URL = 'https://admin.fedoraproject.org/updates/' 49​ BODHI_URL = 'https://admin.fedoraproject.org/updates/'
Show All 13 Lines
View Options

blockerbugs/templates/layout.html

Show First 20 Lines • Show All 158 Lines • ▼ Show 20 Line(s)156 <div class="fedora-prefooter">
159 <div class="fedora-footer"></div> 159​ <div class="fedora-footer"></div>
160 </div> 160​ </div>
161 </div> 161​ </div>
162 </div> 162​ </div>
163 {% endblock %} 163​ {% endblock %}
164 164​
165</div> <!-- end of main row --> 165​</div> <!-- end of main row -->
166 166​
167​{% if config['FEDMENU_URL'] %}
168​<script src="{{ config['FEDMENU_URL'] }}/js/fedmenu.js"></script>
169​<script>
170​ fedmenu({
171​ 'url': '{{ config["FEDMENU_DATA_URL"] }}',
172​ 'mimeType': 'application/javascript',
173​ 'position': 'bottom-right',
174​ });
175​</script>
176​{% endif %}
177​
167</body> 178​</body>
168</html> 179​</html>
View Options

conf/settings.py.example

1# while you can use this as a template, we recommend that you use the blockerbugs 1​# while you can use this as a template, we recommend that you use the blockerbugs
2# cli to generate a config file 2​# cli to generate a config file
3SECRET_KEY = 'replace-me-with-something-random' 3​SECRET_KEY = 'replace-me-with-something-random'
4SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://dbuser:dbpassword@dbhost:dbport/dbname' 4​SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://dbuser:dbpassword@dbhost:dbport/dbname'
5FAS_ADMIN_GROUP = "magic-fas-group" 5​FAS_ADMIN_GROUP = "magic-fas-group"
6FAS_USER = "magicuser@unicornsarereal.com" 6​FAS_USER = "magicuser@unicornsarereal.com"
7FAS_PASSWORD = "password" 7​FAS_PASSWORD = "password"
8BUGZILLA_URL = 'https://partner-bugzilla.redhat.com' 8​BUGZILLA_URL = 'https://partner-bugzilla.redhat.com'
9BUGZILLA_XMLRPC = 'https://partner-bugzilla.redhat.com/xmlrpc.cgi' 9​BUGZILLA_XMLRPC = 'https://partner-bugzilla.redhat.com/xmlrpc.cgi'
10KOJI_URL = 'http://koji.stg.fedoraproject.org/' 10​KOJI_URL = 'http://koji.stg.fedoraproject.org/'
11BODHI_URL = 'https://admin.stg.fedoraproject.org/updates' 11​BODHI_URL = 'https://admin.stg.fedoraproject.org/updates'
12FILE_LOGGING = False 12​FILE_LOGGING = False
13LOGFILE = /var/log/blockerbugs/blockerbugs.log 13​LOGFILE = /var/log/blockerbugs/blockerbugs.log
14SYSLOG_LOGGING = False 14​SYSLOG_LOGGING = False
15STREAM_LOGGING = True 15​STREAM_LOGGING = True
16​FEDMENU_URL = "https://apps.fedoraproject.org/fedmenu/"
17​FEDMENU_DATA_URL = "https://apps.fedoraproject.org/js/data.js"