Merge branch 'release/1.6.0'

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.6.0
+## 12/06/2016
+
+1. [](#bugfix)
+    * Only set fixed-nav class on body element when show_onpage_menu is true [#15](https://github.com/getgrav/grav-theme-bootstrap/pull/15)
+    * Translate label in custom form field templates
+    * Add custom styling for login forms
+
 # v1.5.0
 ## 07/14/2016
 
@@ -8,7 +16,7 @@
     * Fix setting the page language in the html tag
     * Replace the hardcoded "Grav" title with the actual site title
     * Include the correct javascript file that highlights the active section in the menu
-    
+
 # v1.4.1
 ## 09/16/2015
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Bootstrap
-version: 1.5.0
+version: 1.6.0
 description: "Bootstrap is built using the popular **Bootstrap** Framework"
 icon: bold
 author:

scss/theme.scss

@@ -18,3 +18,5 @@
 @import "theme/fixes";
 
 @import "theme/modular/all";
+
+@import "theme/login";

scss/theme/_login.scss

@@ -0,0 +1,40 @@
+#grav-login {
+	max-width: 50rem!important;
+
+	.col-sm-2 {
+		width: 50%;
+		text-align: right;
+    	padding-top: 5px;
+	}
+
+	.col-sm-10 {
+		width: 50%;
+	}
+
+	form {
+		padding-top: 30px
+	}
+
+	.rememberme {
+		float: right!important;
+	}
+
+	.form-actions {
+		button {
+			margin-top: 50px;
+		}
+
+		.button.secondary {
+			line-height: 26px;
+
+			i {
+				line-height: 26px;
+			}
+		}
+	}
+
+	.button {
+		vertical-align: bottom!important;
+	}
+}
+

templates/forms/fields/date/date.html.twig

@@ -3,9 +3,9 @@
 <div class="form-field">
     <label class="control-label col-sm-2">
             {% if field.help %}
-            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label }}</span>
+            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
             {% else %}
-            {{ field.label }}
+            {{ field.label|default(field.name|capitalize)|t }}
             {% endif %}
             {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
     </label>

templates/forms/fields/datetime/datetime.html.twig

@@ -3,9 +3,9 @@
 <div class="form-field">
     <label class="control-label col-sm-2">
             {% if field.help %}
-            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label }}</span>
+            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
             {% else %}
-            {{ field.label }}
+            {{ field.label|default(field.name|capitalize)|t }}
             {% endif %}
             {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
     </label>

templates/forms/fields/email/email.html.twig

@@ -0,0 +1,27 @@
+{% set value = (value is null ? field.default : value) %}
+
+<div class="form-field">
+
+        <label class="control-label col-sm-2">
+            {% if field.help %}
+            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
+            {% else %}
+            {{ field.label|default(field.name|capitalize)|t }}
+            {% endif %}
+            {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
+        </label>
+        <div class="col-sm-10">
+            <input  type="email"
+                    class="form-control"
+                    name="{{ (scope ~ field.name)|fieldName }}"
+                    value="{{ value|join(', ') }}"
+                    {% if field.placeholder %}placeholder="{{ field.placeholder }}"{% endif %}
+                    {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
+                    {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
+                    {% if field.autocomplete in ['on', 'off'] %}autocomplete="{{ field.autocomplete }}"{% endif %}
+                    {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
+                    {% if field.validate.pattern %}pattern="{{ field.validate.pattern }}"{% endif %}
+            />
+        </div>
+
+</div>

templates/forms/fields/password/password.html.twig

@@ -3,9 +3,9 @@
 <div class="form-field">
     <label class="control-label col-sm-2">
         {% if field.help %}
-            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label }}</span>
+            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
         {% else %}
-            {{ field.label }}
+            {{ field.label|default(field.name|capitalize)|t }}
             {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
         {% endif %}
     </label>

templates/forms/fields/radio/radio.html.twig

@@ -3,9 +3,9 @@
 <div class="form-field">
     <label class="control-label col-sm-2">
             {% if field.help %}
-            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label }}</span>
+            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
             {% else %}
-            {{ field.label }}
+            {{ field.label|default(field.name|capitalize)|t }}
             {% endif %}
             {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
     </label>

templates/forms/fields/select/select.html.twig

@@ -3,9 +3,9 @@
 <div class="form-field">
     <label class="control-label col-sm-2">
             {% if field.help %}
-            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label }}</span>
+            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
             {% else %}
-            {{ field.label }}
+            {{ field.label|default(field.name|capitalize)|t }}
             {% endif %}
             {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
     </label>

templates/forms/fields/text/text.html.twig

@@ -4,9 +4,9 @@
 
         <label class="control-label col-sm-2">
             {% if field.help %}
-            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label }}</span>
+            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
             {% else %}
-            {{ field.label }}
+            {{ field.label|default(field.name|capitalize)|t }}
             {% endif %}
             {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
         </label>

templates/forms/fields/textarea/textarea.html.twig

@@ -3,9 +3,9 @@
 <div class="form-field">
     <label class="control-label col-sm-2">
             {% if field.help %}
-            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label }}</span>
+            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
             {% else %}
-            {{ field.label }}
+            {{ field.label|default(field.name|capitalize)|t }}
             {% endif %}
             {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
     </label>

templates/forms/fields/upload/upload.html.twig

@@ -3,9 +3,9 @@
 <div class="form-field">
     <label class="control-label col-sm-2">
             {% if field.help %}
-                <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label }}</span>
+                <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
             {% else %}
-                {{ field.label }}
+                {{ field.label|default(field.name|capitalize)|t }}
             {% endif %}
             {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
     </label>

templates/modular.html.twig

@@ -25,7 +25,7 @@
     {% endif %}
 {% endblock %}
 
-{% block body_classes %}{{ parent() }} fixed-nav{% endblock %}
+{% block body_classes %}{{ parent() }} {% if show_onpage_menu %}fixed-nav{% endif %} {% endblock %}
 
 {% block header_navigation %}
     {% if show_onpage_menu %}