restyle resizer

diff --git a/feedlist.js b/feedlist.js
index 1f851e0e8156d19b410eb412c0d25bee7937334e..5ba9ec0b83fc38b23d2b67fcccc14c85fe2cf113 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -489,6 +489,7 @@ function mouse_down_handler(e) {
                        mouse_x = 0;
                        mouse_y = 0;
                        document.onselectstart = function() { return false; };
+                       return false;
                }
        } catch (e) {
                exception_error("mouse_move_handler", e);

diff --git a/images/fresh_new.png b/images/fresh_new.png
new file mode 100644 (file)
index 0000000..222f5eb
Binary files /dev/null and b/images/fresh_new.png differ

diff --git a/images/piggie_icon.png b/images/piggie_icon.png
new file mode 100644 (file)
index 0000000..38733c5
Binary files /dev/null and b/images/piggie_icon.png differ

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

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

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

diff --git a/themes/3pane/images/resize_handle_vert.png b/themes/3pane/images/resize_handle_vert.png
new file mode 100644 (file)
index 0000000..18d0451
Binary files /dev/null and b/themes/3pane/images/resize_handle_vert.png differ

diff --git a/themes/3pane/images/resize_vert.png b/themes/3pane/images/resize_vert.png
new file mode 100644 (file)
index 0000000..763d42b
Binary files /dev/null and b/themes/3pane/images/resize_vert.png differ

diff --git a/themes/3pane/theme.css b/themes/3pane/theme.css
index da4870d4ed67115fa170ebd0ce3e5a6953364c30..2df6ecd6d6e85ab5c76909c05d688ddde9a78300 100644 (file)
--- a/themes/3pane/theme.css
+++ b/themes/3pane/theme.css
@@ -30,3 +30,17 @@ div.postHeader div.postDateRTL {
 span.headlineInnerTitle {
        display : none;
 }
+
+#resize-grabber {
+       height : 100%;
+       width : 5px;
+       border-width : 0px 1px 0px 0px;
+       cursor : move;
+       text-align : center;
+       float : left;
+       background : url("images/resize_vert.png") top left;
+}
+
+#content-insert {
+       margin-left : 5px;
+}

diff --git a/themes/compact/images/resize_horiz.png b/themes/compact/images/resize_horiz.png
new file mode 100644 (file)
index 0000000..cbf1909
Binary files /dev/null and b/themes/compact/images/resize_horiz.png differ

diff --git a/themes/compat/theme.css b/themes/compat/theme.css
index fb639899b2d4138fd32e5edac58ae65573201d13..810cff7db7fa5a059d3015da7a8137800ad3cb78 100644 (file)
--- a/themes/compat/theme.css
+++ b/themes/compat/theme.css
@@ -914,5 +914,6 @@ table.headlinesList tr.feedTitle td a, div.cdmFeedTitle a {
 
 #resize-grabber {
        border-color : #c0c0c0;
+       background : url("images/resize_horiz.png") top left;
 }
 

diff --git a/themes/graphite/images/footer.png b/themes/graphite/images/footer.png
deleted file mode 100644 (file)
index 770a821..0000000
Binary files a/themes/graphite/images/footer.png and /dev/null differ

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

diff --git a/themes/graphite/images/toolbar.png b/themes/graphite/images/toolbar.png
deleted file mode 100644 (file)
index dd76142..0000000
Binary files a/themes/graphite/images/toolbar.png and /dev/null differ

diff --git a/themes/graphite/images/ttrss_logo.png b/themes/graphite/images/ttrss_logo.png
deleted file mode 100644 (file)
index 2cedc35..0000000
Binary files a/themes/graphite/images/ttrss_logo.png and /dev/null differ

