zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

working on support for sub directory

Browse Source
This commit is contained in:
printempw 2016-09-10 17:02:47 +08:00
parent fd622e2eb8
commit 300d5c4b6f
23 changed files with 78 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/admin/customize.tpl
View File

@ -3,7 +3,7 @@
@section('title', '个性化')
@section('style')
<link rel="stylesheet" href="../assets/libs/skins/_all-skins.min.css">
<link rel="stylesheet" href="{{ assets('libs/skins/_all-skins.min.css') }}">
@endsection
@section('content')
@ -94,7 +94,7 @@
<div class="box-header with-border">
<h3 class="box-title">首页配置</h3>
</div><!-- /.box-header -->
<form method="post" action="../admin/customize">
<form method="post">
<input type="hidden" name="option" value="adapter">
<div class="box-body">
<?php
@ -146,7 +146,7 @@
<i class="fa fa-question-circle" title="字符串将不会被转义，请小心" data-toggle="tooltip" data-placement="bottom"></i>
</h3>
</div><!-- /.box-header -->
<form method="post" action="../admin/customize">
<form method="post">
<input type="hidden" name="option" value="adapter">
<div class="box-body">
<?php

4
resources/views/admin/index.tpl
View File

@ -22,7 +22,7 @@
<div class="row">
<div class="col-md-6">
<div class="info-box">
<a href="../admin/users">
<a href="{{ url('admin/users') }}">
<span class="info-box-icon bg-aqua"><i class="fa fa-users"></i></span>
<div class="info-box-content">
<span class="info-box-text">注册用户</span>
@ -34,7 +34,7 @@
<div class="col-md-6">
<div class="info-box">
<a href="../admin/players">
<a href="{{ url('admin/players') }}">
<div class="info-box-content" style="margin-left: 0;">
<span class="info-box-text">角色总数</span>
<span class="info-box-number">{{ App\Models\PlayerModel::all()->count() }}</span>

13
resources/views/admin/master.tpl
View File

@ -61,7 +61,7 @@
<!-- Menu Footer-->
<li class="user-footer">
<div class="pull-left">
<a href="../user/profile" class="btn btn-default btn-flat">我的资料</a>
<a href="{{ url('user/profile') }}" class="btn btn-default btn-flat">我的资料</a>
</div>
<div class="pull-right">
<a href="javascript:logout();" class="btn btn-default btn-flat">登出</a>
@ -97,13 +97,13 @@
@foreach ($menu['admin'] as $key => $value)
<li class="{{ ($__env->yieldContent('title') == $value['title']) ? 'active' : '' }}">
<a href="{{ $value['link'] }}"><i class="fa {{ $value['icon'] }}"></i> <span>{{ $value['title'] }}</span></a>
<a href="{{ url($value['link']) }}"><i class="fa {{ $value['icon'] }}"></i> <span>{{ $value['title'] }}</span></a>
</li>
@endforeach
@if ($user->is_admin)
<li class="header">返回</li>
<li><a href="../user"><i class="fa fa-user"></i> <span>用户中心</span></a></li>
<li><a href="{{ url('user') }}"><i class="fa fa-user"></i> <span>用户中心</span></a></li>
@endif
</ul><!-- /.sidebar-menu -->
</section>
@ -134,10 +134,11 @@
@if (Option::get('check_update') == '1')
<script>
$(document).ready(function() {
$.getJSON('../admin/update?action=check', function(data) {
var url = "{{ url('admin/update') }}";
$.getJSON(url + '?action=check', function(data) {
if (data.new_version_available == true)
$('[href="/admin/update"]').append('<span class="label label-primary pull-right">v'+data.latest_version+'</span>');
})
$('[href="' + url + '"]').append('<span class="label label-primary pull-right">v'+data.latest_version+'</span>');
});
});
</script>
@endif

6
resources/views/admin/options.tpl
View File

@ -30,7 +30,7 @@
<div class="box-header with-border">
<h3 class="box-title">常规选项</h3>
</div><!-- /.box-header -->
<form method="post" action="../admin/options">
<form method="post">
<input type="hidden" name="option" value="general">
<div class="box-body">
<?php
@ -155,7 +155,7 @@
<div class="box-header with-border">
<h3 class="box-title">站点公告</h3>
</div><!-- /.box-header -->
<form method="post" action="../admin/options">
<form method="post">
<input type="hidden" name="option" value="announcement">
<div class="box-body">
<?php
@ -178,7 +178,7 @@
<div class="box-header with-border">
<h3 class="box-title">数据对接配置</h3>
</div><!-- /.box-header -->
<form method="post" action="../admin/options">
<form method="post">
<input type="hidden" name="option" value="adapter">
<div class="box-body">
<p>当前版本数据对接不可用。</p>

