luci-0.11: merge outstanding trunk changes

[project/luci.git] / themes / freifunk-bno / luasrc / view / themes / freifunk-bno / header.htm
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 7313fff55087137ce3295e751aa972b56f4604f2..5099d186fe650c2bb5c8a658f07924194d82235f 100644 (file)
--- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
+++ b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
@@ -30,7 +30,6 @@ for i,r in ipairs(request) do
         end
  end
  
         end
  end
  
-require("luci.i18n").loadc("base")
  require("luci.http").prepare_content("text/html")
  
  -%>
  require("luci.http").prepare_content("text/html")
  
  -%>
@@ -41,6 +40,10 @@ require("luci.http").prepare_content("text/html")
  <head>
         <link rel="stylesheet" type="text/css" href="<%=media%>/cascade.css" />
         <% if node and node.css then %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %>
  <head>
         <link rel="stylesheet" type="text/css" href="<%=media%>/cascade.css" />
         <% if node and node.css then %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %>
+       <% if css then %><style title="text/css">
+       <%-= css %>
+       </style>
+       <% end -%>
         <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" />
         <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" />