aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/pl/treksoft/kvision/html
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/kotlin/pl/treksoft/kvision/html')
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/Button.kt35
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/Icon.kt8
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/Image.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/Label.kt51
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/Link.kt33
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/List.kt5
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/Tag.kt6
7 files changed, 35 insertions, 109 deletions
diff --git a/src/main/kotlin/pl/treksoft/kvision/html/Button.kt b/src/main/kotlin/pl/treksoft/kvision/html/Button.kt
index 0b6b43e5..aaa0f735 100644
--- a/src/main/kotlin/pl/treksoft/kvision/html/Button.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/html/Button.kt
@@ -33,13 +33,23 @@ import pl.treksoft.kvision.core.Widget
* Button styles.
*/
enum class ButtonStyle(val className: String) {
- DEFAULT("btn-default"),
PRIMARY("btn-primary"),
+ SECONDARY("btn-secondary"),
SUCCESS("btn-success"),
- INFO("btn-info"),
- WARNING("btn-warning"),
DANGER("btn-danger"),
- LINK("btn-link")
+ WARNING("btn-warning"),
+ INFO("btn-info"),
+ LIGHT("btn-light"),
+ DARK("btn-dark"),
+ LINK("btn-link"),
+ OUTLINEPRIMARY("btn-outline-primary"),
+ OUTLINESECONDARY("btn-outline-secondary"),
+ OUTLINESUCCESS("btn-outline-success"),
+ OUTLINEDANGER("btn-outline-danger"),
+ OUTLINEWARNING("btn-outline-warning"),
+ OUTLINEINFO("btn-outline-info"),
+ OUTLINELIGHT("btn-outline-light"),
+ OUTLINEDARK("btn-outline-dark")
}
/**
@@ -47,8 +57,7 @@ enum class ButtonStyle(val className: String) {
*/
enum class ButtonSize(internal val className: String) {
LARGE("btn-lg"),
- SMALL("btn-sm"),
- XSMALL("btn-xs")
+ SMALL("btn-sm")
}
/**
@@ -71,7 +80,7 @@ enum class ButtonType(internal val buttonType: String) {
* @param classes a set of CSS class names
*/
open class Button(
- text: String, icon: String? = null, style: ButtonStyle = ButtonStyle.DEFAULT, type: ButtonType = ButtonType.BUTTON,
+ text: String, icon: String? = null, style: ButtonStyle = ButtonStyle.PRIMARY, type: ButtonType = ButtonType.BUTTON,
disabled: Boolean = false, classes: Set<String> = setOf()
) : Widget(classes) {
@@ -123,14 +132,16 @@ open class Button(
if (block) {
cl.add("btn-block" to true)
}
- if (disabled) {
- cl.add("disabled" to true)
- }
return cl
}
override fun getSnAttrs(): List<StringPair> {
- return super.getSnAttrs() + ("type" to type.buttonType)
+ val snattrs = super.getSnAttrs().toMutableList()
+ snattrs.add("type" to type.buttonType)
+ if (disabled) {
+ snattrs.add("disabled" to "disabled")
+ }
+ return snattrs
}
/**
@@ -154,7 +165,7 @@ open class Button(
fun Container.button(
text: String,
icon: String? = null,
- style: ButtonStyle = ButtonStyle.DEFAULT,
+ style: ButtonStyle = ButtonStyle.PRIMARY,
type: ButtonType = ButtonType.BUTTON,
disabled: Boolean = false,
classes: Set<String> = setOf(),
diff --git a/src/main/kotlin/pl/treksoft/kvision/html/Icon.kt b/src/main/kotlin/pl/treksoft/kvision/html/Icon.kt
index 7e10c10f..a9fb03db 100644
--- a/src/main/kotlin/pl/treksoft/kvision/html/Icon.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/html/Icon.kt
@@ -39,13 +39,7 @@ open class Icon(icon: String) : Tag(TAG.SPAN) {
override fun getSnClass(): List<StringBoolPair> {
val cl = super.getSnClass().toMutableList()
- if (icon.startsWith("fa-")) {
- cl.add("fa" to true)
- cl.add(icon to true)
- } else {
- cl.add("glyphicon" to true)
- cl.add("glyphicon-$icon" to true)
- }
+ icon.split(" ").forEach { cl.add(it to true) }
return cl
}
diff --git a/src/main/kotlin/pl/treksoft/kvision/html/Image.kt b/src/main/kotlin/pl/treksoft/kvision/html/Image.kt
index 4d373270..81873088 100644
--- a/src/main/kotlin/pl/treksoft/kvision/html/Image.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/html/Image.kt
@@ -32,8 +32,8 @@ import pl.treksoft.kvision.core.Widget
* Image shapes.
*/
enum class ImageShape(internal val className: String) {
- ROUNDED("img-rounded"),
- CIRCLE("img-circle"),
+ ROUNDED("rounded"),
+ CIRCLE("rounded-circle"),
THUMBNAIL("img-thumbnail")
}
@@ -89,7 +89,7 @@ open class Image(
override fun getSnClass(): List<StringBoolPair> {
val cl = super.getSnClass().toMutableList()
if (responsive) {
- cl.add("img-responsive" to true)
+ cl.add("img-fluid" to true)
}
if (centered) {
cl.add("center-block" to true)
diff --git a/src/main/kotlin/pl/treksoft/kvision/html/Label.kt b/src/main/kotlin/pl/treksoft/kvision/html/Label.kt
deleted file mode 100644
index 827c90fd..00000000
--- a/src/main/kotlin/pl/treksoft/kvision/html/Label.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2017-present Robert Jaros
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package pl.treksoft.kvision.html
-
-import pl.treksoft.kvision.core.Container
-
-/**
- * Simple label component rendered as *span*.
- *
- * @constructor
- * @param content label text
- * @param rich determines if [content] can contain HTML code
- */
-@Deprecated("Use Span class instead.")
-open class Label(content: String? = null, rich: Boolean = false) : Span(content, rich) {
- companion object {
- /**
- * DSL builder extension function.
- *
- * It takes the same parameters as the constructor of the built component.
- */
- @Deprecated("User Span.Companion.span function instead.")
- @Suppress("DEPRECATION")
- fun Container.label(
- content: String? = null, rich: Boolean = false, init: (Label.() -> Unit)? = null
- ): Label {
- val label = Label(content, rich).apply { init?.invoke(this) }
- this.add(label)
- return label
- }
- }
-}
diff --git a/src/main/kotlin/pl/treksoft/kvision/html/Link.kt b/src/main/kotlin/pl/treksoft/kvision/html/Link.kt
index 5fc613e2..63104248 100644
--- a/src/main/kotlin/pl/treksoft/kvision/html/Link.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/html/Link.kt
@@ -26,7 +26,6 @@ import org.w3c.dom.events.MouseEvent
import pl.treksoft.kvision.core.Container
import pl.treksoft.kvision.core.ResString
import pl.treksoft.kvision.core.StringPair
-import pl.treksoft.kvision.dropdown.DropDown
import pl.treksoft.kvision.panel.SimplePanel
/**
@@ -99,37 +98,5 @@ open class Link(
this.add(link)
return link
}
-
- /**
- * DSL builder extension function for a disabled link in a dropdown list.
- *
- * It takes the same parameters as the constructor of the built component.
- */
- fun ListTag.linkDisabled(
- label: String, icon: String? = null, image: ResString? = null,
- classes: Set<String> = setOf(), init: (Link.() -> Unit)? = null
- ): Link {
- val link = Link(label, null, icon, image, classes).apply { init?.invoke(this) }
- val tag = Tag(TAG.LI, classes = setOf("disabled"))
- tag.add(link)
- this.add(tag)
- return link
- }
-
- /**
- * DSL builder extension function for a disabled link in a dropdown list.
- *
- * It takes the same parameters as the constructor of the built component.
- */
- fun DropDown.linkDisabled(
- label: String, icon: String? = null, image: ResString? = null,
- classes: Set<String> = setOf(), init: (Link.() -> Unit)? = null
- ): Link {
- val link = Link(label, "javascript:void(0)", icon, image, classes).apply { init?.invoke(this) }
- val tag = Tag(TAG.LI, classes = setOf("disabled"))
- tag.add(link)
- this.add(tag)
- return link
- }
}
}
diff --git a/src/main/kotlin/pl/treksoft/kvision/html/List.kt b/src/main/kotlin/pl/treksoft/kvision/html/List.kt
index 5fb489da..cf3f8be6 100644
--- a/src/main/kotlin/pl/treksoft/kvision/html/List.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/html/List.kt
@@ -27,7 +27,6 @@ import pl.treksoft.kvision.KVManager
import pl.treksoft.kvision.core.Component
import pl.treksoft.kvision.core.Container
import pl.treksoft.kvision.core.StringBoolPair
-import pl.treksoft.kvision.dropdown.DropDown
import pl.treksoft.kvision.panel.SimplePanel
/**
@@ -98,14 +97,14 @@ open class ListTag(
val childrenElements = children.filter { it.visible }
val res = when (type) {
ListType.UL, ListType.OL, ListType.UNSTYLED, ListType.INLINE -> childrenElements.map { v ->
- if (v is Tag && v.type == TAG.LI || v is DropDown && v.forNavbar) {
+ if (v is Tag && v.type == TAG.LI /*|| v is DropDown && v.forNavbar*/) {
v.renderVNode()
} else {
h("li", arrayOf(v.renderVNode()))
}
}
ListType.DL, ListType.DL_HORIZ -> childrenElements.mapIndexed { index, v ->
- if (v is Tag && v.type == TAG.LI || v is DropDown && v.forNavbar) {
+ if (v is Tag && v.type == TAG.LI /*|| v is DropDown && v.forNavbar*/) {
v.renderVNode()
} else {
h(if (index % 2 == 0) "dt" else "dd", arrayOf(v.renderVNode()))
diff --git a/src/main/kotlin/pl/treksoft/kvision/html/Tag.kt b/src/main/kotlin/pl/treksoft/kvision/html/Tag.kt
index 512ca8b8..a5e855ae 100644
--- a/src/main/kotlin/pl/treksoft/kvision/html/Tag.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/html/Tag.kt
@@ -73,6 +73,12 @@ enum class TAG(internal val tagName: String) {
BR("br"),
CAPTION("caption"),
+ FIGURE("figure"),
+ FIGCAPTION("figcaption"),
+ PICTURE("figcaption"),
+ SOURCE("figcaption"),
+
+ TABLE("table"),
THEAD("thead"),
TH("th"),
TBODY("tbody"),
generated by cgit (git 2.46.0) at 2024-12-21 01:50:29 +0000