* luci/themes: merge openwrt.org the from xyron

5 files changed, 193 insertions, 228 deletions

diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/bg.jpg b/themes/openwrt.org/htdocs/luci-static/openwrt.org/bg.jpg
new file mode 100644
index 0000000000..91c1b12fb5
--- /dev/null
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/bg.jpg
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
index 90827ab4ed..62b59adf56 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -1,298 +1,265 @@
-@charset "utf-8";
+* {
+	margin: 0;
+	padding: 0;
+}
 
 body {
+	background-color: #4a6b7c;
+	background-image: url(bg.jpg);
+	background-position: bottom center;
+	background-attachment: fixed;
+	background-repeat: repeat-x;
+	color: #ffffff;
 	font-family: Verdana, Arial, sans-serif;
-	background-color: #557788;
-}
-
-h1 {
-	margin: 0%;
-	font-size: 1.4em;
-	font-weight: bold;
-	margin-bottom: 0.5em;
+	font-size: 100%;
+	line-height: 100%;
 }
 
-h2 {
-	margin: 0%;
-	font-size: 1.2em;
-	font-weight: bold;
-}
-
-h3 {
-	margin: 0%;
+.clear {
+	clear: both;
+	height: 1px;
 }
 
-#page {
-	background-color: #d4dce0;
-	border-left: 3px solid #000000;
-	border-right: 3px solid #000000;
+.hidden {
+	display: none;
 }
 
 #header {
-	padding: 0.2em;
-	height: 4.5em;
-	padding-left: 1.2em;
-}
-
-#columns {
-	border-left: 10.1em solid #ccd6db;
-	border-right: 10.1em solid #ccd6db;
-	display: block;
-	padding: 0.1em;
-}
-
-#columnswrapper {
-	display: block;
-	margin-left: -10em;
-	margin-right: -10em;
-}
-
-#content {
-	margin-left: 14em;
-	margin-right: 14em;
-	display: block;
-	position: relative;
-	padding: 2px;
-	font-size: 0.8em;
-}
-
-.headerlogo {
-	height: 4em;
-	padding: 5px;
+	min-height: 98px;
+	background-image: url(header.jpg);
+	background-repeat: no-repeat;
+	background-position: left center;
+	background-color: #557788;
+	text-align: right;
 }
 
-.headerlogo img {
-	height: 100%;
+#header .info {
+	padding: 1em 1em;
+	font-size: 70%;
+	line-height: 160%;
 }
 
-.headertitle {
-	font-size: 2.4em;
-	color: black;
-	font-weight: bold;
-	letter-spacing: 0.6em;
-	text-transform: lowercase;
-}
-
-.separator {
-	padding-left: 0.25em;
-	font-weight: bold;
-	font-size: 0.8em;
-	line-height: 1.4em;
+#header .title {
+	display: none;
 }
 
