File tree Expand file tree Collapse file tree 4 files changed +32
-6
lines changed Expand file tree Collapse file tree 4 files changed +32
-6
lines changed Original file line number Diff line number Diff line change 5
5
from django .http import HttpResponse
6
6
from gevent .event import Event
7
7
from django .conf import settings
8
+ from django .utils .html import escape
8
9
9
10
from chat .models import Map
10
11
@@ -91,7 +92,7 @@ def player_update_position(self, request):
91
92
92
93
def message_new (self , request ):
93
94
key = request .COOKIES ['rpg_key' ]
94
- msg = request .POST ['body' ]
95
+ msg = escape ( request .POST ['body' ])
95
96
player = self .get_player (key )
96
97
player ['last_message' ] = msg
97
98
self .new_room_event (['last_message' , [key , msg ]])
Original file line number Diff line number Diff line change 1
1
2
2
# main {
3
- width : 760 px ;
3
+ width : 770 px ;
4
4
margin : 0 auto;
5
5
}
6
6
@@ -31,10 +31,30 @@ body {
31
31
background : # 666 ;
32
32
}
33
33
34
- # tileset-container {
34
+ # right-container {
35
+ width : 188px ;
35
36
float : right;
36
37
color : # fff ;
37
38
}
39
+
40
+ # chat-log {
41
+ border : 1px # 666 solid;
42
+ padding : 10px ;
43
+ list-style : none;
44
+ height : 270px ;
45
+ overflow : auto;
46
+ }
47
+
48
+ # chat-log li {
49
+ padding : 0 ;
50
+ margin : 0 ;
51
+ color : # eee ;
52
+ }
53
+
54
+ # chat-log li span {
55
+ color : # aaa ;
56
+ }
57
+
38
58
# grid-serialized {
39
59
width : 600px ;
40
60
height : 100px ;
Original file line number Diff line number Diff line change @@ -259,7 +259,11 @@ $(function() {
259
259
Player . prototype . say = function ( message ) {
260
260
clearTimeout ( this . message_timeout ) ;
261
261
var el = this . message_element ;
262
- this . message_element . text ( message ) ;
262
+ var chat_log_item = $ ( '<li></li>' ) ;
263
+ chat_log_item . html ( '<span>' + this . pname + ':</span> ' + message ) ;
264
+ $ ( '#chat-log' ) . append ( chat_log_item )
265
+ $ ( '#chat-log' ) . scrollTop ( 1000 )
266
+ this . message_element . html ( message ) ;
263
267
this . message_element . slideDown ( "slow" ) ;
264
268
var _hide_message = function ( ) { el . slideUp ( "slow" ) ; }
265
269
this . message_timeout = setTimeout ( _hide_message , 12000 ) ;
Original file line number Diff line number Diff line change 9
9
< div id ="main ">
10
10
< p id ="room_data "> < span id ="room_name "> {{ map.name }}</ span >
11
11
(< span id ="room_x "> {{ map.x }}</ span > , < span id ="room_y "> {{ map.y }}</ span > </ span > )</ p >
12
- < div id ="tileset -container ">
12
+ < div id ="right -container ">
13
13
< img src ="{{MEDIA_URL}}tileset.png " id ="tileset ">
14
14
< br >
15
15
< input id ="save-map " type ="submit " value ="Save map ">
16
16
< span id ="save-message " style ="display:none "> Map saved.</ span >
17
+
18
+ < ul id ="chat-log "> </ ul >
17
19
</ div >
18
20
19
21
< div id ="map "> </ div >
24
26
</ form >
25
27
< input type ="button " value ="Magic " id ="magic ">
26
28
</ div >
27
-
28
29
< div id ="select "> </ div >
29
30
</ div >
30
31
< script >
You can’t perform that action at this time.
0 commit comments