diff --git a/themes/graphite/theme.css b/themes/graphite/theme.css
deleted file mode 100644 (file)
index f465a0e..0000000
--- a/themes/graphite/theme.css
+++ /dev/null
@@ -1,215 +0,0 @@
-div.postReply div.postHeader {
-       border : 1px solid #a2aab7;
-}
-
-ul.feedList li.feedCat a:hover {
-       color : #5d6978;
-}
-
-li.feedSelected a,
-li.labelSelected a,
-li.virtSelected a,
-li.tagSelected a {
-       color : #5d6978;
-}
-
-li.feedUnreadSelected a,
-li.labelUnreadSelected a,
-li.virtUnreadSelected a,
-li.tagUnreadSelected a {
-       color : #5d6978;
-}
-
-a:hover {
-       color : #5d6978;
-}
-
-/* preferences */
-
-tr.title td {
-       color : #5d6978;
-}
-
-tr.title td a {
-       color : #5d6978;
-}
-
-table.prefFeedList td.feedEditCat {
-       border-color : #a2aab7;
-}
-
-div.prefFeedCatHolder {
-       border : 1px solid #a2aab7;
-}
-
-a.helpLink:hover {
-       color : #5d6978;
-}
-
-#infoBoxTitle {
-       border-color : #a2aab7;
-       background-color : #a2aab7;
-}
-
-
-#infoBox {     
-       border-color : #a2aab7;
-       background : white;
-}
-
-div.infoBoxContents a {
-       color : #5d6978;
-}
-
-div.prefsTab {
-       border-color : #a2aab7;
-}
-
-div.prefsTabSelected {
-       border-color : #a2aab7;
-       background-color : #e3edf9;
-}
-
-table.loginForm {
-       background-color : #c8d1dc;
-}
-
-table.innerLoginForm {
-       border : 1px solid #a2aab7;
-}
-
-.insensitive a {
-       color : #5d6978;
-}
-
-span.contentPreview:hover {
-       color : #5d6978;
-}
-
-div.cdmArticle {
-       border-color : #c0c0c0;
-       border-width : 0px 0px 1px 0px;
-       border-style : solid;
-       background-color : #fafafa;
-       margin : 0px;
-       padding : 10px;
-}
-
-div.cdmArticleUnread {
-       border-color : #c0c0c0;
-       border-width : 0px 0px 1px 0px;
-       border-style : solid;
-       background-color : #fafeff;
-       margin : 0px;
-       padding : 10px;
-}
-
-div.cdmArticleSelected, div.cdmArticleUnreadSelected {
-       margin : 0px;
-       padding : 10px;
-       background-color : #fff7d5;
-       border-color : #e7d796;
-       border-width : 0px 0px 1px 0px;
-       border-style : solid;
-}
-
-div.cdmHeader a:hover {
-       color : #5d6978;
-}
-
-span.groupPrompt {
-       color : #5d6978;
-}
-
-ul.feedErrorsList {
-       border : 1px solid #a2aab7;
-}
-
-ul.userFeedList {
-       border : 1px solid #a2aab7;
-}
-
-ul.labelTestResults {
-       border : 1px solid #a2aab7;
-}
-
-ul.filterTestResults {
-       border : 1px solid #a2aab7;
-}
-
-ul.browseFeedList {
-       border : 1px solid #a2aab7;
-}
-
-div.cdmContent a {
-       color : #5d6978;
-}
-
-a.cdmToggleLink:hover {
-       color : #5d6978;
-}
-
-span.debugTS {
-       color : #5d6978;
-}
-
-table.loginForm2 .loginTop {
-       border-color : #a2aab7;
-       }
-
-
-table.loginForm2 .loginBottom {
-       border-color : #a2aab7;
-}
-
-table.loginForm2 .loginBottom a:hover {
-       color : #5d6978;
-}
-
-/* layout */
-
-#header {
-       color : #5d6978;
-}
-
-#feeds-holder {
-       border-color : #a2aab7;
-}
-
-#toolbar {
-       background-image : url("images/toolbar.png");
-}
-
-div.headlines_normal {
-       border-color : #a2aab7;
-}
-
-div.headlines_cdm {
-       border-color : #a2aab7;
-}
-
-#content-frame {
-       border-color : #a2aab7;
-}
-
-#footer, #prefFooter {
-       background-image : url("images/footer.png");
-       border-color : #a2aab7;
-
-}
-
-/* preferences layout */
-
-#prefHeader {
-       color : #5d6978;
-}
-
-div.return a {
-       color : #5d6978;
-}
-
-#prefContent {
-       background-image : url("images/prefs-content.png");
-       border-color : #a2aab7;
-}
-

diff --git a/themes/graycube/images/._resize_handle_horiz.png b/themes/graycube/images/._resize_handle_horiz.png
new file mode 100644 (file)
index 0000000..f79bfc2
Binary files /dev/null and b/themes/graycube/images/._resize_handle_horiz.png differ

diff --git a/themes/graycube/images/._resize_horiz.png b/themes/graycube/images/._resize_horiz.png
new file mode 100644 (file)
index 0000000..3a6d9e5
Binary files /dev/null and b/themes/graycube/images/._resize_horiz.png differ

diff --git a/themes/graycube/images/resize_handle_horiz.png b/themes/graycube/images/resize_handle_horiz.png
new file mode 100644 (file)
index 0000000..a2e347e
Binary files /dev/null and b/themes/graycube/images/resize_handle_horiz.png differ

diff --git a/themes/graycube/images/resize_horiz.png b/themes/graycube/images/resize_horiz.png
new file mode 100644 (file)
index 0000000..cbf1909
Binary files /dev/null and b/themes/graycube/images/resize_horiz.png differ

diff --git a/themes/graycube/theme.css b/themes/graycube/theme.css
index 5ea3b7692bf59f3fa3a51ce27d76bf950c7d2562..b078c6b063d516fcdf0e02a70175f522f99fc5fb 100644 (file)
--- a/themes/graycube/theme.css
+++ b/themes/graycube/theme.css
@@ -500,7 +500,8 @@ div.tagCloudContainer {
 }
 
 #resize-grabber {
-       right : 40px;
        border-color : gray;
+       background : url("images/resize_horiz.png") top left;
 }
 
+

