Skip to content

Commit

Permalink
Pretty config editor (#10)
Browse files Browse the repository at this point in the history
* add pretty yaml editor

* Update Makefile

* miniy the js add css
  • Loading branch information
rufengsuixing committed Dec 2, 2019
1 parent bf18924 commit 52f45fb
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=luci-app-adguardhome
PKG_VERSION:=1.7
PKG_RELEASE:=7
PKG_RELEASE:=8

PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

Expand Down
7 changes: 6 additions & 1 deletion luasrc/model/cbi/AdGuardHome/manual.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ local binpath = uci:get("AdGuardHome","AdGuardHome","binpath")
s = m:section(TypedSection, "AdGuardHome")
s.anonymous=true
s.addremove=false
--- config
o = s:option(TextValue, "escconf")
o.rows = 33
o.rows = 66
o.wrap = "off"
o.rmempty = true
o.cfgvalue = function(self, section)
Expand All @@ -30,6 +31,10 @@ end
o.remove = function(self, section, value)
NXFS.writefile(escconf, "")
end
o = s:option(DummyValue, "")
o.anonymous=true
o.template = "AdGuardHome/yamleditor"
--- log
if (NXFS.access("/tmp/AdGuardHometmpconfig.yaml")) then
local c=NXFS.readfile("/tmp/AdGuardHometest.log")
if (c~="") then
Expand Down
26 changes: 26 additions & 0 deletions luasrc/view/AdGuardHome/yamleditor.htm
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<%+cbi/valueheader%>
<script src="/luci-static/resources/codemirror/lib/codemirror.js"></script>
<link rel="stylesheet" href="/luci-static/resources/codemirror/lib/codemirror.css"/>
<script src="/luci-static/resources/codemirror/mode/yaml/yaml.js"></script>
<link rel="stylesheet" href="/luci-static/resources/codemirror/theme/dracula.css"/>
<link rel="stylesheet" href="/luci-static/resources/codemirror/addon/fold/foldgutter.css"/>
<script src="/luci-static/resources/codemirror/addon/fold/foldcode.js"></script>
<script src="/luci-static/resources/codemirror/addon/fold/foldgutter.js"></script>
<script src="/luci-static/resources/codemirror/addon/fold/indent-fold.js"></script>
<script type="text/javascript">//<![CDATA[
var editor = CodeMirror.fromTextArea(document.getElementById("cbid.AdGuardHome.AdGuardHome.escconf"), {
mode: "text/yaml", //实现groovy代码高亮
styleActiveLine: true,
lineNumbers: true, //显示行号
theme: "dracula", //设置主题
lineWrapping: true, //代码折叠
foldGutter: true,
gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
matchBrackets: true,//括号匹配
foldGutter: true
}
);
//]]>
</script>
<%+cbi/valuefooter%>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 52f45fb

Please sign in to comment.