Merge remote-tracking branch 'origin/53_3.13_LoadEmailDrafts' into 53…

…_3.13_LoadEmailDrafts
hpi-swt2 · Feb 3, 2017 · 126bd0b · 126bd0b
2 parents 5737a42 + dd12cb1
commit 126bd0b
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 24 deletions.
diff --git a/app/assets/javascripts/events.js b/app/assets/javascripts/events.js
@@ -3,17 +3,47 @@
 
 jQuery(function() {
 
-    $('#send-emails-modal').on('show.bs.modal', function (event) {
-        var button = $(event.relatedTarget);
-        var header = button.data('title');
-        var list = button.data('list');
-        var modal = $(this);
-        modal.find('.modal-title').text(header);
-        modal.find('#send-emails-mailto').attr('href', 'mailto:' + list);
-        modal.find('#send-emails-list').val(list);
-    });
+  $('#send-emails-modal').on('show.bs.modal', function (event) {
+    var button = $(event.relatedTarget);
+    var header = button.data('title');
+    var list = button.data('list');
+    var modal = $(this);
+    modal.find('.modal-title').text(header);
+    modal.find('#send-emails-mailto').attr('href', 'mailto:' + list);
+    modal.find('#send-emails-list').val(list);
+  });
 });
 
+function enableMultilinePlaceholder(){
+  // work around so that we can have a multiline placeholder
+  $("#description")
+    .val(function(index, oldVal) {
+      if (!oldVal) {
+        $(this).css('color', '#bbb');
+        return EVENT_DESCRIPTION_PLACEHOLDER;
+      }
+      return oldVal;
+    })
+    .focus(function(){
+      if($(this).val() === EVENT_DESCRIPTION_PLACEHOLDER){
+        $(this).val('').css('color', '#000');
+      }
+    })
+    .blur(function(){
+      if($(this).val() ===''){
+        $(this).val(EVENT_DESCRIPTION_PLACEHOLDER).css('color', '#bbb');
+      }
+    })
+    .parents("form").on("submit", function() {
+      $("#description").val(function(index, oldVal) {
+        return oldVal == EVENT_DESCRIPTION_PLACEHOLDER ? '' : oldVal;
+      });
+    });
+}
+// make sure multiline placeholders also work if the page is called via turbolink
+$(document).on('turbolinks:load', enableMultilinePlaceholder);
+jQuery(enableMultilinePlaceholder);
+
 function addCustomApplicationField() {
   $(CUSTOM_APPLICATION_FIELD_TEMPLATE)
     .insertBefore('#add-custom-application-fields');

diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
@@ -41,22 +41,9 @@
   <div class="form-group">
     <%= f.label :description, :class => 'control-label col-lg-2' %>
     <div class="col-lg-10">
-      <%= f.text_area :description, :class => 'form-control', :id => 'description',  :placeholder => '', :rows => 20 %>
+      <%= f.text_area :description, :class => 'form-control', :id => 'description',  :placeholder => '', :rows => 20, :spellcheck => "false" %>
       <script>
-        var placeholder = '## Untertitel \nLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n \n ## Lernziele\n* a\n* b\n* c\n\n## Hinweise\n* a\n* b\n* c';
-        $("#description").attr('placeholder', placeholder);
-
-        $("#description").focus(function(){
-            if($(this).val() === placeholder){
-                $(this).attr('placeholder', '');
-            }
-        });
-
-        $("#description").blur(function(){
-            if($(this).val() ===''){
-                $(this).attr('placeholder', placeholder);
-            }
-        });
+        var EVENT_DESCRIPTION_PLACEHOLDER = '<%= I18n.t "events.description_placeholder" %>';
       </script>
       <%=f.error_span(:description) %>
       Dieser Editor unterstüzt <a href="https://daringfireball.net/projects/markdown/syntax">Markdown</a>

diff --git a/config/locales/de.events.yml b/config/locales/de.events.yml
@@ -2,8 +2,11 @@
 
 de:
   events:
+    intro_text: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
+    description_placeholder: "## Untertitel\\nLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\\n \\n ## Lernziele\\n* a\\n* b\\n* c\\n\\n## Hinweise\\n* a\\n* b\\n* c" 
     archive: "Veranstaltungs-Archiv"
     all_events: "Alle Events"
+
     applicants_overview:
       title: "Bewerber für %{title}"
       participations: "Anzahl der Bewerbungen"