diff options
25 files changed, 60 insertions, 226 deletions
diff --git a/feedlist.js b/feedlist.js index 1f851e0e8..5ba9ec0b8 100644 --- 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 Binary files differnew file mode 100644 index 000000000..222f5ebe1 --- /dev/null +++ b/images/fresh_new.png diff --git a/images/piggie_icon.png b/images/piggie_icon.png Binary files differnew file mode 100644 index 000000000..38733c501 --- /dev/null +++ b/images/piggie_icon.png diff --git a/images/resize_handle_horiz.png b/images/resize_handle_horiz.png Binary files differnew file mode 100644 index 000000000..b0ef93f1b --- /dev/null +++ b/images/resize_handle_horiz.png diff --git a/images/resize_horiz.png b/images/resize_horiz.png Binary files differnew file mode 100644 index 000000000..ce947c9b2 --- /dev/null +++ b/images/resize_horiz.png diff --git a/images/resizer.png b/images/resizer.png Binary files differnew file mode 100644 index 000000000..ca3b02f81 --- /dev/null +++ b/images/resizer.png diff --git a/themes/3pane/images/resize_handle_vert.png b/themes/3pane/images/resize_handle_vert.png Binary files differnew file mode 100644 index 000000000..18d045159 --- /dev/null +++ b/themes/3pane/images/resize_handle_vert.png diff --git a/themes/3pane/images/resize_vert.png b/themes/3pane/images/resize_vert.png Binary files differnew file mode 100644 index 000000000..763d42b56 --- /dev/null +++ b/themes/3pane/images/resize_vert.png diff --git a/themes/3pane/theme.css b/themes/3pane/theme.css index da4870d4e..2df6ecd6d 100644 --- 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 Binary files differnew file mode 100644 index 000000000..cbf190971 --- /dev/null +++ b/themes/compact/images/resize_horiz.png diff --git a/themes/compat/theme.css b/themes/compat/theme.css index fb639899b..810cff7db 100644 --- 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 Binary files differdeleted file mode 100644 index 770a82121..000000000 --- a/themes/graphite/images/footer.png +++ /dev/null diff --git a/themes/graphite/images/prefs-content.png b/themes/graphite/images/prefs-content.png Binary files differdeleted file mode 100644 index 1a9f7cf22..000000000 --- a/themes/graphite/images/prefs-content.png +++ /dev/null diff --git a/themes/graphite/images/toolbar.png b/themes/graphite/images/toolbar.png Binary files differdeleted file mode 100644 index dd7614278..000000000 --- a/themes/graphite/images/toolbar.png +++ /dev/null diff --git a/themes/graphite/images/ttrss_logo.png b/themes/graphite/images/ttrss_logo.png Binary files differdeleted file mode 100644 index 2cedc35ed..000000000 --- a/themes/graphite/images/ttrss_logo.png +++ /dev/null diff --git a/themes/graphite/theme.css b/themes/graphite/theme.css deleted file mode 100644 index f465a0e14..000000000 --- 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 Binary files differnew file mode 100644 index 000000000..f79bfc23f --- /dev/null +++ b/themes/graycube/images/._resize_handle_horiz.png diff --git a/themes/graycube/images/._resize_horiz.png b/themes/graycube/images/._resize_horiz.png Binary files differnew file mode 100644 index 000000000..3a6d9e541 --- /dev/null +++ b/themes/graycube/images/._resize_horiz.png diff --git a/themes/graycube/images/resize_handle_horiz.png b/themes/graycube/images/resize_handle_horiz.png Binary files differnew file mode 100644 index 000000000..a2e347e3d --- /dev/null +++ b/themes/graycube/images/resize_handle_horiz.png diff --git a/themes/graycube/images/resize_horiz.png b/themes/graycube/images/resize_horiz.png Binary files differnew file mode 100644 index 000000000..cbf190971 --- /dev/null +++ b/themes/graycube/images/resize_horiz.png diff --git a/themes/graycube/theme.css b/themes/graycube/theme.css index 5ea3b7692..b078c6b06 100644 --- 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 1351d75ae..fd7134f32 100644 --- 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; +} @@ -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 f98d774b8..a49e62d83 100644 --- 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"> </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"> </div> + <!-- <div class="whiteBox"> </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 6e788cff3..ae9e443e2 100644 --- 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(); |
