Merge pull request #3057 from floriank/fix/20026-update-icons-in-admin-menu

[20026] Update icons in admin menu

app/assets/fonts/openproject_icon/openproject-icon-font.svg

@@ -118,7 +118,6 @@
 <glyph unicode="&#57454;" d="M272 338c-17 0-30 14-30 30 0 16 13 29 30 29 16 0 29-13 29-29 0-16-13-30-29-30m50-194c0-4 0-5-5-5l-90 0c-5 0-5 1-5 5l0 23c0 4 0 5 5 5l22 0 0 110-23 0c-4 0-5 1-5 5l0 23c0 4 1 5 5 5l64 0c4 0 5-1 5-5l0-138 22 0c5 0 5-1 5-5z m-60 338l0 0c77-3 148-37 192-102 37-55 34-76 40-130l0 0c-4-77-37-148-103-192-54-37-75-34-129-39l0 0c-77 3-148 36-192 102-37 54-34 75-40 129l0 0c3 77 37 148 102 192 25 17 55 24 83 35z m0-34c-109 0-198-89-198-198 0-109 89-198 198-198 109 0 198 89 198 198 0 109-89 198-198 198z"/>
 <glyph unicode="&#57455;" d="M424 414c90-90 90-236 0-326-90-90-236-90-326 0-90 90-90 236 0 326 90 90 236 90 326 0z m0 0z m-167 28l-17-3-24-24c-5-23-5-11 0-35l24-23c23-5 11-5 34 0l24 23c5 24 5 12 0 35l-24 24z m23-103l-80 0c-9 0-14-4-14-14l0-29c0-9 5-13 14-13l21 0 0-123-21 0-6-1-7-7c-2-16 0-4 0-35l0-6 7-7 6-1 114 0c10 0 14 5 14 14l0 29c0 9-4 14-14 14l-21 0 0 165c0 10-4 14-13 14z"/>
 <glyph unicode="&#57456;" d="M484 484l-456 0 0-456 456 0z m-29-427l-398 0 0 398 398 0z m-129 284l15 57-85 0-16-57z m-93-28l-62-199 85 0 62 199z"/>
-<glyph unicode="&#57457;" d="M379 480c15-6 31-11 45-18 27-15 47-51 53-80 3-15 0-31 0-47-12-32-26-71-63-85-21-7-44-9-66-14l-33 7-34-34 24-24-50-50-26 25-28-25 0-50c-82-29-55-6-94-50l0 0-75 25c52 157 6 56 208 258-2 11-8 22-7 33 3 41 15 90 55 111 14 7 30 12 44 18z m-14-81c-8-8-8-22 0-31 9-8 23-8 31 0 9 9 9 23 0 31-8 9-22 9-31 0z"/>
 <glyph unicode="&#57458;" d="M484 484l-456 0 0-456 456 0z m-29-427l-398 0 0 398 398 0z m-307 92l40 47c25-20 54-31 84-31 19 0 29 7 29 18l0 1c0 10-8 16-43 24-55 13-98 29-98 82l0 1c0 48 38 82 100 82 44 0 79-11 107-34l-36-51c-24 17-50 26-72 26-18 0-26-8-26-17l0-1c0-11 8-17 44-25 60-13 97-32 97-80l0-1c0-53-42-84-105-84-46 0-89 14-121 43m279 79l-342 0 0 28 342 0z"/>
 <glyph unicode="&#57459;" d="M256 218l203 179c-1 1-2 1-4 1l-398 0c-1 0-2 0-3 0z m228 152c0 3-1 6-2 9l-144-126 142-124c2 4 4 8 4 13z m-453 11c-2-4-3-7-3-11l0-228c0-4 1-8 3-11l143 122z m286-147l-61-54-61 54-140-120c1 0 1 0 2 0l397 0z"/>
 <glyph unicode="&#57460;" d="M370 373l117-117-117-117 0 89-171 0 0 56 171 0z m-342 111l285 0 0-143-57 0 0 86-171 0 0-342 171 0 0 86 57 0 0-143-285 0z"/>
