You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by rl...@apache.org on 2021/04/24 15:25:41 UTC
svn commit: r1889150 - in /comdev/nearby_people/nearby: templates/404.html
templates/500.html templates/base.html templates/base_map.html
templates/people.html templates/pick_place.html urls.py
Author: rlenferink
Date: Sat Apr 24 15:25:41 2021
New Revision: 1889150
URL: http://svn.apache.org/viewvc?rev=1889150&view=rev
Log:
Updated code alignment (tabs -> spaces)
Modified:
comdev/nearby_people/nearby/templates/404.html
comdev/nearby_people/nearby/templates/500.html
comdev/nearby_people/nearby/templates/base.html
comdev/nearby_people/nearby/templates/base_map.html
comdev/nearby_people/nearby/templates/people.html
comdev/nearby_people/nearby/templates/pick_place.html
comdev/nearby_people/nearby/urls.py
Modified: comdev/nearby_people/nearby/templates/404.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/nearby/templates/404.html?rev=1889150&r1=1889149&r2=1889150&view=diff
==============================================================================
--- comdev/nearby_people/nearby/templates/404.html (original)
+++ comdev/nearby_people/nearby/templates/404.html Sat Apr 24 15:25:41 2021
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>The Nearby Apache People - Page Not Found</title>
+ <title>The Nearby Apache People - Page Not Found</title>
<link media="screen, projection" type="text/css" href="https://community.apache.org/style/compressed.css" rel="stylesheet">
<link media="screen, projection" type="text/css" href="https://community.apache.org/style/style.css" rel="stylesheet">
</head>
@@ -13,12 +13,12 @@
<hr class="space col"/>
<div class="block">
<div class="column span-24">
- <div id="header">
+ <div id="header">
<h1>We were unable to find your page</h1>
<p class="alt">
Brought to you by the <a href="https://community.apache.org">Apache Community Development Project</a>.
</p>
- </div>
+ </div>
</div>
</div>
<div id="menu">
@@ -33,17 +33,17 @@
</tr>
</table>
</div>
-
- <div id="content">
+
+ <div id="content">
<p class="highlight">Please see the links below for where you might wish to visit instead:</p>
- <ul>
- <li><a href="https://community.apache.org/">The Apache Community Development Project</a></li>
- <li><a href="/">Search for nearby people</a></li>
- <li><a href="/pick_place/?type=lm">Search for Local Mentors</a></li>
- <li><a href="/pick_place/?type=sp">Search for Apache Speakers</a></li>
- </ul>
- </div>
- </div>
+ <ul>
+ <li><a href="https://community.apache.org/">The Apache Community Development Project</a></li>
+ <li><a href="/">Search for nearby people</a></li>
+ <li><a href="/pick_place/?type=lm">Search for Local Mentors</a></li>
+ <li><a href="/pick_place/?type=sp">Search for Apache Speakers</a></li>
+ </ul>
+ </div>
+ </div>
</div>
</body>
</html>
Modified: comdev/nearby_people/nearby/templates/500.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/nearby/templates/500.html?rev=1889150&r1=1889149&r2=1889150&view=diff
==============================================================================
--- comdev/nearby_people/nearby/templates/500.html (original)
+++ comdev/nearby_people/nearby/templates/500.html Sat Apr 24 15:25:41 2021
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>The Nearby Apache People App is Unavailable</title>
+ <title>The Nearby Apache People App is Unavailable</title>
<link media="screen, projection" type="text/css" href="https://community.apache.org/style/compressed.css" rel="stylesheet">
<link media="screen, projection" type="text/css" href="https://community.apache.org/style/style.css" rel="stylesheet">
</head>
@@ -13,12 +13,12 @@
<hr class="space col"/>
<div class="block">
<div class="column span-24">
- <div id="header">
+ <div id="header">
<h1>The Nearby Apache People is Unavailable</h1>
<p class="alt">
Brought to you by the <a href="https://community.apache.org">Apache Community Development Project</a>.
</p>
- </div>
+ </div>
</div>
</div>
<div id="menu">
@@ -33,11 +33,11 @@
</tr>
</table>
</div>
-
- <div id="content">
+
+ <div id="content">
<p class="highlight">The nearby people application will be back online shortly, sorry for the inconvenience</p>
- </div>
- </div>
+ </div>
+ </div>
</div>
</body>
</html>
Modified: comdev/nearby_people/nearby/templates/base.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/nearby/templates/base.html?rev=1889150&r1=1889149&r2=1889150&view=diff
==============================================================================
--- comdev/nearby_people/nearby/templates/base.html (original)
+++ comdev/nearby_people/nearby/templates/base.html Sat Apr 24 15:25:41 2021
@@ -18,7 +18,7 @@
<div id="header">
<h1>Nearby Apache People</h1>
<p class="alt">
- Brought to you by the <a href="https://community.apache.org">Apache Community Development Project</a>.
+ Brought to you by the <a href="https://community.apache.org">Apache Community Development Project</a>.
</p>
</div>
</div>
@@ -26,28 +26,28 @@
<div id="menu">
<table border="0" cellpadding="2" cellspacing="0" width="100%">
<tr class="topBar">
- <td align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
- <a href="/" title="Community Development Apps">Community Development Apps</a> > <a href="/pick_place" title="Find People">Find People</a>
- </td>
- <td align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+ <td align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+ <a href="/" title="Community Development Apps">Community Development Apps</a> > <a href="/pick_place" title="Find People">Find People</a>
+ </td>
+ <td align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
<a href="https://community.apache.org/">Apache Community Development</a> | <a href="https://lists.apache.org/list.html?dev@community.apache.org">Mailling List</a>
- </td>
+ </td>
</tr>
</table>
</div>
-
+
<div id="content">
<p class="highlight">{% block heading %}{% endblock %}</p>
- {% if messages %}
- <ul class="messages">
- {% for message in messages %}
- <li>{{ message }}</li>
- {% endfor %}
- </ul>
- {% endif %}
-
- {% block content %}
- {% endblock %}
+ {% if messages %}
+ <ul class="messages">
+ {% for message in messages %}
+ <li>{{ message }}</li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+
+ {% block content %}
+ {% endblock %}
</div>
</div>
</div>
Modified: comdev/nearby_people/nearby/templates/base_map.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/nearby/templates/base_map.html?rev=1889150&r1=1889149&r2=1889150&view=diff
==============================================================================
--- comdev/nearby_people/nearby/templates/base_map.html (original)
+++ comdev/nearby_people/nearby/templates/base_map.html Sat Apr 24 15:25:41 2021
@@ -28,7 +28,7 @@ function createMarker(map,name,lat,lng,l
}
msg = msg + " <ul>";
for (var i = 0; i < projects.length; i++) {
- msg = msg + "<li>" + projects[i] + "</li>";
+ msg = msg + "<li>" + projects[i] + "</li>";
};
msg = msg + " </ul>";
if (email != "None") {
@@ -43,15 +43,15 @@ function createMarker(map,name,lat,lng,l
marker.addListener("click", function() {
infoWindow.open(map, marker);
});
-
+
return marker;
}
function showDetail(uid) {
- if (map.getZoom() < 9) {
+ if (map.getZoom() < 9) {
map.setZoom(9);
- }
- map.panTo(markers[uid].position);
+ }
+ map.panTo(markers[uid].position);
google.maps.event.trigger(markers[uid], "click");
}
@@ -62,9 +62,9 @@ function showDetail(uid) {
#map.col1map { height: 400px; width: 80%; }
#map.col2map { width:500px; height:500px; float: left }
- #people { float:left; width:300px; background:#eee; list-style:none; padding:0; }
- #people tr { padding:5px; }
- #people tr:hover { background:#FFF; color:#ff;}
+ #people { float:left; width:300px; background:#eee; list-style:none; padding:0; }
+ #people tr { padding:5px; }
+ #people tr:hover { background:#FFF; color:#ff;}
</style>
{% block initmap %}
Modified: comdev/nearby_people/nearby/templates/people.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/nearby/templates/people.html?rev=1889150&r1=1889149&r2=1889150&view=diff
==============================================================================
--- comdev/nearby_people/nearby/templates/people.html (original)
+++ comdev/nearby_people/nearby/templates/people.html Sat Apr 24 15:25:41 2021
@@ -46,27 +46,27 @@ $(document).ready(function(){
{% block content %}
{% if people %}
- {% if large_distance %}
- <p>Sorry, there isn't anyone all that near to you. Below is a
- list of people you may wish to visit when travelling futher
- afield.</p>
- {% endif %}
+ {% if large_distance %}
+ <p>Sorry, there isn't anyone all that near to you. Below is a
+ list of people you may wish to visit when travelling futher
+ afield.</p>
+ {% endif %}
- <table id="people">
- {% for dist, person in people %}
- <tr>
- <td><a href="javascript:showDetail('{{person.uid}}')">{{person.name}}</a></td>
- <td>{{dist|distanceformat}}</td>
- </tr>
- {% endfor %}
- </table>
+ <table id="people">
+ {% for dist, person in people %}
+ <tr>
+ <td><a href="javascript:showDetail('{{person.uid}}')">{{person.name}}</a></td>
+ <td>{{dist|distanceformat}}</td>
+ </tr>
+ {% endfor %}
+ </table>
- <div id="map" class="col2map"></div>
-
+ <div id="map" class="col2map"></div>
+
{% else %}
- <p>Sorry, there's no-one near you :(</p>
- <p>Maybe <a href="/pick_place/">try somewhere else?</a></p>
- <p><i>Why not try searching for people near where you may be visiting
+ <p>Sorry, there's no-one near you :(</p>
+ <p>Maybe <a href="/pick_place/">try somewhere else?</a></p>
+ <p><i>Why not try searching for people near where you may be visiting
when on holiday, or next time you're travelling for work?</i></p>
{% endif %}
Modified: comdev/nearby_people/nearby/templates/pick_place.html
URL: http://svn.apache.org/viewvc/comdev/nearby_people/nearby/templates/pick_place.html?rev=1889150&r1=1889149&r2=1889150&view=diff
==============================================================================
--- comdev/nearby_people/nearby/templates/pick_place.html (original)
+++ comdev/nearby_people/nearby/templates/pick_place.html Sat Apr 24 15:25:41 2021
@@ -7,57 +7,57 @@
<style type="text/css">
.map {
- width: 300px;
- height: 150px;
- display: none;
+ width: 300px;
+ height: 150px;
+ display: none;
}
</style>
<script type="text/javascript" charset="utf-8">
var places = new Array();
{% for p in places %}
places[{{forloop.counter0}}] = {
- 'name': '{{p.name}}', lat: {{p.latitude}}, lng: {{p.longitude}},
- 'id': 'map_{{forloop.counter}}',
+ 'name': '{{p.name}}', lat: {{p.latitude}}, lng: {{p.longitude}},
+ 'id': 'map_{{forloop.counter}}',
}
{% endfor %}
function drawMaps() {
- for(var i in places) {
- var p = places[i];
- var div = document.getElementById(p['id']);
+ for(var i in places) {
+ var p = places[i];
+ var div = document.getElementById(p['id']);
- div.style.display = "block";
- div.parentNode.style.marginBottom = "35px";
+ div.style.display = "block";
+ div.parentNode.style.marginBottom = "35px";
- var place = new google.maps.LatLng(p['lat'], p['lng']);
- var map = new google.maps.Map(div);
+ var place = new google.maps.LatLng(p['lat'], p['lng']);
+ var map = new google.maps.Map(div);
map.setZoom(8);
- map.panTo(place);
+ map.panTo(place);
- var m = new google.maps.Marker({
+ var m = new google.maps.Marker({
position: place,
title: p['name'],
map: map
- });
- }
+ });
+ }
}
</script>
{% if places %}
- <h3>We found several places with that name, we've sorted them by popularity</h3>
- <h4>Please tell us which one you want?</h4>
+ <h3>We found several places with that name, we've sorted them by popularity</h3>
+ <h4>Please tell us which one you want?</h4>
- <ul>
- {% for p in places %}
- <li><a href="/find_people/?latitude={{p.latitude}}&longitude={{p.longitude}}&type={{form.data.type}}&rows={{form.data.rows}}" title="{{p.latitude|floatformat:4}} {{p.longitude|floatformat:4}}">{{p.name}} ({{p.country}})</a><div id="map_{{forloop.counter}}" class="map"></div></li>
- {% endfor %}
- </ul>
+ <ul>
+ {% for p in places %}
+ <li><a href="/find_people/?latitude={{p.latitude}}&longitude={{p.longitude}}&type={{form.data.type}}&rows={{form.data.rows}}" title="{{p.latitude|floatformat:4}} {{p.longitude|floatformat:4}}">{{p.name}} ({{p.country}})</a><div id="map_{{forloop.counter}}" class="map"></div></li>
+ {% endfor %}
+ </ul>
{% else %}
{% if message %}
<p>{{message}}</p>
{% else %}
- <p>To begin, please enter your location.</p>
- {% endif %}
+ <p>To begin, please enter your location.</p>
+ {% endif %}
{% endif %}
<form action="/pick_place/" method="post">
@@ -68,13 +68,13 @@ function drawMaps() {
</form>
<script type="text/javascript" charset="utf-8">
- var t;
- $(document).ready(function(){
- t = setTimeout(function() {
- clearTimeout(t);
- drawMaps();
- }, 15*1000);
- });
+ var t;
+ $(document).ready(function(){
+ t = setTimeout(function() {
+ clearTimeout(t);
+ drawMaps();
+ }, 15*1000);
+ });
</script>
{% endblock %}
Modified: comdev/nearby_people/nearby/urls.py
URL: http://svn.apache.org/viewvc/comdev/nearby_people/nearby/urls.py?rev=1889150&r1=1889149&r2=1889150&view=diff
==============================================================================
--- comdev/nearby_people/nearby/urls.py (original)
+++ comdev/nearby_people/nearby/urls.py Sat Apr 24 15:25:41 2021
@@ -22,18 +22,18 @@ from pathlib import Path
BASE_DIR = Path(__file__).resolve().parent
urlpatterns = [
- path('', views.welcome),
- path('index.html', views.welcome),
- path('pick_place/', views.pick_place),
- path('find_people/', views.find_people),
+ path('', views.welcome),
+ path('index.html', views.welcome),
+ path('pick_place/', views.pick_place),
+ path('find_people/', views.find_people),
- # Old style JSON support, not template based
- path('find_people_json/', views.find_people_json),
+ # Old style JSON support, not template based
+ path('find_people_json/', views.find_people_json),
# Replacement for https://people.apache.org/map.html
- path('map/', views.all_people),
- path('map.html', views.all_people),
+ path('map/', views.all_people),
+ path('map.html', views.all_people),
# Map of all committers, filterable by when they joined
- path('map/years/', views.people_years),
+ path('map/years/', views.people_years),
]