projects / oweals / luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f27b174)
luci-0.10: Merge r6986
authorManuel Munz <freifunk@somakoma.de>
Wed, 13 Apr 2011 19:31:01 +0000 (19:31 +0000)
committerManuel Munz <freifunk@somakoma.de>
Wed, 13 Apr 2011 19:31:01 +0000 (19:31 +0000)
themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css patch | blob | history
themes/fledermaus/luasrc/view/themes/fledermaus/header.htm patch | blob | history
themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css patch | blob | history
themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm patch | blob | history
themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css patch | blob | history
themes/freifunk-hannover/htdocs/luci-static/freifunk-hannover/cascade.css patch | blob | history
themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm patch | blob | history
themes/freifunk/htdocs/luci-static/freifunk/cascade.css patch | blob | history
themes/freifunk/luasrc/view/themes/freifunk/header.htm patch | blob | history

diff --git a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
index 6326cacadd9db57cbc328286e0ec7fdaa4a835b6..dab28aaac9ca24c80c934c6f85b16e7e6e48c7ef 100644 (file)
--- 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 4573eedcdc796e516c61ca6cc2dab57a6a543bb0..cd48bd7222a999f0d2f0235dac83a695c6ad7436 100644 (file)
--- 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 %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %>
        <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
        <meta http-equiv="content-script-type" content="text/javascript" />
+       <script type="text/javascript" src="<%=resource%>/xhr.js"></script>
        <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
 
        <!--[if lt IE 7]>
@@ -63,6 +64,14 @@ require("luci.http").prepare_content("text/html")
        <![endif]-->
 </head>
 <body onload="window.setup_hover && setup_hover()">
+
+<%- if 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 -%>
+
 <div id="header"><div id="header2">
        <span id="header3">freifunk kamikaze</span><br />
        <span id="header4">now with even more bats and stuff</span>
@@ -178,3 +187,11 @@ end
        <br class="clear" />
 </div>
 <div id="maincontent">
+<% if category ~= "freifunk" and category ~= "splash" then %>
+       <noscript>
+               <div class="warning">
+                       <strong><%:Java Script required!%></strong><br />
+                       <%:You must enable Java Script in your browser or LuCI will not work properly.%>
+               </div>
+       </noscript>
+<% end %>
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css b/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
index 451df9ca7634a6be49193e0071ba0ab9806f1948..c1dca1864d858352dd345a0fdf1d5ad35ac4af7f 100644 (file)
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
+++ b/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
@@ -619,6 +619,57 @@ 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 #000;
+       border-bottom: none;
+       background-color: #eee;
+       color: #bbb;
+}
+
+ul.cbi-tabmenu li.cbi-tab-highlighted a {
+       color: #000;
+       background-color: #FFEEAA;
+}
+
+ul.cbi-tabmenu li a:hover {
+       color: #000;
+}
+
+ul.cbi-tabmenu li.cbi-tab a {
+       position: relative;
+       top: 1px;
+       padding-top: 4px;
+       color: #000;
+       background-color: #fff;
+}
+
+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;
+}
+
+
 .right {
        text-align: right;
 }
diff --git a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
index aa9e037268a3b3ad425134a9c8345686f47e74d7..660d95ac86c27e7e9fd7eefa0e91a669b987032a 100644 (file)
--- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
+++ b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
@@ -44,6 +44,7 @@ require("luci.http").prepare_content("text/html")
        <link rel="shortcut icon" href="<%=media%>/images/favicon.ico" />
        <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
        <meta http-equiv="content-script-type" content="text/javascript" />
+       <script type="text/javascript" src="<%=resource%>/xhr.js"></script>
        <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
 
        <!--[if lt IE 7]>
@@ -68,6 +69,12 @@ require("luci.http").prepare_content("text/html")
 <center>
 
 <div id="wrapper">
+<%- if 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 -%>
 <div id="main">
 
 
@@ -193,4 +200,13 @@ end
 
        <br class="clear" />
 </div>
+
 <div id="maincontent">
+<% if category ~= "freifunk" and category ~= "splash" then %>
+<noscript>
+       <div class="errorbox">
+               <strong><%:Java Script required!%></strong><br />
+               <%:You must enable Java Script in your browser or LuCI will not work properly.%>
+       </div>
+</noscript>
+<% end %>
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
index 6764607918e00db4a36cf24f1dca9c389cd17551..d1b3a27036428507f18e3d0a001738d04f11f8f9 100644 (file)
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
+++ b/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
@@ -450,53 +450,53 @@ ul.cbi-apply {
 }
 
 ul.cbi-tabmenu {
-        padding: 3px 0;
-        margin-left: 0 !important;
-        margin-bottom: -1px;
-        list-style-type: none;
+       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;
+       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 #000;
-        border-bottom: none;
-        background-color: #eee;
-        color: #bbb;
+       text-decoration: none;
+       padding: 3px 7px;
+       margin-right: 3px;
+       border: 1px outset #000;
+       border-bottom: none;
+       background-color: #eee;
+       color: #bbb;
 }
 
 ul.cbi-tabmenu li.cbi-tab-highlighted a {
-        color: #000;
-        background-color: #FFEEAA;
+       color: #000;
+       background-color: #FFEEAA;
 }
 
 ul.cbi-tabmenu li a:hover {
-        color: #000;
+       color: #000;
 }
 
 ul.cbi-tabmenu li.cbi-tab a {
-        position: relative;
-        top: 1px;
-        padding-top: 4px;
-        color: #000;
-        background-color: #fff;
+       position: relative;
+       top: 1px;
+       padding-top: 4px;
+       color: #000;
+       background-color: #fff;
 }
 
 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;
