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

Jump to bottom

Feature/fix typos #38

Merged
merged 3 commits into from
Oct 7, 2024
Merged

Feature/fix typos #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ffef60
Fix some typos
Sep 18, 2024
4d0b21b
Fix some typos
Sep 18, 2024
7833428
Merge remote-tracking branch 'origin/feature/fix-typos' into feature/…
cuioss Oct 7, 2024
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
2 changes: 1 addition & 1 deletion ...tal-ui-bootstrap-page-templates/src/main/resources/META-INF/templates/portal/master.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
name="messages" &gt;</li>
<li>Footer: The footer is implemented as an include: &lt;ui:include
src="/templates/layout_footer.xhtml" /&gt; it can be overwritten by
configuring the MultitemplateMapper accordingly
configuring the MultiTemplatingMapper accordingly
</li>
</ul>
</body>
Expand Down
2 changes: 1 addition & 1 deletion ...otstrap-page-templates/src/main/resources/META-INF/templates/portal/master_centered.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
name="messages" &gt;</li>
<li>Footer: The footer is implemented as an include: &lt;ui:include
src="/templates/layout_footer.xhtml" /&gt; it can be overwritten by
configuring the MultitemplateMapper accordingly
configuring the MultiTemplatingMapper accordingly.
</li>
</ul>
</body>
Expand Down
2 changes: 1 addition & 1 deletion ...ortal-ui-bootstrap-page-templates/src/main/resources/META-INF/templates/portal/root.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
name="messages" &gt;</li>
<li>Footer: The footer is implemented as an include: &lt;ui:include
src="/templates/layout_footer.xhtml" /&gt; it can be overwritten by
configuring the MultitemplateMapper accordingly
configuring the MultiTemplatingMapper accordingly
</li>
</ul>
</body>
Expand Down
4 changes: 2 additions & 2 deletions modules/portal-ui-runtime/src/test/resources/META-INF/templates/portal/master.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
name="messages" &gt;</li>
<li>Footer: The footer is implemented as an include: &lt;ui:include
src="/templates/layout_footer.xhtml" /&gt; it can be overwritten by
configuring the MultitemplateMapper accordingly
configuring the MultiTemplatingMapper accordingly
</li>
</ul>
</body>
Expand All @@ -74,7 +74,7 @@

<h:panelGroup id="#{GlobalIds.MAIN_CONTENT.id}" layout="block"
styleClass="container-fluid">
<!-- Display sticky messages. The extension point is a &lt;ui:insert name="stickyMessages" &gt;-->
<!-- Display sticky messages. The extension point is an &lt;ui:insert name="stickyMessages" &gt;-->
<ui:insert name="stickyMessages">
<portal:stickyMessages id="stickyMessages" />
</ui:insert>
Expand Down
2 changes: 1 addition & 1 deletion modules/portal-ui-runtime/src/test/resources/META-INF/templates/portal/master_centered.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
name="messages" &gt;</li>
<li>Footer: The footer is implemented as an include: &lt;ui:include
src="/templates/layout_footer.xhtml" /&gt; it can be overwritten by
configuring the MultitemplateMapper accordingly
configuring the MultiTemplatingMapper accordingly
</li>
</ul>
</body>
Expand Down
2 changes: 1 addition & 1 deletion modules/portal-ui-runtime/src/test/resources/META-INF/templates/portal/root.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
name="messages" &gt;</li>
<li>Footer: The footer is implemented as an include: &lt;ui:include
src="/templates/layout_footer.xhtml" /&gt; it can be overwritten by
configuring the MultitemplateMapper accordingly
configuring the MultiTemplatingMapper accordingly
</li>
</ul>
</body>
Expand Down
9 changes: 6 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,21 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>de.cuioss</groupId>
<artifactId>cui-java-parent</artifactId>
<version>0.8.0</version>
<relativePath/>
</parent>

<groupId>de.cuioss.portal.ui</groupId>
<artifactId>cui-portal-ui</artifactId>
<name>cui portal ui</name>
<version>1.0.0-SNAPSHOT</version>
<description>Provides the jsf based UI-components defining the
cuioss-portal.
</description>
<description>Provides the JSF based UI-components defining the CUIOSS Portal.</description>
<packaging>pom</packaging>

<url>https://github.com/cuioss/cui-portal-ui/</url>
<scm>
<url>https://github.com/cuioss/cui-portal-ui/</url>
Expand All @@ -28,11 +29,13 @@
<url>https://github.com/cuioss/cui-portal-ui/issues</url>
<system>GitHub Issues</system>
</issueManagement>

<properties>
<version.cui.parent>0.8.0</version.cui.parent>
<version.cui.jsf.components>1.0.0-SNAPSHOT</version.cui.jsf.components>
<version.cui.portal.core>1.0.0</version.cui.portal.core>
</properties>

<modules>
<module>bom</module>
<module>modules</module>
Expand Down
Loading