From d56dcba7d4b34e93e1882054087d62a1d4b591f1 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 23 Apr 2012 21:27:22 +0200 Subject: [PATCH] #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;