Author: ito
Date: Mon Jan 25 16:17:09 2010
New Revision: 902856
URL: http://svn.apache.org/viewvc?rev=902856&view=rev
Log:
CLEREZZA-77: closed
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/README.txt
- copied unchanged from r901934,
incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/README.txt
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/
- copied from r901934,
incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/panel.js
- copied unchanged from r901934,
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/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/
(props changed)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css
Propchange:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 25 16:17:09 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.web.resources.style:894321-894392
+/incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style:900408-901934
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/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/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java?rev=902856&r1=902855&r2=902856&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
Mon Jan 25 16:17:09 2010
@@ -67,7 +67,6 @@
private RenderletManager renderletManager;
/**
- * The activate method is called when SCR activates the component
* configuration.
*
* @param context
@@ -88,6 +87,7 @@
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(templateURL.toString()),
PLATFORM.HeadedPage, null,
MediaType.APPLICATION_XHTML_XML_TYPE, true);
+
}
/**
@@ -99,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/trunk/org.apache.clerezza.parent/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/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp?rev=902856&r1=902855&r2=902856&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp
Mon Jan 25 16:17:09 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/trunk/org.apache.clerezza.parent/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/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css?rev=902856&r1=902855&r2=902856&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css
Mon Jan 25 16:17:09 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 {
