Skip to content

Commit

Permalink
1. 修复文章编辑后格式错乱的问题
Browse files Browse the repository at this point in the history 
2. fontawesome转本地
3. 其他html代码结构调整
  • Loading branch information
@jksdou
jksdou committed Sep 9, 2024
1 parent 230d9fe commit d6e49a6
Show file tree
Hide file tree
Showing 56 changed files with 3,937 additions and 1,419 deletions.
2 changes: 1 addition & 1 deletion src/about.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<meta name="keywords" content="<?php echo $conf['keywords']; ?>">
<meta name="description" content="<?php echo $conf['description']; ?>">
<link rel="shortcut icon" type="images/x-icon" href="./favicon.ico" />
<link href="assets/fontawesome/4.7.0/css/fontawesome.min.css" rel="stylesheet" />
<link rel="stylesheet" href="<?php echo $site_cdnpublic; ?>font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="./assets/css/ozui.min.css" />
<link rel="stylesheet" type="text/css" href="./templates/default/css/style.css" />
<?php echo $conf['script_header']; ?>
Expand Down
65 changes: 36 additions & 29 deletions src/admin/account.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,46 @@
require('./navbar.php');
require('./sidebar.php');
?>
<ol class="breadcrumb">
<li><a href="./"><?php echo $lang->admin->index; ?></a></li>
<li class="active"><?php echo $lang->admin->user; ?></li>
</ol>

<div class="row">
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading"><b><?php echo $lang->admin->user; ?></b></div>
<div class="panel-body">
<form name="account-form" onsubmit="return appSaveAccount()" method="post">
<div class="input-group">
<span class="input-group-addon">管理员账号</span>
<input value="<?php echo $conf['admin_user']; ?>" type="text" class="form-control" placeholder="请输入管理员账号" name="admin_user" required>
<div class="content-wrapper">
<section class="content-header">
<ol class="breadcrumb">
<li><a href="./"><?php echo $lang->admin->index; ?></a></li>
<li class="active"><?php echo $lang->admin->user; ?></li>
</ol>
</section>

<section class="content">
<div class="row">
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading"><b><?php echo $lang->admin->user; ?></b></div>
<div class="panel-body">
<form name="account-form" onsubmit="return appSaveAccount()" method="post">
<div class="input-group">
<span class="input-group-addon">管理员账号</span>
<input value="<?php echo $conf['admin_user']; ?>" type="text" class="form-control" placeholder="请输入管理员账号" name="admin_user" required>
</div>
<br />
<div class="input-group">
<span class="input-group-addon">管理员密码</span>
<input type="password" name="admin_pwd" value="" class="form-control" placeholder="请输入当前的管理员密码"/>
</div><br/>
<div class="input-group">
<span class="input-group-addon">新的密码</span>
<input type="password" name="newpwd" value="" class="form-control" placeholder="如果不修改密码，请在密码输入框中留空"/>
</div><br/>
<div class="input-group">
<span class="input-group-addon">重输密码</span>
<input type="password" name="newpwd2" value="" class="form-control" placeholder="如果不修改密码，请在密码输入框中留空"/>
</div><br/>
<input type="submit" class="btn btn-info btn-block" name="submit" value="修改">
</form>
</div>
<br />
<div class="input-group">
<span class="input-group-addon">管理员密码</span>
<input type="password" name="admin_pwd" value="" class="form-control" placeholder="请输入当前的管理员密码"/>
</div><br/>
<div class="input-group">
<span class="input-group-addon">新的密码</span>
<input type="password" name="newpwd" value="" class="form-control" placeholder="如果不修改密码，请在密码输入框中留空"/>
</div><br/>
<div class="input-group">
<span class="input-group-addon">重输密码</span>
<input type="password" name="newpwd2" value="" class="form-control" placeholder="如果不修改密码，请在密码输入框中留空"/>
</div><br/>
<input type="submit" class="btn btn-info btn-block" name="submit" value="修改">
</form>
</div>
</div>
</div>
</div>
</section>
</div>

