Skip to content

Commit 61cf127

Browse files
committed
info side panel
- Legacy-Id: 5414
1 parent f5833c4 commit 61cf127

4 files changed

Lines changed: 180 additions & 48 deletions

File tree

v4.41/ietf/meeting/ajax.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,33 @@ def update_timeslot(request, new_event):
3535
print e
3636

3737
return simplejson.dumps({'message':'im happy!'})
38+
39+
40+
@dajaxice_register
41+
def get_info(request, meeting_obj):#, event):
42+
# print event
43+
# try:
44+
# ss = ScheduledSession.objects.get(id=int(event["session_id"]))
45+
# print ss
46+
# except Exception as e:
47+
# print e
48+
ss = ScheduledSession.objects.get(id=int(meeting_obj["session_id"]))
49+
50+
return simplejson.dumps({'room':str(ss.timeslot.location),
51+
'group':str(ss.session.group),
52+
'name':str(ss.session.name),
53+
'short_name':str(ss.session.name),
54+
'agenda_note':str(ss.session.agenda_note),
55+
'attendees':str(ss.session.attendees),
56+
'status': str(ss.session.status),
57+
'requested_time': str(ss.session.requested),
58+
'requested_by': str(ss.session.requested_by),
59+
'requested_duration': str(ss.session.requested_duration),
60+
'ss_name':str(ss.schedule.name),
61+
'ss_owner':str(ss.schedule.owner),
62+
'ss_visible':str(ss.schedule.visible),
63+
'ss_public':str(ss.schedule.public),
64+
'ts_time':str(ss.timeslot.time),
65+
'ts_duration':str(ss.timeslot.duration),
66+
67+
})

v4.41/ietf/templates/meeting/edit_agenda.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<tr id="{{r|nospace}}">
124124
<th class="vert_time">{{r}}</th>
125125
{% for slot in date_slices|lookup:day %}
126-
<td id="{{r|slugify}}_{{day}}_{{slot.0|date:'Hi'}}" class="{% cycle 'alt' '' %}" style="background:#606060 "></td>
126+
<td id="{{r|slugify}}_{{day}}_{{slot.0|date:'Hi'}}" class="agenda_slot {% cycle 'alt' '' %}" style="background:#606060 "></td>
127127
{% endfor %}
128128
</tr>
129129
{% endfor %}
@@ -136,11 +136,15 @@
136136

137137
</div>
138138

139-
<div style="height:119px"></div> <!-- Not sure why I need this, but it's there to push the sortablelist down (otherwise it moves the table too) -->
139+
<div id="ss_info" style="height:119px;">
140+
141+
142+
</div> <!-- Not sure why I need this, but it's there to push the sortablelist down (otherwise it moves the table too) -->
140143

141144
<div id="sortable-list" style="margin-top:120px; border:1px solid black; height:400px; width:200px;overflow:scroll;">
142145
<div style="background-color:maroon; "><b>Unassigned Events:</b></div>
143146

147+
144148
</div>
145149
</div>
146150

v4.41/static/css/ietf.css

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,12 @@ span {
126126

127127
/* Cell Styles
128128
------------------------------------------------------------------------*/
129-
.room_title {
130-
width:128px;
131-
// background-color:#666666;
132-
background-color:#C00000;
129+
.room_title /* tr th */ {
130+
width:150px;
131+
min-width:150px;
132+
max-width:150px;
133+
background-color:#A60000;
134+
/* // background-color:#C00000; */
133135
border:1px solid black;
134136
color:white;
135137
}
@@ -148,7 +150,7 @@ span {
148150
... */
149151

150152
.cells tr td{
151-
width:132px;
153+
/* width:132px; */
152154
//background-color:#dedede;
153155

154156
border:0px solid ;
@@ -160,7 +162,7 @@ span {
160162
}
161163

162164
.cells tr td.alt{
163-
width:132px;
165+
/* width:132px; */
164166
background-color:#dedede;
165167

166168
border:0px solid ;
@@ -187,10 +189,10 @@ span {
187189
}
188190

189191

190-
.event_title
191-
{
192+
/* .event_title */
193+
/* { */
192194

193-
}
195+
/* } */
194196
span.event_title{
195197
background:aqua;
196198
align:right;
@@ -201,33 +203,52 @@ table.meeting_event {
201203
background:#E0FFFF;
202204

203205
border-radius: 4px;
204-
margin:8px;
205-
206+
// margin:8px;
207+
width:160px;
208+
/* width:100%; */
209+
max-width:250px;
210+
height:67px;
211+
cursor:pointer;
206212
}
207213

208214
.meeting_event th{
209215
// background:#E6E6FA;
216+
padding:0px;
210217
background-color:#ff7373;
211-
font-size: 8px;
212-
text-align:left;
218+
font-size: 10px;
219+
text-align:center;
213220
border:1px solid blue;
221+
height:8px;
214222

215223
}
216224

225+
/* #meeting_event_title tr{ */
226+
/* height:10px; */
227+
/* // background-color:#ff7373; */
228+
/* } */
229+
230+
.agenda_slot{
231+
max-width:10px;
232+
233+
}
234+
217235
.meeting_event tr td{
218236
padding:0px;
219237
background-color:white;
220238
float: inherit;
221-
font-size: 8px;
239+
font-size: 9px;
222240
text-align:left;
223241
vertical-align:text-top;
224-
width:128px;
225-
height:10px;
242+
/* width:128px; */
243+
/* height:10px; */
244+
width:100%;
245+
246+
height:100%;
226247
border:1px solid blue;
227-
border-radius: 15px;
248+
border-radius: 4px;
228249

229250

230251
}
231-
.ui-effects-transfer {
232-
border: 1px dotted black;
233-
}
252+
.ui-effects-transfer {
253+
border: 1px dotted black;
254+
}

0 commit comments

Comments
 (0)