From 195a30c1a6faeb961e4905501003d213e79e8f07 Mon Sep 17 00:00:00 2001
From: Alexander Meindl <alex@alphanodes.com>
Date: Sat, 20 Mar 2021 19:10:38 +0100
Subject: [PATCH] refactoring live search to get cleaner css structure

---
 .../_h2_with_query_search.html.slim           |  22 +++++------
 assets/images/smileys/rose.png                | Bin 1000 -> 0 bytes
 assets/stylesheets/additionals.css            |  37 ++++++------------
 config/locales/cs.yml                         |   1 +
 config/locales/de.yml                         |   1 +
 config/locales/en.yml                         |   1 +
 config/locales/es.yml                         |   1 +
 config/locales/fr.yml                         |   1 +
 config/locales/it.yml                         |   1 +
 config/locales/ja.yml                         |   1 +
 config/locales/ko.yml                         |   1 +
 config/locales/pl.yml                         |   1 +
 config/locales/pt-BR.yml                      |   1 +
 config/locales/ru.yml                         |   1 +
 config/locales/zh-TW.yml                      |   1 +
 config/locales/zh.yml                         |   1 +
 docs/manual.rst                               |   2 +-
 lib/additionals/formatter.rb                  |   1 -
 lib/additionals/helpers.rb                    |   6 +++
 19 files changed, 44 insertions(+), 37 deletions(-)
 delete mode 100644 assets/images/smileys/rose.png

diff --git a/app/views/additionals/_h2_with_query_search.html.slim b/app/views/additionals/_h2_with_query_search.html.slim
index d09b8ee3..e9d1b627 100644
--- a/app/views/additionals/_h2_with_query_search.html.slim
+++ b/app/views/additionals/_h2_with_query_search.html.slim
@@ -1,13 +1,13 @@
-- classes = 'title' unless defined? classes
-h2 class="#{classes}"
+- classes = 'live-search'
+- if defined? css_class
+  - classes << " #{css_class}"
+h2#page-title class="#{classes}"
   = @query.new_record? ? l(title) : h(@query.name)
-  span.additionals-live-search
-    = text_field_tag :search,
-                     q,
-                     autocomplete: 'off',
-                     class: 'live-search-field',
-                     placeholder: defined?(placeholder) ? placeholder : l(:label_query_name_search)
+  = text_field_tag :search,
+                    q,
+                    class: 'no-tooltip',
+                    autocomplete: 'off',
+                    title: defined?(title_info) ? title_info : nil
 
