style feed icon and opml file upload controls

[tt-rss.git] / classes / pref / feeds.php

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index fcd2aedad5219e771f405c3c80d7395204478c5a..5b7e52ac094aa633f8776063bf1081a02b7797f8 100755 (executable)
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -510,7 +510,7 @@ class Pref_Feeds extends Handler_Protected {
                        print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
                        <div dojoType="dijit.layout.ContentPane" title="'.__('General').'">';
 
-                       $auth_pass_encrypted = sql_bool_to_bool($row["auth_pass_encrypted"]);
+                       $auth_pass_encrypted = $row["auth_pass_encrypted"];
 
                        $title = htmlspecialchars($row["title"]);
 
@@ -644,7 +644,7 @@ class Pref_Feeds extends Handler_Protected {
                        //print "<div class=\"dlgSec\">".__("Options")."</div>";
                        print "<div class=\"dlgSecSimple\">";
 
-                       $private = sql_bool_to_bool($row["private"]);
+                       $private = $row["private"];
 
                        if ($private) {
                                $checked = "checked=\"1\"";
@@ -655,7 +655,7 @@ class Pref_Feeds extends Handler_Protected {
                        print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"private\" id=\"private\"
                        $checked>&nbsp;<label for=\"private\">".__('Hide from Popular feeds')."</label>";
 
-                       $include_in_digest = sql_bool_to_bool($row["include_in_digest"]);
+                       $include_in_digest = $row["include_in_digest"];
 
                        if ($include_in_digest) {
                                $checked = "checked=\"1\"";
@@ -668,7 +668,7 @@ class Pref_Feeds extends Handler_Protected {
                        $checked>&nbsp;<label for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
 
 
-                       $always_display_enclosures = sql_bool_to_bool($row["always_display_enclosures"]);
+                       $always_display_enclosures = $row["always_display_enclosures"];
 
                        if ($always_display_enclosures) {
                                $checked = "checked";
@@ -680,7 +680,7 @@ class Pref_Feeds extends Handler_Protected {
                        name=\"always_display_enclosures\"
                        $checked>&nbsp;<label for=\"always_display_enclosures\">".__('Always display image attachments')."</label>";
 
-                       $hide_images = sql_bool_to_bool($row["hide_images"]);
+                       $hide_images = $row["hide_images"];
 
                        if ($hide_images) {
                                $checked = "checked=\"1\"";
@@ -693,7 +693,7 @@ class Pref_Feeds extends Handler_Protected {
                        $checked>&nbsp;<label for=\"hide_images\">".
                                __('Do not embed images')."</label>";
 
-                       $cache_images = sql_bool_to_bool($row["cache_images"]);
+                       $cache_images = $row["cache_images"];
 
                        if ($cache_images) {
                                $checked = "checked=\"1\"";
@@ -706,7 +706,7 @@ class Pref_Feeds extends Handler_Protected {
                        $checked>&nbsp;<label for=\"cache_images\">".
                                __('Cache media')."</label>";
 
-                       $mark_unread_on_update = sql_bool_to_bool($row["mark_unread_on_update"]);
+                       $mark_unread_on_update = $row["mark_unread_on_update"];
 
                        if ($mark_unread_on_update) {
                                $checked = "checked";
@@ -726,19 +726,23 @@ class Pref_Feeds extends Handler_Protected {
 
                        print "<div class=\"dlgSecSimple\">";
 
+                       print "<img class=\"feedIcon\" src=\"".Feeds::getFeedIcon($feed_id)."\">";
+
                        print "<iframe name=\"icon_upload_iframe\"
-                       style=\"width: 400px; height: 100px; display: none;\"></iframe>";
+                               style=\"width: 400px; height: 100px; display: none;\"></iframe>";
 
                        print "<form style='display : block' target=\"icon_upload_iframe\"
                        enctype=\"multipart/form-data\" method=\"POST\"
                        action=\"backend.php\">
-                       <input id=\"icon_file\" size=\"10\" name=\"icon_file\" type=\"file\">
+                       <label class=\"dijitButton\">".__("Choose file...")."
+                               <input style=\"display: none\" id=\"icon_file\" size=\"10\" name=\"icon_file\" type=\"file\">
+                       </label>
                        <input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
                        <input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
-                       <input type=\"hidden\" name=\"method\" value=\"uploadicon\"><p>
+                       <input type=\"hidden\" name=\"method\" value=\"uploadicon\">                    
                        <button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
                                type=\"submit\">".__('Replace')."</button>
-                       <button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
+                       <button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
                                type=\"submit\">".__('Remove')."</button>
                        </form>";
 
@@ -1285,7 +1289,9 @@ class Pref_Feeds extends Handler_Protected {
                print "<form  name=\"opml_form\" style='display : block' target=\"upload_iframe\"
                        enctype=\"multipart/form-data\" method=\"POST\"
                        action=\"backend.php\">
-                       <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
+                       <label class=\"dijitButton\">".__("Choose file...")."
+                               <input style=\"display : none\" id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
+                       </label>
                        <input type=\"hidden\" name=\"op\" value=\"dlg\">
                        <input type=\"hidden\" name=\"method\" value=\"importOpml\">
                        <button dojoType=\"dijit.form.Button\" onclick=\"return opmlImport();\" type=\"submit\">" .
@@ -1296,7 +1302,7 @@ class Pref_Feeds extends Handler_Protected {
                $opml_export_filename = "TinyTinyRSS_".date("Y-m-d").".opml";
 
                print "<p>" . __('Filename:') .
-            " <input type=\"text\" id=\"filename\" value=\"$opml_export_filename\" />&nbsp;" .
+            " <input class=\"input input-text\" type=\"text\" id=\"filename\" value=\"$opml_export_filename\" />&nbsp;" .
                                __('Include settings') . "<input type=\"checkbox\" id=\"settings\" checked=\"1\"/>";
 
                print "</p><button dojoType=\"dijit.form.Button\"