Fix broken showcase pages

melloware · Dec 5, 2024 · 8138e95 · 8138e95
1 parent 37c8980
commit 8138e95
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 152 deletions.
diff --git a/src/main/java/org/primefaces/showcase/view/button/SpeedDialView.java b/src/main/java/org/primefaces/showcase/view/button/SpeedDialView.java
@@ -72,7 +72,7 @@ public void init() {
 
         item = DefaultMenuItem.builder()
                 .icon("pi pi-upload")
-                .outcome("/ui/file/upload/basic")
+                .outcome("/ui/file/upload/simple")
                 .build();
         model.getElements().add(item);
 
@@ -113,4 +113,4 @@ public void addMessage(String summary, String detail) {
         FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, summary, detail);
         FacesContext.getCurrentInstance().addMessage(null, message);
     }
-}
+}
diff --git a/src/main/resources/META-INF/resources/ui/button/speedDial.xhtml b/src/main/resources/META-INF/resources/ui/button/speedDial.xhtml
@@ -121,31 +121,31 @@
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages" ariaLabel="Edit"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial direction="down">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial direction="left">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial direction="right">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
                 </div>
@@ -158,71 +158,71 @@
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial radius="80" direction="up" type="semi-circle">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial radius="80" direction="down" type="semi-circle">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial radius="80" direction="left" type="semi-circle">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial radius="80" direction="right" type="semi-circle">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial radius="120" direction="up-left" type="quarter-circle" buttonStyleClass="ui-button-success">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial radius="120" direction="up-right" type="quarter-circle" buttonStyleClass="ui-button-success">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial radius="120" direction="down-left" type="quarter-circle" buttonStyleClass="ui-button-success">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
                     <p:speedDial radius="120" direction="down-right" type="quarter-circle" buttonStyleClass="ui-button-success">
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
                 </div>
@@ -236,7 +236,7 @@
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages" title="Add"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages" title="Update"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages" title="Delete"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic" title="Upload"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple" title="Upload"/>
                         <p:menuitem icon="pi pi-external-link" title="PrimeFaces" url="https://www.primefaces.org"/>
                     </p:speedDial>
 
@@ -245,7 +245,7 @@
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages" title="Add"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages" title="Update"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages" title="Delete"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic" title="Upload"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple" title="Upload"/>
                         <p:menuitem icon="pi pi-external-link" title="PrimeFaces" url="https://www.primefaces.org"/>
                     </p:speedDial>
                 </div>
@@ -259,7 +259,7 @@
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
                 </div>
@@ -273,7 +273,7 @@
                         <p:menuitem icon="pi pi-pencil" action="#{speedDialView.add}" update="messages"/>
                         <p:menuitem icon="pi pi-refresh" action="#{speedDialView.update}" update="messages"/>
                         <p:menuitem icon="pi pi-trash" action="#{speedDialView.delete}" update="messages"/>
-                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/basic"/>
+                        <p:menuitem icon="pi pi-upload" outcome="/ui/file/upload/simple"/>
                         <p:menuitem icon="pi pi-external-link" url="https://www.primefaces.org"/>
                     </p:speedDial>
                 </div>

diff --git a/src/main/resources/META-INF/resources/ui/data/diagram/editable.xhtml b/src/main/resources/META-INF/resources/ui/data/diagram/editable.xhtml
@@ -4,7 +4,7 @@
                 xmlns:f="jakarta.faces.core"
                 xmlns:p="primefaces"
                 template="/template/template.xhtml"
-                xmlns:c="jakarta.tags.core">
+>
 
     <ui:define name="head">
         <style>
@@ -45,8 +45,8 @@
                 <p:diagram value="#{diagramEditableView.model}" style="height:600px" styleClass="ui-widget-content"
                            var="el">
                     <f:facet name="element">
-                        <h:outputText value="#{el.name}" style="display:block;margin-top:1em;"/>
-                        <p:graphicImage name="demo/images/#{el.image}"/>
+                        <h:outputText value="#{el.data.name}" style="display:block;margin-top:1em;"/>
+                        <p:graphicImage name="demo/images/#{el.data.image}"/>
                     </f:facet>
                     <p:ajax event="connect" listener="#{diagramEditableView.onConnect}"/>
                     <p:ajax event="disconnect" listener="#{diagramEditableView.onDisconnect}"/>

diff --git a/src/main/resources/META-INF/resources/ui/input/manyCheckbox.xhtml b/src/main/resources/META-INF/resources/ui/input/manyCheckbox.xhtml
@@ -44,11 +44,6 @@
                                       columns="3">
                     <f:selectItems value="#{checkboxView.cities}" var="city" itemLabel="#{city}" itemValue="#{city}"/>
                 </p:selectManyCheckbox>
