From 37d8ac6cd6aa7fb86bb6de17d7e0c455be37e202 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Thu, 20 Jul 2023 09:37:32 +0200
Subject: [PATCH] Fix shareable links after develop merge

---
 app/assets/stylesheets/tailwind/inputs.css    | 21 +++++++++++++++++++
 app/controllers/teams_controller.rb           |  5 +++--
 .../_my_module_details.html.erb               |  4 ++--
 .../_destroy_tasks_sharing_modal.html.erb     |  4 ++--
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/tailwind/inputs.css b/app/assets/stylesheets/tailwind/inputs.css
index 377405efb..27055b4cc 100644
--- a/app/assets/stylesheets/tailwind/inputs.css
+++ b/app/assets/stylesheets/tailwind/inputs.css
@@ -45,4 +45,25 @@
   .sci-input-container-v2.right-icon input {
     @apply pr-10;
   }
+
+  .sci-input-container-v2.left-icon input {
+    @apply pl-10;
+  }
+
+  .sci-input-container-v2.textarea-lg {
+    @apply h-[9rem];
+  }
+
+  .sci-input-container-v2 textarea {
+    @apply w-full h-full bg-transparent px-2 border rounded outline-none absolute top-0;
+    border-color: var(--sn-sleepy-grey);
+  }
+
+  .sci-input-container-v2 textarea::placeholder {
+    color: var(--sn-sleepy-grey);
+  }
+
+  .sci-input-container-v2 textarea:focus {
+    border-color: var(--sn-science-blue);
+  }
 }
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
index 9bfb7b147..6a2ef32ff 100644
--- a/app/controllers/teams_controller.rb
+++ b/app/controllers/teams_controller.rb
@@ -70,8 +70,9 @@ class TeamsController < ApplicationController
   def disable_tasks_sharing_modal
     render json: {
       html: render_to_string(
-        partial: 'users/settings/teams/destroy_tasks_sharing_modal.html.erb',
-        locals: {}
+        partial: 'users/settings/teams/destroy_tasks_sharing_modal',
+        locals: {},
+        formats: :html
       )
     }
   end
diff --git a/app/views/shareable_links/_my_module_details.html.erb b/app/views/shareable_links/_my_module_details.html.erb
index e27d9b669..a9de8bbcc 100644
--- a/app/views/shareable_links/_my_module_details.html.erb
+++ b/app/views/shareable_links/_my_module_details.html.erb
@@ -8,7 +8,7 @@
   <div id="startDateContainer" class="datetime-container">
     <span class="date-text">
       <span id="startDateLabelContainer" class="view-block">
-        <%= render partial: "my_modules/start_date_label.html.erb" , locals: { my_module: @my_module } %>
+        <%= render partial: "my_modules/start_date_label", locals: { my_module: @my_module } %>
       </span>
     </span>
   </div>
@@ -22,7 +22,7 @@
   <div id="dueDateContainer" class="datetime-container">
     <span class="date-text">
       <span id="dueDateLabelContainer" class="view-block">
-        <%= render partial: "my_modules/due_date_label.html.erb" , locals: { my_module: @my_module, due_date_editable: false } %>
+        <%= render partial: "my_modules/due_date_label", locals: { my_module: @my_module, due_date_editable: false } %>
       </span>
     </span>
   </div>
diff --git a/app/views/users/settings/teams/_destroy_tasks_sharing_modal.html.erb b/app/views/users/settings/teams/_destroy_tasks_sharing_modal.html.erb
index 4cb033d64..e97b98bdc 100644
--- a/app/views/users/settings/teams/_destroy_tasks_sharing_modal.html.erb
+++ b/app/views/users/settings/teams/_destroy_tasks_sharing_modal.html.erb
@@ -6,8 +6,8 @@
         <h4 class="modal-title" id="team-sharing-tasks-label"><%= t("users.settings.teams.show.tasks_share.disable_modal.title") %></h4>
       </div>
       <div class="modal-body">
-        <p><%= t("users.settings.teams.show.tasks_share.disable_modal.description_p1", {team_name: @team.name}) %></p>
-        <p><%= t("users.settings.teams.show.tasks_share.disable_modal.description_p2", {counter: @team.number_of_task_shared}) %></p>
+        <p><%= t("users.settings.teams.show.tasks_share.disable_modal.description_p1", team_name: @team.name) %></p>
+        <p><%= t("users.settings.teams.show.tasks_share.disable_modal.description_p2", counter: @team.number_of_task_shared) %></p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.cancel') %></button>