32
resources/views/admin/players.tpl
View File

@ -15,6 +15,7 @@
角色管理
@endif
<small>Player Management</small>
<!-- Search Form -->
<form method="get" action="" class="user-search-form">
<input type="text" name="q" class="form-control user-search-input" placeholder="输入，回车搜索。" value="{{ $q }}">
<select name="filter" class="form-control pull-right user-search-input">
@ -22,7 +23,6 @@
<option value='uid' selected="{{ $filter == 'nickname' ? 'selected' : '' }}">根据角色拥有者搜索</option>
</select>
</form>
</h1>
</section>
@ -59,24 +59,24 @@
@if ($player->tid_steve == '0')
<img id="{{ $player->pid }}-steve" width="64" />
@else
<a href="../skinlib/show?tid={{ $player->tid_steve }}">
<img id="{{ $player->pid }}-steve" width="64" src="../preview/64/{{ $player->tid_steve }}.png" />
<a href="{{ url('skinlib/show?tid='.$player->tid_steve) }}">
<img id="{{ $player->pid }}-steve" width="64" src="{{ url('preview/64/'.$player->tid_steve) }}.png" />
</a>
@endif
@if ($player->tid_alex == '0')
<img id="{{ $player->pid }}-alex" width="64" />
@else
<a href="../skinlib/show?tid={{ $player->tid_alex }}">
<img id="{{ $player->pid }}-alex" width="64" src="../preview/64/{{ $player->tid_alex }}.png" />
<a href="{{ url('skinlib/show?tid='.$player->tid_alex) }}">
<img id="{{ $player->pid }}-alex" width="64" src="{{ url('preview/64/'.$player->tid_alex) }}.png" />
</a>
@endif
@if ($player->tid_cape == '0')
<img id="{{ $player->pid }}-cape" width="64" />
@else
<a href="../skinlib/show?tid={{ $player->tid_cape }}">
<img id="{{ $player->pid }}-cape" width="64" src="../preview/64/{{ $player->tid_cape }}.png" />
<a href="{{ url('skinlib/show?tid='.$player->tid_cape) }}">
<img id="{{ $player->pid }}-cape" width="64" src="{{ url('preview/64/'.$player->tid_cape) }}.png" />
</a>
@endif
</td>
@ -145,24 +145,6 @@
</section><!-- /.content -->
</div><!-- /.content-wrapper -->
<div id="modal-change-texture" class="modal fade" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">更改 Player 的材质</h4>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<a href="./player" class="btn btn-default pull-left">添加角色</a>
<a href="javascript:setTexture();" class="btn btn-primary">提交</a>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
@endsection
@section('script')

4
resources/views/admin/score.tpl
View File

@ -22,7 +22,7 @@
<div class="box-header with-border">
<h3 class="box-title">积分换算</h3>
</div><!-- /.box-header -->
<form method="post" action="../admin/score">
<form method="post">
<input type="hidden" name="option" value="rate">
<div class="box-body">
<?php
@ -90,7 +90,7 @@
<div class="box-header with-border">
<h3 class="box-title">签到配置</h3>
</div><!-- /.box-header -->
<form method="post" action="../admin/score">
<form method="post">
<input type="hidden" name="option" value="sign">
<div class="box-body">
<?php

2
resources/views/admin/update.tpl
View File

