1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-09 13:39:14 +00:00

interface tweaks, add info/question/exclamation pics

This commit is contained in:
Andrew Dolgov
2007-03-02 20:16:45 +01:00
parent b05d782d90
commit 0d32b41e36
13 changed files with 73 additions and 54 deletions

View File

@@ -35,14 +35,15 @@
}
if (count($subscribed) > 0) {
print "<div class=\"notice\">";
print "<b>Subscribed to feeds:</b>";
print "<ul class=\"nomarks\">";
$msg = "<b>Subscribed to feeds:</b>".
"<ul class=\"nomarks\">";
foreach ($subscribed as $title) {
print "<li>$title</li>";
$msg .= "<li>$title</li>";
}
print "</ul>";
print "</div>";
$msg .= "</ul>";
print format_notice($msg);
}
}
@@ -442,11 +443,9 @@
}
if (subscribe_to_feed($link, $feed_url, $cat_id)) {
print "Subscribed to <b>$feed_url</b>.";
print format_notice("Subscribed to <b>$feed_url</b>.");
} else {
print "<div class=\"warning\">
Already subscribed to <b>$feed_url</b>.
</div>";
print format_warning("Already subscribed to <b>$feed_url</b>.");
}
if ($p_from != 'tt-rss') {
@@ -548,9 +547,7 @@
} else {
print "<div class=\"warning\">
Category <b>$feed_cat</b> already exists in the database.
</div>";
print format_warning("Category <b>$feed_cat</b> already exists in the database.");
}
}
@@ -577,8 +574,7 @@
WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
} else {
print "<div class=\"warning\">
Unable to delete non empty feed categories.</div>";
print format_warning("Unable to delete non empty feed categories.");
}

View File

@@ -213,6 +213,9 @@
$filter_types[$line["id"]] = $line["description"];
}
print "<a class='helpLinkPic' href=\"javascript:displayHelpInfobox(2)\">
<img src='images/sign_quest.png'></a>";
print "<input type=\"submit\"
class=\"button\"
onclick=\"return displayDlg('quickAddFilter', false)\"
@@ -336,9 +339,6 @@
print "</p>";
print "<div class=\"insensitive\" style=\"float : right\">See
<a target=\"_new\" href=\"http://tt-rss.spb.ru/trac/wiki/ContentFilters\">this page</a>
for additional information on filtering</div>";
/* print "<div class=\"insensitive\" style=\"float : right\">
First matching filter is used, filtering is performed

View File

@@ -190,6 +190,9 @@
$sort = "description";
}
print "<a class='helpLinkPic' href=\"javascript:displayHelpInfobox(1)\">
<img src='images/sign_quest.png'></a>";
print "<div class=\"prefGenericAddBox\">";
print"<input type=\"submit\" class=\"button\"
@@ -222,7 +225,6 @@
<td width=\"5%\">&nbsp;</td>
<td width=\"30%\"><a href=\"javascript:updateLabelList('description')\">Caption</a></td>
<td width=\"50%\"><a href=\"javascript:updateLabelList('sql_exp')\">SQL Expression</a>
<a class=\"helpLink\" href=\"javascript:displayHelpInfobox(1)\">(?)</a>
</td>
</tr>";

View File

@@ -164,35 +164,25 @@
pwd_hash = 'SHA1:".sha1("password")."')");
if (db_num_rows($result) != 0) {
print "<div class=\"warning\">
Your password is at default value, please change it.
</div>";
print format_warning("Your password is at default value, please change it.");
}
if ($_SESSION["pwd_change_result"] == "failed") {
print "<div class=\"warning\">
There was an error while changing your password.
</div>";
print format_warning("Could not change the password.");
}
if ($_SESSION["pwd_change_result"] == "ok") {
print "<div class=\"notice\">
Password changed successfully.
</div>";
print format_notice("Password was changed.");
}
$_SESSION["pwd_change_result"] = "";
if ($_SESSION["prefs_op_result"] == "reset-to-defaults") {
print "<div class=\"notice\">
Your configuration was reset to defaults.
</div>";
print format_notice("The configuration was reset to defaults.");
}
if ($_SESSION["prefs_op_result"] == "save-config") {
print "<div class=\"notice\">
Your configuration was saved successfully.
</div>";
print format_notice("The configuration was saved.");
}
$_SESSION["prefs_op_result"] = "";