Skip to content

Commit

Permalink
Merge pull request #55 from AIFDR/develop
Browse files Browse the repository at this point in the history
Bump version to 0.1.2
  • Loading branch information
akbargumbira committed Nov 12, 2014
2 parents 8d795e5 + a6b3c86 commit 486f82e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 27 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
Django User Map
=================

[![Stories in Ready](https://badge.waffle.io/aifdr/inasafe-user-map.png?label=ready&title=Ready)](http://waffle.io/aifdr/inasafe-user-map)
[![Develop Branch](https://api.travis-ci.org/AIFDR/inasafe-user-map.svg?branch=develop)](https://travis-ci.org/AIFDR/inasafe-user-map)
[![Coverage Status](https://coveralls.io/repos/AIFDR/inasafe-user-map/badge.png?branch=develop)](https://coveralls.io/r/AIFDR/inasafe-user-map?branch=develop)


A django application for making community user's map. Users can
add themselves on the map by providing some information:

Expand Down Expand Up @@ -40,9 +42,9 @@ Installation
)
```

3. Include user-map URLconf in your project urls.py e.g:
3. Include user-map URLconf in your project urls.py with namespace user_map (required) e.g:
```
url(r'^user-map/', include('user_map.urls')),
url(r'^user-map/', include('user_map.urls', namespace='user_map')),
```

3. Add authentication user model and authentication backend in your django
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

setup(
name='django-user-map',
version='0.1.1',
version='0.1.2',
author='Akbar Gumbira',
author_email='[email protected]',
packages=find_packages(),
Expand Down
24 changes: 0 additions & 24 deletions user_map/static/user_map/css/user-map.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,6 @@ body > .container {
max-width: 700px;
}

/* ******************** */
/* Controls */
/* ******************** */
.leaflet-control-stats {
background: none repeat scroll 0 0 #F8F8F9;
border-radius: 8px 8px 8px 8px;
box-shadow: 0 1px 7px #999999;
}
.leaflet-control-stats a {
background-image: url("../img/update_stats.png");
background-position: 50% 50%;
background-repeat: no-repeat;
display: inline-block;
width: 46px;
}
.leaflet-control-stats div, .leaflet-control-stats a {
height: 46px;
display: inline-block;
line-height: 46px;
}
.leaflet-control-stats div {
padding: 0 5px;
}

/* ******************** */
/* Misc */
/* ******************** */
Expand Down

0 comments on commit 486f82e

Please sign in to comment.