From 1bf1a8ad0530f8c73f3cd8ee5a47b663b102d4e6 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 4 Aug 2014 23:27:55 +0200
Subject: [PATCH] Remove gluon-luci-core
The package luci-base now contains everything we need.
---
package/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 package/gluon-luci-core/Makefile
delete mode 100644 package/gluon-luci-core/files/usr/lib/lua/luci/view/error404.htm
delete mode 100644 package/gluon-luci-core/files/usr/lib/lua/luci/view/error500.htm
delete mode 100644 package/gluon-luci-core/files/usr/lib/lua/luci/view/footer.htm
delete mode 100644 package/gluon-luci-core/files/usr/lib/lua/luci/view/header.htm
delete mode 100644 package/gluon-luci-core/files/usr/lib/lua/luci/view/sysauth.htm
diff --git a/package/gluon-luci-core/Makefile b/package/gluon-luci-core/Makefile
deleted file mode 100644
index 2cee38618..000000000
--- a/package/gluon-luci-core/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2013 Nils Schneider <nils at nilsschneider.net>
-# 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/package/gluon-luci-core/files/usr/lib/lua/luci/view/error404.htm b/package/gluon-luci-core/files/usr/lib/lua/luci/view/error404.htm
deleted file mode 100644
index 813604d12..000000000
--- a/package/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 <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-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%>
-<h2><a id="content" name="content">404 <%:Not Found%></a></h2>
-<p><%:Sorry, the object you requested was not found.%></p>
-<tt><%:Unable to dispatch%>: <%=luci.http.request.env.PATH_INFO%></tt>
-<%+footer%>
diff --git a/package/gluon-luci-core/files/usr/lib/lua/luci/view/error500.htm b/package/gluon-luci-core/files/usr/lib/lua/luci/view/error500.htm
deleted file mode 100644
index 14ba0410a..000000000
--- a/package/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 <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-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%>
-<h2><a id="content" name="content">500 <%:Internal Server Error%></a></h2>
-<p><%:Sorry, the server encountered an unexpected error.%></p>
-<pre class="error500"><%=message%></pre>
-<%+footer%>
diff --git a/package/gluon-luci-core/files/usr/lib/lua/luci/view/footer.htm b/package/gluon-luci-core/files/usr/lib/lua/luci/view/footer.htm
deleted file mode 100644
index 6c6d21421..000000000
--- a/package/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 <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-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/package/gluon-luci-core/files/usr/lib/lua/luci/view/header.htm b/package/gluon-luci-core/files/usr/lib/lua/luci/view/header.htm
deleted file mode 100644
index 77018b117..000000000
--- a/package/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 <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-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/package/gluon-luci-core/files/usr/lib/lua/luci/view/sysauth.htm b/package/gluon-luci-core/files/usr/lib/lua/luci/view/sysauth.htm
deleted file mode 100644
index 8c4b19c7c..000000000
--- a/package/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 <steven@midlink.org>
-Copyright 2008-2012 Jo-Philipp Wich <xm@subsignal.org>
-
-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%>
-
-<form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">
- <div class="cbi-map">
- <h2><a id="content" name="content"><%:Authorization Required%></a></h2>
- <div class="cbi-map-descr">
- <%:Please enter your username and password.%>
- <%- if fuser then %>
- <div class="error"><%:Invalid username and/or password! Please try again.%></div>
- <br />
- <% end -%>
- </div>
- <fieldset class="cbi-section"><fieldset class="cbi-section-node">
- <div class="cbi-value">
- <label class="cbi-value-title"><%:Username%></label>
- <div class="cbi-value-field">
- <input class="cbi-input-user" type="text" name="username" value="<%=duser%>" />
- </div>
- </div>
- <div class="cbi-value cbi-value-last">
- <label class="cbi-value-title"><%:Password%></label>
- <div class="cbi-value-field">
- <input id="focus_password" class="cbi-input-password" type="password" name="password" />
- </div>
- </div>
- </fieldset></fieldset>
- </div>
-
- <div>
- <input type="submit" value="<%:Login%>" class="cbi-button cbi-button-apply" />
- <input type="reset" value="<%:Reset%>" class="cbi-button cbi-button-reset" />
- </div>
-</form>
-<script type="text/javascript">//<![CDATA[
- var input = document.getElementById('focus_password');
- if (input)
- input.focus();
-//]]></script>
-<%+footer%>
--
GitLab