Second half of merge....

5 files changed, 114 insertions, 15 deletions

diff --git a/modules/serversetup/lang/pt/templates/ipxe-adv.json b/modules/serversetup/lang/pt/templates/ipxe-adv.json
new file mode 100644
index 00000000..19d120ad
--- /dev/null
+++ b/modules/serversetup/lang/pt/templates/ipxe-adv.json
@@ -0,0 +1,28 @@
+{
+    "lang_bootBehavior": "Comportamento Padr\u00e3o de Boot",
+    "lang_bootInfo": "Aqui ajustes podem ser feitos na apar\u00eancia do menu de boot.",
+    "lang_bootMenu": "Menu de Boot",
+    "lang_bootMenuCreate": "Criar Menu de Boot",
+    "lang_cancel": "Cancelar",
+    "lang_close": "Fechar",
+    "lang_compile": "Compilar",
+    "lang_compilingIpxe": "Compilando iPXE",
+    "lang_customScript": "Script Customizado",
+    "lang_download": "Baixar",
+    "lang_example": "Exemplo",
+    "lang_extension": "Extens\u00e3o",
+    "lang_ipxeInfo": "Aqui \u00e9 poss\u00edvel compilar e baixar o iPXE utilizando um script customiz\u00e1vel.",
+    "lang_ipxeWarning": "Se esta for a primeira vez compilando, poder\u00e1 levar entre 1 e 4 minutos para que termine.",
+    "lang_loading": "Carregando",
+    "lang_localHDD": "HDD Local",
+    "lang_menuCustom": "Menu Adicional Customizado",
+    "lang_menuCustomHint1": "Aqui voc\u00ea tem a oportunidade de adicionar seu pr\u00f3prio c\u00f3digo de menu para o menu PXE exibido, por exemplo, para se referir a outro servidor PXE. O formato corresponde ao formato de menu syslinux.",
+    "lang_menuCustomHint2": "Voc\u00ea pode criar uma ou mais entradas. Se voc\u00ea quiser criar uma entrada que \u00e9 iniciada automaticamente quando o usu\u00e1rio faz uma sele\u00e7\u00e3o, atribua como",
+    "lang_menuCustomHint3": "e selecione como o comportamento de boot padr\u00e3o tamb\u00e9m my-entry.",
+    "lang_menuDisplayTime": "Tempo de Exibi\u00e7\u00e3o do Menu",
+    "lang_mountIpxe": "Montar iPXE",
+    "lang_restoreDefault": "Restaurar Padr\u00e3o",
+    "lang_saveScript": "Salvar Script",
+    "lang_seconds": "Segundos",
+    "lang_success": "Arquivo criado com sucesso:"
+}
diff --git a/modules/serversetup/page.inc.php b/modules/serversetup/page.inc.php
index e37d7d40..289bf3d5 100644
--- a/modules/serversetup/page.inc.php
+++ b/modules/serversetup/page.inc.php
@@ -65,19 +65,27 @@ class Page_ServerSetup extends Page
 			Render::addTemplate('ipxe_update', array('taskid' => $taskid));
 		}
 
-		Render::addTemplate('ipaddress', array(
-			'ips' => $this->taskStatus['data']['addresses']
-		));
-		$data = $this->currentMenu;
-		if (!isset($data['defaultentry']))
-			$data['defaultentry'] = 'net';
-		if ($data['defaultentry'] === 'net')
-			$data['active-net'] = 'checked';
-		if ($data['defaultentry'] === 'hdd')
-			$data['active-hdd'] = 'checked';
-		if ($data['defaultentry'] === 'custom')
-			$data['active-custom'] = 'checked';
-		Render::addTemplate('ipxe', $data);
+		if (Request::get('advanced', 'false', 'string') === 'false') {
+			Render::addTemplate('ipxe-smp');
+		} else {
+			Render::addTemplate('ipaddress', array(
+				'ips' => $this->taskStatus['data']['addresses']
+			));
+			$data = $this->currentMenu;
+			if (!isset($data['defaultentry']))
+				$data['defaultentry'] = 'net';
+			if ($data['defaultentry'] === 'net')
+				$data['active-net'] = 'checked';
+			if ($data['defaultentry'] === 'hdd')
+				$data['active-hdd'] = 'checked';
+			if ($data['defaultentry'] === 'custom')
+				$data['active-custom'] = 'checked';
+			//There is no $this->username and no pxe.embed, why do we need this?
+			//Page won't load with lines below uncommented
+			//$data['username'] = $this->username;
+			//$data['script'] = file_get_contents("/opt/taskmanager/data/pxe.embed");
+			Render::addTemplate('ipxe-adv', $data);
+		}
 	}
 
 	// -----------------------------------------------------------------------------------------------
