Make files headers, indentation and conding style consistent

Signed-off-by: Giovanni Giacobbi <giovanni@giacobbi.net>
This commit is contained in:
Giovanni Giacobbi 2021-01-21 13:39:56 +01:00
parent 9fdcfc866c
commit e37523385f
No known key found for this signature in database
GPG Key ID: 63A98B68F17EE59B
3 changed files with 24 additions and 22 deletions

View File

@ -10,14 +10,14 @@
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
-%> -%>
<% <%
local sys = require "luci.sys" local sys = require "luci.sys"
local util = require "luci.util" local util = require "luci.util"
local http = require "luci.http" local http = require "luci.http"
local disp = require "luci.dispatcher" local disp = require "luci.dispatcher"
@ -26,12 +26,13 @@
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()
-- 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
@ -54,7 +55,7 @@
<html lang="<%=luci.i18n.context.lang%>"> <html lang="<%=luci.i18n.context.lang%>">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title> <title>
<%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> <%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %>
- LuCI</title> - LuCI</title>

View File

@ -1,39 +1,41 @@
<%# <%#
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
-%> -%>
<% <%
local sys = require "luci.sys" local sys = require "luci.sys"
local util = require "luci.util" local util = require "luci.util"
local http = require "luci.http" local http = require "luci.http"
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 nutil = require "nixio.util" local fs = require "nixio.fs"
local uci = require 'luci.model.uci'.cursor() local nutil = require "nixio.util"
local uci = require 'luci.model.uci'.cursor()
-- send as HTML5 -- send as HTML5
http.prepare_content("text/html") http.prepare_content("text/html")
math.randomseed(tonumber(tostring(os.time()):reverse():sub(1, 9))) math.randomseed(tonumber(tostring(os.time()):reverse():sub(1, 9)))
-- Custom settings -- Custom settings
local mode = 'normal' local mode = 'normal'
local dark_css = fs.readfile('/www/luci-static/argon/css/dark.css') local dark_css = fs.readfile('/www/luci-static/argon/css/dark.css')
local bar_color = '#5e72e4' local bar_color = '#5e72e4'
@ -47,8 +49,7 @@
blur_opacity_dark = uci:get_first('argon', 'global', 'transparency_dark') blur_opacity_dark = uci:get_first('argon', 'global', 'transparency_dark')
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%>">

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
@ -25,7 +25,7 @@
<% <%
local util = require "luci.util" local util = require "luci.util"
local boardinfo = util.ubus("system", "board") local boardinfo = util.ubus("system", "board")
local fs = require "nixio.fs" local fs = require "nixio.fs"
local nutil = require "nixio.util" local nutil = require "nixio.util"
function glob(...) function glob(...)
@ -60,7 +60,7 @@
end end
if bgcount > 0 then if bgcount > 0 then
currentBg = bgs[math.random(1,bgcount)] currentBg = bgs[math.random(1,bgcount)]
end end
%> %>
<div class="login-page"> <div class="login-page">
@ -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"
@ -96,7 +96,7 @@
end end
%> %>
style="background-image:url(<%=bg_url%>)" style="background-image:url(<%=bg_url%>)"
<% elseif (bgcount > 0 and currentBg["type"] ~= "mp4") then %> <% elseif (bgcount > 0 and currentBg["type"] ~= "mp4") then %>
style="background-image:url(<%=currentBg.url%>)" style="background-image:url(<%=currentBg.url%>)"
<% end %> <% end %>
></div> ></div>