From 37f4010e8f81db354085ca5b7b8fc40100169376 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 27 Nov 2011 16:57:05 +0300
Subject: add support for http basic authorization

---
 res/values/strings.xml  | 10 ++++++++--
 res/xml/preferences.xml | 14 ++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c0615976..222e8444 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13,15 +13,16 @@
     <string name="password">Password</string>
     <string name="default_url">http://example.domain/tt-rss/</string>
     <string name="authentication">Authentication</string>
-    <string name="look_and_feel">Look and feel</string>
+    <string name="look_and_feel">Interface</string>
     <string name="pref_theme">Theme</string>
-    <string name="pref_theme_long">Changes color theme of the application.</string>
+    <string name="pref_theme_long">Changes color theme of the application</string>
     <string name="ttrss_url">Tiny Tiny RSS URL</string>
     <string name="auto_login">Login automatically</string>
     <string name="theme_dark">Dark</string>
     <string name="preferences">Preferences</string>
     <string name="theme_light">Light</string>
     <string name="connection">Connection</string>
+    <string name="http_authentication">HTTP Authentication</string>
     <string name="login_api_disabled">Login failed: API disabled.</string>
     <string name="login_no_data">Login failed: no data received.</string>
     <string name="login_wrong_password">Login failed: username or password incorrect.</string>
@@ -48,4 +49,9 @@
     <string name="toggle_marked">Toggle starred</string>
     <string name="toggle_published">Toggle published</string>
     <string name="set_unread">Mark unread</string>
+    <string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authorization</string>
+    <string name="login_summary">Your tt-rss login. Not needed for single user mode</string>
+    <string name="password_summary">Your tt-rss password</string>
+    <string name="ttrss_url_summary">URL of your tt-rss installation directory, e.g. http://site.com/tt-rss/</string>
+        
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 4fb2c5ec..3bc482f3 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -5,12 +5,17 @@
   
    <PreferenceCategory android:title="@string/connection">
         
-        <EditTextPreference android:title="@string/login" android:key="login" android:singleLine="true"></EditTextPreference>
-        <EditTextPreference android:title="@string/password" android:key="password" android:singleLine="true" android:password="true"></EditTextPreference>
-        <EditTextPreference android:key="ttrss_url" android:title="@string/ttrss_url" android:singleLine="true" textUri="true" android:hint="@string/default_url"></EditTextPreference>
+        <EditTextPreference android:summary="@string/login_summary" android:title="@string/login" android:key="login" android:singleLine="true"></EditTextPreference>
+        <EditTextPreference android:summary="@string/password_summary" android:title="@string/password" android:key="password" android:singleLine="true" android:password="true"></EditTextPreference>
+        <EditTextPreference android:summary="@string/ttrss_url_summary" android:key="ttrss_url" android:title="@string/ttrss_url" android:singleLine="true" textUri="true" android:hint="@string/default_url"></EditTextPreference>
         <CheckBoxPreference android:defaultValue="false" android:title="@string/ssl_trust_any" android:key="ssl_trust_any" />                                              
 	</PreferenceCategory>
    
+   <PreferenceCategory android:title="@string/http_authentication">
+        <EditTextPreference android:title="@string/login" android:summary="@string/http_login_summary" android:key="http_login" android:singleLine="true"></EditTextPreference>
+        <EditTextPreference android:title="@string/password" android:key="http_password" android:singleLine="true" android:password="true"></EditTextPreference>
+   </PreferenceCategory>
+       
    <PreferenceCategory android:title="@string/look_and_feel">
       <ListPreference
            android:title="@string/pref_theme"
@@ -21,7 +26,8 @@
       
       <CheckBoxPreference android:title="@string/sort_feeds_by_unread" android:key="sort_feeds_by_unread"/>
    </PreferenceCategory>
-   
+
+       
    <PreferenceCategory android:title="@string/debugging">
                <CheckBoxPreference android:defaultValue="false" android:title="@string/transport_debugging" android:key="transport_debugging" />
    </PreferenceCategory>                                              
-- 
cgit v1.2.3