diff --git a/tt-rss.css b/tt-rss.css
index 1351d75ae35841cf34babfd37c37dadf6a3079ba..fd7134f326a46f3550df59d5835ad6764c3311dc 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1508,7 +1508,7 @@ div.headlines_cdm {
        border-collapse : collapse;
 }
 
-#resize-grabber {
+/*#resize-grabber {
        position : absolute;
        border-width : 1px;
        border-style : dotted;
@@ -1521,6 +1521,16 @@ div.headlines_cdm {
        top : 20px;
        display : none;
        cursor : move;
+}*/
+
+#resize-grabber {
+       height : 5px;
+       border-width : 0px 0px 1px 0px;
+       border-style : solid;
+       border-color : #88b0f0;
+       background : url("images/resize_horiz.png") top left;
+       cursor : move;
+       text-align : center;
 }
 
 #footer, #prefFooter {
@@ -1972,3 +1982,7 @@ div#l_progress_i {
        background-color : #88b0f0;
        height : 10px;
 }
+
+#content-insert {
+       background-color : white;
+}

diff --git a/tt-rss.js b/tt-rss.js
index 3c9ce336e632edd58bafbbc772e719bbe6264c8a..71ebf13bc72d7efee2538d109c6b5e336499c72c 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -371,7 +371,8 @@ function resize_headlines(delta_x, delta_y) {
                var f_frame = document.getElementById("footer");
                var feeds_frame = document.getElementById("feeds-holder");
                var resize_grab = document.getElementById("resize-grabber");
-       
+               var resize_handle = document.getElementById("resize-handle");
+
                if (!c_frame || !h_frame) return;
        
                if (feeds_frame && getInitParam("theme") == "compat") {
@@ -395,6 +396,9 @@ function resize_headlines(delta_x, delta_y) {
                        resize_grab.style.left = (h_frame.offsetLeft + h_frame.offsetWidth - 
                                4) + "px";
                        resize_grab.style.display = "block";
+
+                       resize_handle.src = "themes/3pane/images/resize_handle_vert.png";
+                       resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
        
                } else {
        
@@ -413,11 +417,17 @@ function resize_headlines(delta_x, delta_y) {
        
                        var theme_c = 0;
        
-                       if (getInitParam("theme") == "graycube") theme_c = 1;
+                       if (getInitParam("theme") == "graycube") {
+                               theme_c = 1;
+                       }
+
+                       if (getInitParam("theme") == "graycube" || getInitParam("theme") == "compat") {
+                               resize_handle.src = "themes/graycube/images/resize_handle_horiz.png";
+                       }
        
-                       resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 
+/*                     resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 
                                4 - theme_c) + "px";
-                       resize_grab.style.display = "block";
+                       resize_grab.style.display = "block"; */
        
                }
        

diff --git a/tt-rss.php b/tt-rss.php
index f98d774b855e5d3631b816ac3b11279e24e11018..a49e62d83058c7c59a9a05579ab15c1913a82c82 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -231,10 +231,16 @@ window.onload = init;
 <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
        <div id="headlines-frame" class="headlines_normal">
                <div class="whiteBox"><?php echo __('No feed selected.') ?></div></div>
-       <div id="content-frame"><div class="whiteBox">&nbsp;</div></div>
+       <div id="content-frame">
        <div id="resize-grabber"
                onmouseover="enable_resize(true)" onmouseout="enable_resize(false)"
-               title="<?php echo __('Drag me to resize panels') ?>"> </div>
+               title="<?php echo __('Drag me to resize panels') ?>"> 
+               <img src="images/resize_handle_horiz.png" id="resize-handle" 
+                       onmouseover="enable_resize(true)" onmouseout="enable_resize(false)"
+                       alt="">
+               </div>
+       <div id="content-insert">&nbsp;</div>
+       <!-- <div class="whiteBox">&nbsp;</div> --> </div>
 <?php } else { ?>
        <div id="headlines-frame" class="headlines_cdm">
                <div class="whiteBox"><?php echo __('No feed selected.') ?></div></div>

diff --git a/viewfeed.js b/viewfeed.js
index 6e788cff324de4428c752af356bd7a54d96e1a1f..ae9e443e2c99503ae04219dc08d50b437730c03a 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -256,7 +256,9 @@ function render_article(article) {
                        f.scrollTop = 0;
                } catch (e) { };
 
-               f.innerHTML = article;
+               var fi = document.getElementById("content-insert");
+
+               fi.innerHTML = article;
 
        } catch (e) {
                exception_error("render_article", e);
@@ -363,8 +365,8 @@ function article_callback2(transport, id, feed_id) {
                
                } else {
                        debug("article_callback: returned no XML object");
-                       var f = document.getElementById("content-frame");
-                       f.innerHTML = "<div class='whiteBox'>" + __('Could not display article (missing XML object)') + "</div>";
+                       //var f = document.getElementById("content-frame");
+                       //f.innerHTML = "<div class='whiteBox'>" + __('Could not display article (missing XML object)') + "</div>";
                }
 
                var date = new Date();