diff options
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_flash.html.erb | 17 | ||||
| -rw-r--r-- | app/views/layouts/admin.html.erb | 9 |
2 files changed, 14 insertions, 12 deletions
diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb index a67fc866..b72c377f 100644 --- a/app/views/layouts/_flash.html.erb +++ b/app/views/layouts/_flash.html.erb | |||
| @@ -2,20 +2,21 @@ | |||
| 2 | <div id="flash"> | 2 | <div id="flash"> |
| 3 | <%= flash[:notice] %> | 3 | <%= flash[:notice] %> |
| 4 | <% if flash[:status_path] %> | 4 | <% if flash[:status_path] %> |
| 5 | <%= link_to 'Go to Status', flash[:status_path] %> | 5 | <%= link_to t(".go_to_status"), flash[:status_path] %> |
| 6 | <% end %> | 6 | <% end %> |
| 7 | <% if flash[:stale_locale_path] %> | 7 | <% if flash[:stale_locale_path] %> |
| 8 | The <%= flash[:stale_locale] %> translation may be out of date — | 8 | <%= t(".stale_prefix", :lang => flash[:stale_locale]) %> |
| 9 | <%= link_to 'review it', flash[:stale_locale_path] %> too. | 9 | <%= link_to t(".stale_link"), flash[:stale_locale_path] %><%= t(".stale_suffix") %> |
| 10 | <% end %> | 10 | <% end %> |
| 11 | <% if flash[:locked_node_path] %> | 11 | <% if flash[:locked_node_path] %> |
| 12 | <span class="warning">The page is locked by <%= flash[:locked_by] %> — | 12 | <span class="warning"><%= t(".locked_prefix", :login => flash[:locked_by]) %> |
| 13 | <%= link_to 'unlock it there', flash[:locked_node_path] %> first, | 13 | <%= link_to t(".locked_link"), flash[:locked_node_path] %><%= t(".locked_suffix") %> |
| 14 | then attach from this asset's page.</span> | 14 | </span> |
| 15 | <% end %> | 15 | <% end %> |
| 16 | <% if flash[:headline_kept_path] %> | 16 | <% if flash[:headline_kept_path] %> |
| 17 | <span class="warning">The page's existing headline was kept — | 17 | <span class="warning"><%= t(".headline_prefix") %> |
| 18 | <%= link_to 'change it there', flash[:headline_kept_path] %> if needed.</span> | 18 | <%= link_to t(".headline_link"), flash[:headline_kept_path] %><%= t(".headline_suffix") %> |
| 19 | </span> | ||
| 19 | <% end %> | 20 | <% end %> |
| 20 | <% if flash[:error] %> | 21 | <% if flash[:error] %> |
| 21 | <span id="flash_error"><%= flash[:error] %></span> | 22 | <span id="flash_error"><%= flash[:error] %></span> |
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 89c9b550..e056489f 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb | |||
| @@ -10,15 +10,16 @@ | |||
| 10 | <%= javascript_include_tag 'admin_bundle' %> | 10 | <%= javascript_include_tag 'admin_bundle' %> |
| 11 | <%= tinymce_assets %> | 11 | <%= tinymce_assets %> |
| 12 | <link rel="stylesheet" href="<%= mtime_busted_path('/stylesheets/admin.css') %>"> | 12 | <link rel="stylesheet" href="<%= mtime_busted_path('/stylesheets/admin.css') %>"> |
| 13 | <script src="<%= mtime_busted_path('/javascripts/admin_search.js') %>"></script> | ||
| 14 | <script src="<%= mtime_busted_path('/javascripts/admin_interface.js') %>"></script> | ||
| 15 | <script src="<%= mtime_busted_path('/javascripts/related_assets.js') %>"></script> | ||
| 16 | <%= javascript_tag nonce: true do %> | 13 | <%= javascript_tag nonce: true do %> |
| 17 | var ADMIN_SEARCH_URL = "<%= admin_search_path %>"; | 14 | var ADMIN_SEARCH_URL = "<%= admin_search_path %>"; |
| 18 | var ADMIN_MENU_SEARCH_URL = "<%= admin_menu_search_path %>"; | 15 | var ADMIN_MENU_SEARCH_URL = "<%= admin_menu_search_path %>"; |
| 16 | var ADMIN_STRINGS = <%= raw({ :lock_lost_prefix => t(".lock_lost_prefix"), :lock_lost_link => t(".lock_lost_link"), :insert_image => t(".insert_image"), :insert_image_tooltip => t(".insert_image_tooltip") }.to_json) %>; | ||
| 19 | var PARAMETERIZE_PREVIEW_URL = "<%= parameterize_preview_nodes_path %>"; | 17 | var PARAMETERIZE_PREVIEW_URL = "<%= parameterize_preview_nodes_path %>"; |
| 20 | var DASHBOARD_SEARCH_URL = "<%= admin_dashboard_search_path %>"; | 18 | var DASHBOARD_SEARCH_URL = "<%= admin_dashboard_search_path %>"; |
| 21 | <% end %> | 19 | <% end %> |
| 20 | <script src="<%= mtime_busted_path('/javascripts/admin_search.js') %>"></script> | ||
| 21 | <script src="<%= mtime_busted_path('/javascripts/admin_interface.js') %>"></script> | ||
| 22 | <script src="<%= mtime_busted_path('/javascripts/related_assets.js') %>"></script> | ||
| 22 | </head> | 23 | </head> |
| 23 | 24 | ||
| 24 | <body> | 25 | <body> |
| @@ -30,7 +31,7 @@ | |||
| 30 | <div id="search_widget" style="display: none;"> | 31 | <div id="search_widget" style="display: none;"> |
| 31 | <div> | 32 | <div> |
| 32 | <%= form_tag admin_search_path, method: :get do %> | 33 | <%= form_tag admin_search_path, method: :get do %> |
| 33 | <%= text_field_tag :search_term, nil, placeholder: "Search nodes…", autocomplete: "off" %> | 34 | <%= text_field_tag :search_term, nil, placeholder: t(".search_placeholder"), autocomplete: "off" %> |
| 34 | <% end %> | 35 | <% end %> |
| 35 | </div> | 36 | </div> |
| 36 | <div id="menu_search_results" class="search_results" style="display: none"></div> | 37 | <div id="menu_search_results" class="search_results" style="display: none"></div> |