diff --git a/app/views/branded/layouts/_branding.html.erb b/app/views/branded/layouts/_branding.html.erb index ea9994e..db80414 100644 --- a/app/views/branded/layouts/_branding.html.erb +++ b/app/views/branded/layouts/_branding.html.erb @@ -47,6 +47,9 @@ <% end %> <% end %> +
+ <%= current_user.org.banner_text.html_safe %> +
<% end %> diff --git a/app/views/orgs/_profile_form.html.erb b/app/views/orgs/_profile_form.html.erb index 6490a1b..34fa494 100644 --- a/app/views/orgs/_profile_form.html.erb +++ b/app/views/orgs/_profile_form.html.erb @@ -32,8 +32,11 @@
- <%= f.label :banner_text, _('Banner text'), class: 'control-label' %> - <%= f.text_area :banner_text, class: 'form-control', 'aria-required': true %> + <% tip = _('Maximum 3 lines (about 250 characters)') %> +
+ <%= f.label :banner_text, _('Banner text'), class: 'control-label' %> + <%= f.text_area :banner_text, class: 'form-control', 'aria-required': true %> +
diff --git a/lib/assets/javascripts/utils/tinymce.js b/lib/assets/javascripts/utils/tinymce.js index ff285b2..bc82477 100644 --- a/lib/assets/javascripts/utils/tinymce.js +++ b/lib/assets/javascripts/utils/tinymce.js @@ -31,6 +31,7 @@ autoresize_bottom_margin: 10, branding: false, extended_valid_elements: 'iframe[tooltip] , a[href|target=_blank]', + default_link_target: '_blank', paste_auto_cleanup_on_paste: true, paste_remove_styles: true, paste_retain_style_properties: 'none', diff --git a/lib/assets/javascripts/views/orgs/admin_edit.js b/lib/assets/javascripts/views/orgs/admin_edit.js index 165aa40..d411a80 100644 --- a/lib/assets/javascripts/views/orgs/admin_edit.js +++ b/lib/assets/javascripts/views/orgs/admin_edit.js @@ -57,4 +57,10 @@ e.preventDefault(); } }); + + Tinymce.init({ + selector: '#org_banner_text', + forced_root_block: '', + toolbar: 'bold italic underline | link', + }); }); diff --git a/lib/assets/stylesheets/application.scss b/lib/assets/stylesheets/application.scss index 8067f2b..c880e94 100644 --- a/lib/assets/stylesheets/application.scss +++ b/lib/assets/stylesheets/application.scss @@ -25,10 +25,3 @@ clear: left; margin-bottom: 10px; } - -.org-banner-text { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} diff --git a/lib/assets/stylesheets/dmpopidor.scss b/lib/assets/stylesheets/dmpopidor.scss index 123273e..066715b 100644 --- a/lib/assets/stylesheets/dmpopidor.scss +++ b/lib/assets/stylesheets/dmpopidor.scss @@ -565,4 +565,11 @@ .text { padding: 20px 0; } +} + +.org-banner-text { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); } \ No newline at end of file