incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r912562 - in /sling/trunk/launchpad: builder/src/main/bundles/list.xml content/src/main/resources/content/index.html
Date Mon, 22 Feb 2010 13:49:46 GMT
Author: bdelacretaz
Date: Mon Feb 22 13:49:46 2010
New Revision: 912562

URL: http://svn.apache.org/viewvc?rev=912562&view=rev
Log:
SLING-1401 - add login links to default index.html page and /sling-test/sling/sling-test.html

Modified:
    sling/trunk/launchpad/builder/src/main/bundles/list.xml
    sling/trunk/launchpad/content/src/main/resources/content/index.html

Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=912562&r1=912561&r2=912562&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Feb 22 13:49:46 2010
@@ -123,7 +123,7 @@
         <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad.content</artifactId>
-            <version>2.0.4-incubator</version>
+            <version>2.0.5-SNAPSHOT</version>
         </bundle>
 
         <!-- scripting -->

Modified: sling/trunk/launchpad/content/src/main/resources/content/index.html
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/content/src/main/resources/content/index.html?rev=912562&r1=912561&r2=912562&view=diff
==============================================================================
--- sling/trunk/launchpad/content/src/main/resources/content/index.html (original)
+++ sling/trunk/launchpad/content/src/main/resources/content/index.html Mon Feb 22 13:49:46
2010
@@ -22,6 +22,7 @@
   <head>
     <title>Welcome to the Sling Launchpad</title>
     <link rel="stylesheet" type="text/css" href="sling.css"/>
+    <script src="../system/sling.js"/></script>
   </head>
   <body>
   	<div class="title">
@@ -39,8 +40,8 @@
 	    <h1>Welcome to the Sling Launchpad</h1>
 	    
 		<p>
-			Apache Sling (currently in incubation) is a web framework that uses a Java Content Repository,

-			such as Apache Jackrabbit, to store and manage content.
+			<a href="http://sling.apache.org">Apache Sling</a> is a web framework that
uses a Java Content Repository, 
+			such as <a href="http://jackrabbit.apache.org">Apache Jackrabbit</a>, to store
and manage content.
 
 			Sling applications use either scripts or Java servlets, selected based on simple name
conventions, 
 			to process HTTP requests in a RESTful way.
@@ -69,6 +70,20 @@
 			Note that you can mount the repository via WebDAV to explore or modify content,
 			simply use the <a href="./">root URL</a> as the WebDAV server URL.
 		</p>
+        <p>
+           You are currently logged in as user <b id="username">????</b> to workspace
<b id="workspace">????</b>. 
+        </p>
+        <p>
+            To login with a different username (use <em>admin/admin</em> to be
allowed to write to the repository),
+            use <a href="../?sling:authRequestLogin=1">this link</a>.
+        </p>
+        <script language="javascript">
+            var info = Sling.getSessionInfo();
+            document.getElementById("username").innerHTML = info.userID;
+            document.getElementById("workspace").innerHTML = info.workspace;
+        </script>
+        
+        <h2>More info</h2>
 		<p>
 			Use our 
 			<a href="http://sling.apache.org/site/project-information.html#ProjectInformation-lists">
@@ -76,16 +91,13 @@
 			</a> to contact the Sling developers team.
 		</p>	
 	    <p>
-	    	The Sling OSGi management console is available at <a href="system/console">system/console</a>.
+	    	The Sling OSGi management console is available at <a href="system/console">system/console</a>,
+	    	use <em>admin/admin</em> to login.
 	    </p>
 	    <p>
 	    	The Sling client library tests are available at 
 	    	<a href="sling-test/sling/sling-test.html">sling-test/sling/sling-test.html</a>.
 	    </p>
-	    <p>
-                You can <a href="../?sling:authRequestLogin=1">login</a> to Sling,
even though this
-                page is accessible to the anonymous user.
-	    </p>
     </div>
   </body>
-</html>
+</html>
\ No newline at end of file



Mime
View raw message