You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/09/30 23:55:56 UTC
svn commit: r1177853 - in /tapestry/tapestry5/trunk/tapestry-core/src/main:
java/org/apache/tapestry5/corelib/pages/
resources/org/apache/tapestry5/corelib/pages/
resources/org/apache/tapestry5/internal/t5internal/components/
Author: hlship
Date: Fri Sep 30 21:55:56 2011
New Revision: 1177853
URL: http://svn.apache.org/viewvc?rev=1177853&view=rev
Log:
TAP5-1678: Have more of the links on PageCatalog update the page listing zone
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/t5internal/components/bluerobot-layout.css
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/t5internal/components/internal-layout.css
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java?rev=1177853&r1=1177852&r2=1177853&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java Fri Sep 30 21:55:56 2011
@@ -192,12 +192,12 @@ public class PageCatalog
return pagesZone.getBody();
}
- void onActionFromClearCache()
+ Object onActionFromClearCache()
{
if (productionMode)
{
alertManager.error("Clearing the cache is only allowed in development mode.");
- return;
+ return null;
}
pageSource.clearCache();
@@ -205,14 +205,16 @@ public class PageCatalog
failures = null;
alertManager.info("Page cache cleared.");
+
+ return pagesZone.getBody();
}
- void onActionFromRunGC()
+ Object onActionFromRunGC()
{
if (productionMode)
{
alertManager.error("Executing a garbage collection is only allowed in development mode.");
- return;
+ return null;
}
Runtime runtime = Runtime.getRuntime();
@@ -225,6 +227,8 @@ public class PageCatalog
alertManager.info(String.format("Garbage collection freed %,.2f Kb of memory.",
((double) delta) / 1024.0d));
+
+ return pagesZone.getBody();
}
public String formatElapsed(long millis)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml?rev=1177853&r1=1177852&r2=1177853&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml Fri Sep 30 21:55:56 2011
@@ -13,13 +13,13 @@
</li>
<t:if test="! productionMode">
<li>
- <t:actionlink t:id="clearCache">clear the cache</t:actionlink>
+ <t:actionlink t:id="clearCache" zone="pages">clear the cache</t:actionlink>
</li>
<li>
<t:actionlink t:id="reloadClasses" zone="pages">reload component classes</t:actionlink>
</li>
<li>
- <t:actionlink t:id="runGC">Run the GC</t:actionlink>
+ <t:actionlink t:id="runGC" zone="pages">Run the GC</t:actionlink>
</li>
</t:if>
</ul>
@@ -44,7 +44,7 @@
</p:selectorCell>
<p:empty>
<p><em>There are no pages in the page cache. This can only occur immediately after reloading all
- component classes.</em></p>
+ component classes or clearing the cache.</em></p>
</p:empty>
</t:grid>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/t5internal/components/bluerobot-layout.css
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/t5internal/components/bluerobot-layout.css?rev=1177853&r1=1177852&r2=1177853&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/t5internal/components/bluerobot-layout.css (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/t5internal/components/bluerobot-layout.css Fri Sep 30 21:55:56 2011
@@ -33,22 +33,6 @@ div.t-content>p+p {
text-indent: 30px;
}
-a {
- color: #09c;
- font-size: 11px;
- text-decoration: none;
- font-weight: 600;
- font-family: verdana, arial, helvetica, sans-serif;
-}
-
-a:link {
- color: #09c;
-}
-
-a:visited {
- color: #07a;
-}
-
div.t-header {
margin: 50px 0px 10px 0px;
padding: 17px 0px 0px 20px;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/t5internal/components/internal-layout.css
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/t5internal/components/internal-layout.css?rev=1177853&r1=1177852&r2=1177853&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/t5internal/components/internal-layout.css (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/t5internal/components/internal-layout.css Fri Sep 30 21:55:56 2011
@@ -5,7 +5,8 @@ SPAN.detail {
UL.t-menu {
list-style-type: none;
margin-left: 0;
- padding: 0
+ padding: 0;
+ font-size: 12px;
}
UL.t-menu LI {
@@ -31,4 +32,8 @@ DIV.t-space-vertically {
LABEL:after {
content: ":"
+}
+
+A {
+ text-decoration: none;
}
\ No newline at end of file