rework the way published feed is displayed; css cleanups
This commit is contained in:
Andrew Dolgov
parent
58b9d4759e
commit
cf9dc03257
|
|
@ -3,6 +3,33 @@
|
|||
$id = $_REQUEST["id"];
|
||||
$param = db_escape_string($_REQUEST["param"]);
|
||||
|
||||
if ($id == "pubUrl") {
|
||||
|
||||
print "<div id=\"infoBoxTitle\">".__('Published Articles')."</div>";
|
||||
print "<div class=\"infoBoxContents\">";
|
||||
|
||||
$url_path = article_publish_url($link);
|
||||
|
||||
print __("Your Published articles feed URL is:");
|
||||
|
||||
print "<div class=\"tagCloudContainer\">";
|
||||
print "<a id='pub_feed_url' href='$url_path' target='_blank'>$url_path</a>";
|
||||
print "</div>";
|
||||
|
||||
print "<div align='center'>";
|
||||
|
||||
print "<button onclick=\"return pubRegenKey()\">".
|
||||
__('Generate new URL')."</button> ";
|
||||
|
||||
print "<input class=\"button\"
|
||||
type=\"submit\" onclick=\"return closeInfoBox()\"
|
||||
value=\"".__('Close this window')."\">";
|
||||
|
||||
print "</div></div>";
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if ($id == "explainError") {
|
||||
|
||||
print "<div id=\"infoBoxTitle\">".__('Notice')."</div>";
|
||||
|
|
|
|||
|
|
@ -1404,12 +1404,17 @@
|
|||
|
||||
print "<h3>" . __("Firefox Integration") . "</h3>";
|
||||
|
||||
print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.');
|
||||
print "</p><p> <a class='visibleLinkB' href='javascript:window.navigator.registerContentHandler(" .
|
||||
print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "</p>";
|
||||
|
||||
print "<p";
|
||||
|
||||
print "<button onclick='window.navigator.registerContentHandler(" .
|
||||
"\"application/vnd.mozilla.maybe.feed\", " .
|
||||
"\"" . add_feed_url() . "\", " . " \"Tiny Tiny RSS\")'>" .
|
||||
__('Click here to register this site as a feed reader.') . "</a></p>";
|
||||
__('Click here to register this site as a feed reader.') .
|
||||
"</button>";
|
||||
|
||||
print "</p>";
|
||||
|
||||
print "<h3>".__("Published articles")."</h3>";
|
||||
|
||||
|
|
@ -1419,12 +1424,9 @@
|
|||
|
||||
print "<p>".__('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.')."</p>";
|
||||
|
||||
$url_path = article_publish_url($link);
|
||||
print "<button onclick=\"return displayDlg('pubUrl')\">".
|
||||
__('Display URL')."</button> ";
|
||||
|
||||
print "<p><a class=\"visibleLinkB\" id=\"pubGenAddress\" target=\"_blank\" href=\"$url_path\">".__("Link to published articles feed.")."</a></p>";
|
||||
|
||||
print "<button onclick=\"return pubRegenKey()\">".
|
||||
__('Generate another link')."</button>";
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
69
prefs.js
69
prefs.js
|
|
@ -12,33 +12,6 @@ var color_picker_active = false;
|
|||
var selection_disabled = false;
|
||||
var mouse_is_down = false;
|
||||
|
||||
function replace_pubkey_callback(transport) {
|
||||
try {
|
||||
var link = $("pubGenAddress");
|
||||
|
||||
if (transport.responseXML) {
|
||||
|
||||
var new_link = transport.responseXML.getElementsByTagName("link")[0];
|
||||
|
||||
if (new_link) {
|
||||
link.href = new_link.firstChild.nodeValue;
|
||||
//link.innerHTML = new_link.firstChild.nodeValue;
|
||||
|
||||
new Effect.Highlight(link);
|
||||
|
||||
notify_info("Published feed URL changed.");
|
||||
} else {
|
||||
notify_error("Could not change feed URL.");
|
||||
}
|
||||
|
||||
} else {
|
||||
notify_error("Could not change feed URL.");
|
||||
}
|
||||
} catch (e) {
|
||||
exception_error("replace_pubkey_callback", e);
|
||||
}
|
||||
}
|
||||
|
||||
function feedlist_callback2(transport) {
|
||||
|
||||
try {
|
||||
|
|
@ -1716,22 +1689,38 @@ function feedlistToggleSLAT() {
|
|||
|
||||
function pubRegenKey() {
|
||||
|
||||
var ok = confirm(__("Replace current publishing address with a new one?"));
|
||||
try {
|
||||
var ok = confirm(__("Replace current publishing address with a new one?"));
|
||||
|
||||
if (ok) {
|
||||
|
||||
notify_progress("Trying to change address...", true);
|
||||
|
||||
var query = "?op=rpc&subop=regenPubKey";
|
||||
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: query,
|
||||
onComplete: function(transport) {
|
||||
var new_link = transport.responseXML.getElementsByTagName("link")[0];
|
||||
|
||||
var e = $('pub_feed_url');
|
||||
|
||||
if (new_link) {
|
||||
e.href = new_link.firstChild.nodeValue;
|
||||
e.innerHTML = new_link.firstChild.nodeValue;
|
||||
|
||||
new Effect.Highlight(e);
|
||||
|
||||
if (ok) {
|
||||
|
||||
notify_progress("Trying to change address...");
|
||||
|
||||
var query = "?op=rpc&subop=regenPubKey";
|
||||
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: query,
|
||||
onComplete: function(transport) {
|
||||
replace_pubkey_callback(transport);
|
||||
notify('');
|
||||
|
||||
} else {
|
||||
notify_error("Could not change feed URL.");
|
||||
}
|
||||
} });
|
||||
|
||||
}
|
||||
} catch (e) {
|
||||
exception_error("pubRegenKey", e);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
182
tt-rss.css
182
tt-rss.css
|
|
@ -38,10 +38,6 @@ div.postReply div.postHeader {
|
|||
color : #909090;
|
||||
}
|
||||
|
||||
/* div.postReply > div.postHeader {
|
||||
padding : 5px;
|
||||
} */
|
||||
|
||||
div.postReply div.postContent {
|
||||
padding : 10px;
|
||||
font-size : 14px;
|
||||
|
|
@ -260,15 +256,6 @@ a:hover {
|
|||
position : absolute;
|
||||
}
|
||||
|
||||
#iedit_title, #iedit_link, #iedit_regexp, #iedit_descr, #iedit_expr, #iedit_updintl,
|
||||
#iedit_purgintl, #iedit_ulogin, #iedit_ulevel, #iedit_match, #iedit_feed,
|
||||
#iedit_fcat, #iedit_filter_action, #iedit_login, #iedit_pass, #iedit_email,
|
||||
#iedit_parent_feed {
|
||||
width : 100%;
|
||||
padding-left : 2px;
|
||||
background-color : #f0fff0;
|
||||
}
|
||||
|
||||
textarea.iedit {
|
||||
width : 100%;
|
||||
}
|
||||
|
|
@ -350,36 +337,6 @@ input.editbox {
|
|||
color : #4684ff;
|
||||
}
|
||||
|
||||
div.expPane {
|
||||
margin : 15px;
|
||||
}
|
||||
|
||||
/*.button {
|
||||
border : 1px solid #d0d0d0;
|
||||
background-image : url("images/button.png");
|
||||
background-position : top;
|
||||
background-repeat : repeat-x;
|
||||
background-color : white;
|
||||
color : black;
|
||||
}
|
||||
|
||||
.button:hover {
|
||||
background : white;
|
||||
text-decoration : none;
|
||||
color : black;
|
||||
}
|
||||
|
||||
.disabledButton {
|
||||
border : 1px solid #c0c0c0;
|
||||
background-color : white;
|
||||
color : gray;
|
||||
}
|
||||
|
||||
a.button {
|
||||
padding : 2px 5px 2px 5px;
|
||||
font-size : small;
|
||||
} */
|
||||
|
||||
.evenUnreadSelected, .evenSelectedUnread, .evenUnreadSelected td,
|
||||
.evenSelectedUnread td {
|
||||
background-color : #fff7d5;
|
||||
|
|
@ -569,15 +526,6 @@ a.helpLink:hover {
|
|||
color : #4684ff;
|
||||
}
|
||||
|
||||
div.helpResponse {
|
||||
margin : 10px;
|
||||
background-image : url("images/vgrad_light_rev2.png");
|
||||
background-position : top left;
|
||||
background-repeat : repeat-x;
|
||||
padding : 10px 20px 10px 20px;
|
||||
border : 1px solid #f0f0f0;
|
||||
}
|
||||
|
||||
#infoBoxTitle {
|
||||
border-width : 0px 0px 1px 0px;
|
||||
border-style : solid;
|
||||
|
|
@ -601,7 +549,6 @@ div.helpResponse {
|
|||
overflow : hidden;
|
||||
left : -4px;
|
||||
top : -4px;
|
||||
|
||||
}
|
||||
|
||||
div#errorBox {
|
||||
|
|
@ -614,7 +561,6 @@ div#errorBox {
|
|||
top : -4px;
|
||||
}
|
||||
|
||||
|
||||
html>body #infoBox, html>body #errorBox {
|
||||
left : -10px;
|
||||
top : -10px;
|
||||
|
|
@ -643,7 +589,6 @@ html>body #infoBox, html>body #errorBox {
|
|||
background-position : left bottom;
|
||||
}
|
||||
|
||||
|
||||
#infoBoxShadow, #errorBoxShadow {
|
||||
background-image : url("images/shadow.png");
|
||||
background-position : bottom right;
|
||||
|
|
@ -680,18 +625,6 @@ div.infoBoxContents a:hover {
|
|||
color : black;
|
||||
}
|
||||
|
||||
div.helpResponse h1, div.infoBoxContents h1 {
|
||||
/* border-width : 0px 0px 1px 0px;
|
||||
border-style : solid;
|
||||
border-color : #c0c0c0; */
|
||||
font-size : 18px;
|
||||
}
|
||||
|
||||
div.helpResponse h2, div.infoBoxContents h2 {
|
||||
/* border-width : 0px 0px 0px 0px; */
|
||||
font-size : 16px;
|
||||
}
|
||||
|
||||
pre {
|
||||
margin : 5px;
|
||||
}
|
||||
|
|
@ -770,7 +703,6 @@ div.warning {
|
|||
margin : 0px 0px 5px 0px;
|
||||
}
|
||||
|
||||
|
||||
div.warning img, div.notice img, div.error img {
|
||||
vertical-align : middle;
|
||||
padding : 5px;
|
||||
|
|
@ -803,16 +735,6 @@ table.loginForm {
|
|||
background-color : #ecf4ff;
|
||||
}
|
||||
|
||||
table.innerLoginForm {
|
||||
border : 1px solid #88b0f0;
|
||||
padding : 50px;
|
||||
background-color : white;
|
||||
}
|
||||
|
||||
table.innerLoginForm td {
|
||||
padding : 3px 3px 5px 3px;
|
||||
}
|
||||
|
||||
span.feed_error {
|
||||
color : red;
|
||||
}
|
||||
|
|
@ -829,32 +751,8 @@ span.feed_error {
|
|||
color : black;
|
||||
}
|
||||
|
||||
/* .prefGenericAddBox {
|
||||
font-size : 14px;
|
||||
} */
|
||||
|
||||
body.logoutBody {
|
||||
background-color : #f0f0f0;
|
||||
color : black;
|
||||
}
|
||||
|
||||
span.logoutWarning {
|
||||
color : red;
|
||||
font-weight : bold;
|
||||
}
|
||||
|
||||
div.logoutContent {
|
||||
width : 600px;
|
||||
border : 1px solid #c0c0c0;
|
||||
background-color : white;
|
||||
margin-left : auto;
|
||||
margin-right : auto;
|
||||
margin-top : 20px;
|
||||
padding : 10px;
|
||||
}
|
||||
|
||||
.small {
|
||||
font-size : 14px;
|
||||
font-size : 13px;
|
||||
}
|
||||
|
||||
table.innerFeedTable td {
|
||||
|
|
@ -988,12 +886,6 @@ div.postHeader div {
|
|||
display : none;
|
||||
}
|
||||
|
||||
/*td.hlContent {
|
||||
overflow : hidden;
|
||||
height : 1em;
|
||||
display : block;
|
||||
} */
|
||||
|
||||
td.hlMarkedPic, td.hlSelectRow, td.hlUpdated, td.hlFeed {
|
||||
height : 1em;
|
||||
}
|
||||
|
|
@ -1011,10 +903,6 @@ span.hlFeed a:hover {
|
|||
color : #4684ff;
|
||||
}
|
||||
|
||||
/* div.cdmArticle:hover {
|
||||
background-color : white;
|
||||
} */
|
||||
|
||||
div.cdmAllTags {
|
||||
float : left;
|
||||
background-color : white;
|
||||
|
|
@ -1039,22 +927,15 @@ div.cdmArticle {
|
|||
background-color : #f9faff;
|
||||
margin : 0px;
|
||||
color : #505050;
|
||||
/* padding : 10px; */
|
||||
color : black;
|
||||
|
||||
}
|
||||
|
||||
/* div.cdmArticleUnread:hover {
|
||||
background-color : white;
|
||||
} */
|
||||
|
||||
div.cdmArticleUnread {
|
||||
border-color : #a0a0a0;
|
||||
border-width : 0px 0px 1px 0px;
|
||||
border-style : solid;
|
||||
background-color : white;
|
||||
margin : 0px;
|
||||
/* padding : 10px; */
|
||||
color : black;
|
||||
}
|
||||
|
||||
|
|
@ -1086,20 +967,11 @@ div.cdmFooter {
|
|||
color : black;
|
||||
padding : 5px;
|
||||
color : gray;
|
||||
/* background-color : white; */
|
||||
border-width : 1px 0px 0px 0px;
|
||||
border-color : #c0c0c0;
|
||||
border-style : dotted;
|
||||
}
|
||||
|
||||
/*div.cdmArticleSelected div.cdmFooter {
|
||||
background-color : transparent;
|
||||
}
|
||||
|
||||
div.cdmArticleUnreadSelected div.cdmFooter {
|
||||
background-color : transparent;
|
||||
}*/
|
||||
|
||||
div.cdmFooter span.s0 {
|
||||
border-width : 0px 1px 0px 0px;
|
||||
border-color : #c0c0c0;
|
||||
|
|
@ -1193,8 +1065,6 @@ span.groupPrompt {
|
|||
}
|
||||
|
||||
div.tagCloudContainer {
|
||||
/* height : 300px;
|
||||
overflow : auto; */
|
||||
border : 1px solid #99d67a;
|
||||
background-color : white;
|
||||
margin : 5px 0px 5px 0px;
|
||||
|
|
@ -1229,41 +1099,6 @@ ul.userFeedList {
|
|||
padding : 0px;
|
||||
}
|
||||
|
||||
/* #browseBigFeedList li.oddSelected {
|
||||
border : 1px solid #d0d0f6;
|
||||
background-color : #eaeaff;
|
||||
-moz-border-radius : 5px;
|
||||
} */
|
||||
|
||||
/*#browseBigFeedList li {
|
||||
padding :0px;
|
||||
}*/
|
||||
|
||||
div.labelTestError {
|
||||
margin : 5px 0px 5px 0px;
|
||||
color : #f04040;
|
||||
}
|
||||
|
||||
ul.labelTestResults {
|
||||
height : 100px;
|
||||
overflow : auto;
|
||||
list-style-type : none;
|
||||
margin : 0px 0px 5px 0px;
|
||||
padding : 0px;
|
||||
border : 1px solid #99d67a;
|
||||
background-color : white;
|
||||
}
|
||||
|
||||
ul.filterTestResults {
|
||||
height : 300px;
|
||||
overflow : auto;
|
||||
list-style-type : none;
|
||||
margin : 0px 0px 5px 0px;
|
||||
padding : 0px;
|
||||
border : 1px solid #99d67a;
|
||||
background-color : white;
|
||||
}
|
||||
|
||||
ul.browseFeedList {
|
||||
height : 300px;
|
||||
overflow : auto;
|
||||
|
|
@ -1656,10 +1491,6 @@ div.headlines_cdm {
|
|||
}
|
||||
|
||||
#headlineActionsTop {
|
||||
/* border-width : 0px 0px 1px 0px;
|
||||
border-style : solid;
|
||||
border-color : #c0c0c0;
|
||||
background-color : #fafafa; */
|
||||
font-size : 14px;
|
||||
}
|
||||
|
||||
|
|
@ -1759,9 +1590,6 @@ a.helpLinkPic img {
|
|||
vertical-align : middle;
|
||||
}
|
||||
|
||||
#fadd_login_container {
|
||||
}
|
||||
|
||||
li.feedCatHolder {
|
||||
display : inline;
|
||||
}
|
||||
|
|
@ -1770,12 +1598,6 @@ table.prefFeedCatList {
|
|||
background-color : white;
|
||||
}
|
||||
|
||||
/*a[target="_new"], a[target="_blank"] {
|
||||
border-width : 0px 0px 1px 0px;
|
||||
border-color : #778899;
|
||||
border-style : dotted;
|
||||
}*/
|
||||
|
||||
div.autocomplete {
|
||||
position : absolute;
|
||||
width : 250px;
|
||||
|
|
@ -1831,7 +1653,6 @@ div.dashboard {
|
|||
|
||||
a.visibleLink {
|
||||
color : #4684ff;
|
||||
|
||||
}
|
||||
|
||||
a.visibleLinkB {
|
||||
|
|
@ -2207,6 +2028,7 @@ div#offlineModeDrop {
|
|||
optgroup {
|
||||
color : #5050aa;
|
||||
font-style : normal;
|
||||
|
||||
}
|
||||
|
||||
option {
|
||||
|
|
|
|||
Loading…
Reference in New Issue