From 0b1fbaf892dee6eb0e96098b252ee4c1d71c62d6 Mon Sep 17 00:00:00 2001 From: xiaoz Date: Mon, 12 Apr 2021 18:41:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/onenav.simple.db3 | Bin 32768 -> 36864 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/db/onenav.simple.db3 b/db/onenav.simple.db3 index bda06b0362e93f21e2e3a362d1bea3017471f147..895d56f7623f7824e6ce8ea226292321d67f3f99 100644 GIT binary patch delta 449 zcmZo@U}{*vG(lRhn1O+T6Nq6zV4{w(Y%znL_XJ+{p9~yqwhVmXoV)q=v)S^=aSC&6 z<_Ou$C~%NniH+g)vD|FphKh{knRzLx75RDb`2{7J`FX|h*{PNBo-Ppx z5l-hISH}=n1y4U0*9ZlKI83F2zaNsQf`$^%1SQQlE;ey}MaF7$<1bqPUTliSpWb4 delta 110 zcmZozz|_#dG(lRhfPsO51Bh9GmILx})mTey+6XT(cjr$lk@8)!6+bk;Znt$R1(M1XZ69d>;89{~tRlet+7{I#7 G!2tju)EbHa From 6f12b074f2d8ab42ed9aa0ffc8b2e7135ab70c23 Mon Sep 17 00:00:00 2001 From: xiaoz Date: Tue, 13 Apr 2021 16:47:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b09f6a..a65fbb3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![](https://i.bmp.ovh/imgs/2020/12/40f222b7da7a89c9.png) - +![](https://i.bmp.ovh/imgs/2021/04/5c46f84f158d8d3a.png) ![](https://i.bmp.ovh/imgs/2020/12/7a1eee25c16d2d81.png) From 1554f30f6f4d03adf9438bf6a5215ff76c23d04a Mon Sep 17 00:00:00 2001 From: xiaoz Date: Mon, 26 Jul 2021 19:15:45 +0800 Subject: [PATCH 3/4] 20210726 --- controller/index.php | 9 ++++++++- data/update.log | 18 +++++++++++++++++- templates/admin/index.php | 5 ++++- templates/default/index.php | 2 +- templates/default/static/style.css | 12 +++++++++++- version.txt | 2 +- 6 files changed, 42 insertions(+), 6 deletions(-) diff --git a/controller/index.php b/controller/index.php index 836b9d9..14b2807 100644 --- a/controller/index.php +++ b/controller/index.php @@ -118,5 +118,12 @@ else{ // 载入前台首页模板 -require('templates/'.TEMPLATE.'/index.php'); +//判断文件夹是否存在 +if( is_dir('templates/'.TEMPLATE) ){ + $tpl_dir = 'templates/'; +} +else{ + $tpl_dir = 'data/templates/'; +} +require($tpl_dir.TEMPLATE.'/index.php'); ?> \ No newline at end of file diff --git a/data/update.log b/data/update.log index 154b5dd..283fe1a 100644 --- a/data/update.log +++ b/data/update.log @@ -6,4 +6,20 @@ 1. 更改初始化数据库位置 2. 修复分类目录不按权重排序的问题 3. 书签导入 -4. 书签批量删除 \ No newline at end of file +4. 书签批量删除 + +20210412 +CREATE TABLE on_options ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + "key" TEXT(64) NOT NULL, + value TEXT, + extend TEXT +); + +CREATE INDEX on_options_id_IDX ON on_options (id,"key"); +CREATE INDEX on_options_key_IDX ON on_options ("key"); + +20210726 +1. 修复后台QQ群2 +2. 后台添加社区支持链接 +3. 修复默认主题顶部遮挡问题 \ No newline at end of file diff --git a/templates/admin/index.php b/templates/admin/index.php index f67666d..dc3a18a 100644 --- a/templates/admin/index.php +++ b/templates/admin/index.php @@ -14,7 +14,10 @@
QQ群1：147687134
-
QQ群2：147687134
+
QQ群2：932795364
+
+
+
社区支持：https://dwz.ovh/vd0bw
项目地址：https://github.com/helloxz/onenav
diff --git a/templates/default/index.php b/templates/default/index.php index 294ca63..36a29ab 100644 --- a/templates/default/index.php +++ b/templates/default/index.php @@ -129,7 +129,7 @@ $property = ''; } ?> -
+
diff --git a/templates/default/static/style.css b/templates/default/static/style.css index 4f94349..cfd464b 100644 --- a/templates/default/static/style.css +++ b/templates/default/static/style.css @@ -135,4 +135,14 @@ footer a{ } .mdui-snackbar-top{ background-color: #FF2377; -} \ No newline at end of file +} +.cat-title{ + margin-top: -68px; + padding-top:68px; + /* margin-bottom: 0; */ +} + +/* :target { + padding-top: 70px; + margin-top: -70px; + } */ \ No newline at end of file diff --git a/version.txt b/version.txt index e30cff6..4019413 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.9.11-20210411 \ No newline at end of file +v0.9.12-20210726 \ No newline at end of file From 89adde94d8c254aaf6facd5be9c5bb3f84b996cf Mon Sep 17 00:00:00 2001 From: xiaoz Date: Mon, 26 Jul 2021 21:46:49 +0800 Subject: [PATCH 4/4] 0.9.12 --- README.md | 5 ++++- templates/default/static/style.css | 2 +- test.php | 24 ------------------------ 3 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 test.php diff --git a/README.md b/README.md index a65fbb3..084a108 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,11 @@ * 支持后台管理 * 支持私有链接 * 支持书签批量导入 -* 支持多种主题风格（默认内置2套模板） +* 支持多种主题风格 * 支持链接信息自动识别 * 支持API +* 支持Docker部署 +* 支持uTools插件 ## 安装 @@ -59,6 +61,7 @@ docker run -itd --name="onenav" -p 80:80 \ * Blog:https://www.xiaoz.me/ * QQ:337003006 * QQ群：147687134 +* 社区支持：[https://dwz.ovh/vd0bw](https://dwz.ovh/vd0bw) ## 鸣谢 diff --git a/templates/default/static/style.css b/templates/default/static/style.css index cfd464b..5d46e0b 100644 --- a/templates/default/static/style.css +++ b/templates/default/static/style.css @@ -137,7 +137,7 @@ footer a{ background-color: #FF2377; } .cat-title{ - margin-top: -68px; + margin-top: -50px; padding-top:68px; /* margin-bottom: 0; */ } diff --git a/test.php b/test.php deleted file mode 100644 index e0a6929..0000000 --- a/test.php +++ /dev/null @@ -1,24 +0,0 @@ -/i"; - -preg_match_all($pattern,$content,$arr); - -foreach( $arr[0] as $link ) -{ - //var_dump($link); - #$pattern = "/href=\"(.*)\"? ADD_DATE/i"; - $pattern = "/http.*\"? ADD_DATE/i"; - preg_match($pattern,$link,$urls); - $url = str_replace('" ADD_DATE','',$urls[0]); - $pattern = "/>.*<\/a>$/i"; - preg_match($pattern,$link,$titles); - - $title = str_replace('>','',$titles[0]); - $title = str_replace('"; - //echo 'dsd'; -} \ No newline at end of file