From 0c5459f96eafe586f6d7f15dff31b65372844dec Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Tue, 5 Feb 2013 20:40:55 +0100 Subject: [PATCH] template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes. --- .../agenda/static/images/icons/summary.png | Bin 299 -> 0 bytes openslides/agenda/static/styles/agenda.css | 14 ---- .../static/javascript/assignment.js | 21 +++--- .../assignment/static/styles/assignment.css | 16 +---- .../assignment/templates/assignment/view.html | 39 +++++++---- .../templates/projector/Assignment.html | 14 ++-- .../motion/templates/motion/base_motion.html | 66 ------------------ openslides/motion/templates/motion/view.html | 26 +++---- .../motion/templates/projector/Motion.html | 14 ++-- .../participant/static/styles/participant.css | 16 ----- .../templates/participant/group_overview.html | 32 ++++++--- .../projector/static/images/icons/clock.png | Bin 1273 -> 0 bytes .../static/images/icons/document-save.png | Bin 563 -> 0 bytes .../projector/static/images/icons/go-down.png | Bin 562 -> 0 bytes .../projector/static/images/icons/go-up.png | Bin 532 -> 0 bytes .../projector/static/images/icons/pause.png | Bin 484 -> 0 bytes .../projector/static/images/icons/play.png | Bin 501 -> 0 bytes .../static/images/icons/skip-backward.png | Bin 511 -> 0 bytes .../static/images/icons/spin-down.png | Bin 269 -> 0 bytes .../projector/static/images/icons/spin-up.png | Bin 255 -> 0 bytes .../static/images/icons/view-reset.png | Bin 370 -> 0 bytes .../projector/static/images/icons/zoom-in.png | Bin 867 -> 0 bytes .../static/images/icons/zoom-out.png | Bin 884 -> 0 bytes .../static/img/glyphicons_054_clock.png | Bin 0 -> 1376 bytes .../static/{images => img}/logo-projector.png | Bin .../presentation-header-bg.png | Bin .../projector/static/styles/projector.css | 4 +- .../projector/templates/base-projector.html | 2 +- .../static/images/icons/accept-grey.png | Bin 3142 -> 0 bytes openslides/static/images/icons/accept.png | Bin 924 -> 0 bytes openslides/static/images/icons/add-user.png | Bin 821 -> 0 bytes openslides/static/images/icons/add.png | Bin 564 -> 0 bytes openslides/static/images/icons/clear.png | Bin 644 -> 0 bytes openslides/static/images/icons/close-grey.png | Bin 379 -> 0 bytes openslides/static/images/icons/close.png | Bin 654 -> 0 bytes openslides/static/images/icons/cross.png | Bin 2836 -> 0 bytes openslides/static/images/icons/delete.png | Bin 640 -> 0 bytes .../static/images/icons/dialog-cancel.png | Bin 848 -> 0 bytes .../static/images/icons/dialog-ok-apply.png | Bin 597 -> 0 bytes openslides/static/images/icons/dialog-ok.png | Bin 601 -> 0 bytes openslides/static/images/icons/done-grey.png | Bin 413 -> 0 bytes openslides/static/images/icons/done.png | Bin 756 -> 0 bytes openslides/static/images/icons/edit.png | Bin 726 -> 0 bytes openslides/static/images/icons/error.png | Bin 722 -> 0 bytes openslides/static/images/icons/export.png | Bin 614 -> 0 bytes openslides/static/images/icons/guest.png | Bin 636 -> 0 bytes openslides/static/images/icons/import.png | Bin 609 -> 0 bytes .../static/images/icons/information.png | Bin 803 -> 0 bytes openslides/static/images/icons/number.png | Bin 694 -> 0 bytes openslides/static/images/icons/off.png | Bin 489 -> 0 bytes openslides/static/images/icons/on.png | Bin 757 -> 0 bytes openslides/static/images/icons/pdf.png | Bin 688 -> 0 bytes openslides/static/images/icons/preview.png | Bin 808 -> 0 bytes openslides/static/images/icons/projector.png | Bin 720 -> 0 bytes .../static/images/icons/reject-grey.png | Bin 3081 -> 0 bytes openslides/static/images/icons/reject.png | Bin 842 -> 0 bytes .../static/images/icons/remove-user.png | Bin 707 -> 0 bytes openslides/static/images/icons/remove.png | Bin 332 -> 0 bytes openslides/static/images/icons/revert.png | Bin 794 -> 0 bytes openslides/static/images/icons/statistics.png | Bin 495 -> 0 bytes openslides/static/images/icons/undo.png | Bin 866 -> 0 bytes .../static/images/icons/user-information.png | Bin 825 -> 0 bytes openslides/static/images/icons/warning.png | Bin 741 -> 0 bytes .../static/img/glyphicons_006_user_add.png | Bin 0 -> 1044 bytes .../icons => img}/voting-abstention.png | Bin .../{images/icons => img}/voting-invalid.png | Bin .../{images/icons => img}/voting-no.png | Bin .../{images/icons => img}/voting-total.png | Bin .../{images/icons => img}/voting-yes-grey.png | Bin .../{images/icons => img}/voting-yes.png | Bin openslides/static/styles/base.css | 6 ++ 71 files changed, 93 insertions(+), 177 deletions(-) delete mode 100644 openslides/agenda/static/images/icons/summary.png delete mode 100644 openslides/motion/templates/motion/base_motion.html delete mode 100644 openslides/projector/static/images/icons/clock.png delete mode 100644 openslides/projector/static/images/icons/document-save.png delete mode 100644 openslides/projector/static/images/icons/go-down.png delete mode 100644 openslides/projector/static/images/icons/go-up.png delete mode 100644 openslides/projector/static/images/icons/pause.png delete mode 100644 openslides/projector/static/images/icons/play.png delete mode 100644 openslides/projector/static/images/icons/skip-backward.png delete mode 100644 openslides/projector/static/images/icons/spin-down.png delete mode 100644 openslides/projector/static/images/icons/spin-up.png delete mode 100644 openslides/projector/static/images/icons/view-reset.png delete mode 100644 openslides/projector/static/images/icons/zoom-in.png delete mode 100644 openslides/projector/static/images/icons/zoom-out.png create mode 100644 openslides/projector/static/img/glyphicons_054_clock.png rename openslides/projector/static/{images => img}/logo-projector.png (100%) rename openslides/projector/static/{images => img}/presentation-header-bg.png (100%) delete mode 100644 openslides/static/images/icons/accept-grey.png delete mode 100644 openslides/static/images/icons/accept.png delete mode 100644 openslides/static/images/icons/add-user.png delete mode 100644 openslides/static/images/icons/add.png delete mode 100644 openslides/static/images/icons/clear.png delete mode 100644 openslides/static/images/icons/close-grey.png delete mode 100644 openslides/static/images/icons/close.png delete mode 100644 openslides/static/images/icons/cross.png delete mode 100644 openslides/static/images/icons/delete.png delete mode 100644 openslides/static/images/icons/dialog-cancel.png delete mode 100644 openslides/static/images/icons/dialog-ok-apply.png delete mode 100644 openslides/static/images/icons/dialog-ok.png delete mode 100644 openslides/static/images/icons/done-grey.png delete mode 100644 openslides/static/images/icons/done.png delete mode 100644 openslides/static/images/icons/edit.png delete mode 100644 openslides/static/images/icons/error.png delete mode 100644 openslides/static/images/icons/export.png delete mode 100644 openslides/static/images/icons/guest.png delete mode 100644 openslides/static/images/icons/import.png delete mode 100644 openslides/static/images/icons/information.png delete mode 100644 openslides/static/images/icons/number.png delete mode 100644 openslides/static/images/icons/off.png delete mode 100644 openslides/static/images/icons/on.png delete mode 100644 openslides/static/images/icons/pdf.png delete mode 100644 openslides/static/images/icons/preview.png delete mode 100644 openslides/static/images/icons/projector.png delete mode 100644 openslides/static/images/icons/reject-grey.png delete mode 100644 openslides/static/images/icons/reject.png delete mode 100644 openslides/static/images/icons/remove-user.png delete mode 100644 openslides/static/images/icons/remove.png delete mode 100644 openslides/static/images/icons/revert.png delete mode 100644 openslides/static/images/icons/statistics.png delete mode 100644 openslides/static/images/icons/undo.png delete mode 100644 openslides/static/images/icons/user-information.png delete mode 100644 openslides/static/images/icons/warning.png create mode 100644 openslides/static/img/glyphicons_006_user_add.png rename openslides/static/{images/icons => img}/voting-abstention.png (100%) rename openslides/static/{images/icons => img}/voting-invalid.png (100%) rename openslides/static/{images/icons => img}/voting-no.png (100%) rename openslides/static/{images/icons => img}/voting-total.png (100%) rename openslides/static/{images/icons => img}/voting-yes-grey.png (100%) rename openslides/static/{images/icons => img}/voting-yes.png (100%) diff --git a/openslides/agenda/static/images/icons/summary.png b/openslides/agenda/static/images/icons/summary.png deleted file mode 100644 index 0f8264c78d78dbbea7fa8f458a86f5394e0f61d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVxZ#d zAk65bF}ngN$X?><>&kwUk(E)CS^wIs#Xup~0G|+7APoU*Ntf7?E_0_p5Xn5{+kH8t z`)JGR3*8&9Z{ECl%a$!$w{G3Jeao)%kI$SrfA;M8Yu9evyZ7Mv^Oyhr{Re`yCss8; zQs1}!-eZk--+wFyrAj--46$I g4&-IjzSzGt?v*H?vj6d;ULe{% trans "elected" %} {% if perms.assignment.can_manage_assignment %} {% if assignment.status == "sea" or assignment.status == "vot" %} - + + + {% endif %} {% endif %} {% endif %} @@ -107,9 +109,9 @@
{{ field }} - + {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %} - + {% endif %}
{% endfor %} @@ -126,7 +128,10 @@
    {% for person in blocked_candidates %}
  • - {{ person }} + {{ person }} + + +
  • {% empty %}
  • {% trans "No blocked candidates available." %}
  • @@ -155,10 +160,14 @@ {{ poll.get_ballot }}. {% trans 'ballot' %} {% if perms.assignment.can_manage_assignment %}
    - - + rel="tooltip" data-original-title="{% trans 'Publish/unpublish results' %}"> + {% if poll.published %} + + {% else %} + + {% endif %} @@ -178,10 +187,10 @@ {% if candidate in assignment.elected %} {% if perms.assignment.can_manage_assignment %} - + {% else %} - + {% endif %} {% else %} @@ -194,11 +203,11 @@ {% for vote in poll_list %} {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %} - {{ vote.Yes }}
    - {{ vote.No }}
    - {{ vote.Abstain }}
    + {{ vote.Yes }}
    + {{ vote.No }}
    + {{ vote.Abstain }}
    {% elif 'Votes' in vote %} - {{ vote.Votes }} + {{ vote.Votes }} {% elif vote == None %} {% trans 'was not a
    candidate'%} {% else %} @@ -217,7 +226,7 @@ {% if poll.published or perms.assignment.can_manage_assignment %} {% if poll.has_votes %} - + {{ poll.print_votesinvalid }} {% endif %} @@ -233,7 +242,7 @@ {% if poll.published or perms.assignment.can_manage_assignment %} {% if poll.has_votes %} - + {{ poll.print_votescast }} {% endif %} diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html index 35c10f64b..761e70bf1 100644 --- a/openslides/assignment/templates/projector/Assignment.html +++ b/openslides/assignment/templates/projector/Assignment.html @@ -66,7 +66,7 @@ {% if candidate in assignment.elected %} - + {% endif %} {{ candidate }} @@ -75,11 +75,11 @@ {% if not assignment_publish_winner_results_only or candidate in assignment.elected %} {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %} - {{ vote.Yes }}
    - {{ vote.No }}
    - {{ vote.Abstain }}
    + {{ vote.Yes }}
    + {{ vote.No }}
    + {{ vote.Abstain }}
    {% elif 'Votes' in vote %} - {{ vote.Votes }} + {{ vote.Votes }} {% elif vote == None %} {% trans 'was not a
    candidate'%} {% else %} @@ -97,7 +97,7 @@ {% for poll in polls %} {% if poll.has_votes %} - + {{ poll.print_votesinvalid }} {% endif %} @@ -112,7 +112,7 @@ {% if poll.has_votes %} - + {{ poll.print_votescast }} {% endif %} diff --git a/openslides/motion/templates/motion/base_motion.html b/openslides/motion/templates/motion/base_motion.html deleted file mode 100644 index 0dc5846a6..000000000 --- a/openslides/motion/templates/motion/base_motion.html +++ /dev/null @@ -1,66 +0,0 @@ -{% extends "base.html" %} - -{% load tags %} -{% load i18n %} -{% load staticfiles %} - -{% block submenu %} - {% url 'motion_overview' as url_motionoverview %} -

    {% trans "Motions" %}

    - - - {# second submenu #} - {% if motion %} -
    -

    {% trans "Motion No." %} - {% if motion.number != None %} - {{ motion.number }} - {% else %} - [-] - {% endif %} -

    - - {% endif %} -{% endblock %} diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html index de7d03936..b3e9256ab 100644 --- a/openslides/motion/templates/motion/view.html +++ b/openslides/motion/templates/motion/view.html @@ -43,7 +43,7 @@