You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by it...@apache.org on 2010/01/19 20:59:25 UTC

svn commit: r900933 - in /incubator/clerezza/issues/CLEREZZA-77: org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/ org.apache.clerezza.web.resources.style/ org.apache.clerezza.web.resources.style/src/main/java/or...

Author: ito
Date: Tue Jan 19 19:59:25 2010
New Revision: 900933

URL: http://svn.apache.org/viewvc?rev=900933&view=rev
Log:
CLEREZZA-77: removed HeadedPageWithPanel and extended HeadedPage

Added:
    incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/README.txt
Removed:
    incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-with-panel-template.ssp
Modified:
    incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
    incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
    incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp
    incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css
    incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/panel.js

Modified: incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf?rev=900933&r1=900932&r2=900933&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf (original)
+++ incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf Tue Jan 19 19:59:25 2010
@@ -33,14 +33,6 @@
 	<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/08/platform#" />
 </rdfs:Class>
 
-<rdfs:Class rdf:about="http://clerezza.org/2009/08/platform#HeadedPageWithPanel">
-	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
-	<rdfs:subClassOf rdf:resource="http://clerezza.org/2009/08/platform#HeadedPage"/>
-	<rdfs:label xml:lang="en">HeadedPageWithPanel</rdfs:label>
-	<skos:definition xml:lang="en">A web page typically rendered with a header and a panel.</skos:definition>
-	<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/08/platform#" />
-</rdfs:Class>
-
 <!-- Properties -->
 
 <rdf:Property rdf:about="http://clerezza.org/2009/08/platform#defaultBaseUri">

Added: incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/README.txt
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/README.txt?rev=900933&view=auto
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/README.txt (added)
+++ incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/README.txt Tue Jan 19 19:59:25 2010
@@ -0,0 +1,18 @@
+How to create a tab in the Panel:
+
+
+1. Add your panel to a page from type HeadedPage with the ResultDocModifier. The
+first node of your panel must have an id, which identifies the tab.
+
+e.g.
+resultDocModifier.addNodes2Elem("tx-panel-detail", <div id="my-tab">My Tab</div>);
+
+2. The id of the first node of your panel can be used as style information for the tab button.
+The following snippet adds an icon to the tab button (the size of an icon has to be
+22x22):
+
+li.my-tab a {
+	background-image:url(/path/images/panel/standard-tab.png);
+}
+
+

Modified: incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java?rev=900933&r1=900932&r2=900933&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java (original)
+++ incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java Tue Jan 19 19:59:25 2010
@@ -88,11 +88,6 @@
 		renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
 				new UriRef(templateURL.toString()), PLATFORM.HeadedPage, null,
 				MediaType.APPLICATION_XHTML_XML_TYPE, true);
-
-		templateURL = getClass().getResource("headed-page-with-panel-template.ssp");
-		renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
-				new UriRef(templateURL.toString()), PLATFORM.HeadedPageWithPanel, null,
-				MediaType.APPLICATION_XHTML_XML_TYPE, true);
 	}
 
 	/**
@@ -104,12 +99,6 @@
 	@Path("{path:.+}")
 	public PathNode getStaticFile(@PathParam("path") String path) {
 		final PathNode node = fileServer.getNode(path);
-		logger.debug("Serving static {}", node);
-		try {
-			logger.debug("Inputstream {}", node.getInputStream());
-		} catch (IOException ex) {
-			logger.error("Reading static file {}", ex);
-		}
 		return node;
 	}
 }
\ No newline at end of file

Modified: incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp?rev=900933&r1=900932&r2=900933&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp (original)
+++ incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp Tue Jan 19 19:59:25 2010
@@ -2,6 +2,8 @@
 resultDocModifier.addStyleSheet("/yui/container/assets/container-core.css");
 resultDocModifier.addScriptReference("/jquery/jquery-1.3.2.min.js");
 resultDocModifier.addScriptReference("/jquery/jquery.menu.js");
+resultDocModifier.addScriptReference("/jquery/jquery.panel.js");
+resultDocModifier.addScriptReference("/style/scripts/panel.js");
 resultDocModifier.addScriptReference("/scripts/modification-status.js");
 resultDocModifier.addScriptReference("/scripts/status-message.js");
 resultDocModifier.addScriptReference("/yui/yahoo-dom-event/yahoo-dom-event.js");
@@ -34,6 +36,17 @@
 				</ol>	
 			</div>
 		</div>
+		<div class="tx-panel" id="tx-panel">
+			<a href="#" class="tx-panel-open-close tx-icon-left-inverse" id="tx-panel-open-close">open/close</a>
+			<div id="tx-panel-title"></div>
+			<div class="tx-panel-window">
+				<div class="tx-tab" id="tx-panel-tab">
+					<ol id="tx-tab-panel-ol">
+					</ol>
+				</div>
+				<div class="tx-panel-detail" id="tx-panel-detail"></div>
+			</div>
+		</div>
 		{render(res,"naked")}
 	</body>
 </html>

Modified: incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css?rev=900933&r1=900932&r2=900933&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css (original)
+++ incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css Tue Jan 19 19:59:25 2010
@@ -1,10 +1,11 @@
 /* panel */
 .tx-panel {
 	position: absolute;
-	top: 0;
+	top: 12em;
 	bottom: 0;
 	left: 0.5em;
 	width: 27em;
+	z-Index: 100;
 }
 
 .tx-panel.tx-close {

Modified: incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/panel.js
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/panel.js?rev=900933&r1=900932&r2=900933&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/panel.js (original)
+++ incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/panel.js Tue Jan 19 19:59:25 2010
@@ -1,7 +1,30 @@
 $(document).ready(function () {
-
 	if($("#tx-panel-detail").children().length == 0){
 		$("#tx-panel").hide();
+	} else {
+		$("#tx-panel-detail").children().each(function() {
+			var li = $("<li/>").addClass($(this).attr("id"))
+			var aHref = $("<a/>").attr("href", "#").text("tab");
+			aHref.bind("click", function () {
+				if(!$(this).parent().hasClass("tx-active")) {
+					$("#tx-panel-detail").children().each(function() {
+						$(this).hide();
+					});
+					$("#tx-tab-panel-ol").children().each(function() {
+						$(this).removeClass("tx-active");
+					});
+					$("#" + $(this).parent().attr("class")).show();
+					$(this).parent().addClass("tx-active");
+				}
+			})
+			li.append(aHref);
+			$("#tx-tab-panel-ol").append(li);
+		});
+		$("#tx-panel-detail").children(":not(:first)").each(function() {
+			$(this).hide();
+		});
+		$("#tx-tab-panel-ol").children(":first").each(function() {
+			$(this).addClass("tx-active");
+		});	
 	}
-
 });
\ No newline at end of file