Merge branch 'release/1.0.3'

.dependencies

@@ -18,27 +18,31 @@ git:
     random:
         url: https://github.com/getgrav/grav-plugin-random
         path: user/plugins/random
-        branch: develop    
+        branch: develop
     pagination:
         url: https://github.com/getgrav/grav-plugin-pagination
         path: user/plugins/pagination
-        branch: develop    
+        branch: develop
     relatedpages:
         url: https://github.com/getgrav/grav-plugin-relatedpages
         path: user/plugins/relatedpages
         branch: develop
-    simple_form:
-        url: https://github.com/nunopress/grav-plugin-simple_form
-        path: user/plugins/simple_form
-        branch: develop
+    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
     taxonomylist:
         url: https://github.com/getgrav/grav-plugin-taxonomylist
         path: user/plugins/taxonomylist
         branch: develop
     archives:
         url: https://github.com/getgrav/grav-plugin-archives
         path: user/plugins/archives
-        branch: develop   
+        branch: develop
     twentyfifteen:
         url: https://github.com/getgrav/grav-theme-twentyfifteen
         path: user/themes/twentyfifteen
@@ -63,18 +67,22 @@ links:
     random:
         src: grav-plugin-random
         path: user/plugins/random
-        scm: github    
+        scm: github
     pagination:
         src: grav-plugin-pagination
         path: user/plugins/pagination
-        scm: github    
+        scm: github
     relatedpages:
         src: grav-plugin-relatedpages
         path: user/plugins/relatedpages
         scm: github
-    simple_form:
-        src: grav-plugin-simple_form
-        path: user/plugins/simple_form
+    email:
+        src: grav-plugin-email
+        path: user/plugins/email
+        scm: github
+    form:
+        src: grav-plugin-form
+        path: user/plugins/form
         scm: github
     taxonomylist:
         src: grav-plugin-taxonomylist
@@ -83,7 +91,7 @@ links:
     archives:
         src: grav-plugin-archives
         path: user/plugins/archives
-        scm: github 
+        scm: github
     twentyfifteen:
         src: grav-theme-twentyfifteen
         path: user/themes/twentyfifteen

CHANGELOG.md

@@ -1,8 +1,16 @@
-# v1.0.0
+# v1.0.3
+## 11/11/2015
+
+1. [](#bugfix)
+    * Blog item date fix
+    * Next/Prev fix
+    * SimpleForm replaced with Forms
+
+# v1.0.2
 ## 09/15/2015
 
 1. [](#new)
-    * ChangeLog started...
+    * Minor bugfixes
 
 # v1.0.1
 ## 09/15/2015
@@ -11,8 +19,8 @@
     * Bugfixes for Simple Form 1.3.0
     * Bugfixes for markdown extra
 
-# v1.0.2
+# v1.0.0
 ## 09/15/2015
 
 1. [](#new)
-    * Minor bugfixes
+    * ChangeLog started...

blueprints.yaml

@@ -1,5 +1,5 @@
 name: TwentyFifteen Site
-version: 1.0.2
+version: 1.0.3
 description: "Twenty Fifteen is a Grav adaptation of most popular 2015 Wordpress theme."
 icon: group
 author:

config/plugins/email.yaml

@@ -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'

config/system.yaml

@@ -8,6 +8,10 @@ pages:
     twig: false
   markdown:
     extra: true
+  dateformat:
+    default: 'd, Y'                          # The default date format Grav expects in the `date: ` field
+    short: 'Y-m-d'                    # Short date format
+    long: 'F jS \a\t g:ia'
 languages:
   supported:
     - en
@@ -22,7 +26,7 @@ languages:
   home_redirect:
     include_lang: true
     include_route: false
-  session_store_active: false    
+  session_store_active: false
 
 cache:
   enabled: false

pages/03.contact/form.md

@@ -0,0 +1,54 @@
+---
+title: Contact Form
+menu: Contact
+form:
+    name: my-nice-form
+    classes: comment-form
+    fields:
+        - name: name
+          label: Name
+          placeholder: Enter your name
+          autofocus: on
+          autocomplete: on
+          type: text
+          validate:
+            required: true
+
+        - name: email
+          label: Email
+          placeholder: Enter your email address
+          type: text
+          validate:
+            rule: email
+            required: true
+
+        - name: message
+          label: Message
+          size: long
+          placeholder: Enter your message
+          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
+---
+
+Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.

pages/03.contact/thankyou/formdata.md

@@ -0,0 +1,5 @@
+---
+title: Thank you !
+---
+
+Your email was sent. Thank you !