diff --git a/README.md b/README.md index ef2dd21..3d1bdd8 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,11 @@ * 支持后台管理 * 支持私有链接 * 支持书签批量导入 -* 支持多种主题风格(默认内置2套模板) +* 支持多种主题风格 * 支持链接信息自动识别 * 支持API +* 支持Docker部署 +* 支持uTools插件 ## 安装 @@ -55,6 +57,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/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/db/onenav.simple.db3 b/db/onenav.simple.db3 index bda06b0..895d56f 100644 Binary files a/db/onenav.simple.db3 and b/db/onenav.simple.db3 differ 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..5d46e0b 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: -50px; + padding-top:68px; + /* margin-bottom: 0; */ +} + +/* :target { + padding-top: 70px; + margin-top: -70px; + } */ \ No newline at end of file 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 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