in status bar, replaced SHA with version

l-dfa · Apr 16, 2017 · 8f0e932 · 8f0e932
1 parent 45920b4
commit 8f0e932
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,14 +1,20 @@
 alabaster==0.7.9
 Babel==2.3.4
+bleach==1.4.3
 colorama==0.3.7
 Django==1.9.8
+django-expense==0.5.1
+django-filter==1.0.1
 django-taggit==0.20.2
 docutils==0.12
+html5lib==0.9999999
 imagesize==0.7.1
 Jinja2==2.8
 MarkupSafe==0.23
 Pygments==2.1.3
 pytz==2016.6.1
+readme-renderer==0.7.0
+restview==2.7.0
 six==1.10.0
 snowballstemmer==1.2.1
 Sphinx==1.4.6

diff --git a/servizi/servizi/settings.py b/servizi/servizi/settings.py
@@ -69,7 +69,7 @@
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'spese.context_processors.commit_id',
+                'spese.context_processors.commit_ver',
             ],
         },
     },
@@ -189,7 +189,7 @@
     }    
 }
 
-COMMIT_ID = '332ae0c'
+COMMIT_VER = 'v0.5'
 
 
 

diff --git a/servizi/spese/context_processors.py b/servizi/spese/context_processors.py
@@ -1,5 +1,5 @@
 from django.conf import settings # import the settings file
 
-def commit_id(request):
+def commit_ver(request):
     # return the value you want as a dictionary. you may add multiple values in there.
-    return {'COMMIT_ID': settings.COMMIT_ID}
+    return {'COMMIT_VER': settings.COMMIT_VER}
diff --git a/servizi/spese/docs/source/changelog.rst b/servizi/spese/docs/source/changelog.rst
@@ -12,7 +12,8 @@ Version 0.5
   and partial *description*;
 * exporting expenses list to csv file;
 * in transfer fund detail, added reference to other expense;
-* documents updated.
+* user manual updated;
+* added version in status bar.
 
 Version 0.4
 -------------

diff --git a/servizi/spese/docs/source/installation.rst b/servizi/spese/docs/source/installation.rst
@@ -17,9 +17,9 @@ Futhermore I take for granted you know how to use virtualenv
 and you'll use it to create a Django project to test this app.
 
 Hereafter I describe how install from a distribution. You can download it from `this tar.gz
-<https://github.com/l-dfa/django-spese/releases/download/v0.1/django-spese-0.1.tar.gz>`_ ,
+<https://github.com/l-dfa/django-spese/releases/download/v0.5/django-spese-0.5.tar.gz>`_ ,
 or from `this zip archive
-<https://github.com/l-dfa/django-spese/releases/download/v0.1/django-spese-0.1.zip>`_ 
+<https://github.com/l-dfa/django-spese/releases/download/v0.5/django-spese-0.5.zip>`_ 
 if you prefer a zipped version.
 
 .. note:: If you are a developer, maybe you'd like to clone from the

diff --git a/servizi/templates/base.html b/servizi/templates/base.html
@@ -73,7 +73,7 @@
                     </nav>
                 </div>
                 <div class="four columns s-text-right">
-                    <p>&copy; 2016, 2017. Servizi. All Rights Reserved. {{ COMMIT_ID }}</p>
+                    <p>&copy; 2016, 2017. Servizi. All Rights Reserved. {{ COMMIT_VER }}</p>
                 </div>
             </div>
             </div>