diff --git a/backend.php b/backend.php index bb8f86534..a9a661427 100644 --- a/backend.php +++ b/backend.php @@ -40,7 +40,9 @@ $actid = $_GET["actid"]; - print ""; +// print "
"; + + print ""; +// print ""; $icon_file = ICONS_DIR . "/$feed_id.ico"; if ($subop != "piggie") { if (file_exists($icon_file) && filesize($icon_file) > 0) { - $feed_icon = ""; + $feed_icon = ""; } else { - $feed_icon = " "; + $feed_icon = ""; } } else { $feed_icon = "$feed"; - if (ENABLE_FEED_ICONS) { + +/* if (ENABLE_FEED_ICONS) { print ""; } + print ""; print ""; - print ""; - ++$lnum; - } + print ""; */ + + print "
  • "; + if (ENABLE_FEED_ICONS) { + print "$feed_icon"; + } + print "$feed"; -// print "
    • "; + if ($unread > 0) { + print " +  ($unread)"; + } + + print ""; -// print ""; + ++$lnum; + } print "
    $feed_icon$feed"; print "$unread / "; print "$total"; print "
    -// Update all feeds
     "; -// print "
    "; print "
    $total_unread
    "; print "
    $actid
    "; -/* - print "

    All feeds: - Update"; - - print " Mark as read

    "; - - print "
    $total_unread
    "; -*/ - - - } @@ -226,7 +226,23 @@ $feed_icon = " "; } - print ""; + + print "
    "; + + print " + "; + print " + "; + + print "
    Title:" . $line["title"] . "
    Link:" . $line["link"] . "
    "; + + print "
    " . $feed_icon . "
    "; + print "
    " . $line["content"] . "
    "; + + print ""; + +/* print ""; print " @@ -244,7 +260,7 @@ colspan=\"2\" width=\"100%\">" . $line["content"] . ""; - print "
    Title: $feed_icon
    "; + print ""; */ } @@ -629,26 +645,30 @@ if ($subop == "edit") { print "Edit feed:  - Cancel  - Save"; + + "; } else { print " Selection:  - Edit  - Remove "; + + "; + if (ENABLE_PREFS_CATCHUP_UNCATCHUP) { print " - Mark as read  - Mark as unread "; + +  "; } print " - All feeds:  - Export OPML"; + All feeds: + "; } @@ -808,20 +828,29 @@ print "

    "; if ($subop == "edit") { - print "Edit feed:  - Cancel  - Save"; + print "Edit feed: + + "; } else { print " - Selection:  - Edit  - Remove "; + Selection: + + "; } } + if ($op == "error") { + print "

    "; + $msg = $_GET["msg"]; + print $msg; + print "
    "; + } + pg_close($link); ?> diff --git a/feedlist.js b/feedlist.js index dd0d04914..5ea9fffe9 100644 --- a/feedlist.js +++ b/feedlist.js @@ -74,11 +74,12 @@ function viewfeed(feed, skip, subop, doc) { headlines_frame.location.href = query + "&addheader=true"; - cleanSelected("feedsList"); + cleanSelectedList("feedList"); + var feedr = document.getElementById("FEEDR-" + feed); if (feedr) { feedr.className = feedr.className + "Selected"; - } + } disableContainerChildren("headlinesToolbar", false, doc); diff --git a/functions.js b/functions.js index 7faf42874..ebb1bb8f3 100644 --- a/functions.js +++ b/functions.js @@ -124,10 +124,18 @@ function hotkey_handler(e) { } -function cleanSelected(element) { +function cleanSelectedList(element) { var content = document.getElementById(element); - var rows = new Array(); + for (i = 0; i < content.childNodes.length; i++) { + content.childNodes[i].className = content.childNodes[i].className.replace("Selected", ""); + } + +} + + +function cleanSelected(element) { + var content = document.getElementById(element); for (i = 0; i < content.rows.length; i++) { content.rows[i].className = content.rows[i].className.replace("Selected", ""); @@ -247,4 +255,12 @@ function disableContainerChildren(id, disable, doc) { } +function gotoPreferences() { + document.location.href = "prefs.php"; +} + +function gotoMain() { + document.location.href = "tt-rss.php"; +} + diff --git a/images/blank_icon.png b/images/blank_icon.png new file mode 100644 index 000000000..a2f107312 Binary files /dev/null and b/images/blank_icon.png differ diff --git a/images/ttrss_logo.png b/images/ttrss_logo.png new file mode 100644 index 000000000..0cfde81c0 Binary files /dev/null and b/images/ttrss_logo.png differ diff --git a/images/ttrss_logo.svg b/images/ttrss_logo.svg new file mode 100644 index 000000000..0291cf933 --- /dev/null +++ b/images/ttrss_logo.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + tiny tiny rss + + diff --git a/images/vgrad_light.png b/images/vgrad_light.png new file mode 100644 index 000000000..31322e6a6 Binary files /dev/null and b/images/vgrad_light.png differ diff --git a/images/vgrad_light_rev.png b/images/vgrad_light_rev.png new file mode 100644 index 000000000..36f0b5595 Binary files /dev/null and b/images/vgrad_light_rev.png differ diff --git a/images/vgrad_light_rev2.png b/images/vgrad_light_rev2.png new file mode 100644 index 000000000..d69a31c40 Binary files /dev/null and b/images/vgrad_light_rev2.png differ diff --git a/prefs.php b/prefs.php index 52eedc6d3..5f0adf7d1 100644 --- a/prefs.php +++ b/prefs.php @@ -1,6 +1,6 @@ - Tiny Tiny RSS + Tiny Tiny RSS : Preferences @@ -12,27 +12,26 @@ - +
    - - - + - -
    - Preferences + + logo
    - -
     Close
    -     		- Return to main - + + + + +
    +
    +

    Feed Configuration

     
    -
    Expand section > @@ -61,7 +60,7 @@
    + Tiny-Tiny RSS v © 2005 Andrew Dolgov
    Running in demo mode, some functionality is disabled. diff --git a/tt-rss.css b/tt-rss.css index 37518b3d1..40d959d7d 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -6,217 +6,239 @@ body { font-family : sans-serif; } -h1 { - font-size : 16pt; -} - -h2 { - font-size : 14pt; - font-color : bold; - border-width : 0px 0px 1px 0px; - border-style : solid; - border-color : #e0e0e0; -} - -hr { - border-width : 0px 0px 1px 0px; - border-style : dashed; - border-color : #e0e0e0; -} - -a { - color : black; - text-decoration : none; -} +/* common styles */ -a:hover { - color : #5050aa; +table.main td.header { + padding : 10px 10px 10px 50px; + height : 90px; + font-size : 24pt; + font-weight : bold; + background-image : url("images/vgrad_light_rev2.png"); + background-position : top left; + background-repeat : repeat-x; } -table.postTable a { - color : #5050aa; +table.main td.mainToolbar { + border-width : 0px 0px 0px 0px; + border-style : solid; + border-color : #c0c0c0; + padding : 10px 25px 10px 10px; } -table.postTable a:hover { - color : black; +table.main td.feeds { + width : 300px; + height : 100%; + border-width : 1px 0px 0px 0px; + border-style : solid; + border-color : #c0c0c0; + padding : 5px; } -td.headlinesToolbar { +table.main td.headlinesToolbarBox { padding : 10px; -} - -table.headlinesList td.title, table.headlinesHeader td.title { - font-weight : bold; - font-size : large; - border-width : 0px 0px 1px 0px; - border-color : #d0d0d0; + border-width : 0px 0px 1px 1px; border-style : solid; - text-align : right; - padding-bottom : 3px; + border-color : #c0c0c0; + background-image : url("images/vgrad_light.png"); + background-position : bottom left; + background-repeat : repeat-x; } -table.headlinesList td.feedLastUpdateNotice { - font-size : x-small; - border-width : 0px 0px 1px 0px; - border-color : #d0d0d0; +table.main td.footer { + border-width : 1px 0px 0px 0px; border-style : solid; - text-align : left; - padding-bottom : 3px; - color : #a0a0a0; + border-color : #c0c0c0; + padding : 10px; + text-align : center; + font-size : x-small; + background-image : url("images/vgrad_light_rev2.png"); + background-position : top left; + background-repeat : repeat-x; + color : gray; } -table.headlinesList td.headlineUpdated { - width : 200px; +table.main td.footer a { + color : gray; } -input { - border : 1px solid #a0a0a0; +table.main td.footer a:hover { + color : #5050aa; } -table.main td.toolbar { - height : 40px; - background-color : #f0f0f0; - padding-right : 10px; - padding-left : 10px; - font-size : small; +table.main td.headlines { + height : 25%; + border-width : 0px 0px 1px 1px; + border-style : solid; + border-color : #c0c0c0; } -#notify { - font-weight : bold; - border : 1px solid #c0c0c0; - font-size : small; - display : none; - background : white; - -moz-border-radius : 5px; - padding : 2px 5px 2px 5px; - width : 300px; +table.main td.content { + height : 100%; + background-image : url("images/vgrad_light_rev.png"); + background-position : top left; + background-repeat : repeat-x; + border-width : 0px 0px 0px 1px; + border-style : solid; + border-color : #c0c0c0; } -table.feedsList td { - font-size : x-small; +table.main td.prefContent { + height : 100%; + background-image : url("images/vgrad_light_rev.png"); + background-position : top left; + background-repeat : repeat-x; + border-width : 1px 0px 0px 0px; + border-style : solid; + border-color : #c0c0c0; + padding : 20px; } -table.main td.header { - font-size : 21pt; - background-color : #f0f0f0; - background-image : url("images/header.png"); +div.postReply { + background-image : url("images/vgrad_light_rev.png"); background-position : top left; background-repeat : repeat-x; - height : 50px; - padding-left : 80px; - padding-top : 30px; - font-weight : bold; - color : black; + height : 100%; + padding : 10px; } -table.main td.feeds { - width : 300px; - border-width : 1px 1px 0px 0px; - border-color : #c0c0c0; - border-style : solid; +div.postReply div.postHeader { + background : white; + border : 1px solid #c0c0c0; padding : 5px; } -div.headlineToolbar { - border-width : 1px 0px 0px 0px; - border-color : #c0c0c0; - border-style : solid; +div.postReply div.postContent { padding : 10px; } -td.articleToolbar { - border-width : 0px 0px 1px 0px; - border-color : #c0c0c0; - border-style : solid; - padding : 10px; - background : #f0f0f0; +div.postReply div.postIcon { + float : right; + border : 0px; + margin : 10px; } -table.main td.headlines { - height : 25%; - border-width : 1px 0px 0px 0px; - border-color : #c0c0c0; - border-style : solid; - font-size : small; + +ul.feedList { + list-style-type : none; + margin : 0px; + padding : 10px; } -table.main td.prefContent { - padding : 10px; - border-width : 1px 0px 0px 0px; - border-color : #c0c0c0; - border-style : solid; +ul.feedList li { + margin : 2px; +} + +ul.feedList li.oddSelected, ul.feedList li.evenSelected, + li.oddUnreadSelected, li.evenUnreadSelected { + background-color : white; +} + +li.oddSelected a, li.evenSelected a, + li.oddUnreadSelected a, li.evenUnreadSelected a { + color : #5050aa; +} +ul.feedList img { + margin : 0px 3px 0px 0px; + width : 16px; + height : 16px; } -table.main td.headlinesToolbarBox { - padding : 0px; - height : 20px; - border-width : 1px 0px 0px 0px; - border-color : #c0c0c0; - border-style : solid; +h1 { + font-size : 16pt; } -table.main td.content { - padding : 0px; - border-width : 1px 0px 0px 0px; - border-color : #c0c0c0; +h2 { + font-size : 14pt; + font-color : bold; + border-width : 0px 0px 1px 0px; border-style : solid; + border-color : #e0e0e0; } -table.main td.notify { - height : 40px; - border-width : 1px 0px 0px 0px; - border-color : #c0c0c0; - border-style : solid; - font-size : x-small; - text-align : center; - color : gray; - background-color : #f0f0f0; - background-image : url("images/header_rev.png"); - background-position : top left; - background-repeat : repeat-x; +hr { + border-width : 0px 0px 1px 0px; + border-style : dashed; + border-color : #e0e0e0; +} +a { + color : black; + text-decoration : none; } -.evenGrayed { - background-color : #f0f0f0; - color : #909090; +a:hover { + color : #5050aa; } -.oddGrayed { - color : #909090; +#piggie { + width : 400; + height : 400; + left : 50; + background-color : white; + display : none; + z-index : 3; + background-image : url("http://madoka.spb.ru/stuff/fox/piggie.png"); + background-position : center center; + background-repeat : no-repeat; + position : absolute; + border : 1px solid pink; + margin-left : auto; + margin-right : auto; + -moz-border-radius : 10px; + opacity : 0.8; } -.even { - background-color : #f0f0f0; +#iedit_title, #iedit_link, #iedit_regexp, #iedit_descr { + width : 100%; + padding-left : 2px; } -.evenUnread { - background-color : #f0f0f0; +#notify { font-weight : bold; + font-size : small; + display : none; + width : 350px; + color : gray; } -.oddUnread { - font-weight : bold; +div.expPane { + margin : 15px; } -.invisible { - display : none; +iframe.feedsFrame { + width : 100%; + height : 90%; + border-width : 0px; + margin : 0px; + padding : 0px; } -table.prefAddFeed td { - padding : 2px; +iframe.contentFrame, iframe.headlinesFrame { + width : 100%; + border-width : 0px; + padding : 0px; + margin : 0px; + height : 100%; } -table.prefAddFeed input { - width : 250px; +.button { + border : 1px solid #d0d0d0; + background-image : url("images/button.png"); + background-position : top; + background-repeat : repeat-x; + background-color : white; + color : black; } -table.prefFeedList tr.title td, table.prefFilterList tr.title td, - table.headlinesList tr.title td { - font-weight : bold; - border-width : 0px 0px 1px 0px; - border-color : #f0f0f0; - border-style : solid; +.button:hover { + background : white; + text-decoration : none; + color : black; +} + +a.button { + padding : 2px 5px 2px 5px; + font-size : small; } .evenUnreadSelected, .evenSelectedUnread { @@ -251,132 +273,51 @@ table.prefFeedList tr.title td, table.prefFilterList tr.title td, color : #909090; } -.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; -} */ - -a.button { - padding : 2px 5px 2px 5px; -} - - -.buttonWarn { - border : 1px solid #d0d0d0; - background-image : url("images/button.png"); - background-position : top; - background-repeat : repeat-x; - background-color : white; - color : black; - padding : 2px 5px 2px 5px; - font-size : small; -} - -.buttonWarn:hover { - background : #fff0f0; - text-decoration : none; - color : black; -} - -td.headlineUpdateMark { - width : 25px; - text-align : center; -} - -div.errorBox { - border : 1px solid #c0c0c0; - padding : 20px; - margin : 20px; - background : #f0f0f0; -} - -tr.titleTop, tr.titleBottom, tr.titleTopBottom { - background : #f0f0f0; -} - -td.titleIcon { - border-width : 0px 0px 1px 0px; - border-color : #d0d0d0; - border-style : solid; +.evenGrayed { + background-color : #f0f0f0; + color : #909090; } -tr.titleTop td { - padding : 5px 10px 0px 10px; +.oddGrayed { + color : #909090; } -tr.titleBottom td { - padding : 3px 10px 5px 10px; - border-width : 0px 0px 1px 0px; - border-color : #d0d0d0; - border-style : solid; +.even { + background-color : #f0f0f0; } -tr.titleTopBottom td { - padding : 3px 10px 5px 10px; - border-width : 1px 0px 1px 0px; - border-color : #d0d0d0; - border-style : solid; +.evenUnread { + background-color : #f0f0f0; + font-weight : bold; } -td.post { - padding : 20px; +.oddUnread { + font-weight : bold; } -#piggie { - width : 400; - height : 400; - left : 50; - background-color : white; +.invisible { display : none; - z-index : 3; - background-image : url("http://madoka.spb.ru/stuff/fox/piggie.png"); - background-position : center center; - background-repeat : no-repeat; - position : absolute; - border : 1px solid pink; - margin-left : auto; - margin-right : auto; - -moz-border-radius : 10px; - opacity : 0.8; } -img.feedIcon { - margin : 3px; - border : 1px solid #c0c0c0; +input { + border : 1px solid #a0a0a0; } -#iedit_title, #iedit_link, #iedit_regexp, #iedit_descr { - width : 100%; - padding-left : 2px; -} +/* preferences */ -div.expPane { - margin : 15px; +table.prefAddFeed td { + padding : 2px; } -iframe.feedsFrame { - width : 100%; - height : 90%; - border-width : 0px; - margin : 0px; - padding : 0px; +table.prefAddFeed input { + width : 250px; } -iframe.contentFrame, iframe.headlinesFrame { - width : 100%; - border-width : 0px; - padding : 0px; - margin : 0px; - height : 100%; +table.prefFeedList tr.title td, table.prefFilterList tr.title td, + table.headlinesList tr.title td { + font-weight : bold; + border-width : 0px 0px 1px 0px; + border-color : #f0f0f0; + border-style : solid; } diff --git a/tt-rss.js b/tt-rss.js index 2bd19f138..d8e9dc6a8 100644 --- a/tt-rss.js +++ b/tt-rss.js @@ -62,7 +62,7 @@ function feedlist_callback() { function refetch_callback() { if (xmlhttp_rpc.readyState == 4) { - notify("All feeds updated"); + notify("All feeds updated."); active_feed_id = frames["feeds-frame"].document.getElementById("ACTFEEDID").innerHTML; diff --git a/tt-rss.php b/tt-rss.php index e240365ef..2428b1d17 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -15,12 +15,20 @@ -
    - Tiny Tiny RSS + logo
    - + @@ -50,7 +58,7 @@
    + + + + +
    +
    + +
    - +