Skip to content

Commit

Permalink
Merge pull request #13 from hmrc/fset-1085
Browse files Browse the repository at this point in the history
FSET-1085 fixes for the guard and guardWithLabel widgets
  • Loading branch information
Henri Cook authored Jan 5, 2017
2 parents c8ac576 + ead0e86 commit 578eaae
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 1 addition & 5 deletions app/views/application/assistance.scala.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@(assistanceForm: Form[_root_.forms.AssistanceForm.Data])(implicit request: Request[_], flash: Flash, user: Option[CachedData], feedbackUrl: String)

@import helpers.CSRFieldConstructor._
@import views.html.widgets.{guard, guardWithLabel, inputCheckboxGroup, radioBox, select_guard}

@import views.html.widgets.{guard, guardWithLabel, inputCheckboxGroup, radioBox}

@main_template(title = "Additional information", pageForms = Seq(assistanceForm)) {

Expand Down Expand Up @@ -86,12 +85,9 @@ <h2 class="heading-large">Guaranteed interview scheme</h2>
</div>
</div>
}


}

<script>

function cleanCheckBoxGroupAndOther(checkBoxGroup,other){
$("#"+other).val("");

Expand Down
2 changes: 2 additions & 0 deletions app/views/widgets/guard.scala.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@(field: play.api.data.Field, label: String, labelHint: String, options: String*)(subForm: PartialFunction[String, Html])

@import helpers.CSRSkinnyFieldConstructor._

<fieldset>
<legend class="form-label" id="@field.id-question">@label</legend>
<p class="form-hint text">@labelHint</p>
Expand Down
2 changes: 2 additions & 0 deletions app/views/widgets/guardWithLabel.scala.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@(field: play.api.data.Field, label: String, labelHint: (String, String), options: String*)(subForm: PartialFunction[String, Html])

@import helpers.CSRSkinnyFieldConstructor._

<fieldset>
<legend class="form-label" id="@field.id-question">@label</legend>
<p class="form-hint text">@labelHint._1</p>
Expand Down

0 comments on commit 578eaae

Please sign in to comment.