Author: musachy Date: Mon May 28 09:49:00 2007 New Revision: 542271 URL: http://svn.apache.org/viewvc?view=rev&rev=542271 Log: Fix example to use Dojo plugin tags
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/chat/chatLogin.ftl struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/chat/chatLogin.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/chat/chatLogin.ftl?view=diff&rev=542271&r1=542270&r2=542271 ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/chat/chatLogin.ftl (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/chat/chatLogin.ftl Mon May 28 09:49:00 2007 @@ -2,7 +2,7 @@ <html> <head> <title>Showcase - Chat - Login</title> - <@s.head theme="ajax" /> + <@s.head /> </head> <body> <@s.actionerror /> 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=542271&r1=542270&r2=542271 ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl Mon May 28 09:49:00 2007 @@ -3,7 +3,7 @@ <html> <head> <title>Showcase - Chat - Room Selection</title> - <@s.head theme="ajax" /> + <@sx.head /> <style type="text/css"> div.box { border: 1px solid darkblue; @@ -128,11 +128,11 @@ <div class="box"> <h3>Users Available In Chat</h3> <@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"> + <@sx.div id="usersAvailable" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}" + href="%{usersAvailableUrl}" + class="box"> Initial Loading Users ... - </@s.div> + </@sx.div> </div> </div> @@ -141,20 +141,20 @@ <div class="box"> <h3>Rooms Available In Chat</h3> <@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="%{roomsAvailableUrl}" > + <@sx.div id="roomsAvailable" listenTopics="topicRoomCreated" + updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}" + href="%{roomsAvailableUrl}" > Initial Loading Rooms ... - </@s.div> + </@sx.div> </div> <div id="createRoom" class="box"> <h3>Create Room In Chat</h3> <div id="createRoomResult"></div> - <@s.form id="createRoomId" action="createRoom" namespace="/chat/ajax" method="POST" theme="ajax"> + <@s.form id="createRoomId" action="createRoom" namespace="/chat/ajax" method="POST"> <@s.textfield label="Room Name" required="true" name="name" /> <@s.textarea theme="xhtml" label="Room Description" required="true" name="Description" /> - <@s.submit value="%{'Create Room'}" resultDivId="createRoomResult" notifyTopics="topicRoomCreated" theme="ajax" align="left" /> + <@sx.submit value="%{'Create Room'}" targets="createRoomResult" afterNotifyTopics="topicRoomCreated" align="left" /> </@s.form> </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=542271&r1=542270&r2=542271 ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl Mon May 28 09:49:00 2007 @@ -2,7 +2,7 @@ <html> <head> <title>Showcase - Chat - Show Room </title> - <@s.head theme="ajax" /> + <@sx.head /> <style type="text/css"> div.box { border: 1px solid darkblue; @@ -109,10 +109,10 @@ <div class="box"> <h3>Users Available In Chat</h3> <@s.url id="usersAvailableUrl" action="usersAvailable" namespace="/chat/ajax" /> - <@s.div id="usersAvailable" href="%{usersAvailableUrl}" - theme="ajax" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}"> + <@sx.div id="usersAvailable" href="%{usersAvailableUrl}" + updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}"> Initial Users Available ... - </@s.div> + </@sx.div> </div> </div> @@ -122,20 +122,20 @@ <@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="true" - theme="ajax" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}" + <@sx.div id="messagesInRoom" href="%{#url}" includeContext="true" + updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}" listenTopics="topicMessageSend"> Initial Messages In Room ... - </@s.div> + </@sx.div> </div> <div class="box"> <h3>Send Messages</h3> - <@s.form id="sendMessageForm" action="sendMessageToRoom" namespace="/chat/ajax" method="POST" theme="ajax"> + <@s.form id="sendMessageForm" action="sendMessageToRoom" namespace="/chat/ajax" method="POST"> <div id="sendMessageResult"></div> <@s.textarea label="Message"name="message" theme="xhtml" /> <@s.hidden name="roomName" value="%{roomName}" /> - <@s.submit id="submit" theme="ajax" resultDivId="sendMessageResult" notifyTopics="topicMessageSend" value="%{'Send'}" /> + <@sx.submit id="submit" resultDivId="sendMessageResult" afterNotifyTopics="topicMessageSend" value="%{'Send'}" /> </@s.form> </div> </div> @@ -147,10 +147,10 @@ <@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="true" - theme="ajax" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}"> + <@sx.div id="usersAvailableInRoom" href="%{#url}" includeContext="true" + delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}"> Initial Users Available In Room ... - </@s.div> + </@sx.div> </div> </div>