projects / project / luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 9d2e1cf)
themes: add facility to include custom css
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 21 Nov 2012 18:36:40 +0000 (18:36 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 21 Nov 2012 18:36:40 +0000 (18:36 +0000)
themes/bootstrap/luasrc/view/themes/bootstrap/header.htm patch | blob | history
themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm patch | blob | history
themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm patch | blob | history
themes/openwrt/luasrc/view/themes/openwrt.org/header.htm patch | blob | history

diff --git a/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm
index 1d23877..c79c152 100644 (file)
--- a/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm
+++ b/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm
@@ -106,6 +106,10 @@ You may obtain a copy of the License at
   <link rel="shortcut icon" href="<%=media%>/favicon.ico">
   <% if node and node.css then %><link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
   <% end -%>
+  <% if css then %><style title="text/css">
+  <%-= css %>
+  </style>
+  <% end -%>
   <script src="<%=resource%>/xhr.js"></script>
  </head>
 
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 7313fff..be03d87 100644 (file)
--- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
+++ b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
@@ -41,6 +41,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 %>
+       <% 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" />
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 c14d8be..a8c257e 100644 (file)
--- a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
+++ b/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
@@ -79,6 +79,10 @@ You may obtain a copy of the License at
 <!--[if IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie7.css" /><![endif]-->
 <% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
 <% end -%>
+<% if css then %><style title="text/css">
+<%= css %>
+</style>
+<% end -%>
 <script type="text/javascript" src="<%=resource%>/xhr.js"></script>
 
 <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(tostring(node.title)) or '')) %> - LuCI</title>
diff --git a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
index 9f85959..5006723 100644 (file)
--- a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
@@ -107,6 +107,10 @@ $Id$
 <!--[if IE 8]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie8.css" /><![endif]-->
 <% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
 <% end -%>
+<% if css then %><style title="text/css">
+<%= css %>
+</style>
+<% end -%>
 <script type="text/javascript" src="<%=resource%>/xhr.js"></script>
 <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
 </head>
Lua Configuration Interface (mirror)