+       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],
diff --git a/themes/freifunk-hannover/htdocs/luci-static/freifunk-hannover/cascade.css b/themes/freifunk-hannover/htdocs/luci-static/freifunk-hannover/cascade.css
index 6837713a45786fef91898180856d7d25f7212ed4..a04ebb07063ad77f0dff26f90d5f5585c23eae2f 100644 (file)
--- a/themes/freifunk-hannover/htdocs/luci-static/freifunk-hannover/cascade.css
+++ b/themes/freifunk-hannover/htdocs/luci-static/freifunk-hannover/cascade.css
@@ -424,8 +424,59 @@ textarea#syslog {
 \r
 ul.cbi-apply {\r
        font-size: 90%;\r
-}\r
-\r
+}
+
+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 #000;
+       border-bottom: none;
+       background-color: #eee;
+       color: #bbb;
+}
+
+ul.cbi-tabmenu li.cbi-tab-highlighted a {
+       color: #000;
+       background-color: #FFEEAA;
+}
+
+ul.cbi-tabmenu li a:hover {
+       color: #000;
+}
+
+ul.cbi-tabmenu li.cbi-tab a {
+       position: relative;
+       top: 1px;
+       padding-top: 4px;
+       color: #000;
+       background-color: #fff;
+}
+
+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],\r
 input[type=reset],\r
 input[type=image] {\r
diff --git a/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm b/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm
index e6f0eb443f147c85f737fc394d1ec1964eefa90a..d594a6535d82b58f2ab146490befabed24ecd845 100644 (file)
--- a/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm
+++ b/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm
@@ -49,10 +49,20 @@ require("luci.http").prepare_content("application/xhtml+xml")
 <script type="text/javascript" src="<%=resource%>/VarType.js"></script>
 <script type="text/javascript" src="<%=resource%>/XHTML1.js"></script>
 <script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script>
+<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
+
 <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
 </head>
 <body class="lang_<%=luci.i18n.context.lang%>">
 
+
+<%- if 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>
@@ -161,3 +171,11 @@ else -%>
 <div class="clear"></div>
 </div>
 <div id="maincontent">
+<% if category ~= "freifunk" and category ~= "splash" then %>
+<noscript>
+       <div class="warning">
+               <strong><%:Java Script required!%></strong><br />
+               <%:You must enable Java Script in your browser or LuCI will not work properly.%>
+       </div>
+</noscript>
+<% end %>
diff --git a/themes/freifunk/htdocs/luci-static/freifunk/cascade.css b/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
index e40ddb808ddb33722ba68fcf19dd801ddcad762f..230695b7c67b23d6529c9d6a47b49a1912b90142 100644 (file)
--- a/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
+++ b/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
@@ -626,6 +626,57 @@ 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 #000;
+       border-bottom: none;
+       background-color: #eee;
+       color: #bbb;
+}
+
+ul.cbi-tabmenu li.cbi-tab-highlighted a {
+       color: #000;
+       background-color: #FFEEAA;
+}
+
+ul.cbi-tabmenu li a:hover {
+       color: #000;
+}
+
+ul.cbi-tabmenu li.cbi-tab a {
+       position: relative;
+       top: 1px;
+       padding-top: 4px;
+       color: #000;
+       background-color: #fff;
+}
+
+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;
+}
+
+
 .right {
        text-align: right;
 }
diff --git a/themes/freifunk/luasrc/view/themes/freifunk/header.htm b/themes/freifunk/luasrc/view/themes/freifunk/header.htm
index f2d9285bcab3484cc5c0795d2fd72a1c4c8735a5..845c4af83b3a0ed0ffb5f184907ef2b4c3175f1b 100644 (file)
--- a/themes/freifunk/luasrc/view/themes/freifunk/header.htm
+++ b/themes/freifunk/luasrc/view/themes/freifunk/header.htm
@@ -9,8 +9,6 @@ You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
-$Id$
-
 -%>
 <%
 require("luci.sys")
@@ -44,6 +42,7 @@ require("luci.http").prepare_content("text/html")
        <link rel="shortcut icon" href="<%=media%>/images/favicon.ico" />
        <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
        <meta http-equiv="content-script-type" content="text/javascript" />
+       <script type="text/javascript" src="<%=resource%>/xhr.js"></script>
        <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
 
        <!--[if lt IE 7]>
@@ -68,6 +67,12 @@ require("luci.http").prepare_content("text/html")
 <center>
 
 <div id="wrapper">
+<%- if 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 -%>
 <div id="main">
 
 
@@ -194,3 +199,11 @@ end
        <br class="clear" />
 </div>
 <div id="maincontent">
+<% if category ~= "freifunk" and category ~= "splash" then %>
+<noscript>
+       <div class="warning">
+               <strong><%:Java Script required!%></strong><br />
+               <%:You must enable Java Script in your browser or LuCI will not work properly.%>
+       </div>
+</noscript>
+<%end%>
Unnamed repository; edit this file 'description' to name the repository.