diff --git a/VERSION.md b/VERSION.md index 3eefcb9..7dea76e 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -1.0.0 +1.0.1 diff --git a/modules/api.py b/modules/api.py index 2266973..0b01f0e 100644 --- a/modules/api.py +++ b/modules/api.py @@ -165,10 +165,21 @@ def getPluginVersion(loc): c += 1 return float(_version) +def getVersion(): + f = open('VERSION.md', 'r') + version = f.read().rstrip() + f.close() + return version + def performUpgrade(): git.cmd.Git('.').pull("https://github.com/wez3/domoboard.git") return "Upgrade completed." +def getCurrentBranch(): + repo = git.Repo('.') + branch = repo.active_branch + return branch.name + def indexPlugins(params={}): tmpFolder = 'static/tmp' indexFolderPath = 'static/tmp/pluginsIndex/' diff --git a/server.py b/server.py index edafd95..f6d2dbb 100755 --- a/server.py +++ b/server.py @@ -46,7 +46,8 @@ def generatePage(): configValues = configValues, blockArray = blockArray, _csrf_token = session['_csrf_token'], - version = getVersion(), + version = api.getVersion(), + branch = api.getCurrentBranch(), debug = app.debug) else: abort(404) @@ -131,12 +132,6 @@ def appendDefaultPages(config): config['log'] = {'display_components': {'components': 'serverlog'}} return config -def getVersion(): - f = open('VERSION.md', 'r') - version = f.read().rstrip() - f.close() - return version - if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument("-c", "--config", dest="configfile", diff --git a/templates/footer.html b/templates/footer.html index 5e9b5ff..84f4e47 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -16,11 +16,11 @@ $(document).ready(function() { var interval = setInterval(function() { var momentNow = moment(); - + $('#date-part').html(momentNow.locale(local_language).format('dddd D MMMM YYYY')); - - $('#time-part').html(momentNow.format('HH:mm')); - + + $('#time-part').html(momentNow.format('HH:mm')); + }, 100); {% if configValues["domoboard"].get("date") == "True" %} $('#date-part').removeClass('hide_date'); @@ -45,7 +45,7 @@ {% endif %}