remove obsolete images; layout cleanup

diff --git a/images/button.png b/images/button.png
deleted file mode 100644 (file)
index db22782..0000000
Binary files a/images/button.png and /dev/null differ

diff --git a/images/button_pressed.png b/images/button_pressed.png
deleted file mode 100644 (file)
index be0fb4a..0000000
Binary files a/images/button_pressed.png and /dev/null differ

diff --git a/images/cat-collapse.png b/images/cat-collapse.png
deleted file mode 100644 (file)
index ee4cebb..0000000
Binary files a/images/cat-collapse.png and /dev/null differ

diff --git a/images/cat-uncollapse.png b/images/cat-uncollapse.png
deleted file mode 100644 (file)
index 926bc5f..0000000
Binary files a/images/cat-uncollapse.png and /dev/null differ

diff --git a/images/offline-sync.gif b/images/offline-sync.gif
deleted file mode 100644 (file)
index 71932f9..0000000
Binary files a/images/offline-sync.gif and /dev/null differ

diff --git a/images/offline.png b/images/offline.png
deleted file mode 100644 (file)
index 5cd9b31..0000000
Binary files a/images/offline.png and /dev/null differ

diff --git a/images/prefs-content.png b/images/prefs-content.png
deleted file mode 100644 (file)
index c975a45..0000000
Binary files a/images/prefs-content.png and /dev/null differ

diff --git a/images/resize_handle_horiz.png b/images/resize_handle_horiz.png
deleted file mode 100644 (file)
index b0ef93f..0000000
Binary files a/images/resize_handle_horiz.png and /dev/null differ

diff --git a/images/resize_horiz.png b/images/resize_horiz.png
deleted file mode 100644 (file)
index ce947c9..0000000
Binary files a/images/resize_horiz.png and /dev/null differ

diff --git a/images/resizer.png b/images/resizer.png
deleted file mode 100644 (file)
index ca3b02f..0000000
Binary files a/images/resizer.png and /dev/null differ

diff --git a/tt-rss.css b/tt-rss.css
index e4661e83922c26849a0eb504d1e23a6018df5d80..843799d5abdad5ae7eefcf2e903e6cad50bb911b 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -961,46 +961,6 @@ html, body#ttrssPrefs, #main {
 
 /* 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 {
        float : right;
        font-size : 12px;
@@ -1015,34 +975,6 @@ div.return a:hover {
        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 {
        float : right;
        margin-left : 10px;
@@ -1102,22 +1034,6 @@ div.autocomplete ul li {
        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 {
        color : #009900;
 }

diff --git a/tt-rss.php b/tt-rss.php
index 63c922f087028619c9d9d282a09aa5f62c6bdb0c..a68ed51ab4e91cce37523492ad7ed0581d8cd266 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -1,12 +1,12 @@
 <?php
-       require_once "functions.php"; 
+       require_once "functions.php";
        require_once "sessions.php";
        require_once "sanity_check.php";
-       require_once "version.php"; 
+       require_once "version.php";
        require_once "config.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);
 
@@ -17,9 +17,9 @@
        no_cache_incantation();
 
        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">
 <html>
 <head>
@@ -65,12 +65,9 @@
                </div>
                <noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
        </div>
-</div> 
+</div>
 
 <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 echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
        <?php } ?>
@@ -85,10 +82,10 @@
                        | <a href="logout.php"><?php echo __('Logout') ?></a>
        <?php } ?>
 
-       <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()" 
-               width="13" height="13" 
+       <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
+               width="13" height="13"
                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"/>
 </div>
 
@@ -120,16 +117,16 @@
        title="<?php echo __("News") ?>">
 
 <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'>
 
-               <button dojoType="dijit.form.Button" id="collapse_feeds_btn" 
+               <button dojoType="dijit.form.Button" id="collapse_feeds_btn"
                        onclick="collapse_feedlist()"
                        title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
                        &lt;&lt;</button>
 
-               <select name="view_mode" title="<?php echo __('Show articles') ?>" 
+               <select name="view_mode" title="<?php echo __('Show articles') ?>"
                        onchange="viewModeChanged()"
                        dojoType="dijit.form.Select">
                        <option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
@@ -142,7 +139,7 @@
                </select>
 
                <select title="<?php echo __('Sort articles') ?>"
-                       onchange="viewModeChanged()" 
+                       onchange="viewModeChanged()"
                        dojoType="dijit.form.Select" name="order_by">
                        <option selected="selected" value="default"><?php echo __('Default') ?></option>
                        <option value="date"><?php echo __('Date') ?></option>
@@ -150,11 +147,11 @@
                        <option value="score"><?php echo __('Score') ?></option>
                </select>
 
-               <button dojoType="dijit.form.Button" name="update" 
+               <button dojoType="dijit.form.Button" name="update"
                        onclick="scheduleFeedUpdate()">
                        <?php echo __('Update') ?></button>
 
-               <button dojoType="dijit.form.Button" 
+               <button dojoType="dijit.form.Button"
                        onclick="catchupCurrentFeed()">
                        <?php echo __('Mark as read') ?></button>
 
@@ -190,7 +187,7 @@
                <div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
                </div>
 
-               <div id="headlines-frame" dojoType="dijit.layout.ContentPane" 
+               <div id="headlines-frame" dojoType="dijit.layout.ContentPane"
                                onscroll="headlines_scroll_handler(this)" region="center">
                        <div id="headlinesInnerContainer">
                                <div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
@@ -206,15 +203,6 @@
 </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 } ?>
-       &copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
-</div> -->
-
 </div>
 
 <?php db_close($link); ?>