<?php require('./footer.php'); ?>
Expand Down
99 changes: 53 additions & 46 deletions src/admin/apply.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,53 +14,60 @@
$apply_count = $DB->count('apply', array('reject' => 0));
$apply_list = $DB->findAll('apply', '*', array('reject' => 0), 'id asc', "$page_offset,$page_size");
?>
<ol class="breadcrumb">
<li><a href="./"><?php echo $lang->admin->index; ?></a></li>
<li><a href="site.php"><?php echo $lang->admin->site; ?></a></li>
<li class="active"><?php echo $lang->admin->apply_list; ?></li>
</ol>
<div>
<a class="btn btn-success" href="apply_reject.php"><?php echo $lang->admin->apply_reject; ?></a>
</div>
<br />
<div class="panel panel-default">
<div class="panel-heading">
<b><?php echo $lang->admin->apply;?></b>
<span>共 <b><?php echo $apply_count;?></b> 个申请</span>
</div>
<div class="table-responsive">
<table class="table table-bordered table-striped">
<thead>
<tr style="white-space: nowrap;">
<th class="text-center" style="width: 10%;">名称</th>
<th class="text-center" style="width: 5%;">图片</th>
<th class="text-center" style="width: 10%;">分类</th>
<th class="text-center" style="width: 15%;">链接</th>
<th class="text-center" style="width: 40%;">简介</th>
<th class="text-center" style="width: 20%;">操作</th>
</tr>
</thead>
<tbody>
<?php foreach($apply_list as $row) { ?>
<tr class="text-center">
<td><?php echo $row['name'];?></td>
<td><img src="<?php echo $row['img'];?>" width="20px" height="20px"></td>
<td><?php echo $row['catename'];?></td>
<td><a href="../go.php?url=<?php echo $row['url'];?>" title="<?php echo $row['url'];?>" target="_blank"><?php echo $row['url'];?></a></td>
<td><?php echo $row['introduce'];?></td>
<td>
<a href="./apply_edit.php?id=<?php echo $row['id'];?>" class="btn btn-xs btn-info">审核</a>
<a class="btn btn-xs btn-success" onclick="javascript:return app_reject_apply(<?php echo $row['id']; ?>, '<?php echo $row['name'];?>')">拒绝</a>
<a class="btn btn-xs btn-danger" onclick="javascript:return app_del_apply(<?php echo $row['id']; ?>, '<?php echo $row['name'];?>')">删除</a>
</td>
</tr>
<?php }?>
</tbody>
</table>
</div>
</div>

<?php echo pagination('apply.php', $page, $apply_count, $page_size); ?>
<div class="content-wrapper">
<section class="content-header">
<ol class="breadcrumb">
<li><a href="./"><?php echo $lang->admin->index; ?></a></li>
<li><a href="site.php"><?php echo $lang->admin->site; ?></a></li>
<li class="active"><?php echo $lang->admin->apply_list; ?></li>
</ol>
</section>
<section class="content">
<div>
<a class="btn btn-success" href="apply_reject.php"><?php echo $lang->admin->apply_reject; ?></a>
</div>
<br />
<div class="panel panel-default">
<div class="panel-heading">
<b><?php echo $lang->admin->apply;?></b>
<span>共 <b><?php echo $apply_count;?></b> 个申请</span>
</div>
<div class="table-responsive">
<table class="table table-bordered table-striped">
<thead>
<tr style="white-space: nowrap;">
<th class="text-center" style="width: 10%;">名称</th>
<th class="text-center" style="width: 5%;">图片</th>
<th class="text-center" style="width: 10%;">分类</th>
<th class="text-center" style="width: 15%;">链接</th>
<th class="text-center" style="width: 40%;">简介</th>
<th class="text-center" style="width: 20%;">操作</th>
</tr>
</thead>
<tbody>
<?php foreach($apply_list as $row) { ?>
<tr class="text-center">
<td><?php echo $row['name'];?></td>
<td><img src="<?php echo $row['img'];?>" width="20px" height="20px"></td>
<td><?php echo $row['catename'];?></td>
<td><a href="../go.php?url=<?php echo $row['url'];?>" title="<?php echo $row['url'];?>" target="_blank"><?php echo $row['url'];?></a></td>
<td><?php echo $row['introduce'];?></td>
<td>
<a href="./apply_edit.php?id=<?php echo $row['id'];?>" class="btn btn-xs btn-info">审核</a>
<a class="btn btn-xs btn-success" onclick="javascript:return app_reject_apply(<?php echo $row['id']; ?>, '<?php echo $row['name'];?>')">拒绝</a>
<a class="btn btn-xs btn-danger" onclick="javascript:return app_del_apply(<?php echo $row['id']; ?>, '<?php echo $row['name'];?>')">删除</a>
</td>
</tr>
<?php }?>
</tbody>
</table>
</div>
</div>

<?php echo pagination('apply.php', $page, $apply_count, $page_size); ?>
</section>
</div>

<?php require ('./footer.php'); ?>
<script>
Expand Down
Loading

0 comments on commit d6e49a6

Please sign in to comment.