From 253fd41071f55f15e8b8b1b362db08c9d31bca1b Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Thu, 11 Feb 2021 13:26:48 +0100
Subject: [PATCH] Don't repeat code in kara ejs cards
---
instance/views/kara.ejs | 9 +++++++++
instance/views/karaDBListItem.ejs | 9 +--------
instance/views/karaQueueListItem.ejs | 9 +--------
3 files changed, 11 insertions(+), 16 deletions(-)
create mode 100644 instance/views/kara.ejs
diff --git a/instance/views/kara.ejs b/instance/views/kara.ejs
new file mode 100644
index 0000000..cba6f72
--- /dev/null
+++ b/instance/views/kara.ejs
@@ -0,0 +1,9 @@
+<%# vim: ts=4 syntax=html
+ The template for the kara in kara cards %>
+<span hidden class = "karaID"><%= kara.id %></span>
+<span class="karaElement p-2 bd-highlight mr-auto"><%= kara.cat %> - <%= kara.language %> / <b><%= kara.source %></b><br>
+ <%= kara.type %> - <b><%= kara.title %></b> <i>[<%= kara.author %>]</i>
+</span>
+<% if (kara.hasOwnProperty('position')) { %>
+ <span class="karaElement p-3 bd-highlight karaPosition"><b><%= kara.position %></b></span>
+<% } %>
diff --git a/instance/views/karaDBListItem.ejs b/instance/views/karaDBListItem.ejs
index 8f29e2c..26b27e8 100644
--- a/instance/views/karaDBListItem.ejs
+++ b/instance/views/karaDBListItem.ejs
@@ -1,14 +1,7 @@
<%# vim: ts=4 syntax=html
The template for the kara card in lists %>
<li class="card p-2 bd-highlight shadow-none d-flex flex-row bd-highlight mb-3 karaCard" draggable="true">
- <span hidden class = "karaID"><%= kara.id %></span>
- <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b><%= kara.language %></b></span>
- <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b><%= kara.cat %></b></span>
- <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b><%= kara.type %></b></span>
- <span class="karaElement p-2 bd-highlight mr-auto"><b><%= kara.source %><br> <%= kara.title %></b> <i>[<%= kara.author %>]</i></span>
- <% if (kara.hasOwnProperty('position')) { %>
- <span class="karaElement p-3 bd-highlight karaPosition"><b><%= kara.position %></b></span>
- <% } %>
+ <%- include('kara.ejs'); %>
<div class="karaElement p-2 bd-highlight">
<div class="d-flex flex-row bd-highlight mb-3 btn-group karaActionBtnGroup" role="group">
<button class="btn btn-outline-light karaActionBtn karaAddBtn" title="Add"><i class="fas fa-plus"></i></button>
diff --git a/instance/views/karaQueueListItem.ejs b/instance/views/karaQueueListItem.ejs
index 052387b..0d710db 100644
--- a/instance/views/karaQueueListItem.ejs
+++ b/instance/views/karaQueueListItem.ejs
@@ -1,14 +1,7 @@
<%# vim: ts=4 syntax=html
The template for the kara card in lists %>
<li class="card p-2 bd-highlight shadow-none d-flex flex-row bd-highlight mb-3 karaCard karaQueue" draggable="true">
- <span hidden class = "karaID"><%= kara.id %></span>
- <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b><%= kara.language %></b></span>
- <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b><%= kara.cat %></b></span>
- <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b><%= kara.type %></b></span>
- <span class="karaElement p-2 bd-highlight mr-auto"><b><%= kara.source %><br> <%= kara.title %></b> <i>[<%= kara.author %>]</i></span>
- <% if (kara.hasOwnProperty('position')) { %>
- <span class="karaElement p-3 bd-highlight karaPosition"><b><%= kara.position %></b></span>
- <% } %>
+ <%- include('kara.ejs'); %>
<div class="karaElement p-2 bd-highlight">
<div class="d-flex flex-row bd-highlight mb-3 btn-group karaActionBtnGroup" role="group">
<button class="btn btn-outline-light karaActionBtn karaPlayBtn" title="Play"><i class="fas fa-play"></i></button>
--
GitLab