From d56dcba7d4b34e93e1882054087d62a1d4b591f1 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 23 Apr 2012 21:27:22 +0200 Subject: [PATCH 1/5] #119: Adjusted icon filenames. --- openslides/agenda/static/styles/agenda.css | 4 +- .../agenda/templates/agenda/item_row.html | 4 +- .../application/base_application.html | 4 +- .../templates/application/overview.html | 4 +- .../templates/application/view.html | 18 +++--- .../templates/assignment/overview.html | 4 +- .../assignment/templates/assignment/view.html | 14 ++--- openslides/locale/de/LC_MESSAGES/django.po | 2 +- .../participant/static/styles/participant.css | 4 +- .../templates/participant/group_overview.html | 4 +- .../templates/participant/overview.html | 4 +- .../{media-playback-pause.png => pause.png} | Bin .../{media-playback-start.png => play.png} | Bin ...ia-skip-backward.png => skip-backward.png} | Bin .../{view-restore.png => view-reset.png} | Bin .../static/styles/projector-control.css | 8 +-- .../templates/projector/base_projector.html | 2 +- .../templates/projector/control.html | 8 +-- ...task-accepted-grey.png => accept-grey.png} | Bin .../icons/{task-accepted.png => accept.png} | Bin .../icons/{list-add-user.png => add-user.png} | Bin .../images/icons/{list-add.png => add.png} | Bin .../icons/{edit-delete.png => delete.png} | Bin .../{task-complete-grey.png => done-grey.png} | Bin .../icons/{task-complete.png => done.png} | Bin .../icons/{document-edit.png => edit.png} | Bin .../icons/{document-export.png => export.png} | Bin .../static/images/icons/games-endturn.png | Bin 575 -> 0 bytes .../static/images/icons/go-previous.png | Bin 634 -> 0 bytes .../icons/{user-identity.png => guest.png} | Bin openslides/static/images/icons/help-hint.png | Bin 694 -> 0 bytes .../icons/{document-import.png => import.png} | Bin .../static/images/icons/list-remove.png | Bin 332 -> 0 bytes .../icons/{milestone.png => number.png} | Bin .../icons/{user-offline.png => off.png} | Bin .../images/icons/{user-online.png => on.png} | Bin .../static/images/icons/pdf-annotations.png | Bin 745 -> 0 bytes .../static/images/icons/process-stop.png | Bin 722 -> 0 bytes .../{video-projector.png => projector.png} | Bin openslides/static/images/icons/rating.png | Bin 665 -> 0 bytes .../{task-reject-grey.png => reject-grey.png} | Bin .../icons/{task-reject.png => reject.png} | Bin .../{list-remove-user.png => remove-user.png} | Bin .../icons/{document-revert.png => revert.png} | Bin .../{view-statistics.png => statistics.png} | Bin .../images/icons/{edit-undo.png => undo.png} | Bin .../static/images/icons/view-list-details.png | Bin 287 -> 0 bytes .../static/images/icons/view-list-icons.png | Bin 280 -> 0 bytes .../static/images/icons/view-list-text.png | Bin 257 -> 0 bytes .../static/images/icons/view-list-tree.png | Bin 299 -> 0 bytes .../static/images/icons/view-presentation.png | Bin 618 -> 0 bytes .../images/icons/view-sort-ascending.png | Bin 632 -> 0 bytes .../icons/{task-attention.png => warning.png} | Bin openslides/static/styles/base.css | 53 +++++++----------- 54 files changed, 63 insertions(+), 74 deletions(-) rename openslides/projector/static/images/icons/{media-playback-pause.png => pause.png} (100%) rename openslides/projector/static/images/icons/{media-playback-start.png => play.png} (100%) rename openslides/projector/static/images/icons/{media-skip-backward.png => skip-backward.png} (100%) rename openslides/projector/static/images/icons/{view-restore.png => view-reset.png} (100%) rename openslides/static/images/icons/{task-accepted-grey.png => accept-grey.png} (100%) rename openslides/static/images/icons/{task-accepted.png => accept.png} (100%) rename openslides/static/images/icons/{list-add-user.png => add-user.png} (100%) rename openslides/static/images/icons/{list-add.png => add.png} (100%) rename openslides/static/images/icons/{edit-delete.png => delete.png} (100%) rename openslides/static/images/icons/{task-complete-grey.png => done-grey.png} (100%) rename openslides/static/images/icons/{task-complete.png => done.png} (100%) rename openslides/static/images/icons/{document-edit.png => edit.png} (100%) rename openslides/static/images/icons/{document-export.png => export.png} (100%) delete mode 100644 openslides/static/images/icons/games-endturn.png delete mode 100644 openslides/static/images/icons/go-previous.png rename openslides/static/images/icons/{user-identity.png => guest.png} (100%) delete mode 100644 openslides/static/images/icons/help-hint.png rename openslides/static/images/icons/{document-import.png => import.png} (100%) delete mode 100644 openslides/static/images/icons/list-remove.png rename openslides/static/images/icons/{milestone.png => number.png} (100%) rename openslides/static/images/icons/{user-offline.png => off.png} (100%) rename openslides/static/images/icons/{user-online.png => on.png} (100%) delete mode 100644 openslides/static/images/icons/pdf-annotations.png delete mode 100644 openslides/static/images/icons/process-stop.png rename openslides/static/images/icons/{video-projector.png => projector.png} (100%) delete mode 100644 openslides/static/images/icons/rating.png rename openslides/static/images/icons/{task-reject-grey.png => reject-grey.png} (100%) rename openslides/static/images/icons/{task-reject.png => reject.png} (100%) rename openslides/static/images/icons/{list-remove-user.png => remove-user.png} (100%) rename openslides/static/images/icons/{document-revert.png => revert.png} (100%) rename openslides/static/images/icons/{view-statistics.png => statistics.png} (100%) rename openslides/static/images/icons/{edit-undo.png => undo.png} (100%) delete mode 100644 openslides/static/images/icons/view-list-details.png delete mode 100644 openslides/static/images/icons/view-list-icons.png delete mode 100644 openslides/static/images/icons/view-list-text.png delete mode 100644 openslides/static/images/icons/view-list-tree.png delete mode 100644 openslides/static/images/icons/view-presentation.png delete mode 100644 openslides/static/images/icons/view-sort-ascending.png rename openslides/static/images/icons/{task-attention.png => warning.png} (100%) diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css index 760e57598..7c3700e9e 100644 --- a/openslides/agenda/static/styles/agenda.css +++ b/openslides/agenda/static/styles/agenda.css @@ -1,6 +1,6 @@ /* agenda item open/closed */ a.close_link span { - background-image: url(../images/icons/task-complete-grey.png); + background-image: url(../images/icons/done-grey.png); background-repeat: no-repeat; background-position: center; width: 16px; @@ -8,5 +8,5 @@ a.close_link span { display: inline-block; } a.close_link.closed span { - background-image: url(../images/icons/task-complete.png); + background-image: url(../images/icons/done.png); } diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index fa871aad3..eebe20c86 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -7,7 +7,7 @@ {% elif item.closed %} - + {% endif %} @@ -29,7 +29,7 @@ {% endif %} {% if perms.agenda.can_manage_agenda %} - + {% endif %} diff --git a/openslides/application/templates/application/base_application.html b/openslides/application/templates/application/base_application.html index 67fc2caa3..dac22d596 100644 --- a/openslides/application/templates/application/base_application.html +++ b/openslides/application/templates/application/base_application.html @@ -45,9 +45,9 @@
  • {%trans 'Application as PDF' %}
    • {# activate and polls #} {% if perms.projector.can_manage_projector %} -
  • {%trans 'Show Application' %}
    • +
  • {%trans 'Show Application' %}
    • {% if "genpoll" in actions %} -
  • {%trans 'New vote' %}
    • +
  • {%trans 'New vote' %}
    • {% endif %} {% for poll in application.polls %} {% url application_poll_view poll.id as url_applicationpollview %} diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html index 3922542f4..b485b38f8 100644 --- a/openslides/application/templates/application/overview.html +++ b/openslides/application/templates/application/overview.html @@ -68,8 +68,8 @@ {% endif %} {% if perms.application.can_manage_application %} - - + + {% endif %} diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index 575d002e4..f296ca7dc 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -50,7 +50,7 @@ {% if perms.application.can_manage_application %} {% if "genpoll" in actions %} - {%trans 'New vote' %} + {%trans 'New vote' %} {% else %} - @@ -68,7 +68,7 @@ {{ forloop.counter }}. {% trans "Vote" %}: - + {% elif poll.has_votes %} {{ forloop.counter }}. {% trans "Vote" %}: @@ -88,7 +88,7 @@ {% if forloop.last %} {% if "genpoll" in actions %} - {%trans 'New vote' %} + {%trans 'New vote' %} {% endif %} {% endif %} @@ -149,7 +149,7 @@ {% trans 'Permit' %} {% endif %} {% if "nop" in actions %} - {% trans 'Not permit (reject)' %} + {% trans 'Not permit (reject)' %} {% endif %} {% if "setnumber" in actions %} {% trans 'Set Number' %} @@ -162,7 +162,7 @@

    {% trans "Result after vote" %}:

    {% if "acc" in actions %} - {%trans 'Accepted' %} + {%trans 'Accepted' %} {% endif %} {% if "rej" in actions %} @@ -250,17 +250,17 @@ {% if application.status != "pub" %} {% if revision == application.permitted %} - + {% else %} {% if perms.application.can_manage_application %} - + {% endif %} {% if not revision.rejected and revision.id > application.permitted.id and perms.application.can_manage_application %} - + {% endif %} {% endif %} {% if revision.rejected %} - + {% endif %} {% endif %} diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html index 98c835876..4c59da819 100644 --- a/openslides/assignment/templates/assignment/overview.html +++ b/openslides/assignment/templates/assignment/overview.html @@ -40,8 +40,8 @@ {% endif %} {% if perms.assignment.can_manage_assignment %} - - + + {% endif %} diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html index 163161b5b..c8e736298 100644 --- a/openslides/assignment/templates/assignment/view.html +++ b/openslides/assignment/templates/assignment/view.html @@ -64,7 +64,7 @@
  • {{ profile }} {% if perms.assignment.can_manage_assignment %} {% if assignment.status == "sea" or assignment.status == "vot" %} - + {% endif %} {% endif %}
    • @@ -101,7 +101,7 @@ {{ field }} {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %} - + {% endif %} {% endfor %} @@ -138,14 +138,14 @@ {% if poll.published %} {% else %} {% endif %} - + {% endif %} {# endif #} @@ -154,7 +154,7 @@ - {%trans 'New ballot' %} + {%trans 'New ballot' %} @@ -231,7 +231,7 @@ {% if assignment.profile.count > 0 and perms.assignment.can_manage_assignment and assignment.status == "vot" %}

    - {%trans 'New ballot' %} + {%trans 'New ballot' %}

    {% endif %} diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 52c5429b9..4abfeaca9 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -1007,7 +1007,7 @@ msgstr "Version akzeptiert" #: application/templates/application/view.html:256 msgid "Accept Version" -msgstr "Zugelassene Version" +msgstr "Version zulassen" #: application/templates/application/view.html:259 msgid "Reject Version" diff --git a/openslides/participant/static/styles/participant.css b/openslides/participant/static/styles/participant.css index ae2bb0c56..3292dc417 100644 --- a/openslides/participant/static/styles/participant.css +++ b/openslides/participant/static/styles/participant.css @@ -1,5 +1,5 @@ a.status_link.active span { - background-image: url(../images/icons/user-online.png); + background-image: url(../images/icons/on.png); background-repeat: no-repeat; background-position: center; width: 16px; @@ -7,7 +7,7 @@ a.status_link.active span { display: inline-block; } a.status_link.inactive span { - background-image: url(../images/icons/user-offline.png); + background-image: url(../images/icons/off.png); background-repeat: no-repeat; background-position: center; width: 16px; diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html index ee685aa08..e355ccc9a 100644 --- a/openslides/participant/templates/participant/group_overview.html +++ b/openslides/participant/templates/participant/group_overview.html @@ -15,9 +15,9 @@ {% for group in groups %} {{ group.name }} - + {% if group.name != 'Anonymous' %} - + {% endif %} diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html index 0d695d69b..e13f4a4ca 100644 --- a/openslides/participant/templates/participant/overview.html +++ b/openslides/participant/templates/participant/overview.html @@ -85,8 +85,8 @@ {{ user.last_login }} {% endif %} - - + + diff --git a/openslides/projector/static/images/icons/media-playback-pause.png b/openslides/projector/static/images/icons/pause.png similarity index 100% rename from openslides/projector/static/images/icons/media-playback-pause.png rename to openslides/projector/static/images/icons/pause.png diff --git a/openslides/projector/static/images/icons/media-playback-start.png b/openslides/projector/static/images/icons/play.png similarity index 100% rename from openslides/projector/static/images/icons/media-playback-start.png rename to openslides/projector/static/images/icons/play.png diff --git a/openslides/projector/static/images/icons/media-skip-backward.png b/openslides/projector/static/images/icons/skip-backward.png similarity index 100% rename from openslides/projector/static/images/icons/media-skip-backward.png rename to openslides/projector/static/images/icons/skip-backward.png diff --git a/openslides/projector/static/images/icons/view-restore.png b/openslides/projector/static/images/icons/view-reset.png similarity index 100% rename from openslides/projector/static/images/icons/view-restore.png rename to openslides/projector/static/images/icons/view-reset.png diff --git a/openslides/projector/static/styles/projector-control.css b/openslides/projector/static/styles/projector-control.css index 984a738fc..62e3e8ae9 100644 --- a/openslides/projector/static/styles/projector-control.css +++ b/openslides/projector/static/styles/projector-control.css @@ -67,7 +67,7 @@ } /* countdown */ a.countdown_visible_link.closed div { - background-image: url(../images/icons/user-offline.png); + background-image: url(../images/icons/off.png); background-repeat: no-repeat; background-position: center; width: 16px; @@ -75,7 +75,7 @@ a.countdown_visible_link.closed div { display: inline-block; } a.countdown_visible_link.open div { - background-image: url(../images/icons/user-online.png); + background-image: url(../images/icons/on.png); background-repeat: no-repeat; background-position: center; width: 16px; @@ -84,7 +84,7 @@ a.countdown_visible_link.open div { } /* activate link */ a.activate_link div { - background-image: url(../images/icons/task-accepted-grey.png); + background-image: url(../images/icons/accept-grey.png); background-repeat: no-repeat; float: left; width: 16px; @@ -95,5 +95,5 @@ a.activate_link div { left: 4px; } a.activate_link.active div { - background-image: url(../images/icons/task-accepted.png); + background-image: url(../images/icons/accept.png); } diff --git a/openslides/projector/templates/projector/base_projector.html b/openslides/projector/templates/projector/base_projector.html index 163c9f8ef..73bfb2e5b 100644 --- a/openslides/projector/templates/projector/base_projector.html +++ b/openslides/projector/templates/projector/base_projector.html @@ -17,7 +17,7 @@ {% endif %} {% if perms.projector.can_see_projector %}
  • - {% trans 'Projector view' %} + {% trans 'Projector view' %}
    • {% endif %} diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/control.html index 39648f1ee..f685e4a40 100644 --- a/openslides/projector/templates/projector/control.html +++ b/openslides/projector/templates/projector/control.html @@ -55,7 +55,7 @@ - + @@ -113,13 +113,13 @@ | {{countdown_time}}{% trans "sec" %} - + - + - + {% endif %} {% if overlay.def_name == "Message" %} diff --git a/openslides/static/images/icons/task-accepted-grey.png b/openslides/static/images/icons/accept-grey.png similarity index 100% rename from openslides/static/images/icons/task-accepted-grey.png rename to openslides/static/images/icons/accept-grey.png diff --git a/openslides/static/images/icons/task-accepted.png b/openslides/static/images/icons/accept.png similarity index 100% rename from openslides/static/images/icons/task-accepted.png rename to openslides/static/images/icons/accept.png diff --git a/openslides/static/images/icons/list-add-user.png b/openslides/static/images/icons/add-user.png similarity index 100% rename from openslides/static/images/icons/list-add-user.png rename to openslides/static/images/icons/add-user.png diff --git a/openslides/static/images/icons/list-add.png b/openslides/static/images/icons/add.png similarity index 100% rename from openslides/static/images/icons/list-add.png rename to openslides/static/images/icons/add.png diff --git a/openslides/static/images/icons/edit-delete.png b/openslides/static/images/icons/delete.png similarity index 100% rename from openslides/static/images/icons/edit-delete.png rename to openslides/static/images/icons/delete.png diff --git a/openslides/static/images/icons/task-complete-grey.png b/openslides/static/images/icons/done-grey.png similarity index 100% rename from openslides/static/images/icons/task-complete-grey.png rename to openslides/static/images/icons/done-grey.png diff --git a/openslides/static/images/icons/task-complete.png b/openslides/static/images/icons/done.png similarity index 100% rename from openslides/static/images/icons/task-complete.png rename to openslides/static/images/icons/done.png diff --git a/openslides/static/images/icons/document-edit.png b/openslides/static/images/icons/edit.png similarity index 100% rename from openslides/static/images/icons/document-edit.png rename to openslides/static/images/icons/edit.png diff --git a/openslides/static/images/icons/document-export.png b/openslides/static/images/icons/export.png similarity index 100% rename from openslides/static/images/icons/document-export.png rename to openslides/static/images/icons/export.png diff --git a/openslides/static/images/icons/games-endturn.png b/openslides/static/images/icons/games-endturn.png deleted file mode 100644 index 909a2f0d792d204c4d5abaf437cc7c38f87d9858..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 575 zcmV-F0>J%=P)`uymQ#!p8kUzWO+MDwJ-S@5_Y2Ap)qaCVU4UKc)nNG zU)C4QDjRy0N4SVNe6G}}1w&aaNTq5*9Anh#4LlUx5Y0+f)KaBEBinRbW5)NQCXVGt ztiswArM7*n|HkPYju z8;P>cz#Z8=w8*maf>n(u=qgbox+(b~=_S{UJdt&3w?q#ltt5ypsJ)U!Nv9=vIqv=` z!72`x-oM8Q49gTQ30`PKbk=cTI{`$s4yOfgFkJ@P3zF;#Ry3kY=Vy5^Dj7*vWUYzL zN;b=Qljy2sWnAPKW{a-*omHO0GQNmrbb4n5uVo9OW#1(8+M<-7`#egenDsqLORfDxu8Q$=)(Eo@Bqdcmzf&hUzY zcCz#{0000YdQ@0+Q*UN;cVTj6004N}D=#nC%goCzPEIUH)ypqR2LLwM23QbN%3J^d N002ovPDHLkV1lr~|1SUl diff --git a/openslides/static/images/icons/go-previous.png b/openslides/static/images/icons/go-previous.png deleted file mode 100644 index 940797b8a588cd4a74ce79ffd8c3957041c319e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 634 zcmV-=0)_pFP)Btj8dji$CWjoEB=citM4UJ9wN_<`s6d|`$e{40W==$&{9 zA^C*lynEr<+3RRQ!!~+OJq$DV`&~|Jlal+WYZ*|`LUMdAQ(v4<>^3H^oF9g_zJ%>) zTNj@wQi`i8*!1zCL|`!63j)9|fBto#XMCRyC2mQOz(B@nay$w+%P9Y-(_fU0Ux6r~aPK?(uRIVknvdoE^f zKESv69MQT@&fd`#@8ZE!l*D5p)M`E$1GE4(Bh7#i5{z=#wu^lJ12}V=M-bEj<337j z1VI%D?*NQ81wo-g)i|Uipj4ph_*g4dP$(>8rT7(sHUsMV`{yr=UD-EFAD54QDy&$x z1C(vvn2OC{I~6M_;90gBeRM0fFJWXnt3nLa}#r&B7#jeXfedf&hSgiI4NQzzi9<_UgR zI62a9?LGW1J#tB2yZ>71v6TGdzhLeeG$r?M3Bk@m2zbS}1b;)1?;q8>GCBM&8?MXX UHoH%CfB*mh07*qoM6N<$f(*zK!2kdN diff --git a/openslides/static/images/icons/user-identity.png b/openslides/static/images/icons/guest.png similarity index 100% rename from openslides/static/images/icons/user-identity.png rename to openslides/static/images/icons/guest.png diff --git a/openslides/static/images/icons/help-hint.png b/openslides/static/images/icons/help-hint.png deleted file mode 100644 index 352fd541526e1716648549aa1550578e32c7d8c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 694 zcmV;n0!jUeP)LgoND#vg zdiQS#if-XG3c`!mpj$UDbqMqj33c#N5rrC58W|O>YrC760pc(CqG4-=B1FB~l064MAi&(DzDfGQo(Bx16eICl`qPYyi^BG7Ca@?EM zzf1TyTZK$GZCu#cXdm!wm`f|a8lJxcM&g`>4EI)GkE(z2Vr%mW81F=gkPbA7&4wDB%F@?2vpfTH`!@^@5@N!zuOc^X9!pN7q4Rp5 zmSw>VshF9KV|pZH0h@$KQ-cG4+7%2Nfm>cIRBImkevJl>L!I$V961L_ob854%LbS* zpVPlrE>JaeoU-akI-YHVD3s9TxZ_ddeGPQ+W!nH|C7v?T6wC;>MfUEYeSXD7!;Schf7+rKF|IWYKP5)Na~f-i)({ig)o z_G!2_H3Nl030&8eaMT8=WVeiSzFaJoa*K;gRuIYx=iGr-h^Xa@nD_79eXy{wFgH3n cYPH+@53)lcnFqS}VgLXD07*qoM6N<$f^#-88vp4nJ zFzyCnMyofE9{~j=OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpe0@>FMGa zQgQ3;q>X${1_EvC9b7%{lo;_Hxw!m6mdKI;Vst075>6Bme*a diff --git a/openslides/static/images/icons/milestone.png b/openslides/static/images/icons/number.png similarity index 100% rename from openslides/static/images/icons/milestone.png rename to openslides/static/images/icons/number.png diff --git a/openslides/static/images/icons/user-offline.png b/openslides/static/images/icons/off.png similarity index 100% rename from openslides/static/images/icons/user-offline.png rename to openslides/static/images/icons/off.png diff --git a/openslides/static/images/icons/user-online.png b/openslides/static/images/icons/on.png similarity index 100% rename from openslides/static/images/icons/user-online.png rename to openslides/static/images/icons/on.png diff --git a/openslides/static/images/icons/pdf-annotations.png b/openslides/static/images/icons/pdf-annotations.png deleted file mode 100644 index dbb2e8b1cd8033cec942bc683493d6868c677af6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 745 zcmVK~#9!osmsQR8bg)pYJ+%ey+}>Q<9-3B_#9%nTt#)D2t$| z7Ey~Jf;KI(RS<34w}@7`2>RJYf+4hX7ZO%fhM^f!{!wN$I*mGW?>(ol%NP>1@#UWL zF23_V-}%m!widD{I_P8#>KmXxcJ45zFJHUSO^^d8j=0t8RV;oBsA_1yx*3VN9-=j4 zTpXtYD1i-a`fB?n2f?BAMQmwC2!9A>L1tf$NV?vWxuFlDMZ(YrYe0;89!ySsLC|ar z0HsPSgScs=!Xq~}p_M6?bAdMcT}u#ZccBQf3|76Y2w)1&u>Q1$6M8tww&NZzZViyE zPEoUYkeZe(#gfJME%CSzcLnQg0Kkd1c$KaUj$5gny$I5Ny@|rC&+xq&ia8&ERMH^` zEQLj*W0}=}N)!?;aXkfj>PdE8Y{DY+of+iaopEd_#7j9O;zF?)@CP97?{HeZ42h+p zapphyw01Rfyk{?t2)!qt^ZvmEqTN%8Rd1lzj(#2Dph>k@wDMC+G##m>=);~XTiJ2G zk^Zi?4Bh=irYQ~0Wq`OT2t5!%6tbeQ7-9jeW&G(^Mjy|xu_Md=vn?!58%BCRmI0#X zRPeV-`GDbvlZ-u@rv6|p2X5{pnL!KlBpO#n_>aE6&M~UNEvGhd^nM%OdKYT~Y$;E; z_?=+M|36@~XPP&+$2r*DN_|^3U^MJ&_@{>F2=bFieBHkRbHjQ3LdfT3ZYmz(SzqVG|c5sBvYC8;yxO zSMFq|3m+?&Il=G#E*49tb+=foJF~O)o2zJAzY&PF{ zcQn;xSqPzlrXf8Sr($<54-e-N;#i|37$JfeySwr|H*TiPjViKU2hYP-r|-JdeIIGH zvULAmHS=RRl4$?nxsLQ$&+S_&y<9>lNLMW?6?D~xf(rKqNMIPx zd#_(jYV!-|zE9h^AzFuq)IAV+w4c8~=fz8y0^G?-dasQn115Tdn&%~|A0}vNX+xMM zI1WZ8gLU}|!H6++cMEgqtE(6)(Z>6UZ6-?KfMBzVR#`_c{$geH4(`G{Mt4TRS=_}1 z)}K5ku0+iP0~os4W}*Zhh?V?Xnv7=Z$s~F<8$KdoN!Mj#`V-#t6m{EXEfF$}36PsM z{9MLeU!(oOL(IN@{(Swi-DdxO(vP0vC*p_z(nBUnAYrSfv!k{YxOn;`zVFlX@->=i zA^`zZ^pJ`6U`mLC?_!J(Hk0VGLEG0J+JjFDxRwQa41O0`O2Ldx?YPU)!&1&fixf!S zn2aCUOCnPtj4HxY0=|T$7Qx3gSv%o`aN{OMl2=M{z*k99Nn-Ihx?xcFJjw_rSIV_h z4e)M3BpHVn>L*IXElUe#_ZH`mp)s9rK0xC zTn^mJIWzZinUoTnfr3AvG@g83nrM6RUk3AI`VD>iKp(}S;$8jrKN)-((>sKkK5z6K zQ;hDTN}#l#quj2)GI)2#*y`5#>r~Ha9kvVD9#Xw$G`Fr!Q!S0(urkCqx3od-V}$F8 z9cnb0+Sb)?#CGqeD#9Q*iv=uw%sXDAZ2HYw8H&7e;DUdj<*%u|TjFgqd;88t)MyHj z0^p>hXf=SO8xRK^qESO(X40ut=8mY2jZZbltomlTg9iqnhZ@OlaGP>pq8Tl`#7_XIs{CXZEVUxVA{Si#!ug z$8(3XLmD$ksUtL!HVGRD>I;zHzvAU|&1?L?$?T|jv^K<5j1TkA1KDJ!5urk?2^L)@ zlkj!f1oaL~JyeQA*TtSyjfxgHj*Kx;C3OH6Axa=*0Z1N>!F6SH!#!Xenks@Ys{t;t z9fU?OC@lf5fg{BFA4o>W1Li&ev-e<`7Tl&s-Naz@4R4+wloc5!lIL8@MUQTpt6Hc~)EmH|E? zuK)l42Qnc*FypFV_5>C^@cHu>Z$AHi@7{yYpTB(j z_6?}(?(V}zKy54~L4Lsu;)X^`3R+`F!OV1nfH5l+X2VU0<;0T!YTV8Bs z)4`G_z3~&5D$MkFpvn>Ectep#Y*G8$n8Ul(r=(u%wt0Hv?rrIR`35ZQ26ewnnJYJQ UFRnLjs{%RA)78&qol`;+02%CVbpQYW diff --git a/openslides/static/images/icons/view-list-icons.png b/openslides/static/images/icons/view-list-icons.png deleted file mode 100644 index 30f013899e0ce4fd741608227be4580b34212eda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFR|DNig)WhgH%*UQYyE>2D?NY%?PN}v7CMhd9NAiyWY z_5c6>KqdqTW?U7_exO}($+h)TP|t<6Ctj>O_3Hfji#MNtzjyD!=g(h&igz?UxD8az zQWE4B%ph)Pw4|Ul7RdMVba4#fxSlLv#>VW-wzoXtLxL-+VBg z?YHS?M}ZR==h+<<4qugLv0uEB(bz%j0M7(20cZI|&xD&8x686I96R9iS}^v`PLP{C MUHx3vIVCg!00weq9smFU diff --git a/openslides/static/images/icons/view-list-text.png b/openslides/static/images/icons/view-list-text.png deleted file mode 100644 index f4dcabdb20908924bfb6175a9506f1b5e2659906..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFO>_3{-p_ zgc+SQW>)|O*-JcqUDOwi diff --git a/openslides/static/images/icons/view-list-tree.png b/openslides/static/images/icons/view-list-tree.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;rD0#1y6CrNyJ zD@nk@8Uipa3#}knxA71pw6ME7ghfd#xDP(CC<<(Dz5%0d1Eo2eoPp1(E-)m0mT9Uf zyT&wcG#X(z+=lN5cpS9gI5xb7fakeb+$=Dg&ta4sz-H4955G@4-Ohieef;oAd9c5? zhrz}Mex9D<%h%6nx7%=Cmn+aMgx#TzciSuXg5HtgXVMr}Gq|p_S&Z4p}PrxPA!H}hCz1}Kby?m{1B2CjJ zfSeWUS)L!azV!jiBMM>z3dI%ins|fDtrV-h-diC=O4ld}2b0MpvGw)*y(n1^Rl#gF z+aY0$61oM+{b)QQHdsL{h*!i5Xwy)E4U~)0@nMKL&;+nTbcqY%Imb= z4<2tGydU5DF$_RV$$9jK&r-^UF|NoSu^$5xwr`Za*M5L82FtQYYcU|lfunIecveI1 zQys0nMwPjT&wYDxRa(X=;#hdMTtxY85mDDcdAX?U5@~Js9rEzzOC7U!E+H0=pXEF_ z0tE-qP);t!#>a_)mUKGZ#el$r0FAxhO1Ba4Ho6jc(FknYCZPnT6&);u06|s7PO}9m zI3?>&K+c6iA)G@tn?){{(+N_kRLJ00Gk_2Qc*vjwatv7zGMNlj?=TQ;^mzhIioY5B z^mnPU5z~qe=A7fiu>swJ!)Sf~VBkh<6qlC3EQZn16e^WUIDBL-baZJ=~rDfR`(4pk;Uw2G6yWhTng4?)`ta;5atc>pPenIfH8#Pl5}H zhqsgX_;nMH7t67(A?EXW3Nm+~w?J5!xsH+hFAxZUTSKQ%s%~KRX=%I7`9yfizVDmr zq|G^pN3^ls#O0aixN!P7@++$?#bj8#zE|n#GgWI_a_Z45iNPDw<})4mJO2SRUQSlI SFFUdT00001_ diff --git a/openslides/static/images/icons/task-attention.png b/openslides/static/images/icons/warning.png similarity index 100% rename from openslides/static/images/icons/task-attention.png rename to openslides/static/images/icons/warning.png diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index e9a8482e5..76496ac16 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -357,61 +357,52 @@ input[type="submit"], input[type="button"] { background:url(../images/icons/dialog-ok.png) no-repeat 0px 0px; } .button .edit{ - background:url(../images/icons/document-edit.png) no-repeat 0px 0px; + background:url(../images/icons/edit.png) no-repeat 0px 0px; } .button .revert{ - background:url(../images/icons/document-revert.png) no-repeat 0px 0px; + background:url(../images/icons/revert.png) no-repeat 0px 0px; } .button .undo{ - background:url(../images/icons/edit-undo.png) no-repeat 0px 0px; + background:url(../images/icons/undo.png) no-repeat 0px 0px; } .button .item{ background:url(../images/icons/view-list-details.png) no-repeat 0px 0px; } .button .projector{ - background:url(../images/icons/video-projector.png) no-repeat 0px 0px; + background:url(../images/icons/projector.png) no-repeat 0px 0px; } -.button .accept{ - background:url(../images/icons/task-complete.png) no-repeat 0px 0px; +.button .done{ + background:url(../images/icons/done.png) no-repeat 0px 0px; } .button .reject{ - background:url(../images/icons/task-reject.png) no-repeat 0px 0px; + background:url(../images/icons/reject.png) no-repeat 0px 0px; } -.button .poll{ - background:url(../images/icons/view-statistics.png) no-repeat 0px 0px; -} -.button .previous{ - background:url(../images/icons/go-previous.png) no-repeat 0px 0px; +.statistics{ + background:url(../images/icons/statistics.png) no-repeat 0px 0px; } .button .pdf{ background:url(../images/icons/pdf.png) no-repeat 0px 0px; } .button .adduser{ - background:url(../images/icons/list-add-user.png) no-repeat 0px 0px; + background:url(../images/icons/add-user.png) no-repeat 0px 0px; } .button .removeuser{ - background:url(../images/icons/list-remove-user.png) no-repeat 0px 0px; + background:url(../images/icons/remove-user.png) no-repeat 0px 0px; } .button .export{ - background:url(../images/icons/document-export.png) no-repeat 0px 0px; + background:url(../images/icons/export.png) no-repeat 0px 0px; } .button .import{ - background:url(../images/icons/document-import.png) no-repeat 0px 0px; + background:url(../images/icons/import.png) no-repeat 0px 0px; } .button .add{ - background:url(../images/icons/list-add.png) no-repeat 0px 0px; -} -.button .remove{ - background:url(../images/icons/list-remove.png) no-repeat 0px 0px; + background:url(../images/icons/add.png) no-repeat 0px 0px; } .button .number{ - background:url(../images/icons/milestone.png) no-repeat 0px 0px; -} -.button .stop{ - background:url(../images/icons/process-stop.png) no-repeat 0px 0px; + background:url(../images/icons/number.png) no-repeat 0px 0px; } .button .guest{ - background:url(../images/icons/user-identity.png) no-repeat 0px 0px; + background:url(../images/icons/guest.png) no-repeat 0px 0px; } .button .clear{ background:url(../images/icons/clear.png) no-repeat 0px 0px; @@ -553,7 +544,7 @@ ul.results { padding: 10px 20px 10px 36px; } .notification.success { - background: url("../images/icons/task-complete.png") repeat scroll 0 0 #D5FFCE; + background: url("../images/icons/done.png") repeat scroll 0 0 #D5FFCE; border-color: #9ADF8F; color: #556652; } @@ -563,7 +554,7 @@ ul.results { color: #665252; } .notification.warning { - background: url("../images/icons/task-attention.png") repeat scroll 0 0 #FFFBCC; + background: url("../images/icons/warning.png") repeat scroll 0 0 #FFFBCC; border-color: #E6DB55; color: #666452; } @@ -587,14 +578,12 @@ ul.results { .preview { background:url("../images/icons/preview.png") no-repeat 0px 0px; } -.poll { - background:url("../images/icons/view-statistics.png") no-repeat 0px 0px; -} + /* inactive/active */ a.activate_link span { - background-image: url(../images/icons/task-accepted-grey.png); + background-image: url(../images/icons/accepted-grey.png); background-repeat: no-repeat; background-position: center; width: 16px; @@ -602,7 +591,7 @@ a.activate_link span { display: inline-block; } a.activate_link.active span { - background-image: url(../images/icons/task-accepted.png); + background-image: url(../images/icons/accepted.png); } tr.activeline td, .activeline { background-color: #bed4de !important; From cfcd2d10d7b2a3c09c650f1fac58d9ae384e90d1 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 23 Apr 2012 21:48:20 +0200 Subject: [PATCH 2/5] Fixed wrong icon filename. --- openslides/static/styles/base.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index 76496ac16..978e7c142 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -583,7 +583,7 @@ ul.results { /* inactive/active */ a.activate_link span { - background-image: url(../images/icons/accepted-grey.png); + background-image: url(../images/icons/accept-grey.png); background-repeat: no-repeat; background-position: center; width: 16px; @@ -591,7 +591,7 @@ a.activate_link span { display: inline-block; } a.activate_link.active span { - background-image: url(../images/icons/accepted.png); + background-image: url(../images/icons/accept.png); } tr.activeline td, .activeline { background-color: #bed4de !important; From 3d0fe9b565eeb0dc8bd05537396ab22e6755f521 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 23 Apr 2012 22:07:34 +0200 Subject: [PATCH 3/5] Updated translations. --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 31457 -> 31535 bytes openslides/locale/de/LC_MESSAGES/django.po | 45 +++++++++++++-------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 406d2f1336d2a50665a83d558da2adf8fcacf062..1c0445d3d05f3f40df015e07f0cd2b972cd2edf3 100644 GIT binary patch delta 9306 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 F{vUolMg#x= delta 9283 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\n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,6 @@ msgid "Closed" msgstr "Abgeschlossen" #: agenda/models.py:42 agenda/templates/agenda/overview.html:66 -#: projector/models.py:19 msgid "Weight" msgstr "Gewichtung" @@ -1119,7 +1118,7 @@ msgstr "Darf selbst für Wahlen kandidieren" msgid "Can manage assignment" msgstr "Darf Wahlen verwalten" -#: assignment/models.py:203 assignment/views.py:291 assignment/views.py:575 +#: assignment/models.py:205 assignment/views.py:291 assignment/views.py:575 #: assignment/templates/assignment/base_assignment.html:14 #: assignment/templates/assignment/overview.html:6 #: assignment/templates/assignment/overview.html:9 @@ -1249,8 +1248,8 @@ msgid "New election" msgstr "Neue Wahl" #: assignment/templates/assignment/base_assignment.html:20 -msgid "Print all elections" -msgstr "Alle Wahlen drucken" +msgid "All elections as PDF" +msgstr "Alle Wahlen als PDF" #: assignment/templates/assignment/config.html:5 #: assignment/templates/assignment/config.html:8 @@ -1277,6 +1276,7 @@ msgid "Delete election" msgstr "Wahl löschen" #: assignment/templates/assignment/overview.html:46 +#: assignment/templates/assignment/view.html:14 msgid "Election as PDF" msgstr "Wahl als PDF" @@ -1305,10 +1305,6 @@ msgstr "Kurzbeschreibung" msgid "Print ballot" msgstr "Stimmzettel drucken" -#: assignment/templates/assignment/view.html:14 -msgid "Print Election" -msgstr "Wahl drucken" - #: assignment/templates/assignment/view.html:26 msgid "Manage election" msgstr "Wahl verwalten" @@ -1408,7 +1404,7 @@ msgstr "Erlaube Zugriff für anonyme Gast-Nutzer" #: config/forms.py:28 participant/forms.py:95 msgid "Welcome text" -msgstr "Willkommens text" +msgstr "Willkommenstext" #: config/models.py:34 msgid "Can manage configuration" @@ -1762,12 +1758,12 @@ msgid "Import participants" msgstr "Teilnehmer/innen importieren" #: participant/templates/participant/base_participant.html:24 -msgid "Print participant list" -msgstr "Teilnehmerliste drucken" +msgid "List of participants as PDF" +msgstr "Teilnehmerliste als PDF" #: participant/templates/participant/base_participant.html:27 -msgid "Print first time passwords" -msgstr "Erst-Passwörter drucken" +msgid "First time passwords as PDF" +msgstr "Erst-Passwörter als PDF" #: participant/templates/participant/config.html:5 #: participant/templates/participant/config.html:8 @@ -1975,10 +1971,18 @@ msgstr "Countdown starten" msgid "Stop countdown" msgstr "Countdown stoppen" +#: projector/templates/projector/control.html:151 +msgid "Custom slides" +msgstr "Benutzerdefinierte Folien" + +#: projector/templates/projector/control.html:163 +msgid "New slide" +msgstr "Neue Folie" + #: projector/templates/projector/new.html:6 #: projector/templates/projector/new.html:9 -msgid "New Slide" -msgstr "Neue Folie" +msgid "New custom slide" +msgstr "Neue benutzerdefinierte Folie" #: templates/404.html:7 msgid "Page not found." @@ -2024,6 +2028,15 @@ msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen." msgid "undefined-filename" msgstr "undefinierter-dateiname" +#~ msgid "Print all elections" +#~ msgstr "Alle Wahlen drucken" + +#~ msgid "Print Election" +#~ msgstr "Wahl drucken" + +#~ msgid "Print participant list" +#~ msgstr "Teilnehmerliste drucken" + #~ msgid "Edit assignment" #~ msgstr "Wahl bearbeiten" From dc863cc3b91ac776922628cca5c93b7a8fa9cef5 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 23 Apr 2012 22:07:52 +0200 Subject: [PATCH 4/5] Added custom slides portlet. --- openslides/projector/models.py | 2 +- .../static/javascript/projector-control.js | 1 + .../templates/projector/control.html | 26 ++++++++++++++++++- .../projector/templates/projector/new.html | 4 +-- openslides/projector/urls.py | 2 +- openslides/static/styles/base.css | 2 +- 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/openslides/projector/models.py b/openslides/projector/models.py index cd6334516..c3e25840f 100644 --- a/openslides/projector/models.py +++ b/openslides/projector/models.py @@ -16,7 +16,7 @@ class ProjectorSlide(models.Model, SlideMixin): title = models.CharField(max_length=100, verbose_name=_("Title")) text = models.TextField(null=True, blank=True, verbose_name=_("Text")) - weight = models.IntegerField(default=0, verbose_name=_("Weight")) + #weight = models.IntegerField(default=0, verbose_name=_("Weight")) def slide(self): return { diff --git a/openslides/projector/static/javascript/projector-control.js b/openslides/projector/static/javascript/projector-control.js index 3948cb97b..ad4ceac32 100644 --- a/openslides/projector/static/javascript/projector-control.js +++ b/openslides/projector/static/javascript/projector-control.js @@ -11,6 +11,7 @@ $(function() { success: function(data) { $('.activate_link').removeClass('active'); $('li').removeClass('activeline'); + $('div').removeClass('activeline'); link.addClass('active'); link.parent().addClass('activeline'); }, diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/control.html index f685e4a40..c0eac9a3d 100644 --- a/openslides/projector/templates/projector/control.html +++ b/openslides/projector/templates/projector/control.html @@ -64,7 +64,7 @@ {% if category != 'projector' %}
    {% with category_big=category|capfirst %} -
    {% trans category_big %}
    +
    {% trans category_big %}
    {% endwith %}
    {% for slides in group %} @@ -143,5 +143,29 @@
    + + + {% for category, group in categories.items %} + {% if category == 'projector' %} +
    +
    {% trans "Custom slides" %}
    +
    + {% for slides in group %} + {% if slides.control_template %} + {% include slides.control_template %} + {% endif %} + {% if not forloop.last %} +
    + {% endif %} + {% endfor %} + + + +
    +
    + {% endif %} + {% endfor %} {% endblock %} diff --git a/openslides/projector/templates/projector/new.html b/openslides/projector/templates/projector/new.html index 607a4bc31..927839d2c 100644 --- a/openslides/projector/templates/projector/new.html +++ b/openslides/projector/templates/projector/new.html @@ -3,10 +3,10 @@ {% load tags %} {% load i18n %} -{% block title %}{{ block.super }} – {%trans "New Slide" %}{% endblock %} +{% block title %}{{ block.super }} – {%trans "New custom slide" %}{% endblock %} {% block content %} -

    {% trans 'New Slide' %}

    +

    {% trans 'New custom slide' %}

    {% csrf_token %} {{ form.as_p }}