diff --git a/app/controllers/common.php b/app/controllers/common.php index 9b87219..71c067f 100644 --- a/app/controllers/common.php +++ b/app/controllers/common.php @@ -69,11 +69,6 @@ Router\get_action('show-help', function () { Response\html(Template\load('show_help')); }); -// Show the menu for the mobile view -Router\get_action('more', function () { - Response\html(Template\layout('show_more', array('menu' => 'more'))); -}); - // Image proxy (avoid SSL mixed content warnings) Router\get_action('proxy', function () { Handler\Proxy\download(rawurldecode(Request\param('url'))); diff --git a/app/templates/layout.php b/app/templates/layout.php index 88d7ee3..9ac2305 100644 --- a/app/templates/layout.php +++ b/app/templates/layout.php @@ -29,30 +29,40 @@ +
%s') ?> %s') ?> diff --git a/app/templates/show_more.php b/app/templates/show_more.php deleted file mode 100644 index aac686b..0000000 --- a/app/templates/show_more.php +++ /dev/null @@ -1,22 +0,0 @@ - \ No newline at end of file diff --git a/assets/css/app.css b/assets/css/app.css index 6d39168..e1250ee 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -442,6 +442,11 @@ header a { text-decoration: none; } +nav .menu-more-switcher { + color: #777; + cursor: pointer; +} + nav .active a { color: #333; font-weight: bold; @@ -793,7 +798,11 @@ iframe { font-size: 75%; } -.menu-more li { +#menu-more { + padding-top: 20px; +} + +#menu-more li { font-size: 1.1em; padding-top: 10px; padding-bottom: 10px; @@ -801,9 +810,13 @@ iframe { list-style-type: none; } -.menu-more a { - text-decoration: none; +#menu-more li.active a { color: #333; +} + +#menu-more a { + text-decoration: none; + color: #777; display: block; } diff --git a/assets/js/all.js b/assets/js/all.js index 5eb835f..7ad18db 100644 --- a/assets/js/all.js +++ b/assets/js/all.js @@ -602,6 +602,9 @@ Miniflux.Event = (function() { case 'show-search': Miniflux.Nav.ShowSearch(); break; + case 'toggle-menu-more': + Miniflux.Nav.ToggleMenuMore(); + break; } } }; @@ -974,6 +977,12 @@ Miniflux.Nav = (function() { document.getElementById("search-form").removeAttribute("class"); document.getElementById("form-text").focus(); }, + ToggleMenuMore: function () { + var menu = document.getElementById("menu-more"); + menu.hasAttribute("class") + ? menu.removeAttribute("class") + : menu.setAttribute("class", "hide"); + }, IsListing: isListing }; diff --git a/assets/js/event.js b/assets/js/event.js index 065d09b..e4f81d1 100644 --- a/assets/js/event.js +++ b/assets/js/event.js @@ -85,6 +85,9 @@ Miniflux.Event = (function() { case 'show-search': Miniflux.Nav.ShowSearch(); break; + case 'toggle-menu-more': + Miniflux.Nav.ToggleMenuMore(); + break; } } }; diff --git a/assets/js/nav.js b/assets/js/nav.js index c4454e7..5ffcb13 100644 --- a/assets/js/nav.js +++ b/assets/js/nav.js @@ -112,6 +112,12 @@ Miniflux.Nav = (function() { document.getElementById("search-form").removeAttribute("class"); document.getElementById("form-text").focus(); }, + ToggleMenuMore: function () { + var menu = document.getElementById("menu-more"); + menu.hasAttribute("class") + ? menu.removeAttribute("class") + : menu.setAttribute("class", "hide"); + }, IsListing: isListing };