Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
e6f909cfc9 | |||
40fc1d99a7 | |||
58835f4098 | |||
68a0e505bf | |||
70717c9a6a | |||
6fd49ce421 | |||
5fbaacb893 |
@ -1,3 +1,7 @@
|
||||
## v4.0.1 2020-07-13
|
||||
|
||||
- Fixed staticman comments UI that was broken since the migration to bootstrap 4
|
||||
|
||||
## v4.0.0 2020-07-12
|
||||
|
||||
- **BREAKING CHANGE** Replace `image` YAML parameter with `thumbnail-img` to be more clear
|
||||
|
@ -1,7 +1,8 @@
|
||||
# Beautiful Jekyll
|
||||
|
||||
[](https://github.com/daattali/beautiful-jekyll/actions?query=branch%3Amaster+event%3Apush+workflow%3A%22Beautiful+Jekyll+CI%22)
|
||||
[](https://xscode.com/daattali/beautiful-jekyll)
|
||||
[](https://badge.fury.io/rb/beautiful-jekyll-theme)
|
||||
[](https://github.com/daattali/beautiful-jekyll/actions?query=branch%3Amaster+event%3Apush+workflow%3A%22Beautiful+Jekyll+CI%22)
|
||||
|
||||
> *Copyright 2020 [Dean Attali](https://deanattali.com)*
|
||||
|
||||
@ -214,6 +215,8 @@ If you need any help, I suggest heading over to the [Jekyll support forum](https
|
||||
|
||||
Beautiful Jekyll is actively used by thousands of people with wildly varying degrees of competency, so it's impossible to answer all the questions that may arise. Below are answers to a few very common questions. Most questions that I get asked are not directly related to this theme, and instead are more general questions about Jekyll or web development. Many such questions can be answered by reading the [Jekyll documentation](https://jekyllrb.com/) or with Google.
|
||||
|
||||
**If you really wany my personal help, please visit https://xscode.com/daattali/beautiful-jekyll to hire my services.**
|
||||
|
||||
### What if I don't want the website to be `https://<yourusername>.github.io`?
|
||||
|
||||
Every GitHub user can have one repository (repository = project) named `<yourusername>.github.io` and the website for that repository will be `https://<yourusername>.github.io`.
|
||||
|
@ -140,14 +140,14 @@ footer-link-col: "#404040"
|
||||
|
||||
# To use Staticman comments, first invite `staticmanlab` as a collaborator to your repository and
|
||||
# accept the invitation by going to `https://staticman3.herokuapp.com/v3/connect/github/<username>/<repo-name>`.
|
||||
# Then uncomment the following section and fill in "repository", "branch", and "endpoint".
|
||||
# Then uncomment the following section and fill in "repository" and "branch".
|
||||
# If you want to use reCaptcha for staticman (optional for spam protection), then fill
|
||||
# in the "siteKey" and "secret" parameters below and also in `staticman.yml`.
|
||||
# See more details at https://staticman.net/
|
||||
#staticman:
|
||||
# repository : # GitHub username/repository eg. "daattali/beautiful-jekyll"
|
||||
# branch : master # If you're not using `master` branch, then you also need to update the `branch` parameter in `staticman.yml`
|
||||
# endpoint : # URL of your own deployment, with a trailing slash (will fallback to a public GitLab instance) eg. https://<your-api>/v3/entry/github/
|
||||
# endpoint : # (optional) URL of your own deployment, with a trailing slash eg. https://<your-api>/v3/entry/github/ (will fallback to a public GitLab instance)
|
||||
# reCaptcha:
|
||||
# siteKey : # Use your own site key, you need to apply for one on Google
|
||||
# secret : # ENCRYPT your password by going to https://staticman3.herokuapp.com/v3/encrypt/<your-site-secret>
|
||||
|
@ -39,7 +39,7 @@
|
||||
<label for="comment-form-url">{{ site.data.ui-text[site.locale].comment_form_website_label | default: "Website (optional)" }}</label>
|
||||
<input type="url" id="comment-form-url" name="fields[url]" tabindex="4"/>
|
||||
</div>
|
||||
<div class="form-group hidden" style="display: none;">
|
||||
<div class="form-group d-none" style="display: none;">
|
||||
<input type="hidden" name="options[origin]" value="{{ page.url | absolute_url }}">
|
||||
<input type="hidden" name="options[slug]" value="{{ page.slug }}">
|
||||
<label for="comment-form-location">Not used. Leave blank if you are a human.</label>
|
||||
@ -48,9 +48,9 @@
|
||||
{% if site.staticman.reCaptcha.secret %}<input type="hidden" name="options[reCaptcha][secret]" value="{{ site.staticman.reCaptcha.secret }}">{% endif %}
|
||||
</div>
|
||||
<!-- Start comment form alert messaging -->
|
||||
<p class="hidden js-notice">
|
||||
<strong class="js-notice-text-success hidden">{{ site.data.ui-text[site.locale].comment_success_msg | default: "Thanks for your comment! It will show on the site once it has been approved." }}</strong>
|
||||
<strong class="js-notice-text-failure hidden">{{ site.data.ui-text[site.locale].comment_error_msg | default: "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again." }}</strong>
|
||||
<p class="d-none js-notice alert">
|
||||
<strong class="js-notice-text-success d-none">{{ site.data.ui-text[site.locale].comment_success_msg | default: "Thanks for your comment! It will show on the site once it has been approved." }}</strong>
|
||||
<strong class="js-notice-text-failure d-none">{{ site.data.ui-text[site.locale].comment_error_msg | default: "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again." }}</strong>
|
||||
</p>
|
||||
<!-- End comment form alert messaging -->
|
||||
{% if site.staticman.reCaptcha.siteKey %}
|
||||
@ -59,8 +59,8 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
<button type="submit" id="comment-form-submit" tabindex="5" class="btn btn--primary btn--large">{{ site.data.ui-text[site.locale].comment_btn_submit | default: "Submit Comment" }}</button>
|
||||
<button type="submit" id="comment-form-submitted" tabindex="5" class="btn btn--primary btn--large hidden" disabled>{{ site.data.ui-text[site.locale].comment_btn_submitted | default: "Submitted" }}</button>
|
||||
<button type="submit" id="comment-form-submit" tabindex="5" class="btn btn-primary btn-lg">{{ site.data.ui-text[site.locale].comment_btn_submit | default: "Submit Comment" }}</button>
|
||||
<button type="submit" id="comment-form-submitted" tabindex="5" class="btn btn-primary btn-lg d-none" disabled>{{ site.data.ui-text[site.locale].comment_btn_submitted | default: "Submitted" }}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
2
assets/js/jquery-3.4.1.min.js
vendored
Normal file
2
assets/js/jquery-3.4.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -21,18 +21,18 @@ layout: null
|
||||
data: $(this).serialize(),
|
||||
contentType: 'application/x-www-form-urlencoded',
|
||||
success: function (data) {
|
||||
$('#comment-form-submit').addClass('hidden');
|
||||
$('#comment-form-submitted').removeClass('hidden');
|
||||
$('.page__comments-form .js-notice').removeClass('notice--danger');
|
||||
$('.page__comments-form .js-notice').addClass('notice--success');
|
||||
$('#comment-form-submit').addClass('d-none');
|
||||
$('#comment-form-submitted').removeClass('d-none');
|
||||
$('.page__comments-form .js-notice').removeClass('alert-danger');
|
||||
$('.page__comments-form .js-notice').addClass('alert-success');
|
||||
showAlert('success');
|
||||
},
|
||||
error: function (err) {
|
||||
console.log(err);
|
||||
$('#comment-form-submitted').addClass('hidden');
|
||||
$('#comment-form-submit').removeClass('hidden');
|
||||
$('.page__comments-form .js-notice').removeClass('notice--success');
|
||||
$('.page__comments-form .js-notice').addClass('notice--danger');
|
||||
$('#comment-form-submitted').addClass('d-none');
|
||||
$('#comment-form-submit').removeClass('d-none');
|
||||
$('.page__comments-form .js-notice').removeClass('alert-success');
|
||||
$('.page__comments-form .js-notice').addClass('alert-danger');
|
||||
showAlert('failure');
|
||||
$(form).removeClass('disabled');
|
||||
}
|
||||
@ -42,13 +42,13 @@ layout: null
|
||||
});
|
||||
|
||||
function showAlert(message) {
|
||||
$('.page__comments-form .js-notice').removeClass('hidden');
|
||||
$('.page__comments-form .js-notice').removeClass('d-none');
|
||||
if (message == 'success') {
|
||||
$('.page__comments-form .js-notice-text-success').removeClass('hidden');
|
||||
$('.page__comments-form .js-notice-text-failure').addClass('hidden');
|
||||
$('.page__comments-form .js-notice-text-success').removeClass('d-none');
|
||||
$('.page__comments-form .js-notice-text-failure').addClass('d-none');
|
||||
} else {
|
||||
$('.page__comments-form .js-notice-text-success').addClass('hidden');
|
||||
$('.page__comments-form .js-notice-text-failure').removeClass('hidden');
|
||||
$('.page__comments-form .js-notice-text-success').addClass('d-none');
|
||||
$('.page__comments-form .js-notice-text-failure').removeClass('d-none');
|
||||
}
|
||||
}
|
||||
})(jQuery);
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
Gem::Specification.new do |spec|
|
||||
spec.name = "beautiful-jekyll-theme"
|
||||
spec.version = "4.0.0"
|
||||
spec.version = "4.0.1"
|
||||
spec.authors = ["Dean Attali"]
|
||||
spec.email = ["daattali@gmail.com"]
|
||||
|
||||
|
Reference in New Issue
Block a user