diff --git a/web/app/assets/images/shared/icon_accordion_256.png b/web/app/assets/images/content/icon_instrument_accordion256.png similarity index 100% rename from web/app/assets/images/shared/icon_accordion_256.png rename to web/app/assets/images/content/icon_instrument_accordion256.png diff --git a/web/app/assets/images/shared/icon_acoustic_256.png b/web/app/assets/images/content/icon_instrument_acoustic_guitar256.png similarity index 100% rename from web/app/assets/images/shared/icon_acoustic_256.png rename to web/app/assets/images/content/icon_instrument_acoustic_guitar256.png diff --git a/web/app/assets/images/shared/icon_banjo_256.png b/web/app/assets/images/content/icon_instrument_banjo256.png similarity index 100% rename from web/app/assets/images/shared/icon_banjo_256.png rename to web/app/assets/images/content/icon_instrument_banjo256.png diff --git a/web/app/assets/images/shared/icon_bass_256.png b/web/app/assets/images/content/icon_instrument_bass_guitar256.png similarity index 100% rename from web/app/assets/images/shared/icon_bass_256.png rename to web/app/assets/images/content/icon_instrument_bass_guitar256.png diff --git a/web/app/assets/images/shared/icon_cello_256.png b/web/app/assets/images/content/icon_instrument_cello256.png similarity index 100% rename from web/app/assets/images/shared/icon_cello_256.png rename to web/app/assets/images/content/icon_instrument_cello256.png diff --git a/web/app/assets/images/shared/icon_clarinet_256.png b/web/app/assets/images/content/icon_instrument_clarinet256.png similarity index 100% rename from web/app/assets/images/shared/icon_clarinet_256.png rename to web/app/assets/images/content/icon_instrument_clarinet256.png diff --git a/web/app/assets/images/shared/icon_computer_256.png b/web/app/assets/images/content/icon_instrument_computer256.png similarity index 100% rename from web/app/assets/images/shared/icon_computer_256.png rename to web/app/assets/images/content/icon_instrument_computer256.png diff --git a/web/app/assets/images/shared/icon_other_256.png b/web/app/assets/images/content/icon_instrument_default256.png similarity index 100% rename from web/app/assets/images/shared/icon_other_256.png rename to web/app/assets/images/content/icon_instrument_default256.png diff --git a/web/app/assets/images/shared/icon_drums_256.png b/web/app/assets/images/content/icon_instrument_drums256.png similarity index 100% rename from web/app/assets/images/shared/icon_drums_256.png rename to web/app/assets/images/content/icon_instrument_drums256.png diff --git a/web/app/assets/images/shared/icon_guitar_256.png b/web/app/assets/images/content/icon_instrument_electric_guitar256.png similarity index 100% rename from web/app/assets/images/shared/icon_guitar_256.png rename to web/app/assets/images/content/icon_instrument_electric_guitar256.png diff --git a/web/app/assets/images/shared/icon_euphonium_256.png b/web/app/assets/images/content/icon_instrument_euphonium256.png similarity index 100% rename from web/app/assets/images/shared/icon_euphonium_256.png rename to web/app/assets/images/content/icon_instrument_euphonium256.png diff --git a/web/app/assets/images/shared/icon_flute_256.png b/web/app/assets/images/content/icon_instrument_flute256.png similarity index 100% rename from web/app/assets/images/shared/icon_flute_256.png rename to web/app/assets/images/content/icon_instrument_flute256.png diff --git a/web/app/assets/images/shared/icon_frenchhorn_256.png b/web/app/assets/images/content/icon_instrument_french_horn256.png similarity index 100% rename from web/app/assets/images/shared/icon_frenchhorn_256.png rename to web/app/assets/images/content/icon_instrument_french_horn256.png diff --git a/web/app/assets/images/shared/icon_harmonica_256.png b/web/app/assets/images/content/icon_instrument_harmonica256.png similarity index 100% rename from web/app/assets/images/shared/icon_harmonica_256.png rename to web/app/assets/images/content/icon_instrument_harmonica256.png diff --git a/web/app/assets/images/shared/icon_keyboard_256.png b/web/app/assets/images/content/icon_instrument_keyboard256.png similarity index 100% rename from web/app/assets/images/shared/icon_keyboard_256.png rename to web/app/assets/images/content/icon_instrument_keyboard256.png diff --git a/web/app/assets/images/shared/icon_mandolin_256.png b/web/app/assets/images/content/icon_instrument_mandolin256.png similarity index 100% rename from web/app/assets/images/shared/icon_mandolin_256.png rename to web/app/assets/images/content/icon_instrument_mandolin256.png diff --git a/web/app/assets/images/shared/icon_oboe_256.png b/web/app/assets/images/content/icon_instrument_oboe256.png similarity index 100% rename from web/app/assets/images/shared/icon_oboe_256.png rename to web/app/assets/images/content/icon_instrument_oboe256.png diff --git a/web/app/assets/images/content/icon_instrument_other256.png b/web/app/assets/images/content/icon_instrument_other256.png new file mode 100644 index 000000000..e5163cdc8 Binary files /dev/null and b/web/app/assets/images/content/icon_instrument_other256.png differ diff --git a/web/app/assets/images/shared/icon_piano_256.png b/web/app/assets/images/content/icon_instrument_piano256.png similarity index 100% rename from web/app/assets/images/shared/icon_piano_256.png rename to web/app/assets/images/content/icon_instrument_piano256.png diff --git a/web/app/assets/images/shared/icon_saxophone_256.png b/web/app/assets/images/content/icon_instrument_saxophone256.png similarity index 100% rename from web/app/assets/images/shared/icon_saxophone_256.png rename to web/app/assets/images/content/icon_instrument_saxophone256.png diff --git a/web/app/assets/images/shared/icon_trombone_256.png b/web/app/assets/images/content/icon_instrument_trombone256.png similarity index 100% rename from web/app/assets/images/shared/icon_trombone_256.png rename to web/app/assets/images/content/icon_instrument_trombone256.png diff --git a/web/app/assets/images/shared/icon_trumpet_256.png b/web/app/assets/images/content/icon_instrument_trumpet256.png similarity index 100% rename from web/app/assets/images/shared/icon_trumpet_256.png rename to web/app/assets/images/content/icon_instrument_trumpet256.png diff --git a/web/app/assets/images/shared/icon_tuba_256.png b/web/app/assets/images/content/icon_instrument_tuba256.png similarity index 100% rename from web/app/assets/images/shared/icon_tuba_256.png rename to web/app/assets/images/content/icon_instrument_tuba256.png diff --git a/web/app/assets/images/shared/icon_ukelele_256.png b/web/app/assets/images/content/icon_instrument_ukelele256.png similarity index 100% rename from web/app/assets/images/shared/icon_ukelele_256.png rename to web/app/assets/images/content/icon_instrument_ukelele256.png diff --git a/web/app/assets/images/shared/icon_upright_bass_256.png b/web/app/assets/images/content/icon_instrument_upright_bass256.png similarity index 100% rename from web/app/assets/images/shared/icon_upright_bass_256.png rename to web/app/assets/images/content/icon_instrument_upright_bass256.png diff --git a/web/app/assets/images/shared/icon_viola_256.png b/web/app/assets/images/content/icon_instrument_viola256.png similarity index 100% rename from web/app/assets/images/shared/icon_viola_256.png rename to web/app/assets/images/content/icon_instrument_viola256.png diff --git a/web/app/assets/images/shared/icon_violin_256.png b/web/app/assets/images/content/icon_instrument_violin256.png similarity index 100% rename from web/app/assets/images/shared/icon_violin_256.png rename to web/app/assets/images/content/icon_instrument_violin256.png diff --git a/web/app/assets/images/shared/icon_vocals_256.png b/web/app/assets/images/content/icon_instrument_vocal256.png similarity index 100% rename from web/app/assets/images/shared/icon_vocals_256.png rename to web/app/assets/images/content/icon_instrument_vocal256.png diff --git a/web/app/assets/images/content/icon_instrument_voice256.png b/web/app/assets/images/content/icon_instrument_voice256.png new file mode 100644 index 000000000..89cd3e558 Binary files /dev/null and b/web/app/assets/images/content/icon_instrument_voice256.png differ diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js index 2f76d9809..48e0ff04e 100644 --- a/web/app/assets/javascripts/profile.js +++ b/web/app/assets/javascripts/profile.js @@ -323,7 +323,7 @@ var instrument = user.instruments[i]; var description = instrument.instrument_id; var proficiency = instrument.proficiency_level; - var instrument_icon_url = context.JK.getInstrumentIcon45(description); + var instrument_icon_url = context.JK.getInstrumentIcon256(description); // add instrument info to layout var template = $('#template-profile-instruments').html(); diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js index c11a7d6b8..8fa15df0d 100644 --- a/web/app/assets/javascripts/utils.js +++ b/web/app/assets/javascripts/utils.js @@ -81,11 +81,13 @@ var instrumentIconMap24 = {}; var instrumentIconMap45 = {}; + var instrumentIconMap256 = {}; $.each(context._.keys(icon_map_base), function (index, instrumentId) { var icon = icon_map_base[instrumentId]; instrumentIconMap24[instrumentId] = "/assets/content/icon_instrument_" + icon + "24.png"; instrumentIconMap45[instrumentId] = "/assets/content/icon_instrument_" + icon + "45.png"; + instrumentIconMap256[instrumentId] = "/assets/content/icon_instrument_" + icon + "256.png"; }); /** @@ -282,6 +284,10 @@ return instrumentIconMap45; }; + context.JK.getInstrumentIconMap256 = function () { + return instrumentIconMap256; + }; + context.JK.getInstrumentIcon24 = function (instrument) { if (instrument in instrumentIconMap24) { return instrumentIconMap24[instrument]; @@ -298,6 +304,14 @@ return instrumentIconMap45["default"]; }; + context.JK.getInstrumentIcon256 = function (instrument) { + if (instrument in instrumentIconMap256) { + return instrumentIconMap256[instrument]; + } + + return instrumentIconMap256["default"]; + }; + // meant to pass in a bunch of images with an instrument-id attribute on them. context.JK.setInstrumentAssetPath = function ($elements) {