From: Manuel Munz Date: Wed, 13 Apr 2011 19:31:01 +0000 (+0000) Subject: luci-0.10: Merge r6986 X-Git-Tag: 0.10.0~162 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1982f945fa3935e1ccdd6f20088c6903dac0b981;p=oweals%2Fluci.git luci-0.10: Merge r6986 --- diff --git a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css index 6326cacad..dab28aaac 100644 --- a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css +++ b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css @@ -511,6 +511,56 @@ ul.cbi-apply { font-size: 90%; } +ul.cbi-tabmenu { + padding: 3px 0; + margin-left: 0 !important; + margin-bottom: -1px; + list-style-type: none; +} + +ul.cbi-tabmenu li.cbi-tab, +ul.cbi-tabmenu li.cbi-tab-disabled { + display: inline; + margin: 0; +} + +ul.cbi-tabmenu li.cbi-tab a, +ul.cbi-tabmenu li.cbi-tab-disabled a { + text-decoration: none; + padding: 3px 7px; + margin-right: 3px; + border: 1px outset #000000; + border-bottom: none; + background-color: #EEEEEE; + color: #BBBBBB; +} + +ul.cbi-tabmenu li.cbi-tab-highlighted a { + color: #000000; + background-color: #FFEEAA; +} + +ul.cbi-tabmenu li a:hover { + color: #000000; +} + +ul.cbi-tabmenu li.cbi-tab a { + position: relative; + top: 1px; + padding-top: 4px; + color: #000000; + background-color: #FFFFFF; +} + +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 #CCCCCC; + margin: 0.25em 0.25em 2em; + padding: 0.5em 0.5em 0.5em 2em; +} + .right { text-align: right; } diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm index 4573eedcd..cd48bd722 100644 --- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm +++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm @@ -43,6 +43,7 @@ require("luci.http").prepare_content("text/html") <% if node and node.css then %><% end %> + <%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI + +<%- if luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> +
+ <%:No password set!%>
+ <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%> +
+<%- end -%> +