-
-                <h5>Grid Layout (deprecated)</h5>
-                <p:selectManyCheckbox id="grid" value="#{checkboxView.selectedCities}" layout="grid" columns="3" styleClass="grid-checkbox">
-                    <f:selectItems value="#{checkboxView.cities}" var="city" itemLabel="#{city}" itemValue="#{city}"/>
-                </p:selectManyCheckbox>
 
                 <h5>Line Direction</h5>
                 <p:selectManyCheckbox id="lineDirection" value="#{checkboxView.selectedCities}" layout="lineDirection">

diff --git a/src/main/resources/META-INF/resources/ui/input/oneRadio.xhtml b/src/main/resources/META-INF/resources/ui/input/oneRadio.xhtml
@@ -53,12 +53,6 @@
                     <f:selectItems value="#{radioView.cities}" var="city" itemLabel="#{city}" itemValue="#{city}"/>
                 </p:selectOneRadio>
 
-
-                <h5>Grid (deprecated)</h5>
-                <p:selectOneRadio id="city" value="#{radioView.city}" layout="grid" columns="3" styleClass="grid-radio">
-                    <f:selectItems value="#{radioView.cities}" var="city" itemLabel="#{city}" itemValue="#{city}"/>
-                </p:selectOneRadio>
-
 
                 <h5>Custom Layout (Facet)</h5>
                 <p:selectOneRadio id="customRadio" value="#{radioView.color}">

diff --git a/src/main/resources/META-INF/resources/ui/panel/panelGrid.xhtml b/src/main/resources/META-INF/resources/ui/panel/panelGrid.xhtml
@@ -217,125 +217,6 @@
             </p:panelGrid>
         </div>
 
-        <div class="card">
-            <h5>Grouping (deprecated)</h5>
-            <p:panelGrid style="margin-top:20px" layout="tabular" columns="0">
-                <f:facet name="header">
-                    <p:row>
-                        <p:column colspan="7">1995-96 NBA Playoffs</p:column>
-                    </p:row>
-                    <p:row>
-                        <p:column colspan="2">Conf. Semifinals</p:column>
-                        <p:column colspan="2">Conf. Finals</p:column>
-                        <p:column colspan="2">NBA Finals</p:column>
-                        <p:column>Champion</p:column>
-                    </p:row>
-
-                </f:facet>
-
-                <p:row>
-                    <p:column style="font-weight: bold;">Seattle</p:column>
-                    <p:column style="font-weight: bold;">4</p:column>
-
-                    <p:column rowspan="2" style="font-weight: bold;">Seattle</p:column>
-                    <p:column rowspan="2" style="font-weight: bold;">4</p:column>
-
-                    <p:column rowspan="5">Seattle</p:column>
-                    <p:column rowspan="5">2</p:column>
-
-                    <p:column rowspan="11" style="font-weight: bold;">Chicago</p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column>Houston</p:column>
-                    <p:column>0</p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column colspan="4" styleClass="ui-widget-header">
-                        <p:spacer height="0"/>
-                    </p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column style="font-weight: bold;">Utah</p:column>
-                    <p:column style="font-weight: bold;">4</p:column>
-
-                    <p:column rowspan="2">Utah</p:column>
-                    <p:column rowspan="2">3</p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column>San Antonio</p:column>
-                    <p:column>2</p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column colspan="6" styleClass="ui-widget-header">
-                        <p:spacer height="0"/>
-                    </p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column style="font-weight: bold;">Chicago</p:column>
-                    <p:column style="font-weight: bold;">4</p:column>
-
-                    <p:column rowspan="2" style="font-weight: bold;">Chicago</p:column>
-                    <p:column rowspan="2" style="font-weight: bold;">4</p:column>
-
-                    <p:column rowspan="5" style="font-weight: bold;">Chicago</p:column>
-                    <p:column rowspan="5" style="font-weight: bold;">4</p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column>New York</p:column>
-                    <p:column>1</p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column colspan="4" styleClass="ui-widget-header">
-                        <p:spacer height="0"/>
-                    </p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column>Atlanta</p:column>
-                    <p:column>1</p:column>
-
-                    <p:column rowspan="2">Orlando</p:column>
-                    <p:column rowspan="2">0</p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column style="font-weight: bold;">Orlando</p:column>
-                    <p:column style="font-weight: bold;">4</p:column>
-                </p:row>
-
-
-                <f:facet name="footer">
-                    <p:row>
-                        <p:column colspan="4" style="text-align: right">
-                            Finals MVP
-                        </p:column>
-                        <p:column colspan="3" rowspan="3">
-                            Michael Jordan (Chicago)
-                        </p:column>
-                    </p:row>
-
-                    <p:row>
-                        <p:column colspan="4" style="text-align: right">
-                            Season MVP
-                        </p:column>
-                    </p:row>
-                    <p:row>
-                        <p:column colspan="4" style="text-align: right">
-                            Top Scorer
-                        </p:column>
-                    </p:row>
-                </f:facet>
-            </p:panelGrid>
-        </div>
-
         <div class="card">
             <h5>Responsive Grid</h5>
             <style>