Merge branch 'release/1.2.0'

CHANGELOG.md

@@ -1,9 +1,18 @@
+# v1.2.0
+## 09/09/2016
+
+1. [](#improved)
+    * Added french
+    * Fix Comments submit-button value [#4](https://github.com/getgrav/grav-theme-gateway/pull/4)
+    * Soften truncate so words or links wont be cut off [#5](https://github.com/getgrav/grav-theme-gateway/pull/5)
+    * Remove unneeded form overrides and just override the form twig blocks that changed
+
 # v1.1.0
 ## 07/14/2016
 
 1. [](#bugfix)
     * Fix setting the page language in the html tag
-    
+
 # v1.0.0
 ## 02/10/2016
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Gateway
-version: 1.1.0
+version: 1.2.0
 description: "Gateway incorporates elegant style with user friendly options making it perfectly suited for a variety of Grav users."
 icon: empire
 author:

languages.yaml

@@ -1,2 +1,5 @@
 en:
-  TRANSLATION_TEST: Gateway!
+  TRANSLATION_TEST: Gateway!
+
+fr:
+  TRANSLATION_TEST: Gateway!

templates/forms/form.html.twig

@@ -1,21 +1,8 @@
-<div class="alert">{{ form.message }}</div>
-
-<form name="{{ form.name }}"
-      action="{{ uri.rootUrl ~ (form.action|default(page.route)) }}"
-      method="{{ form.method|upper|default('POST') }}" class="contact-form commentsblock">
-{% for field in form.fields %}
-    {% set value = form.value(field.name) %}
-    <div>
-        {% include "forms/fields/#{field.type}/#{field.type}.html.twig" %}
-    </div>
-{% endfor %}
-
-	<div class="buttons">
-	{% for button in form.buttons %}
-	    <button class="pushbutton-wide" type="{{ button.type|default('submit') }}">{{ button.value|default('Submit') }}</button>
-	{% endfor %}
-	</div>
-
-	{{ nonce_field('form', 'form-nonce') }}
-
-</form>
+{% extends 'forms/default/form.html.twig' %}
+{% block form_classes %}
+  class="{{ form.classes }} contact-form commentsblock"
+{% endblock %}
+
+{% block button_classes %}
+  class="{{ button.classes|default('button') }} pushbutton-wide"
+{% endblock %}

templates/partials/blog_item.html.twig

@@ -41,7 +41,7 @@
     {% set show_prev_next = true %}
     {% endif %}
     {% elseif truncate and readmore is sameas(false) %}
-    {{ page.content|truncate(200) }}
+    {{ page.content|truncate(200, true) }}
     {% elseif truncate and page.summary != page.content %}
     <p>
       {{ page.summary|striptags }}

templates/partials/comments.html.twig

@@ -38,7 +38,7 @@
 
   <div class="buttons">
     {% for button in grav.config.plugins.comments.form.buttons %}
-    <button class="btn" type="{{ button.type|default('submit') }}">{{ button.value|default('Submit') }}</button>
+    <button class="btn" type="{{ button.type|default('submit') }}">{{ button.value|t|default('Submit') }}</button>
     {% endfor %}
   </div>