@@ -256,7 +255,19 @@
 <glyph unicode="&#57587;" d="M326 499l-140 0c-26 0-42-16-42-32l0-419c0-19 19-35 42-35l144 0c22 0 41 16 41 35l0 419c-3 16-19 32-45 32z m-28-35l70-96 74 96z m0-144l70-96 74 96z m0-147l70-96 74 96z m-228 291l74-96 70 96z m0-144l74-96 70 96z m0-147l74-96 70 96z m250 227c0-35-29-64-64-64-35 0-64 29-64 64 0 35 29 64 64 64 35 0 64-29 64-64z m0-144c0-35-29-64-64-64-35 0-64 29-64 64 0 35 29 64 64 64 35 0 64-29 64-64z m0-147c0-36-29-64-64-64-35 0-64 28-64 64 0 35 29 64 64 64 35 0 64-29 64-64z"/>
 <glyph unicode="&#57589;" d="M256 384c0 80-179 96-256 96l0-352 16 0c6 0 10 0 16 0l0-32c64 0 192 19 192-32l64 0c0 51 128 32 192 32l0 32c6 0 10 0 16 0l16 0 0 352c-77 0-256-16-256-96z m-224 64c16 0 29 0 45-3 3 0 6 0 6 0 0 0 3 0 3 0 64-3 132-19 138-55 0-3 0-3 0-6l0-237c-48 29-134 29-192 29z m448-272c-58 0-144-3-192-29l0 237c0 22 35 64 192 64z m-384 90l-16-48-19 0 51 153 26 0 54-153-22 0-20 48z m51 16l-16 44c-3 10-3 20-6 29-3-9-7-19-10-29l-16-44z m179-52l87 125-80 0 0 16 105 0 0-13-86-121 86 0 0-16-112 0z"/>
 <glyph unicode="&#57588;" d="M400 496l-51 0c-45 0-80-35-80-80l0-128-87 0c-3 0-6 0-6 0-3 0-10 0-13 0l-48 0c-45 0-83-35-83-80l0-102c0-45 35-80 80-80l51 0c45 0 80 35 80 80l0 102c0 10-3 19-3 26l29 0 0-93c0-16 13-26 25-26 16 0 26 13 26 26l0 96 16 0c3 0 6 0 10 0l51 0c45 0 80 35 80 80l0 99c3 45-32 80-77 80z m-211-390c0-13-13-26-26-26l-48 0c-16 0-25 13-25 26l0 102c0 16 12 26 25 26l51 0c16 0 26-13 26-26l0-102z m237 208c0-16-13-26-26-26l-51 0c-3 0-3 0-7 0 0 0 0 0 4 0l-4 0c-12 3-19 13-19 26l0 102c0 13 13 26 26 26l51 0c13 0 26-13 26-26z"/>
-<glyph unicode="&#57591;" d="M512 188c0-29-10-53-30-73-20-20-44-30-72-30l-291 0c-32 0-61 12-84 35-23 24-35 52-35 85 0 23 6 45 19 64 13 20 29 34 50 44-1 5-1 9-1 11 0 38 14 70 40 97 27 26 59 40 97 40 28 0 53-8 76-24 23-15 40-36 50-61 13 11 27 17 44 17 19 0 35-7 49-20 13-14 20-30 20-49 0-13-4-25-11-37 23-5 42-17 57-35 15-19 22-40 22-64z"/>
-<glyph unicode="&#57592;" d="M407 270c-18 66-74 113-139 113-45 0-88-23-115-62-8 2-15 3-23 3-61 0-110-54-110-121 0-23 6-46 18-66 3-5 8-8 13-8l414 0c5 0 9 3 12 7 10 15 15 32 15 50 0 50-40 90-85 84z"/>
 <glyph unicode="&#57590;" d="M392 437l45-45-317-317-45 45z m-272 0l317-317-45-45-317 317z"/>
