From 1eff492575007ff8d7eb7d079a6cbd2c8979c6b7 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 4 Aug 2014 23:27:55 +0200 Subject: [PATCH] Remove gluon-luci-core The package luci-base now contains everything we need. --- gluon/gluon-luci-core/Makefile | 39 -------------- .../files/usr/lib/lua/luci/view/error404.htm | 19 ------- .../files/usr/lib/lua/luci/view/error500.htm | 19 ------- .../files/usr/lib/lua/luci/view/footer.htm | 15 ------ .../files/usr/lib/lua/luci/view/header.htm | 21 -------- .../files/usr/lib/lua/luci/view/sysauth.htm | 54 ------------------- 6 files changed, 167 deletions(-) delete mode 100644 gluon/gluon-luci-core/Makefile delete mode 100644 gluon/gluon-luci-core/files/usr/lib/lua/luci/view/error404.htm delete mode 100644 gluon/gluon-luci-core/files/usr/lib/lua/luci/view/error500.htm delete mode 100644 gluon/gluon-luci-core/files/usr/lib/lua/luci/view/footer.htm delete mode 100644 gluon/gluon-luci-core/files/usr/lib/lua/luci/view/header.htm delete mode 100644 gluon/gluon-luci-core/files/usr/lib/lua/luci/view/sysauth.htm diff --git a/gluon/gluon-luci-core/Makefile b/gluon/gluon-luci-core/Makefile deleted file mode 100644 index 2cee386..0000000 --- a/gluon/gluon-luci-core/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2013 Nils Schneider -# This is free software, licensed under the Apache 2.0 license. - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gluon-luci-core -PKG_VERSION:=0.1 -PKG_RELEASE:=1 - -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - -include $(INCLUDE_DIR)/package.mk - -define Package/gluon-luci-core - SECTION:=gluon - CATEGORY:=Gluon - TITLE:=Luci code shared by configmode and expertmode - DEPENDS:=+gluon-core +gluon-luci-theme +luci-lib-web -endef - -define Package/gluon-luci-core/description - Luci code shared by various gluon packages -endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/gluon-luci-core/install - $(CP) ./files/* $(1)/ -endef - -$(eval $(call BuildPackage,gluon-luci-core)) diff --git a/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/error404.htm b/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/error404.htm deleted file mode 100644 index 813604d..0000000 --- a/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/error404.htm +++ /dev/null @@ -1,19 +0,0 @@ -<%# -LuCI - Lua Configuration Interface -Copyright 2008 Steven Barth -Copyright 2008 Jo-Philipp Wich - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ - --%> -<%+header%> -

404 <%:Not Found%>

-

<%:Sorry, the object you requested was not found.%>

-<%:Unable to dispatch%>: <%=luci.http.request.env.PATH_INFO%> -<%+footer%> diff --git a/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/error500.htm b/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/error500.htm deleted file mode 100644 index 14ba041..0000000 --- a/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/error500.htm +++ /dev/null @@ -1,19 +0,0 @@ -<%# -LuCI - Lua Configuration Interface -Copyright 2008 Steven Barth -Copyright 2008 Jo-Philipp Wich - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ - --%> -<%+header%> -

500 <%:Internal Server Error%>

-

<%:Sorry, the server encountered an unexpected error.%>

-
<%=message%>
-<%+footer%> diff --git a/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/footer.htm b/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/footer.htm deleted file mode 100644 index 6c6d214..0000000 --- a/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/footer.htm +++ /dev/null @@ -1,15 +0,0 @@ -<%# -LuCI - Lua Configuration Interface -Copyright 2008 Steven Barth -Copyright 2008 Jo-Philipp Wich - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ - --%> -<% include("themes/" .. theme .. "/footer") %> \ No newline at end of file diff --git a/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/header.htm b/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/header.htm deleted file mode 100644 index 77018b1..0000000 --- a/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/header.htm +++ /dev/null @@ -1,21 +0,0 @@ -<%# -LuCI - Lua Configuration Interface -Copyright 2008 Steven Barth -Copyright 2008 Jo-Philipp Wich - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ - --%> - -<% - if not luci.dispatcher.context.template_header_sent then - include("themes/" .. theme .. "/header") - luci.dispatcher.context.template_header_sent = true - end -%> diff --git a/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/sysauth.htm b/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/sysauth.htm deleted file mode 100644 index 8c4b19c..0000000 --- a/gluon/gluon-luci-core/files/usr/lib/lua/luci/view/sysauth.htm +++ /dev/null @@ -1,54 +0,0 @@ -<%# -LuCI - Lua Configuration Interface -Copyright 2008 Steven Barth -Copyright 2008-2012 Jo-Philipp Wich - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ - --%> - -<%+header%> - -
"> -
-

<%:Authorization Required%>

-
- <%:Please enter your username and password.%> - <%- if fuser then %> -
<%:Invalid username and/or password! Please try again.%>
-
- <% end -%> -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
- - -
-
- -<%+footer%>