Fix/queueing multiple requests

.gitignore

@@ -1,4 +1,5 @@
 
+*.DS_Store
 .project
 
 *.name

Dockerfile

@@ -1,3 +1,9 @@
 FROM nginx:stable
+ENV VFB_MAIN_SERVER=v2.virtualflybrain.org
+ENV VFB_PDB_SERVER=pdb.virtualflybrain.org
+ENV VFB_OWL_SERVER=owl.virtualflybrain.org
 COPY html /usr/share/nginx/html
-COPY default.conf /etc/nginx/conf.d/default.conf
+COPY default.conf /etc/nginx/conf.d/default.conf
+RUN sed -i "s|VFB_MAIN_SERVER|${VFB_MAIN_SERVER}|g" /usr/share/nginx/html/index.html
+RUN sed -i "s|VFB_PDB_SERVER|${VFB_PDB_SERVER}|g" /usr/share/nginx/html/conf/vfb.xmi
+RUN sed -i "s|VFB_OWL_SERVER|${VFB_OWL_SERVER}|g" /usr/share/nginx/html/conf/vfb.xmi

ISSUE_TEMPLATE.md

@@ -0,0 +1,30 @@
+##### Description of the problem
+
+
+
+
+
+This form is for VFB2 bug reports and feature requests.
+
+If you need help, please use the [forum](https://groups.google.com/forum/#!forum/vfb-suport).
+
+Describe the bug or feature request in detail.
+
+Always include a code snippet, screenshots, and any relevant data to help us understand your issue.
+
+##### Browser
+
+- [x] All of them
+- [ ] Chrome
+- [ ] Firefox
+- [ ] Internet Explorer
+
+##### OS
+
+- [x] All of them
+- [ ] Windows
+- [ ] macOS
+- [ ] Linux
+- [ ] Android
+- [ ] iOS
+

README.md

@@ -1 +1,8 @@
-# VFB2-draft
+[![Docker Hub](https://www.shippable.com/assets/images/logos/docker-hub.jpg)](https://hub.docker.com/r/virtualflybrain/vfb2/)[![Build Status](https://travis-ci.org/VirtualFlyBrain/VFB2.svg?branch=master)](https://travis-ci.org/VirtualFlyBrain/VFB2)
+
+# VFB2
+
+Main Server for VFB version 2.x
+
+This version is under development so most documentation is can be found in https://github.com/VirtualFlyBrain/VFB 
+

html/Feedback.htm

@@ -1,125 +1,91 @@
-<jsp:include page="/jsp/includes/homeHead.jsp" >
-	<jsp:param name="navpath" value="The VFB Site@/site/vfb_site/home.htm|Feedback@ " />
-	<jsp:param name="title" value="Feedback" />
-</jsp:include>
 
 
-
-<div class="row">
-
-	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
-
-		<div class="well">
-
 	  	<h2>Help us improve the site</h2>
 
-				<script>var theURL = window.location.protocol + "//" + window.location.host + "/" + window.location.pathname;</script>
-				<p>We really appreciate any feedback you could give us.</p>
-				<p>You can simply <b><span id="emailUs"></span>
-
-
-
 				<script>
-					$(document).ready( function () {
-						window.SupDetail = {};
-						var nVer = navigator.appVersion;
-						var nAgt = navigator.userAgent;
-						var browserName  = navigator.appName;
-						var fullVersion  = ''+parseFloat(navigator.appVersion);
-						var majorVersion = parseInt(navigator.appVersion,10);
-						var nameOffset,verOffset,ix;
-						var browserSize = String($(window).width()) + ',' + String($(window).height());
-						SupDetail.cookies = "";
-
-						// In Opera, the true version is after "Opera" or after "Version"
-						if ((verOffset=nAgt.indexOf("Opera"))!=-1) {
-						 browserName = "Opera";
-						 fullVersion = nAgt.substring(verOffset+6);
-						 if ((verOffset=nAgt.indexOf("Version"))!=-1)
-						   fullVersion = nAgt.substring(verOffset+8);
-						}
-						// In MSIE, the true version is after "MSIE" in userAgent
-						else if ((verOffset=nAgt.indexOf("MSIE"))!=-1) {
-						 browserName = "Microsoft Internet Explorer";
-						 fullVersion = nAgt.substring(verOffset+5);
-						}
-						// In Chrome, the true version is after "Chrome"
-						else if ((verOffset=nAgt.indexOf("Chrome"))!=-1) {
-						 browserName = "Chrome";
-						 fullVersion = nAgt.substring(verOffset+7);
-						}
-						// In Safari, the true version is after "Safari" or after "Version"
-						else if ((verOffset=nAgt.indexOf("Safari"))!=-1) {
-						 browserName = "Safari";
-						 fullVersion = nAgt.substring(verOffset+7);
-						 if ((verOffset=nAgt.indexOf("Version"))!=-1)
-						   fullVersion = nAgt.substring(verOffset+8);
-						}
-						// In Firefox, the true version is after "Firefox"
-						else if ((verOffset=nAgt.indexOf("Firefox"))!=-1) {
-						 browserName = "Firefox";
-						 fullVersion = nAgt.substring(verOffset+8);
-						}
-						// In most other browsers, "name/version" is at the end of userAgent
-						else if ( (nameOffset=nAgt.lastIndexOf(' ')+1) <
-								  (verOffset=nAgt.lastIndexOf('/')) )
-						{
-						 browserName = nAgt.substring(nameOffset,verOffset);
-						 fullVersion = nAgt.substring(verOffset+1);
-						 if (browserName.toLowerCase()==browserName.toUpperCase()) {
-						  browserName = navigator.appName;
-						 }
-						}
-						// trim the fullVersion string at semicolon/space if present
-						if ((ix=fullVersion.indexOf(";"))!=-1)
-						   fullVersion=fullVersion.substring(0,ix);
-						if ((ix=fullVersion.indexOf(" "))!=-1)
-						   fullVersion=fullVersion.substring(0,ix);
-
-						majorVersion = parseInt(''+fullVersion,10);
-						if (isNaN(majorVersion)) {
-						 fullVersion  = ''+parseFloat(navigator.appVersion);
-						 majorVersion = parseInt(navigator.appVersion,10);
-						}
-						SupDetail.sysDetail = navigator.userAgent + ' Size:[' + browserSize + ']';
-						SupDetail.sysDetailURL = encodeURIComponent(SupDetail.sysDetail);
-						SupDetail.cleanURL = encodeURIComponent('${param.url}');
-
-						SupDetail.cookies = returnCleanData();
-						SupDetail.cookiesURL = encodeURIComponent(SupDetail.cookies);
-
-						$('#systemDetails').text(SupDetail.sysDetail);
-						$('#cookieDetails').text(SupDetail.cookies);
-						if (store.enabled){
-							$('#dataStore').text('LocalData:');
-							mail3("support","virtualflybrain",1,"?subject=Feedback about " + SupDetail.cleanURL + " on " + SupDetail.sysDetail + " LocalData:" + SupDetail.cookiesURL,"email us", "emailUs");
-						}else{
-							mail3("support","virtualflybrain",1,"?subject=Feedback about " + SupDetail.cleanURL + " on " + SupDetail.sysDetail + " Cookies:" + SupDetail.cookiesURL,"email us", "emailUs");
-						}
-					});
-				</script></b> with details.</p>
+					var theURL = window.thePreviousURL;
+					$('#feedback_url')[0].innerHTML = theURL;
+					window.SupDetail = {};
+					var nVer = navigator.appVersion;
+					var nAgt = navigator.userAgent;
+					var browserName  = navigator.appName;
+					var fullVersion  = ''+parseFloat(navigator.appVersion);
+					var majorVersion = parseInt(navigator.appVersion,10);
+					var nameOffset,verOffset,ix;
+					var browserSize = String($(window).width()) + ',' + String($(window).height());
+					SupDetail.cookies = "";
+
+					// In Opera, the true version is after "Opera" or after "Version"
+					if ((verOffset=nAgt.indexOf("Opera"))!=-1) {
+					 browserName = "Opera";
+					 fullVersion = nAgt.substring(verOffset+6);
+					 if ((verOffset=nAgt.indexOf("Version"))!=-1)
+					   fullVersion = nAgt.substring(verOffset+8);
+					}
+					// In MSIE, the true version is after "MSIE" in userAgent
+					else if ((verOffset=nAgt.indexOf("MSIE"))!=-1) {
+					 browserName = "Microsoft Internet Explorer";
+					 fullVersion = nAgt.substring(verOffset+5);
+					}
+					// In Chrome, the true version is after "Chrome"
+					else if ((verOffset=nAgt.indexOf("Chrome"))!=-1) {
+					 browserName = "Chrome";
+					 fullVersion = nAgt.substring(verOffset+7);
+					}
+					// In Safari, the true version is after "Safari" or after "Version"
+					else if ((verOffset=nAgt.indexOf("Safari"))!=-1) {
+					 browserName = "Safari";
+					 fullVersion = nAgt.substring(verOffset+7);
+					 if ((verOffset=nAgt.indexOf("Version"))!=-1)
+					   fullVersion = nAgt.substring(verOffset+8);
+					}
+					// In Firefox, the true version is after "Firefox"
+					else if ((verOffset=nAgt.indexOf("Firefox"))!=-1) {
+					 browserName = "Firefox";
+					 fullVersion = nAgt.substring(verOffset+8);
+					}
+					// In most other browsers, "name/version" is at the end of userAgent
+					else if ( (nameOffset=nAgt.lastIndexOf(' ')+1) <
+							  (verOffset=nAgt.lastIndexOf('/')) )
+					{
+					 browserName = nAgt.substring(nameOffset,verOffset);
+					 fullVersion = nAgt.substring(verOffset+1);
+					 if (browserName.toLowerCase()==browserName.toUpperCase()) {
+					  browserName = navigator.appName;
+					 }
+					}
+					// trim the fullVersion string at semicolon/space if present
+					if ((ix=fullVersion.indexOf(";"))!=-1)
+					   fullVersion=fullVersion.substring(0,ix);
+					if ((ix=fullVersion.indexOf(" "))!=-1)
+					   fullVersion=fullVersion.substring(0,ix);
+
+					majorVersion = parseInt(''+fullVersion,10);
+					if (isNaN(majorVersion)) {
+					 fullVersion  = ''+parseFloat(navigator.appVersion);
+					 majorVersion = parseInt(navigator.appVersion,10);
+					}
+					$('#feedback_systemDetails')[0].innerHTML = navigator.userAgent + ' Size:[' + browserSize + ']';
+					$('#feedback_githubissue')[0].href = $('#feedback_githubissue')[0].href + 'Referring%20page%3A%20' + encodeURIComponent(theURL) + '%0ASystem%20details%3A%20' + encodeURIComponent(navigator.userAgent) + encodeURIComponent(' Size:[' + browserSize + ']');
+				</script>
+				<p>We really appreciate any feedback you could give us.</p>
+				<p>You can simply <b><span id="emailUs"></span></b>email us (support@virtualflybrain.org) with details.</p>
 
 				<p>Alternatively, as VFB is an opensource project,
 				you can engage directly with our developer community on GitHub
-				[<a href="https://github.com/VirtualFlyBrain/VFB" target="_blank">VirtualFlyBrain/VFB</a>].</p>
+				[<a href="https://github.com/VirtualFlyBrain/VFB2" target="_blank">VirtualFlyBrain/VFB2</a>].</p>
 				<p>If you have a GitHub account you can easily raise a new issue:
-				<a class="btn btn-xs btn-warning" href="https://github.com/VirtualFlyBrain/VFB/issues/new?body=%0A%0A%0A%0A%0A%0ASupport%20info%3A%0A"
-				onclick="location.href=this.href+SupDetail.cleanURL+'%0A'+SupDetail.sysDetailURL+'%0A'+SupDetail.cookiesURL;return false;" title="Report an issue via GitHub" target="_blank">
+				<a id="feedback_githubissue" class="btn btn-xs btn-warning" href="https://github.com/VirtualFlyBrain/VFB2/issues/new?body=%0A%0A%0A%0A%0A%0ASupport%20info%3A%0A"
+			    title="Report an issue via GitHub" target="_blank">
 				Create GitHub Issue</a>
 				</p>
 				<p> This could simply be a question or a new feature request, but if you have found a bug we missed please copy in
 				the page address and system details listed below to help us resolve any issue as quickly as possible.
-				<br /><small>Note: Both the email and issue links above should do this automatically for you.</small></p>
+				</p>
 
 				<div style="border: 1px solid green;">
-					<b>Referring page:</b> <small>${param.url}</small><br />
-					<b>System details:</b> <small id="systemDetails"></small><br />
-					<b id="dataStore">Cookies:</b> <small id="cookieDetails"></small><br />
+					<b>Referring page:</b> <small id="feedback_url"></small><br />
+					<b>System details:</b> <small id="feedback_systemDetails"></small><br />
 				</div>
 				<p>Thank you for your help.</p>
-			</div>
-	</div> <!-- center_wide -->
-</div>
-
-
-<jsp:include page="/jsp/includes/homeFoot.jsp" />
+