Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
hexplor committed Oct 15, 2015
2 parents 9f467e8 + e802363 commit 6310b5f
Show file tree
Hide file tree
Showing 9 changed files with 102 additions and 70 deletions.
24 changes: 16 additions & 8 deletions .dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ git:
url: https://github.com/getgrav/grav-plugin-error
path: user/plugins/error
branch: master
simple_form:
url: https://github.com/nunopress/grav-plugin-simple_form
path: user/plugins/simple_form
branch: master
email:
url: https://github.com/getgrav/grav-plugin-email
path: user/plugins/email
branch: master
form:
url: https://github.com/getgrav/grav-plugin-form
path: user/plugins/form
branch: master
twenty:
url: https://github.com/getgrav/grav-theme-twenty
path: user/themes/twenty
Expand All @@ -20,10 +24,14 @@ links:
src: grav-plugin-problems
path: user/plugins/problems
scm: github
simple_form:
src: grav-plugin-simple_form
path: user/plugins/simple_form
scm: github
email:
src: grav-plugin-email
path: user/plugins/email
scm: github
form:
src: grav-plugin-form
path: user/plugins/form
scm: github
error:
src: grav-plugin-error
path: user/plugins/error
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# v1.0.3
## 10/15/2015

1. [](#new)
* Removed SimpleForm plugin support due to constant compatibility problems
* Added support for Email and Form plugins

# v1.0.1
## 09/21/2015

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,5 @@ This will install the Twenty theme into your `/user/themes` directory within Gra

You can find more information bout this process, including manual installation instructions, by visiting the [project page for the stand-alone Grav theme](https://github.com/getgrav/grav-theme-twenty).

# Contact Form Configuration
For contact form configuration instructions please refer to [official documentatnion](http://learn.getgrav.org/advanced/contact-form). Make sure you installed Email and Form plugin though.
2 changes: 1 addition & 1 deletion blueprints.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Twenty Site
version: 1.0.2
version: 1.0.3
description: "Twenty is a free and responsive theme for **Grav**. It's a port of **Twenty** template by HTML5 UP."
icon: group
author:
Expand Down
13 changes: 13 additions & 0 deletions config/plugins/email.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
enabled: true
from: your@email.here
to: your@email.here
mailer:
engine: mail
smtp:
server: localhost
port: 25
encryption: none
user: ''
password: ''
sendmail:
bin: '/usr/sbin/sendmail'
43 changes: 0 additions & 43 deletions config/plugins/simple_form.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions pages/05.contact/contact.md

This file was deleted.

63 changes: 63 additions & 0 deletions pages/05.contact/form.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
---
title: Get In Touch
description: Use the form below to give /dev/null a piece of your mind.
body_class: contact
icon: envelope
form:
name: my-nice-form
fields:
- name: name
label: Name
framework_size: half
placeholder: Name
autofocus: on
autocomplete: on
type: text
validate:
required: true

- name: email
framework_size: half
label: Email
placeholder: name@example.com
type: text
validate:
rule: email
required: true

- name: message
framework_size: full
label: Message
size: long
placeholder: Your message here
type: textarea
validate:
required: true

buttons:
- type: submit
value: Submit

process:
- email:
from: "{{ config.plugins.email.from }}"
to:
- "{{ config.plugins.email.from }}"
- "{{ form.value.email }}"
subject: "[Feedback] {{ form.value.name|e }}"
body: "{% include 'forms/data.html.twig' %}"
- save:
fileprefix: feedback-
dateformat: Ymd-His-u
extension: txt
body: "{% include 'forms/data.txt.twig' %}"
- message: Thank you for your feedback!
- display: thankyou
buttons:
- text: Take My Money
url: '#'
class: special
- text: LOL Wut
url: '#'
menu: after_article
---
File renamed without changes.

0 comments on commit 6310b5f

Please sign in to comment.