Add partners logos

healthsites · Feb 12, 2018 · 1c17c7b · 1c17c7b
1 parent 34248f4
commit 1c17c7b
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 12 deletions.
diff --git a/django_project/core/base_static/img/cartong.png b/django_project/core/base_static/img/cartong.png
diff --git a/django_project/core/base_static/img/missing-maps.png b/django_project/core/base_static/img/missing-maps.png
diff --git a/django_project/frontend/templates/index.html b/django_project/frontend/templates/index.html
@@ -36,7 +36,7 @@
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet" type="text/css"
           media="screen, projection"/>
-    <link rel="shortcut icon" href="/static/img/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="static/img/favicon.ico" type="image/x-icon">
 
 
     {% stylesheet 'project' %}
@@ -51,7 +51,8 @@
 
     </head>
 
-<body class="body home" itemscope itemtype="https://schema.org/Organization">
+<body class="body home" itemscope itemtype="http://schema.org/Organization">
+<img src="http://healthsites.mashastudio.net/img/healthsites-fb.png" itemprop="image" width="0" height="0"/>
 <nav id="navbar-wrapper" class="navbar navbar-fixed-top masthead">
     <div class="container-fluid">
         <div class="navbar-header">
@@ -78,7 +79,7 @@
                     <i class="fa fa-google-plus"></i>
                 </a>
                 <a class="linkedin-href"
-                   href="https://www.linkedin.com/shareArticle?mini=true&url=https://healthsites.io&title=Healthsites&summary=Building%20a%20free,%20curated,%20canonical%20source%20of%20healthcare%20location%20data"
+                   href="https://www.linkedin.com/shareArticle?mini=true&url=http://healthsites.io&title=Healthsites&summary=Building%20a%20free,%20curated,%20canonical%20source%20of%20healthcare%20location%20data"
                    target="_blank">
                     <i class="fa fa-linkedin"></i>
                 </a>
@@ -113,6 +114,10 @@
                                                         value="place"><span></span><label class="option"
                                                                                           for="radio-healthsite">place</label>
                 </div>
+                <div class="option"><span></span><input type="radio" name="option" id="radio-what3words"
+                                                        value="what3words"><span></span><label class="option"
+                                                                                               for="radio-what3words">what3words</label>
+                </div>
             </div>
             <input id="search-box" type="search" name="q" placeholder="search..."><input type="submit" value="search">
         </form>
@@ -342,6 +347,8 @@ <h3>Partners</h3>
             <li><a href="https://www.ihf-fih.org/" target="_blank"><img src="{% static "img/ihf-logo.png" %}"/></a></li>
             <li><a href="https://hotosm.org/" target="_blank"><img src="{% static "img/hot-logo.png" %}"/></a></li>
             <li><a href="https://www.msf.org/" target="_blank"><img src="{% static "img/msf-logo.png" %}"/></a></li>
+            <li><a href="http://www.missingmaps.org" target="_blank"><img src="{% static "img/missing-maps.png" %}"/></a></li>
+            <li><a href="https://cartong.org/" target="_blank"><img src="{% static "img/cartong.png" %}"/></a></li>
         </ul>
     </div>
 </section>
@@ -404,10 +411,10 @@ <h3>Partners</h3>
 </footer>
 
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet-src.js"></script>
-<script type="text/javascript" src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="https://code.jquery.com/jquery-1.10.2.js"></script>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.7/d3.min.js"></script>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/c3/0.4.10/c3.min.js"></script>
-<script type="text/javascript" src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
+<script type="text/javascript" src="https://code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
 <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="https://cdn.jsdelivr.net/jquery.slick/1.5.7/slick.min.js"></script>
 <script type="text/javascript"
@@ -543,6 +550,9 @@ <h3>Partners</h3>
                 $(this).removeClass("ui-corner-top").addClass("ui-corner-all");
             }
         });
+
+        {# first init #}
+        gettingData("");
     });
 </script>
 <!--

diff --git a/django_project/frontend/views.py b/django_project/frontend/views.py
@@ -97,7 +97,7 @@ def search_place(request, place):
             result['northeast_lng'] = '%f' % northeast_lng
             result['southwest_lat'] = '%f' % southwest_lat
             result['southwest_lng'] = '%f' % southwest_lng
-        except:
+        except Exception:
             print 'getting place error'
     return result
 

diff --git a/django_project/localities/management/commands/generate_countries.py b/django_project/localities/management/commands/generate_countries.py
@@ -79,7 +79,7 @@ def handle(self, *args, **options):
                          country.geometry.coords[0]] +
                         [Polygon(coords) for coords in geometry.coords[0]]).geojson
                 country.polygon_geometry = geometry
-            except:
+            except Exception:
                 if 'MultiPolygon' not in geometry.geojson:
                     geometry = MultiPolygon(Polygon(geometry.coords[0])).geojson
                 else:

diff --git a/django_project/localities/tests/test_views.py b/django_project/localities/tests/test_views.py
@@ -101,7 +101,7 @@ def test_localitiesInfo_view(self):
         self.assertEqual(resp.status_code, 200)
 
         self.assertEqual(resp['Content-Type'], 'application/json')
-        self.assertGreaterEqual(len(resp.content), 478)
+        self.assertGreaterEqual(len(resp.content), 477)
 
     @skip('skip')
     def test_localitiesUpdate_form_get_no_user(self):

diff --git a/django_project/localities/utils.py b/django_project/localities/utils.py
@@ -179,7 +179,7 @@ def get_json_from_request(request):
                     is_valid = False
                     json['invalid_key'] = attribute.attribute.key
                     break
-            except:
+            except Exception:
                 pass
 
     json['is_valid'] = is_valid

diff --git a/django_project/localities/views.py b/django_project/localities/views.py
@@ -58,7 +58,7 @@ def _parse_request_params(self, request):
             data = request.GET.get('data')
             uuid = request.GET.get('uuid')
 
-        except:
+        except Exception:
             # return 404 if any of parameters are missing or not parsable
             raise Http404
 
@@ -217,7 +217,7 @@ def get_json_from_request(request):
         json[req[0].lower()] = req[1]
         try:
             Attribute.objects.get(key=req[0].lower())
-        except:
+        except Exception:
             if req[0] not in special_request:
                 tmp_changeset = Changeset.objects.create(
                     social_user=request.user
@@ -253,7 +253,7 @@ def get_json_from_request(request):
                     is_valid = False
                     json['invalid_key'] = attribute.attribute.key
                     break
-            except:
+            except Exception:
                 print 'except'
 
     json['is_valid'] = is_valid