You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/10/22 10:06:08 UTC
svn commit: r1633553 - in
/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot:
public/ public/slingshot2/ public/slingshot2/places/
public/slingshot2/places/flight/ public/slingshot2/places/flight/images/
public/slingshot2/pla...
Author: cziegeler
Date: Wed Oct 22 08:06:07 2014
New Revision: 1633553
URL: http://svn.apache.org/r1633553
Log:
Add content for slingshot2 user
Added:
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2.json (with props)
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places.json (with props)
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight/
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight.json (with props)
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight/images/
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight/images/flight.jpg (with props)
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing/
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing.json (with props)
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing/images/
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing/images/landing.jpg (with props)
Modified:
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/js/slingshot.js
Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2.json?rev=1633553&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2.json (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2.json Wed Oct 22 08:06:07 2014
@@ -0,0 +1,6 @@
+{
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/User",
+ "description":"This is the user space of slingshot2!",
+ "title":"The Truth Is Out There"
+}
\ No newline at end of file
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2.json
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2.json
------------------------------------------------------------------------------
svn:keywords = Id
Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places.json?rev=1633553&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places.json (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places.json Wed Oct 22 08:06:07 2014
@@ -0,0 +1,6 @@
+{
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Category",
+ "title":"Places",
+ "description":"Mysterious places around the globe."
+}
\ No newline at end of file
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places.json
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places.json
------------------------------------------------------------------------------
svn:keywords = Id
Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight.json?rev=1633553&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight.json (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight.json Wed Oct 22 08:06:07 2014
@@ -0,0 +1,15 @@
+{
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Item",
+ "title":"Flight Route",
+ "description":"Looks different from above...",
+
+ comments : {
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Comments",
+ },
+ ratings : {
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Ratings",
+ }
+}
\ No newline at end of file
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight.json
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight.json
------------------------------------------------------------------------------
svn:keywords = Id
Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight/images/flight.jpg
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight/images/flight.jpg?rev=1633553&view=auto
==============================================================================
Binary file - no diff available.
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/flight/images/flight.jpg
------------------------------------------------------------------------------
svn:mime-type = image/jpeg
Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing.json?rev=1633553&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing.json (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing.json Wed Oct 22 08:06:07 2014
@@ -0,0 +1,15 @@
+{
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Item",
+ "title":"Landing Place",
+ "description":"Something happened here long time ago!",
+
+ comments : {
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Comments",
+ },
+ ratings : {
+ "jcr:primaryType":"sling:OrderedFolder",
+ "sling:resourceType":"slingshot/Ratings",
+ }
+}
\ No newline at end of file
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing.json
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing.json
------------------------------------------------------------------------------
svn:keywords = Id
Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing/images/landing.jpg
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing/images/landing.jpg?rev=1633553&view=auto
==============================================================================
Binary file - no diff available.
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/public/slingshot2/places/landing/images/landing.jpg
------------------------------------------------------------------------------
svn:mime-type = image/jpeg
Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/js/slingshot.js
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/js/slingshot.js?rev=1633553&r1=1633552&r2=1633553&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/js/slingshot.js (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/js/slingshot.js Wed Oct 22 08:06:07 2014
@@ -39,6 +39,7 @@ $( document ).ready(function() {
document.location = u;
},
error: function() {
+ alert("Try username slingshot1 or slingshot2 with the password being the same as the username.");
form.j_password.value="";
$(".ui-form-label").css("background-color","red");
}