+<glyph unicode="&#57593;" d="M134 330l119 105c0 0 0 0-3 0l-234 0z m132 86c0 3 0 3 0 6l-84-73 84-74c0 3 3 7 3 7l0 134z m-266 6c0 0 0-3 0-6l0-134c0-4 0-4 0-7l83 71z m170-83l-36-32-35 32-83-70 234 0z m96-320l-116 131c-12 13-9 32 7 45 13 10 35 7 48-6l57-67 176 214c13 13 32 16 48 6 16-9 20-28 7-44z"/>
+<glyph unicode="&#57594;" d="M477 419l-458 0 0-272 144 0 0 29-115 0 0 211 19 0 189-176 189 179 19 0 0-211-29 0 0-29 61 0 0 269z m-221-169l-147 137 291 0z m141-23c-10 7-23 3-29-3l-102-118-36 35c-6 6-19 9-28 3-10-6-10-16-4-22l68-71 134 154c6 6 3 16-3 22z"/>
+<glyph unicode="&#57591;" d="M512 188c0-29-10-53-30-73-20-20-44-30-72-30l-291 0c-32 0-61 12-84 35-23 24-35 52-35 85 0 23 6 45 19 64 13 20 29 34 50 44-1 5-1 9-1 11 0 38 14 70 40 97 27 26 59 40 97 40 28 0 53-8 76-24 23-15 40-36 50-61 13 11 27 17 44 17 19 0 35-7 49-20 13-14 20-30 20-49 0-13-4-25-11-37 23-5 42-17 57-35 15-19 22-40 22-64z"/>
+<glyph unicode="&#57592;" d="M0 384l32 0 0-384-32 0z m128 0l32 0 0-384-32 0z m-96-352l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 96l96 0 0-64-96 0z m32 0l32 0 0-384-32 0z m128-32l32 0 0-352-32 0z m32-320l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m64 0l32 0 0-352-32 0z m64 96l32 0 0-448-32 0z m128 0l32 0 0-448-32 0z m-96-416l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 64l96 0 0-32-96 0z m0 160l96 0 0-64-96 0z m32-64l32 0 0-384-32 0z m-32-32l96 0 0-32-96 0z"/>
+<glyph unicode="&#57595;" d="M452 390c7-39 2-76-14-110-16-34-42-54-77-60-22-4-44-4-66-1 0 0-61-99-61-99 0 0-36-6-36-6 0 0-53-85-53-85-5-10-12-15-23-17 0 0-39-7-39-7-4-1-8-1-12 2-3 3-5 7-6 11 0 0-8 51-8 51-3 10-1 19 6 28 0 0 132 198 132 198-8 17-14 37-19 61-6 37 3 68 27 96 24 28 56 45 95 52 36 7 69-1 100-23 30-22 48-53 54-91m-64-39c10 15 14 32 11 50-3 18-12 32-27 42-14 11-30 15-47 12-17-4-30-13-41-28-2-4-4-8-6-12-1-4-1-7 0-10 1-3 2-6 2-8 1-3 3-5 7-9 4-3 7-6 9-8 3-1 6-4 11-8 6-4 10-6 12-8 2-2 6-5 11-9 6-4 10-7 12-8 3-1 6-3 10-6 4-3 7-4 10-4 2 0 5 0 8 0 4 1 7 2 10 5 2 2 5 5 8 9"/>
+<glyph unicode="&#57457;" d="M379 480c15-6 31-11 45-18 27-15 47-51 53-80 3-15 0-31 0-47-12-32-26-71-63-85-21-7-44-9-66-14l-33 7-34-34 24-24-50-50-26 25-28-25 0-50c-82-29-55-6-94-50l0 0-75 25c52 157 6 56 208 258-2 11-8 22-7 33 3 41 15 90 55 111 14 7 30 12 44 18z m-14-81c-8-8-8-22 0-31 9-8 23-8 31 0 9 9 9 23 0 31-8 9-22 9-31 0z"/>
+<glyph unicode="&#57596;" d="M32 448l448 0 0-352-448 0z"/>
+<glyph unicode="&#57597;" d="M32 448l192 0 0-64-192 0z m0-96l192 0 0-64-192 0z m0-96l192 0 0-64-192 0z m0-96l192 0 0-64-192 0z m224 288l224 0 0-352-224 0z"/>
+<glyph unicode="&#57598;" d="M32 448l448 0 0-64-448 0z m0-96l448 0 0-64-448 0z m0-96l448 0 0-64-448 0z m0-96l448 0 0-64-448 0z"/>
+<glyph unicode="&#57599;" d="M294 480c-99 0-182-70-204-163l-80 0 108-173 112 173-73 0c19 57 73 99 137 99 80 0 144-64 144-144 0-80-64-144-144-144-28 0-57 10-80 26l-35-55c32-22 74-35 115-35 116 0 208 93 208 208 0 115-92 208-208 208z m4-230c-10 0-16 9-16 16l0 64c0 9 6 16 16 16 9 0 16-7 16-16l0-64c0-7-10-16-16-16z m80-64c-4 0-7 0-10 3l-80 64c-10 6-10 16-3 22 3 10 13 10 22 3l80-64c7-6 10-16 3-22-6-3-9-6-12-6z"/>
+<glyph unicode="&#57600;" d="M416 480l0 32-32 0 0-32-64 0 0 32-32 0 0-32-64 0 0 32-32 0 0-32-64 0 0 32-32 0 0-32-96 0 0-480 512 0 0 480z m32-416l-384 0 0 352 32 0 0-32 32 0 0 32 64 0 0-32 32 0 0 32 64 0 0-32 32 0 0 32 64 0 0-32 32 0 0 32 32 0z m-205 42l0 27c-19 1-38 6-48 12l8 34c12-7 29-13 48-13 16 0 28 7 28 18 0 11-10 18-31 25-31 11-52 25-52 53 0 25 18 45 49 51l0 28 28 0 0-26c19-1 32-5 42-9l-8-33c-8 3-21 10-42 10-19 0-25-8-25-16 0-10 10-16 35-25 34-12 48-28 48-54 0-25-18-47-51-53l0-29z"/>
+<glyph unicode="&#57601;" d="M200 452l312 0 0-47-312 0z m0-191l312 0 0-46-312 0z m0-178l312 0 0-47-312 0z m-150-83l-47 52c-5 6-4 14 2 18 6 4 15 3 20-2l24-27 71 87c4 5 13 7 19 3 6-4 8-12 3-18z m0 171l-47 53c-5 5-4 13 2 17 6 5 15 4 20-2l24-26 71 86c4 6 13 7 19 3 6-4 8-12 3-17z m23 186c-39 0-72 32-72 72 0 39 33 72 72 72 40 0 73-33 73-72 0-40-33-72-73-72z m0 121c-27 0-49-22-49-49 0-28 22-50 49-50 28 0 50 22 50 50 0 27-22 49-50 49z"/>
+<glyph unicode="&#57603;" d="M237 122l0 30c-21 1-42 7-54 14l9 38c14-8 33-14 53-14 19 0 31 7 31 19 0 13-10 20-34 28-34 12-57 28-57 59 0 28 20 50 54 57l0 30 31 0 0-28c21-1 36-6 46-11l-9-36c-8 4-23 11-46 11-21 0-27-9-27-18 0-10 11-17 38-27 38-14 53-31 53-60 0-29-20-53-57-59l0-33-31 0z m20-102c-6 0-12 0-17 0-69 5-132 39-173 94l38 29c33-44 83-71 138-75 103-7 193 69 200 170 3 49-13 97-46 134-32 37-78 60-128 63-73 5-142-32-177-95l-42 24c44 79 131 125 222 119 63-4 120-33 161-79 42-47 62-107 58-169-9-122-112-215-234-215z m-221 246l-14 135 112-57z"/>
+<glyph unicode="&#57602;" d="M77 218c0 9 3 16 9 20 7 5 17 7 31 8l14 0 0 5c0 5-1 9-3 12-3 3-7 4-13 4-4 0-8-1-12-2-4-1-8-3-12-4l-6 13c5 2 10 4 16 5 5 2 10 2 15 2 11 0 20-2 25-7 6-5 9-12 9-23l0-58-14 0-3 12-1 0c-4-5-8-9-12-11-5-1-10-2-17-2-8 0-15 2-19 6-5 5-7 12-7 20z m18 0c0-4 1-7 4-9 2-2 5-3 10-3 7 0 12 2 16 5 4 4 6 9 6 16l0 7-11 0c-9 0-15-2-19-4-4-3-6-7-6-12z m81-25l0 122 18 0 0-29c0-2 0-5 0-10-1-4-1-7-1-8l1 0c6 9 14 13 26 13 10 0 19-4 25-12 6-7 9-18 9-32 0-15-3-26-9-34-6-7-15-11-26-11-11 0-19 4-25 11l-1 0-4-10-13 0z m18 44c0-11 2-19 5-23 3-5 9-7 16-7 7 0 12 2 15 7 3 5 5 13 5 23 0 19-7 29-20 29-8 0-13-2-16-6-3-5-5-12-5-22z m76-1c0 14 4 26 11 33 7 8 17 12 30 12 9 0 18-2 25-5l-6-15c-7 3-14 5-19 5-15 0-22-10-22-30 0-10 2-17 5-22 4-5 10-7 17-7 8 0 16 2 23 6l0-16c-3-2-7-3-11-4-3-1-8-1-13-1-13 0-23 3-30 11-7 8-10 19-10 33z m236-122l-497 0 0 278 497 0z m-465 32l433 0 0 214-433 0z"/>
 </font></defs></svg>

