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

Simplify update page

Browse Source
This commit is contained in:
Pig Fang 2019-04-05 22:53:07 +08:00
parent a24e34cf5e
commit e32983a1a1
4 changed files with 1 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/lang/en/admin.yml
View File

@ -111,17 +111,8 @@ update:
latest: "Latest Version:"
current: "Current Version:"
release-time: "Release Time:"
pre-release: You are now using pre-release version.
change-log:
text: "Change Log:"
empty: Empty
downloads:
text: "Download Link:"
link: Click to download full update package.
check-github: <a href=":url" target="_blank" class="el-button pull-right">Check GitHub Releases</a>
button: Update Now

9
resources/lang/zh_CN/admin.yml
View File

@ -116,17 +116,8 @@ update:
latest: 最新版本：
current: 当前版本：
release-time: 发布时间：
pre-release: 当前版本为未发布测试版
change-log:
text: 更新日志：
empty: 无内容
downloads:
text: 下载地址：
link: 点击下载完整安装包
check-github: <a href=":url" target="_blank" class="el-button pull-right">查看 GitHub Releases</a>
button: 马上升级

52
resources/views/admin/update.blade.php
View File

@ -38,28 +38,6 @@
v{{ $info['current_version'] }}
</td>
</tr>
<tr>
<td class="key">@lang('admin.update.info.release-time')</td>
<td class="value">
{{ get_datetime_string($info['release_time']) }}
</td>
</tr>
<tr>
<td class="key">@lang('admin.update.info.change-log.text')</td>
<td class="value">
{!! nl2p($info['release_note']) ?: trans('admin.update.info.change-log.empty') !!}
</td>
</tr>
<tr>
<td class="key">@lang('admin.update.info.downloads.text')</td>
<td class="value">
<a href="{!! $info['release_url'] !!}">@lang('admin.update.info.downloads.link')</a>
</td>
</tr>
@if($info['pre_release'])
<div class="callout callout-warning">@lang('admin.update.info.pre-release-warning')</div>
@endif
</tbody>
</table>
@ -79,16 +57,6 @@
v{{ $info['current_version'] }}
</td>
</tr>
<tr>
<td class="key">@lang('admin.update.info.release-time')</td>
<td class="value">
@if ($info['release_time'])
{{ get_datetime_string($info['release_time']) }}
@else
@lang('admin.update.info.pre-release')
@endif
</td>
</tr>
</tbody>
</table>
@endif
@ -113,27 +81,7 @@
</section><!-- /.content -->
</div><!-- /.content-wrapper -->
<div id="modal-start-download" 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">@lang('admin.update.download.downloading')</h4>
</div>
<div class="modal-body">
<p>@lang('admin.update.download.size')<span id="file-size">0</span> Bytes</p>
<div class="progress">
<div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%">
<span id="download-progress">0</span>%
</div>
</div>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<script>
blessing.extra = @json($extra)
</script>
@endsection

6
tests/UpdateControllerTest.php
View File

@ -39,11 +39,7 @@ class UpdateControllerTest extends TestCase
// New version available
$time = time();
$this->appendToGuzzleQueue(200, [], $this->generateFakeUpdateInfo('8.9.3', false, $time));
$this->get('/admin/update')
->assertSee(config('app.version'))
->assertSee('8.9.3')
->assertSee('test')
->assertSee(Carbon::createFromTimestamp($time)->toDateTimeString());
$this->get('/admin/update')->assertSee(config('app.version'))->assertSee('8.9.3');
// Now using pre-release version
$this->appendToGuzzleQueue(200, [], $this->generateFakeUpdateInfo('0.0.1', false, $time));