This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-9.x by this push:
new 45b91d444f [WICKET-7068] Tree styles are updated to be RTL-friendly
(#600)
45b91d444f is described below
commit 45b91d444fe0df5986983a28f048cd749c0c4d1f
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Aug 23 22:45:58 2023 +0700
[WICKET-7068] Tree styles are updated to be RTL-friendly (#600)
---
.../repeater/tree/theme/human/folder-rtl-other.gif | Bin 0 -> 1046 bytes
.../html/repeater/tree/theme/human/folder-rtl.gif | Bin 0 -> 577 bytes
.../html/repeater/tree/theme/human/theme.css | 58 ++++++++++++++++++++-
.../html/repeater/tree/theme/human/tree-rtl.gif | Bin 0 -> 190 bytes
.../tree/theme/windows/folder-rtl-closed.gif | Bin 0 -> 369 bytes
.../tree/theme/windows/folder-rtl-open.gif | Bin 0 -> 376 bytes
.../tree/theme/windows/folder-rtl-other.gif | Bin 0 -> 573 bytes
.../html/repeater/tree/theme/windows/theme.css | 56 +++++++++++++++++++-
.../html/repeater/tree/theme/windows/tree-rtl.gif | Bin 0 -> 3729 bytes
9 files changed, 112 insertions(+), 2 deletions(-)
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/folder-rtl-other.gif
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/folder-rtl-other.gif
new file mode 100644
index 0000000000..99f3c29a2c
Binary files /dev/null and
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/folder-rtl-other.gif
differ
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/folder-rtl.gif
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/folder-rtl.gif
new file mode 100644
index 0000000000..181b7693c4
Binary files /dev/null and
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/folder-rtl.gif
differ
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/theme.css
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/theme.css
index 7ca0a9ecd0..d56aaeae66 100644
---
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/theme.css
+++
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/theme.css
@@ -20,6 +20,10 @@
padding: 0px;
}
+html[dir="rtl"] .tree-theme-human div.tree-subtree {
+ margin: 0px 18px 0px 0px;
+}
+
.tree-theme-human div.tree-branch {
margin: 0px;
padding: 0px;
@@ -39,6 +43,10 @@
width: 18px;
}
+html[dir="rtl"] .tree-theme-human .tree-junction {
+ float: right;
+}
+
.tree-theme-human .tree-junction-expanded {
display: block;
float: left;
@@ -49,10 +57,20 @@
text-decoration: none;
}
+html[dir="rtl"] .tree-theme-human .tree-junction-expanded {
+ float: right;
+ background-image: url(tree-rtl.gif);
+ background-position-x: -36px;
+}
+
.tree-theme-human .tree-junction-expanded:hover {
background-position: -54px center;
}
+html[dir="rtl"] .tree-theme-human .tree-junction-expanded:hover {
+ background-position-x: 0px;
+}
+
.tree-theme-human .tree-junction-collapsed {
display: block;
float: left;
@@ -63,15 +81,29 @@
text-decoration: none;
}
+html[dir="rtl"] .tree-theme-human .tree-junction-collapsed {
+ float: right;
+ background-image: url(tree-rtl.gif);
+ background-position-x: -54px;
+}
+
.tree-theme-human .tree-junction-collapsed:hover {
background-position: -36px center;
}
+html[dir="rtl"] .tree-theme-human .tree-junction-collapsed:hover {
+ background-position: -18px center;
+}
+
.tree-theme-human span.tree-content {
display: block;
margin-left: 18px;
}
+html[dir="rtl"] .tree-theme-human span.tree-content {
+ margin-right: 18px;
+}
+
/* tabletree */
.tree-theme-human table {
@@ -105,22 +137,46 @@
}
.tree-theme-human .tree-folder-closed {
+ display: inline-block;
padding-left: 18px;
background-image: url(folder.gif);
background-position: 0px 50%;
background-repeat: no-repeat;
}
+html[dir="rtl"] .tree-theme-human .tree-folder-closed {
+ background-image: url(folder-rtl.gif);
+ background-position-x: right;
+ padding-right: 18px;
+ padding-left: initial;
+}
+
.tree-theme-human .tree-folder-open {
+ display: inline-block;
padding-left: 18px;
background-image: url(folder.gif);
background-position: 0px 50%;
background-repeat: no-repeat;
}
+html[dir="rtl"] .tree-theme-human .tree-folder-open {
+ background-image: url(folder-rtl.gif);
+ background-position-x: right;
+ padding-right: 18px;
+ padding-left: initial;
+}
+
.tree-theme-human .tree-folder-other {
+ display: inline-block;
padding-left: 18px;
background-image: url(folder-other.gif);
background-position: 0px 50%;
background-repeat: no-repeat;
-}
\ No newline at end of file
+}
+
+html[dir="rtl"] .tree-theme-human .tree-folder-other {
+ background-image: url(folder-rtl-other.gif);
+ background-position-x: right;
+ padding-right: 18px;
+ padding-left: initial;
+}
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/tree-rtl.gif
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/tree-rtl.gif
new file mode 100644
index 0000000000..085edf3ed3
Binary files /dev/null and
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/human/tree-rtl.gif
differ
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/folder-rtl-closed.gif
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/folder-rtl-closed.gif
new file mode 100644
index 0000000000..b812bae8fb
Binary files /dev/null and
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/folder-rtl-closed.gif
differ
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/folder-rtl-open.gif
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/folder-rtl-open.gif
new file mode 100644
index 0000000000..16ad5a79c1
Binary files /dev/null and
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/folder-rtl-open.gif
differ
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/folder-rtl-other.gif
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/folder-rtl-other.gif
new file mode 100644
index 0000000000..1e3039740e
Binary files /dev/null and
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/folder-rtl-other.gif
differ
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/theme.css
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/theme.css
index 9e68b9a699..fa4b9014d9 100644
---
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/theme.css
+++
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/theme.css
@@ -20,6 +20,11 @@
padding: 0px;
}
+html[dir="rtl"] .tree-theme-windows div.tree-subtree {
+ margin: 0px 18px 0px 0px;
+ padding: 0px;
+}
+
.tree-theme-windows div.tree-branch {
margin: 0px;
padding: 0px;
@@ -31,6 +36,11 @@
background-repeat: repeat-y;
}
+html[dir="rtl"] .tree-theme-windows div.tree-branch-mid {
+ background-image: url(tree-rtl.gif);
+ background-position-x: calc(100%/* to skip */ +/* minimizer */ 54px);
+}
+
.tree-theme-windows div.tree-branch-last {
}
@@ -45,6 +55,12 @@
background-repeat: no-repeat;
}
+html[dir="rtl"] .tree-theme-windows .tree-junction {
+ float: right;
+ background-image: url(tree-rtl.gif);
+ background-position-x: -18px;
+}
+
.tree-theme-windows .tree-junction-expanded {
display: block;
float: left;
@@ -55,6 +71,12 @@
text-decoration: none;
}
+html[dir="rtl"] .tree-theme-windows .tree-junction-expanded {
+ float: right;
+ background-image: url(tree-rtl.gif);
+ background-position-x: -36px;
+}
+
.tree-theme-windows .tree-junction-collapsed {
display: block;
float: left;
@@ -65,11 +87,22 @@
text-decoration: none;
}
+html[dir="rtl"] .tree-theme-windows .tree-junction-collapsed {
+ float: right;
+ background-image: url(tree-rtl.gif);
+ background-position-x: -54px;
+}
+
.tree-theme-windows span.tree-content {
display: block;
margin-left: 18px;
}
+html[dir="rtl"] .tree-theme-windows span.tree-content {
+ margin-right: 18px;
+ margin-left: initial;
+}
+
/* tabletree */
.tree-theme-windows table {
@@ -111,6 +144,13 @@
background-repeat: no-repeat;
}
+html[dir="rtl"] .tree-theme-windows .tree-folder-closed {
+ padding-right: 18px;
+ padding-left: initial;
+ background-image: url(folder-rtl-closed.gif);
+ background-position-x: right;
+}
+
.tree-theme-windows .tree-folder-open {
padding-left: 18px;
background-image: url(folder-open.gif);
@@ -118,9 +158,23 @@
background-repeat: no-repeat;
}
+html[dir="rtl"] .tree-theme-windows .tree-folder-open {
+ padding-right: 18px;
+ padding-left: initial;
+ background-image: url(folder-rtl-open.gif);
+ background-position-x: right;
+}
+
.tree-theme-windows .tree-folder-other {
padding-left: 18px;
background-image: url(folder-other.gif);
background-position: 0px 50%;
background-repeat: no-repeat;
-}
\ No newline at end of file
+}
+
+html[dir="rtl"] .tree-theme-windows .tree-folder-other {
+ padding-right: 18px;
+ padding-left: initial;
+ background-image: url(folder-rtl-other.gif);
+ background-position-x: right;
+}
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/tree-rtl.gif
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/tree-rtl.gif
new file mode 100644
index 0000000000..91ad7cdfe5
Binary files /dev/null and
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/tree-rtl.gif
differ
