servers/ttrss
1
0
Fork 0
mirror of https://tt-rss.org/git/tt-rss.git synced 2024-06-24 11:56:36 +02:00
Code Issues Releases Wiki Activity

misc dialog style updates

Browse Source
This commit is contained in:
Andrew Dolgov 2010-11-18 22:26:04 +03:00
parent fb8b2153ac
commit a83280194a
6 changed files with 62 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feedlist.js
View File

@ -267,7 +267,7 @@ function request_counters() {
function displayNewContentPrompt(id) { function displayNewContentPrompt(id) {
try { try {
var msg = "<a href='#' onclick='viewfeed("+id+")'>" + var msg = "<a href='#' onclick='viewCurrentFeed()'>" +
__("New articles available in this feed (click to show)") + "</a>"; __("New articles available in this feed (click to show)") + "</a>";
msg = msg.replace("%s", getFeedName(id)); msg = msg.replace("%s", getFeedName(id));

18
functions.js
View File

@ -306,10 +306,28 @@ function toggleSelectListRow(sender) {
return toggleSelectRow(sender, row); return toggleSelectRow(sender, row);
} }
/* this is for dijit Checkbox */
function toggleSelectListRow2(sender) {
var row = sender.domNode.parentNode;
return toggleSelectRow(sender, row);
}
function tSR(sender, row) { function tSR(sender, row) {
return toggleSelectRow(sender, row); return toggleSelectRow(sender, row);
} }
/* this is for dijit Checkbox */
function toggleSelectRow2(sender, row) {
if (!row) row = sender.domNode.parentNode.parentNode;
if (sender.checked && !row.hasClassName('Selected'))
row.addClassName('Selected');
else
row.removeClassName('Selected');
}
function toggleSelectRow(sender, row) { function toggleSelectRow(sender, row) {
if (!row) row = sender.parentNode.parentNode; if (!row) row = sender.parentNode.parentNode;

4
modules/popup-dialog.php
View File

@ -321,7 +321,7 @@
print "<input type=\"hidden\" name=\"op\" value=\"rpc\">"; print "<input type=\"hidden\" name=\"op\" value=\"rpc\">";
print "<input type=\"hidden\" name=\"subop\" value=\"updateFeedBrowser\">"; print "<input type=\"hidden\" name=\"subop\" value=\"updateFeedBrowser\">";
print " print "<div dojoType=\"dijit.Toolbar\">
<div style='float : right'> <div style='float : right'>
<img style='display : none' <img style='display : none'
id='feed_browser_spinner' src='". id='feed_browser_spinner' src='".
@ -347,7 +347,7 @@
print "</select> "; print "</select> ";
print "<p>"; print "</div>";
$owner_uid = $_SESSION["uid"]; $owner_uid = $_SESSION["uid"];

24
modules/pref-feeds.php
View File

@ -1062,7 +1062,7 @@
} }
} }
print "<div> print "<div dojoType=\"dijit.Toolbar\">
<input id=\"fadd_cat\" <input id=\"fadd_cat\"
onkeypress=\"return filterCR(event, addFeedCat)\" onkeypress=\"return filterCR(event, addFeedCat)\"
size=\"40\"> size=\"40\">
@ -1073,14 +1073,14 @@
WHERE owner_uid = ".$_SESSION["uid"]." WHERE owner_uid = ".$_SESSION["uid"]."
ORDER BY title"); ORDER BY title");
print "<p>"; # print "<p>";
if (db_num_rows($result) != 0) { if (db_num_rows($result) != 0) {
print __('Select:')." # print __('Select:')."
<a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'all')\">".__('All')."</a>, # <a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'all')\">".__('All')."</a>,
<a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'none')\">".__('None')."</a>"; # <a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'none')\">".__('None')."</a>";
#
print "<div class=\"prefFeedCatHolder\">"; print "<div class=\"prefFeedCatHolder\">";
print "<form id=\"feed_cat_edit_form\" onsubmit=\"return false\">"; print "<form id=\"feed_cat_edit_form\" onsubmit=\"return false\">";
@ -1097,12 +1097,12 @@
$cat_id = $line["id"]; $cat_id = $line["id"];
$this_row_id = "id=\"FCATR-$cat_id\""; $this_row_id = "id=\"FCATR-$cat_id\"";
print "<tr class=\"$class\" $this_row_id>"; print "<tr class=\"\" $this_row_id>";
$edit_title = htmlspecialchars($line["title"]); $edit_title = htmlspecialchars($line["title"]);
print "<td width='5%' align='center'><input print "<td width='5%' align='center'><input
onclick='toggleSelectRow(this);' onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" id=\"FCCHK-$cat_id\"></td>"; type=\"checkbox\" id=\"FCCHK-$cat_id\"></td>";
print "<td>"; print "<td>";
@ -1427,14 +1427,14 @@
$icon_file = ICONS_DIR . "/" . $details["id"] . ".ico"; $icon_file = ICONS_DIR . "/" . $details["id"] . ".ico";
if (file_exists($icon_file) && filesize($icon_file) > 0) { if (file_exists($icon_file) && filesize($icon_file) > 0) {
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL . $feed_icon = "<img style=\"vertical-align : middle\" class=\"tinyFeedIcon\" src=\"" . ICONS_URL .
"/".$details["id"].".ico\">"; "/".$details["id"].".ico\">";
} else { } else {
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">"; $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
} }
$check_box = "<input onclick='toggleSelectListRow(this)' $check_box = "<input onclick='toggleSelectListRow2(this)'
class='feedBrowseCB' dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" id=\"FBCHK-" . $details["id"] . "\">"; type=\"checkbox\" id=\"FBCHK-" . $details["id"] . "\">";
$class = ($feedctr % 2) ? "even" : "odd"; $class = ($feedctr % 2) ? "even" : "odd";
@ -1454,7 +1454,7 @@
src='images/feed-icon-12x12.png'></a>"; src='images/feed-icon-12x12.png'></a>";
print "<li title=\"".htmlspecialchars($details["site_url"])."\" print "<li title=\"".htmlspecialchars($details["site_url"])."\"
class='$class' id=\"FBROW-".$details["id"]."\">$check_box". id=\"FBROW-".$details["id"]."\">$check_box".
"$feed_icon $feed_url " . htmlspecialchars($details["title"]) . "$feed_icon $feed_url " . htmlspecialchars($details["title"]) .
"&nbsp;<span class='subscribers'>($subscribers)</span> "&nbsp;<span class='subscribers'>($subscribers)</span>
$site_url</li>"; $site_url</li>";

17
prefs.js
View File

@ -224,7 +224,7 @@ function addFeedCat() {
infobox_callback2(transport); infobox_callback2(transport);
} }); } });
link.value = ""; cat.value = "";
} }
} }
@ -1078,17 +1078,12 @@ function init_second_stage() {
dojo.addOnLoad(function() { dojo.addOnLoad(function() {
var active_tab = getInitParam("prefs_active_tab"); var tab = getURLParam('tab');
if (!$(active_tab+"Tab")) active_tab = "genConfig";
if (!active_tab || active_tab == '0') active_tab = "genConfig";
var http_tab = getURLParam('tab'); if (tab) {
tab = dijit.byId(tab + "Tab");
if (http_tab) active_tab = http_tab; if (tab) dijit.byId("pref-tabs").selectChild(tab);
}
var tab = dijit.byId(active_tab + "Tab");
if (tab) dijit.byId("pref-tabs").selectChild(tab);
}); });

31
tt-rss.css
View File

@ -222,6 +222,16 @@ input.editbox {
cursor : pointer; cursor : pointer;
} }
.blankborder, .blankborder td {
border-style : solid;
border-color : transparent;
border-width : 0px 0px 1px 0px;
}
.Selected, .Selected td {
background-color : #fff7d5;
}
.even.Unread.Selected, .even.Unread.Selected td { .even.Unread.Selected, .even.Unread.Selected td {
background-color : #fff7d5; background-color : #fff7d5;
font-weight : bold; font-weight : bold;
@ -400,8 +410,10 @@ table.prefFeedList td.feedSelect {
div.prefFeedCatHolder { div.prefFeedCatHolder {
height : 250px; height : 250px;
overflow : auto; overflow : auto;
border : 1px solid gray; border-width : 0px 1px 1px 1px;
margin : 5px 0px 5px 0px; border-color : #c0c0c0;
border-style : solid;
margin : 0px 0px 5px 0px;
background-color : white; background-color : white;
} }
@ -675,7 +687,7 @@ span.groupPrompt {
} }
div.tagCloudContainer { div.tagCloudContainer {
border : 1px solid gray; border : 1px solid #c0c0c0;
background-color : white; background-color : white;
margin : 5px 0px 5px 0px; margin : 5px 0px 5px 0px;
padding : 5px; padding : 5px;
@ -683,7 +695,7 @@ div.tagCloudContainer {
} }
div.errorExplained { div.errorExplained {
border : 1px solid gray; border : 1px solid #c0c0c0;
background-color : white; background-color : white;
margin : 5px 0px 5px 0px; margin : 5px 0px 5px 0px;
padding : 5px; padding : 5px;
@ -712,16 +724,19 @@ ul.userFeedList {
ul.browseFeedList { ul.browseFeedList {
height : 300px; height : 300px;
overflow : auto; overflow : auto;
list-style-type : none; border-width : 0px 1px 1px 1px;
border-color : #c0c0c0;
border-style : solid;
margin : 0px 0px 5px 0px; margin : 0px 0px 5px 0px;
padding : 0px;
border : 1px solid gray;
background-color : white; background-color : white;
list-style-type : none;
padding : 0px;
} }
ul.browseFeedList li { ul.browseFeedList li {
margin : 0px; margin : 0px;
padding : 0px; padding : 2px 4px 2px 4px;
} }
span.subscribers { span.subscribers {