Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

work in progress improvements to schedule edit styling

Browse source
This commit is contained in:
James Tauber 2012-08-30 12:26:41 -04:00
parent 95d182e528
commit 38e2124c64
2 changed files with 26 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
symposion/templates/schedule/_grid.html
View file

@ -1,4 +1,4 @@
<table class="table"> <table class="table table-bordered table-condensed">
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
{% for room in timetable.rooms %} {% for room in timetable.rooms %}
@ -9,8 +9,8 @@
<tr> <tr>
<td class="time">{{ row.time|date:"h:iA" }}</td> <td class="time">{{ row.time|date:"h:iA" }}</td>
{% for slot in row.slots %} {% for slot in row.slots %}
<td colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}"> <td class="slot" colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}">
<span class="controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "plenary" #}" rel="facebox">plenary</a> | <a href="{# url schedule_slot_add slot.pk "break" #}" rel="facebox">break</a> | <a href="{# url schedule_slot_add slot.pk "presentation" #}" rel="facebox">presentation</a></span> <span class="schedule-controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "plenary" #}" rel="facebox">plenary</a> | <a href="{# url schedule_slot_add slot.pk "break" #}" rel="facebox">break</a> | <a href="{# url schedule_slot_add slot.pk "presentation" #}" rel="facebox">presentation</a></span>
</td> </td>
{% comment %} {% comment %}
<td colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}" class="slot {{ slot.kind.name }} rowspan-{{ slot.rowspan }} colspan-{{ slot.colspan }}"> <td colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}" class="slot {{ slot.kind.name }} rowspan-{{ slot.rowspan }} colspan-{{ slot.colspan }}">

68
symposion/templates/schedule/schedule_edit.html
View file

@ -10,29 +10,34 @@
{% block extra_head %} {% block extra_head %}
<link rel="stylesheet" href="{{ STATIC_URL }}css/facebox.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}css/facebox.css" />
<style> <style>
/*
body {
font-family: "Helvetica Neue", Arial, "Helvetica";
}
#wrapper {
width: 960px;
}
table {
border-collapse: collapse;
font-weight: normal;
line-height: 1.1em;
}
td { td {
padding: 4px 8px; font-size: 9pt;
border: 1px solid #666;
vertical-align: top;
} }
td.slot { td.slot {
text-align: center; text-align: center;
background: #FFF; vertical-align: middle;
font-size: 10pt;
width: 180px;
} }
td.time {
vertical-align: top;
width: 50px;
font-size: 8pt;
padding-top: 0;
}
td.slot:hover .schedule-controls {
display: block;
}
.schedule-controls {
display: none;
font-size: 8pt;
}
.schedule-controls a {
text-decoration: none;
color: #000;
}
.schedule-controls a:hover {
color: #999;
}
/*
td.slot.recess, td.slot.recess,
td.slot.recess.colspan-1.rowspan-1, td.slot.recess.colspan-1.rowspan-1,
td.slot.recess.colspan-1.rowspan-2 { td.slot.recess.colspan-1.rowspan-2 {
@ -48,39 +53,12 @@
font-style: italic; font-style: italic;
font-size: 8pt; font-size: 8pt;
} }
th {
font-size: 12pt;
background: #FFF;
padding: 2px 4px;
border: none;
border-right: 1px solid #666;
}
td.time {
width: 50px;
font-size: 9pt;
border: none;
border-top: 1px solid #666;
}
td.colspan-1.rowspan-1 { td.colspan-1.rowspan-1 {
background: #FFFCC9; background: #FFFCC9;
} }
td.colspan-1.rowspan-2 { td.colspan-1.rowspan-2 {
background: #FDA; background: #FDA;
} }
td.slot:hover .controls {
display: block;
}
.controls {
display: none;
font-size: 8pt;
}
.controls a {
text-decoration: none;
color: #000;
}
.controls a:hover {
color: #999;
}
#facebox h3 { #facebox h3 {
margin-top: 0; margin-top: 0;
} }