Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/themes:

Browse source 
- create new package luci-theme-base
	- add new base package to package feed
	- make openwrt.org and openwrtlight themes depend on theme-base
This commit is contained in:
Jo-Philipp Wich 2008-10-21 00:49:01 +00:00
parent f35cea8c53
commit fe5db50285
6 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
contrib/package/luci/Makefile
View file

@ -556,6 +556,16 @@ define Package/luci-sgi-webuci/install
endef endef
### Themes ### ### Themes ###
define Package/luci-theme-base
$(call Package/luci/thtemplate)
DEPENDS:=+luci-web
TITLE:=Common base for all themes
endef
define Package/luci-theme-base/install
$(call Package/luci/install/template,$(1),themes/base)
endef
define Package/luci-theme-fledermaus define Package/luci-theme-fledermaus
$(call Package/luci/fftemplate) $(call Package/luci/fftemplate)
DEPENDS:=+luci-web DEPENDS:=+luci-web
@ -591,6 +601,7 @@ endef
define Package/luci-theme-openwrt define Package/luci-theme-openwrt
$(call Package/luci/thtemplate) $(call Package/luci/thtemplate)
TITLE:=OpenWRT.org (default) TITLE:=OpenWRT.org (default)
DEPENDS:=+luci-theme-base
endef endef
define Package/luci-theme-openwrt/install define Package/luci-theme-openwrt/install
@ -600,6 +611,7 @@ endef
define Package/luci-theme-openwrtlight define Package/luci-theme-openwrtlight
$(call Package/luci/thtemplate) $(call Package/luci/thtemplate)
TITLE:=OpenWRT.org - light variant without images TITLE:=OpenWRT.org - light variant without images
DEPENDS:=+luci-theme-base
endef endef
define Package/luci-theme-openwrtlight/install define Package/luci-theme-openwrtlight/install
@ -777,6 +789,9 @@ ifneq ($(CONFIG_PACKAGE_luci-sgi-webuci),)
PKG_SELECTED_MODULES+=libs/sgi-webuci PKG_SELECTED_MODULES+=libs/sgi-webuci
endif endif
ifneq ($(CONFIG_PACKAGE_luci-theme-base),)
PKG_SELECTED_MODULES+=themes/base
endif
ifneq ($(CONFIG_PACKAGE_luci-theme-fledermaus),) ifneq ($(CONFIG_PACKAGE_luci-theme-fledermaus),)
PKG_SELECTED_MODULES+=themes/fledermaus PKG_SELECTED_MODULES+=themes/fledermaus
endif endif
@ -862,6 +877,7 @@ $(eval $(call BuildPackage,luci-sgi-cgi))
$(eval $(call BuildPackage,luci-sgi-luci)) $(eval $(call BuildPackage,luci-sgi-luci))
$(eval $(call BuildPackage,luci-sgi-webuci)) $(eval $(call BuildPackage,luci-sgi-webuci))
$(eval $(call BuildPackage,luci-theme-base))
$(eval $(call BuildPackage,luci-theme-fledermaus)) $(eval $(call BuildPackage,luci-theme-fledermaus))
$(eval $(call BuildPackage,luci-theme-freifunk)) $(eval $(call BuildPackage,luci-theme-freifunk))
$(eval $(call BuildPackage,luci-theme-freifunk-bno)) $(eval $(call BuildPackage,luci-theme-freifunk-bno))

2
themes/base/Makefile Normal file
View file

@ -0,0 +1,2 @@
include ../../build/config.mk
include ../../build/module.mk

0
themes/openwrt.org/htdocs/luci-static/openwrt.org/Dropdowns.js → themes/base/htdocs/luci-static/resources/Dropdowns.js
View file

0
themes/openwrt.org/htdocs/luci-static/openwrt.org/VarType.js → themes/base/htdocs/luci-static/resources/VarType.js
View file

0
themes/openwrt.org/htdocs/luci-static/openwrt.org/XHTML1.js → themes/base/htdocs/luci-static/resources/XHTML1.js
View file

6
themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
View file

@ -46,9 +46,9 @@ require("luci.http").prepare_content("application/xhtml+xml")
<!--[if IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie7.css" /><![endif]--> <!--[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%>" /> <% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
<% end -%> <% end -%>
<script type="text/javascript" src="<%=media%>/VarType.js"></script> <script type="text/javascript" src="<%=resource%>/VarType.js"></script>
<script type="text/javascript" src="<%=media%>/XHTML1.js"></script> <script type="text/javascript" src="<%=resource%>/XHTML1.js"></script>
<script type="text/javascript" src="<%=media%>/Dropdowns.js"></script> <script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script>
<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
</head> </head>
<body class="lang_<%=luci.i18n.context.lang%>"> <body class="lang_<%=luci.i18n.context.lang%>">