Skip to content

Commit bab2c9d

Browse files
committed
Fix layout
1 parent ccc850b commit bab2c9d

File tree

4 files changed

+7
-22
lines changed

4 files changed

+7
-22
lines changed
Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
<%= stylesheet_link_tag('custom_messages', plugin: 'redmine_message_customize') %>
22
<%= stylesheet_link_tag('select2.min', plugin: 'redmine_message_customize') %>
33
<%= javascript_include_tag('select2.min', plugin: 'redmine_message_customize') %>
4-
<h2><%= l(:label_custom_messages) %></h2>
5-
64
<% unless @setting.enabled? %>
75
<div class='flash warning'>
86
<%= l(:text_disabled_customize) %>
97
</div>
108
<% end %>
119

10+
<div class='message-customize-menu contextual'>
11+
<%= link_to (@setting.enabled? ? l(:label_disable_customize) : l(:label_enable_customize)), toggle_enabled_custom_message_settings_path, method: :post, class: 'icon icon-settings' %> /
12+
<%= open_default_messages_window_link(@lang) %>
13+
</div>
14+
15+
<h2><%= l(:label_custom_messages) %></h2>
16+
1217
<% if @setting.errors.any? %>
1318
<%= error_messages_for(@setting) %>
1419
<% end %>
15-
<div class='message-customize-menu'>
16-
<%= link_to (@setting.enabled? ? l(:label_disable_customize) : l(:label_enable_customize)), toggle_enabled_custom_message_settings_path, method: :post, class: 'icon icon-settings' %> /
17-
<%= open_default_messages_window_link(@lang) %>
1820

19-
<% unless MessageCustomize::Locale.customizable_plugin_messages? %>
20-
<p>
21-
<%= l(:text_unable_to_customize_plugin_messages) %>
22-
</p>
23-
<% end %>
24-
</div>
2521
<%= render_tabs (@setting.errors.any? ? [] : [{name: 'normal', partial: 'normal_tab', label: 'label_normal_tab'}]) + [{name: 'yaml', partial: 'yaml_tab', label: 'label_yaml_tab'}] %>

assets/stylesheets/custom_messages.css

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,4 @@
3434
}
3535
.select2-container--default .select2-results__option[aria-disabled=true] span {
3636
color: white;
37-
}
38-
39-
div.message-customize-menu {
40-
text-align: right;
41-
}
42-
div.message-customize-menu p {
43-
color: gray;
44-
font-size: 10px;
45-
margin: 5px 0px;
4637
}

config/locales/en.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ en:
99
text_description_of_search_box: You can enter search terms in the search box to narrow down the results.
1010
text_for_your_reference: If you do not know how to write, please refer to "%{value}".
1111
text_disabled_customize: All message customizations are disabled.
12-
text_unable_to_customize_plugin_messages: Impossible to customize the messages of the plugins.
1312

1413
error_unused_keys: The keys not present in Redmine are used.
1514
error_unavailable_languages: The languages not present in Redmine are used.

config/locales/ja.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ ja:
99
text_description_of_search_box: 検索ボックスにキーワードを入力することで、選択肢を絞り込むことが出来ます。
1010
text_for_your_reference: "もし書き方がわからない場合は、「%{value}」が参考になるはずです。"
1111
text_disabled_customize: メッセージのカスタマイズはすべて無効になっています。
12-
text_unable_to_customize_plugin_messages: Redmineに入っているプラグインのメッセージはカスタマイズできません。
1312

1413
error_unused_keys: Redmineに存在しないキーが利用されています。
1514
error_unavailable_languages: Redmineで利用できない言語が利用されています。

0 commit comments

Comments
 (0)