From eb9381f89c7bf4ef279325115702bd723e42f8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xe=CC=81fir=20Destiny?= <xefir@crystalyx.net>
Date: Wed, 2 Oct 2013 16:46:02 +0200
Subject: [PATCH] =?UTF-8?q?Appli=20compl=C3=A8tement=20fonctionnelle=20!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ajax.php  |  4 ++--
 index.php | 12 +++++++++---
 js/app.js |  5 -----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ajax.php b/ajax.php
index 276c180..41faa7e 100644
--- a/ajax.php
+++ b/ajax.php
@@ -22,9 +22,9 @@ if (!empty($_POST['action'])) {
 			echo ansi2html($session->exec('cd ' . $config['path'] . ' && ' . $gitstatus));
 		} else if ($_POST['action'] == 'push') {
 			$message = empty($_POST['message']) ? 'FTP' : $_POST['message'];
-			//echo $session->exec('cd ' . $config['path'] . ' && git add -A && git commit -m "' . $message . '" && git push && ' . $gitstatus);
+			echo ansi2html($session->exec('cd ' . $config['path'] . ' && git add -A && git commit -m "' . $message . '" && git push && ' . $gitstatus));
 		} else if ($_POST['action'] == 'pull') {
-			//echo $session->exec('cd ' . $config['path'] . ' && git pull && ' . $gitstatus);
+			echo ansi2html($session->exec('cd ' . $config['path'] . ' && git pull && ' . $gitstatus));
 		}
 	}
 }
diff --git a/index.php b/index.php
index 3e70e81..d752d99 100644
--- a/index.php
+++ b/index.php
@@ -35,10 +35,16 @@ global $servers;
 							<section id="<?php echo $id; ?>">
 								<h3><?php echo $param['title']; ?> <span class="label"></span></h3>
 								<div class="btn-group">
-									<button class="btn" onclick="callRequest('status', '<?php echo $id; ?>');"><i class="icon-refresh"></i> Status</button>
-									<button class="btn" onclick="callRequest('pull', '<?php echo $id; ?>');"><i class="icon-arrow-down"></i> Pull</button>
+									<button class="btn" onclick="callRequest('status', '<?php echo $id; ?>');">
+										<i class="icon-refresh"></i> Status
+									</button>
+									<button class="btn" onclick="callRequest('pull', '<?php echo $id; ?>');">
+										<i class="icon-arrow-down"></i> Pull
+									</button>
 									<div class="input-prepend">
-										<button class="btn" type="button"><i class="icon-arrow-up"></i> Push</button>
+										<button class="btn" type="button" onclick="callRequest('push', '<?php echo $id; ?>', document.querySelector('#<?php echo $id; ?> input[name=message]').value);">
+											<i class="icon-arrow-up"></i> Push
+										</button>
 										<input type="text" name="message" placeholder="Commit message">
 									</div>
 								</div>
diff --git a/js/app.js b/js/app.js
index bda7241..209045c 100644
--- a/js/app.js
+++ b/js/app.js
@@ -36,8 +36,3 @@ function callRequest(action, section, message) {
 		}
 	};
 }
-
-function push(section) {
-	//callRequest('push', section, document.getElementById('message').value);
-	return false;
-}