Add a second category for user slingshot2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1633558 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Item/main.html.jsp b/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Item/main.html.jsp
index e1c2b8d..be8a5a7 100644
--- a/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Item/main.html.jsp
+++ b/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Item/main.html.jsp
@@ -20,6 +20,7 @@
org.apache.sling.api.resource.ResourceUtil,
org.apache.sling.api.resource.ValueMap,
org.apache.sling.sample.slingshot.SlingshotConstants,
+ org.apache.sling.sample.slingshot.SlingshotUtil,
org.apache.sling.api.request.ResponseUtil" %><%
%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><%
%><sling:defineObjects/><%
@@ -44,6 +45,6 @@
</div>
<div class="brand">
<span class="label fg-white"><%= ResponseUtil.escapeXml(itemTitle) %></span>
- <span class="badge bg-orange"><%= count %></span>
+ <span class="badge bg-orange"><%= SlingshotUtil.getRating(resource) %></span>
</div>
</div>
diff --git a/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens.json b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens.json
new file mode 100644
index 0000000..9bb74cf
--- /dev/null
+++ b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens.json
@@ -0,0 +1,6 @@
+{
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Category",
+ "title":"Aliens",
+ "description":"Strange creatures from outer space."
+}
\ No newline at end of file
diff --git a/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/strange.json b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/strange.json
new file mode 100644
index 0000000..642e4eb
--- /dev/null
+++ b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/strange.json
@@ -0,0 +1,15 @@
+{
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Item",
+ "title":"Strange",
+ "description":"This guy looks really strange...",
+
+ comments : {
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Comments",
+ },
+ ratings : {
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Ratings",
+ }
+}
\ No newline at end of file
diff --git a/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/strange/images/pic.jpg b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/strange/images/pic.jpg
new file mode 100644
index 0000000..ab1a7ab
--- /dev/null
+++ b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/strange/images/pic.jpg
Binary files differ
diff --git a/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/underwater.json b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/underwater.json
new file mode 100644
index 0000000..9d91c7d
--- /dev/null
+++ b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/underwater.json
@@ -0,0 +1,15 @@
+{
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Item",
+ "title":"Underwater",
+ "description":"Surprise down under...",
+
+ comments : {
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Comments",
+ },
+ ratings : {
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Ratings",
+ }
+}
\ No newline at end of file
diff --git a/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/underwater/images/pic.jpg b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/underwater/images/pic.jpg
new file mode 100644
index 0000000..dbd88b7
--- /dev/null
+++ b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/underwater/images/pic.jpg
Binary files differ
diff --git a/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/welcome.json b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/welcome.json
new file mode 100644
index 0000000..f08d144
--- /dev/null
+++ b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/welcome.json
@@ -0,0 +1,15 @@
+{
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Item",
+ "title":"Welcome",
+ "description":"This guy looks charming",
+
+ comments : {
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Comments",
+ },
+ ratings : {
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Ratings",
+ }
+}
\ No newline at end of file
diff --git a/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/welcome/images/pic.jpg b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/welcome/images/pic.jpg
new file mode 100644
index 0000000..96d2cfa
--- /dev/null
+++ b/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/aliens/welcome/images/pic.jpg
Binary files differ