Browse Source

Merge pull request #23 from helloxz/dev

Dev
pull/30/head 0.9.12
xiaoz 3 years ago committed by GitHub
parent
commit
60a535dfbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      README.md
  2. 9
      controller/index.php
  3. 16
      data/update.log
  4. BIN
      db/onenav.simple.db3
  5. 5
      templates/admin/index.php
  6. 2
      templates/default/index.php
  7. 10
      templates/default/static/style.css
  8. 24
      test.php
  9. 2
      version.txt

5
README.md

@ -14,9 +14,11 @@ @@ -14,9 +14,11 @@
* 支持后台管理
* 支持私有链接
* 支持书签批量导入
* 支持多种主题风格(默认内置2套模板)
* 支持多种主题风格
* 支持链接信息自动识别
* 支持API
* 支持Docker部署
* 支持uTools插件
## 安装
@ -55,6 +57,7 @@ docker run -itd --name="onenav" -p 80:80 \ @@ -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)
## 鸣谢

9
controller/index.php

@ -118,5 +118,12 @@ else{ @@ -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');
?>

16
data/update.log

@ -7,3 +7,19 @@ @@ -7,3 +7,19 @@
2. 修复分类目录不按权重排序的问题
3. 书签导入
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. 修复默认主题顶部遮挡问题

BIN
db/onenav.simple.db3

Binary file not shown.

5
templates/admin/index.php

@ -14,7 +14,10 @@ @@ -14,7 +14,10 @@
<div class = "admin-msg">QQ群1:147687134</div>
</div>
<div class="layui-col-lg4">
<div class = "admin-msg">QQ群2:147687134</div>
<div class = "admin-msg">QQ群2:932795364</div>
</div>
<div class="layui-col-lg4">
<div class = "admin-msg">社区支持:<a href="https://dwz.ovh/vd0bw" rel = "nofollow" target="_blank" title="访问下问社区">https://dwz.ovh/vd0bw</a></div>
</div>
<div class="layui-col-lg4">
<div class = "admin-msg">项目地址:<a href="https://github.com/helloxz/onenav" rel = "nofollow" target="_blank">https://github.com/helloxz/onenav</a></div>

2
templates/default/index.php

@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
$property = '';
}
?>
<div id = "category-<?php echo $category['id']; ?>" class = "mdui-col-xs-12 mdui-typo-title cat-title" style = "margin-top:1.5em;">
<div id = "category-<?php echo $category['id']; ?>" class = "mdui-col-xs-12 mdui-typo-title cat-title">
<?php echo $category['name']; ?> <?php echo $property; ?>
<span class = "mdui-typo-caption"><?php echo $category['description']; ?></span>
</div>

10
templates/default/static/style.css

@ -136,3 +136,13 @@ footer a{ @@ -136,3 +136,13 @@ footer a{
.mdui-snackbar-top{
background-color: #FF2377;
}
.cat-title{
margin-top: -50px;
padding-top:68px;
/* margin-bottom: 0; */
}
/* :target {
padding-top: 70px;
margin-top: -70px;
} */

24
test.php

@ -1,24 +0,0 @@ @@ -1,24 +0,0 @@
<?php
$content = file_get_contents('./bookmarks.html');
$pattern = "/<A.*<\/A>/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('</A','',$title);
//echo $url;
//exit;
echo $title.' - '.$url."<br />";
//echo 'dsd';
}

2
version.txt

@ -1 +1 @@ @@ -1 +1 @@
v0.9.11-20210411
v0.9.12-20210726
Loading…
Cancel
Save