From a0cc210a688db0e68719ffe10c2fc94415ddd96d Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Tue, 23 Nov 2010 23:32:18 +0000 Subject: [PATCH] theme/freifunk-generic: fix html markup and clean/modify css --- .../luci-static/freifunk-generic/cascade.css | 99 +++++++++--------- .../luci-static/freifunk-generic/logo.jpg | Bin 4742 -> 4722 bytes .../view/themes/freifunk-generic/header.htm | 27 ++--- 3 files changed, 59 insertions(+), 67 deletions(-) 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 fe6d84aae..4530b0876 100644 --- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css +++ b/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css @@ -8,7 +8,7 @@ html { } body { - color: #cccccc; + color: #ccc; background:#e5eef5 url(bg.jpg) repeat-x top left; font-family: Verdana, Arial, sans-serif; font-size: 100%; @@ -77,21 +77,27 @@ code { } .error { - color: #ff0000; + color: #f00; background-color: white; } #header { - min-height: 98px; + min-height: 100px; background: #FFF url(header.jpg) repeat-x left bottom; - color: #cccccc; + color: #ccc; font-weight: bold; + text-align:right; +} + +#header img { + border: 0; + padding-left: 10px; } #header_left{ -position: absolute; text-align:left; top: 42px; +float:left; } #header_left a{ @@ -100,14 +106,6 @@ font: bold 28px Helvetica; text-decoration: none; } -#header_right{ -text-align:right; -} - -#header h1 { - padding: 1em 1em 0 1em; -} - #header p { padding: 0 1em 1em 1em; } @@ -324,7 +322,7 @@ html #menubar a:visited.warning { #modemenu { width: auto; background: #000; - color: #ffffff; + color: #fff; list-style: none; margin-right: 1px; } @@ -350,7 +348,7 @@ html #menubar a:visited.warning { textarea#syslog { width: 98%; min-height: 500px; - border: 3px solid #cccccc; + border: 3px solid #ccc; padding: 5px; font-family: monospace; } @@ -363,8 +361,8 @@ textarea#syslog { padding: 0.5em; color: #000; font-size: 80%; - background: #ffffff url(bg.jpg) repeat-x center bottom; - border: 1px dashed #CCCCCC; + background: #fff url(bg.jpg) repeat-x center bottom; + border: 1px dashed #ccc; } #maincontent h2 { @@ -388,8 +386,8 @@ textarea#syslog { .cbi-section { margin-bottom: 0.5em; padding: 0.5em 1em; - border: 1px dotted #555555; - background-color: #ffffff; + border: 1px dotted #555; + background-color: #fff; color: #000; } @@ -409,7 +407,7 @@ textarea#syslog { .cbi-section h3 { text-decoration: none !important; font-weight: bold !important; - color: #555555 !important; + color: #555 !important; margin: 0.25em !important; font-size: 100% !important; } @@ -451,8 +449,8 @@ ul.cbi-tabmenu li.cbi-tab-disabled a { margin-right: 3px; border: 1px outset #000; border-bottom: none; - background-color: #EEEEEE; - color: #BBBBBB; + background-color: #eee; + color: #bbb; } ul.cbi-tabmenu li.cbi-tab-highlighted a { @@ -469,14 +467,14 @@ ul.cbi-tabmenu li.cbi-tab a { top: 1px; padding-top: 4px; color: #000; - background-color: #FFFFFF; + 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 #CCCCCC; + border-bottom: 1px solid #ccc; margin: 0.25em 0.25em 2em; padding: 0.5em 0.5em 0.5em 2em; } @@ -493,9 +491,9 @@ input[type=button] { select, input, textarea { - background: #ffffff; + background: #fff; color: #000; - border: 1px solid #cccccc; + border: 1px solid #ccc; } input[type=image] { @@ -508,7 +506,7 @@ select:focus, select:hover, textarea:focus, textarea:hover { - background-color: #ffffff; + background-color: #fff; color: #000; } @@ -643,7 +641,7 @@ table th { table.smalltext { background: #f5f5f5; color: #000; - border: 1px solid #666666; + border: 1px solid #666; font-size: 90%; width: 80%; margin-left: auto; @@ -658,14 +656,14 @@ table.smalltext tr:hover td { table.smalltext tr th { padding: 0 0.25em; - border-left: 1px solid #666666; + border-left: 1px dotted #666; text-align: left; } table.smalltext tr td { - padding: 0 0.25em; - border-top: 1px solid #666666; - border-left: 1px solid #666666; + padding: 0.2em; + border-top: 1px dotted #666; + border-left: 1px dotted #666; } table.cbi-section-table .cbi-rowstyle-1, @@ -676,7 +674,7 @@ table.cbi-section-table .cbi-rowstyle-1 * { .cbi-section .cbi-rowstyle-1 h3 { background-color: #f1f6fa; - color: #555555; + color: #555; } .cbi-rowstyle-2 { @@ -687,7 +685,7 @@ div.cbi-value { clear: left; vertical-align: middle; padding-left: 0.25em; - border-bottom: 1px dashed #bbbbbb; + border-bottom: 1px dashed #bbb; } div.cbi-value:hover { @@ -719,7 +717,7 @@ div.cbi-section-create { } div.cbi-tblsection-create { - border-bottom: 1px dotted #bbbbbb; + border-bottom: 1px dotted #bbb; } div.cbi-section-create .cbi-button { @@ -727,16 +725,15 @@ div.cbi-section-create .cbi-button { } input.cbi-section-create-name { - border: ; margin-right: -0.25em; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px; - border-top-color: #999999; - border-right-color: #999999; - border-bottom-color: #999999; - border-left-color: #999999; + border-top-color: #999; + border-right-color: #999; + border-bottom-color: #999; + border-left-color: #999; } div.cbi-map-descr { @@ -745,7 +742,7 @@ div.cbi-map-descr { div.cbi-optionals { padding: 0.25em; - border-bottom: 1px dotted #bbbbbb; + border-bottom: 1px dotted #bbb; } div.cbi-section-remove { @@ -754,9 +751,9 @@ div.cbi-section-remove { .cbi-section-node { clear: both; - border-top: 1px dotted #bbbbbb; - border-left: 1px dotted #bbbbbb; - border-right: 1px dotted #bbbbbb; + border-top: 1px dotted #bbb; + border-left: 1px dotted #bbb; + border-right: 1px dotted #bbb; border-bottom: none; padding-bottom: 0; } @@ -797,8 +794,8 @@ td.cbi-section-table-optionals { div.cbi-error { font-size: 95%; font-weight: bold; - color: #ff0000; - background-color: #ffffff; + color: #f00; + background-color: #fff; } td.cbi-value-error { @@ -808,7 +805,7 @@ td.cbi-value-error { .cbi-value-error input, .cbi-value-error select { color: red; - background-color: #ffcccc; + background-color: #fcc; } .cbi-section-error { @@ -843,7 +840,7 @@ margin: 0 auto -2em; .luci a:link, .luci a:visited, .exectime { - color: #666666; + color: #666; text-decoration: none; font-size: 70%; } @@ -854,9 +851,9 @@ margin: 0 auto -2em; .error500 { white-space: normal; - border: 1px dotted #ff0000; - background-color: #ffffff; + border: 1px dotted #f00; + background-color: #fff; color: #000; padding: 0.5em; } - +} diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg b/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg index c33df01d901cb72fe1588c7a3a0a5503dc6d32c4..ea06ce77f44ba6a310b338f7b2532c5958830937 100644 GIT binary patch delta 4358 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 AqW}N^ delta 4375 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 Ry*=ZSuA`HR0U-k~|Jgt;YOw$S diff --git a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm index 617ae76c3..c6375ad45 100644 --- a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm +++ b/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm @@ -22,7 +22,6 @@ local cattree = category and luci.dispatcher.node(category) local node = luci.dispatcher.context.dispatched local hostname = luci.sys.hostname() - local c = luci.model.uci.cursor():get_all("freifunk", "community") if c and c.name then @@ -67,6 +66,8 @@ require("luci.http").prepare_content("application/xhtml+xml") +
+