app/assets/stylesheets/fonts/_openproject_icon_font.md

@@ -38,6 +38,7 @@
 <i class="icon-battery1"></i>
 <i class="icon-battery2"></i>
 <i class="icon-battery3"></i>
+<i class="icon-billing-information"></i>
 <i class="icon-bold"></i>
 <i class="icon-book1"></i>
 <i class="icon-book2"></i>
@@ -70,6 +71,7 @@
 <i class="icon-copy2"></i>
 <i class="icon-copy3"></i>
 <i class="icon-cup"></i>
+<i class="icon-custom-fields"></i>
 <i class="icon-cut"></i>
 <i class="icon-delete"></i>
 <i class="icon-delete-folder"></i>
@@ -80,6 +82,7 @@
 <i class="icon-download1"></i>
 <i class="icon-duplicate"></i>
 <i class="icon-edit"></i>
+<i class="icon-enumerations2"></i>
 <i class="icon-error"></i>
 <i class="icon-faq"></i>
 <i class="icon-filter"></i>
@@ -157,6 +160,7 @@
 <i class="icon-paragraph"></i>
 <i class="icon-paragraph-left"></i>
 <i class="icon-paragraph-right"></i>
+<i class="icon-payment-history2"></i>
 <i class="icon-phone"></i>
 <i class="icon-pin"></i>
 <i class="icon-play"></i>

