Author: hermanns
Date: Wed Dec 6 13:11:56 2006
New Revision: 483228
URL: http://svn.apache.org/viewvc?view=rev&rev=483228
Log:
Showcase Examples Broken
o fixed chatroom sample (looks good)
o some url fixes for hangman (ajax not working properly yet)
o better javascript popup text values for submit and rest buttons (aaa, bbb)
Issue Number: WW-1538
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/hangmanAjax.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/test.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/updateCharacterAvailable.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl?view=diff&rev=483228&r1=483227&r2=483228
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl
Wed Dec 6 13:11:56 2006
@@ -127,8 +127,9 @@
</#if>
<div class="box">
<h3>Users Available In Chat</h3>
- <@s.div id="usersAvailable" delay="1" updateFreq="[EMAIL
PROTECTED]@UPDATE_FREQ}"
- theme="ajax" href="/chat/ajax/usersAvailable.action"
+ <@s.url id="usersAvailableUrl" action="usersAvailable"
namespace="/chat/ajax" />
+ <@s.div id="usersAvailable" delay="1" updateFreq="[EMAIL
PROTECTED]@UPDATE_FREQ}"
+ theme="ajax" href="%{usersAvailableUrl}"
class="box">
Initial Loading Users ...
</@s.div>
@@ -139,9 +140,10 @@
<div class="center">
<div class="box">
<h3>Rooms Available In Chat</h3>
- <@s.div id="roomsAvailable" listenTopics="topicRoomCreated"
+ <@s.url id="roomsAvailableUrl" action="roomsAvailable"
namespace="/chat/ajax" />
+ <@s.div id="roomsAvailable" listenTopics="topicRoomCreated"
delay="1" updateFreq="[EMAIL
PROTECTED]@UPDATE_FREQ}"
- theme="ajax"
href="/chat/ajax/roomsAvailable.action" >
+ theme="ajax" href="%{roomsAvailableUrl}" >
Initial Loading Rooms ...
</@s.div>
</div>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl?view=diff&rev=483228&r1=483227&r2=483228
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl Wed
Dec 6 13:11:56 2006
@@ -108,7 +108,8 @@
</div>
<div class="box">
<h3>Users Available In Chat</h3>
- <@s.div id="usersAvailable"
href="/chat/ajax/usersAvailable.action"
+ <@s.url id="usersAvailableUrl" action="usersAvailable"
namespace="/chat/ajax" />
+ <@s.div id="usersAvailable" href="%{usersAvailableUrl}"
theme="ajax" delay="1" updateFreq="[EMAIL
PROTECTED]@UPDATE_FREQ}">
Initial Users Available ...
</@s.div>
@@ -118,10 +119,10 @@
<div class="center">
<div class="box">
<h3>Messages Posted In Room [${roomName?default('')}]</h3>
- <@s.url id="url"
value="/chat/ajax/messagesAvailableInRoom.action" includeContext="false">
+ <@s.url id="url"
value="/chat/ajax/messagesAvailableInRoom.action" includeContext="true">
<@s.param name="roomName" value="%{roomName}" />
</@s.url>
- <@s.div id="messagesInRoom" href="%{#url}"
includeContext="false"
+ <@s.div id="messagesInRoom" href="%{#url}" includeContext="true"
theme="ajax" delay="1" updateFreq="[EMAIL
PROTECTED]@UPDATE_FREQ}"
listenTopics="topicMessageSend">
Initial Messages In Room ...
@@ -143,10 +144,10 @@
<div class="right">
<div class="box">
<h3>Users Available In Room [${roomName?default('')}]</h3>
- <@s.url id="url" value="/chat/ajax/usersAvailableInRoom.action"
includeContext="false">
+ <@s.url id="url" value="/chat/ajax/usersAvailableInRoom.action"
includeContext="true">
<@s.param name="roomName" value="%{roomName}" />
</@s.url>
- <@s.div id="usersAvailableInRoom" href="%{#url}"
includeContext="false"
+ <@s.div id="usersAvailableInRoom" href="%{#url}"
includeContext="true"
theme="ajax" delay="1" updateFreq="[EMAIL
PROTECTED]@UPDATE_FREQ}">
Initial Users Available In Room ...
</@s.div>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/hangmanAjax.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/hangmanAjax.ftl?view=diff&rev=483228&r1=483227&r2=483228
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/hangmanAjax.ftl
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/hangmanAjax.ftl
Wed Dec 6 13:11:56 2006
@@ -207,9 +207,10 @@
<@s.set name="chalkboardImageName"
value="%{'Chalkboard_'+#currentCharacter+'.png'}" />
<@s.url id="chalkboardImageUrl"
value="%{'/hangman/images/'+#chalkboardImageName}" />
<@s.url id="spacerUrl" value="/hangman/images/letter-spacer.png" />
-
+
+ <@s.url id="blankUrl" value="ajax/blank.action" includeContext="false" />
<@s.a theme="ajax"
- href="ajax/blank.action"
+ href="%{blankUrl}"
id="%{#currentCharacter}"
notifyTopics="topicGuessMade"
showErrorTransportText="true">
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/test.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/test.ftl?view=diff&rev=483228&r1=483227&r2=483228
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/test.ftl
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/test.ftl Wed Dec
6 13:11:56 2006
@@ -12,7 +12,7 @@
var anchor = dojo.byId("myAnchor");
alert(anchor);
dojo.event.connect(anchor, "onclick", function(event) {
- alert('aaa');
+ alert('Custom onclick handler triggered before
submitting form... Press OK!');
});
</script>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/updateCharacterAvailable.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/updateCharacterAvailable.ftl?view=diff&rev=483228&r1=483227&r2=483228
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/updateCharacterAvailable.ftl
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/hangman/updateCharacterAvailable.ftl
Wed Dec 6 13:11:56 2006
@@ -20,11 +20,11 @@
<@s.set name="chalkboardImageName"
value="%{'Chalkboard_'+#currentCharacter+'.png'}" />
<@s.url id="chalkboardImageUrl"
value="%{'/hangman/images/'+#chalkboardImageName}" />
<@s.url id="spacerUrl" value="/hangman/images/letter-spacer.png" />
-
+ <@s.url id="blankUrl" value="ajax/blank.action" includeContext="false" />
<@s.a theme="ajax"
id="%{#currentCharacter}"
- href="ajax/blank.action"
+ href="%{blankUrl}"
notifyTopics="topicGuessMade"
showErrorTransportText="true">
<img height="36" alt="" src="<@s.property
value="%{#chalkboardImageUrl}" />" width="36" border="0" />
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp?view=diff&rev=483228&r1=483227&r2=483228
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp Wed
Dec 6 13:11:56 2006
@@ -118,8 +118,8 @@
name="thoughts"
tooltip="Enter your thoughts here" />
- <s:submit onclick="alert('aaaa');" />
- <s:reset onclick="alert('bbbb');" />
+ <s:submit onclick="alert('Custom onclick event triggered before submitting
form... Press OK to continue!');" />
+ <s:reset onclick="alert('Resetting form now... Press OK to continue!');" />
</s:form>
</body>
