Added beta message + report issue link

This commit is contained in:
Andy Miller
2015-08-04 10:13:14 -06:00
parent a3fed7e7a5
commit bdca72c797
8 changed files with 59 additions and 1 deletions

View File

@@ -10,6 +10,7 @@ login:
warnings:
delete_page: true
edit_mode: auto // auto|normal|expert
show_beta_msg: true
popularity:
enabled: true
ignore: ['/test*','/modular']

View File

@@ -50,6 +50,18 @@ form:
expert: Expert
help: Auto will use blueprint if available, if none found, it will use "Expert" mode.
show_beta_msg:
type: toggle
label: Show Beta Message
highlight: 1
default: 1
options:
1: Enabled
0: Disabled
validate:
type: bool
help: Show the beta warning message on the dashboard
login.enabled:
type: hidden
label: Login enabled

View File

@@ -1,4 +1,6 @@
en:
ADMIN_BETA_MSG: This is a Beta release! Use this in production at your own risk...
ADMIN_REPORT_ISSUE: Found an issue? Please report it on GitHub.
EMAIL_FOOTER: <a href="http://getgrav.org">Powered by Grav</a> - The Modern Flat File CMS
LOGIN_BTN: Login
LOGIN_BTN_FORGOT: Forgot
@@ -19,6 +21,8 @@ en:
FORGOT_EMAIL_BODY: <h1>Password Reset</h1><p>Dear %1$s,</p><p>A request was made on <b>%4$s</b> to reset your password.</p><p><br /><a href="%2$s" class="btn-primary">Click this to reset your password</a><br /><br /></p><p>Alternatively, copy the following URL into your browser's address bar:</p> <p>%2$s</p><p><br />Kind regards,<br /><br />%3$s</p>
it:
ADMIN_BETA_MSG: This is a Beta release! Use this in production at your own risk...
ADMIN_REPORT_ISSUE: Found an issue? Please report it on GitHub.
EMAIL_FOOTER: <a href="http://getgrav.org">Powered by Grav</a> - The Modern Flat File CMS
LOGIN_BTN: Login
LOGIN_BTN_FORGOT: Reset password

View File

@@ -82,6 +82,10 @@ b, strong {
.info {
background: #9055AF;
color: #fff; }
.info a {
color: #e6e6e6; }
.info a:hover {
color: #fff; }
.info-reverse {
color: #9055AF; }
@@ -89,10 +93,18 @@ b, strong {
.notice {
background: #2693B7;
color: #fff; }
.notice a {
color: #e6e6e6; }
.notice a:hover {
color: #fff; }
.error {
background: #DA4B46;
color: #fff; }
.error a {
color: #e6e6e6; }
.error a:hover {
color: #fff; }
.badge {
font-size: 0.9rem;
@@ -525,6 +537,10 @@ form .form-column > .form-field.grid {
-moz-flex: 0;
-ms-flex: 0;
flex: 0; }
form .grid.vertical {
-webkit-flex-flow: column;
-moz-flex-flow: column;
flex-flow: column; }
form .form-select-wrapper, form .selectize-control.single .selectize-input {
position: relative; }
form .form-select-wrapper:after, form .selectize-control.single .selectize-input:after {

File diff suppressed because one or more lines are too long

View File

@@ -65,6 +65,12 @@ b, strong {
.info {
background: $info-bg;
color: $info-fg;
a {
color: darken($info-fg, 10%);
&:hover {
color: $info-fg;
}
}
}
.info-reverse {
@@ -74,11 +80,23 @@ b, strong {
.notice {
background: $tertiary-accent-bg;
color: $tertiary-accent-fg;
a {
color: darken($tertiary-accent-fg, 10%);
&:hover {
color: $tertiary-accent-fg;
}
}
}
.error {
background: $notice-bg;
color: $notice-fg;
a {
color: darken($notice-fg, 10%);
&:hover {
color: $notice-fg;
}
}
}
.badge {

View File

@@ -110,7 +110,11 @@
{% endblock %}
{% block content %}
{% include 'partials/messages.html.twig' %}
{% if config.plugins.admin.show_beta_msg %}
<div class="error alert"><i class="fa fa-exclamation-circle"></i> {{ 'ADMIN_BETA_MSG'|t }}</div>
{% endif %}
<div id="latest">
<div class="button-bar">
<a class="button" href="{{ uri.route(true) }}/pages"><i class="fa fa-fw fa-file-text-o"></i>Manage Pages</a>

View File

@@ -91,6 +91,9 @@
<div class="admin-block default-box-shadow">
{% block content %}{% endblock %}
</div>
{% if config.plugins.admin.show_beta_msg %}
<div class="notice alert"><i class="fa fa-github"></i> <a href="https://github.com/getgrav/grav/grav-plugin-admin/issues">{{ 'ADMIN_REPORT_ISSUE'|t }}</a></div>
{% endif %}
{% block content_bottom %}{% endblock %}
</div>
<footer id="footer">