Merge pull request #166 from cartender/pr/whitespace_cleanup

Clean up trailing whitespace, file headers, indentation and end of file newlines
This commit is contained in:
老竭力 2021-01-21 21:14:38 +08:00 committed by GitHub
commit dcc62fae29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 61 additions and 60 deletions

View File

@ -10,7 +10,7 @@
luci-theme-material: luci-theme-material:
Copyright 2015 Lutty Yang <lutty@wcan.in> Copyright 2015 Lutty Yang <lutty@wcan.in>
Agron Theme Argon Theme
https://demos.creative-tim.com/argon-dashboard/index.html https://demos.creative-tim.com/argon-dashboard/index.html
Licensed to the public under the Apache License 2.0 Licensed to the public under the Apache License 2.0
@ -32,6 +32,7 @@
-- send as HTML5 -- send as HTML5
http.prepare_content("text/html") http.prepare_content("text/html")
math.randomseed(os.time()) math.randomseed(os.time())
-- Custom settings -- Custom settings

View File

@ -1,17 +1,17 @@
<%# <%#
edge is a clean HTML5 theme for LuCI. It is based on luci-theme-material edge Template Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material Argon Template
luci-theme-edge luci-theme-argon
Copyright 2020 Jerrykuku <jerrykuku@qq.com> Copyright 2020 Jerrykuku <jerrykuku@qq.com>
Have a bug? Please create an issue here on GitHub! Have a bug? Please create an issue here on GitHub!
https://github.com/jerrykuku/luci-theme-edge/issues https://github.com/jerrykuku/luci-theme-argon/issues
luci-theme-material: luci-theme-material:
Copyright 2015 Lutty Yang <lutty@wcan.in> Copyright 2015 Lutty Yang <lutty@wcan.in>
Agron Theme Argon Theme
https://demos.creative-tim.com/edge-dashboard/index.html https://demos.creative-tim.com/argon-dashboard/index.html
Licensed to the public under the Apache License 2.0 Licensed to the public under the Apache License 2.0
-%> -%>
@ -23,7 +23,9 @@
local disp = require "luci.dispatcher" local disp = require "luci.dispatcher"
local boardinfo = util.ubus("system", "board") local boardinfo = util.ubus("system", "board")
local node = disp.context.dispatched local node = disp.context.dispatched
local fs = require "nixio.fs" local fs = require "nixio.fs"
local nutil = require "nixio.util" local nutil = require "nixio.util"
local uci = require 'luci.model.uci'.cursor() local uci = require 'luci.model.uci'.cursor()
@ -48,7 +50,6 @@
mode = uci:get_first('argon', 'global', 'mode') mode = uci:get_first('argon', 'global', 'mode')
bar_color = mode == 'dark' and dark_primary or primary bar_color = mode == 'dark' and dark_primary or primary
end end
-%> -%>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%=luci.i18n.context.lang%>"> <html lang="<%=luci.i18n.context.lang%>">
@ -120,4 +121,3 @@
<body <body
class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><% end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>" class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><% end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>"
data-page="<%= table.concat(disp.context.requestpath, "-") %>"> data-page="<%= table.concat(disp.context.requestpath, "-") %>">

View File

@ -15,7 +15,7 @@
MUI: MUI:
https://github.com/muicss/mui https://github.com/muicss/mui
Agron Theme Argon Theme
https://demos.creative-tim.com/argon-dashboard/index.html https://demos.creative-tim.com/argon-dashboard/index.html
Licensed to the public under the Apache License 2.0 Licensed to the public under the Apache License 2.0
@ -85,7 +85,7 @@
<% else %> <% else %>
<div class="main-bg" id="main-bg" <div class="main-bg" id="main-bg"
<% <%
if (bgcount == 0 ) then if (bgcount == 0) then
local http = require "luci.sys" local http = require "luci.sys"
local json = require "luci.jsonc" local json = require "luci.jsonc"
local bg_url = media .. "/img/bg1.jpg" local bg_url = media .. "/img/bg1.jpg"