-.whitetext {
-	color: white;
+.pathbar {
+	display: none;
 }
 
-.blacktext {
-	color: #000000;
+.mainmenu {
+	float: left;
+	width: 100%;
+/*	height: 2em;*/
+	min-height: 1.5em;
+	background: #000000;
+	color: #ffffff;
 }
 
-.magentatext {
-	color: #dc0065;
+.mainmenu div {
+	float: left;
+	/*display: inline;*/
 }
 
-.inheritcolor {
-	color: inherit;
+.mainmenu div ul {
+	display: none;
+	position: absolute;
+	background: #000000;
+	color: #ffffff;
+	border-width: 0 1px 1px 1px;
+	border-style: solid;
+	border-color: #444444;
+	list-style-type: none;
 }
 
-.smalltext {
-	font-size: 0.8em;
+.mainmenu ul li:hover > ul,
+.mainmenu div:hover > ul {
+	display: block;
 }
 
-.black {
-	background-color: #000000;
+.mainmenu ul li > ul {
+/*	display: none;*/
+	left: 100%;
+	margin-top: -1.8em;
+	border-width: 1px;
 }
 
-.nodeco {
+.modemenu a,
+.mainmenu a {
+	display: block;
+	padding: 0.5em;
+	/*width: */
+	color: #ffffff;
 	text-decoration: none;
+	font-size: 80%;
 }
 
-.redhover:hover {
-	color: red;
-}
-
-.bold {
+.mainmenu .active a,
+.modemenu .active a {
+	color: #ffff00;
 	font-weight: bold;
 }
 
-.sidebar {
-	position: relative;
-	padding: 0.25em;
-	color: gray;
-	width: 9em;
+.mainmenu li:hover > span > a,
+.mainmenu div:hover > a {
 	font-weight: bold;
+/*	color: #ffffff;*/
 }
 
-.separator a, .sidebar a {
-	color: inherit;
-	text-decoration: inherit;
-}
-
-.separator a:hover, .sidebar a:hover {
-	color: red;
+.modemenu a:hover,
+.modemenu a:focus,
+.mainmenu a:hover,
+.mainmenu a:focus {
+	color: #ffff00;
+	font-weight: bold;
 }
 
-.sidebar div {
-	padding-bottom: 0.5em;
+.mainmenu div.preactive > a {
+	color: #ffff00;
+	font-weight: bold;
 }
 
-.sidebar ul {
-	font-size: 0.9em;
-	color: white;
+.modemenu ul {
+	float: right;
+	/*max-width: 45%;*/
+	width: 45%;
+	margin-top: -1.8em;
+	background: #000000;
+	color: #ffffff;
 	list-style-type: none;
-	padding-left: 1em;
-	margin-top: 0%;
-}
-
-.table {
-	display: table;
 }
 
-.table-row {
-	display: table-row;
-}
-
-.table-cell {
-	display: table-cell;
+.modemenu li {
+	float: right;
 }
 
-.left {
-	float: left;
-	text-align: left;
+.sidebar {
+/*	display: none;*/
+/*	float: right;*/
+	position: fixed;
+	bottom: 0.5em;
+	right: 0;
+	width: 19%;
+	color: #888888;
+	text-align: center;
+	font-size: 100%;
+	font-weight: bold;
 }
 
-.right {
+.sidebar ul {
 	float: right;
+	width: 100%;
+	margin-top: 0.5em;
+	list-style-type: none;
+	color: #ffffff;
 	text-align: right;
+	font-size: 80%;
+	font-size: normal;
 }
 
-.clear {
+#content {
 	clear: both;
+	width: 60%;
+	/*margin: 2.25em 20% 0 20%;*/
+	margin: 0 auto;
+	padding: 0.5em;
+	background: #f5f5f5;
+	color: #000000;
+	border-width: 0 1px 1px 1px;
+	border-style: solid;
+	border-color: #444444;
+	font-size: 80%;
 }
 
-.hidden {
-	display: none;
-}
-
-.inline {
-	display: inline;
+#content h1 {
+	margin: 0.25em 0 0.5em 0;
+	font-size: 150%;
+	font-weight: normal;
 }
 
-.code {
-	background: #f7f7f7;
-	border: 1px solid #d7d7d7;
-	margin: 1em 1.75em;
-	padding: 1em;
+#content h2 {
+	margin: 0.5em 0;
+	font-size: 120%;
+	font-weight: normal;
+	text-decoration: underline;
 }
 
-code {
-	display: block;
-	background: #f7f7f7;
-	border: 1px solid #d7d7d7;
-	margin: 1em 1.75em;
-	padding: 1em;
-	overflow: auto;
-	white-space: pre;
+#content p {
+/*	margin: 1em;*/
+	margin-bottom: 1em;
 }
 
 .cbi-section {
-	margin-top: 1em;
+	margin: 0 1em;
 }
 
-.cbi-section-remove {
-	text-align: right;
-}
-
-.cbi-value {
-	display: table-row;
-}
-
-.cbi-value-title {
-	display: table-cell;
-	line-height: 1.75em;
-	font-weight: bold;
-	padding: 0.25em;
-}
-
-.cbi-value-field {
-	display: table-cell;
-	text-align: left;
-	padding: 0.25em;
-	line-height: 1.75em;
-}
-
-.cbi-value-field input, .cbi-value-field select,
-.cbi-optionals select, .cbi-optionals input,
-.cbi-section-remove input, .cbi-section-create input  {
-	font-size: 0.8em;
-	margin: 0%;
+.cbi-section h2 {
+	margin: 0.5em 0 0.5em -0.5em !important;
 }
 
 .cbi-section-descr {
-	padding-bottom: 1em;
-}
-
-.cbi-value-description {
-	display: inline;
-	font-style: italic;
-	font-size: 0.8em; 
-	padding: 0.25em;
 	margin-bottom: 0.5em;
 }
 
-.cbi-form-separator {
-	margin-top: 1em;
+input[type=submit],
+input[type=reset],
+label {
+	cursor: pointer;
 }
 
-.cbi-section-node {
-	display: table;
-	padding: 0.25em;
+select,
+input,
+textarea {
+	background: #dddddd;
+	color: #000000;
 	border: 1px solid #000000;
 }
 
-.cbi-section-row {
-	display: table-row;
+select,
+input[type=text] {
+	width: 20em;
 }
 
-.cbi-section-row-head {
-	display: table-cell;
-	font-weight: bold;
-	padding: 0.25em;
+textarea {
+	margin-left: -1px;
+	margin-bottom: 0.5em;
 }
 
-.cbi-section-row-descr {
-	display: table-cell;
-	padding: 0.25em;
-	font-size: 0.8em;
+form > div > input[type=submit],
+form > div > input[type=reset] {
+	float: right;
+	margin-left: 0.5em;
 }
 
-.cbi-section-node h3 {
-	margin-bottom: 0.5em;
+table.smalltext {
+	background: #f5f5f5;
+	border-top: 1px solid #666666;
+	border-right: 1px solid #666666;
+	border-bottom: 1px solid #666666;
 }
 
-.cbi-error {
-	color: red;
-	font-weight: bold;
-	font-size: 0.8em;
-	margin-bottom: 0.75em;
+table.smalltext tr th {
+	padding: 0 0.25em;
+	border-left: 1px solid #666666;
 }
 
-.cbi-optionals {
-	margin-top: 1em;
-	display: table-cell;
+table.smalltext tr td {
+	padding: 0 0.25em;
+	border-top: 1px solid #666666;
+	border-left: 1px solid #666666;
 }
 
-.cbi-optionals option {
-	font-size: 0.8em;
+.luci {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	text-align: right;
 }
 
-.error {
-	color: red;
-	font-weight: bold;
+.luci a {
+	color: #666666;
+	text-decoration: none;
+	font-size: 70%;
 }
 
-.ok {
-	color: green;
-	font-weight: bold;
-}
\ No newline at end of file
+
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/header.jpg b/themes/openwrt.org/htdocs/luci-static/openwrt.org/header.jpg
new file mode 100644
index 0000000000..b27d42b9a9
--- /dev/null
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/header.jpg
diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
index 4ea69cb22e..98c3ff6da2 100644
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
@@ -1,8 +1,8 @@
+		<br class="clear" />
 	</div>
-	<div class="clear"></div>
 </div></div>
 </div>
 
-<div class="separator black whitetext bold"><a href="<%=controller%>/about"><%= luci.__appname__ .. " " .. luci.__version__%> - Lua Configuration Interface</a></div>
+<div class="luci separator black whitetext bold"><a href="<%=controller%>/about">Powered by <%= luci.__appname__ .. " " .. luci.__version__%></a></div>
 </body>
 </html>
diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
index 49d282c1f4..8ed87abd73 100644
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -30,19 +30,19 @@ require("luci.http").prepare_content("text/html")
 </head>
 <body>
 <div id="header">
-	<div class="whitetext smalltext bold right">
+	<div class="info whitetext smalltext bold right">
 	<%=luci.config.brand.firmware%><br />
 	<%=luci.config.brand.distro%><br />
 	<%:load%>: <%=load1%> <%=load5%> <%=load15%><br />
 	<%:hostname%>: <%=luci.sys.hostname()%> 
 	</div>
-	<div>
+	<div class="title">
 		<span class="headertitle"><%=luci.config.brand.title%></span><br />
 		<span class="whitetext bold"><%=luci.config.brand.subtitle%></span>
 	</div>
 </div>
 
-<div class="separator black whitetext bold">
+<div class="pathbar separator black whitetext bold">
 <%:path%>: <% 
 local c = tree
 local url = controller
@@ -56,9 +56,7 @@ end
 %>
 </div>
 
-<div id="page">
-<div id="columns"><div id="columnswrapper">
-	<div class="sidebar left">
+<div class="mainmenu">
 <%
 local function submenu(prefix, node)
 	if not node._menu_selected or not node.nodes then
@@ -80,7 +78,7 @@ local function submenu(prefix, node)
 		href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
 		%>
 		<li>
-			<span<% if nnode._menu_selected then %> class="blacktext"<%end%>><a href="<%=href%>"><%=nnode.title%></a></span>
+			<span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=href%>"><%=nnode.title%></a></span>
 			<% submenu(prefix .. v.name .. "/", nnode) %>
 		</li>
 	<% end %>
@@ -101,7 +99,7 @@ if cattree and cattree.nodes then
 		if node.title and node.target then
 			local href = controller.."/"..category.."/"..k.name
 			href = (k.query) and href .. luci.http.build_querystring(k.query) or href %>
-			<div<% if node._menu_selected then %> class="blacktext"<%end%>><a href="<%=href%>"><%=node.title%></a>			
+			<div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=node.title%></a>			
 				<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
 			</div>
 <%		end
@@ -109,16 +107,16 @@ if cattree and cattree.nodes then
 end
 %>		
 	</div>
-	<div class="sidebar right">
-		<div><%:webui%>
-			<ul><%
-				for k,node in pairs(tree.nodes) do
-					if node.title then %>
-						<li<% if request[1] == k then %> class="blacktext"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li>
-<%					end
-				end%>
-			</ul>
-		</div>
+	<div class="modemenu">
+		<ul><%
+			for k,node in pairs(tree.nodes) do
+				if node.title then %>
+					<li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li>
+<%				end
+			end%>
+		</ul>
+	</div>
+	<div class="sidebar">
 		<%
 			if "admin" == request[1] then
 				local ucic = 0
@@ -130,7 +128,7 @@ end
 					end
 				end
 		%>
-		<div><%:config%>
+		<div>
 			<ul>
 			<% if ucic > 0 then %>
 				<li><a href="<%=controller%>/admin/uci/changes"><%:changes%>: <%=ucic%></a></li>