From 2ab097b2e5d0470f39021e2c27252d1ee8f20d94 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 4 Dec 2018 22:24:31 +0300 Subject: initial work for flat modern theme --- classes/feeds.php | 78 +- css/default.css | 111 +- css/dijit.less | 35 +- css/prefs.less | 3 +- css/tt-rss.less | 101 +- index.php | 2 +- js/PrefLabelTree.js | 2 +- lib/flat-ttrss/README.md | 37 + lib/flat-ttrss/dijit/Calendar.css | 216 ++ lib/flat-ttrss/dijit/Calendar.styl | 247 ++ lib/flat-ttrss/dijit/Calendar_rtl.css | 6 + lib/flat-ttrss/dijit/Calendar_rtl.styl | 17 + lib/flat-ttrss/dijit/ColorPalette.css | 66 + lib/flat-ttrss/dijit/ColorPalette.styl | 69 + lib/flat-ttrss/dijit/ColorPalette_rtl.css | 4 + lib/flat-ttrss/dijit/ColorPalette_rtl.styl | 10 + lib/flat-ttrss/dijit/Common.css | 87 + lib/flat-ttrss/dijit/Common.styl | 104 + lib/flat-ttrss/dijit/Dialog.css | 274 ++ lib/flat-ttrss/dijit/Dialog.styl | 308 ++ lib/flat-ttrss/dijit/Dialog_rtl.css | 8 + lib/flat-ttrss/dijit/Dialog_rtl.styl | 17 + lib/flat-ttrss/dijit/Editor.css | 53 + lib/flat-ttrss/dijit/Editor.styl | 69 + lib/flat-ttrss/dijit/Editor_rtl.css | 0 lib/flat-ttrss/dijit/Editor_rtl.styl | 8 + lib/flat-ttrss/dijit/InlineEditBox.css | 23 + lib/flat-ttrss/dijit/InlineEditBox.styl | 31 + lib/flat-ttrss/dijit/Menu.css | 157 + lib/flat-ttrss/dijit/Menu.styl | 191 ++ lib/flat-ttrss/dijit/Menu_rtl.css | 9 + lib/flat-ttrss/dijit/Menu_rtl.styl | 20 + lib/flat-ttrss/dijit/ProgressBar.css | 110 + lib/flat-ttrss/dijit/ProgressBar.styl | 70 + lib/flat-ttrss/dijit/TimePicker.css | 60 + lib/flat-ttrss/dijit/TimePicker.styl | 71 + lib/flat-ttrss/dijit/TitlePane.css | 118 + lib/flat-ttrss/dijit/TitlePane.styl | 110 + lib/flat-ttrss/dijit/TitlePane_rtl.css | 7 + lib/flat-ttrss/dijit/TitlePane_rtl.styl | 18 + lib/flat-ttrss/dijit/Toolbar.css | 137 + lib/flat-ttrss/dijit/Toolbar.styl | 145 + lib/flat-ttrss/dijit/Toolbar_rtl.css | 11 + lib/flat-ttrss/dijit/Toolbar_rtl.styl | 20 + lib/flat-ttrss/dijit/Tree.css | 181 ++ lib/flat-ttrss/dijit/Tree.styl | 122 + lib/flat-ttrss/dijit/Tree_rtl.css | 9 + lib/flat-ttrss/dijit/Tree_rtl.styl | 16 + lib/flat-ttrss/dijit/dijit_variables.styl | 361 +++ lib/flat-ttrss/dijit/form/Button.css | 646 ++++ lib/flat-ttrss/dijit/form/Button.styl | 165 + lib/flat-ttrss/dijit/form/Button_rtl.css | 15 + lib/flat-ttrss/dijit/form/Button_rtl.styl | 27 + lib/flat-ttrss/dijit/form/Checkbox.css | 131 + lib/flat-ttrss/dijit/form/Checkbox.styl | 137 + lib/flat-ttrss/dijit/form/NumberSpinner.css | 125 + lib/flat-ttrss/dijit/form/NumberSpinner.styl | 124 + lib/flat-ttrss/dijit/form/NumberSpinner_rtl.css | 4 + lib/flat-ttrss/dijit/form/NumberSpinner_rtl.styl | 10 + lib/flat-ttrss/dijit/form/RadioButton.css | 157 + lib/flat-ttrss/dijit/form/RadioButton.styl | 136 + lib/flat-ttrss/dijit/form/Select.css | 167 + lib/flat-ttrss/dijit/form/Select.styl | 164 + lib/flat-ttrss/dijit/form/Select_rtl.css | 15 + lib/flat-ttrss/dijit/form/Select_rtl.styl | 27 + lib/flat-ttrss/dijit/form/Slider.css | 300 ++ lib/flat-ttrss/dijit/form/Slider.styl | 345 ++ lib/flat-ttrss/dijit/form/Slider_rtl.css | 32 + lib/flat-ttrss/dijit/form/Slider_rtl.styl | 39 + lib/flat-ttrss/dijit/form/TextBox.css | 275 ++ lib/flat-ttrss/dijit/form/TextBox.styl | 104 + lib/flat-ttrss/dijit/form/TextBox_rtl.css | 21 + lib/flat-ttrss/dijit/form/TextBox_rtl.styl | 30 + .../dijit/form/dijit_form_variables.styl | 212 ++ lib/flat-ttrss/dijit/images/loadingAnimation.gif | Bin 0 -> 718 bytes lib/flat-ttrss/dijit/images/progressBarStrips.png | Bin 0 -> 1280 bytes lib/flat-ttrss/dijit/layout/AccordionContainer.css | 169 + .../dijit/layout/AccordionContainer.styl | 160 + .../dijit/layout/AccordionContainer_rtl.css | 4 + .../dijit/layout/AccordionContainer_rtl.styl | 12 + lib/flat-ttrss/dijit/layout/BorderContainer.css | 97 + lib/flat-ttrss/dijit/layout/BorderContainer.styl | 117 + lib/flat-ttrss/dijit/layout/ContentPane.css | 36 + lib/flat-ttrss/dijit/layout/ContentPane.styl | 45 + lib/flat-ttrss/dijit/layout/TabContainer.css | 359 +++ lib/flat-ttrss/dijit/layout/TabContainer.styl | 446 +++ lib/flat-ttrss/dijit/layout/TabContainer_rtl.css | 13 + lib/flat-ttrss/dijit/layout/TabContainer_rtl.styl | 23 + .../dijit/layout/dijit_layout_variables.styl | 135 + lib/flat-ttrss/flat.css | 37 + lib/flat-ttrss/flat_dijit.css | 1690 ++++++++++ lib/flat-ttrss/flat_dijit_rtl.css | 177 + lib/flat-ttrss/flat_rtl.css | 26 + lib/flat-ttrss/icons/flat-icons.css | 639 ++++ lib/flat-ttrss/icons/flat-icons.styl | 522 +++ lib/flat-ttrss/icons/fonts/flat-icon.eot | Bin 0 -> 13608 bytes lib/flat-ttrss/icons/fonts/flat-icon.svg | 122 + lib/flat-ttrss/icons/fonts/flat-icon.ttf | Bin 0 -> 13436 bytes lib/flat-ttrss/icons/fonts/flat-icon.woff | Bin 0 -> 13512 bytes lib/flat-ttrss/icons/images/loadingAnimation.gif | Bin 0 -> 631 bytes lib/flat-ttrss/icons/selection.json | 3388 ++++++++++++++++++++ lib/flat-ttrss/mixins.styl | 238 ++ lib/flat-ttrss/variables.styl | 74 + lib/flat-ttrss/variables_material_colors.styl | 279 ++ prefs.php | 2 +- 105 files changed, 15948 insertions(+), 199 deletions(-) create mode 100644 lib/flat-ttrss/README.md create mode 100755 lib/flat-ttrss/dijit/Calendar.css create mode 100755 lib/flat-ttrss/dijit/Calendar.styl create mode 100755 lib/flat-ttrss/dijit/Calendar_rtl.css create mode 100755 lib/flat-ttrss/dijit/Calendar_rtl.styl create mode 100755 lib/flat-ttrss/dijit/ColorPalette.css create mode 100755 lib/flat-ttrss/dijit/ColorPalette.styl create mode 100644 lib/flat-ttrss/dijit/ColorPalette_rtl.css create mode 100644 lib/flat-ttrss/dijit/ColorPalette_rtl.styl create mode 100644 lib/flat-ttrss/dijit/Common.css create mode 100755 lib/flat-ttrss/dijit/Common.styl create mode 100755 lib/flat-ttrss/dijit/Dialog.css create mode 100755 lib/flat-ttrss/dijit/Dialog.styl create mode 100755 lib/flat-ttrss/dijit/Dialog_rtl.css create mode 100755 lib/flat-ttrss/dijit/Dialog_rtl.styl create mode 100755 lib/flat-ttrss/dijit/Editor.css create mode 100755 lib/flat-ttrss/dijit/Editor.styl create mode 100755 lib/flat-ttrss/dijit/Editor_rtl.css create mode 100755 lib/flat-ttrss/dijit/Editor_rtl.styl create mode 100755 lib/flat-ttrss/dijit/InlineEditBox.css create mode 100755 lib/flat-ttrss/dijit/InlineEditBox.styl create mode 100755 lib/flat-ttrss/dijit/Menu.css create mode 100755 lib/flat-ttrss/dijit/Menu.styl create mode 100755 lib/flat-ttrss/dijit/Menu_rtl.css create mode 100755 lib/flat-ttrss/dijit/Menu_rtl.styl create mode 100755 lib/flat-ttrss/dijit/ProgressBar.css create mode 100755 lib/flat-ttrss/dijit/ProgressBar.styl create mode 100755 lib/flat-ttrss/dijit/TimePicker.css create mode 100755 lib/flat-ttrss/dijit/TimePicker.styl create mode 100755 lib/flat-ttrss/dijit/TitlePane.css create mode 100755 lib/flat-ttrss/dijit/TitlePane.styl create mode 100755 lib/flat-ttrss/dijit/TitlePane_rtl.css create mode 100755 lib/flat-ttrss/dijit/TitlePane_rtl.styl create mode 100755 lib/flat-ttrss/dijit/Toolbar.css create mode 100755 lib/flat-ttrss/dijit/Toolbar.styl create mode 100755 lib/flat-ttrss/dijit/Toolbar_rtl.css create mode 100755 lib/flat-ttrss/dijit/Toolbar_rtl.styl create mode 100755 lib/flat-ttrss/dijit/Tree.css create mode 100755 lib/flat-ttrss/dijit/Tree.styl create mode 100644 lib/flat-ttrss/dijit/Tree_rtl.css create mode 100644 lib/flat-ttrss/dijit/Tree_rtl.styl create mode 100644 lib/flat-ttrss/dijit/dijit_variables.styl create mode 100644 lib/flat-ttrss/dijit/form/Button.css create mode 100755 lib/flat-ttrss/dijit/form/Button.styl create mode 100644 lib/flat-ttrss/dijit/form/Button_rtl.css create mode 100755 lib/flat-ttrss/dijit/form/Button_rtl.styl create mode 100644 lib/flat-ttrss/dijit/form/Checkbox.css create mode 100755 lib/flat-ttrss/dijit/form/Checkbox.styl create mode 100644 lib/flat-ttrss/dijit/form/NumberSpinner.css create mode 100755 lib/flat-ttrss/dijit/form/NumberSpinner.styl create mode 100644 lib/flat-ttrss/dijit/form/NumberSpinner_rtl.css create mode 100644 lib/flat-ttrss/dijit/form/NumberSpinner_rtl.styl create mode 100644 lib/flat-ttrss/dijit/form/RadioButton.css create mode 100755 lib/flat-ttrss/dijit/form/RadioButton.styl create mode 100644 lib/flat-ttrss/dijit/form/Select.css create mode 100755 lib/flat-ttrss/dijit/form/Select.styl create mode 100644 lib/flat-ttrss/dijit/form/Select_rtl.css create mode 100644 lib/flat-ttrss/dijit/form/Select_rtl.styl create mode 100644 lib/flat-ttrss/dijit/form/Slider.css create mode 100755 lib/flat-ttrss/dijit/form/Slider.styl create mode 100644 lib/flat-ttrss/dijit/form/Slider_rtl.css create mode 100755 lib/flat-ttrss/dijit/form/Slider_rtl.styl create mode 100644 lib/flat-ttrss/dijit/form/TextBox.css create mode 100755 lib/flat-ttrss/dijit/form/TextBox.styl create mode 100644 lib/flat-ttrss/dijit/form/TextBox_rtl.css create mode 100755 lib/flat-ttrss/dijit/form/TextBox_rtl.styl create mode 100644 lib/flat-ttrss/dijit/form/dijit_form_variables.styl create mode 100755 lib/flat-ttrss/dijit/images/loadingAnimation.gif create mode 100755 lib/flat-ttrss/dijit/images/progressBarStrips.png create mode 100644 lib/flat-ttrss/dijit/layout/AccordionContainer.css create mode 100755 lib/flat-ttrss/dijit/layout/AccordionContainer.styl create mode 100644 lib/flat-ttrss/dijit/layout/AccordionContainer_rtl.css create mode 100644 lib/flat-ttrss/dijit/layout/AccordionContainer_rtl.styl create mode 100644 lib/flat-ttrss/dijit/layout/BorderContainer.css create mode 100755 lib/flat-ttrss/dijit/layout/BorderContainer.styl create mode 100644 lib/flat-ttrss/dijit/layout/ContentPane.css create mode 100755 lib/flat-ttrss/dijit/layout/ContentPane.styl create mode 100644 lib/flat-ttrss/dijit/layout/TabContainer.css create mode 100755 lib/flat-ttrss/dijit/layout/TabContainer.styl create mode 100644 lib/flat-ttrss/dijit/layout/TabContainer_rtl.css create mode 100755 lib/flat-ttrss/dijit/layout/TabContainer_rtl.styl create mode 100644 lib/flat-ttrss/dijit/layout/dijit_layout_variables.styl create mode 100755 lib/flat-ttrss/flat.css create mode 100644 lib/flat-ttrss/flat_dijit.css create mode 100644 lib/flat-ttrss/flat_dijit_rtl.css create mode 100644 lib/flat-ttrss/flat_rtl.css create mode 100644 lib/flat-ttrss/icons/flat-icons.css create mode 100644 lib/flat-ttrss/icons/flat-icons.styl create mode 100755 lib/flat-ttrss/icons/fonts/flat-icon.eot create mode 100755 lib/flat-ttrss/icons/fonts/flat-icon.svg create mode 100755 lib/flat-ttrss/icons/fonts/flat-icon.ttf create mode 100755 lib/flat-ttrss/icons/fonts/flat-icon.woff create mode 100644 lib/flat-ttrss/icons/images/loadingAnimation.gif create mode 100755 lib/flat-ttrss/icons/selection.json create mode 100755 lib/flat-ttrss/mixins.styl create mode 100755 lib/flat-ttrss/variables.styl create mode 100644 lib/flat-ttrss/variables_material_colors.styl diff --git a/classes/feeds.php b/classes/feeds.php index e9650ca5e..8425b9c06 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -15,22 +15,6 @@ class Feeds extends Handler_Protected { $feed_id, $is_cat, $search, $error, $feed_last_updated) { - $catchup_sel_link = "Headlines.catchupSelection()"; - - $archive_sel_link = "Headlines.archiveSelection()"; - $delete_sel_link = "Headlines.deleteSelection()"; - - $sel_all_link = "Headlines.select('all')"; - $sel_unread_link = "Headlines.select('unread')"; - $sel_none_link = "Headlines.select('none')"; - $sel_inv_link = "Headlines.select('invert')"; - - $tog_unread_link = "Headlines.selectionToggleUnread()"; - $tog_marked_link = "Headlines.selectionToggleMarked()"; - $tog_published_link = "Headlines.selectionTogglePublished()"; - - $set_score_link = "Article.selectionSetScore()"; - if ($is_cat) $cat_q = "&is_cat=$is_cat"; if ($search) { @@ -39,23 +23,20 @@ class Feeds extends Handler_Protected { $search_q = ""; } - $reply = ""; + $reply = ""; $rss_link = htmlspecialchars(get_self_url_prefix() . "/public.php?op=rss&id=$feed_id$cat_q$search_q"); - // right part - $error_class = $error ? "error" : ""; - $reply .= " - - "; - + "; -# $reply .= ""; $reply .= ""; if ($feed_site_url) { @@ -75,52 +56,37 @@ class Feeds extends Handler_Protected { $reply .= strip_tags($feed_title); } - $reply .= ""; - - $reply .= ""; - -# $reply .= ""; - - // left part + $reply .= ""; - $reply .= ""; + $reply .= ""; $reply .= ""; - - /*$reply .= " - ".__('All').", - ".__('Unread').", - ".__('Invert').", - ".__('None').""; - - $reply .= " "; */ - + $reply .= " "; $reply .= "