From d81e5141c10a97bf5764892f9b20933b751c1da3 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Fri, 6 Feb 2015 15:32:18 +0000 Subject: bitbake: toaster: display Toaster mode and version in debug mode This patch displays the current running mode and checked-out git branch as Toaster version when running in debug mode. (Bitbake rev: 93e4f8c44273f4657c5be4c00b61db12aa875e31) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/static/css/default.css | 19 +++++++++++++++++++ bitbake/lib/toaster/toastergui/templates/base.html | 6 ++++++ bitbake/lib/toaster/toastergui/views.py | 8 ++++++-- bitbake/lib/toaster/toastermain/settings.py | 5 +++-- 4 files changed, 34 insertions(+), 4 deletions(-) (limited to 'bitbake/lib/toaster') diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index 10952547b4..a866773af6 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css @@ -2,6 +2,25 @@ .logo img { height: 30px; width: auto !important; } .logo { padding-top: 4px !important; padding-bottom:0px !important; } +/* style the version text */ +.version-text { + color: #AAA; + font-size: 0.6em; + display: table-footer-group; + padding: 0px; + margin: 1px 1px 1px 1px; +} + +.version-brand, .version-brand:hover, a.version-brand:focus { + color: #777; + display: block; + float: left; + font-size: 20px; + font-weight: 200; + padding: 00px 0px; + text-shadow: 0 1px 0 #fff; +} + /* Style the breadcrumb */ .breadcrumb { display: inline-block; background-color: transparent; } .section { margin: 20px 0; } diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index e95b5e0cac..6f249bcf2d 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html @@ -59,6 +59,12 @@
Toaster + {% if DEBUG %} +
+

version {{TOASTER_VERSION}}

+

{%if MANAGED%}managed{%else%}interactive{%endif%} mode

+
+ {% endif %} Toaster manual diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index b67a6767b3..4b770ff5db 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -1709,10 +1709,12 @@ if toastermain.settings.MANAGED: # the context processor that supplies data used across all the pages def managedcontextprocessor(request): + import subprocess ret = { "projects": Project.objects.all(), "MANAGED" : toastermain.settings.MANAGED, - "DEBUG" : toastermain.settings.DEBUG + "DEBUG" : toastermain.settings.DEBUG, + "TOASTER_VERSION": toastermain.settings.TOASTER_VERSION, } if 'project_id' in request.session: try: @@ -3057,7 +3059,9 @@ else: return { "projects": [], "MANAGED" : toastermain.settings.MANAGED, - "DEBUG" : toastermain.settings.DEBUG + "DEBUG" : toastermain.settings.DEBUG, + "TOASTER_VERSION": toastermain.settings.TOASTER_VERSION, + } diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index ea7c3534da..b6a42c0626 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py @@ -211,8 +211,6 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.cache.UpdateCacheMiddleware', - 'django.middleware.cache.FetchFromCacheMiddleware', # Uncomment the next line for simple clickjacking protection: # 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) @@ -233,6 +231,9 @@ CACHES = { from os.path import dirname as DN SITE_ROOT=DN(DN(os.path.abspath(__file__))) +import subprocess +TOASTER_VERSION = subprocess.Popen('cd %s; git branch | grep "^* " | tr -d "* "' % SITE_ROOT, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0] + ROOT_URLCONF = 'toastermain.urls' # Python dotted path to the WSGI application used by Django's runserver. -- cgit v1.2.3-54-g00ecf