remove obsolete images; layout cleanup
Before Width: | Height: | Size: 879 B |
Before Width: | Height: | Size: 873 B |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 847 B |
Before Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 100 B |
Before Width: | Height: | Size: 110 B |
Before Width: | Height: | Size: 187 B |
84
tt-rss.css
|
@ -961,46 +961,6 @@ html, body#ttrssPrefs, #main {
|
||||||
|
|
||||||
/* preferences layout */
|
/* preferences layout */
|
||||||
|
|
||||||
/* #prefFooter {
|
|
||||||
position : absolute;
|
|
||||||
bottom : 0px;
|
|
||||||
height : 20px;
|
|
||||||
text-align : center;
|
|
||||||
color : gray;
|
|
||||||
font-size : 12px;
|
|
||||||
background-image : url("images/footer.png");
|
|
||||||
background-position : top left;
|
|
||||||
background-repeat : repeat-x;
|
|
||||||
background-color : white;
|
|
||||||
right : 0px;
|
|
||||||
left : 261px;
|
|
||||||
padding : 10px;
|
|
||||||
border-collapse : collapse;
|
|
||||||
border-width : 1px 0px 0px 0px;
|
|
||||||
border-style : solid;
|
|
||||||
border-color : #88b0f0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#prefFooter {
|
|
||||||
left : 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#footer a, #prefFooter a {
|
|
||||||
color : gray;
|
|
||||||
}
|
|
||||||
|
|
||||||
#footer a:hover, #prefFooter a:hover {
|
|
||||||
color : black;
|
|
||||||
}
|
|
||||||
|
|
||||||
#prefHeader {
|
|
||||||
color : #4684ff;
|
|
||||||
font-size : 12px;
|
|
||||||
margin : 10px;
|
|
||||||
height : 33px;
|
|
||||||
} */
|
|
||||||
|
|
||||||
div.return {
|
div.return {
|
||||||
float : right;
|
float : right;
|
||||||
font-size : 12px;
|
font-size : 12px;
|
||||||
|
@ -1015,34 +975,6 @@ div.return a:hover {
|
||||||
color : black;
|
color : black;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* #prefContentOuter {
|
|
||||||
clear : left;
|
|
||||||
position : absolute;
|
|
||||||
bottom : 41px;
|
|
||||||
top : 75px;
|
|
||||||
left : 0px;
|
|
||||||
right : 0px;
|
|
||||||
min-height : 300px;
|
|
||||||
border-width : 1px 0px 0px 0px;
|
|
||||||
border-color : #88b0f0;
|
|
||||||
border-style : solid;
|
|
||||||
font-size : 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#prefContent {
|
|
||||||
z-index : 4;
|
|
||||||
background-image : url("images/prefs-content.png");
|
|
||||||
background-position : top left;
|
|
||||||
background-repeat : repeat-x;
|
|
||||||
position : absolute;
|
|
||||||
bottom : 0px;
|
|
||||||
top : 0px;
|
|
||||||
left : 0px;
|
|
||||||
right : 0px;
|
|
||||||
padding : 1em;
|
|
||||||
overflow : auto;
|
|
||||||
} */
|
|
||||||
|
|
||||||
#header .logo {
|
#header .logo {
|
||||||
float : right;
|
float : right;
|
||||||
margin-left : 10px;
|
margin-left : 10px;
|
||||||
|
@ -1102,22 +1034,6 @@ div.autocomplete ul li {
|
||||||
float : right;
|
float : right;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
div.topLinks {
|
|
||||||
float : right;
|
|
||||||
color : gray;
|
|
||||||
font-size : 12px;
|
|
||||||
line-height : 120%;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.topLinks a {
|
|
||||||
color : #4684ff;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.topLinks a:hover {
|
|
||||||
color : black;
|
|
||||||
} */
|
|
||||||
|
|
||||||
#header a.feedback {
|
#header a.feedback {
|
||||||
color : #009900;
|
color : #009900;
|
||||||
}
|
}
|
||||||
|
|
44
tt-rss.php
|
@ -1,12 +1,12 @@
|
||||||
<?php
|
<?php
|
||||||
require_once "functions.php";
|
require_once "functions.php";
|
||||||
require_once "sessions.php";
|
require_once "sessions.php";
|
||||||
require_once "sanity_check.php";
|
require_once "sanity_check.php";
|
||||||
require_once "version.php";
|
require_once "version.php";
|
||||||
require_once "config.php";
|
require_once "config.php";
|
||||||
require_once "db-prefs.php";
|
require_once "db-prefs.php";
|
||||||
|
|
||||||
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
|
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
|
||||||
|
|
||||||
init_connection($link);
|
init_connection($link);
|
||||||
|
|
||||||
|
@ -17,9 +17,9 @@
|
||||||
no_cache_incantation();
|
no_cache_incantation();
|
||||||
|
|
||||||
header('Content-Type: text/html; charset=utf-8');
|
header('Content-Type: text/html; charset=utf-8');
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
|
@ -65,12 +65,9 @@
|
||||||
</div>
|
</div>
|
||||||
<noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
|
<noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="header">
|
<div id="header">
|
||||||
<!-- <img class="logo" src="<?php echo theme_image($link, 'images/logo.png') ?>"
|
|
||||||
onclick="window.open('http://tt-rss.org')" title="Tiny Tiny RSS"/> -->
|
|
||||||
|
|
||||||
<?php if (!SINGLE_USER_MODE) { ?>
|
<?php if (!SINGLE_USER_MODE) { ?>
|
||||||
<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
|
<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
@ -85,10 +82,10 @@
|
||||||
| <a href="logout.php"><?php echo __('Logout') ?></a>
|
| <a href="logout.php"><?php echo __('Logout') ?></a>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
<img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
|
<img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
|
||||||
width="13" height="13"
|
width="13" height="13"
|
||||||
src="<?php echo theme_image($link, 'images/new_version.png') ?>"
|
src="<?php echo theme_image($link, 'images/new_version.png') ?>"
|
||||||
title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>"
|
title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>"
|
||||||
alt="new_version_icon"/>
|
alt="new_version_icon"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -120,16 +117,16 @@
|
||||||
title="<?php echo __("News") ?>">
|
title="<?php echo __("News") ?>">
|
||||||
|
|
||||||
<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
|
<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
|
||||||
<div id="main-toolbar" dojoType="dijit.Toolbar">
|
<div id="main-toolbar" dojoType="dijit.Toolbar">
|
||||||
|
|
||||||
<form id="main_toolbar_form" action="" onsubmit='return false'>
|
<form id="main_toolbar_form" action="" onsubmit='return false'>
|
||||||
|
|
||||||
<button dojoType="dijit.form.Button" id="collapse_feeds_btn"
|
<button dojoType="dijit.form.Button" id="collapse_feeds_btn"
|
||||||
onclick="collapse_feedlist()"
|
onclick="collapse_feedlist()"
|
||||||
title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
|
title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
|
||||||
<<</button>
|
<<</button>
|
||||||
|
|
||||||
<select name="view_mode" title="<?php echo __('Show articles') ?>"
|
<select name="view_mode" title="<?php echo __('Show articles') ?>"
|
||||||
onchange="viewModeChanged()"
|
onchange="viewModeChanged()"
|
||||||
dojoType="dijit.form.Select">
|
dojoType="dijit.form.Select">
|
||||||
<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
|
<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
|
||||||
|
@ -142,7 +139,7 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select title="<?php echo __('Sort articles') ?>"
|
<select title="<?php echo __('Sort articles') ?>"
|
||||||
onchange="viewModeChanged()"
|
onchange="viewModeChanged()"
|
||||||
dojoType="dijit.form.Select" name="order_by">
|
dojoType="dijit.form.Select" name="order_by">
|
||||||
<option selected="selected" value="default"><?php echo __('Default') ?></option>
|
<option selected="selected" value="default"><?php echo __('Default') ?></option>
|
||||||
<option value="date"><?php echo __('Date') ?></option>
|
<option value="date"><?php echo __('Date') ?></option>
|
||||||
|
@ -150,11 +147,11 @@
|
||||||
<option value="score"><?php echo __('Score') ?></option>
|
<option value="score"><?php echo __('Score') ?></option>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<button dojoType="dijit.form.Button" name="update"
|
<button dojoType="dijit.form.Button" name="update"
|
||||||
onclick="scheduleFeedUpdate()">
|
onclick="scheduleFeedUpdate()">
|
||||||
<?php echo __('Update') ?></button>
|
<?php echo __('Update') ?></button>
|
||||||
|
|
||||||
<button dojoType="dijit.form.Button"
|
<button dojoType="dijit.form.Button"
|
||||||
onclick="catchupCurrentFeed()">
|
onclick="catchupCurrentFeed()">
|
||||||
<?php echo __('Mark as read') ?></button>
|
<?php echo __('Mark as read') ?></button>
|
||||||
|
|
||||||
|
@ -190,7 +187,7 @@
|
||||||
<div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
|
<div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="headlines-frame" dojoType="dijit.layout.ContentPane"
|
<div id="headlines-frame" dojoType="dijit.layout.ContentPane"
|
||||||
onscroll="headlines_scroll_handler(this)" region="center">
|
onscroll="headlines_scroll_handler(this)" region="center">
|
||||||
<div id="headlinesInnerContainer">
|
<div id="headlinesInnerContainer">
|
||||||
<div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
|
<div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
|
||||||
|
@ -206,15 +203,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
|
|
||||||
<a href="http://tt-rss.org/">Tiny Tiny RSS</a>
|
|
||||||
<?php if (!defined('HIDE_VERSION')) { ?>
|
|
||||||
v<?php echo VERSION ?>
|
|
||||||
<?php } ?>
|
|
||||||
© 2005–<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
|
|
||||||
</div> -->
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php db_close($link); ?>
|
<?php db_close($link); ?>
|
||||||
|
|