summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorManuel Munz <freifunk@somakoma.de>2011-04-13 19:29:30 +0000
committerManuel Munz <freifunk@somakoma.de>2011-04-13 19:29:30 +0000
commit3a12f82014cbac58080ef19673e0ff86fcae1112 (patch)
treeabb730d612b2f156793b1c7e841b1c7c8dc8b91b
parent0c281f4e8618d70b8fd8abb25d0fe5a9acac769f (diff)
themes: Update fledermaus, freifunk-bno, freifunk-hannover and freifunk
-rw-r--r--themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css50
-rw-r--r--themes/fledermaus/luasrc/view/themes/fledermaus/header.htm17
-rw-r--r--themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css51
-rw-r--r--themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm16
-rw-r--r--themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css54
-rw-r--r--themes/freifunk-hannover/htdocs/luci-static/freifunk-hannover/cascade.css55
-rw-r--r--themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm18
-rw-r--r--themes/freifunk/htdocs/luci-static/freifunk/cascade.css51
-rw-r--r--themes/freifunk/luasrc/view/themes/freifunk/header.htm17
9 files changed, 298 insertions, 31 deletions
diff --git a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
index a34881be06..6f8ff64c1a 100644
--- a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
+++ b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
@@ -517,6 +517,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 4573eedcdc..cd48bd7222 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 %><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 6731b7c7f9..c67e96a7fd 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
+++ b/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
@@ -625,6 +625,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 aa9e037268..660d95ac86 100644
--- 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 3affd0857d..158a158d81 100644
--- 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 b85c1638fa..98490ced76 100644
--- 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 {
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;
+}
+
+
input[type=submit],
input[type=reset],
input[type=image] {
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 e6f0eb443f..d594a6535d 100644
--- 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 2d8311d49d..8ce8ff4aa5 100644
--- a/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
+++ b/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
@@ -632,6 +632,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 f2d9285bca..845c4af83b 100644
--- 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%>