github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-13 23:53:42 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polish admin dashboard

Browse Source
This commit is contained in:
Toby Zerner 2015-08-27 10:50:15 +09:30
parent 54ec8364d5
commit 430a8cd575
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/js/admin/src/components/DashboardPage.js
View File

@ -6,9 +6,9 @@ export default class DashboardPage extends Component {
<div className="DashboardPage"> <div className="DashboardPage">
<div className="container"> <div className="container">
<h2>Welcome to Flarum Beta</h2> <h2>Welcome to Flarum Beta</h2>
<p>This is beta software; you shouldn't use it in production.</p> <p>Thanks for trying out Flarum! You are running version <strong>{app.forum.attribute('version')}</strong>.</p>
<p>You're running version X</p> <p>This is beta software, and should not be used in production. If you run into any trouble, please read the <a href="http://flarum.org/docs/troubleshooting" target="_blank">Troubleshooting docs</a>. You can get further help on the <a href="http://discuss.flarum.org" target="_blank">support forum</a> and report bugs on <a href="https://github.com/flarum/core/issues" target="_blank">GitHub</a>.</p>
<p>Get help on X. Report bugs here. Feedback here. Contribute here.</p> <p>If you'd like to contribute, check out the <a href="http://flarum.org/docs/contributing" target="_blank">Contributing page</a>.</p>
</div> </div>
</div> </div>
); );

12
framework/core/less/admin/DashboardPage.less
View File

@ -1,4 +1,10 @@
.DashboardPage { .DashboardPage {
background: @control-bg;
color: @control-color;
min-height: 100vh;
font-size: 16px;
line-height: 1.7;
@media @desktop-up { @media @desktop-up {
.container { .container {
max-width: 600px; max-width: 600px;
@ -6,4 +12,10 @@
margin: 0; margin: 0;
} }
} }
h2 {
font-size: 30px;
font-weight: 300;
margin-top: 0;
}
} }

2
framework/core/src/Api/Serializers/ForumSerializer.php
View File

@ -11,6 +11,7 @@
namespace Flarum\Api\Serializers; namespace Flarum\Api\Serializers;
use Flarum\Core; use Flarum\Core;
use Flarum\Core\Application;
class ForumSerializer extends Serializer class ForumSerializer extends Serializer
{ {
@ -49,6 +50,7 @@ class ForumSerializer extends Serializer
if ($this->actor->isAdmin()) { if ($this->actor->isAdmin()) {
$attributes['adminUrl'] = Core::url('admin'); $attributes['adminUrl'] = Core::url('admin');
$attributes['version'] = Application::VERSION;
} }
return $attributes; return $attributes;

4
framework/core/src/Core/Application.php
View File

@ -23,11 +23,11 @@ use Illuminate\Contracts\Foundation\Application as ApplicationContract;
class Application extends Container implements ApplicationContract class Application extends Container implements ApplicationContract
{ {
/** /**
* The Laravel framework version. * The Flarum version.
* *
* @var string * @var string
*/ */
const VERSION = '5.1.9 (LTS)'; const VERSION = '0.1.0-beta';
/** /**
* The base path for the Laravel installation. * The base path for the Laravel installation.