From 65778857614acec57e82b241646d5774426eb160 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 16 Aug 2013 13:42:22 +0800 Subject: [PATCH] docx xlsx and pptx file types fixed plus icon provided in edit form for files --- .../docx-128_32.png} | Bin .../docx-16_32.png} | Bin .../docx-24_32.png} | Bin .../docx-256_32.png} | Bin .../docx-32_32.png} | Bin .../docx-48_32.png} | Bin .../docx-64_32.png} | Bin .../docx-72_32.png} | Bin .../docx-80_32.png} | Bin .../docx-96_32.png} | Bin .../docx-sm-16_32.png} | Bin .../docx-sm-24_32.png} | Bin .../docx-sm-32_32.png} | Bin .../docx_mac-sm.ico => docx/docx-sm.ico} | Bin .../docx_mac.icns => docx/docx.icns} | Bin .../{docx_mac/docx_mac.ico => docx/docx.ico} | Bin .../pptx-128_32.png} | Bin .../pptx-16_32.png} | Bin .../pptx-24_32.png} | Bin .../pptx-256_32.png} | Bin .../pptx-32_32.png} | Bin .../pptx-48_32.png} | Bin .../pptx-64_32.png} | Bin .../pptx-72_32.png} | Bin .../pptx-80_32.png} | Bin .../pptx-96_32.png} | Bin .../pptx-sm-16_32.png} | Bin .../pptx-sm-24_32.png} | Bin .../pptx-sm-32_32.png} | Bin .../pptx_mac-sm.ico => pptx/pptx-sm.ico} | Bin .../pptx_mac.icns => pptx/pptx.icns} | Bin .../{pptx_mac/pptx_mac.ico => pptx/pptx.ico} | Bin .../xlsx-128_32.png} | Bin .../xlsx-16_32.png} | Bin .../xlsx-24_32.png} | Bin .../xlsx-256_32.png} | Bin .../xlsx-32_32.png} | Bin .../xlsx-48_32.png} | Bin .../xlsx-64_32.png} | Bin .../xlsx-72_32.png} | Bin .../xlsx-80_32.png} | Bin .../xlsx-96_32.png} | Bin .../xlsx-sm-16_32.png} | Bin .../xlsx-sm-24_32.png} | Bin .../xlsx-sm-32_32.png} | Bin .../xlsx_mac-sm.ico => xlsx/xlsx-sm.ico} | Bin .../xlsx_mac.icns => xlsx/xlsx.icns} | Bin .../{xlsx_mac/xlsx_mac.ico => xlsx/xlsx.ico} | Bin .../desktop/personal_books/_form.html.erb | 20 ++++++++++++------ .../personal_books/_form_file.html.erb | 7 +++++- .../conference_pages/_form_file.html.erb | 7 +++++- .../desktop/journal_pages_helper.rb | 4 +++- .../desktop/journal_pages/_form_file.html.erb | 7 +++++- .../desktop/personal_labs/_form_file.html.erb | 7 +++++- .../personal_patents/_form_file.html.erb | 15 ++++++++----- .../personal_projects/_form_file.html.erb | 7 +++++- .../personal_researchs/_form_file.html.erb | 7 +++++- 57 files changed, 63 insertions(+), 18 deletions(-) rename app/assets/images/ft-icons/{docx_mac/docx_mac-128_32.png => docx/docx-128_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-16_32.png => docx/docx-16_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-24_32.png => docx/docx-24_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-256_32.png => docx/docx-256_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-32_32.png => docx/docx-32_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-48_32.png => docx/docx-48_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-64_32.png => docx/docx-64_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-72_32.png => docx/docx-72_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-80_32.png => docx/docx-80_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-96_32.png => docx/docx-96_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-sm-16_32.png => docx/docx-sm-16_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-sm-24_32.png => docx/docx-sm-24_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-sm-32_32.png => docx/docx-sm-32_32.png} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac-sm.ico => docx/docx-sm.ico} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac.icns => docx/docx.icns} (100%) rename app/assets/images/ft-icons/{docx_mac/docx_mac.ico => docx/docx.ico} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-128_32.png => pptx/pptx-128_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-16_32.png => pptx/pptx-16_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-24_32.png => pptx/pptx-24_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-256_32.png => pptx/pptx-256_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-32_32.png => pptx/pptx-32_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-48_32.png => pptx/pptx-48_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-64_32.png => pptx/pptx-64_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-72_32.png => pptx/pptx-72_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-80_32.png => pptx/pptx-80_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-96_32.png => pptx/pptx-96_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-sm-16_32.png => pptx/pptx-sm-16_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-sm-24_32.png => pptx/pptx-sm-24_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-sm-32_32.png => pptx/pptx-sm-32_32.png} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac-sm.ico => pptx/pptx-sm.ico} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac.icns => pptx/pptx.icns} (100%) rename app/assets/images/ft-icons/{pptx_mac/pptx_mac.ico => pptx/pptx.ico} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-128_32.png => xlsx/xlsx-128_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-16_32.png => xlsx/xlsx-16_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-24_32.png => xlsx/xlsx-24_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-256_32.png => xlsx/xlsx-256_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-32_32.png => xlsx/xlsx-32_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-48_32.png => xlsx/xlsx-48_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-64_32.png => xlsx/xlsx-64_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-72_32.png => xlsx/xlsx-72_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-80_32.png => xlsx/xlsx-80_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-96_32.png => xlsx/xlsx-96_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-sm-16_32.png => xlsx/xlsx-sm-16_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-sm-24_32.png => xlsx/xlsx-sm-24_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-sm-32_32.png => xlsx/xlsx-sm-32_32.png} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac-sm.ico => xlsx/xlsx-sm.ico} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac.icns => xlsx/xlsx.icns} (100%) rename app/assets/images/ft-icons/{xlsx_mac/xlsx_mac.ico => xlsx/xlsx.ico} (100%) diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-128_32.png b/app/assets/images/ft-icons/docx/docx-128_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-128_32.png rename to app/assets/images/ft-icons/docx/docx-128_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-16_32.png b/app/assets/images/ft-icons/docx/docx-16_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-16_32.png rename to app/assets/images/ft-icons/docx/docx-16_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-24_32.png b/app/assets/images/ft-icons/docx/docx-24_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-24_32.png rename to app/assets/images/ft-icons/docx/docx-24_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-256_32.png b/app/assets/images/ft-icons/docx/docx-256_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-256_32.png rename to app/assets/images/ft-icons/docx/docx-256_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-32_32.png b/app/assets/images/ft-icons/docx/docx-32_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-32_32.png rename to app/assets/images/ft-icons/docx/docx-32_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-48_32.png b/app/assets/images/ft-icons/docx/docx-48_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-48_32.png rename to app/assets/images/ft-icons/docx/docx-48_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-64_32.png b/app/assets/images/ft-icons/docx/docx-64_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-64_32.png rename to app/assets/images/ft-icons/docx/docx-64_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-72_32.png b/app/assets/images/ft-icons/docx/docx-72_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-72_32.png rename to app/assets/images/ft-icons/docx/docx-72_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-80_32.png b/app/assets/images/ft-icons/docx/docx-80_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-80_32.png rename to app/assets/images/ft-icons/docx/docx-80_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-96_32.png b/app/assets/images/ft-icons/docx/docx-96_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-96_32.png rename to app/assets/images/ft-icons/docx/docx-96_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-sm-16_32.png b/app/assets/images/ft-icons/docx/docx-sm-16_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-sm-16_32.png rename to app/assets/images/ft-icons/docx/docx-sm-16_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-sm-24_32.png b/app/assets/images/ft-icons/docx/docx-sm-24_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-sm-24_32.png rename to app/assets/images/ft-icons/docx/docx-sm-24_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-sm-32_32.png b/app/assets/images/ft-icons/docx/docx-sm-32_32.png similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-sm-32_32.png rename to app/assets/images/ft-icons/docx/docx-sm-32_32.png diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac-sm.ico b/app/assets/images/ft-icons/docx/docx-sm.ico similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac-sm.ico rename to app/assets/images/ft-icons/docx/docx-sm.ico diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac.icns b/app/assets/images/ft-icons/docx/docx.icns similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac.icns rename to app/assets/images/ft-icons/docx/docx.icns diff --git a/app/assets/images/ft-icons/docx_mac/docx_mac.ico b/app/assets/images/ft-icons/docx/docx.ico similarity index 100% rename from app/assets/images/ft-icons/docx_mac/docx_mac.ico rename to app/assets/images/ft-icons/docx/docx.ico diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-128_32.png b/app/assets/images/ft-icons/pptx/pptx-128_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-128_32.png rename to app/assets/images/ft-icons/pptx/pptx-128_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-16_32.png b/app/assets/images/ft-icons/pptx/pptx-16_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-16_32.png rename to app/assets/images/ft-icons/pptx/pptx-16_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-24_32.png b/app/assets/images/ft-icons/pptx/pptx-24_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-24_32.png rename to app/assets/images/ft-icons/pptx/pptx-24_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-256_32.png b/app/assets/images/ft-icons/pptx/pptx-256_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-256_32.png rename to app/assets/images/ft-icons/pptx/pptx-256_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-32_32.png b/app/assets/images/ft-icons/pptx/pptx-32_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-32_32.png rename to app/assets/images/ft-icons/pptx/pptx-32_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-48_32.png b/app/assets/images/ft-icons/pptx/pptx-48_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-48_32.png rename to app/assets/images/ft-icons/pptx/pptx-48_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-64_32.png b/app/assets/images/ft-icons/pptx/pptx-64_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-64_32.png rename to app/assets/images/ft-icons/pptx/pptx-64_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-72_32.png b/app/assets/images/ft-icons/pptx/pptx-72_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-72_32.png rename to app/assets/images/ft-icons/pptx/pptx-72_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-80_32.png b/app/assets/images/ft-icons/pptx/pptx-80_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-80_32.png rename to app/assets/images/ft-icons/pptx/pptx-80_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-96_32.png b/app/assets/images/ft-icons/pptx/pptx-96_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-96_32.png rename to app/assets/images/ft-icons/pptx/pptx-96_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-sm-16_32.png b/app/assets/images/ft-icons/pptx/pptx-sm-16_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-sm-16_32.png rename to app/assets/images/ft-icons/pptx/pptx-sm-16_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-sm-24_32.png b/app/assets/images/ft-icons/pptx/pptx-sm-24_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-sm-24_32.png rename to app/assets/images/ft-icons/pptx/pptx-sm-24_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-sm-32_32.png b/app/assets/images/ft-icons/pptx/pptx-sm-32_32.png similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-sm-32_32.png rename to app/assets/images/ft-icons/pptx/pptx-sm-32_32.png diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac-sm.ico b/app/assets/images/ft-icons/pptx/pptx-sm.ico similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac-sm.ico rename to app/assets/images/ft-icons/pptx/pptx-sm.ico diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac.icns b/app/assets/images/ft-icons/pptx/pptx.icns similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac.icns rename to app/assets/images/ft-icons/pptx/pptx.icns diff --git a/app/assets/images/ft-icons/pptx_mac/pptx_mac.ico b/app/assets/images/ft-icons/pptx/pptx.ico similarity index 100% rename from app/assets/images/ft-icons/pptx_mac/pptx_mac.ico rename to app/assets/images/ft-icons/pptx/pptx.ico diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-128_32.png b/app/assets/images/ft-icons/xlsx/xlsx-128_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-128_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-128_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-16_32.png b/app/assets/images/ft-icons/xlsx/xlsx-16_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-16_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-16_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-24_32.png b/app/assets/images/ft-icons/xlsx/xlsx-24_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-24_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-24_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-256_32.png b/app/assets/images/ft-icons/xlsx/xlsx-256_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-256_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-256_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-32_32.png b/app/assets/images/ft-icons/xlsx/xlsx-32_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-32_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-32_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-48_32.png b/app/assets/images/ft-icons/xlsx/xlsx-48_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-48_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-48_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-64_32.png b/app/assets/images/ft-icons/xlsx/xlsx-64_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-64_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-64_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-72_32.png b/app/assets/images/ft-icons/xlsx/xlsx-72_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-72_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-72_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-80_32.png b/app/assets/images/ft-icons/xlsx/xlsx-80_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-80_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-80_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-96_32.png b/app/assets/images/ft-icons/xlsx/xlsx-96_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-96_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-96_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm-16_32.png b/app/assets/images/ft-icons/xlsx/xlsx-sm-16_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm-16_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-sm-16_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm-24_32.png b/app/assets/images/ft-icons/xlsx/xlsx-sm-24_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm-24_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-sm-24_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm-32_32.png b/app/assets/images/ft-icons/xlsx/xlsx-sm-32_32.png similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm-32_32.png rename to app/assets/images/ft-icons/xlsx/xlsx-sm-32_32.png diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm.ico b/app/assets/images/ft-icons/xlsx/xlsx-sm.ico similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac-sm.ico rename to app/assets/images/ft-icons/xlsx/xlsx-sm.ico diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac.icns b/app/assets/images/ft-icons/xlsx/xlsx.icns similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac.icns rename to app/assets/images/ft-icons/xlsx/xlsx.icns diff --git a/app/assets/images/ft-icons/xlsx_mac/xlsx_mac.ico b/app/assets/images/ft-icons/xlsx/xlsx.ico similarity index 100% rename from app/assets/images/ft-icons/xlsx_mac/xlsx_mac.ico rename to app/assets/images/ft-icons/xlsx/xlsx.ico diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb index 2ed83d0f..8ff320d8 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb @@ -71,13 +71,21 @@
  • <%= label_tag("", t("personal_book.author_type"), class: "s_grid_4 s_grid") %> - <% @author_types.each do |author_type| %> - <%= content_tag :label,:class => "s_grid_4 s_grid" do -%> - <%= check_box_tag 'writing_book[book_author_type_ids][]', author_type.id, @personal_book.book_author_type_ids.include?(author_type.id)%> - <%= author_type.title %> - <%= hidden_field_tag 'writing_book[book_author_type_ids][]', '' %> + +
    + +
      + <% @author_types.each_with_index do |author_type, i| %> +
    • + <%= check_box_tag "writing_book[book_author_type_ids][]", + author_type.id, + @personal_book.book_author_type_ids.include?(author_type.id), + id: "field-#{i}" + %><%= label_tag("field-#{i}", author_type.title) %> +
    • <% end %> - <% end %> +
    +