Merge pull request #12 from iromli/defaults

Add defaults (icons) and config

Author: akbargumbira

users/config.py.prod

@@ -4,15 +4,15 @@ import os
 
 # PROJECT_NAME: Project Name.
 # It would override page title, email confirmation to user, so on.
-PROJECT_NAME = 'InaSAFE'
+PROJECT_NAME = 'Python Indonesia'
 
 # PUBLIC_URL: Public URL that is used for publishing this apps.
 # It will be used for detail of the email confirmation, and other things if
 # it's needed
-PUBLIC_URL = 'http://users.inasafe.org'
+PUBLIC_URL = 'http://members.python.or.id'
 
 # PROJECT_FAVICON_FILE: Path to project favicon file
-PROJECT_FAVICON_FILE = '/users/static/img/user-icon.png'
+PROJECT_FAVICON_FILE = '/users/static/img/favicon.png'
 
 # PATH TO SQLITE DB
 SQLITE_DB_PATH = os.path.abspath(
@@ -39,6 +39,6 @@ MAIL_ADMIN = ('InaSAFE User Map Administrator', MAIL_CONFIG['MAIL_USERNAME'])
 
 # USER ICONS: All icon paths that are used.
 USER_ICONS = dict(
-    user='/static/img/user-icon.png',
-    shadow='/static/img/shadow-icon.png'
+    user='/static/img/marker.png',
+    shadow='/static/img/marker-shadow.png'
 )

users/config.py.test

@@ -4,16 +4,15 @@ import os
 
 # PROJECT_NAME: Project Name.
 # It would override page title, email confirmation to user, so on.
-PROJECT_NAME = 'InaSAFE'
+PROJECT_NAME = 'Python Indonesia'
 
 # PUBLIC_URL: Public URL that is used for publishing this apps.
 # It will be used for detail of the email confirmation, and other things if
 # it's needed
-PUBLIC_URL = 'http://users.inasafe.org'
-
+PUBLIC_URL = 'http://members.python.or.id'
 
 # PROJECT_FAVICON_FILE: Path to project favicon file
-PROJECT_FAVICON_FILE = '/users/static/img/user-icon.png'
+PROJECT_FAVICON_FILE = '/users/static/img/favicon.png'
 
 # PATH TO SQLITE DB
 SQLITE_DB_PATH = os.path.abspath(
@@ -41,6 +40,6 @@ MAIL_ADMIN = ('InaSAFE User Map Administrator', MAIL_CONFIG['MAIL_USERNAME'])
 
 # USER ICONS: All icon paths that are used.
 USER_ICONS = dict(
-    user='/static/img/user-icon.png',
-    shadow='/static/img/shadow-icon.png'
+    user='/static/img/marker.png',
+    shadow='/static/img/marker-shadow.png'
 )

users/static/img/favicon.png

@@ -32,11 +32,11 @@ function createIconMarkerBase(shadow_icon_path) {
   IconMarkerBase = L.Icon.extend({
     options: {
       shadowUrl: shadow_icon_path,
-      iconSize: [19, 32],
-      shadowSize: [42, 35],
-      iconAnchor: [12, 32],
+      iconSize: [20, 20],
+      shadowSize: [28, 28],
+      iconAnchor: [16, 24],
       shadowAnchor: [12, 32],
-      popupAnchor: [-2, -32]
+      popupAnchor: [-5, -28]
     }
   });
   return IconMarkerBase;