diff --git a/modules/serversetup/templates/ipaddress.html b/modules/serversetup/templates/ipaddress.html
index e4967703..e4c1fba9 100644
--- a/modules/serversetup/templates/ipaddress.html
+++ b/modules/serversetup/templates/ipaddress.html
@@ -1,3 +1,4 @@
+<a class="btn btn-default" href="?do=Serversetup&amp;advanced=false" role="button"><strong>{{lang_ipxeSmp}}</strong></a></br></br>
 <div class="panel panel-default">
 	<div class="panel-heading">
 		{{lang_bootAddress}}
@@ -31,4 +32,4 @@
 			</p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/serversetup/templates/ipxe.html b/modules/serversetup/templates/ipxe-adv.html
index 54d7db16..00e9fd3a 100644
--- a/modules/serversetup/templates/ipxe.html
+++ b/modules/serversetup/templates/ipxe-adv.html
@@ -1,7 +1,7 @@
 <div class="panel panel-default">
 	<div class="panel-heading">
 		{{lang_mountIpxe}}
-	</div>
+    </div>
 	<div class="panel-body">
 		<p>{{lang_ipxeInfo}}</p>
     		<label for="ext">{{lang_extension}}:</label>
diff --git a/modules/serversetup/templates/ipxe-smp.html b/modules/serversetup/templates/ipxe-smp.html
new file mode 100644
index 00000000..d126710c
--- /dev/null
+++ b/modules/serversetup/templates/ipxe-smp.html
@@ -0,0 +1,62 @@
+<a class="btn btn-default" href="?do=Serversetup&amp;advanced=true" role="button"><strong>{{lang_ipxeAdv}}</strong></a></br></br>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{lang_mountIpxe}}
+	</div>
+	<div class="panel-body">
+		<p>{{lang_ipxeSmpInfo}}</p>
+		<button id="mount-button" onclick="mountIpxe('iso');" class="btn btn-primary" type="button" data-toggle="modal" data-target="#ipxe-modal" data-backdrop="static">	{{lang_compileIso}}
+		</button>
+		<button id="mount-button" onclick="mountIpxe('usb');" class="btn btn-primary" type="button" data-toggle="modal" data-target="#ipxe-modal" data-backdrop="static">	{{lang_compileUsb}}
+		</button>
+    		<br>
+	</div>
+</div>
+
+
+<div class="modal fade" id="ipxe-modal" tabindex="-1" role="dialog" aria-labelledby="ipxe-modal-label" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="ipxe-modal-label">{{lang_compilingIpxe}}</h4>
+      </div>
+      <div class="modal-body" id="ipxe-modal-body">
+
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+        <button id="download-btn" type="button" class="btn btn-primary" disabled="disabled" onclick="downloadIpxe()">{{lang_download}}</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+	function mountIpxe(extension) {
+		document.getElementById('ipxe-modal-body').innerHTML = "<div class='alert alert-info' role='alert'>{{lang_ipxeWarning}}</div>"
+			+ "{{lang_loading}} <img src='fonts/loader.gif'/>";
+		$("#download-btn").prop("disabled",true);
+		var xmlhttp = new XMLHttpRequest();
+		xmlhttp.open("GET","?do=ServerSetup&async=true&submitTask=true&extension=" + extension,true);
+		xmlhttp.onreadystatechange= function() {
+			if (xmlhttp.readyState==4 && xmlhttp.status==200) {
+				var initResponse = xmlhttp.responseText;
+				if(initResponse != "success")
+					document.getElementById('ipxe-modal-body').innerHTML = initResponse;
+				else {
+					document.getElementById('ipxe-modal-body').innerHTML = "{{lang_success}}: ipxe." + extension;
+                    document.getElementById('download-btn').setAttribute('onclick','downloadIpxe(\''+extension+'\')');
+					$("#download-btn").prop("disabled",false);
+				}
+			}
+		}
+		xmlhttp.send();
+	}
+
+    function downloadIpxe(extension) {
+        console.log("TESTE");
+        console.log(extension);
+		window.location = "?do=ServerSetup&download=" + extension;
+	}
+</script>