Merge branch 'dev'

CHANGELOG.md

@@ -10,8 +10,27 @@ of this ChangeLog is autogenerated by the following command:
         --pretty=format:'* %cd %h %s' \
         $(git ls-remote -t .|tail -1|cut -f1)..
 
+### 3.0.2 (2018-11-07)
+
+* 2018-11-07 dcbb8a0 The form role is unnecessary for element form
+* 2018-11-07 354c408 Set `for` attribute for groups to the first field
+* 2018-11-07 adaeb1b Fix aria-controls in TabSet
+* 2018-11-07 2e070bf Tab panel role is "tabpanel"
+* 2018-10-25 c807ed4 Update tracker URLs
+* 2018-10-25 55c636c Update bootstrap URL
+
+### 3.0.1 (2018-10-12)
+
+* 2018-10-12 2dda1fc Update jquery to 3.3.1
+* 2018-10-12 ce79871 Update colorbox to 1.6.4
+* 2018-10-11 f0fec57 public webroot support
+* 2018-03-26 62f9270 Include map file from bootstrap 3.3.7
+
 ### 3.0.0 (2018-01-05)
 
+* 2018-01-05 4044e92 Bump release in CHANGELOG
+* 2018-01-05 fa853f0 Add standard .gitattributes
+* 2018-01-05 09c561e Update CHANGELOG
 * 2018-01-05 c930bf7 Fix requirements for SS4
 * 2018-01-05 df2f98b Add CHANGELOG
 * 2018-01-05 6f80908 Move usage section into user docs

README.md

@@ -2,7 +2,7 @@ SilverStrap
 ===========
 
 A [SilverStripe](http://www.silverstripe.org/) theme based on the
-[Bootstrap](http://twitter.github.io/bootstrap/) front-end framework. It should
+[Bootstrap](http://getbootstrap.com/) front-end framework. It should
 work out of the box on basic sites, i.e. by installing and enabling it you
 should already see how it looks a SilverStrap based website.
 

composer.json

@@ -20,8 +20,8 @@
         }
     ],
     "support": {
-        "issues": "http://dev.entidi.com/p/silverstrap/issues/",
-        "source": "http://dev.entidi.com/p/silverstrap/source/tree/master/"
+        "issues": "https://track.entidi.com/project/view/9/",
+        "source": "https://track.entidi.com/source/silverstrap/"
     },
     "require": {
         "entidi/silverstrap-module": "^2.0"

docs/en/support.md

@@ -6,6 +6,6 @@ This project has been developed by [ntd](mailto:ntd@entidi.it). Its
 SilverStripe modules and themes.
 
 To check out the code, report issues or propose enhancements, go to the
-[dedicated tracker](http://dev.entidi.com/p/silverstrap).
+[dedicated tracker](https://track.entidi.com/project/view/9/).
 Alternatively you can do the same things by leveraging the official
 [github repository](https://github.com/ntd/silverstrap).

templates/SilverStripe/Forms/FieldGroup_holder.ss

@@ -1,5 +1,5 @@
 <div class="$Silverstrap.group $HolderClasses<% if $Message %> has-error<% end_if %>"><% if $Title %>
-  <label class="$Silverstrap.label"<% if $ID %> for="$ID"<% end_if %>>$Title</label><% end_if %><% loop $FieldList %>
+  <label class="$Silverstrap.label"<% if $FieldList.First.ID %> for="$FieldList.First.ID.ATT"<% end_if %>>$Title</label><% end_if %><% loop $FieldList %>
   <%-- The following div should pertain to SmallFieldHolder but I cannot pass parameters
        to the underlying templates for applying the offset only to the first field --%>
   <div class="$Silverstrap.small_holder<% if not $Up.Title && $First %> $Silverstrap.no_label<% end_if %>">

templates/SilverStripe/Forms/Includes/Form.ss

@@ -1,5 +1,5 @@
 <% if $IncludeFormTag %>
-<form class="form-horizontal $extraClass.RAW" $getAttributesHTML('class').RAW role="form"><% end_if %><% if $Message %>
+<form class="form-horizontal $extraClass.RAW" $getAttributesHTML('class').RAW><% end_if %><% if $Message %>
   <div id="{$FormName}_error" class="alert alert-<% if $MessageType=='good' %>success<% else_if $MessageType=='bad' %>danger<% else %>warning<% end_if %>">
     <button type="button" class="close" data-dismiss="alert">&times;</button>
     $Message.XML

templates/SilverStripe/Forms/SelectionGroup.ss

@@ -5,7 +5,7 @@
   </li><% end_loop %>
 </ul>
 <div class="tab-content"><% loop $FieldSet %>
-  <div id="$Up.Name.ATT-$Pos" role="tab-panel" class="tab-pane fade<% if $Selected %> in active<% end_if %>"><% if $FieldList %>
+  <div id="$Up.Name.ATT-$Pos" role="tabpanel" class="tab-pane fade<% if $Selected %> in active<% end_if %>"><% if $FieldList %>
     $FieldHolder<% end_if %>
   </div><% end_loop %>
 </div>

templates/SilverStripe/Forms/TabSet.ss

@@ -1,9 +1,9 @@
 <ul $getAttributesHTML('class') class="nav nav-tabs $extraClass" role="tablist"><% loop $Tabs %>
-  <li role="presentation"<% if $First %> class="active"<% end_if %>><a href="#$Top.Name-$Pos" aria-controls="$Name" role="tab" data-toggle="tab">$Name.XML</a></li><% end_loop %>
+  <li role="presentation"<% if $First %> class="active"<% end_if %>><a href="#$Top.Name.ATT-$Pos" aria-controls="$Top.Name.ATT-$Pos" role="tab" data-toggle="tab">$Name.XML</a></li><% end_loop %>
 </ul>
 <div class="tab-content"><% loop $Tabs %><% if $Tabs %>
-  <b>ERROR</b> Nested tabs are <a href="http://getbootstrap.com/javascript/#tabs-examples">not supported</a> by BootStrap 3.<% else %>
-  <div role="tabpanel" class="tab-pane<% if $First %> active<% end_if %>" id="$Top.Name-$Pos"><% loop $Fields %>
+  <b>ERROR</b> Nested tabs are <a href="https://getbootstrap.com/docs/3.3/javascript/#tabs-examples">not supported</a> by BootStrap 3.<% else %>
+  <div role="tabpanel" class="tab-pane<% if $First %> active<% end_if %>" id="$Top.Name.ATT-$Pos"><% loop $Fields %>
     $FieldHolder<% end_loop %>
   </div><% end_if %><% end_loop %>
 </div>