Merge pull request #108 from gnieark/dev

Dev

Dockerfile

@@ -24,7 +24,7 @@ RUN cp /var/www/src/config.php.empty /var/www/src/config.php && \
     chmod +x /populate_mysql.sh && \
     chown -R www-data:www-data /var/www
     
-EXPOSE 80 3306
+EXPOSE 80
 
 ADD install.sql /install.sql
 RUN rm /run.sh

README.md

@@ -18,9 +18,9 @@ See dockerFile and associated scripts to understand what is needed.
 
 To test an image of bots arena with docker:
 
-  make
+    make
-  docker build .
+    docker build .
-  docker run --name hey -p 127.0.0.1:8080:80 DockerImageId
+    docker run --name hey -p 127.0.0.1:8080:80 DockerImageId
 
 For nginx Rewrite rules in server directive are:
 

html/testBotScripts/tron.html

@@ -25,7 +25,9 @@ section{margin: 0 auto; width: 90%;}
 article{float: right; width:70%;}
 aside{float:left;width:29%;}
 .playerBox{}
-.playerBox input, .playerBox select {width:100%;}
+.playerBox em {width: 100%;}
+.playerBox em label { width: 40%; text-align: right;}
+.playerBox em input,.playerBox em input, .playerBox em select {width:59%; float:right;}
 
 
 
@@ -42,6 +44,17 @@ function createElem(type,attributes){
     {elem.setAttribute(i,attributes[i]);}
     return elem;
 }
+
+function makeid(){
+    var text = "";
+    var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+    for( var i=0; i < 5; i++ )
+        text += possible.charAt(Math.floor(Math.random() * possible.length));
+
+    return text;
+}
+
 function changeRandom(index,newValue){
   if (newValue == "random" ){
     document.getElementById("posX" + index).className = "hidden";
@@ -52,53 +65,121 @@ function changeRandom(index,newValue){
   }
 
 }
+
 function changeTypePlayer(index,newValue){
   if (newValue == "Human") document.getElementById("botUrl" + index).className = "hidden";
   else document.getElementById("botUrl" + index).className = "";
 
 }
+
+function createElemWithLabel(type,attributes,labelTxt, id =''){
+  /*
+  * return an em element containing label and data like this:
+  * <em id='kjhjk'>
+  *	<label for="plop"> the text of blah blah </label>
+  *	<input type='someType' value='kjhjlkh' id='plop'/>
+  * </em>
+  */
+
+ if( id == ''){
+  var em = createElem ('em',{});
+ }else{
+  var em = createElem ('em',{'id':id});
+ }
+ 
+ if (typeof attributes['id'] !== 'undefined') {
+    var forId = attributes['id'];
+ }else{
+    var forId = makeid();
+ }
+ var label = createElem('label',{'for' : forId});
+ label.innerHTML = labelTxt;
+ em.appendChild(label);
+ var elem = createElem(type,attributes);
+ if (typeof attributes['id'] !== 'undefined') {
+  em.setAttribute('id',forId);
+ }
+ em.appendChild(elem);
+ return em;
+
+}
+function createLineSelect(labelTxt,arrayOptions,attributes){
+  //attributes are the select 's attributes, not his container
+  var em = createElem('em',{});
+  if (typeof attributes['id'] !== 'undefined') {
+    var forId = attributes['id'];
+  }else{
+    var forId = makeid();
+  }
+  var label = createElem('label',{'for':forId});
+  label.innerHTML = labelTxt;
+  em.appendChild(label);
+  
+  var select = createElem('select',attributes);
+  if (typeof attributes['id'] !== 'undefined') {
+    select.setAttribute('id',forId);
+  }
+  
+  for(var i=0; i < arrayOptions.length; i++){
+    var option = createElem('option',{'value':arrayOptions[i]['value']});
+    option.innerHTML =  arrayOptions[i]['text'];
+    select.appendChild(option);
+  }
+  em.appendChild(select);
+  return em;
+}
 function createPlayerForm(index){
   var container = document.getElementById("playersSettings");
   var divForm = createElem("div", {"id": "containerPlayer" + index,"class":"playerBox" } );
-  
+    
-  //Type of player
+   divForm.appendChild(
-  var select = createElem("select",{"id":"playerType" + index,"onchange":"changeTypePlayer('" + index + "', this.value);"});
+	    createLineSelect('Type:',
-  var optionHuman = createElem("option",{"value":"Human"});
+				      [ {'value':'bot','text' : 'bot'},
-  optionHuman.innerHTML = "Human";
+					{'value':'human','text' : 'human'}
-  var optionBot = createElem("option",{"value":"Bot"});
+				      ],
-  optionBot.innerHTML = "Bot";
+				      
-  
+				      {"id":"playerType" + index,
-  select.appendChild(optionBot);
+					"onchange":"changeTypePlayer('" + index + "', this.value);"
-  select.appendChild(optionHuman);
+				      }
-  divForm.appendChild(select);
+			    )
-  
+  );
-  //url 
+  divForm.appendChild(
-  var inputUrl = createElem("input", {"id":"botUrl" + index, "type": "text", "value":"", "placeholder":"http://Bot.url" });
+    createElemWithLabel(
-  divForm.appendChild(inputUrl);
+			  'input',
-  
+			  {
-  
+			    "id":"botUrl" + index, "type": "text", "value":"",
-  
+			    "placeholder":"http://Bot.url" 
-  //Starting cell
+			  },
-  var selectRandomStartCell = createElem("select",{
+			  'URL du Bot'
-		"id": "randomOrNot" + index,
+      )
-		"onchange":"changeRandom('" + index + "', this.value);"
+    
-	      });
+  );
-  
+   divForm.appendChild(
-  var optionRandom = createElem("option",{"value":"random","selected":"selected"});
+	    createLineSelect('Starting cell:',
-  optionRandom.innerHTML = "random";
+				      [ {'value':'random','text' : 'random'},
-  
+					{'value':'defined','text' : 'Let me define it'}
-  var optionDefined = createElem("option",{"value":"defined"});
+				      ],
-  optionDefined.innerHTML = "Let me define it";
+				      
-  selectRandomStartCell.appendChild(optionRandom);
+				      {
-  selectRandomStartCell.appendChild(optionDefined);
+					"id": "randomOrNot" + index,
-  
+					"onchange":"changeRandom('" + index + "', this.value);"
-  divForm.appendChild(selectRandomStartCell);
+				      }
-  
+			    )
-  var inputX = createElem("input",{"type":"text","value": "0","id":"posX" + index,"class":"hidden"});
+  );
-  var inputY = createElem("input",{"type":"text","value": "0","id":"posY" + index,"class":"hidden"});
+  divForm.appendChild(
-  
+    createElemWithLabel(
-  divForm.appendChild(inputX);
+      'input',
-  divForm.appendChild(inputY);
+      {"type":"text","value": "0","id":"posX" + index},
+      'X coord:'
+    )
+  );
+  divForm.appendChild(
+    createElemWithLabel(
+      'input',
+      {"type":"text","value": "0","id":"posY" + index},
+      'Y coord:'
+    )
+  );
   
   container.appendChild(divForm);