New text

Now getting only the current season's observations on the front page

VIPSWeb/static/js/frontpage.js

@@ -66,7 +66,7 @@ var filteredObservations;
 function cacheObservations()
 {
 	//$.getJSON(settings.vipslogicProtocol + "://" + settings.vipslogicServerName + "/rest/observation/broadcast/list/" + settings.vipsOrganizationId, function( json ) {
-	$.getJSON("/vipslogicproxy/rest/observation/broadcast/list/" + settings.vipsOrganizationId, function( json ) {
+	$.getJSON("/vipslogicproxy/rest/observation/broadcast/list/" + settings.vipsOrganizationId + "?season=" + getCurrentYear(), function( json ) {
 		allObservations = json;
 		//console.log(allObservations);
 		filterObservations();

VIPSWeb/static/js/util.js

@@ -75,6 +75,12 @@ function setMomentToMidnight(momentObj)
 	return momentObj.hour(0).minute(0).second(0).millisecond(0);
 }
 
+function getCurrentYear()
+{
+	return getSystemTime().year();
+	
+}
+
 /**
  * Returns the computed CSS display of the element. Handling both IE
  * and the normal browsers

observations/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-13 15:02-0700\n"
+"POT-Creation-Date: 2017-03-14 16:07-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,11 +51,7 @@ msgid "Observation was not quantified"
 msgstr ""
 
 #: templates/observations/detail.html:116
-msgid "Location is hidden"
-msgstr ""
-
-#: templates/observations/detail.html:117
-msgid "The observer has requested that the location is hidden"
+msgid "Map view not available"
 msgstr ""
 
 #: templates/observations/index.html:25 templates/observations/index.html:28

observations/locale/nb/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-13 15:02-0700\n"
+"POT-Creation-Date: 2017-03-14 16:07-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,12 +55,8 @@ msgid "Observation was not quantified"
 msgstr "Observasjonen ble ikke kvantifisert"
 
 #: templates/observations/detail.html:116
-msgid "Location is hidden"
-msgstr "Plasseringen er skjult"
-
-#: templates/observations/detail.html:117
-msgid "The observer has requested that the location is hidden"
-msgstr "Observatøren har bedt om at plasseringen skal være skjult"
+msgid "Map view not available"
+msgstr "Kartvisning ikke tilgjengelig"
 
 #: templates/observations/index.html:25
 #: templates/observations/index.html:28

observations/locale/zh_CN/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-13 15:02-0700\n"
+"POT-Creation-Date: 2017-03-14 16:07-0700\n"
 "PO-Revision-Date: 2016-10-27 11:26+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -50,11 +50,7 @@ msgid "Observation was not quantified"
 msgstr "观测没有定量化"
 
 #: templates/observations/detail.html:116
-msgid "Location is hidden"
-msgstr ""
-
-#: templates/observations/detail.html:117
-msgid "The observer has requested that the location is hidden"
+msgid "Map view not available"
 msgstr ""
 
 #: templates/observations/index.html:25 templates/observations/index.html:28

observations/templates/observations/detail.html

@@ -113,9 +113,7 @@
 	
 	function renderLocationIsHiddenMessage(){
 		document.getElementById("observationViewMap").parentNode.innerHTML =
-			"<h2>{% trans "Location is hidden" %}</h2>" +
-			"<p>{% trans "The observer has requested that the location is hidden" %}</p>" +
-			"<p><img class='img-responsive' src='{% static "observations/images/globe.png" %}'/></p>";
+			"<h2>{% trans "Map view not available" %}</h2>";
 	}
 </script>
 {% endblock %}