From bb0f2e43bb3c066f3a1cefe10c673ca227ba15b1 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Thu, 6 Feb 2020 09:50:57 +0100
Subject: [PATCH] Rename merge images to concat images

---
 app/services/views.py      | 2 +-
 app/templates/base.html.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/views.py b/app/services/views.py
index bf7cd723..d6703ddb 100644
--- a/app/services/views.py
+++ b/app/services/views.py
@@ -10,7 +10,7 @@ import json
 import os
 
 
-SERVICES = {'merge_images': {'name': 'Merge Images',
+SERVICES = {'merge_images': {'name': 'Concat images',
                              'resources': {'mem_mb': 4096, 'n_cores': 4},
                              'add_job_form': AddMergeImagesJobForm},
             'nlp': {'name': 'Natural Language Processing',
diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2
index 15ebb39e..de81f85b 100644
--- a/app/templates/base.html.j2
+++ b/app/templates/base.html.j2
@@ -62,7 +62,7 @@
         <li><a href="{{ url_for('main.dashboard') }}"><i class="material-icons">dashboard</i>Dashboard</a></li>
         <li><div class="divider"></div></li>
         <li><a class="subheader">Services</a></li>
-        <li><a href="{{ url_for('services.service', service='merge_images') }}"><i class="material-icons">burst_mode</i>Merge images</a></li>
+        <li><a href="{{ url_for('services.service', service='merge_images') }}"><i class="material-icons">burst_mode</i>Concat images</a></li>
         <li><a href="{{ url_for('services.service', service='nlp') }}"><i class="material-icons">format_textdirection_l_to_r</i>NLP</a></li>
         <li><a href="{{ url_for('services.service', service='ocr') }}"><i class="material-icons">find_in_page</i>OCR</a></li>
         {% if current_user.is_administrator() %}