valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tabbed feed editor

This commit is contained in:
Andrew Dolgov 2015-08-12 20:35:53 +03:00
parent bf9cc9ad95
commit d98779972d
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
classes/pref/feeds.php
View File

@ -533,6 +533,9 @@ class Pref_Feeds extends Handler_Protected {
global $purge_intervals; global $purge_intervals;
global $update_intervals; global $update_intervals;
print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
<div dojoType="dijit.layout.ContentPane" title="'.__('General').'">';
$feed_id = $this->dbh->escape_string($_REQUEST["id"]); $feed_id = $this->dbh->escape_string($_REQUEST["id"]);
$result = $this->dbh->query( $result = $this->dbh->query(
@ -658,8 +661,11 @@ class Pref_Feeds extends Handler_Protected {
</div>"; </div>";
print "</div>"; print "</div>";
print "<div class=\"dlgSec\">".__("Options")."</div>";
print "<div class=\"dlgSecCont\">"; print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
//print "<div class=\"dlgSec\">".__("Options")."</div>";
print "<div class=\"dlgSecSimple\">";
$private = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "private")); $private = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "private"));
@ -737,10 +743,11 @@ class Pref_Feeds extends Handler_Protected {
print "</div>"; print "</div>";
print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
/* Icon */ /* Icon */
print "<div class=\"dlgSec\">".__("Icon")."</div>"; print "<div class=\"dlgSecSimple\">";
print "<div class=\"dlgSecCont\">";
print "<iframe name=\"icon_upload_iframe\" print "<iframe name=\"icon_upload_iframe\"
style=\"width: 400px; height: 100px; display: none;\"></iframe>"; style=\"width: 400px; height: 100px; display: none;\"></iframe>";
@ -751,18 +758,23 @@ class Pref_Feeds extends Handler_Protected {
<input id=\"icon_file\" size=\"10\" name=\"icon_file\" type=\"file\"> <input id=\"icon_file\" size=\"10\" name=\"icon_file\" type=\"file\">
<input type=\"hidden\" name=\"op\" value=\"pref-feeds\"> <input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
<input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\"> <input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
<input type=\"hidden\" name=\"method\" value=\"uploadicon\"> <input type=\"hidden\" name=\"method\" value=\"uploadicon\"><p>
<button class=\"small\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\" <button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
type=\"submit\">".__('Replace')."</button> type=\"submit\">".__('Replace')."</button>
<button class=\"small\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\" <button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
type=\"submit\">".__('Remove')."</button> type=\"submit\">".__('Remove')."</button>
</form>"; </form>";
print "</div>"; print "</div>";
print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED, PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
"hook_prefs_edit_feed", $feed_id); "hook_prefs_edit_feed", $feed_id);
print "</div></div>";
$title = htmlspecialchars($title, ENT_QUOTES); $title = htmlspecialchars($title, ENT_QUOTES);
print "<div class='dlgButtons'> print "<div class='dlgButtons'>
@ -788,6 +800,7 @@ class Pref_Feeds extends Handler_Protected {
<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button> <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button>
</div>"; </div>";
return; return;
} }

2
css/tt-rss.css
View File

@ -675,7 +675,7 @@ div.dlgSecCont {
font-weight : normal; font-weight : normal;
} }
div.dlgSecCont hr { div.dlgSecCont hr, div.dlgSecSimple hr {
height : 0px; height : 0px;
line-height : 0px; line-height : 0px;
border : 0px solid transparent; border : 0px solid transparent;