diff --git a/.travis.yml b/.travis.yml index 4772bb138..fdf57462c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - "2.6" - "2.7" install: - - easy_install https://www.djangoproject.com/download/1.5c1/tarball/ + - easy_install https://www.djangoproject.com/download/1.5b2/tarball/ - pip install -r requirements.txt --use-mirrors - python extras/scripts/create_local_settings.py script: diff --git a/extras/benchmark/bench.py b/extras/benchmark/bench.py index 7b9ca4178..31e886d01 100755 --- a/extras/benchmark/bench.py +++ b/extras/benchmark/bench.py @@ -31,12 +31,8 @@ URL_SETS = { "/jsi18n/", "/static/styles/base.css", "/static/javascript/utils.js", - "/static/javascript/jquery.js", - "/static/images/bg-submenu.gif", - "/static/images/bg-header.gif", - "/static/images/logo.png", - "/static/images/icons/dialog-information.png", - "/static/images/icons/cross.png", + "/static/javascript/jquery.min.js", + "/static/img/logo.png", ], "agenda": [ "/agenda/", @@ -44,25 +40,15 @@ URL_SETS = { "/static/styles/tabledrag.css", "/static/javascript/utils.js", "/static/styles/agenda.css", - "/static/javascript/jquery.js", + "/static/javascript/jquery.min.js", "/jsi18n/", - "/static/images/bg-header.gif", - "/static/images/bg-submenu.gif", - "/static/images/logo.png", - "/static/images/icons/application-pdf.png", - "/static/images/icons/cross.png", ], "application": [ "/application/", "/static/styles/base.css", "/static/javascript/utils.js", - "/static/javascript/jquery.js", + "/static/javascript/jquery.min.js", "/jsi18n/", - "/static/images/bg-header.gif", - "/static/images/bg-submenu.gif", - "/static/images/icons/cross.png", - "/static/images/logo.png", - "/static/images/icons/application-pdf.png", ] } diff --git a/openslides/agenda/static/javascript/agenda.js b/openslides/agenda/static/javascript/agenda.js index 93b2db91c..69432803f 100644 --- a/openslides/agenda/static/javascript/agenda.js +++ b/openslides/agenda/static/javascript/agenda.js @@ -20,7 +20,7 @@ function hideClosedSlides(hide) { if (hide) { $('#hidelink').attr('title', 'show'); $('#hidelink').removeClass('hide').addClass('show'); - $('.close_link.closed').parent().parent().each(function() { + $('.close_link .icon-checked-new').parent().parent().parent().each(function() { hideLine($(this)); }); hidden = $('#menu-overview tr:hidden').size(); @@ -35,21 +35,26 @@ function hideClosedSlides(hide) { } $(function() { - $('.close_link a').click(function(event) { + // change participant status (on/off) + $('.close_link').click(function(event) { event.preventDefault(); - slide = $(this); + var link = $(this); $.ajax({ type: 'GET', - url: slide.attr('href'), + url: $(this).attr('href'), dataType: 'json', success: function(data) { if (data.closed) { - newclass = 'closed'; + newclass = 'icon-checked-new'; + link.parent().parent().addClass('offline'); + link.addClass('btn-success'); } else { - newclass = 'open'; + newclass = 'icon-unchecked-new'; + link.parent().parent().removeClass('offline'); + link.removeClass('btn-success'); } - slide.parent().removeClass('closed open').addClass(newclass); - slide.attr('href', data.link); + link.children('i').removeClass('icon-checked-new icon-unchecked-new').addClass(newclass); + link.attr('href', data.link); } }); }); diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css index 611d19646..3851b9db8 100644 --- a/openslides/agenda/static/styles/agenda.css +++ b/openslides/agenda/static/styles/agenda.css @@ -19,6 +19,7 @@ background-image: url(../images/icons/close.png); } -table#menu-overview { - white-space: nowrap; -} +tr.topline td { + border-bottom: 1px solid #333333; + background-color: #CDCDCD; +} \ No newline at end of file diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html deleted file mode 100644 index be70f6f40..000000000 --- a/openslides/agenda/templates/agenda/base_agenda.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "base.html" %} - -{% load tags %} -{% load i18n %} -{% load staticfiles %} - -{% block submenu %} - {% url 'item_overview' as url_itemoverview %} - {% url 'item_new' as url_itemnew %} -