-    javascript:
-      observeLiveSearchField('search',
-                             'query-result-list')
+  javascript:
+    observeLiveSearchField('search', 'query-result-list');
diff --git a/assets/images/smileys/rose.png b/assets/images/smileys/rose.png
deleted file mode 100644
index 66ea939be2f980a15e7d289181015395297c4f85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1000
zcmV<E0~h>>P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000B8Nkl<ZNQupq
zU1%It6vzMP-aE51lilrxXx2@jU;}MK3|iMfB}f-6D77D=SSpA?eGwIkPzbaj(LPA2
z{UCyGV$noF2!s-<RL~&AuOzmnO>Gh_5wtDA=5sTdoxO994^jvwJ59s~|Bv_F^Z(uR
z!3F+r>IM$|XJ#J(Pj&-4mzh7`1#lPe;<B?s7w}3Y4~heP0-Q2LFEjI_0MeH0_O$HT
z<Na{<tgnOMX#k<+x}Q-P_V16P$JPz_RLa3Ed-p!{`^bnd0JOBVd0sk=#hDp=f96a8
zrA+hg-QKsIowEm+tJhzF5OYr)JC;^L07QUg{T(m{&>CO{Y#Y4?59%f6>X(4xKRr|&
zfSDa>+u*6GigzfRg#knk2v>{80t}G?5zLJn74OJw7DOa=F|Qw>fSaZH`8u_*04}bm
z9+XNUn45zHuE%&(7BPSG=hdrE<!Wj~G%>LvZZ$MuYIM{v(bttcL>wSsK60_ACkS&n
zsFoIx=K)a!a$Ts_RxDLl<EP$U-$YS+#Ye^g0H7N<V7c!5&HMH_cQ-bQL?(mM^faa}
zU)CdieSt2Oo_!AJ`_}*f_z>7=OZj%W3j1l%C?tiJ3;c0lO#2JK&A8l(fJ1M1yQJlQ
z0D_2g`90y=$F=L<+T2uckB|Nlo_y0!tmSbPXTXdpMwEHr{vCJaa+?k#smEa0wrmA3
z?6sK30!|$DhfGvH{o{o%0^2RAY%W_TRqWEOsyoi$^^U5?6>ubC-cEqJFTWX=hQ^@+
zFU3{5-Lev|F|#h0if!+_<)2$~1-EsoWAXFj9gB~o$xko?ZlVTYhDc+g;oj|sckXyK
z18{~JtNtf<1l(3f2Mho>b_SO1pkdR4_oO$t;`~>q1Fe@%o;d0ct(I4@saslGZO><i
zRoROG8_YIv1qmwy9fkOLY(TRS7iVV^?_T(>@%*-JR@(O{7#kP}V*&Ym-VTAZEJaD9
zA`ga=0DFRjLnJgfp}?fSJh$~3W)T?XK!7%~Di__7^qcefq7BRs4-bbcT2v?$gfR&R
zQaT3gu|X07X^_Y;p%(C_ul;%nU~ks2tYbngNMs<8W`m>wdyvvGCgBtc1pxqZIbd>f
zlI!bhIbxQQBtbC45HmOupc2X8I_S5Dul<tjoVk@8Ct!}5i^NnUfuex$*=S#vyv4!6
zehtK|X;V{^a2&^plyWq)BO|iGY*%dvk_+>WFBl;MT1XBdWgyFCKb1=9{{DWm+~+Tj
W#E){3Ktf^w0000<MNUMnLSTaZ63Tf1

diff --git a/assets/stylesheets/additionals.css b/assets/stylesheets/additionals.css
index 90d320ae..a8b1b728 100644
--- a/assets/stylesheets/additionals.css
+++ b/assets/stylesheets/additionals.css
@@ -16,10 +16,6 @@
   padding-bottom: 10px;
 }
 
-span.additionals-live-search input::placeholder {
-  font-size: 90%;
-}
-
 .query-description,
 .dashboard-description {
   color: #666;
@@ -143,12 +139,6 @@ span.additionals-live-search input::placeholder {
   background-image: url(../images/smileys/smiley-cool.png);
 }
 
-.smiley-rose {
-  background-image: url(../images/smileys/rose.png);
-  width: 24px;
-  height: 24px;
-}
-
 .smiley-check {
   background-image: url(../images/smileys/check.png);
 }
@@ -191,26 +181,25 @@ div.clear-both { clear: both; }
 
 img.additionals-avatar { margin-right: 0.25em; }
 
-/* Live search */
-.additionals-live-search input.live-search-field {
+h2#page-title input {
   font-size: 16px;
-  width: 65%;
 }
 
-.additionals-live-search {
+h2#page-title::before {
+  font-family: Font Awesome\ 5 Free;
+  padding-right: 5px;
+  text-shadow: 0 2px 0 #efefef;
+  font-size: 90%;
+}
+
+/* Live search */
+h2#page-title.live-search input {
   margin-left: 5px;
 }
 
-.ui-tooltip {
-  color: #fff;
-  background: #000;
-  opacity: 0.85;
-  padding: 8px;
-  border: 0;
-  max-width: inherit;
-  border-radius: 4px;
-  box-shadow: 0 0 6px #888;
-  font-size: 12px;
+h2#page-title.import::before {
+  font-weight: 900;
+  content: "\f093"; /* fas fa-upload */
 }
 
 a.external.redmine-link {
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 62e1096b..d40e4afc 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -183,3 +183,4 @@ cs:
   wiki_pdf_remove_attachments_info: "Pokud je aktivní, připojené soubory Wiki se nebudou zobrazovat v zobrazení PDF."
   wiki_pdf_remove_title_info: "Pokud je aktivní, informace o názvu Wiki se nebudou zobrazovat v zobrazení PDF."
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index a48356c5..fcc4a142 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -183,3 +183,4 @@ de:
   wiki_pdf_remove_attachments_info: Wenn aktiv, werden die an der Wiki Seite angehängten Dateien nicht in der PDF Ansicht angezeigt.
   wiki_pdf_remove_title_info: Wenn aktiv, wird der Wiki Titel nicht in der PDF Ansicht angezeigt.
   button_merge: Zusammenführen
+  label_live_search_hints: "Verfügbare Feldsuche: %{value}"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 29a5c614..44ee5581 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -183,3 +183,4 @@ en:
   wiki_pdf_remove_attachments_info: "When active the attached Wiki files will not be displayed in PDF view."
   wiki_pdf_remove_title_info: "When active the Wiki title info will not be displayed in PDF view."
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index b80327bd..dd3acdfc 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -183,3 +183,4 @@ es:
   wiki_pdf_remove_attachments_info: "Cuando está activa, los adjuntos no serán mostrados en los PDF."
   wiki_pdf_remove_title_info: "Cuando está activa, el título de la Wiki no será mostrado en los PDF."
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index f7d6dab1..1e42de1a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -183,3 +183,4 @@ fr:
   wiki_pdf_remove_attachments_info: "Lorsqu'ils sont actifs, les fichiers Wiki joints ne seront pas affichés en vue PDF."
   wiki_pdf_remove_title_info: "Lorsqu'elle est active, l'information sur le titre du wiki ne sera pas affichée dans la vue PDF."
   button_merge: Fusionner
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 17e8e8dd..88f7a34e 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -183,3 +183,4 @@ it:
   wiki_pdf_remove_attachments_info: "Quando è attivo, il Wiki file allegati non verranno visualizzati nella vista PDF."
   wiki_pdf_remove_title_info: "Quando è attivo, le informazioni sul titolo del Wiki non verranno visualizzate nella vista PDF."
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 62dd2de6..cfb700cb 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -183,3 +183,4 @@ ja:
   wiki_pdf_remove_attachments_info: "アクティブな場合、添付されたWikiファイルはPDFビューに表示されません。"
   wiki_pdf_remove_title_info: "アクティブな場合、Wikiのタイトル情報はPDFビューに表示されません。"
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 97923af1..4688f850 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -183,3 +183,4 @@ ko:
   wiki_pdf_remove_attachments_info: 활성화 된 경우 첨부 된 Wiki 파일은 PDF보기에 표시되지 않습니다.
   wiki_pdf_remove_title_info: 활성화되면 위키 제목 정보가 PDF보기에 표시되지 않습니다.
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f01c1b4e..fd868f67 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -183,3 +183,4 @@ pl:
   wiki_pdf_remove_attachments_info: "Gdy jest aktywny, załączone pliki Wiki nie będą wyświetlane w widoku PDF."
   wiki_pdf_remove_title_info: "Gdy jest aktywny, informacja o tytule Wiki nie będzie wyświetlana w widoku PDF."
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 1e944089..11d4f76d 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -183,3 +183,4 @@ pt-BR:
   wiki_pdf_remove_attachments_info: "Quando ativo, os arquivos Wiki anexos não serão exibidos na visualização em PDF."
   wiki_pdf_remove_title_info: "Quando ativo, o título do Wiki não será exibido na visualização em PDF."
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 8db95329..f72509fc 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -183,3 +183,4 @@ ru:
   wiki_pdf_remove_attachments_info: "Если флажок установлен, вложенные Вики-файлы не будут отображаться в PDF-формате."
   wiki_pdf_remove_title_info: "При активации этого параметра информация о названии Вики не будет отображаться в PDF-формате."
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 6b97ba69..f735fdbc 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -183,3 +183,4 @@
   wiki_pdf_remove_attachments_info: "當啟用時，Wiki附件將不會顯示在PDF中。"
   wiki_pdf_remove_title_info: "當啟用時，Wiki標題訊息不會顯示在PDF中"
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 41eb2d8d..d3137f08 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -183,3 +183,4 @@ zh:
   wiki_pdf_remove_attachments_info:  当启用时，WIKI 附件将不会显示在PDF视图中。
   wiki_pdf_remove_title_info: 当启用时，WIKI 标题信息将不会显示在PDF视图中。
   button_merge: Merge
+  label_live_search_hints: "Available field searches: %{value}"
diff --git a/docs/manual.rst b/docs/manual.rst
index a4fb60d9..055970ba 100644
--- a/docs/manual.rst
+++ b/docs/manual.rst
@@ -49,7 +49,7 @@ Disable modules
   Please restart the application server, if you make changes to the external urls settings as well as if you activate the Smileys support.
 
 .. note::
-  You can use the following manual smiley codes: :), =), :D, =D, :'(, :(, ;), :P, :O, :/, :S, :|, :X, :*, O:), >:), B), (!), (?), (v), (x), (/) and @}->-
+  You can use the following manual smiley codes: :), =), :D, =D, :'(, :(, ;), :P, :O, :/, :S, :|, :X, :*, O:), >:), B), (!), (?), (v), (x) and  (/)
 
 
 
diff --git a/lib/additionals/formatter.rb b/lib/additionals/formatter.rb
index 0bf67277..793045d4 100644
--- a/lib/additionals/formatter.rb
+++ b/lib/additionals/formatter.rb
@@ -18,7 +18,6 @@ module Additionals
                 'angel' => '[Oo][=:]-?\)', # O:)
                 'evil' => '>[=:;]-?[)(]', # >:)
                 'rock' => 'B-?\)', # B)
-                'rose' => '@[)\}][-\\/\',;()>\}]*', # @}->-
                 'exclamation' => '[\[(]![\])]', # (!)
                 'question' => '[\[(]\?[\])]', # (?)
                 'check' => '[\[(]\\/[\])]', # (/)
diff --git a/lib/additionals/helpers.rb b/lib/additionals/helpers.rb
index 5328e9a5..a8048b01 100644
--- a/lib/additionals/helpers.rb
+++ b/lib/additionals/helpers.rb
@@ -1,5 +1,11 @@
 module Additionals
   module Helpers
+    def live_search_title_info(entity)
+      fields = "LiveSearch::#{entity.to_s.classify}".constantize.info_fields
+      all_fields = fields.map { |f| "#{f}:term" }.join ', '
+      l :label_live_search_hints, value: all_fields
+    end
+
     def link_to_external(name, link, options = {})
       options[:class] ||= 'external'
       options[:class] << ' external' if options[:class].exclude? 'external'