Changeset 6541

Timestamp:

11/24/10 00:32:18 (2 years ago)

Author:

soma

Message:

theme/freifunk-generic: fix html markup and clean/modify css

Location:

luci/trunk/themes/freifunk-generic

Files:

• htdocs/luci-static/freifunk-generic/cascade.css (modified) (26 diffs)
• htdocs/luci-static/freifunk-generic/logo.jpg (modified) (previous)
• luasrc/view/themes/freifunk-generic/header.htm (modified) (3 diffs)

luci/trunk/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css

@@ -9 +9 @@
 
 body {
-    color: #cccccc;
+    color: #ccc;
     background:#e5eef5 url(bg.jpg) repeat-x top left;
     font-family: Verdana, Arial, sans-serif;
@@ -78 +78 @@
 
 .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;
 }
 
@@ -99 +105 @@
 font: bold 28px Helvetica;
 text-decoration: none;
-}
-
-#header_right{
-text-align:right;
-}
-
-#header h1 {
-    padding: 1em 1em 0 1em;
 }
 
@@ -325 +323 @@
     width: auto;
     background: #000;
-    color: #ffffff;
+    color: #fff;
     list-style: none;
     margin-right: 1px;
@@ -351 +349 @@
     width: 98%;
     min-height: 500px;
-    border: 3px solid #cccccc;
+    border: 3px solid #ccc;
     padding: 5px;
     font-family: monospace;
@@ -364 +362 @@
     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;
 }
 
@@ -389 +387 @@
     margin-bottom: 0.5em;
     padding: 0.5em 1em;
-    border: 1px dotted #555555;
-    background-color: #ffffff;
+    border: 1px dotted #555;
+    background-color: #fff;
     color: #000;
 }
@@ -410 +408 @@
     text-decoration: none !important;
     font-weight: bold !important;
-    color: #555555 !important;
+    color: #555 !important;
     margin: 0.25em !important;
     font-size: 100% !important;
@@ -452 +450 @@
         border: 1px outset #000;
         border-bottom: none;
-        background-color: #EEEEEE;
-        color: #BBBBBB;
+        background-color: #eee;
+        color: #bbb;
 }
 
@@ -470 +468 @@
         padding-top: 4px;
         color: #000;
-        background-color: #FFFFFF;
+        background-color: #fff;
 }
 
@@ -477 +475 @@
         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;
@@ -494 +492 @@
 input,
 textarea {
-    background: #ffffff;
-    color: #000;
-    border: 1px solid #cccccc;
+    background: #fff;
+    color: #000;
+    border: 1px solid #ccc;
 }
 
@@ -509 +507 @@
 textarea:focus,
 textarea:hover {
-    background-color: #ffffff;
+    background-color: #fff;
     color: #000;
 }
@@ -644 +642 @@
     background: #f5f5f5;
     color: #000;
-    border: 1px solid #666666;
+    border: 1px solid #666;
     font-size: 90%;
     width: 80%;
@@ -659 +657 @@
 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;
 }
 
@@ -677 +675 @@
 .cbi-section .cbi-rowstyle-1 h3 {
     background-color: #f1f6fa;
-    color: #555555;
+    color: #555;
 }
 
@@ -688 +686 @@
     vertical-align: middle;
     padding-left: 0.25em;
-    border-bottom: 1px dashed #bbbbbb;
+    border-bottom: 1px dashed #bbb;
 }
 
@@ -720 +718 @@
 
 div.cbi-tblsection-create {
-    border-bottom: 1px dotted #bbbbbb;
+    border-bottom: 1px dotted #bbb;
 }
 
@@ -728 +726 @@
 
 input.cbi-section-create-name {
-    border: ;
     margin-right: -0.25em;
     border-top-width: 1px;
@@ -734 +731 @@
     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;
 }
 
@@ -746 +743 @@
 div.cbi-optionals {
     padding: 0.25em;
-    border-bottom: 1px dotted #bbbbbb;
+    border-bottom: 1px dotted #bbb;
 }
 
@@ -755 +752 @@
 .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;
@@ -798 +795 @@
     font-size: 95%;
     font-weight: bold;
-    color: #ff0000;
-    background-color: #ffffff;
+    color: #f00;
+    background-color: #fff;
 }
 
@@ -809 +806 @@
 .cbi-value-error select {
     color: red;
-    background-color: #ffcccc;
+    background-color: #fcc;
 }
 
@@ -844 +841 @@
 .luci a:visited,
 .exectime {
-    color: #666666;
+    color: #666;
     text-decoration: none;
     font-size: 70%;
@@ -855 +852 @@
 .error500 {
     white-space: normal;
-    border: 1px dotted #ff0000;
-    background-color: #ffffff;
+    border: 1px dotted #f00;
+    background-color: #fff;
     color: #000;
     padding: 0.5em;
 }
-
+}

luci/trunk/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm

@@ -22 +22 @@
 local node     = luci.dispatcher.context.dispatched
 local hostname = luci.sys.hostname()
-
 
 local c = luci.model.uci.cursor():get_all("freifunk", "community")
@@ -68 +67 @@
 <body class="lang_<%=luci.i18n.context.lang%>">
 
+<div class="wrapper">
+
 <!--[if lt IE 7]>
 <div class="warning"><div style="background-color: #cccccc;padding: 2px 10px 2px 10px">
@@ -81 +82 @@
 
 <div id="header">
-<span id="ff_logo">
-<a href="<%=homepage%>" style="text.decoration=none"><img src="/luci-static/freifunk-generic/logo.jpg" border="0" alt="FF Logo" align="left" /></a>
-</span>
-
-<span id="header_left">
-<a href="<%=homepage%>"><%=community%></a>
-</span>
-
-<h1><%=luci.version.distname%></h1>
-<p>
-<%=luci.version.distversion%><br />
-<%:Load%>: <%="%.2f" % load1%> <%="%.2f" % load5%> <%="%.2f" % load15%><br />
-<%:Hostname%>: <%=hostname%>
-<br />
-</p>
+    <span id="header_left">
+        <a href="<%=homepage%>"><img src="/luci-static/freifunk-generic/logo.jpg" alt="FF Logo" /></a>
+        <a href="<%=homepage%>"><%=community%></a>
+    </span>
+    <p>
+        <%=luci.version.distversion%><br />
+        <%:Load%>: <%="%.2f" % load1%> <%="%.2f" % load5%> <%="%.2f" % load15%><br />
+        <%:Hostname%>: <%=hostname%><br />
+    </p>
 </div>