LPS-112457 Uses clay:badge to replace raw html badge instances

wincent · May 28, 2020 · e853281 · e853281
1 parent 188d337
commit e853281
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 17 deletions.
diff --git a/modules/apps/application-list/application-list-taglib/build.gradle b/modules/apps/application-list/application-list-taglib/build.gradle
@@ -8,6 +8,7 @@ dependencies {
 	compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
 	compileOnly group: "org.osgi", name: "org.osgi.service.http.whiteboard", version: "1.0.0"
 	compileOnly project(":apps:application-list:application-list-api")
+	compileOnly project(":apps:frontend-taglib:frontend-taglib-clay")
 	compileOnly project(":core:petra:petra-lang")
 	compileOnly project(":core:petra:petra-sql-dsl-api")
 	compileOnly project(":core:petra:petra-string")

diff --git a/...s/application-list/application-list-taglib/src/main/resources/META-INF/resources/init.jsp b/...s/application-list/application-list-taglib/src/main/resources/META-INF/resources/init.jsp
@@ -18,6 +18,7 @@
 
 <%@ taglib uri="http://liferay.com/tld/application-list" prefix="liferay-application-list" %><%@
 taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
+taglib uri="http://liferay.com/tld/clay" prefix="clay" %><%@
 taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
 taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
 

diff --git a/...ion-list/application-list-taglib/src/main/resources/META-INF/resources/panel_app/page.jsp b/...ion-list/application-list-taglib/src/main/resources/META-INF/resources/panel_app/page.jsp
@@ -31,9 +31,11 @@ String url = (String)request.getAttribute("liferay-application-list:panel-app:ur
 			<%= label %>
 
 			<c:if test="<%= notificationsCount > 0 %>">
-				<span class="badge badge-danger float-right">
-					<span class="badge-item badge-item-expand"><%= notificationsCount %></span>
-				</span>
+				<clay:badge
+					className="float-right"
+					displayType="danger"
+					label="<%= String.valueOf(notificationsCount) %>"
+				/>
 			</c:if>
 		</aui:a>
 	</li>

diff --git a/...st/application-list-taglib/src/main/resources/META-INF/resources/panel_category/start.jsp b/...st/application-list-taglib/src/main/resources/META-INF/resources/panel_category/start.jsp
@@ -22,9 +22,12 @@
 			<%= panelCategory.getLabel(themeDisplay.getLocale()) %>
 
 			<c:if test="<%= notificationsCount > 0 %>">
-				<span class="badge badge-danger float-right panel-notifications-count">
-					<span class="badge-item badge-item-expand" data-qa-id="notificationsCount"><%= notificationsCount %></span>
-				</span>
+				<clay:badge
+					className="float-right panel-notifications-count"
+					data-qa-id="notificationsCount"
+					displayType="danger"
+					label="<%= String.valueOf(notificationsCount) %>"
+				/>
 			</c:if>
 		</c:if>
 

diff --git a/...rtal-search/portal-search-admin-web/src/main/resources/META-INF/resources/connections.jsp b/...rtal-search/portal-search-admin-web/src/main/resources/META-INF/resources/connections.jsp
@@ -75,11 +75,10 @@ SearchEngineDisplayContext
 					<h3 class="search-engine-page-title">
 						<liferay-ui:message key="active-connections" />
 
-						<span class="badge badge-secondary">
-							<span class="badge-item badge-item-expand">
-								<%= (connectionInformationList == null) ? 0 : connectionInformationList.size() %>
-							</span>
-						</span>
+						<clay:badge
+							displayType="secondary"
+							label="<%= String.valueOf((connectionInformationList == null) ? 0 : connectionInformationList.size()) %>"
+						/>
 					</h3>
 
 					<c:choose>

diff --git a/modules/apps/product-navigation/product-navigation-personal-menu-web/build.gradle b/modules/apps/product-navigation/product-navigation-personal-menu-web/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 	compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
 	compileOnly project(":apps:configuration-admin:configuration-admin-api")
 	compileOnly project(":apps:dynamic-data-mapping:dynamic-data-mapping-api")
+	compileOnly project(":apps:frontend-taglib:frontend-taglib-clay")
 	compileOnly project(":apps:portal:portal-upgrade-api")
 	compileOnly project(":apps:product-navigation:product-navigation-control-menu-api")
 	compileOnly project(":apps:product-navigation:product-navigation-personal-menu-api")

diff --git a/...rsonal-menu-web/src/main/resources/META-INF/resources/control_menu/personal_menu_icon.jsp b/...rsonal-menu-web/src/main/resources/META-INF/resources/control_menu/personal_menu_icon.jsp
@@ -56,9 +56,11 @@
 			%>
 
 			<aui:a href="<%= (notificationsURL != null) ? notificationsURL : null %>">
-				<span class="badge badge-danger panel-notifications-count">
-					<span class="badge-item badge-item-expand"><%= notificationsCount %></span>
-				</span>
+				<clay:badge
+					className="panel-notifications-count"
+					displayType="danger"
+					label="<%= String.valueOf(notificationsCount) %>"
+				/>
 			</aui:a>
 		</c:if>
 	</span>

diff --git a/...ation/product-navigation-personal-menu-web/src/main/resources/META-INF/resources/init.jsp b/...ation/product-navigation-personal-menu-web/src/main/resources/META-INF/resources/init.jsp
@@ -19,6 +19,7 @@
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
 
 <%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
+taglib uri="http://liferay.com/tld/clay" prefix="clay" %><%@
 taglib uri="http://liferay.com/tld/product-navigation" prefix="liferay-product-navigation" %><%@
 taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
 

diff --git a/modules/apps/product-navigation/product-navigation-user-personal-bar-web/build.gradle b/modules/apps/product-navigation/product-navigation-user-personal-bar-web/build.gradle
@@ -6,6 +6,7 @@ dependencies {
 	compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
 	compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
 	compileOnly project(":apps:application-list:application-list-api")
+	compileOnly project(":apps:frontend-taglib:frontend-taglib-clay")
 	compileOnly project(":apps:product-navigation:product-navigation-personal-menu-api")
 	compileOnly project(":apps:product-navigation:product-navigation-taglib")
 	compileOnly project(":apps:site:site-api")

diff --git a/...n/product-navigation-user-personal-bar-web/src/main/resources/META-INF/resources/init.jsp b/...n/product-navigation-user-personal-bar-web/src/main/resources/META-INF/resources/init.jsp
@@ -19,6 +19,7 @@
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
 
 <%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
+taglib uri="http://liferay.com/tld/clay" prefix="clay" %><%@
 taglib uri="http://liferay.com/tld/product-navigation" prefix="liferay-product-navigation" %><%@
 taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
 

diff --git a/...n/product-navigation-user-personal-bar-web/src/main/resources/META-INF/resources/view.jsp b/...n/product-navigation-user-personal-bar-web/src/main/resources/META-INF/resources/view.jsp
@@ -37,9 +37,11 @@
 				%>
 
 				<aui:a href="<%= (notificationsURL != null) ? notificationsURL : null %>">
-					<span class="badge badge-danger panel-notifications-count">
-						<span class="badge-item badge-item-expand"><%= notificationsCount %></span>
-					</span>
+					<clay:badge
+						className="panel-notifications-count"
+						displayType="danger"
+						label="<%= String.valueOf(notificationsCount) %>"
+					/>
 				</aui:a>
 			</c:if>
 		</span>