From 044908439bdd7280f7539e12441d7dfa6c4d4c63 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Apr 2013 19:07:14 +0200
Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20gestion=20authentification=20HTTP.?=
 =?UTF-8?q?=20Voir=20issue=20#26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/Feed.php            | 11 +++++++++--
 app/views/configure/feed.phtml | 13 +++++++++++++
 public/theme/base.css          |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/models/Feed.php b/app/models/Feed.php
index 159b6e767..91c8d8022 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -51,8 +51,15 @@ class Feed extends Model {
 	public function pathEntries () {
 		return $this->pathEntries;
 	}
-	public function httpAuth () {
-		return $this->httpAuth;
+	public function httpAuth ($raw = true) {
+		if ($raw) {
+			return $this->httpAuth;
+		} else {
+			return array (
+				'username' => '',
+				'password' => ''
+			);
+		}
 	}
 	public function nbEntries () {
 		$feedDAO = new FeedDAO ();
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index de0d5c83b..2ac601e3d 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -53,6 +53,19 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<label class="group-name" for="http_user">Username HTTP</label>
+			<div class="group-controls">
+				<input type="text" name="http_user" id="http_user" value="Pas encore implémenté" />
+				<i class="icon i_help"></i> La connexion permet d'accéder aux flux protégés par une authentification HTTP
+			</div>
+
+			<label class="group-name" for="http_pass">Password HTTP</label>
+			<div class="group-controls">
+				<input type="text" name="http_pass" id="http_pass" value="Pas encore implémenté" />
+			</div>
+		</div>
+
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button class="btn btn-important">Valider</button>
diff --git a/public/theme/base.css b/public/theme/base.css
index 9f53293d5..b2e47fd69 100644
--- a/public/theme/base.css
+++ b/public/theme/base.css
@@ -695,6 +695,7 @@ input, select, textarea {
 					height: 35px;
 					vertical-align: middle;
 					line-height: 35px;
+					font-size: 12px;
 				}
 			.flux_header .item.website {
 				width: 200px;