Some style changes for projector and agenda template.
This commit is contained in:
parent
fdc83048f4
commit
5e6180a465
@ -25,9 +25,6 @@
|
|||||||
<a class="close_link {% if item.closed %}closed{% else %}open{% endif %}" href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}">
|
<a class="close_link {% if item.closed %}closed{% else %}open{% endif %}" href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}">
|
||||||
<span></span>
|
<span></span>
|
||||||
</a>
|
</a>
|
||||||
{% if item.children.exists %}
|
|
||||||
<a href="{% url item_activate_summary item.id %}"><img src="/static/images/icons/view-list-tree.png" title="{% trans 'Select item overview' %}"></a>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
|
@ -60,7 +60,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="topline {% if overview %}activeline{% endif %}">
|
<tr class="topline {% if overview %}activeline{% endif %}">
|
||||||
<td>{{overview}}</td>
|
<td></td>
|
||||||
<td>
|
<td>
|
||||||
<b>{% trans "Agenda" %} ({{ items|length }} {% trans "items" %}<span id="hiddencount"></span>)</b>
|
<b>{% trans "Agenda" %} ({{ items|length }} {% trans "items" %}<span id="hiddencount"></span>)</b>
|
||||||
</td>
|
</td>
|
||||||
|
@ -78,15 +78,24 @@
|
|||||||
{% if slide.model_slide %}
|
{% if slide.model_slide %}
|
||||||
<ul style="line-height: 180%">
|
<ul style="line-height: 180%">
|
||||||
{% for item in slide.get_items %}
|
{% for item in slide.get_items %}
|
||||||
<li><a href="{% url projector_activate_slide item.sid %}"
|
<li class="{% if item.active %}activeline{% endif %}"><a href="{% url projector_activate_slide item.sid %}"
|
||||||
class="activate_link {% if item.active %}active{% endif %}"
|
class="activate_link {% if item.active %}active{% endif %}"
|
||||||
><div></div></a><a href="{% url projector_edit_slide item.id %}">{{ item }}</a></li>
|
><div></div></a>
|
||||||
|
{% for i in item.get_ancestors %} {% endfor %}
|
||||||
|
<a href="{% url projector_edit_slide item.id %}">{{ item }}</a>
|
||||||
|
{% if item.children.exists %}
|
||||||
|
<a href="{% url projector_activate_summary item.sid %}"><img src="/static/images/icons/view-list-tree.png" title="{% trans 'Select item overview' %}"></a>
|
||||||
|
{% endif %}
|
||||||
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
{% else %}
|
{% else %}
|
||||||
<a href="{% url projector_activate_slide slide.key %}"
|
<hr>
|
||||||
|
<ul style="line-height: 180%">
|
||||||
|
<li><a href="{% url projector_activate_slide slide.key %}"
|
||||||
class="activate_link {% if slide.active %}active{% endif %}"
|
class="activate_link {% if slide.active %}active{% endif %}"
|
||||||
><div></div></a>{{ slide.key }}
|
><div></div></a>{{ slide.key }}</li>
|
||||||
|
</ul>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
@ -33,6 +33,12 @@ urlpatterns = patterns('projector.views',
|
|||||||
name='projector_activate_slide',
|
name='projector_activate_slide',
|
||||||
),
|
),
|
||||||
|
|
||||||
|
url(r'^activate/(?P<sid>[^/]*)/summary/$',
|
||||||
|
ActivateView.as_view(),
|
||||||
|
{'summary': True},
|
||||||
|
name='projector_activate_summary',
|
||||||
|
),
|
||||||
|
|
||||||
url(r'^edit/(?P<pk>\d+)/$',
|
url(r'^edit/(?P<pk>\d+)/$',
|
||||||
ItemUpdate.as_view(),
|
ItemUpdate.as_view(),
|
||||||
name='projector_edit_slide',
|
name='projector_edit_slide',
|
||||||
|
@ -10,6 +10,7 @@ $(function() {
|
|||||||
data: '',
|
data: '',
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
$('.activate_link').removeClass('active');
|
$('.activate_link').removeClass('active');
|
||||||
|
$('li').removeClass('activeline');
|
||||||
link.addClass('active');
|
link.addClass('active');
|
||||||
},
|
},
|
||||||
error: function () {
|
error: function () {
|
||||||
|
@ -230,7 +230,7 @@ table a.table_edit {
|
|||||||
.agendatable td.dragcell {
|
.agendatable td.dragcell {
|
||||||
padding: 0px 0 0px 10px;
|
padding: 0px 0 0px 10px;
|
||||||
}
|
}
|
||||||
.agendatable tr.activeline td {
|
.agendatable tr.activeline td, .activeline {
|
||||||
background-color: #bed4de;
|
background-color: #bed4de;
|
||||||
}
|
}
|
||||||
.agendatable td img.center {
|
.agendatable td img.center {
|
||||||
|
@ -23,6 +23,9 @@
|
|||||||
padding: 0.4em;
|
padding: 0.4em;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
.portlet-content li{
|
||||||
|
padding: 4px 0;
|
||||||
|
}
|
||||||
.ui-sortable-placeholder {
|
.ui-sortable-placeholder {
|
||||||
border: 1px dotted black;
|
border: 1px dotted black;
|
||||||
visibility: visible !important;
|
visibility: visible !important;
|
||||||
@ -69,7 +72,10 @@ a.activate_link div {
|
|||||||
float: left;
|
float: left;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
height: 16px;
|
height: 16px;
|
||||||
padding-right: 10px;
|
padding-right: 16px;
|
||||||
|
position: relative;
|
||||||
|
top: 4px;
|
||||||
|
left: 4px;
|
||||||
}
|
}
|
||||||
a.activate_link.active div {
|
a.activate_link.active div {
|
||||||
background-image: url(/static/images/icons/task-accepted.png);
|
background-image: url(/static/images/icons/task-accepted.png);
|
||||||
|
Loading…
Reference in New Issue
Block a user