subdomain cities and combo picker

DEPLOYMENT.md

@@ -0,0 +1,22 @@
+##Municipality Index File
+The municipality index file resides in "data/index.js", and has some needed
+information about each municipality.
+
+Mandatory fields:
++ "display" - the Hebrew (or whatever) display name for the municipality
+
+Optional fields:
++ "server" - the base url for the server that hosts this municipality's plans.
+  If not defined it is "http://opentaba-server-<muni-name>.herokuapp.com/"
++ "center" - the center point of the municipality's gush map
++ "bounds" - the boundaries to the municipality. the user will not be able
+  to go past these.
++ "file" - path in the repository to the municipality's gush map.
+  If not defined it is "https://api.github.com/repos/niryariv/israel_gushim/contents/<muni_name>.topojson"
+  This file will be downloaded using Github's contents API, so it must not 
+  exceed 1MB in size. Files from other static hosts will probably be loaded fine
+  as long as the "Accept" header is ignored.
++ "fb_link" - link to the municipality's facebook page.
+  If not defined the facebook icon will open a "share on facebook" window
++ "twitter_link" - link to the municipality's twitter page.
+  If not defined the twitter icon will open a "tweet" window

README.md

@@ -1 +1 @@
-[![Build Status](https://travis-ci.org/niryariv/opentaba-client.png?branch=master)](https://travis-ci.org/niryariv/opentaba-client)Client code for OpenTaba - details will arrive soon, but the code is pretty simple to understand.If you came looking for the server side of opentaba It's [here](https://github.com/niryariv/opentaba-server).##Testing:see [what's needed](tests/testing.md) with testing.##Want to help?look at the issues. Lots of work here 
+[![Build Status](https://travis-ci.org/niryariv/opentaba-client.png?branch=master)](https://travis-ci.org/niryariv/opentaba-client)Client code for OpenTaba - details will arrive soon, but the code is pretty simple to understand.If you came looking for the server side of opentaba It's [here](https://github.com/niryariv/opentaba-server).##Testingsee [what's needed](tests/testing.md) with testing.##Production###ArchitectureThe production environment is made up of a github pages site per municipality, all being updated from onemain repository's master branch: [niryariv/opentaba-client](http://github.com/niryariv/opentaba-client/).This is done mainly to support different subdomains for different municipalities, but also to providethe ability to modify certain municipalities' sites without modifying all of them.###MaintenanceMaintenance is done using [fabric](http://fabfile.org), by activating different tasks defined in fabfile.py (for a list of all tasks, run `fab -l`, and for details about a specific task run `fab -d <task-name>`)To execute a task, run: `fab task-name:arg1,arg2...` or `fab task-name:arg1=val1,arg2=val2...`For step-by-step instructions on how to add a new municipality, check out [opentaba-server's Deployment Readme](http://github.com/niryariv/opentaba-server/blob/master/DEPLOYMENT.md#deploy-a-new-municipality)For information about the municipality index file's syntax, check out [The Deployment Readme](DEPLOYMENT.md)Main tasks:+ create_site (site_name) : create a new github repo, add a new remote to the local git repository for the new repo,   push (deploy) only to gh_pages branch, and edit the new repository's CNAME file for subdomain attaching.+ delete_site (site_name) : delete a github repository and remove it from the local git repository's remotes.+ deploy_client_all () : push all changes done in the local repository to all remote repositories defined in the   remote "all_sites".##Want to help?look at the issues. Lots of work here 

app.js

@@ -1,6 +1,5 @@
  // deprecating, replacing with serverless mode
 var RUNNING_LOCAL = (document.location.host.indexOf('localhost') > -1 || document.location.host.indexOf('127.0.0.1') > -1 || document.location.protocol == 'file:');
-var API_URL = RUNNING_LOCAL ? 'http://0.0.0.0:5000/' : 'http://opentaba-server.herokuapp.com/'; 
 
 // get the requested url. we do this because the subdomains will just be frames redirecting to the main domain, and since we
 // can't do cross-site with them we can't just use parent.location
@@ -16,6 +15,8 @@ if (muni == undefined) {
     muni = municipalities['jerusalem'];
 }
 
+var API_URL = RUNNING_LOCAL ? 'http://0.0.0.0:5000/' : (muni.server == undefined) ? 'http://opentaba-server-' + muni_name + '.herokuapp.com/' : muni.server;
+
 var gushim;
 var gushimLayer;
 leafletPip.bassackwards = true;
@@ -176,6 +177,9 @@ function get_gush_by_addr(addr) {
 					if (gid && gid.length > 0) {
 						get_gush(gid[0].gushid);
 						var pp = L.popup().setLatLng([lat, lon]).setContent('<b>' + addr + '</b>').openOn(map);
+
+                        // show search note after a successful search
+                        $('#search-note-p').show();
 					} else {
 						$('#search-error-p').html('לא נמצא גוש התואם לכתובת'); // TODO: when enabling multiple cities change the message to point users to try a differenct city
 					}
@@ -272,6 +276,7 @@ $(document).ready(function(){
 		function() {
 			$('#scrobber').show();
 			$('#search-error-p').html('');
+            $('#search-note-p').hide();
 
 			var search_val = $('#search-text').val();
 
@@ -281,7 +286,7 @@ $(document).ready(function(){
 				var result = find_gush(parseInt(search_val));
 				if (result)
 					get_gush(parseInt(search_val));
-				else
+                else
 					$('#search-error-p').html('גוש מספר ' + search_val + ' לא נמצא במפה');
 
 				$('#scrobber').hide(); 
@@ -318,7 +323,7 @@ $(document).ready(function(){
 });
 
 
-var map = L.map('map', { scrollWheelZoom: true, attributionControl: false }).setView(muni.center, DEFAULT_ZOOM);
+var map = L.map('map', { scrollWheelZoom: true, attributionControl: false });
 
 // tile_url = 'http://{s}.tile.cloudmade.com/424caca899ea4a53b055c5e3078524ca/997/256/{z}/{x}/{y}.png';
 // tile_url = 'http://{s}.tile.osm.org/{z}/{x}/{y}.png';
@@ -334,10 +339,11 @@ L.tileLayer(tile_url, {
 L.control.locate({position: 'topleft', keepCurrentZoomLevel: true}).addTo(map);
 
 $.ajax({
-	url: muni.file,
+	url: (muni.file == undefined) ? 'https://api.github.com/repos/niryariv/israel_gushim/contents/' + muni_name + '.topojson' : muni.file,
+    headers: { Accept: 'application/vnd.github.raw' },
 	dataType: 'json'
 }).done(function(res) {
-	gushim = topojson.feature(res, res.objects.gushim).features;
+	gushim = topojson.feature(res, res.objects[muni_name]).features;
 
 	gushimLayer = L.geoJson(gushim,
 		{
@@ -349,6 +355,10 @@ $.ajax({
 			}
 		}
 	).addTo(map);
+
+    // set center and boundaries as defined in the index.js file or according to the gushimLayer
+    map.setView((muni.center == undefined) ? gushimLayer.getBounds().getCenter() : muni.center, DEFAULT_ZOOM);
+    map.setMaxBounds((muni.bounds == undefined) ? gushimLayer.getBounds() : muni.bounds);
 
 	// if the direct gush address mapping was used go ahead and jump to the wanted gush
 	if (got_gushim_delegate) {

css/stylesheet.css

@@ -26,23 +26,23 @@ body{
 
 @font-face {
     font-family: 'Alef';
-    src: url('font/Alef-bold.eot');
-    src: url('font/Alef-bold.eot?#iefix') format('embedded-opentype'),
-         url('font/Alef-bold.woff') format('woff'),
-         url('font/Alef-bold.ttf') format('truetype'),
-         url('font/Alef-bold.svg#alefbold') format('svg');
+    src: url('//fonts.gstatic.com/ea/alefhebrew/v4/Alef-Bold.eot');
+    src: url('//fonts.gstatic.com/ea/alefhebrew/v4/Alef-Bold.eot?#iefix') format('embedded-opentype'),
+         url('//fonts.gstatic.com/ea/alefhebrew/v4/Alef-Bold.woff2') format('woff2'),
+         url('//fonts.gstatic.com/ea/alefhebrew/v4/Alef-Bold.woff') format('woff'),
+         url('//fonts.gstatic.com/ea/alefhebrew/v4/Alef-Bold.ttf') format('truetype');
     font-weight: bold;
     font-style: normal;
 
 }
 
 @font-face {
     font-family: 'Alef';
-    src: url('font/Alef-regular.eot');
-    src: url('font/Alef-regular.eot?#iefix') format('embedded-opentype'),
-         url('font/Alef-regular.woff') format('woff'),
-         url('font/Alef-regular.ttf') format('truetype'),
-         url('font/Alef-regular.svg#alefregular') format('svg');
+    src: url('//fonts.gstatic.com/ea/alefhebrew/v4/Alef-Regular.eot');
+    src: url('//fonts.gstatic.com/ea/alefhebrew/v4/Alef-Regular.eot?#iefix') format('embedded-opentype'),
+         url('//fonts.gstatic.com/ea/alefhebrew/v4/Alef-Regular.woff2') format('woff2'),
+         url('//fonts.gstatic.com/ea/alefhebrew/v4/Alef-Regular.woff') format('woff'),
+         url('//fonts.gstatic.com/ea/alefhebrew/v4/Alef-Regular.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 

data/contrib/README.md

@@ -1 +1 @@
-###Contributed gushim mapsThese are gushim maps contributed to the project by various sources.Original versions are in original directory.
+###Contributed gushim mapsThese are gushim maps contributed to the project by various sources.Only original versions are kept here.