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 @@ +
+ +
+ + La connexion permet d'accéder aux flux protégés par une authentification HTTP +
+ + +
+ +
+
+
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;