diff options
| -rw-r--r-- | backend.php | 22 | ||||
| -rw-r--r-- | images/footer.png | bin | 0 -> 364 bytes | |||
| -rw-r--r-- | images/form.png | bin | 711 -> 0 bytes | |||
| -rw-r--r-- | images/header.png | bin | 292 -> 0 bytes | |||
| -rw-r--r-- | images/header_rev.png | bin | 291 -> 0 bytes | |||
| -rw-r--r-- | images/prefs-content.png | bin | 0 -> 1036 bytes | |||
| -rw-r--r-- | images/toolbar.png | bin | 0 -> 360 bytes | |||
| -rw-r--r-- | images/ttrss_logo.png | bin | 8580 -> 8328 bytes | |||
| -rw-r--r-- | images/ttrss_logo.svg | 22 | ||||
| -rw-r--r-- | images/updated.png | bin | 211 -> 208 bytes | |||
| -rw-r--r-- | images/vgrad_light.png | bin | 177 -> 0 bytes | |||
| -rw-r--r-- | images/vgrad_light_rev.png | bin | 176 -> 0 bytes | |||
| -rw-r--r-- | images/vgrad_light_rev2.png | bin | 394 -> 0 bytes | |||
| -rw-r--r-- | prefs.php | 8 | ||||
| -rw-r--r-- | tt-rss.css | 158 |
15 files changed, 130 insertions, 80 deletions
diff --git a/backend.php b/backend.php index 081bd7726..f1a9e60bd 100644 --- a/backend.php +++ b/backend.php @@ -1812,7 +1812,7 @@ <input type=\"submit\" class=\"button\" onclick=\"javascript:addFeed()\" value=\"Add feed\">"; - if (ENABLE_FEED_BROWSER) { + if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { print " (<a href='javascript:browseFeeds()'>Top 50</a>)"; } @@ -2065,7 +2065,7 @@ </td</tr>"; print "<tr class=\"title\"> - <td width=\"5%\"></td><td width=\"80%\">Title</td> + <td width=\"5%\"> </td><td width=\"80%\">Title</td> </tr>"; $lnum = 0; @@ -3412,7 +3412,7 @@ print "<tr class=\"title\"> <td align='center' width=\"5%\"> </td> - <td width='20%'>Username</td> + <td width='20%'>Login</td> <td width='20%'>E-mail</td> <td width='20%'>Access Level</td> <td width='20%'>Last login</td></tr>"; @@ -3459,6 +3459,8 @@ print "<td><a href=\"javascript:editUser($uid);\">" . $line["login"] . "</td>"; + if (!$line["email"]) $line["email"] = " "; + print "<td><a href=\"javascript:editUser($uid);\">" . $line["email"] . "</td>"; @@ -3467,6 +3469,8 @@ } else if ($uid != $edit_uid) { + if (!$line["email"]) $line["email"] = " "; + print "<td align='center'><input disabled=\"true\" type=\"checkbox\" id=\"UMCHK-".$line["id"]."\"></td>"; @@ -3746,6 +3750,8 @@ if ($op == "pref-feed-browser") { + print "<p>This panel shows feeds subscribed by other users of this system, just in case you are interested in some of them too.</p>"; + if (!ENABLE_FEED_BROWSER) { print "Feed browser is administratively disabled."; return; @@ -3821,7 +3827,11 @@ FROM ttrss_feeds WHERE auth_login = '' AND auth_pass = '' AND private = false GROUP BY feed_url ORDER BY subscribers DESC LIMIT 100"); - + + print "<p>Selection: + <input type='submit' class='button' onclick=\"feedBrowserSubscribe()\" + value=\"Subscribe\">"; + print "<ul class='nomarks' id='browseBigFeedList'>"; $feedctr = 0; @@ -3878,10 +3888,6 @@ print "</ul>"; - print "<p>Selection: - <input type='submit' class='button' onclick=\"feedBrowserSubscribe()\" - value=\"Subscribe\"></p>"; - print "</div>"; } diff --git a/images/footer.png b/images/footer.png Binary files differnew file mode 100644 index 000000000..1fde4ff4d --- /dev/null +++ b/images/footer.png diff --git a/images/form.png b/images/form.png Binary files differdeleted file mode 100644 index a22b7ccff..000000000 --- a/images/form.png +++ /dev/null diff --git a/images/header.png b/images/header.png Binary files differdeleted file mode 100644 index 7ccdf79b2..000000000 --- a/images/header.png +++ /dev/null diff --git a/images/header_rev.png b/images/header_rev.png Binary files differdeleted file mode 100644 index a20427d36..000000000 --- a/images/header_rev.png +++ /dev/null diff --git a/images/prefs-content.png b/images/prefs-content.png Binary files differnew file mode 100644 index 000000000..c975a459f --- /dev/null +++ b/images/prefs-content.png diff --git a/images/toolbar.png b/images/toolbar.png Binary files differnew file mode 100644 index 000000000..8b5f96011 --- /dev/null +++ b/images/toolbar.png diff --git a/images/ttrss_logo.png b/images/ttrss_logo.png Binary files differindex 02e566d61..626eaf41c 100644 --- a/images/ttrss_logo.png +++ b/images/ttrss_logo.png diff --git a/images/ttrss_logo.svg b/images/ttrss_logo.svg index e8aed3abd..e35e527c0 100644 --- a/images/ttrss_logo.svg +++ b/images/ttrss_logo.svg @@ -12,10 +12,10 @@ height="25.000000pt" id="svg2" sodipodi:version="0.32" - inkscape:version="0.42.2" - sodipodi:docbase="/naboo/home/fox/public_html/testbox/tt-rss/images" + inkscape:version="0.43" + sodipodi:docbase="/home/fox/public_html/testbox/tt-rss-blue/images" sodipodi:docname="ttrss_logo.svg" - inkscape:export-filename="/naboo/home/fox/public_html/testbox/tt-rss/images/ttrss_logo.png" + inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png" inkscape:export-xdpi="139.35001" inkscape:export-ydpi="139.35001"> <defs @@ -50,15 +50,15 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="5.6000000" + inkscape:zoom="5.6" inkscape:cx="109.86875" inkscape:cy="3.8105931" inkscape:document-units="px" inkscape:current-layer="layer1" - inkscape:window-width="1600" - inkscape:window-height="1131" + inkscape:window-width="1596" + inkscape:window-height="1153" inkscape:window-x="0" - inkscape:window-y="25" /> + inkscape:window-y="0" /> <metadata id="metadata7"> <rdf:RDF> @@ -76,18 +76,18 @@ id="layer1"> <text xml:space="preserve" - style="font-size:28.000000px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill-opacity:0.037500001;stroke:#b3b3b3;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000;font-family:Verdana;opacity:1.0000000;fill:#000000" + style="font-size:28.000000px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill-opacity:1;stroke:#88b0f0;stroke-width:0.9;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana;opacity:1.0000000;fill:#ffffff" x="3.750001" y="23.750002" id="text1306" sodipodi:linespacing="125.00000%" - inkscape:export-filename="/naboo/home/fox/public_html/testbox/tt-rss/images/ttrss_logo.png" + inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png" inkscape:export-xdpi="180.00000" inkscape:export-ydpi="180.00000"><tspan sodipodi:role="line" id="tspan1308" - x="3.7500010" + x="3.750001" y="23.750002" - style="fill-opacity:0.037500001;fill:#000000">tiny tiny rss</tspan></text> + style="fill-opacity:1;fill:#ffffff;stroke:#88b0f0;stroke-opacity:1;stroke-width:0.9;stroke-miterlimit:4;stroke-dasharray:none">tiny tiny rss</tspan></text> </g> </svg> diff --git a/images/updated.png b/images/updated.png Binary files differindex 62a0093c8..f5abd6b0c 100644 --- a/images/updated.png +++ b/images/updated.png diff --git a/images/vgrad_light.png b/images/vgrad_light.png Binary files differdeleted file mode 100644 index ee278f283..000000000 --- a/images/vgrad_light.png +++ /dev/null diff --git a/images/vgrad_light_rev.png b/images/vgrad_light_rev.png Binary files differdeleted file mode 100644 index c9be32d45..000000000 --- a/images/vgrad_light_rev.png +++ /dev/null diff --git a/images/vgrad_light_rev2.png b/images/vgrad_light_rev2.png Binary files differdeleted file mode 100644 index d69a31c40..000000000 --- a/images/vgrad_light_rev2.png +++ /dev/null @@ -106,10 +106,10 @@ window.onload = init; <td class="prefsTabs" align="left" valign="bottom"> <input id="genConfigTab" class="prefsTab" type="submit" value="Preferences" onclick="selectTab('genConfig')"> - <input id="feedConfigTab" class="prefsTab" type="submit" value="Feed Configuration" + <input id="feedConfigTab" class="prefsTab" type="submit" value="My Feeds" onclick="selectTab('feedConfig')"> - <? if (ENABLE_FEED_BROWSER) { ?> - <input id="feedBrowserTab" class="prefsTab" type="submit" value="Feed Browser" + <? if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { ?> + <input id="feedBrowserTab" class="prefsTab" type="submit" value="Other Feeds" onclick="selectTab('feedBrowser')"> <? } ?> <input id="filterConfigTab" class="prefsTab" type="submit" value="Content Filtering" @@ -136,7 +136,7 @@ window.onload = init; </tr> <? if (get_pref($link, 'DISPLAY_FOOTER')) { ?> <tr> - <td class="footer" colspan="2"> + <td class="prefFooter" colspan="2"> <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?= VERSION ?> © 2005-2006 Andrew Dolgov <? if (WEB_DEMO_MODE) { ?> <br>Running in demo mode, some functionality is disabled. diff --git a/tt-rss.css b/tt-rss.css index 2829fbd36..e45d7762b 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -12,7 +12,7 @@ table.main td.headerBox { /* background-image : url("images/vgrad_light_rev2.png"); background-position : top left; background-repeat : repeat-x; */ - background-color : white; + background-color : white; } table.main td.header { @@ -45,9 +45,10 @@ table.main td.headlinesToolbarBox { border-width : 0px 0px 1px 1px; border-style : solid; border-color : #88b0f0; - background-image : url("images/vgrad_light.png"); + background-image : url("images/toolbar.png"); background-position : bottom left; background-repeat : repeat-x; + background-color : white; } table.main td.footer { @@ -57,19 +58,31 @@ table.main td.footer { padding : 10px; text-align : center; font-size : x-small; -/* background-image : url("images/vgrad_light_rev2.png"); + background-image : url("images/footer.png"); background-position : top left; - background-repeat : repeat-x; */ - background-color : #ecf4ff; + background-repeat : repeat-x; + background-color : white; + color : black; +} + +table.main td.prefFooter { + border-width : 1px 0px 0px 0px; + border-style : solid; + border-color : #88b0f0; + padding : 10px; + text-align : center; + font-size : x-small; + background-color : white; color : black; } + table.main td.footer a { color : black; } table.main td.footer a:hover { - color : #5050aa; + color : #4684ff; } table.main td.headlines { @@ -99,15 +112,21 @@ table.main td.content { table.main td.prefContent { height : 100%; - background-image : url("images/vgrad_light_rev.png"); + background-image : url("images/prefs-content.png"); background-position : top left; background-repeat : repeat-x; border-width : 1px 0px 0px 0px; border-style : solid; - border-color : #c0c0c0; + border-color : #88b0f0; padding : 20px; + background-color : white; } +/*td.prefContent .even, td.prefContent .even td { + background-color : #ecf4ff; + border-color : #88b0f0; +} */ + div.postReply { /* background-image : url("images/vgrad_light_rev.png"); background-position : top left; @@ -117,7 +136,7 @@ div.postReply { } div.postReply a { - color : #5050aa; + color : #4684ff; } div.postReply a:hover { @@ -161,7 +180,7 @@ ul.feedList li.feedCat a { } ul.feedList li.feedCat a:hover { - color : #5050aa; + color : #4684ff; } ul.feedCatList { @@ -239,14 +258,14 @@ ul.feedlist li.feedSelected a, ul.feedlist li.labelSelected a, ul.feedlist li.virtSelected a, ul.feedlist li.tagSelected a { - color : #5050aa; + color : #4684ff; } ul.feedlist li.feedUnreadSelected a, ul.feedlist li.labelUnreadSelected a, ul.feedlist li.virtUnreadSelected a, ul.feedlist li.tagUnreadSelected a { - color : #5050aa; + color : #4684ff; } ul.feedlist li.feedUnreadSelected, @@ -277,7 +296,7 @@ h2 { font-weight : bold; border-width : 0px 0px 1px 0px; border-style : solid; - border-color : #e0e0e0; + border-color : #88b0f0; } h3 { @@ -285,7 +304,7 @@ h3 { font-weight : bold; border-width : 0px 0px 1px 0px; border-style : solid; - border-color : #e0e0e0; + border-color : #88b0f0; } hr { @@ -300,7 +319,7 @@ a { } a:hover { - color : #5050aa; + color : #4684ff; } #piggie { @@ -389,7 +408,7 @@ iframe.contentFrame, iframe.headlinesFrame { height : 100%; } -.button { +/*.button { border : 1px solid #d0d0d0; background-image : url("images/button.png"); background-position : top; @@ -404,25 +423,42 @@ iframe.contentFrame, iframe.headlinesFrame { color : black; } +.disabledButton { + border : 1px solid #c0c0c0; + background-color : white; + color : gray; +} + a.button { padding : 2px 5px 2px 5px; font-size : small; -} +} */ -.evenUnreadSelected, .evenSelectedUnread { - background-color : #cbe0fc; +.evenUnreadSelected, .evenSelectedUnread, .evenUnreadSelected td, + .evenSelectedUnread td { + background-color : #fff7d5; font-weight : bold; + border-width : 1px 0px 1px 0px; + border-style : solid; + border-color : #e7d796; } -.oddUnreadSelected, .oddSelectedUnread { - background-color : #cbe0fc; +.oddUnreadSelected, .oddSelectedUnread, .oddUnreadSelected td, + .oddSelectedUnread td { + background-color : #fff7d5; font-weight : bold; } -.evenSelected, .oddSelected { - background-color : #cbe0fc; +.evenSelected, .evenSelected td { + background-color : #fff7d5; + border-width : 1px 0px 1px 0px; + border-style : solid; + border-color : #e7d796; } +.oddSelected, .evenSelected td { + background-color : #fff7d5; +} /* .feedUnreadSelected, .feedSelectedUnread, @@ -432,31 +468,35 @@ a.button { font-weight : bold; } */ -.disabledButton { - border : 1px solid #c0c0c0; - background-color : white; - color : gray; -} -.evenGrayed { +.evenGrayed, .evenGrayed td { background-color : #f0f0f0; color : #909090; + border-width : 1px 0px 1px 0px; + border-style : solid; + border-color : #88b0f0; } .oddGrayed { color : #909090; } -.even { +.even, .even td { + border-width : 1px 0px 1px 0px; + border-style : solid; + border-color : #c0c0c0; background-color : #f0f0f0; } -.evenUnread { +.evenUnread, .evenUnread td { background-color : #f0f0f0; font-weight : bold; + border-width : 1px 0px 1px 0px; + border-style : solid; + border-color : #c0c0c0; } -.oddUnread { +.oddUnread, .oddUnread td { font-weight : bold; } @@ -464,26 +504,27 @@ a.button { display : none; } +/* td > input, div > input { border : 1px solid #a0a0a0; -} +} */ /* preferences */ tr.title td { border-width : 0px 0px 1px 0px; - border-color : #f0f0f0; + border-color : #88b0f0; border-style : solid; font-size : x-small; - color : gray; + color : black; } tr.title td a { - color : gray; + color : black; } tr.title td a:hover { - color : #5050aa; + color : #4684ff; } table.prefFeedList td.feedEditCat { @@ -544,8 +585,8 @@ div.helpResponse { } -#infoBox { - border : 1px solid #c0c0c0; +#infoBox { + border : 1px solid #88b0f0; padding-bottom : 10px; font-size : small; position : relative; @@ -565,9 +606,6 @@ div.helpResponse { } div.infoBoxContents { - background-image : url("images/vgrad_light_rev2.png"); - background-position : top left; - background-repeat : repeat-x; padding : 5px; margin-bottom : 5px; } @@ -576,16 +614,15 @@ div.infoBoxContents td { font-size : small; } - div.helpResponse h1, div.infoBoxContents h1 { - border-width : 0px 0px 1px 0px; +/* border-width : 0px 0px 1px 0px; border-style : solid; - border-color : #c0c0c0; + border-color : #c0c0c0; */ font-size : 16pt; } div.helpResponse h2, div.infoBoxContents h2 { - border-width : 0px 0px 0px 0px; +/* border-width : 0px 0px 0px 0px; */ font-size : 12pt; } @@ -606,19 +643,23 @@ input.extSearch { table.main td.prefsTabs { padding-left : 5px; +/* background-image : url("images/toolbar.png"); + background-position : bottom left; + background-repeat : repeat-x; */ } -input.prefsTab { +input.prefsTab { border-width : 1px 1px 0px 1px; - border-color : #c0c0c0; + border-color : #88b0f0; padding : 2px 7px 2px 7px; margin : 0px 1px 0px 0px; width : 130px; - background-image : url("images/vgrad_light_rev2.png"); +/* background-image : url("images/vgrad_light_rev2.png"); background-position : top left; - background-repeat : repeat-x; + background-repeat : repeat-x; */ -moz-border-radius : 7px 7px 0px 0px; font-size : small; + background-color : white; } input.prefsTabSelected { @@ -627,30 +668,31 @@ input.prefsTabSelected { padding : 2px 7px 2px 7px; margin : 0px 1px 0px 0px; width : 130px; - background : white; + background : #88b0f0; font-weight : bold; background-position : top left; background-repeat : repeat-x; -moz-border-radius : 7px 7px 0px 0px; font-size : small; + color : white; } -input.prefsTab:hover { +/*input.prefsTab:hover { background : white; -} +}*/ div.warning { - background : #fffff0; - border : 1px solid #c0c0c0; - padding : 5px; + background : #fff7d5; + border : 1px solid #d7c47a; + padding : 3px; margin : 5px; font-size : x-small; } div.notice { background : #ffffff; - border : 1px solid #c0c0c0; + border : 1px solid #88b0f0; padding : 5px; margin : 5px; font-size : x-small; @@ -947,6 +989,7 @@ ul.userFeedList { height : 300px; overflow : auto; list-style-type : none; + border : 1px solid #88b0f0; } /* #browseBigFeedList li.oddSelected { @@ -961,6 +1004,7 @@ ul.browseFeedList { list-style-type : none; margin : 0px 0px 5px 0px; padding : 0px; + border : 1px solid #88b0f0; } ul.browseFeedList li { |
