Tibor Tóth committed ea282c9 Merge

merge v0.2.2

  • Participants
  • Parent commits ed37063, 20f73bb
  • Tags v0.2.2

Comments (0)

Files changed (5)

File docs/changelog.rst

+Version 0.2.2
+* Fix y axis text orientation on bar charts.
+* Fix documentation copy/paste errors.
+* Integrate sphinx version with application version number.
 Version 0.2.1
 * Changed label orientation on bar charts to avoid text overlapping.
 Version 0.2.0

File docs/

 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
+from expense import VERSION
 # -- General configuration -----------------------------------------------------
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # built documents.
 # The short X.Y version.
-version = '0.2.1'
+version = VERSION
 # The full version, including alpha/beta/rc tags.
-release = '0.2.1'
+release = VERSION
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

File docs/installation.rst

-Before installing django-registration, you'll need to have a copy of
+Before installing django-expense, you'll need to have a copy of
 `Django <>`_ already installed. Django
 version 1.3 is required.
     hg clone
-This will create a copy of the django-registration Mercurial
+This will create a copy of the django-expense Mercurial
 repository on your computer.
 Or you can download the source code from the `downloads

File expense/

 from django.utils.translation import ugettext_lazy as _
 label = _('expenses')
-VERSION = '0.2.1'
+VERSION = '0.2.2'

File expense/templates/admin/expense/expense/bar_chart.html

     <script language="javascript" type="text/javascript" src="{{media_dir}}js/flot/jquery.flot.stack.js"></script>
-      .tickLabel {
+      .xAxis .tickLabel {
       display: block;
       writing-mode: tb-rl;
       text-align: left!important;
-      margin-top: 40px;
+      margin-top: 35px;
       -webkit-transform: rotate(90deg);	
       -moz-transform: rotate(90deg)