Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WICKET-7068] Tree rtl styling #602

Merged
merged 1 commit into from
Aug 24, 2023
Merged

[WICKET-7068] Tree rtl styling #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-toolchains-plugin.version>3.1.0</maven-toolchains-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
<yuicompressor-maven-plugin.version>1.5.1</yuicompressor-maven-plugin.version>
<resources-optimizer-maven-plugin.version>2.4.1</resources-optimizer-maven-plugin.version>

<osgi.dynamicimport.package />
<osgi.export.package>*</osgi.export.package>
Expand Down Expand Up @@ -876,24 +876,6 @@
]]></signatures>
</configuration>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<version>${yuicompressor-maven-plugin.version}</version>
<configuration>
<statistics>true</statistics>
<jswarn>false</jswarn>
<suffix>.min</suffix>
<outputDirectory>${project.build.directory}/generated-res</outputDirectory>
</configuration>
<executions>
<execution>
<goals>
<goal>compress</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -1205,11 +1187,11 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<groupId>org.primefaces.extensions</groupId>
<artifactId>resources-optimizer-maven-plugin</artifactId>
<versionRange>[1.3.0,)</versionRange>
<goals>
<goal>compress</goal>
<goal>optimize</goal>
</goals>
</pluginExecutionFilter>
<action>
Expand Down Expand Up @@ -1273,6 +1255,30 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.primefaces.extensions</groupId>
<artifactId>resources-optimizer-maven-plugin</artifactId>
<version>${resources-optimizer-maven-plugin.version}</version>
<configuration>
<suffix>.min</suffix>
<inputDir>${project.build.directory}/classes</inputDir>
<useDataUri>false</useDataUri>
<resourcesSets>
<resourcesSet>
<excludes>
<exclude>**/jquery*.js</exclude>
</excludes>
</resourcesSet>
</resourcesSets>
</configuration>
<executions>
<execution>
<goals>
<goal>optimize</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
29 changes: 8 additions & 21 deletions wicket-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
<name>Wicket Core</name>
<description>
Wicket is a Java web application framework that takes simplicity,
separation of concerns and ease of development to a whole new level.
Wicket pages can be mocked up, previewed and later revised using
standard WYSIWYG HTML design tools. Dynamic content processing and
form handling is all handled in Java code using a first-class
component model backed by POJO data beans that can easily be
separation of concerns and ease of development to a whole new level.
Wicket pages can be mocked up, previewed and later revised using
standard WYSIWYG HTML design tools. Dynamic content processing and
form handling is all handled in Java code using a first-class
component model backed by POJO data beans that can easily be
persisted using your favorite technology.
</description>
<properties>
Expand Down Expand Up @@ -142,7 +142,7 @@ org.apache.wicket.util.template;-noimport:=true,
org.apache.wicket.util.tester;-noimport:=true,
org.apache.wicket.validation;-noimport:=true,
org.apache.wicket.validation.validator;-noimport:=true
</osgi.export.package>
</osgi.export.package>
<osgi.import.package>!java*,!kotlin*,!sun.nio.ch,!com.sun.crypto.provider,org.slf4j*;version="[1.7,3)",javax.servlet,javax.servlet.http,*</osgi.import.package>
</properties>
<dependencies>
Expand Down Expand Up @@ -196,23 +196,10 @@ org.apache.wicket.validation.validator;-noimport:=true
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/jquery*.js</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<groupId>org.primefaces.extensions</groupId>
<artifactId>resources-optimizer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Expand Down
4 changes: 2 additions & 2 deletions wicket-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
<build>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<groupId>org.primefaces.extensions</groupId>
<artifactId>resources-optimizer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/windows/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ html[dir="rtl"] .tree-theme-windows div.tree-subtree {

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);
background-position-x: calc(100% + 54px);
}

.tree-theme-windows div.tree-branch-last {
Expand Down