@ -110,7 +110,7 @@
<div class="box-header with-border">
<h3 class="box-title">更新选项</h3>
</div><!-- /.box-header -->
<form method="post" action="../admin/update">
<form method="post">
<div class="box-body">
<?php
if (isset($_POST['submit'])) {

2
resources/views/admin/users.tpl
View File

@ -75,7 +75,7 @@
<li><a href="javascript:changeUserNickName('{{ $user->uid }}');">修改昵称</a></li>
<li><a href="javascript:changeUserPwd('{{ $user->uid }}');">更改密码</a></li>
<li class="divider"></li>
<li><a href="../admin/players?filter=uid&q={{ $user->uid }}">查看该用户拥有的角色</a></li>
<li><a href="{{ url('admin/players?filter=uid&q='.$user->uid) }}">查看该用户拥有的角色</a></li>
<li class="divider"></li>
{{-- If current user is super admin --}}

2
resources/views/auth/bind.tpl
View File

@ -6,7 +6,7 @@
<div class="login-box">
<div class="login-logo">
<a href="../">{{ Option::get('site_name') }}</a>
<a href="{{ url('/') }}">{{ Option::get('site_name') }}</a>
</div>
<!-- /.login-logo -->
<div class="login-box-body">

6
resources/views/auth/forgot.tpl
View File

@ -6,7 +6,7 @@
<div class="login-box">
<div class="login-logo">
<a href="../">{{ Option::get('site_name') }}</a>
<a href="{{ url('/') }}">{{ Option::get('site_name') }}</a>
</div>
<!-- /.login-logo -->
<div class="login-box-body">
@ -26,7 +26,7 @@
</div>
<!-- /.col -->
<div class="col-xs-4">
<img class="pull-right captcha" src="./captcha" alt="CAPTCHA" title="点击以更换图片" data-placement="top" data-toggle="tooltip">
<img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="点击以更换图片" data-placement="top" data-toggle="tooltip">
</div>
<!-- /.col -->
</div>
@ -35,7 +35,7 @@
<div class="row">
<div class="col-xs-8">
<a href="./login" class="text-center">我又想起来了</a>
<a href="{{ url('auth/login') }}" class="text-center">我又想起来了</a>
</div>
<!-- /.col -->
<div class="col-xs-4">

10
resources/views/auth/login.tpl
View File

@ -6,7 +6,7 @@
<div class="login-box">
<div class="login-logo">
<a href="../">{{ Option::get('site_name') }}</a>
<a href="{{ url('/') }}">{{ Option::get('site_name') }}</a>
</div>
<!-- /.login-logo -->
<div class="login-box-body">
@ -22,7 +22,7 @@
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<div class="row" id="captcha-form" style="{{ (session('login_fails') > 3) ? '' : 'display: none;'}}">
<div class="row" id="captcha-form" style="{{ (session('login_fails') > 3) ? '' : 'display: none;' }}">
<div class="col-xs-8">
<div class="form-group has-feedback">
<input id="captcha" type="text" class="form-control" placeholder="输入验证码">
@ -30,7 +30,7 @@
</div>
<!-- /.col -->
<div class="col-xs-4">
<img class="pull-right captcha" src="./captcha" alt="CAPTCHA" title="点击以更换图片" data-placement="top" data-toggle="tooltip">
<img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="点击以更换图片" data-placement="top" data-toggle="tooltip">
</div>
<!-- /.col -->
</div>
@ -53,8 +53,8 @@
</div>
</form>
<a href="./forgot">忘记密码了？</a><br>
<a href="./register" class="text-center">注册新账号</a>
<a href="{{ url('auth/forgot') }}">忘记密码了？</a><br>
<a href="{{ url('auth/register') }}" class="text-center">注册新账号</a>
</div>
<!-- /.login-box-body -->

6
resources/views/auth/register.tpl
View File

@ -6,7 +6,7 @@
<div class="register-box">
<div class="register-logo">
<a href="../">{{ Option::get('site_name') }}</a>
<a href="{{ url('/') }}">{{ Option::get('site_name') }}</a>
</div>
<div class="register-box-body">
@ -39,7 +39,7 @@
</div>
<!-- /.col -->
<div class="col-xs-4">
<img class="pull-right captcha" src="./captcha" alt="CAPTCHA" title="点击以更换图片" data-placement="top" data-toggle="tooltip">
<img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="点击以更换图片" data-placement="top" data-toggle="tooltip">
</div>
<!-- /.col -->
</div>
@ -48,7 +48,7 @@
<div class="row">
<div class="col-xs-8">
<a href="./login" class="text-center">已经有账号了？登录</a>
<a href="{{ url('auth/login') }}" class="text-center">已经有账号了？登录</a>
</div>
<!-- /.col -->
<div class="col-xs-4">

2
resources/views/auth/reset.tpl
View File

@ -6,7 +6,7 @@
<div class="login-box">
<div class="login-logo">
<a href="../">{{ Option::get('site_name') }}</a>
<a href="{{ url('/') }}">{{ Option::get('site_name') }}</a>
</div>
<div class="login-box-body">

13
resources/views/index.tpl
View File

@ -31,14 +31,13 @@
<div class="container">
<div class="navbar-header">
<a href="{{ Option::get('site_url') }}" class="navbar-brand">{{ Option::get('site_name') }}</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse pull-left" id="navbar-collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="./">首页</a></li>
<li><a href="./skinlib">皮肤库</a></li>
<li class="active"><a href="{{ url('/') }}">首页</a></li>
<li><a href="{{ url('skinlib') }}">皮肤库</a></li>
</ul>
</div><!-- /.navbar-collapse -->
<!-- Navbar Right Menu -->
@ -63,7 +62,7 @@
<!-- Menu Footer-->
<li class="user-footer">
<div class="pull-left">
<a href="./user" class="btn btn-default btn-flat">用户中心</a>
<a href="{{ url('user') }}" class="btn btn-default btn-flat">用户中心</a>
</div>
<div class="pull-right">
<a href="javascript:logout();" class="btn btn-default btn-flat">登出</a>
@ -74,7 +73,7 @@
@else {{-- Anonymous User --}}
<!-- User Account Menu -->
<li class="dropdown user user-menu">
<a href="./auth/login" class="btn btn-login">登录</a>
<a href="{{ url('auth/login') }}" class="btn btn-login">登录</a>
</li>
@endif
</ul>
@ -93,9 +92,9 @@
</p>
<p>
@if (is_null($user))
<a href="./auth/register" class="button">现在注册</a>
<a href="{{ url('auth/register') }}" class="button">现在注册</a>
@else
<a href="./user" class="button">用户中心</a>
<a href="{{ url('user') }}" class="button">用户中心</a>
@endif
</p>
</div>

10
resources/views/skinlib/master.tpl
View File

@ -35,8 +35,8 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse pull-left" id="navbar-collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="../skinlib">皮肤库</a></li>
<li><a href="../user/closet">我的衣柜</a></li>
<li class="active"><a href="{{ url('skinlib') }}">皮肤库</a></li>
<li><a href="{{ url('user/closet') }}">我的衣柜</a></li>
@unless (isset($with_out_filter))
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@ -66,7 +66,7 @@
</li>
@endunless
</ul>
<form class="navbar-form navbar-left" role="search" action="../skinlib/search">
<form class="navbar-form navbar-left" role="search" action="{{ url('skinlib/search') }}">
<div class="form-group">
<input type="text" class="form-control" id="navbar-search-input" name="q" placeholder="搜索材质" value="{{ $q or '' }}" />
</div>
@ -95,7 +95,7 @@
<!-- Menu Footer-->
<li class="user-footer">
<div class="pull-left">
<a href="../user" class="btn btn-default btn-flat">用户中心</a>
<a href="{{ url('user') }}" class="btn btn-default btn-flat">用户中心</a>
</div>
<div class="pull-right">
<a href="javascript:logout();" class="btn btn-default btn-flat">登出</a>
@ -107,7 +107,7 @@
<!-- User Account Menu -->
<li class="dropdown user user-menu">
<!-- Menu Toggle Button -->
<a href="../auth/login">
<a href="{{ url('auth/login') }}">
<i class="fa fa-user"></i>
<!-- hidden-xs hides the username on small devices so only the image appears. -->
<span class="hidden-xs nickname">未登录</span>

2
resources/views/skinlib/search.tpl
View File

@ -43,7 +43,7 @@
</div><!-- /.box-header -->
<div class="box-body">
@forelse ($textures as $texture)
<a href="../skinlib/show?tid={{ $texture['tid'] }}">
<a href="{{ url('skinlib/show?tid='.$texture['tid']) }}">
@include('skinlib.item')
</a>
@empty

12
resources/views/skinlib/show.tpl
View File

File diff suppressed because one or more lines are too long

4
resources/views/skinlib/upload.tpl
View File

@ -106,8 +106,8 @@ label[for="type-cape"] {
</div><!-- /.container -->
</div><!-- /.content-wrapper -->
<script type="text/javascript" src="../assets/libs/skin-preview/three.min.js"></script>
<script type="text/javascript" src="../assets/libs/skin-preview/three.msp.js"></script>
<script type="text/javascript" src="{{ assets('libs/skin-preview/three.min.js') }}"></script>
<script type="text/javascript" src="{{ assets('libs/skin-preview/three.msp.js') }}"></script>
@endsection
@section('script')

14
resources/views/user/closet.tpl
View File

@ -13,8 +13,8 @@
<small>Closet</small>
</h1>
<div class="breadcrumb">
<a href="../skinlib/upload"><i class="fa fa-upload"></i> 上传材质</a>
<a href="../skinlib"><i class="fa fa-search"></i> 搜索材质</a>
<a href="{{ url('skinlib/upload') }}"><i class="fa fa-upload"></i> 上传材质</a>
<a href="{{ url('skinlib') }}"><i class="fa fa-search"></i> 搜索材质</a>
</div>
</section>
@ -38,14 +38,14 @@
@forelse ($items as $item)
<div class="item" tid="{{ $item->tid }}">
<div class="item-body">
<img src="../preview/{{ $item->tid }}.png">
<img src="{{ url('preview/'.$item->tid) }}.png">
</div>
<div class="item-footer">
<p class="texture-name">
<span title="{{ $item->name }}">{{ $item->name }} <small>({{ $item->type }})</small></span>
</p>
<a href="../skinlib/show?tid={{ $item->tid }}" title="在皮肤库中查看" class="more" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-share"></i></a>
<a href="{{ url('skinlib/show?tid='.$item->tid) }}" title="在皮肤库中查看" class="more" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-share"></i></a>
<span title="更多" class="more" data-toggle="dropdown" aria-haspopup="true" id="share-button"><i class="fa fa-cog"></i></span>
<ul class="dropdown-menu" aria-labelledby="share-button">
@ -57,7 +57,7 @@
@empty
<div class="empty-msg">
<p>衣柜里啥都没有哦~</p>
<p>去<a href="../skinlib">皮肤库</a>看看吧~</p>
<p>去<a href="{{ url('skinlib') }}">皮肤库</a>看看吧~</p>
</div>
@endforelse
@ -133,8 +133,8 @@
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<script type="text/javascript" src="../assets/libs/skin-preview/three.min.js"></script>
<script type="text/javascript" src="../assets/libs/skin-preview/three.msp.js"></script>
<script type="text/javascript" src="{{ assets('libs/skin-preview/three.min.js') }}"></script>
<script type="text/javascript" src="{{ assets('libs/skin-preview/three.msp.js') }}"></script>
@endsection

4
resources/views/user/config.tpl
View File

@ -3,7 +3,7 @@
@section('title', '配置生成')
@section('style')
<link rel="stylesheet" href="../assets/libs/highlight/styles/arduino-light.css">
<link rel="stylesheet" href="{{ assets('libs/highlight/styles/arduino-light.css') }}">
<style> pre { border: 0; } td[class='key'], td[class='value'] { border-top: 0 !important; } </style>
@endsection
@ -133,7 +133,7 @@ Cape: http://skins.minecraft.net/MinecraftCloaks/%s.png
@endsection
@section('script')
<script type="text/javascript" src="../assets/libs/highlight/highlight.min.js"></script>
<script type="text/javascript" src="{{ assets('/libs/highlight/highlight.min.js') }}"></script>
<script>
$(document).ready(function() {
$('pre').each(function(i, block) {

8
resources/views/user/master.tpl
View File

@ -59,7 +59,7 @@
<!-- Menu Footer-->
<li class="user-footer">
<div class="pull-left">
<a href="../user/profile" class="btn btn-default btn-flat">我的资料</a>
<a href="{{ url('user/profile') }}" class="btn btn-default btn-flat">我的资料</a>
</div>
<div class="pull-right">
<a href="javascript:logout();" class="btn btn-default btn-flat">登出</a>
@ -95,16 +95,16 @@
@foreach ($menu['user'] as $key => $value)
<li class="{{ ($__env->yieldContent('title') == $value['title']) ? 'active' : '' }}">
<a href="{{ $value['link'] }}"><i class="fa {{ $value['icon'] }}"></i> <span>{{ $value['title'] }}</span></a>
<a href="{{ url($value['link']) }}"><i class="fa {{ $value['icon'] }}"></i> <span>{{ $value['title'] }}</span></a>
</li>
@endforeach
<li class="header">浏览</li>
<li><a href="../skinlib"><i class="fa fa-archive"></i> <span>皮肤库</span></a></li>
<li><a href="{{ url('skinlib') }}"><i class="fa fa-archive"></i> <span>皮肤库</span></a></li>
@if ($user->is_admin)
<li class="header">管理</li>
<li><a href="../admin"><i class="fa fa-cog"></i> <span>管理面板</span></a></li>
<li><a href="{{ url('admin') }}"><i class="fa fa-cog"></i> <span>管理面板</span></a></li>
@endif
</ul><!-- /.sidebar-menu -->
</section>

4
resources/views/user/player.tpl
View File

@ -141,8 +141,8 @@
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<script type="text/javascript" src="../assets/libs/skin-preview/three.min.js"></script>
<script type="text/javascript" src="../assets/libs/skin-preview/three.msp.js"></script>
<script type="text/javascript" src="{{ assets('libs/skin-preview/three.min.js') }}"></script>
<script type="text/javascript" src="{{ assets('libs/skin-preview/three.msp.js') }}"></script>
@endsection

2
setup/index.php
View File

@ -4,7 +4,7 @@
*/
require __DIR__."/bootstrap.php";
throw new App\Exceptions\PrettyPageException('非法参数', 1, true);
// If already installed
if (checkTableExist()) {
View::show('setup.locked');