diff options
Diffstat (limited to 'themes')
24 files changed, 839 insertions, 2911 deletions
diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css index ab4e08a9e9..21a2291e5b 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css @@ -454,11 +454,14 @@ select, padding: 4px; font-size: 13px; line-height: 18px; - color: #808080; border: 1px solid #ccc; border-radius: 3px; } +.uneditable-input { + color: #808080; +} + .cbi-dropdown, .cbi-dynlist { min-width: 210px; diff --git a/themes/luci-theme-freifunk-generic/Makefile b/themes/luci-theme-freifunk-generic/Makefile deleted file mode 100644 index 2fc62fdbca..0000000000 --- a/themes/luci-theme-freifunk-generic/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org> -# -# This is free software, licensed under the Apache License, Version 2.0 . -# - -include $(TOPDIR)/rules.mk - -LUCI_TITLE:=Freifunk Generic Theme -LUCI_DEPENDS:= - -include ../../luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css deleted file mode 100644 index 590eb3d979..0000000000 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css +++ /dev/null @@ -1,1792 +0,0 @@ -@charset "utf-8"; - -@media all { - -html { - min-height: 100%; - height: auto; -} - -body { - color: #ccc; - background: #e5eef5 linear-gradient(#fff 0%, #e5eef5 100%) no-repeat; - font-family: Verdana, Arial, sans-serif; - font-size: 100%; - line-height: 100%; - padding-bottom: 1.5em; -} - -html, body { - height: 99%; -} - -* { - margin: 0; - padding: 0; - box-sizing: border-box; -} - -.table { display: table; width: 100%; position: relative; } -.tr { display: table-row; } -.thead { display: table-header-group; } -.tbody { display: table-row-group; } -.tfoot { display: table-footer-group; } -.td, .th { display: table-cell; } -.th { font-weight: bold; } - -.table[width="33%"], .th[width="33%"], .td[width="33%"] { width: 33%; } -.table[width="100%"], .th[width="100%"], .td[width="100%"] { width: 100%; } - -.col-1 { flex: 1 1 30px !important; -webkit-flex: 1 1 30px !important; } -.col-2 { flex: 2 2 60px !important; -webkit-flex: 2 2 60px !important; } -.col-3 { flex: 3 3 90px !important; -webkit-flex: 3 3 90px !important; } -.col-4 { flex: 4 4 120px !important; -webkit-flex: 4 4 120px !important; } -.col-5 { flex: 5 5 150px !important; -webkit-flex: 5 5 150px !important; } -.col-6 { flex: 6 6 180px !important; -webkit-flex: 6 6 180px !important; } -.col-7 { flex: 7 7 210px !important; -webkit-flex: 7 7 210px !important; } -.col-8 { flex: 8 8 240px !important; -webkit-flex: 8 8 240px !important; } -.col-9 { flex: 9 9 270px !important; -webkit-flex: 9 9 270px !important; } -.col-10 { flex: 10 10 300px !important; -webkit-flex: 10 10 300px !important; } - -.tr.placeholder { - height: 3.5em; -} - -.tr.placeholder > .td { - position: absolute; - left: 1px; - right: 1px; - bottom: 1px; - text-align: center; - line-height: 3em; -} - -abbr, -acronym { - font-style: normal; - font-variant: normal; -} - -abbr[title], -acronym[title] { - border-bottom: 1px dotted; - cursor: help; -} - -a:link abbr[title], -a:visited abbr[title], -a:link acronym[title], -a:visited acronym[title] { - cursor: pointer; -} - -code { - font-family: monospace; - white-space: pre; -} - -h2, h3, h4, legend { - font-size: 150%; - font-family: Trebuchet MS, Verdana, sans-serif; - font-weight: bold; - margin: .25em 0 .5em 0; - border-bottom: 1px solid; - padding-bottom: 4px; - display: block; - width: 100%; -} - -h3, legend { - font-size: 125%; -} - -h4 { - font-size: 112%; -} - -.cbi-section-node + h4 { - margin-top: 1em; -} - -fieldset { border: none; } - -fieldset > legend { float: left; } -fieldset > legend + * { clear: both; } - -#maincontent ul { - margin-left: 2em; -} - -.warning { - color: red; - background-color: white; - font-weight: bold; - text-decoration: blink; -} - -.clear { - clear: both; -} - -a img { - border: 0; -} - -.skiplink, -.navigation, -.hidden { - position: absolute; - left: -1000px; - top: -1000px; - width: 0px; - height: 0px; - overflow: hidden; - display: inline; -} - -.error { - color: #f00; - background-color: white; -} - -.alert-message { - font-weight: normal; - padding: .5em; - border-radius: 3px; - color: #000; -} - -.alert-message, .cbi-tooltip.error { - background: #fee; - color: #a22; -} - -.alert-message.notice, .cbi-tooltip.notice { - background: linear-gradient(#ccc 0%, #eee 100%); - color: #4a6b7c; -} - -.alert-message.warning, .cbi-tooltip.warning { - background: linear-gradient(#dda 0%, #dd8 100%); - color: #c00; -} - -.alert-message > * { - margin: .5em; -} - -.alert-message > h4 { - font-weight: bold; -} - - -.ifacebadge, .ifacebox { - display: inline-flex; - align-content: center; - border: 1px solid #ccc; - border-radius: 3px; - padding: 2px; - background: #fff; - margin: .25em .5em; -} - -.ifacebox-head { - background: #eee; -} - -.ifacebox-head.active { - background: #90c0e0; -} - -.ifacebadge, .zonebadge { - align-items: center; -} - -.ifacebadge > * { - align-self: flex-start; -} - -.ifacebadge > img, -.ifacebadge > em { - margin-right: 5px; - display: inline-block; - height: 16px; -} - -.ifacebadge-active { - border-color: #000000; - font-weight: bold; -} - -.ifacebox { - flex-direction: column; - margin: 0; - padding: 0; - min-width: 100px; - text-align: center; -} - -.ifacebox > * { - padding: 2px; -} - -.td > .ifacebadge, -.td > .zonebadge { - margin: 0; - vertical-align: top; -} - -.network-status-table { - display: flex; - flex-wrap: wrap; -} - -.network-status-table .ifacebox { - margin: .5em; - font-size: 90%; - flex-grow: 1; -} - -.network-status-table .ifacebox-body { - display: flex; - flex-direction: column; - flex: 1 0; -} - -.network-status-table .ifacebox-body > span { - flex: 10; -} - -.network-status-table .ifacebox-body > div { - display: flex; - flex-wrap: wrap; -} - -.ifacebadge.large, -.network-status-table .ifacebox-body .ifacebadge { - flex: 1; - margin: .5em .25em .25em .25em; - padding: .5em; - min-width: 220px; - white-space: nowrap; -} - - -.zonebadge { - padding: 2px; - display: inline-block; - white-space: nowrap; - border-radius: 3px; -} - -.zonebadge > em, -.zonebadge > strong { - margin: 3px; -} - -.zonebadge input { - width: 6em; - height: 1.5em; -} - -.zonebadge .ifacebadge, -.cbi-dropdown .ifacebadge { - margin: 1px; -} - -.zonebadge .ifacebadge img, -.zonebadge .ifacebadge em, -.cbi-dropdown .ifacebadge img, -.cbi-dropdown .ifacebadge em { - margin: 0 1px; -} - -.zonebadge-empty { - border: 1px dashed #AAAAAA; - color: #AAAAAA; - font-style: italic; - font-size: smaller; -} - - - -#header { - height: auto; - background: #FFF url(header.jpg) repeat-x left bottom; - color: #ccc; - font-weight: bold; - text-align:right; -} - -.header_left { - padding-bottom: 10px; -} - -.header_left img { - padding: 10px 10px 0px 10px; -} - -.header_banner { - overflow:hidden; - padding-bottom: 6px; - text-align:left; -} - -.header_banner img{ - padding: 0px; -} - -.header_left { - text-align:left; - max-width: 50%; - float:left; -} - -.header_left a { - color: #dc0067; - font: bold 36px Helvetica, Verdana, Arial, sans-serif; - text-decoration: none; -} - -#header h1, -.header_right { - max-width: 45%; - text-align: right; - font-size: 70%; - font-weight: normal; - line-height: 160%; - float:right; - padding: 10px 10px 0 0; -} - -ul.dropdowns { - float: left; - margin: 0; - padding: 0; - width: auto; - list-style: none; -} - -html>body ul.dropdowns { - position: relative; -} - -ul.dropdowns li, -ul.dropdowns ul { - margin: 0; - padding: 0; - list-style: none; -} - -ul.dropdowns li { - float: left; - position: relative; - white-space: nowrap; -} - -ul.dropdowns li ul { - position: absolute; - z-index: 1100; - top: auto; - min-width: 10em; -} - -ul.dropdowns li li { - float: none; - position: relative; -} - -ul.dropdowns li a { - display: block; -} - -ul.dropdowns ul li ul { - top: 0; -} - -ul.dropdowns li ul, -ul.dropdowns li.over ul ul, -ul.dropdowns li.focus ul ul, -ul.dropdowns li:hover ul ul, -ul.dropdowns li.over ul ul ul, -ul.dropdowns li.focus ul ul ul, -ul.dropdowns li:hover ul ul ul, -ul.dropdowns li.over ul ul ul ul, -ul.dropdowns li.focus ul ul ul ul, -ul.dropdowns li:hover ul ul ul ul { - left: -3000px; -} - -ul.dropdowns li.over ul, -ul.dropdowns li.focus ul, -ul.dropdowns li:hover ul { - left: 0; -} - -ul.dropdowns ul li.over ul, -ul.dropdowns ul li.focus ul, -ul.dropdowns ul li:hover ul, -ul.dropdowns ul ul li.over ul, -ul.dropdowns ul ul li.focus ul, -ul.dropdowns ul ul li:hover ul, -ul.dropdowns ul ul ul li.over ul, -ul.dropdowns ul ul ul li.focus ul, -ul.dropdowns ul ul ul li:hover ul { - left: 100%; -} - -#xhr_poll_status { - cursor: pointer; -} - -#xhr_poll_status #xhr_poll_status_off { - font-weight: bold; - color: #FF0000; -} - -#xhr_poll_status #xhr_poll_status_on { - font-weight: bold; - color: #00FF00; -} - -#menubar { - position: relative; - width: 100%; - background: #FFF; - color: #004a9c; - border-bottom: 1px dotted #5A5A5A; -} -#menubar .warning { - color: red; - background-color: #FFF; -} - -#menubar ul.dropdowns { - min-height: 1.8em; - background: #FFF; - color: #004a9c; -} - -#menubar ul.dropdowns li ul { - background: #FFF; - color: #004a9c; - border-width: 0 1px 1px 1px; - border-style: dotted; - border-color: #5a5a5a; -} - -#menubar ul.dropdowns ul li ul { - border-width: 1px; -} - -html #menubar a:link, -html #menubar a:visited { - position: relative; - display: block; - padding: 0.5em; - background: #FFF; - color: #004a9c; - text-decoration: none; - font-size: 80%; - font-weight: normal; -} - -html #menubar a:link:hover, -html #menubar a:visited:hover, -html #menubar a:link:active, -html #menubar a:visited:active, -#menubar a:link:focus, -#menubar a:visited:focus { - background: #F2F2F2; - color: #e60076; -} - -html #menubar a:link.active, -html #menubar a:visited.active, -html #menubar a:link.preactive, -html #menubar a:visited.preactive { - background: #FFF; - color: #e60076; -} - -html #menubar a:link.warning, -html #menubar a:visited.warning { - background: #FFF; - color: red; - font-weight: bold; - text-decoration: blink; -} - -#menubar ul.dropdowns li.over>a, -#menubar ul.dropdowns li.focus>a, -#menubar ul.dropdowns li:hover>a { -} - -.lang_de #submenu_mini_system { min-width: 13.3em; } -* html .lang_de #submenu_mini_system { width: 13.3em; } - -.lang_pt-br #submenu_mini_network { min-width: 14em; } -* html .lang_pt-br #submenu_mini_network { width: 14em; } - -.lang_pt-br #submenu_mini_system { min-width: 11.5em; } -* html .lang_pt-br #submenu_mini_system { width: 11.5em; } - -.lang_ru #submenu_mini_system { min-width: 18em; } -* html .lang_ru #submenu_mini_system { width: 18em; } - -.lang_pt-br #submenu_admin_index { min-width: 11em; } -* html .lang_pt-br #submenu_admin_index { width: 11em; } - -.lang_ru #submenu_admin_index { min-width: 15.5em; } -* html .lang_ru #submenu_admin_index { width: 15.5em; } - -.lang_ru #submenu_admin_status { min-width: 10.5em; } -* html .lang_ru #submenu_admin_status { width: 10.5em; } - -.lang_de #submenu_admin_system { min-width: 13.3em; } -* html .lang_de #submenu_admin_system { width: 13.3em; } - -.lang_fr #submenu_admin_system { min-width: 14.5em; } -* html .lang_fr #submenu_admin_system { width: 14.5em; } - -.lang_pt-br #submenu_admin_system { min-width: 11.5em; } -* html .lang_pt-br #submenu_admin_system { width: 11.5em; } - -.lang_ru #submenu_admin_system { min-width: 18em; } -* html .lang_ru #submenu_admin_system { width: 18em; } - -#submenu_admin_services_chillispot { min-width: 15.5em; } -* html #submenu_admin_services_chillispot { width: 15.5em; } - -#submenu_admin_services_coovachilli { min-width: 15em; } -* html #submenu_admin_services_coovachilli { width: 15em; } - -.lang_ru #submenu_admin_network_routes { min-width: 15.3em; } -* html .lang_ru #submenu_admin_network_routes { width: 15.3em; } - -#submenu_admin_network_firewall { min-width: 14em; } -* html #submenu_admin_network_firewall { width: 14em; } - -.lang_de #submenu_admin_network_firewall { min-width: 16.5em; } -* html .lang_de #submenu_admin_network_firewall { width: 16.5em; } - -.lang_pt-br #submenu_admin_network_firewall { min-width: 15em; } -* html .lang_pt-br #submenu_admin_network_firewall { width: 15em; } - -#modemenu { -/* width: auto;*/ - background: #000; - color: #fff; - list-style: none; - margin-right: 1px; -} - -#modemenu li { - float: right; - list-style: none; -} - -#savemenu { - float: right; - margin-right: 2em; -} - -#applyreboot-section { - line-height: 300%; -} - -.lang_de #submenu_admin_uci { - width: 12em; -} - -.lang_ru #submenu_admin_uci { - width: 11.5em; -} - -textarea#syslog { - width: 98%; - min-height: 500px; - border: 3px solid #ccc; - padding: 5px; - font-family: monospace; -} - - -#maincontent { - clear: both; - width: 90%; - margin: 0 auto; - padding: 0.5em; - color: #000; - font-size: 80%; -} - -#maincontent p { - margin-bottom: 1em; -} - -.cbi-section { - margin-bottom: 1.5em; - color: #000; -} - -.cbi-section-descr { - margin-bottom: 0.5em; - font-size: 95%; -} - -.cbi-title-ref { - color: inherit; - text-decoration: none; - padding-right: 18px; - background: url('../resources/cbi/link.gif') no-repeat scroll right center; - background-color: inherit; -} - -ul.cbi-apply { - font-size: 90%; -} - -ul.cbi-tabmenu { - list-style-type: none; - display: flex; - margin: 0 0 .5em 0 !important; - padding: 0 0 0 5px; - border-bottom: 1px solid #bbb; -} - -ul.cbi-tabmenu li { - display: inline-flex; - margin: 0 5px -1px 0; - flex: 0 1 auto; - border: 1px solid #bbb; - border-bottom: none; - border-radius: 3px 3px 0 0; - background: linear-gradient(#ddd 90%, #aaa 100%); - color: #888; - overflow: hidden; - text-overflow: ellipsis; - word-wrap: break-word; -} - -ul.cbi-tabmenu li a, -ul.cbi-tabmenu li a:hover { - text-decoration: none; - color: inherit; - padding: 5px; - flex: 1; - width: 100%; - height: 100%; -} - -ul.cbi-tabmenu li.cbi-tab-highlighted { - color: #000; - background: #fea; -} - -ul.cbi-tabmenu li.cbi-tab { - color: #000; - background: #fff; -} - -ul.cbi-tabmenu + .cbi-section-node { - margin-top: -.5em; -} - -[data-tab-title] { - height: 0; - opacity: 0; - overflow: hidden; -} - -[data-tab-active="true"] { - opacity: 1; - height: auto; - overflow: visible; - transition: opacity .25s ease-in; -} - -div.cbi-tab-descr { - background-image: url(/luci-static/resources/cbi/help.gif); - background-position: 0.25em 50%; - background-repeat: no-repeat; - border-bottom: 1px solid #ccc; - margin: 0.25em 0.25em 2em; - padding: 0.5em 0.5em 0.5em 2em; -} - -input[type=submit], -input[type=reset], -input[type=image], -input[type=button] { - cursor: pointer; -} - -select, -input, -textarea { - background: #fff; - color: #000; - border: 1px solid #cccccc; -} - -input[type=image] { - border: none; -} - -input:focus, -input:hover, -select:focus, -select:hover, -textarea:focus, -textarea:hover { - background-color: #fff; - color: #000; -} - -select, -input[type=text], -input[type=password] { - width: 20em; - font-size: inherit; - line-height: 13pt; - height: 14pt; -} - -select[multiple] { - height: auto; -} - -input[type=radio], -input[type=checkbox], -[data-dynlist] > input + img, -input.cbi-input-password + img { - vertical-align: middle; -} - -.td select, -.td .cbi-dropdown, -.td input[type=text] { - width: 100%; -} - -.td [data-dynlist] > input, -.td input.cbi-input-password { - width: calc(100% - 20px); -} - -img.cbi-image-button { - cursor: pointer; - margin: 0 2px; - vertical-align: middle; -} - -.btn, .cbi-button { - padding: 0 .5em; - border-radius: 3px; - border: 1px solid #aaa; - text-decoration: none; - color: #000; - display: inline-block; - font-size: inherit; - -webkit-appearance: none; - background: #fff; - text-align: center; - font-weight: bold; - line-height: 13pt; - height: 14pt; -} - -.btn:hover, .cbi-button:hover { - box-shadow: 0 0 3px #59d; -} - -.btn[disabled], -.btn[disabled]:hover, -.cbi-button[disabled], -.cbi-button[disabled]:hover { - opacity: .6; - cursor: default; - pointer-events: none; -} - -.cbi-button-positive, -.cbi-button-fieldadd, -.cbi-button-add, -.cbi-button-save { - border-color: #7b7; - color: #7b7; -} - -.cbi-button-neutral, -.cbi-button-reset, -.cbi-button-download, -.cbi-button-find, -.cbi-button-link, -.cbi-button-up, -.cbi-button-down { - border-color: #444; - color: #444; -} - -.cbi-button-action, -.cbi-button-apply, -.cbi-button-reload, -.cbi-button-edit { - border-color: #59d; - color: #59d; -} - -.cbi-button-negative, -.cbi-section-remove .cbi-button, -.cbi-button-remove { - border-color: #b77; - color: #b77; -} - -.cbi-button-action.important, -.cbi-page-actions .cbi-button-apply, -.cbi-section-actions .cbi-button-edit { - color: #fff; - background: #59d; -} - -.cbi-button-positive.important, -.cbi-page-actions .cbi-button-save { - color: #fff; - background: #7b7; -} - -.cbi-page-actions .cbi-button-apply + .cbi-button-save { - background: #fff; - color: #7b7; -} - -.cbi-input-invalid { - background-image: url('../resources/cbi/reset.gif'); - background-repeat: no-repeat; - background-position: right; - color: #FF0000 !important; - border-color: #FF0000; -} - -.cbi-input-invalid { - background-image: url('../resources/cbi/reset.gif'); - background-repeat: no-repeat; - background-position: right; - color: #FF0000 !important; - border-color: #FF0000; -} - -div.cbi-section-remove input { - border-bottom: none; -} - -textarea { - margin-left: -1px; - margin-bottom: 0.5em; -} - -.table .td, .table .th { - color: #000000; - padding: .25em; -} - -.table.smalltext { - background: #f5f5f5; - color: #000; - border: 1px solid #666; - font-size: 90%; - width: 80%; - margin-left: auto; - margin-right: auto; - border-collapse: collapse; -} - -.table.smalltext .tr:hover .td { - background-color: #bbddee; - color: #000; -} - -.table.smalltext .tr .th { - padding: 0 0.25em; - border-left: 1px dotted #666; - text-align: left; -} - -.table.smalltext .tr .td { - padding: 0.2em; - border-top: 1px dotted #666; - border-left: 1px dotted #666; -} - -.cbi-section-node .tr:not(.placeholder):nth-child(even) { - background: #e5eef5; -} - -.table.cbi-section-table .cbi-section-table-cell { - padding: 3px; - white-space: nowrap; -} - -.table .tr > .th:empty { - display: none; -} - -.table.cbi-section-table .tr > *, -.table.cbi-section-table .tr[data-title]::before { - border-top: 1px dotted #bbb; - display: table-cell; -} - -.table.cbi-section-table .tr.table-titles > *, -.table.cbi-section-table .tr.cbi-section-table-titles > *, -.table.cbi-section-table .tr.cbi-section-table-desc > *, -.table.cbi-section-table .tr.table-titles::before, -.table.cbi-section-table .tr.cbi-section-table-titles::before, -.table.cbi-section-table .tr.cbi-section-table-desc::before { - border-top: none; -} - -.table.cbi-section-table .tr:hover::before, -.table.cbi-section-table .tr:hover > * { - background: #eee; -} - -.table.cbi-section-table .tr:nth-child(even):hover::before, -.table.cbi-section-table .tr:nth-child(even):hover > * { - background: #bde; -} - - -div.cbi-value { - clear: left; - vertical-align: middle; - padding-left: 0.25em; - border-bottom: 1px dotted #bbb; -} - -div.cbi-value:hover { - background: #f8f8f8; - color: #000; -} - -.cbi-value-title { - float: left; - width: 40%; - line-height: 1.8em; -} - -.cbi-value-field { - width: 58%; - margin-left: 40%; - padding: 0.25em 0; -} - -.td.cbi-value-field { - width: auto; - margin-left: 0; - align-self: center; -} - -.cbi-value-description { - background-image: url(/luci-static/resources/cbi/help.gif); - background-position: .25em .25em; - background-repeat: no-repeat; - margin: .25em 0 0 0; - padding: .25em .25em .25em 1.75em; -} - -.cbi-section-create { - padding: 0 0 .25em 0; - margin: -3px; - display: inline-flex; - align-items: center; -} - -.cbi-section-create > * { - margin: 3px; - flex: 1 1 auto; -} - -.cbi-section-create > * > input { - width: 100%; -} - -.cbi-section-remove > .cbi-button { - margin-bottom: -1px; - border-radius: 3px 3px 0 0; -} - -.cbi-section-node + .cbi-section-create { - padding-top: 0; -} - -div.cbi-map-descr { - margin-bottom: 1em; -} - -div.cbi-optionals { - padding: 0.25em; - border-bottom: 1px dotted #bbb; -} - - - -.cbi-section-node { - clear: both; - padding-bottom: 0; - position: relative; - border: 1px dotted #555; - background: #fff; - margin-bottom: 5px; -} - -.cbi-section-node-tabbed { - border-top: none; -} - -.cbi-section-node .cbi-optionals:last-child, -.cbi-section-node .cbi-value:last-child { - border-bottom: none; -} - -.table.cbi-section-table { - width: 100%; - font-size: 95%; - border: 1px dotted #444; - background: #fff; - margin: 0 0 .5em 0; -} - -.cbi-section-node > .table.cbi-section-table { - border: none; - margin: 0; -} - -@keyframes flash { - 0% { opacity: 1; } - 50% { opacity: .5; } - 100% { opacity: 1; } -} - -.tr.cbi-section-table-row.flash { - animation: flash .35s; -} - -.tr.cbi-section-table-descr .th { - font-weight: normal; - font-size: 90%; - vertical-align: top; -} - -.td.cbi-section-table-optionals { - text-align: left !important; - padding-top: 1em; -} - -.th.cbi-section-actions, -.td.cbi-section-actions { - display: flex; - justify-content: flex-end; - flex-direction: row; - flex: 1 1 150px; - margin: auto 0 auto auto; -} - -.td.cbi-section-actions > form { - display: flex; -} - -.td.cbi-section-actions > *, -.td.cbi-section-actions > form > * { - flex: 1 1 4em; - margin: 1px; -} - -.cbi-page-actions { - display: flex; - justify-content: flex-end; - margin: -3px; - padding: 0 .25em .25em .25em; -} - -.cbi-page-actions > form { - display: flex; -} - -.cbi-page-actions > * { - flex: 0 1 auto; - margin: 3px; -} - -.cbi-page-actions > form > * { - flex: 1; - margin: 0 3px 0 0; -} - -.cbi-page-actions > .cbi-button-link, -.cbi-page-actions > form[method="get"]:first-child { - margin-right: auto; -} - - -.th[data-type="button"], .td[data-type="button"], -.th[data-type="fvalue"], .td[data-type="fvalue"] { - flex: 1 1 2em; - text-align: center; -} - -#cbi-network-switch_vlan .th, -#cbi-network-switch_vlan .td { - flex-basis: 12%; -} - -#cbi-wireless-overview .td:first-child { - align-self: center; -} - -.td[data-title]::before { - content: attr(data-title) ":\20"; - font-weight: bold; - text-align: left; - display: none; - padding: 1px; - white-space: nowrap; -} - -.tr.placeholder .td[data-title]::before { - display: none; -} - -.tr[data-title]::before, -.tr.cbi-section-table-titles.named::before { - content: attr(data-title) "\20"; - font-weight: bold; - text-align: left; - display: inline-block; - align-self: center; - flex: 1 1 5%; - padding: .25em; - white-space: normal; - word-wrap: break-word; -} - -.cbi-value-helpicon img { - vertical-align: bottom; -} - -div.cbi-error { - font-size: 95%; - font-weight: bold; - color: #f00; - background-color: #fff; -} - -td.cbi-value-error { - border-color: red; -} - -.cbi-value-error input, -.cbi-value-error select { - color: red; - background-color: #fcc; -} - -.cbi-section-error { - color: red; - background-color: white; - font-size: 95%; - border: 1px dotted red; - margin: 3px; - padding: 3px; -} - - -.cbi-dropdown { - border: 1px solid #ccc; - display: inline-flex; - cursor: pointer; - background: #fff; - position: relative; - padding: 0; - color: #000; - min-width: 20em; - max-width: 100%; -} - -.cbi-dropdown:focus { - outline: 2px solid #4b6e9b; -} - -.cbi-dropdown > ul { - margin: 0 !important; - padding: 0; - list-style: none; - overflow-x: hidden; - overflow-y: auto; - display: flex; - width: 100%; -} - -.cbi-dropdown > ul.preview { - display: none; -} - -.cbi-dropdown > .open { - background: #eee; - border: 2px outset #eee; - flex-basis: 15px; -} - -.cbi-dropdown > .open, -.cbi-dropdown > .more { - flex-grow: 0; - flex-shrink: 0; - display: flex; - flex-direction: column; - justify-content: center; - text-align: center; - line-height: 2em; - padding: 0 .25em; -} - -.cbi-dropdown > .more, -.cbi-dropdown > ul > li[placeholder] { - color: #777; - font-weight: bold; - text-shadow: 1px 1px 0px #fff; - display: none; -} - -.cbi-dropdown > ul > li { - display: none; - padding: .25em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - flex-shrink: 1; - flex-grow: 1; - align-items: center; - align-self: center; - min-height: 20px; -} - -.cbi-dropdown > ul > li .hide-open { display: initial; } -.cbi-dropdown > ul > li .hide-close { display: none; } - -.cbi-dropdown > ul > li[display]:not([display="0"]) { - border-left: 1px solid #ccc; -} - -.cbi-dropdown[empty] > ul { - max-width: 1px; -} - -.cbi-dropdown > ul > li > form { - display: none; - margin: 0; - padding: 0; - pointer-events: none; -} - -.cbi-dropdown > ul > li img { - vertical-align: middle; - margin-right: .25em; -} - -.cbi-dropdown > ul > li > form > input[type="checkbox"] { - margin: 0; -} - -.cbi-dropdown > ul > li input[type="text"] { - height: 20px; -} - -.cbi-dropdown[open] { - position: relative; -} - -.cbi-dropdown[open] > ul.dropdown { - display: block; - background: #f6f6f5; - border: 1px solid #918e8c; - box-shadow: 0 0 4px #918e8c; - position: absolute; - z-index: 1000; - max-width: none; - min-width: 100%; - width: auto; -} - -.cbi-dropdown > ul > li[display], -.cbi-dropdown[open] > ul.preview, -.cbi-dropdown[open] > ul.dropdown > li, -.cbi-dropdown[multiple] > ul > li > label, -.cbi-dropdown[multiple][open] > ul.dropdown > li, -.cbi-dropdown[multiple][more] > .more, -.cbi-dropdown[multiple][empty] > .more { - flex-grow: 1; - display: flex; - align-items: center; -} - -.cbi-dropdown[empty] > ul > li, -.cbi-dropdown[optional][open] > ul.dropdown > li[placeholder], -.cbi-dropdown[multiple][open] > ul.dropdown > li > form { - display: block; -} - -.cbi-dropdown[open] > ul.dropdown > li .hide-open { display: none; } -.cbi-dropdown[open] > ul.dropdown > li .hide-close { display: initial; } - -.cbi-dropdown[open] > ul.dropdown > li { - border-bottom: 1px solid #ccc; -} - -.cbi-dropdown[open] > ul.dropdown > li[selected] { - background: #b0d0f0; -} - -.cbi-dropdown[open] > ul.dropdown > li.focus { - background: linear-gradient(90deg, #a3c2e8 0%, #84aad9 100%); -} - -.cbi-dropdown[open] > ul.dropdown > li:last-child { - margin-bottom: 0; - border-bottom: none; -} - -.cbi-dropdown[disabled] { - pointer-events: none; - opacity: .6; -} - - -.cbi-tooltip-container { - cursor: help; -} - -.cbi-tooltip { - position: absolute; - z-index: 1000; - left: -1000px; - border-radius: 3px; - background: #fff; - padding: 2px 5px; - white-space: pre; - opacity: 0; - transition: opacity .25s ease-out; - pointer-events: none; - box-shadow: 0 0 2px #444; -} - -.cbi-tooltip-container:hover .cbi-tooltip { - left: auto; - opacity: 1; - transition: opacity .25s ease-in; -} - -.zonebadge .cbi-tooltip { - padding: 1px; - background: inherit; - margin: -1.6em 0 0 -5px; -} - - -.zone-forwards { - display: flex; - flex-wrap: wrap; -} - -.zone-forwards > * { - flex: 1 1 45%; - padding: 1px; -} - -.zone-forwards > span { - flex-basis: 10%; - text-align: center; -} - -.zone-forwards .zone-src, -.zone-forwards .zone-dest { - display: flex; - flex-direction: column; -} - - -.left, .left::before { - text-align: left !important; -} - -.right, .right::before { - text-align: right !important; -} - -.center, .center::before { - text-align: center !important; -} - -.td.bottom { - align-self: flex-end; -} - -.td.top { - align-self: flex-start; -} - -.td.middle { - align-self: center; -} - - -.footer, .push { - height: 2em; -} - -.footer { - width: 99%; - padding: 0.3em; -} - - -.wrapper { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -2em; -} - -.luci a:link, -.luci a:visited, -.exectime { - color: #666; - text-decoration: none; - font-size: 70%; -} - -.inline { - display: inline; -} - -.error500 { - white-space: normal; - border: 1px dotted #f00; - background-color: #fff; - color: #000; - padding: 0.5em; -} - -.uci-change-list { - font-family: monospace; -} - -.uci-change-list ins, -.uci-change-legend-label ins { - text-decoration: none; - border: 1px solid #00FF00; - background-color: #CCFFCC; - display: block; - padding: 2px; -} - -.uci-change-list del, -.uci-change-legend-label del { - text-decoration: none; - border: 1px solid #FF0000; - background-color: #FFCCCC; - display: block; - font-style: normal; - padding: 2px; -} - -.uci-change-list var, -.uci-change-legend-label var { - text-decoration: none; - border: 1px solid #CCCCCC; - background-color: #EEEEEE; - display: block; - font-style: normal; - padding: 2px; -} - -.uci-change-list var ins, -.uci-change-list var del { - /*display: inline;*/ - border: none; - white-space: pre; - font-style: normal; - padding: 0px; -} - -.uci-change-legend { - padding: 5px; -} - -.uci-change-legend-label { - width: 150px; - float: left; - font-size: 80%; -} - -.uci-change-legend-label>ins, -.uci-change-legend-label>del, -.uci-change-legend-label>var { - float: left; - margin-right: 4px; - width: 10px; - height: 10px; - display: block; -} - -.uci-change-legend-label var ins, -.uci-change-legend-label var del { - line-height: 6px; - border: none; -} - -} - -@media screen and (max-width: 992px) { - body { - -webkit-text-size-adjust: 100%; - } - - #maincontent { - width: 100%; - } - - .table { - display: flex; - flex-direction: column; - width: 100%; - } - - .tr { - display: flex; - flex-direction: row; - flex-wrap: wrap; - align-items: flex-end; - } - - .th, .td { - flex: 2 2 25%; - align-self: flex-start; - overflow: hidden; - text-overflow: ellipsis; - word-wrap: break-word; - display: inline-block; - } - - .td select { - word-wrap: normal; - } - - .td[data-type="button"], - .td[data-type="fvalue"] { - flex: 1 1 12.5%; - text-align: left; - } - - .td.cbi-value-field { - align-self: flex-start; - } - - .td.cbi-value-field .cbi-button { - width: 100%; - } - - .table.cbi-section-table { - border: none; - background: none; - margin: 0; - } - - .tr.table-titles, - .cbi-section-table-titles, - .cbi-section-table-descr { - display: none; - } - - .table.cbi-section-table .tr > *, - .table.cbi-section-table .tr[data-title]::before { - border-top: none; - } - - .cbi-section-table-row { - display: flex; - flex-direction: row; - flex-wrap: wrap; - border: 1px dotted #444; - margin: 0 0 .5em 0; - background: #fff; - } - - .cbi-section-table-row:hover { - border: 1px solid #4a6b7c; - } - - .table.cbi-section-table .tr:hover > *, - .table.cbi-section-table .tr:nth-child(2n):hover > * { - background: none; - } - - .cbi-section-table + .cbi-section-create { - padding-top: 0; - } - - .tr[data-title]::before { - display: block; - flex: 1 1 100%; - background: #eef; - } - - .td[data-title]::before { - display: block; - } - - .td.cbi-section-actions { - flex-basis: 100%; - margin: auto 0 0 auto; - } - - .td.cbi-section-actions > *, - .td.cbi-section-actions > form > * { - flex: 0 1 100%; - max-width: 150px; - } - - .hide-sm, - .hide-xs { - display: none; - } -} - -@media screen and (max-width: 480px) { - body { - font-size: 12pt; - } - - input, textarea, select { - font-size: 12pt !important; - line-height: 1.4em; - } - - select, input[type="text"], input[type="password"] { - width: 100%; - height: 1.4em; - } - - [data-dynlist] > input, - input.cbi-input-password { - width: calc(100% - 20px); - } - - .cbi-dropdown { - min-width: 100%; - } - - .btn, .cbi-button { - font-size: 9pt !important; - line-height: 11pt; - } - - #maincontent { - padding: .25em; - } - - #tabmenu { - margin: -.25em -.25em 1em -.25em; - } - - .th, .td { - flex: 2 2 50%; - } - - .td.cbi-value-field { - flex-basis: 100%; - } - - .td.cbi-value-field[data-type="dvalue"] { - flex-basis: 50%; - } - - .td.cbi-value-field[data-type="button"], - .td.cbi-value-field[data-type="fvalue"] { - flex-basis: 25%; - text-align: left; - } - - .cbi-section { - padding: .25em; - } - - .cbi-value { - padding: 0 .25em; - } - - .cbi-value-title { - float: none; - font-weight: bold; - } - - .cbi-value-field { - width: 100%; - margin: 0; - } - - .cbi-value-description { - margin-top: 5px; - display: block; - } - - .cbi-section-create { - margin-bottom: 1em; - } - - .cbi-optionals { - display: flex; - } - - .cbi-page-actions { - flex-wrap: wrap; - } - - .cbi-page-actions > .cbi-button-link { - flex-basis: 100%; - margin-right: 2px; - } - - .cbi-optionals > *, - .cbi-page-actions > * { - flex: 1 1 auto; - margin: 2px; - height: auto; - } - - ul.cbi-tabmenu { - padding: 0 3px; - } - - ul.cbi-tabmenu li { - font-size: 90%; - margin: 0 1px -1px 0; - } - - .hide-xs { - display: none; - } - - #cbi-network .td[id] > strong { - display: block; - } - - #cbi-network-switch_vlan .td.cbi-section-actions { - flex-basis: 100%; - } - - .network-status-table .ifacebox { - margin: 0 0 .5em 0; - } -} diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg Binary files differdeleted file mode 100644 index 2fde5a2125..0000000000 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg +++ /dev/null diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg Binary files differdeleted file mode 100644 index ea06ce77f4..0000000000 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg +++ /dev/null diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css deleted file mode 100644 index 37d77b4f43..0000000000 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css +++ /dev/null @@ -1,59 +0,0 @@ -#header{ - padding-left:0px !important; - padding-bottom:24px; -} - -.header_left{ - max-width: 100%; -} - -#mainlogo { - max-width: 90%; -} - -#content { - margin-left:0px !important; -} - -#maincontent{ - font-size:1.2em; - line-height:1.5em; -} - -input[type=submit], -.cbi-button, -.cbi-button-reset, -.cbi-button-save{ - display:inline !important; - float:none !important; - padding:10px 30px !important; - margin: 10px 10px 10px 0 !important; -} - -.cbi-input-text, -.cbi-input-select, -.cbi-input-user, -.cbi-input-password{ - display:block !important; - margin: 0 !important; - padding:0 !important; -} - -.cbi-value-field{ - margin:0 !important; - margin-bottom: 1em !important; - width:100% !important; -} - -.cbi-section legend{ - white-space:normal !important; -} - -.cbi-value-title{ - font-weight:bold; - float:none !important; -} - -img { - max-width:100%; -} diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css deleted file mode 100644 index 660cd8df4d..0000000000 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css +++ /dev/null @@ -1,3 +0,0 @@ -.header_right { - display:none; -} diff --git a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm deleted file mode 100644 index 4c38821bbd..0000000000 --- a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm +++ /dev/null @@ -1,30 +0,0 @@ -<%# - Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> - Licensed to the public under the Apache License 2.0. --%> - -<% - local ver = require "luci.version" - - local xtime - if exectime then - xtime = (string.format("%.2fs", os.clock() - exectime)) - end -%> - -</div> -<div class="clear"></div> -<div class="push"></div> -</div> - -<div class="footer"> -<p class="luci"><a href="https://github.com/openwrt/luci">Powered by <%= ver.luciname %> (<%= ver.luciversion %>)</a></p> -<% if xtime then %> -<p class="exectime">Script execution time: <%=xtime%></p> -<% end %> -</div> - -</body> -</html> - diff --git a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm deleted file mode 100644 index fa749325f6..0000000000 --- a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm +++ /dev/null @@ -1,224 +0,0 @@ -<%# - Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org> - Licensed to the public under the Apache License 2.0. --%> - -<% - local fs = require "nixio.fs" - local sys = require "luci.sys" - local util = require "luci.util" - local http = require "luci.http" - local disp = require "luci.dispatcher" - local version = require "luci.version" - - local sysinfo = util.ubus("system", "info") or { } - local loadinfo = sysinfo.load or { 0, 0, 0 } - local boardinfo = util.ubus("system", "board") or { } - - local request = disp.context.path - local category = request[1] - local cattree = category and disp.node(category) - - local tree = disp.node() - local node = disp.context.dispatched - - local categories = disp.node_childs(tree) - - local c = tree - local i, r - - -- tag all nodes leading to this page - for i, r in ipairs(request) do - if c.nodes and c.nodes[r] then - c = c.nodes[r] - c._menu_selected = true - end - end - - local uci = require "luci.model.uci".cursor() - local ff = uci:get("freifunk", "community", "name") or "" - local co = "profile_" .. ff - local community = uci:get_first(co, "community", "name") or "Freifunk" - local hp = uci:get_first(co, "community", "homepage") or "http://www.freifunk.net" - local logo = "/luci-static/freifunk-generic/logo.jpg" - local banner = false - local show_comm = true - - local file - for file in fs.glob("/www/luci-static/resources/custom_logo.*") do - logo = string.gsub(file, "/www", "") - break - end - - for file in fs.glob("/www/luci-static/resources/custom_logo_only.*") do - logo = string.gsub(file, "/www", "") - show_comm = false - break - end - - for file in fs.glob("/www/luci-static/resources/custom_header.*") do - logo = string.gsub(file, "/www", "") - show_comm = false - banner = true - end --%> - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%=luci.i18n.context.lang%>" lang="<%=luci.i18n.context.lang%>"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta http-equiv="Content-Script-Type" content="text/javascript" /> -<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" /> -<link rel="stylesheet" media="only screen and (max-device-width: 854px)" href="<%=media%>/mobile.css" type="text/css" /> -<link rel="stylesheet" media="only screen and (max-width: 854px)" href="<%=media%>/smallscreen.css" type="text/css" /> -<link rel="stylesheet" media="handheld" href="<%=media%>/mobile.css" type="text/css" /> -<% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" /> -<% end -%> -<% if css then %><style title="text/css"> -<%= css %> -</style> -<% end -%> -<meta name="viewport" content="initial-scale=1.0" /> -<script type="text/javascript" src="<%=url('admin/translations', luci.i18n.context.lang)%><%# ?v=PKG_VERSION %>"></script> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> -<script type="text/javascript" src="<%=resource%>/xhr.js"></script> - -<title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(tostring(node.title)) or '')) %> - LuCI</title> -</head> - -<body class="lang_<%=luci.i18n.context.lang%>" data-page="<%= table.concat(disp.context.requestpath, "-") %>"> - -<div class="wrapper"> - -<!--[if lt IE 7]> -<div class="warning"><div style="background-color: #cccccc;padding: 2px 10px 2px 10px"> -<%: Your Internet Explorer is too old to display this page correctly. Please upgrade it to at least version 7 or use another browser like Firefox, Opera or Safari.%> -</div></div> -<![endif]--> - -<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> - <div class="warning"> - <strong><%:No password set!%></strong><br /> - <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%> - </div> -<%- end -%> - -<p class="skiplink"> -<span id="skiplink1"><a href="#navigation"><%:Skip to navigation%></a></span> -<span id="skiplink2"><a href="#content"><%:Skip to content%></a></span> -</p> - -<div id="header"> - <%if banner then%> - <div class="header_banner"> - <a href="<%=hp%>"><img src="<%=logo%>" alt="Header" /></a> - </div> - <%else%> - <div class="header_left"> - <a href="<%=hp%>"><img src="<%=logo%>" id="mainlogo" alt="Logo" /></a> - <%if show_comm then%> - <a href="<%=hp%>"><%=community%></a> - <br/> - <%end%> - </div> - <div class="header_right"> - <%=version.distversion%><br /> - <%:Load%>: <%="%.2f" % (loadinfo[1] / 65535.0)%> <%="%.2f" % (loadinfo[2] / 65535.0)%> <%="%.2f" % (loadinfo[3] / 65535.0)%><br /> - <%:Hostname%>: <%=boardinfo.hostname or "?"%><br /> - <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()"> - <%:Auto Refresh%>: - <span id="xhr_poll_status_on"><%:on%></span> - <span id="xhr_poll_status_off" style="display:none"><%:off%></span> - </span> - </div> - <div class="clear"></div> - - <%end%> -</div> - -<%- - local function submenu(prefix, node) - local childs = disp.node_childs(node) - if #childs > 0 then -%> - <ul id="submenu_<%=string.gsub(string.gsub(prefix, "/", "_"), "^_(.-)_$", "%1")%>"> - <%- - for i, r in ipairs(childs) do - local nnode = node.nodes[r] - local href = controller .. prefix .. r .. "/" .. - (nnode.query and http.build_querystring(nnode.query) or "") - %> - <li> - <a<%=ifattr(nnode._menu_selected, "class", "active")%> href="<%=luci.util.pcdata(href)%>"><%=translate(nnode.title)%></a> - <%- submenu(prefix .. r .. "/", nnode) %> - </li> - <%- - end - %> - </ul> -<% - end - end -%> - -<div id="menubar"> -<h2 class="navigation"><a id="navigation" name="navigation"><%:Navigation%></a></h2> -<ul id="mainmenu" class="dropdowns"> - <% - local childs = disp.node_childs(cattree) - if #childs > 0 then - for i, r in ipairs(childs) do - local nnode = cattree.nodes[r] - local href = controller .. "/" .. category .. "/" .. r .. - (nnode.query and http.build_querystring(k.query) or "") - %> - <li> - <a<%=ifattr(nnode._menu_selected, "class", "preactive")%> href="<%=href%>"><%=translate(nnode.title)%></a> - <%- submenu("/" .. category .. "/" .. r .. "/", nnode) %> - </li> - <% - end - end - %> - <li></li> -</ul> - -<% if #categories > 1 then %> - <ul id="modemenu"> - <% for i, r in ipairs(categories) do %> - <li><a<%=ifattr(request[1] == r, "class", "active")%> href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a></li> - <% end %> - </ul> -<% end %> - -<% -if tree.nodes[category] and tree.nodes[category].ucidata then - local ucic = 0 - for i, j in pairs(require("luci.model.uci").cursor():changes()) do - for k, l in pairs(j) do - for m, n in pairs(l) do - ucic = ucic + 1; - end - end - end --%> - <div id="savemenu"> - <% if ucic > 0 then %> - <a class="uci_change_indicator warning" href="<%=controller%>/<%=category%>/uci/changes/?redir=<%=http.urlencode(http.formvalue('redir') or table.concat(disp.context.request, "/"))%>"><%:Unsaved Changes%>: <%=ucic%></a> - <% end -%> - </div> -<% end %> - -<div class="clear"></div> -</div> -<div id="maincontent"> -<% if category ~= "freifunk" and category ~= "splash" then %> -<noscript> - <div class="errorbox"> - <strong><%:JavaScript required!%></strong><br /> - <%:You must enable JavaScript in your browser or LuCI will not work properly.%> - </div> -</noscript> -<% end %> diff --git a/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/30_luci-theme-freifunk-generic b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/30_luci-theme-freifunk-generic deleted file mode 100644 index 017e7f7bad..0000000000 --- a/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/30_luci-theme-freifunk-generic +++ /dev/null @@ -1,5 +0,0 @@ -uci batch <<-EOF - set luci.themes.Freifunk_Generic=/luci-static/freifunk-generic - set luci.main.mediaurlbase=/luci-static/freifunk-generic - commit luci -EOF diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css index db5304b430..2a88ef3750 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -15,6 +15,9 @@ * MUI: * https://github.com/muicss/mui * + * Menu and loading spinner icons from IcoMoon: + * https://icomoon.io + * * Pure CSS ripple effect: * https://github.com/mladenplavsic/css-ripple-effect * @@ -26,20 +29,6 @@ */ @import url("custom.css"); -/* - * Font generate by Icomoon<icomoon.io> - */ -@font-face { - font-family: "icomoon"; - font-weight: normal; - font-style: normal; - src: url("fonts/font.eot"); - src: url("fonts/font.eot") format("embedded-opentype"), - url("fonts/font.ttf") format("truetype"), - url("fonts/font.woff") format("woff"), - url("fonts/font.svg") format("svg"); -} - .table { position: relative; display: table; @@ -143,20 +132,6 @@ flex: 10 10 300px !important; } -.cbi-button-up, -.cbi-button-down, -.cbi-value-helpicon, -.showSide { - font-family: "icomoon" !important; - font-weight: normal; - font-style: normal; - font-variant: normal; - line-height: 1; - text-transform: none; - -webkit-font-smoothing: antialiased; - speak: none; -} - * { box-sizing: border-box; margin: 0; @@ -229,12 +204,12 @@ input, select, .cbi-dropdown { width: inherit; + cursor: default; } select:not([multiple="multiple"]):focus, input:not(.cbi-button):focus, -.cbi-dropdown:focus, -.cbi-dynlist > .item:focus { +.cbi-dropdown:focus { border-color: #09c; border-color: var(--main-color); } @@ -298,6 +273,12 @@ footer > a { color: #aaa; } +small { + font-size: 90%; + line-height: 1.42857143; + white-space: normal; +} + .main { position: relative; top: 4rem; @@ -320,7 +301,7 @@ footer > a { .main > .loading > span { font-family: monospace; - font-size: 2.0rem; + font-size: 2rem; font-size-adjust: .35; position: relative; top: 12.5%; @@ -329,17 +310,16 @@ footer > a { color: #888; } -.main > .loading > span > .loading-img:before { - content: "\e603"; -} - .main > .loading > span > .loading-img { - font-family: "icomoon" !important; - font-size: 1.0rem; - font-size-adjust: .6; + position: relative; + top: .1rem; + left: .05rem; display: inline-block; + width: 1.25rem; + height: 1.25rem; margin-right: 1rem; animation: anim-rotate 2s infinite linear; + background: url(./icons/spinner.svg) no-repeat center; } @keyframes anim-rotate { @@ -406,6 +386,9 @@ header { header > .fill > .container { margin-top: .5rem; padding: .5rem 1rem 0 1rem; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; user-select: none; } @@ -508,12 +491,17 @@ header > .fill > .container > .status > * { .main > .main-left > .nav > li { padding: .5rem 1rem; cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } -.main > .main-left > .nav > li:nth-last-child(1) { - font-size: 1.2rem; - margin-top: 1rem; - margin-bottom: 1rem; +.main > .main-left > .nav > li:last-child { + display: flex; + align-items: center; + margin: 2rem 0 1rem 0; + padding: 0 0 0 2rem; } .main > .main-left > .nav > li a { @@ -530,15 +518,26 @@ header > .fill > .container > .status > * { display: none; } +.main > .main-left > .nav > .slide > .menu, +.main > .main-left > .nav > li > [data-title="Logout"] { + font-size: 1.15rem; + font-weight: 500; + display: flex; + align-items: center; + width: 100%; + padding: .5rem 1rem; + text-decoration: none; + color: #202124; + color: var(--main-menu-color); +} + .main > .main-left > .nav > .slide > .menu::before { position: absolute; - top: 30%; right: 17px; - width: 1rem; - height: 1rem; + width: 16px; + height: 16px; content: ""; - background-image: url(data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwMCAxMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxMDAwIDEwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGQ9Ik01MDAsNjI1LjJMNzUuMywyNTVMMTAsMzE0LjlMNTAwLDc0NWw0OTAtNDMwLjFMOTI0LjcsMjU1TDUwMCw2MjUuMnoiLz48L2c+PC9zdmc+); - background-repeat: no-repeat; + background: url(./icons/arrow.svg) no-repeat; } .main > .main-left > .nav > .slide > .menu.active::before { @@ -557,13 +556,12 @@ body[class*="node-"] > .main > .main-left > .nav > .slide > .menu.active::before display: none; } -.main > .main-left > .nav > .slide > .menu { - font-size: 1.15rem; - font-weight: 500; - display: block; - padding: .5rem 1rem; - text-decoration: none; - color: var(--menu-color); +.main > .main-left > .nav > li:last-child::before { + position: absolute; + left: 14px; + width: 24px; + height: 24px; + content: url(./icons/logout.svg); } .main > .main-left > .nav > li:hover, @@ -605,21 +603,22 @@ body[class*="node-"] > .main > .main-left > .nav > .slide > .menu.active::before } .main > .main-left > .nav > .slide > .slide-menu > .active:hover { - cursor: hand; background-color: #09c; background-color: var(--main-color); } /* ripple effect */ .main > .main-left > .nav > .slide > .menu, -.main > .main-left > .nav > .slide > .slide-menu > li { +.main > .main-left > .nav > .slide > .slide-menu > li, +.main > .main-left > .nav > li:last-child { position: relative; overflow: hidden; transform: translate3d(0, 0, 0); } -.main > .main-left > .nav > .slide > .menu:after, -.main > .main-left > .nav > .slide > .slide-menu > li:after { +.main > .main-left > .nav > .slide > .menu::after, +.main > .main-left > .nav > .slide > .slide-menu > li::after, +.main > .main-left > .nav > li:last-child::after { position: absolute; top: 0; left: 0; @@ -636,8 +635,9 @@ body[class*="node-"] > .main > .main-left > .nav > .slide > .menu.active::before background-position: 50%; } -.main > .main-left > .nav > .slide > .menu:active:after, -.main > .main-left > .nav > .slide > .slide-menu > li:active:after { +.main > .main-left > .nav > .slide > .menu:active::after, +.main > .main-left > .nav > .slide > .slide-menu > li:active::after, +.main > .main-left > .nav > li:last-child:active::after { transition: 0s; transform: scale(0, 0); opacity: .2; @@ -647,10 +647,6 @@ body[class*="node-"] > .main > .main-left > .nav > .slide > .menu.active::before margin: 0 2rem 1rem 2rem; } -.Processes #maincontent > .container { - margin-right: 0; -} - ul { line-height: normal; } @@ -712,6 +708,14 @@ h5 { box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12); } +.cbi-map-descr, +.cbi-section-descr { + font-size: small; + line-height: 1.42857143; + padding: .5rem; + color: #999; +} + .cbi-map-descr + fieldset { margin-top: 1rem; } @@ -789,8 +793,6 @@ tr > th, border-top: thin solid #ddd; } -tr:first-child > td -.tr:first-child > .td, #cbi-wireless .td, #cbi-network .tr:first-child > .td, .table[width="100%"] > .tr:first-child > .td, @@ -800,6 +802,10 @@ tr:first-child > td border-top: 0 !important; } +.table[width="100%"] > .tr:first-child > .td { + margin: auto 0; +} + .cbi-section-table-row { margin-bottom: 1rem; text-align: center !important; @@ -810,10 +816,10 @@ tr:first-child > td margin-bottom: 0; } +.cbi-section-table-row > .cbi-value-field .cbi-dropdown, .cbi-section-table-row > .cbi-value-field .cbi-input-select, .cbi-section-table-row > .cbi-value-field .cbi-input-text, -.cbi-section-table-row > .cbi-value-field .cbi-input-password, -.cbi-section-table-row > .cbi-value-field .cbi-dropdown { +.cbi-section-table-row > .cbi-value-field .cbi-input-password { width: 100%; } @@ -833,20 +839,11 @@ div > .table > .tr:nth-of-type(2n) { /* fix multiple table */ table table, -.table .table { - border: 0; -} - +.table .table, .cbi-value-field table, -.cbi-value-field .table { - border: 0; -} - +.cbi-value-field .table, td > table > tbody > tr > td, -.td > .table > .tbody > .tr > .td { - border: 0; -} - +.td > .table > .tbody > .tr > .td, .cbi-value-field > table > tbody > tr > td, .cbi-value-field > .table > .tbody > .tr > .td { border: 0; @@ -881,11 +878,25 @@ td > table > tbody > tr > td, touch-action: manipulation; } +.cbi-button-up, +.cbi-button-down { + font-size: 1.2rem; + display: inline-block; + min-width: 0; + padding: .2rem .3rem; + color: transparent !important; + background: url(./icons/arrow.svg) no-repeat center; + background-size: 12px 20px; +} + +.cbi-button-up { + transform: scaleY(-1); +} + .cbi-button:not(select) { -webkit-appearance: none !important; } -form[method="post"] + form[method="post"], .cbi-button + .cbi-button { margin-left: .6rem; } @@ -909,15 +920,27 @@ form[method="post"] + form[method="post"], .btn:hover, .btn:focus, .cbi-button:hover, -.cbi-button:focus { +.cbi-button:focus, +.item:hover::after, +.item:focus::after { box-shadow: 0 0 2px rgba(0, 0, 0, .12), 0 2px 2px rgba(0, 0, 0, .2); } .btn:active, -.cbi-button:active { +.cbi-button:active, +.item:active::after { box-shadow: 0 10px 20px rgba(0, 0, 0, .19), 0 6px 6px rgba(0, 0, 0, .23); } +.cbi-button-up:hover, +.cbi-button-up:focus { + box-shadow: 0 0 2px rgba(0, 0, 0, .12), 0 -2px 2px rgba(0, 0, 0, .2); +} + +.cbi-button-up:active { + box-shadow: 0 -10px 20px rgba(0, 0, 0, .19), 0 -6px 6px rgba(0, 0, 0, .23); +} + .btn:disabled, .cbi-button:disabled { cursor: not-allowed; @@ -968,6 +991,7 @@ form[method="post"] + form[method="post"], .cbi-button-reload, .cbi-button-action, .cbi-button[value="Submit"], +.cbi-button[value="Upload"], .cbi-button[value$="Apply"], .cbi-button[onclick="addKey(event)"] { font-weight: normal; @@ -1010,7 +1034,7 @@ form[method="post"] + form[method="post"], .cbi-button-success, .cbi-button-download, .cbi-button[name="backup"], -.cbi-button[value="Upload"], +.cbi-button[value="Download"], .cbi-button[value="Save mtdblock"] { font-weight: normal; color: #fff; @@ -1028,41 +1052,44 @@ form[method="post"] + form[method="post"], .cbi-value-field .cbi-button-add { font-weight: bold; + margin: 9px 0 4px 3px; padding: 1px 6px; } -.cbi-value-field .cbi-button-neutral { - padding: 1px 8px; -} - -/* table */ .tabs { margin: 0 -2rem; padding-left: .5rem; background-color: #fff; } -.cbi-tabmenu > li, -.tabs > li { +.tabs > li, +.cbi-tabmenu > li { display: inline-block; - padding: .6rem 0; + padding: .55rem 0; + cursor: pointer; } -.cbi-tabmenu > li > a, -.tabs > li > a { - padding: .5rem .8rem; - text-decoration: none; - color: #404040; +.tabs > li { + padding-bottom: .4rem; + border-bottom: .2rem solid transparent; } .tabs > li[class~="active"], .tabs > li:hover { - margin-bottom: -.18751rem; + border-bottom-color: #09c; + border-bottom-color: var(--main-color); +} + +.tabs > li:hover { cursor: pointer; - color: #09c; - color: var(--main-color); - border-bottom: #09c; - border-bottom: .2rem solid var(--main-color); + border-bottom-color: #c9c9c9; +} + +.tabs > li > a, +.cbi-tabmenu > li > a { + padding: .6rem .9rem; + text-decoration: none; + color: #404040; } .tabs > li[class~="active"] > a { @@ -1070,10 +1097,6 @@ form[method="post"] + form[method="post"], color: var(--main-color); } -.tabs > li:hover { - border-bottom: .18751rem solid #c9c9c9; -} - .cbi-tabmenu { border: thin solid #d4d4d4; border-bottom: 0; @@ -1097,15 +1120,15 @@ form[method="post"] + form[method="post"], } [data-tab-title] { + overflow: hidden; height: 0; opacity: 0; - overflow: hidden; } [data-tab-active="true"] { - opacity: 1; - height: auto; overflow: visible; + height: auto; + opacity: 1; transition: opacity .25s ease-in; } @@ -1131,41 +1154,9 @@ form[method="post"] + form[method="post"], display: table-cell; } -.cbi-input-invalid { - color: #f00; - border-color: #f00; -} - -.cbi-section-error { - font-weight: bold; - line-height: 1.42857143; - margin: 18px; - padding: 6px; - border: thin solid #f00; - border-radius: 3px; - background-color: #fce6e6; -} - -.cbi-section-error ul { - margin: 0 0 0 20px; -} - -.cbi-section-error ul li { - font-weight: bold; - color: #f00; -} - -.cbi-value-helpicon > img { - display: none; -} - -.cbi-value-helpicon:before { - content: "\f059"; -} - .cbi-value-description { font-size: small; - padding: .5rem 0 0 0; + padding-top: .4rem; opacity: .5; } @@ -1173,7 +1164,7 @@ form[method="post"] + form[method="post"], display: table-cell; float: left; width: 23rem; - padding-top: .4rem; + padding-top: .35rem; padding-right: 2rem; text-align: right; word-wrap: break-word; @@ -1182,13 +1173,53 @@ form[method="post"] + form[method="post"], .cbi-value { display: inline-block; width: 100%; - padding: .3rem 1rem; + padding: .35rem 1rem .2rem 1rem; } .cbi-value ul { line-height: 1.25; } +.cbi-value-field .cbi-dropdown, +.cbi-value-field .cbi-input-select, +.cbi-value input[type="text"], +.cbi-value input[type="password"] { + min-width: 25rem; +} + +#cbi-firewall-zone .cbi-input-select, +#cbi-network-switch_vlan .cbi-input-select { + min-width: 11rem; +} + +#cbi-network-switch_vlan .cbi-input-text { + max-width: 3rem; +} + +.cbi-input-invalid { + color: #f00; + border-bottom-color: #f00; +} + +.cbi-section-error { + font-weight: bold; + line-height: 1.42857143; + margin: 18px; + padding: 6px; + border: thin solid #f00; + border-radius: 3px; + background-color: #fce6e6; +} + +.cbi-section-error ul { + margin: 0 0 0 20px; +} + +.cbi-section-error ul li { + font-weight: bold; + color: #f00; +} + .td[data-title]::before { font-weight: bold; display: none; @@ -1226,7 +1257,7 @@ form[method="post"] + form[method="post"], .cbi-rowstyle-2 .cbi-button-up, .cbi-rowstyle-2 .cbi-button-down, -.cbi-rowstyle-2:first-child { +body:not(.Interfaces) .cbi-rowstyle-2:first-child { background-color: #fff !important; } @@ -1253,30 +1284,23 @@ form[method="post"] + form[method="post"], margin: 0; } -/* desc */ -.cbi-section-descr, -.cbi-map-descr { - font-size: small; - line-height: 1.42857143; - padding: .5rem; - color: #999; -} - +/* lists */ .cbi-dynlist { line-height: 1.3; flex-direction: column; min-height: 30px; + cursor: text; } .cbi-dynlist > .item { position: relative; - max-width: 24.9rem; - margin: 0 2em 4px 0; - padding: 2px 4px; - cursor: default; + max-width: 25rem; + margin-right: 2em; + padding: .5em .25em .25em 0; pointer-events: none; color: #666; border-bottom: 2px solid rgba(0, 0, 0, .26); + outline: 0; } .cbi-dynlist[name="sshkeys"] > .item { @@ -1303,13 +1327,36 @@ form[method="post"] + form[method="post"], word-break: break-word; } +.cbi-dynlist > .add-item { + display: inline-flex; + align-items: center; + width: 100%; + min-width: 16rem; +} + +.cbi-dynlist > .add-item:not([ondrop]) > input { + overflow: hidden; + width: 100%; + min-width: 15rem; + white-space: nowrap; + text-overflow: ellipsis; +} + +.cbi-dynlist > .add-item[ondrop] > input { + min-width: 13rem; +} + .cbi-dynlist, .cbi-dropdown { position: relative; display: inline-flex; - height: auto; padding: 0; - cursor: default; +} + +.cbi-dropdown[placeholder*="select"] { + max-width: 25rem; + height: auto; + margin-top: -3px; } .cbi-dropdown > ul { @@ -1320,6 +1367,7 @@ form[method="post"] + form[method="post"], margin: 0 !important; padding: 0; list-style: none; + outline: 0; } .cbi-dropdown > ul.preview { @@ -1341,7 +1389,9 @@ form[method="post"] + form[method="post"], flex-shrink: 0; justify-content: center; padding: 0 .25em; + cursor: default; text-align: center; + outline: 0; } .cbi-dropdown > .more, @@ -1402,10 +1452,6 @@ form[method="post"] + form[method="post"], height: 20px; } -.cbi-dropdown[open] { - position: relative; -} - .cbi-dropdown[open] > ul.dropdown { position: absolute; z-index: 1100; @@ -1483,6 +1529,43 @@ form[method="post"] + form[method="post"], width: auto; } +/* progressbar */ +.cbi-progressbar { + position: relative; + min-width: 170px; + height: 20px; + margin: 6px 0; + border: thin solid #999; + background: #eee; +} + +.cbi-progressbar > div { + width: 0; + height: 100%; + transition: width .25s ease-in; + background: #5bc0de; + background: var(--bar-bg); +} + +.cbi-progressbar::after { + font-family: monospace; + font-size: 1.3em; + font-weight: bold; + font-size-adjust: .38; + line-height: normal; + position: absolute; + top: 2px; + right: 0; + bottom: 2px; + left: 0; + overflow: hidden; + content: attr(title); + text-align: center; + white-space: pre; + text-overflow: ellipsis; + text-shadow: 0 0 2px #eee; +} + #modal_overlay { position: fixed; z-index: 900; @@ -1525,6 +1608,7 @@ form[method="post"] + form[method="post"], overflow: auto; margin-bottom: .5em; padding: 8.5px; + cursor: auto; white-space: pre-wrap; color: #eee; outline: 0; @@ -1593,7 +1677,7 @@ body.modal-overlay-active #modal_overlay { bottom: 0; left: .2em; width: 32px; - content: " "; + content: ""; background: url(../resources/icons/loading.gif) no-repeat center; background-size: 16px; } @@ -1641,60 +1725,6 @@ body.modal-overlay-active #modal_overlay { display: inline-block; } -/* input */ -.cbi-value input[type="password"], -.cbi-value input[type="text"] { - min-width: 15rem; -} - -/* select */ -.cbi-value-field .cbi-dropdown, -.cbi-value-field .cbi-input-select { - min-width: 15rem; -} - -.cbi-value-field .cbi-input-invalid { - color: #f00; - border-bottom-color: #f00; -} - -/* progressbar */ -.cbi-progressbar { - position: relative; - min-width: 170px; - height: 20px; - margin: 4px 0; - border: thin solid #999; - background: #eee; -} - -.cbi-progressbar > div { - width: 0; - height: 100%; - transition: width .25s ease-in; - background: #5bc0de; - background: var(--bar-bg); -} - -.cbi-progressbar::after { - font-family: monospace; - font-size: 1.3em; - font-weight: bold; - font-size-adjust: .38; - line-height: normal; - position: absolute; - top: 2px; - right: 0; - bottom: 2px; - left: 0; - overflow: hidden; - content: attr(title); - text-align: center; - white-space: pre; - text-overflow: ellipsis; - text-shadow: 0 0 2px #eee; -} - .th[data-type="button"], .td[data-type="button"], .th[data-type="fvalue"], @@ -1773,12 +1803,11 @@ td > .ifacebadge, #syslog { font-size: small; + line-height: 1.25; overflow-y: hidden; width: 100%; min-height: 15rem; - margin-bottom: 20px; padding: 1rem; - padding-bottom: 2.5rem; resize: none; color: #eee; border: 0; @@ -1929,7 +1958,7 @@ td > .ifacebadge, .cbi-value-field .cbi-input-checkbox, .cbi-value-field .cbi-input-radio { - margin-top: .15rem; + margin-top: .1rem; } .cbi-value-field > ul > li { @@ -1971,20 +2000,6 @@ td.cbi-value-field var, color: #0069d6; } -small { - font-size: 90%; - line-height: 1.42857143; - white-space: normal; -} - -.cbi-button-up, -.cbi-button-down { - font-size: 1.2rem; - display: inline-block; - min-width: 0; - padding: .2rem .3rem; -} - .cbi-optionals { padding: 1rem 1rem 0 1rem; border-top: thin solid #ccc; @@ -2060,8 +2075,6 @@ span[data-tooltip] .label { text-decoration: none; text-transform: uppercase; color: #fff !important; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; border-radius: 3px; background-color: #bfbfbf; text-shadow: none; @@ -2092,11 +2105,13 @@ label > input[type="radio"] { /* diagnostics */ #diag-rc-output > pre, -#command-rc-output > pre { +#command-rc-output > pre, +[data-page="admin-services-wol"] .notice code { font-size: 1.2rem; font-size-adjust: .35; line-height: normal; display: block; + overflow-y: hidden; width: 100%; padding: 8.5px; white-space: pre; @@ -2151,7 +2166,7 @@ input[name="nslookup"] { box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12); } -.node-main-login > .main form > div:nth-last-child(1) { +.node-main-login > .main form > div:last-child { float: right; } @@ -2164,6 +2179,7 @@ input[name="nslookup"] { } .node-main-login > .main .cbi-input-text { + width: 100% !important; min-width: 15rem; } @@ -2179,20 +2195,12 @@ input[name="nslookup"] { } } -/* fix status overview */ -.node-status-overview > .main fieldset:nth-child(4) .td:nth-child(2) { - white-space: normal; -} - -/* fix status processes */ +/* fix status */ +.node-status-overview > .main fieldset:nth-child(4) .td:nth-child(2), .node-status-processes > .main .table .tr .td:nth-child(3) { white-space: normal; } -.node-admin-status form { - margin: 2rem 2rem 0 0; -} - /* fix system reboot */ [data-page="admin-system-reboot"] p { padding-left: 2rem; @@ -2205,11 +2213,11 @@ input[name="nslookup"] { } /* samba */ -#cbi-samba .cbi-value-last .cbi-value-field { +#cbi-samba [data-tab="template"] .cbi-value-field { display: block; } -#cbi-samba .cbi-value-last .cbi-value-title { +#cbi-samba [data-tab="template"] .cbi-value-title { width: auto; padding-bottom: .6rem; } @@ -2287,6 +2295,7 @@ input[name="nslookup"] { } .Firewall form { + margin: 2rem 2rem 0 0; padding: 0; box-shadow: none; } @@ -2319,7 +2328,8 @@ input[name="nslookup"] { display: block; } -#cbi-firewall-zone .td.cbi-section-actions { +#cbi-firewall-zone .td, +#cbi-network-switch_vlan .td { width: 100%; } @@ -2341,6 +2351,7 @@ input[name="nslookup"] { /* custom commands */ .commandbox { width: 24% !important; + margin: 10px 0 0 10px !important; padding: .5rem 1rem; border-bottom: thin solid #ccc; background: #eee; @@ -2361,16 +2372,20 @@ input[name="nslookup"] { .commandbox code { position: absolute; - overflow-x: hidden; - overflow-y: auto; + overflow: hidden; max-width: 60%; - max-height: 55px; - margin-top: -3px; margin-left: 4px; padding: 2px 3px; + white-space: nowrap; text-overflow: ellipsis; } +.commandbox code:hover { + overflow-y: auto; + max-height: 50px; + white-space: normal; +} + .commandbox p:first-of-type { margin-top: -6px; } @@ -2381,7 +2396,7 @@ input[name="nslookup"] { [data-page^="admin-system-commands"] .panel-title, [data-page^="command-cfg"] .mobile-hide, -[data-page^="command-cfg"] header > .fill > .container > #logo { +[data-page^="command-cfg"] .showSide { display: none; } @@ -2393,6 +2408,7 @@ input[name="nslookup"] { max-width: 40%; margin: 0; animation: anim-fade-in 1.5s forwards; + word-break: break-word; opacity: 0; } @@ -2402,6 +2418,21 @@ input[name="nslookup"] { } } +/* IE hacks */ +@media all and (-ms-high-contrast: none) { + .main > .main-left > .nav > .slide > .menu::before { + top: 30.25%; + } + + .main > .main-left > .nav > li:last-child::before { + top: 20%; + } + + .showSide::before { + top: -12px; + } +} + @media screen and (max-width: 1600px) { header > .fill > .container > #logo { margin: 0 2.5rem 0 .5rem; @@ -2415,10 +2446,6 @@ input[name="nslookup"] { width: calc(100% - 13rem); } - .cbi-dynlist > .item { - max-width: 21.9rem; - } - .btn:not(button), .cbi-button { font-size: .8rem; @@ -2429,14 +2456,25 @@ input[name="nslookup"] { padding: .2rem .6rem; } + fieldset, + .cbi-section { + padding: 1rem; + } + .cbi-value-title { width: 15rem; padding-right: .6rem; } - fieldset, - .cbi-section { - padding: 1rem; + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"], + .cbi-value input[type="password"] { + min-width: 22rem; + } + + #cbi-firewall-zone .cbi-input-select { + min-width: 9rem; } .cbi-input-textarea { @@ -2446,10 +2484,6 @@ input[name="nslookup"] { .node-admin-status > .main fieldset li > a { padding: .3rem .6rem; } - - #cbi-firewall-zone > .table { - display: block; - } } @media screen and (max-width: 1366px) { @@ -2477,12 +2511,8 @@ input[name="nslookup"] { width: calc(100% - 13rem); } - .cbi-dynlist > .item { - max-width: 19.9rem; - } - - .cbi-tabmenu > li > a, - .tabs > li > a { + .tabs > li > a, + .cbi-tabmenu > li > a { padding: .2rem .5rem; } @@ -2500,9 +2530,21 @@ input[name="nslookup"] { width: 100%; } + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"], + .cbi-value input[type="password"] { + min-width: 19rem; + } + + #cbi-firewall-zone .cbi-input-select { + min-width: 4rem; + } + .main > .main-left > .nav > li, .main > .main-left > .nav > li a, - .main > .main-left > .nav > .slide > .menu { + .main > .main-left > .nav > .slide > .menu, + .main > .main-left > .nav > li > [data-title="Logout"] { font-size: .9rem; } @@ -2520,7 +2562,8 @@ input[name="nslookup"] { [data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table), [data-page="admin-network-firewall-rules"] .table:not(.cbi-section-table), - [data-page="admin-network-hosts"] .table { + [data-page="admin-network-hosts"] .table, + [data-page="admin-network-routes"] .table { overflow-y: visible; } @@ -2538,16 +2581,15 @@ input[name="nslookup"] { position: relative; } - [data-page^="command-cfg"] header > .fill > .container > .brand { - display: block; - margin-top: -1.75rem; - } - html, .main { overflow-y: visible; } + .main > .loading > span { + top: 25%; + } + .main-left { position: fixed; z-index: 100; @@ -2558,29 +2600,30 @@ input[name="nslookup"] { width: 100%; } - .cbi-dynlist > .item { - max-width: 14.9rem; - } - .showSide { - display: inline-block; - overflow: visible; - margin-right: .5rem; - padding: .1rem; + position: relative; + top: .18rem; + display: inline-flex; + align-items: center; + width: 1.6rem; + height: 1.6rem; + margin-right: .7rem; cursor: pointer; - border-radius: 50%; } - .showSide:before { - font-size: 1.7rem; - content: "\e20e"; + .showSide::before { + position: absolute; + left: 1px; + width: 24px; + height: 24px; + content: ""; + background: url(./icons/menu.svg) no-repeat center; } body:not(.logged-in) .showSide { visibility: hidden; width: 0; margin: 0; - padding: 0; } .node-main-login > .main .cbi-value-title { @@ -2588,12 +2631,27 @@ input[name="nslookup"] { } .cbi-value-title { - width: 9rem; + width: 12rem; padding-right: 1rem; } + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"] { + width: 16rem; + min-width: 16rem; + } + + .cbi-value input[type="password"], + .cbi-value input[name^="pw"], + .cbi-value input[data-update="change"]:nth-child(2) { + width: 13rem !important; + min-width: 13rem; + } + #diag-rc-output > pre, - #command-rc-output > pre { + #command-rc-output > pre, + [data-page="admin-services-wol"] .notice code { font-size: 1rem; } @@ -2601,6 +2659,10 @@ input[name="nslookup"] { display: block; } + .Interfaces .table { + overflow-x: hidden; + } + #packages.table { display: grid; } @@ -2733,6 +2795,7 @@ input[name="nslookup"] { .commandbox { width: 100% !important; + margin-left: 0 !important; } } @@ -2749,7 +2812,6 @@ input[name="nslookup"] { fieldset, .cbi-section { margin: 1rem 0 0 0; - padding: 1rem; } .tabs { @@ -2760,7 +2822,8 @@ input[name="nslookup"] { margin: 0 1rem 1.5rem 1rem; } - .main > .main-left > .nav > .slide > .menu { + .main > .main-left > .nav > .slide > .menu, + .main > .main-left > .nav > li > [data-title="Logout"] { font-size: 1.2rem; } @@ -2770,15 +2833,17 @@ input[name="nslookup"] { .cbi-value-title { display: block; - width: 100%; min-width: 0 !important; - margin-top: 1rem; - margin-bottom: .5rem; + margin: .5rem 0; text-align: left; } + .cbi-value-title, + .cbi-value-description, .cbi-value-field, - .cbi-value-description { + .cbi-value-field .cbi-dropdown, + .cbi-value-field .cbi-input-select, + .cbi-value input[type="text"] { width: 100%; } @@ -2786,13 +2851,8 @@ input[name="nslookup"] { display: inline-block; } - .cbi-tabmenu > li, - .tabs > li { - padding: .6rem 0; - } - - .cbi-tabmenu > li > a, - .tabs > li > a { + .tabs > li > a, + .cbi-tabmenu > li > a { font-size: .9rem; padding: .2rem .3rem; } @@ -2814,7 +2874,7 @@ input[name="nslookup"] { padding: 0; } - .node-main-login > .main form > div:nth-last-child(1) { + .node-main-login > .main form > div:last-child { margin-top: 2rem; } @@ -2832,9 +2892,11 @@ input[name="nslookup"] { margin-top: -8px; } + #syslog, #diag-rc-output > pre, - #command-rc-output > pre { - font-size: .8rem; + #command-rc-output > pre, + [data-page="admin-services-wol"] .notice code { + font-size: .8rem !important; } h2 { @@ -2896,10 +2958,21 @@ input[name="nslookup"] { font-size: .62rem; } - #cbi-wireless .td { + #cbi-wireless > #wifi_assoclist_table .td { overflow: hidden; } + #cbi-wireless > .cbi-section-node .td, + .Interfaces .td.cbi-section-actions { + text-align: center !important; + } + + [data-page="admin-status-processes"] .td[data-title="Hang Up"]::before, + [data-page="admin-status-processes"] .td[data-title="Terminate"]::before, + [data-page="admin-status-processes"] .td[data-title="Kill"]::before { + display: none; + } + .hide-sm, .hide-xs:not([data-title="MAC-Address"]) { display: none; @@ -2910,6 +2983,10 @@ input[name="nslookup"] { ::-webkit-scrollbar { width: 10px; height: 10px; + } + + ::-webkit-scrollbar, + ::-webkit-scrollbar-corner { background: transparent; } @@ -2925,52 +3002,3 @@ input[name="nslookup"] { background: #424242; } } - -@media screen and (min-width: 1152px) { - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: 20rem; - } - - .cbi-value-field .cbi-input-select { - width: 20rem; - } - - .cbi-value-field .cbi-dropdown { - min-width: 20rem; - } - - .cbi-section-node .tr { - overflow: hidden; - } -} - -@media screen and (min-width: 1366px) { - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: 22rem; - } - - .cbi-value-field .cbi-input-select { - width: 22rem; - } - - .cbi-value-field .cbi-dropdown { - min-width: 22rem; - } -} - -@media screen and (min-width: 1600px) { - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: 25rem; - } - - .cbi-value-field .cbi-input-select { - width: 25rem; - } - - .cbi-value-field .cbi-dropdown { - min-width: 25rem; - } -} diff --git a/themes/luci-theme-material/htdocs/luci-static/material/custom.css b/themes/luci-theme-material/htdocs/luci-static/material/custom.css index 6acd5aa3dd..7a5bbb93e8 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/custom.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/custom.css @@ -6,6 +6,7 @@ --menu-bg-color: #fff; --menu-color: #5f6368; --menu-color-hover: #202124; + --main-menu-color: #202124; --submenu-bg-hover: #d4d4d4; --submenu-bg-hover-active: #09c; --font-body: "Microsoft Yahei", "WenQuanYi Micro Hei", "sans-serif", "Helvetica Neue", "Helvetica", "Hiragino Sans GB"; diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.eot b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.eot Binary files differdeleted file mode 100644 index 9e6ffc9b82..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.eot +++ /dev/null diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.svg b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.svg deleted file mode 100644 index d38d057da3..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.svg +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata>Generated by IcoMoon</metadata> -<defs> -<font id="icomoon" horiz-adv-x="1024"> -<font-face units-per-em="1024" ascent="960" descent="-64" /> -<missing-glyph horiz-adv-x="1024" /> -<glyph unicode=" " horiz-adv-x="512" d="" /> -<glyph unicode="" glyph-name="expand_less" d="M512 596.667l256-256-60-60-196 196-196-196-60 60z" /> -<glyph unicode="" glyph-name="expand_more" d="M708 572.667l60-60-256-256-256 256 60 60 196-196z" /> -<glyph unicode="" glyph-name="menu" d="M128 682.667h768v-86h-768v86zM128 384.667v84h768v-84h-768zM128 170.667v86h768v-86h-768z" /> -<glyph unicode="" glyph-name="favorite" d="M512 28.667l-62 56q-106 96-154 142t-107 114-81 123-22 113q0 98 67 166t167 68q116 0 192-90 76 90 192 90 100 0 167-68t67-166q0-78-52-162t-113-146-199-186z" /> -<glyph unicode="" glyph-name="spinner9" d="M512 960c-278.748 0-505.458-222.762-511.848-499.974 5.92 241.864 189.832 435.974 415.848 435.974 229.75 0 416-200.576 416-448 0-53.020 42.98-96 96-96s96 42.98 96 96c0 282.77-229.23 512-512 512zM512-64c278.748 0 505.458 222.762 511.848 499.974-5.92-241.864-189.832-435.974-415.848-435.974-229.75 0-416 200.576-416 448 0 53.020-42.98 96-96 96s-96-42.98-96-96c0-282.77 229.23-512 512-512z" /> -<glyph unicode="" glyph-name="question-circle" horiz-adv-x="878" d="M512 164.571v109.714q0 8-5.143 13.143t-13.143 5.143h-109.714q-8 0-13.143-5.143t-5.143-13.143v-109.714q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143zM658.286 548.571q0 50.286-31.714 93.143t-79.143 66.286-97.143 23.429q-138.857 0-212-121.714-8.571-13.714 4.571-24l75.429-57.143q4-3.429 10.857-3.429 9.143 0 14.286 6.857 30.286 38.857 49.143 52.571 19.429 13.714 49.143 13.714 27.429 0 48.857-14.857t21.429-33.714q0-21.714-11.429-34.857t-38.857-25.714q-36-16-66-49.429t-30-71.714v-20.571q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143q0 10.857 12.286 28.286t31.143 28.286q18.286 10.286 28 16.286t26.286 20 25.429 27.429 16 34.571 7.143 46.286zM877.714 438.857q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -</font></defs></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.ttf b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.ttf Binary files differdeleted file mode 100644 index 84669323e9..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.ttf +++ /dev/null diff --git a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.woff b/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.woff Binary files differdeleted file mode 100644 index 00cf84ea03..0000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/fonts/font.woff +++ /dev/null diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/arrow.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/arrow.svg new file mode 100644 index 0000000000..be864c5ac9 --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/arrow.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#202124" d="m8,10.033663l-6.898535,-6.013274l-1.060688,0.972974l7.959223,6.986249l7.959223,-6.986249l-1.060688,-0.972974l-6.898535,6.013274z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/logout.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/logout.svg new file mode 100644 index 0000000000..d529b94e6f --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/logout.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#202124" d="M10.09,15.59L11.5,17l5,-5,-5,-5,-1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0,-2,0.9,-2,2v4h2V5h14v14H5v-4H3v4c0,1.1,0.89,2,2,2h14c1.1,0,2,-0.9,2,-2V5c0,-1.1,-0.9,-2,-2,-2z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/menu.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/menu.svg new file mode 100644 index 0000000000..46bd0ae687 --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/menu.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#fff" d="m2.037076,18.641983l19.925899,0l0,-2.231286l-19.925899,0l0,2.231286zm0,-7.731664l0,2.179395l19.925899,0l0,-2.179395l-19.925899,0zm0,-5.552269l0,2.231286l19.925899,0l0,-2.231286l-19.925899,0z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/icons/spinner.svg b/themes/luci-theme-material/htdocs/luci-static/material/icons/spinner.svg new file mode 100644 index 0000000000..6ddd3b3ed8 --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/icons/spinner.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#888" d="M8,0c-4.355,0-7.898,3.481-7.998,7.812,0.092-3.779,2.966-6.812,6.498-6.812,3.59,0,6.5,3.134,6.5,7,0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5c0-4.418-3.582-8-8-8zM8,16c4.355,0,7.898-3.481,7.998-7.812-0.092,3.779-2.966,6.812-6.498,6.812-3.59,0-6.5-3.134-6.5-7,0-0.828-0.672-1.5-1.5-1.5s-1.5,0.672-1.5,1.5c0,4.418,3.582,8,8,8z"/></svg>
\ No newline at end of file diff --git a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js index 3c25ed712d..755191f335 100755 --- a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js +++ b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js @@ -1,237 +1,218 @@ /** - * Material is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI + * Material is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI * - * luci-theme-material - * Copyright 2015 Lutty Yang <lutty@wcan.in> + * luci-theme-material + * Copyright 2015 Lutty Yang <lutty@wcan.in> * - * Have a bug? Please create an issue here on GitHub! - * https://github.com/LuttyYang/luci-theme-material/issues + * Have a bug? Please create an issue here on GitHub! + * https://github.com/LuttyYang/luci-theme-material/issues * - * luci-theme-bootstrap: - * Copyright 2008 Steven Barth <steven@midlink.org> - * Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> - * Copyright 2012 David Menting <david@nut-bolt.nl> + * luci-theme-bootstrap: + * Copyright 2008 Steven Barth <steven@midlink.org> + * Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> + * Copyright 2012 David Menting <david@nut-bolt.nl> * - * MUI: - * https://github.com/muicss/mui + * MUI: + * https://github.com/muicss/mui * - * Licensed to the public under the Apache License 2.0 + * Licensed to the public under the Apache License 2.0 */ + (function ($) { - $(".main > .loading").fadeOut(); - - /** - * trim text, Remove spaces, wrap - * @param text - * @returns {string} - */ - function trimText(text) { - return text.replace(/[ \t\n\r]+/g, " "); - } - - - var lastNode = undefined; - var mainNodeName = undefined; - - var nodeUrl = ""; - (function(node){ - var luciLocation; - if (node[0] == "admin"){ - luciLocation = [node[1], node[2]]; - }else{ - luciLocation = node; - } - - for(var i in luciLocation){ - nodeUrl += luciLocation[i]; - if (i != luciLocation.length - 1){ - nodeUrl += "/"; - } - } - })(luciLocation); - - /** - * get the current node by Burl (primary) - * @returns {boolean} success? - */ - function getCurrentNodeByUrl() { - var ret = false; - if (!$('body').hasClass('logged-in')) { - luciLocation = ["Main", "Login"]; - return true; - } - - $(".main > .main-left > .nav > .slide > .menu").each(function () { - var ulNode = $(this); - ulNode.next().find("a").each(function () { - var that = $(this); - var href = that.attr("href"); - - if (href.indexOf(nodeUrl) != -1) { - ulNode.click(); - ulNode.next(".slide-menu").stop(true, true); - lastNode = that.parent(); - lastNode.addClass("active"); - ret = true; - return true; - } - }); - }); - return ret; - } - - /** - * menu click - */ - $(".main > .main-left > .nav > .slide > .menu").click(function () { - var ul = $(this).next(".slide-menu"); - var menu = $(this); - if (!ul.is(":visible")) { - menu.addClass("active"); - ul.addClass("active"); - ul.stop(true).slideDown("fast"); - } else { - ul.stop(true).slideUp("fast", function () { - menu.removeClass("active"); - ul.removeClass("active"); - }); - } - return false; - }); - - /** - * hook menu click and add the hash - */ - $(".main > .main-left > .nav > .slide > .slide-menu > li > a").click(function () { - if (lastNode != undefined) lastNode.removeClass("active"); - $(this).parent().addClass("active"); - $(".main > .loading").fadeIn("fast"); - return true; - }); - - /** - * fix menu click - */ - $(".main > .main-left > .nav > .slide > .slide-menu > li").click(function () { - if (lastNode != undefined) lastNode.removeClass("active"); - $(this).addClass("active"); - $(".main > .loading").fadeIn("fast"); - window.location = $($(this).find("a")[0]).attr("href"); - return false; - }); - - /** - * get current node and open it - */ - if (getCurrentNodeByUrl()) { - mainNodeName = "node-" + luciLocation[0] + "-" + luciLocation[1]; - mainNodeName = mainNodeName.replace(/[ \t\n\r\/]+/g, "_").toLowerCase(); - $("body").addClass(mainNodeName); - } - $(".cbi-button-up").val(""); - $(".cbi-button-down").val(""); - - - /** - * hook other "A Label" and add hash to it. - */ - $("#maincontent > .container").find("a").each(function () { - var that = $(this); - var onclick = that.attr("onclick"); - if (onclick == undefined || onclick == "") { - that.click(function () { - var href = that.attr("href"); - if (href.indexOf("#") == -1) { - $(".main > .loading").fadeIn("fast"); - return true; - } - }); - } - }); - - /** - * Sidebar expand - */ - var showSide = false; - $(".showSide").click(function () { - if (showSide) { - $(".darkMask").stop(true).fadeOut("fast"); - $(".main-left").stop(true).animate({ - width: "0" - }, "fast"); - $(".main-right").css("overflow-y", "visible"); - showSide = false; - } else { - $(".darkMask").stop(true).fadeIn("fast"); - $(".main-left").stop(true).animate({ - width: "15rem" - }, "fast"); - $(".main-right").css("overflow-y", "hidden"); - showSide = true; - } - }); - - - $(".darkMask").click(function () { - if (showSide) { - showSide = false; - $(".darkMask").stop(true).fadeOut("fast"); - $(".main-left").stop(true).animate({ - width: "0" - }, "fast"); - $(".main-right").css("overflow-y", "visible"); - } - }); - - $(window).resize(function () { - if ($(window).width() > 921) { - $(".main-left").css("width", ""); - $(".darkMask").stop(true); - $(".darkMask").css("display", "none"); - showSide = false; - } - }); - - /** - * fix legend position - */ - $("legend").each(function () { - var that = $(this); - that.after("<span class='panel-title'>" + that.text() + "</span>"); - }); - - $(".cbi-section-table-titles, .cbi-section-table-descr, .cbi-section-descr").each(function () { - var that = $(this); - if (that.text().trim() == ""){ - that.css("display", "none"); - } - }); - - - $(".main-right").focus(); - $(".main-right").blur(); - $("input").attr("size", "0"); - - if (mainNodeName != undefined) { - console.log(mainNodeName); - switch (mainNodeName) { - case "node-status-system_log": - case "node-status-kernel_log": - $("#syslog").focus(function () { - $("#syslog").blur(); - $(".main-right").focus(); - $(".main-right").blur(); - }); - break; - case "node-status-firewall": - var button = $(".node-status-firewall > .main fieldset li > a"); - button.addClass("cbi-button cbi-button-reset a-to-btn"); - break; - case "node-system-reboot": - var button = $(".node-system-reboot > .main > .main-right p > a"); - button.addClass("cbi-button cbi-input-reset a-to-btn"); - break; - } - } + $(".main > .loading").fadeOut(); + + /** + * trim text, Remove spaces, wrap + * @param text + * @returns {string} + */ + function trimText(text) { + return text.replace(/[ \t\n\r]+/g, " "); + } + + var lastNode = undefined; + var mainNodeName = undefined; + + var nodeUrl = ""; + (function(node){ + var luciLocation; + if (node[0] == "admin"){ + luciLocation = [node[1], node[2]]; + }else{ + luciLocation = node; + } + + for(var i in luciLocation){ + nodeUrl += luciLocation[i]; + if (i != luciLocation.length - 1){ + nodeUrl += "/"; + } + } + })(luciLocation); + + /** + * get the current node by Burl (primary) + * @returns {boolean} success? + */ + function getCurrentNodeByUrl() { + var ret = false; + if (!$('body').hasClass('logged-in')) { + luciLocation = ["Main", "Login"]; + return true; + } + + $(".main > .main-left > .nav > .slide > .menu").each(function () { + var ulNode = $(this); + ulNode.next().find("a").each(function () { + var that = $(this); + var href = that.attr("href"); + + if (href.indexOf(nodeUrl) != -1) { + ulNode.click(); + ulNode.next(".slide-menu").stop(true, true); + lastNode = that.parent(); + lastNode.addClass("active"); + ret = true; + return true; + } + }); + }); + return ret; + } + + /** + * menu click + */ + $(".main > .main-left > .nav > .slide > .menu").click(function () { + var ul = $(this).next(".slide-menu"); + var menu = $(this); + if (!ul.is(":visible")) { + menu.addClass("active"); + ul.addClass("active"); + ul.stop(true).slideDown("fast"); + } else { + ul.stop(true).slideUp("fast", function () { + menu.removeClass("active"); + ul.removeClass("active"); + }); + } + return false; + }); + + /** + * hook menu click and add the hash + */ + $(".main > .main-left > .nav > .slide > .slide-menu > li > a").click(function () { + if (lastNode != undefined) lastNode.removeClass("active"); + $(this).parent().addClass("active"); + $(".main > .loading").fadeIn("fast"); + return true; + }); + + /** + * fix menu click + */ + $(".main > .main-left > .nav > .slide > .slide-menu > li").click(function () { + if (lastNode != undefined) lastNode.removeClass("active"); + $(this).addClass("active"); + $(".main > .loading").fadeIn("fast"); + window.location = $($(this).find("a")[0]).attr("href"); + return false; + }); + + /** + * get current node and open it + */ + if (getCurrentNodeByUrl()) { + mainNodeName = "node-" + luciLocation[0] + "-" + luciLocation[1]; + mainNodeName = mainNodeName.replace(/[ \t\n\r\/]+/g, "_").toLowerCase(); + $("body").addClass(mainNodeName); + } + + /** + * Sidebar expand + */ + var showSide = false; + $(".showSide").click(function () { + if (showSide) { + $(".darkMask").stop(true).fadeOut("fast"); + $(".main-left").stop(true).animate({ + width: "0" + }, "fast"); + $(".main-right").css("overflow-y", "visible"); + showSide = false; + } else { + $(".darkMask").stop(true).fadeIn("fast"); + $(".main-left").stop(true).animate({ + width: "15rem" + }, "fast"); + $(".main-right").css("overflow-y", "hidden"); + showSide = true; + } + }); + + $(".darkMask").click(function () { + if (showSide) { + showSide = false; + $(".darkMask").stop(true).fadeOut("fast"); + $(".main-left").stop(true).animate({ + width: "0" + }, "fast"); + $(".main-right").css("overflow-y", "visible"); + } + }); + + $(window).resize(function () { + if ($(window).width() > 921) { + $(".main-left").css("width", ""); + $(".darkMask").stop(true); + $(".darkMask").css("display", "none"); + showSide = false; + } + }); + + /** + * fix legend position + */ + $("legend").each(function () { + var that = $(this); + that.after("<span class='panel-title'>" + that.text() + "</span>"); + }); + + $(".cbi-section-table-titles, .cbi-section-table-descr, .cbi-section-descr").each(function () { + var that = $(this); + if (that.text().trim() == ""){ + that.css("display", "none"); + } + }); + + $(".main-right").focus(); + $(".main-right").blur(); + $("input").attr("size", "0"); + $(".cbi-button-up").val("__"); + $(".cbi-button-down").val("__"); + $(".slide > a").removeAttr("href"); + + if (mainNodeName != undefined) { + console.log(mainNodeName); + switch (mainNodeName) { + case "node-status-system_log": + case "node-status-kernel_log": + $("#syslog").focus(function () { + $("#syslog").blur(); + $(".main-right").focus(); + $(".main-right").blur(); + }); + break; + case "node-status-firewall": + var button = $(".node-status-firewall > .main fieldset li > a"); + button.addClass("cbi-button cbi-button-reset a-to-btn"); + break; + case "node-system-reboot": + var button = $(".node-system-reboot > .main > .main-right p > a"); + button.addClass("cbi-button cbi-input-reset a-to-btn"); + break; + } + } })(jQuery); diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css index 449f9d4cf3..26a08be463 100644 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css @@ -157,29 +157,15 @@ h6 { color: inherit; } -html { - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; - height: 100%; -} - -body { - font-size: .8rem; - background-color: #eee; - height: auto; -} - -html, -body { - font-family: "Microsoft Yahei", "WenQuanYi Micro Hei", "sans-serif", "Helvetica Neue", "Helvetica", - "Hiragino Sans GB"; - margin: 0; - padding: 0; - background-color: #EBF1F6; -} header { display: none; + height: 3rem; + z-index: 1000; +} + +header .container { + padding: 0 0.5rem; } select { @@ -587,11 +573,6 @@ footer > a { } /* Main interface right 右主界面 */ -.main-right { - width: 84%; - height: 100%; -} - .main-right .container .alert, .main-right .container .alert-message { margin-top: 1rem; @@ -607,7 +588,7 @@ footer > a { .main-right .container .alert-message h4 { margin-top: 1rem; background: url(./no-pwd.png) no-repeat left 1px / 28px; - padding: 7px 0 0 32px; + padding: 7px 0 0 32px; } .main-right .container .alert-message .btn { @@ -801,7 +782,7 @@ form[method="post"] + form[method="post"], .cbi-button[name="zero"], .cbi-button[name="restart"], .cbi-button[onclick="hide_empty(this)"] { - border: 1px solid; + border: 1px solid; } /* dark blue */ @@ -832,10 +813,10 @@ form[method="post"] + form[method="post"], .cbi-button[value="Submit"], .cbi-button[value$="Apply"], .cbi-button[onclick="addKey(event)"] { - font-weight: normal; - color: #fff; - border: 1px solid #468ea4; - background-color: #468ea4; + font-weight: normal; + color: #fff; + border: 1px solid #468ea4; + background-color: #468ea4; } /* red */ @@ -849,10 +830,10 @@ form[method="post"] + form[method="post"], .cbi-button[onclick="reboot(this)"], .cbi-button-neutral[value="Restart"] { padding: 5px .8rem; - font-weight: 100; - color: #f24b7c; - background-color: transparent; - border: 1px solid #f24b7c; + font-weight: 100; + color: #f24b7c; + background-color: transparent; + border: 1px solid #f24b7c; } /* yellow */ @@ -875,10 +856,10 @@ form[method="post"] + form[method="post"], .cbi-button[name="backup"], .cbi-button[value="Upload"], .cbi-button[value="Save mtdblock"] { - font-weight: normal; - color: #468ea4; - border: thin solid #468ea4; - background-color: transparent; + font-weight: normal; + color: #468ea4; + border: thin solid #468ea4; + background-color: transparent; } .cbi-page-actions .cbi-button-link:first-child { @@ -904,33 +885,52 @@ form[method="post"] + form[method="post"], border-radius: 20px; } -.cbi-tabmenu > li, .tabs > li { + margin-right: .8rem; + padding: 6px 10px; + position: relative; display: inline-block; - padding: .6rem 0; + text-align: center; } -.cbi-tabmenu > li > a, -.tabs > li > a { - padding: .5rem .8rem; +.tabs > li a { + color: #468EA4; + font-size: 14px; text-decoration: none; - color: #404040; + position: relative; + z-index: 1; } - -.tabs > li[class~="active"], -.tabs > li:hover { - cursor: pointer; - background-color: #468ea4; +.tabs > li::after { + content: ''; + background-color: #cccccc82; + position: absolute; + width: 0; + height: 100%; + bottom: 0; border-radius: 20px; + left: 50%; + transform: translateX(-50%); } -.tabs > li[class~="active"], -.tabs > li:hover a { - color: #fff; +.tabs > li:hover::after { + transition: width .35s; + width: calc(100% + 4px); } -.tabs > li[class~="active"] > a { - color: #fff; +.tabs > li.active::after { + width: calc(100% + 4px); + background-color: #468ea473; +} + +.cbi-tabmenu > li { + display: inline-block; + padding: .6rem 0; +} + +.cbi-tabmenu > li > a { + padding: .5rem .8rem; + text-decoration: none; + color: #404040; } .cbi-tabmenu { @@ -1164,17 +1164,17 @@ form[method="post"] + form[method="post"], } .cbi-dynlist > .item::after { - position: absolute; - right: -2em; - bottom: 0; - display: inline-flex; - min-height: 17px; - padding: 0 6px; - content: "\00D7"; - pointer-events: auto; - color: #f24b7c; - border: thin solid #f24b7c; - background-color: transparent; + position: absolute; + right: -2em; + bottom: 0; + display: inline-flex; + min-height: 17px; + padding: 0 6px; + content: "\00D7"; + pointer-events: auto; + color: #f24b7c; + border: thin solid #f24b7c; + background-color: transparent; } .cbi-dynlist > .item > span { @@ -1455,6 +1455,11 @@ body.modal-overlay-active { height: 100vh; } +#modal_overlay .alert-message.warning { + background-color: #fff !important; + margin-bottom: 10px; +} + body.modal-overlay-active #modal_overlay { right: 0; left: 0; @@ -2011,9 +2016,9 @@ input[name="nslookup"] { } /* fix Main Login 登录界面*/ -body.login { - background: #fff url(./loginBG.png) no-repeat center center; - height: 100%; +.login .main-right { + background: url(./loginBG.png) no-repeat center center / cover; + text-align: center; } .login header { @@ -2029,12 +2034,6 @@ body.login { display: none; } -.login > .main > .main-right { - width: 100%; - text-align: center; - background-color: transparent; -} - .login .brand { display: block; color: #fff; @@ -2048,6 +2047,7 @@ body.login { .login > .main #maincontent { margin-top: 5rem; + padding-bottom: 20px; display: inline-block; background-color: transparent; width: 39%; @@ -2071,9 +2071,9 @@ body.login { .login .alert-message > h4 { padding: 7px 0 0 32px; - font-size: 18px; - background: url(./no-pwd.png) no-repeat left 0 / 28px; - display: inline-block; + font-size: 18px; + background: url(./no-pwd.png) no-repeat left 0 / 28px; + display: inline-block; } .login .alert-message > p { @@ -2133,36 +2133,32 @@ body.login { } .login > .main .cbi-value > .cbi-value-field { - display: block; - position: relative; -} - -.login > .main .cbi-value-last > .cbi-value-field > div { - content: ''; - height: 24px; - width: 24px; - position: absolute; - top: 9px; - right: 12px; - background: no-repeat center center / cover; + display: block; + position: relative; } -.login > .main .cbi-value-last > .cbi-value-field .eye { - background-image: url(./op-eye.png); +.login > .main .cbi-value-last .cbi-value-field > div { + height: 24px; + width: 24px; + display: inline-block; + background: url(./op-eye.png) no-repeat center center / cover; + position: absolute; + top: 8px; + right: 12px; } -.login > .main .cbi-value-last > .cbi-value-field .op-eye { - background-image: url(./cl-eye.png); +.login > .main .cbi-value-last .cbi-value-field.op-eye > div { + background-image: url(./cl-eye.png); } -.login > .main .cbi-input-text { +.login > .main .cbi-value .cbi-input-text { + margin: 0 0 16px; + padding-left: 36px; width: 100%; height: 42px; - background: #fff no-repeat 12px center; + border: 1px solid #556270; border-radius: 20px; - padding-left: 42px; - font-size: 18px; - border: none; + background: #fff no-repeat 11px center / 19px; } .login > .main .cbi-value .cbi-input-text { @@ -2181,14 +2177,18 @@ body.login { .login .cbi-page-actions .cbi-button-apply, .login .cbi-button-apply { - border: 1px solid #f24b7c; - background-color: #f24b7c; + border: 1px solid #f24b7c; + background-color: #f24b7c; } .login .cbi-button[value="Reset"] { - color: #fff; - border: 1px solid #9a4569; - background-color: #9a4569; + color: #fff; + border: 1px solid #9a4569; + background-color: #9a4569; +} + +.login footer { + padding: 0; } @media screen and (min-height: 585px) { @@ -2207,16 +2207,14 @@ body.login { } .logged-in header { - padding: 0 1rem; - height: 4rem; - width: 100%; - position: fixed; - top: 0; - background: #fff; - color: #fff; - z-index: 1000; - border-bottom: 1px solid #f5f5f5; display: block; + position: fixed; + top: 1rem; + right: 1rem; + border: 1px solid #ddd; + background-color: #fff; + border-radius: 20px; + width: calc(85% - 20px - 2rem); } .logged-in .main { @@ -2228,8 +2226,8 @@ body.login { } .logged-in header .container .btn-con { - height: 4rem; - line-height: 4rem; + height: 3rem; + line-height: 3rem; } .logged-in header .container .btn-con #xhr_poll_status { @@ -2252,12 +2250,50 @@ body.login { .logged-in .main-right { float: right; + width: 84%; + height: 100%; } .logged-in .main-right .container { margin: 5rem 1rem 1rem; } +/* rosy file server */ +.login-info.node-main-login{ + background-color: #ebf1f6; +} + +.login-info.node-main-login header .container, +.login-info.node-main-login .main { + width: 1170px; +} + +.login-info.node-main-login .main { + padding: 0 15px; +} + +.login-info.node-main-login header { + display: block; +} + +.login-info.node-main-login header .container { + margin: 1rem auto 0; + height: 3rem; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 50px; + line-height: 44px; +} + +.login-info.node-main-login .label.logout { + background-color: #f24b7c; +} + +.login-info.node-main-login .label.logout a { + color: #fff; + text-decoration: none; +} + /* node main login */ .login-info .main { margin: 0 auto; @@ -2440,11 +2476,14 @@ body.login { flex-basis: 12%; } -#cbi-firewall-zone .table, -#cbi-network-switch_vlan .table { +#cbi-firewall-zone .table { display: table; } +#cbi-network-switch_vlan #vlan_table { + overflow-x: auto; +} + #cbi-firewall-zone .td.cbi-section-actions { width: 100%; } @@ -2557,6 +2596,9 @@ body.login { } @media screen and (max-width: 1400px) { + .logged-in header { + width: calc(100% - 230px - 2rem); + } .logged-in .main-right { width: calc(100% - 230px); } @@ -2594,10 +2636,6 @@ body.login { font-size: .7rem; } - #modal_overlay { - top: 3.5rem; - } - [data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table) { display: block; } @@ -2614,22 +2652,23 @@ body.login { } @media screen and (max-width: 992px) { - .login > .main #maincontent { - margin-top: 2rem; - width: 90%; + .login-info.node-main-login header .container, + .login-info.node-main-login .main { + width: 970px; } +} - .login-info .main { - width: 100%; +@media screen and (max-width: 992px) { + .login .main-right { + background: #354057; } - .login > .main .container { - width: 100%; + .login > .main #maincontent { + width: 90%; } .logged-in header { - height: 3rem; - z-index: 2000; + width: calc(100% - 2rem); } .showSide, @@ -2642,16 +2681,15 @@ body.login { display: none; z-index: 1000; position: fixed; - top: 3rem; + top: 0; bottom: 0; left: 0; right: 0; border-radius: 0; background-color: rgba(0, 0, 0, .3); - height: calc(100% - 3rem); } - .main-left .nav-container { + .logged-in .main-left .nav-container { top: 0; left: 0; width: 50%; @@ -2660,7 +2698,7 @@ body.login { height: 100%; } - .main-left .nav-container .navbar-container { + .logged-in .main-left .nav-container .navbar-container { overflow-y: scroll; } @@ -2668,10 +2706,6 @@ body.login { width: 100%; } - body.login { - background: #354057; - } - [data-page^="command-cfg"] header .container > .brand { display: block; margin-top: -1.75rem; @@ -2687,6 +2721,10 @@ body.login { width: 30px; } + .login-info.node-main-login header .showSide { + display: none; + } + .showSide::before { content: ''; display: inline-block; @@ -2857,31 +2895,31 @@ body.login { /* The scroll bar of the navigation bar is compatible with each browser. */ /* Google */ - .main-left .navbar-container::-webkit-scrollbar { + .logged-in .main-left .navbar-container::-webkit-scrollbar { width: 6px; background: transparent; } - .main-left .navbar-container::-webkit-scrollbar-button { + .logged-in .main-left .navbar-container::-webkit-scrollbar-button { display: none; } - .main-left .navbar-container::-webkit-scrollbar-thumb { + .logged-in .main-left .navbar-container::-webkit-scrollbar-thumb { background-color: #ffffff61; border-radius: 10px; } - .main-left .navbar-container::-webkit-scrollbar-thumb { + .logged-in .main-left .navbar-container::-webkit-scrollbar-thumb { background-color: #839dd67a; border-radius: 10px; } - .main-left .navbar-container:hover::-webkit-scrollbar-thumb { + .logged-in .main-left .navbar-container:hover::-webkit-scrollbar-thumb { background-color: #839dd67a; } /* IE */ - .main-left .navbar-container { + .logged-in .main-left .navbar-container { scrollbar-track-color: transparent; scrollbar-face-color: #839dd67a; scrollbar-arrow-color: transparent; @@ -2892,9 +2930,25 @@ body.login { scrollbar-base-color: transparent; } - .main-left .navbar-container:hover { + .logged-in .main-left .navbar-container:hover { scrollbar-face-color: #839dd67a; } + + .login-info.node-main-login header .container, + .login-info.node-main-login .main { + width: 750px; + } +} + +@media screen and (max-width: 768px) { + .login-info.node-main-login header { + padding: 0 15px; + } + + .login-info.node-main-login header .container, + .login-info.node-main-login .main { + width: 100%; + } } @media screen and (max-width: 600px) { @@ -2913,10 +2967,6 @@ body.login { padding: 1rem; } - .tabs { - margin: 0 -1rem; - } - .main-left .nav-container { width: 70%; } diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js index e8424411db..bef272760a 100755 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js @@ -170,22 +170,22 @@ * Sidebar expand */ var showSide = false; - if ($(win).height() == 992) { - $(".showSide").click(function () { - if (showSide) { - $(".darkMask").stop(true).fadeOut("fast"); - $(".main-left").stop(true).fadeOut("fast"); - $(".main-right").css("overflow-y", "visible"); - showSide = false; - } else { - $(".darkMask").stop(true).fadeIn("fast"); - $(".main-left").stop(true).animate({ - width: "100%" - }, "fast").fadeIn("fast"); - $(".main-right").css("overflow-y", "hidden"); - showSide = true; - } - }); + $(".showSide").click(function () { + if (showSide) { + $(".darkMask").stop(true).fadeOut("fast"); + $(".main-left").stop(true).fadeOut("fast"); + $(".main-right").css("overflow-y", "visible"); + showSide = false; + } else { + $(".darkMask").stop(true).fadeIn("fast"); + $(".main-left").stop(true).animate({ + width: "100%" + }, "fast").fadeIn("fast"); + $(".main-right").css("overflow-y", "hidden"); + showSide = true; + } + }); + if($(win).width() <= 992){ $(".main-left").click(function(e) { e.preventDefault(); $(".main-left").stop(true).fadeOut("fast"); @@ -205,6 +205,7 @@ } }); + $('.login .main-right').css('min-height', $(win).height()); $(win).resize(function () { if ($(win).width() > 921) { $(".main-left").css("width", ""); @@ -213,7 +214,7 @@ showSide = false; } - $('body.login').height($(win).height()); + $('.login .main-right').css('min-height', $(win).height()); }); /** @@ -262,16 +263,19 @@ $(this).next().css('border-color', $(this).css('background-color')); }); - $('<div class="eye"></div>').appendTo('.login > .main .cbi-value-last > .cbi-value-field'); - $('.login > .main .cbi-value-last > .cbi-value-field .eye').click(function () { - var className = $(this).attr('class'); - if (className.indexOf('op-eye') > (-1)) { - $('.login > .main .cbi-value-last > .cbi-value-field').children().prop('type', 'text'); - $(this).addClass('eye').removeClass('op-eye'); - } else { - $('.login > .main .cbi-value-last > .cbi-value-field').children().prop('type', 'password'); - $(this).addClass('op-eye').removeClass('eye'); + $('<div>').appendTo('.login > .main .cbi-value-last .cbi-value-field'); + $('.login > .main .cbi-value-last .cbi-value-field > div').click(function(){ + var thisParent = $(this).parent(); + if( thisParent.attr('class').indexOf('op-eye') == (-1) ){ + thisParent.addClass('op-eye'); + $(this).prev().attr('type', 'text'); + }else { + thisParent.removeClass('op-eye'); + $(this).prev().attr('type', 'password'); } + }); -})(window, jQuery);
\ No newline at end of file + $('#cbi-network-switch_vlan .table').wrap('<div id="vlan_table"></div>'); + +})(window, jQuery); diff --git a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm index 4377e1ca98..25997d145e 100755 --- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm +++ b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm @@ -28,7 +28,7 @@ </div> </div> </div> -<footer class="mobile-hide"> +<footer> <a href="https://github.com/openwrt/luci">Powered by<%= ver.luciname %> (<%= ver.luciversion %>)</a> / <%= ver.distversion %> <% if #categories > 1 then %> |
