Skip to content

Commit dafae07

Browse files
adrianhurtMax van der Stam
adrianhurt
authored and
Max van der Stam
committed
release 1.5
1 parent a65fc9a commit dafae07

22 files changed

Lines changed: 48 additions & 84 deletions

‎core-play26/build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := """play-bootstrap-core"""
22

3-
version := "1.5-P26-RC-SNAPSHOT"
3+
version := "1.5-P26"
44

55
scalaVersion := "2.12.8"
66

‎core-play27/build.sbt‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import scalariform.formatter.preferences._
22

33
name := """play-bootstrap-core"""
44

5-
version := "1.5-P27-RC-SNAPSHOT"
5+
version := "1.5-P27"
66

77
scalaVersion := "2.13.0"
88

@@ -55,20 +55,6 @@ publishArtifact in Test := false
5555

5656
pomIncludeRepository := { _ => false }
5757

58-
pomExtra := (
59-
<scm>
60-
<url>git@github.com:adrianhurt/play-bootstrap.git</url>
61-
<connection>scm:git:git@github.com:adrianhurt/play-bootstrap.git</connection>
62-
</scm>
63-
<developers>
64-
<developer>
65-
<id>adrianhurt</id>
66-
<name>Adrian Hurtado</name>
67-
<url>https://github.com/adrianhurt</url>
68-
</developer>
69-
</developers>
70-
)
71-
7258
credentials += Credentials(Path.userHome / ".sbt" / "sonatype.credentials")
7359

7460
publishConfiguration := publishConfiguration.value.withOverwrite(isSnapshot.value)

‎play26-bootstrap3/module/app/views/b3/radioWithOptions.scala.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@(field: Field, options: Seq[(String, Any)], args: (Symbol, Any)*)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)
22
@radioWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> options.headOption.map(_._1)):_*) { implicit extraInfo =>
33
@options.map { v =>
4-
@radioOption(v._1, bs.Args.msg(v._2)(messages))
4+
@radioOption(v._1, v._2)
55
}
6-
}(fc, messages)
6+
}(fc, messages)

‎play26-bootstrap3/module/app/views/b3/selectWithContent.scala.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
@readonlyWrapper(selectName, fieldInfo.value, disabled, argsMap) {
2525
<select id="@fieldInfo.id" name="@selectName" @toHtmlArgs(fieldInfo.innerArgsMap)>
2626
@argsMap.get('_default).map { v =>
27-
@selectOption("", bs.Args.msg(v)(messages), 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
27+
@selectOption("", v, 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
2828
}
2929
@content(values)
3030
</select>
3131
}
3232
}
3333
}
3434
}(fc, messages)
35-
}
35+
}

‎play26-bootstrap3/module/app/views/b3/selectWithOptions.scala.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@(field: Field, options: Seq[(String,String)], args: (Symbol,Any)*)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)
2-
@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).map(bs.Args.msg(_)(messages)).orElse(options.headOption.map(_._1))):_*) { implicit values =>
2+
@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).orElse(options.headOption.map(_._1))):_*) { implicit values =>
33
@options.map { v =>
4-
@selectOption(v._1, bs.Args.msg(v._2)(messages))
4+
@selectOption(v._1, v._2)
55
}
6-
}(fc, messages)
6+
}(fc, messages)

‎play26-bootstrap3/module/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := """play-bootstrap"""
22

3-
version := "1.5-P26-B3-RC-SNAPSHOT"
3+
version := "1.5-P26-B3"
44

55
scalaVersion := "2.12.8"
66

@@ -13,7 +13,7 @@ resolvers ++= Seq(
1313

1414
libraryDependencies ++= Seq(
1515
filters % "provided",
16-
"com.adrianhurt" %% "play-bootstrap-core" % "1.5-P26-RC-SNAPSHOT",
16+
"com.adrianhurt" %% "play-bootstrap-core" % "1.5-P26",
1717
specs2 % Test
1818
)
1919

‎play26-bootstrap3/sample/build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repos
1212
libraryDependencies ++= Seq(
1313
guice,
1414
filters,
15-
"com.adrianhurt" %% "play-bootstrap" % "1.5-P26-B3-RC-SNAPSHOT",
15+
"com.adrianhurt" %% "play-bootstrap" % "1.5-P26-B3",
1616
"org.webjars" % "bootstrap" % "3.4.1" exclude("org.webjars", "jquery"),
1717
"org.webjars" % "jquery" % "3.3.1-2",
1818
"org.webjars" % "font-awesome" % "4.7.0",

‎play26-bootstrap4/module/app/views/b4/radioWithOptions.scala.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@(field: Field, options: Seq[(String, Any)], args: (Symbol, Any)*)(implicit fc: b4.B4FieldConstructor, msgsProv: MessagesProvider)
22
@radioWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> options.headOption.map(_._1)):_*) { implicit extraInfo =>
33
@options.map { v =>
4-
@radioOption(v._1, bs.Args.msg(v._2)(msgsProv))
4+
@radioOption(v._1, v._2)
55
}
6-
}(fc, msgsProv)
6+
}(fc, msgsProv)

‎play26-bootstrap4/module/app/views/b4/selectWithContent.scala.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
@readonlyWrapper(selectName, fieldInfo.value, disabled, argsMap) {
2525
<select id="@fieldInfo.id" name="@selectName" @toHtmlArgs(bs.ArgsMap.withAddingStringValue(fieldInfo.innerArgsMap, 'class, if (fieldInfo.isCustom) "custom-select" else "form-control"))>
2626
@argsMap.get('_default).map { v =>
27-
@selectOption("", bs.Args.msg(v)(msgsProv), 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
27+
@selectOption("", v, 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
2828
}
2929
@content(values)
3030
</select>
3131
}
3232
}
3333
}
3434
}(fc, msgsProv)
35-
}
35+
}

‎play26-bootstrap4/module/app/views/b4/selectWithOptions.scala.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@(field: Field, options: Seq[(String,String)], args: (Symbol,Any)*)(implicit fc: b4.B4FieldConstructor, msgsProv: MessagesProvider)
2-
@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).map(bs.Args.msg(_)(msgsProv)).orElse(options.headOption.map(_._1))):_*) { implicit values =>
2+
@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).orElse(options.headOption.map(_._1))):_*) { implicit values =>
33
@options.map { v =>
4-
@selectOption(v._1, bs.Args.msg(v._2)(msgsProv))
4+
@selectOption(v._1, v._2)
55
}
6-
}(fc, msgsProv)
6+
}(fc, msgsProv)

0 commit comments

Comments
 (0)