app/assets/stylesheets/fonts/_openproject_icon_font.sass

@@ -952,6 +952,18 @@ dt > .icon-wiki-page:before,
 .icon-status-reporting:before
   content: "\e0f3"
 
+.icon-custom-fields:before
+  content: "\e102"
+
+.icon-billing-information:before
+  content: "\e100"
+
+.icon-enumerations2:before
+  content: "\e101"
+
+.icon-payment-history2:before
+  content: "\e103"
+
 /* remove once all menu items have an icon */
 .no-icon
   margin-left: 15px

config/initializers/menus.rb

@@ -105,21 +105,21 @@ Redmine::MenuManager.map :admin_menu do |menu|
   menu.push :statuses,
             { controller: '/statuses' },
             caption: :label_work_package_status_plural,
-            html: { class: 'statuses icon2 icon-status' }
+            html: { class: 'statuses icon2 icon-flag' }
 
   menu.push :workflows,
             { controller: '/workflows', action: 'edit' },
             caption: Proc.new { Workflow.model_name.human },
-            html: { class: 'icon2 icon-status' }
+            html: { class: 'icon2 icon-arrow-circle1' }
 
   menu.push :custom_fields,
             { controller: '/custom_fields' },
             caption: :label_custom_field_plural,
-            html: { class: 'custom_fields icon2 icon-status' }
+            html: { class: 'custom_fields icon2 icon-custom-fields' }
 
   menu.push :enumerations,
             { controller: '/enumerations' },
-            html: { class: 'icon2 icon-status' }
+            html: { class: 'icon2 icon-enumerations2' }
 
   menu.push :settings,
             { controller: '/settings' },
@@ -127,7 +127,7 @@ Redmine::MenuManager.map :admin_menu do |menu|
 
   menu.push :ldap_authentication,
             { controller: '/ldap_auth_sources', action: 'index' },
-            html: { class: 'server_authentication icon2 icon-status' },
+            html: { class: 'server_authentication icon2 icon-flag' },
             if: proc { !OpenProject::Configuration.disable_password_login? }
 
   menu.push :plugins,