From 403dc448febe39088220f0620773ea884d654410 Mon Sep 17 00:00:00 2001
From: Robert <robert@smalc.si>
Date: Fri, 19 Aug 2022 00:48:36 +0200
Subject: [PATCH 1/6] Drupal9: popravki pri prijavi in oblikovanje rezultatov

---
 frontend/api/class.ApiLogin.php               |   2 +-
 .../custom/prijava_1ka/prijava_1ka.module     |   2 +
 .../prijava-z-racuni-modal-block.html.twig    |   8 +-
 .../web/themes/custom/pro1ka/css/style.css    |  16 ++
 .../web/themes/custom/pro1ka/js/login.js      | 139 ++++++++++++++++++
 .../web/themes/custom/pro1ka/js/script.js     |  31 +---
 .../pro1ka/sass/components/_quicktabs.scss    |  19 +++
 .../pro1ka/templates/page--front.html.twig    |   4 +-
 8 files changed, 188 insertions(+), 33 deletions(-)

diff --git a/frontend/api/class.ApiLogin.php b/frontend/api/class.ApiLogin.php
index c9ff9b5fc..318419784 100644
--- a/frontend/api/class.ApiLogin.php
+++ b/frontend/api/class.ApiLogin.php
@@ -1187,7 +1187,7 @@ class ApiLogin
         // Preverimo ReCaptcha
         if (AppSettings::getInstance()->getSetting('google-secret_captcha') !== false) {
             $recaptchaResponse = $this->data['g-recaptcha-response'];
-            $requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . $secret_captcha . '&response=' . $recaptchaResponse);
+            $requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . AppSettings::getInstance()->getSetting('google-secret_captcha') . '&response=' . $recaptchaResponse);
 
             if (!strstr($requestReCaptcha, 'true')) {
                 $error['invalid_recaptcha'] = '1';
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
index d2c3cc9de..b751434cb 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -106,6 +106,8 @@ function prijava_1ka_theme()
       'prijava_z_racuni_modal_block' => [
         'variables' => [
           'lang' => $lang,
+          'rememberMe' => (empty($_COOKIE['remember-me']) ? true : false),
+          'url_google' => $url_google
         ]
       ]
     ];
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig
index 1f61d76c6..8914e5aea 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig
@@ -1,5 +1,5 @@
 {#{% if(prijavljen) %}#}
-  <div class="rexister-modal" id="modal-aai-obvestilo">
+s  <div class="rexister-modal" id="modal-other-login">
 
       <div class="modal-box"><img src="/tema1ka/img/ikone/zapri.svg" class="closemodal">
 
@@ -22,13 +22,13 @@
 
           <div class="w-clearfix">
             <div class="col _4-4-12-12">
-              <p>{{ lang['srv_gdpr_frontend_external_login'] }}</p>
+              <p>{{ lang['srv_gdpr_frontend_external_login'] | raw }}</p>
             </div>
           </div>
 
           <div class="w-clearfix">
             <div class="col _4-4-12-12">
-              <p>{{ lang['srv_gdrp_frontend_cookie'] }}</p>
+              <p>{{ lang['srv_gdrp_frontend_cookie'] | raw }}</p>
             </div>
           </div>
 
@@ -61,7 +61,7 @@
           <div>
             <div class="col w-clearfix">
               <button class="submit-btn w-button prijava-ostale-nazaj" style="float: left;">{{ lang['back'] }}</button>
-              <input type="submit" value="{{ lang['srv_custom_report_alert_yes'] }}" class="submit-btn w-button" id="submit-other-login">
+              <input type="submit" value="{{ lang['srv_custom_report_alert_yes'] }}" class="submit-btn w-button" id="submit-other-login" style="float:right;">
             </div>
           </div>
 
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
index 37014d3ce..cc2258171 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
+++ b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
@@ -1123,6 +1123,22 @@ body {
   font-weight: 400;
 }
 
+ul.seznam-tem {
+  ist-style: none;
+}
+ul.seznam-tem li.prirocnik {
+  padding: 13px 0px;
+  border-bottom: 1px solid #e5e5e5;
+}
+ul.seznam-tem li.prirocnik:first-child {
+  border-top: 1px solid #e5e5e5;
+}
+ul.seznam-tem li.prirocnik a {
+  color: #333333;
+  font-size: 18px;
+  font-weight: 400;
+}
+
 .modal, .rexister-modal {
   position: fixed;
   left: 0%;
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/login.js b/frontend/drupal9/web/themes/custom/pro1ka/js/login.js
index ec5f78743..5e57b28a5 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/js/login.js
+++ b/frontend/drupal9/web/themes/custom/pro1ka/js/login.js
@@ -491,3 +491,142 @@ function odpriAaiLoginObvestilo(){
     jQuery('#modal-open-login-obrazec').css('display', 'flex');
   }
 }
+
+function CookieAlert(link, jezik, url) {
+  var link = link || '/';
+  var jezik = jezik || 'sl';
+  var url = url || false;
+
+  if (link == 'fb') {
+    link = '/frontend/api/api.php?action=login_facebook';
+    // link = 'https://www.1ka.si/fb_login.php';
+  }
+
+  // if (link == 'google') {
+  //   link = '/frontend/api/api.php?action=login_google';
+  // }
+
+  if (link == 'aai') {
+    link = 'https://aai.1ka.si/Shibboleth.sso/Login';
+  }
+
+  var da = 'Nadaljuj';
+  var ne = 'Prekliči';
+  if (jezik == 'en') {
+    var da = 'Continue';
+    var ne = 'Cancel';
+  }
+
+  jQuery('#kuki').dialog({
+    height: "auto",
+    width: 520,
+    dialogClass: 'pojavno-okno-1ka',
+    modal: true,
+    buttons: [{
+      text: da,
+      class: "gumbi-pri-zunanji-prijavi",
+      click: function () {
+        jQuery(this).dialog("close");
+
+        document.location.href = link;
+      }
+    }, {
+      text: ne,
+      click: function () {
+        jQuery(this).dialog("close");
+        if (url) {
+          return false;
+        }
+        else {
+          document.location.href = '/';
+        }
+
+      }
+    }]
+  });
+
+  // Če strinjanje ne obstaja, prikažemo vse gumbe
+  if(jQuery('#pogoji-strinjanje').length == 0)
+    jQuery('.gumbi-pri-zunanji-prijavi').show();
+}
+
+// Za google prijavo moramo postati formo - kar sestavimo direktno url
+/*
+		<form id="googleLoginForm" action="https://accounts.google.com/o/oauth2/auth" method="get" style="display: none;">
+            <input type="hidden" name="response_type" value="code" />
+            <input type="hidden" name="client_id" value="<?=$google_login_client_id?>" />
+            <input type="hidden" name="redirect_uri" value="https://www.1ka.si/utils/google-oauth2.php" />
+            <input type="hidden" name="state" value="<?=(isset ($_GET['regFromEnglish']) && $_GET['regFromEnglish']=="1"?'regFromEnglish':'')?>" />
+            <input type="hidden" name="scope" value="email" />
+            <input type="hidden" name="access_type" value="online" />
+            <input type="hidden" name="prompt" value="consent" />
+            <input type="hidden" name="openid.realm" value="https://www.1ka.si" />
+        </form>
+*/
+function CookieAlertGoogle(jezik, url) {
+  //console.log('sa', link, jezik);
+
+  //var link = link || '/';
+  var jezik = jezik || 'sl';
+  var url = url || false;
+
+  // Sestavimo url
+  var url = 'https://accounts.google.com/o/oauth2/auth?';
+
+  url += 'response_type=code';
+  url += '&client_id=944153399779-m39ehn45vm6b64l0sac7hphtpm0esgqs.apps.googleusercontent.com';
+  url += '&redirect_uri=https://www.1ka.si/frontend/api/google-oauth2.php';
+
+  if(jezik == 'en')
+    url += '&state=regFromEnglish';
+  else
+    url += '&state=';
+
+  url += '&scope=email';
+  url += '&access_type=online';
+  url += '&prompt=consent';
+  url += '&openid.realm=https://www.1ka.si';
+
+
+  var da = 'Nadaljuj';
+  var ne = 'Prekliči';
+  if (jezik == 'en') {
+    var da = 'Continue';
+    var ne = 'Cancel';
+  }
+
+  jQuery('#kuki').dialog({
+    height: "auto",
+    width: 520,
+    dialogClass: 'pojavno-okno-1ka',
+    modal: true,
+    buttons: [{
+      text: da,
+      class: "gumbi-pri-zunanji-prijavi",
+      click: function () {
+        jQuery(this).dialog("close");
+
+        document.location.href = url;
+      }
+    }, {
+      text: ne,
+      click: function () {
+
+        jQuery('#pogoji-strinjanje').attr('checked', false);
+        jQuery(this).dialog("close");
+
+        if (url) {
+          return false;
+        }
+        else {
+          document.location.href = '/';
+        }
+
+      }
+    }]
+  });
+
+  // Če strinjanje ne obstaja, prikažemo vse gumbe
+  if(jQuery('#pogoji-strinjanje').length == 0)
+    jQuery('.gumbi-pri-zunanji-prijavi').show();
+}
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
index 0ac2f3081..163a95c21 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
+++ b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
@@ -331,7 +331,7 @@
 
           jQuery('#modal-other-login #login-' + atribut + '-title').show();
           jQuery('#submit-other-login').attr('data-redirect', 'url-' + atribut);
-          jQuery('#modal-other-login').show();
+          jQuery('#modal-other-login').css('display', 'flex');
         });
 
         jQuery('#modal-other-login #submit-other-login').on('click', function () {
@@ -349,38 +349,17 @@
         /**end prijava z ostalimi računi **/
 
         // Če uporabnik ni prijavljen potem moje ankete odprejo možnost za prijavo
-        if (jQuery('[href*="/admin/survey/index.php?lang="]').length > 0 || jQuery('[data-href*="/admin/survey/index.php?lang="]').length > 0) {
-
-          // preverimo če obstaja piškot, da je uporabnik prijavljen
+        // preverimo če obstaja piškot, da je uporabnik prijavljen
           if (document.cookie.indexOf('unam=') > 0) {
-            var dataHref = jQuery('[data-href*="/admin/survey/index.php?lang="]');
 
-            if (dataHref.length > 0) {
-              dataHref.attr('href', dataHref.attr('data-href'));
-
-              jQuery('#gumb-spletna-uporaba').attr('href', dataHref.attr('data-href')).attr('id', '');
-
-              dataHref.attr('data-href', '');
-            }
-
-            var href = jQuery('[href*="/admin/survey/index.php?lang="]');
-            if (href.length > 0 && dataHref.length < 1) {
-              jQuery('#gumb-spletna-uporaba').attr('href', href.attr('href')).attr('id', '');
-            }
-
-
-            jQuery('[href*="/admin/survey/index.php?lang="]').removeClass('gumb-spletna-uporaba');
+            jQuery('[href="/d/admin/survey"]').attr('href', '/admin/survey/index.php?lang='+lang()).removeClass('gumb-spletna-uporaba');
 
           } else {
-            var href = jQuery('[href*="/admin/survey/index.php?lang="]');
 
-            if (href.length > 0) {
-              href.attr('data-href', href.attr('href')).attr('href', '#');
-            }
+            jQuery('[href="/d/admin/survey"]').attr('href', '#').addClass('gumb-spletna-uporaba');
 
-            jQuery('[data-href*="/admin/survey/index.php?lang="]').addClass('gumb-spletna-uporaba');
           }
-        }
+
 
 
         // Meni za mobilnike
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss
index c01d0ad8f..0b9217e1e 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss
+++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss
@@ -56,3 +56,22 @@
   }
 
 }
+
+ul.seznam-tem{
+  ist-style: none;
+
+  li.prirocnik{
+    padding: 13px 0px;
+    border-bottom: 1px solid $siva-5;
+
+    &:first-child{
+      border-top: 1px solid $siva-5;
+    }
+
+    a{
+      color: #333333;
+      font-size: 18px;
+      font-weight: 400;
+    }
+  }
+}
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig
index 40840a8f2..f7db54e9f 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig
+++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig
@@ -294,7 +294,7 @@
     {# Gumb #}
     <div class="row flex-desna flex">
           <div class="gumb">
-              <a href="{% if uporabnik %}/admin/survey{% else %}#{%  endif %}" class="button shrink main-button w-inline-block" class="ustvari-anketo">
+              <a href="{% if uporabnik %}/admin/survey{% else %}#{%  endif %}" class="button shrink main-button w-inline-block {% if uporabnik is empty %}modal-goto-registration{% endif %}">
                 <div class="button-label">Ustvarite anketo</div>
                 <img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" class="button-right-arrow">
                 <div class="button-flyin"></div>
@@ -356,7 +356,7 @@
     <div class="row flex">
       <div class="col c-33 gumb">
           <div class="buttons-row buttons-center" style="width: 200px">
-            <a href="{% if uporabnik %}/admin/survey{% else %}#{%  endif %}" class="button main-button w-inline-block">
+            <a href="{% if uporabnik %}/admin/survey{% else %}#{%  endif %}" class="button main-button w-inline-block {% if uporabnik is empty %}modal-goto-registration{% endif %}">
               <div class="button-label">Ustvarite anketo</div><img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" alt="" class="button-right-arrow" style="transform: translate3d(0px, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d;">
               <div class="button-flyin" style="transform: translate3d(-100%, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d; display: block;"></div>
             </a>

From 223141c6d89b4d74428a101e159eb2225161c997 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 19 Aug 2022 03:20:25 +0200
Subject: [PATCH 2/6] [Redizajn 1KA v2] Testiranje --> Komentarji -  v delu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Na vprašanja
---
 admin/survey/SurveyAdminSettings.php          |  274 +-
 admin/survey/script/script.js                 |    4 +
 admin/survey/script/vprasanje.js              |    1 +
 lang/1.php                                    |    5 +-
 lang/2.php                                    |    7 +-
 public/css/admin_new.css                      | 3004 +++++++++--------
 .../pages/survey_testiranje/komentarji.scss   |  119 +-
 7 files changed, 1834 insertions(+), 1580 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 3a8e46320..23fd297a6 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -7160,7 +7160,6 @@ class SurveyAdminSettings {
 		// Dodajanje novega komentarja
 
 		echo '<div id="comment_toggle_0_4" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_4\')">';
-		echo '<span class="faicon link-right comments"></span>';
 		echo $lang['srv_add_comment_toggle'];
 		echo '</div>';
 
@@ -7258,7 +7257,6 @@ class SurveyAdminSettings {
 		}
 		// Dodajanje novega komentarja
 		echo '<div id="comment_toggle_0_5" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_5\')">';
-		echo '<span class="faicon link-right comments"></span>';
 		echo $lang['srv_add_comment_toggle'];
 		echo '</div>';
 
@@ -7769,7 +7767,6 @@ class SurveyAdminSettings {
 
 
 							echo '<div id="comment_toggle_'.$spr_id.'" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\''.$spr_id.'\')">';
-                            echo '<span class="faicon link-right comments"></span>';
                             echo $lang['srv_add_comment_toggle'];
                             echo '</div>';
 
@@ -7864,81 +7861,9 @@ class SurveyAdminSettings {
 						
 						echo '<div class="question_comment editor">';
 
-						// komentarji urednikov
-						if ($row1['thread'] > 0) {
-							
-							if (mysqli_num_rows($sqlt) > 0) {
-
-								echo '<div class="comment_type">';
-
-								echo $lang['srv_admin_comment'].':';
-								
-								echo '</div>';
-						
-								$i = 0;
-								while ($rowt = mysqli_fetch_array($sqlt)) {
-
-									echo '<div class="comment_box">';
-
-									echo '<div class="by">';
-									echo $lang['srv_comments_user'].'<span class="user">'.$f->user($rowt['uid']).'</span>'.$lang['srv_comments_user2'];
-									echo '</div>';
-
-									$datetime = strtotime($rowt['time']);
-									$datetime = date("d.m.Y G:i", $datetime);
-
-									echo '<div class="date">';
-									echo $datetime;
-									echo '</div>';
-
-									echo '<div class="content">';
-									echo $rowt['vsebina'];
-									echo '</div>';
-
-                                    if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
-                                        
-                                        echo '<div class="bottom_options">';
-                                        if ($commentmarks == 1) {
-                                            echo '	<select name="ocena" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});">
-                                                        <option value="0"'.($rowt['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
-                                                        <option value="1"'.($rowt['ocena']==1?' selected="selected"':'').'>'.$lang['srv_todo'].'</option>
-                                                        <option value="2"'.($rowt['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
-                                                        <option value="3"'.($rowt['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
-                                                    </select>';
-                                        } else {
-
-											if ($rowt['ocena']==0) {
-												echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
-												echo $lang['srv_comments_archive'].'</p>';
-
-												echo '<div class="reply_to">';
-												echo '<a href="javascript:comment_on_comment(\''.$rowt['id'].'\',\''.$f->user($rowt['uid']).'\',\''.$datetime.'\',\''.$spr_id.'\');"><span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment'].'</a>';
-												echo '</div>';
-											}
-											else {
-												echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
-												echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
-												echo $lang['srv_comments_unarchive'].'</p>';
-											}
-                                        }
-                                        
-                                        echo '</div>';
-                                    }
-
-									echo '</div>';
-
-									echo '<div class="reply_to_text" id="comment_on_comment_'.$rowt['id'].'">';
-									echo '</div>';
-								}
-
-							}
-
-						}
-
 						if ($addfieldposition == '' || $addfieldposition == 0) {
 
-							echo '<div id="comment_toggle_'.$spr_id.'_'.'4'.'" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\''.$spr_id.'_'.'4'.'\')">';
-							echo '<span class="faicon link-right comments"></span>';
+							echo '<div id="comment_toggle_'.$spr_id.'_'.'4'.'" class="add_comment_toggle" onClick="toggleAddComment(\''.$spr_id.'_'.'4'.'\')">';
 							echo $lang['srv_add_comment_toggle'];
 							echo '</div>';
 
@@ -7951,6 +7876,98 @@ class SurveyAdminSettings {
 							echo '</div>';
 						}
 
+						// komentarji urednikov
+						if ($row1['thread'] > 0) {
+							
+							if (mysqli_num_rows($sqlt) > 0) {
+
+								echo '<div class="comment_type">';
+
+								echo $lang['srv_admin_comment'].':';
+
+								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
+								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+								
+								echo '</div>';
+						
+								$i = 0;
+								while ($rowt = mysqli_fetch_array($sqlt)) {
+
+
+									echo '<div class="comment_box '.($rowt['ocena']==0 ? '' : 'archived').'">';
+
+									echo '<div class="by">';
+
+									$datetime = strtotime($rowt['time']);
+									$datetime = date("d.m.Y G:i", $datetime);
+
+									echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$f->user($rowt['uid']).'</span> ('.$datetime.')</p>';
+
+									
+									if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
+									
+										echo '<div class="options">';
+                                        
+										echo '<div class="solve">';
+										if ($rowt['ocena']==0) {
+											echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-check link-right"></span>';
+											echo $lang['srv_comments_archive'].'</p>';
+										}
+										else {
+											echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-undo link-right"></span>';
+											echo $lang['srv_comments_unarchive'].'</p>';
+										}
+										echo '</div>';
+
+										echo '<span class="faicon pointer fa-ellipsis-h" id="dots_'.$rowt['id'].'" onClick="toggleCommentOptions(\''.$rowt['id'].'\');"></span>';
+
+											echo '<div class="options_dropdown displayNone" id="options_'.$rowt['id'].'">';
+											
+											echo '<div class="line">';
+											echo '<a href="javascript:comment_on_comment(\''.$rowt['id'].'\',\''.$f->user($rowt['uid']).'\',\''.$datetime.'\',\''.$spr_id.'\');"><span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment'].'</a>';
+											echo '</div>';
+											
+											echo '<div class="line">';
+											echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+											echo $lang['srv_comment_delete'];
+											echo '</div>';
+											
+											echo '</div>';
+
+											//Klik izven razprith nastavitev - zapremo okno
+											echo '<script>
+											$(document).mouseup(function(e){
+												var container = $(".options_dropdown");
+											
+												if (!container.is(e.target) && container.has(e.target).length === 0){
+													$(".options_dropdown").addClass("displayNone");
+												}
+											});
+										</script>';
+
+
+										
+										echo '</div>'; //options
+                                        
+                                    }
+
+									echo '</div>'; //by
+
+									echo '<div class="content">';
+									echo $rowt['vsebina'];
+									echo '</div>';
+
+
+									echo '</div>'; //comment_box
+
+									echo '<div class="reply_to_text" id="comment_on_comment_'.$rowt['id'].'">';
+									echo '</div>';
+								}
+
+							}
+
+						}
+
 						echo '</div>';
 						
 						
@@ -7971,7 +7988,7 @@ class SurveyAdminSettings {
 								if (!$sqlt) echo mysqli_error($GLOBALS['connect_db']);
 								while ($rowt = mysqli_fetch_array($sqlt)) {
 
-									echo '<div class="comment_box">';
+									echo '<div class="comment_box  '.($rowt['text2']==0 ? '' : 'archived').'">';
 
 									// Ce smo slucajno pobrisali testne vnose, nimamo casa vnosa komentarja
 									$sqlTime = sisplet_query("SELECT time_edit FROM srv_user WHERE id='".$rowt['usr_id']."'");
@@ -7979,69 +7996,78 @@ class SurveyAdminSettings {
 										
 										$rowTime = mysqli_fetch_array($sqlTime);
 
+
 										echo '<div class="by">';
-										echo 'Respondent '.$lang['srv_comments_user2'];
-										echo '</div>';
-									
+
 										if ( strpos($rowt['text'], '__DATE__') !== false ) {
 											$rowt['text'] = str_replace('__DATE__', $f->datetime1($rowTime['time_edit']), $rowt['text']);
-											echo '<div class="content">';
-											echo nl2br($rowt['text']);
-											echo '</div>';
+											$datetime = '-';
+											
 										} 
 										else {
 
 											$datetime = strtotime($rowTime['time_edit']);
 											$datetime = date("d.m.Y G:i", $datetime);
-
-											echo '<div class="date">';
-											echo $datetime;
-											echo '</div>';
-											
-											echo '<div class="content">';
-											echo nl2br($rowt['text']);
-											echo '</div>';
 										}
+
+										echo '<p>Respondent ('.$datetime.')</p>';
+
+
+										if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
+										
+											echo '<div class="options">';
+
+											echo '<div class="solve">';
+											if ($rowt['text2']==0) {
+												echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-check link-right"></span>';
+												echo $lang['srv_comments_archive'].'</p>';
+											}
+											else {
+												echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: (\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-undo link-right"></span>';
+												echo $lang['srv_comments_unarchive'].'</p>';
+											}
+											echo '</div>';
+
+											echo '<span class="faicon pointer fa-ellipsis-h" id="dots_'.$rowt['id'].'" onClick="toggleCommentOptions(\''.$rowt['id'].'\');"></span>';
+
+												echo '<div class="options_dropdown displayNone" id="options_'.$rowt['id'].'">';
+												
+												echo '<div class="line">';
+												echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+												echo $lang['srv_comment_delete'];
+												echo '</div>';
+												
+												echo '</div>';
+
+												//Klik izven razprith nastavitev - zapremo okno
+												echo '<script>
+												$(document).mouseup(function(e){
+													var container = $(".options_dropdown");
+												
+													if (!container.is(e.target) && container.has(e.target).length === 0){
+														$(".options_dropdown").addClass("displayNone");
+													}
+												});
+											</script>';
+
+
+											
+											echo '</div>'; //options
+											
+										}
+
+										echo '</div>'; //by
+
 									}
 									else{
 										if ( strpos($rowt['text'], '__DATE__') !== false ) {
 											$rowt['text'] = str_replace('__DATE__', '', $rowt['text']);
-											echo '<div class="content">';
-											echo nl2br($rowt['text']);
-											echo '</div>';
 										} 
-										else {
-											echo '<div class="content">';
-											echo nl2br($rowt['text']);
-											echo '</div>';
-										}
 									}
 
-									if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
-
-										echo '<div class="bottom_options">';
-
-										if ($commentmarks == 1) {
-											echo '	<select name="ocena'.$rowt['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});">
-														<option value="0"'.($rowt['text2']==0?' selected':'').'>'.$lang['srv_undecided'].'</option>
-														<option value="1"'.($rowt['text2']==1?' selected':'').'>'.$lang['srv_todo'].'</option>
-														<option value="2"'.($rowt['text2']==2?' selected':'').'>'.$lang['srv_done'].'</option>
-														<option value="3"'.($rowt['text2']==3?' selected':'').'>'.$lang['srv_not_relevant'].'</option>
-													</select>';
-										} else {
-
-											if ($rowt['text2']==0) {
-												echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
-												echo $lang['srv_comments_archive'].'</p>';
-											}
-											else {
-												echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
-												echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: (\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
-												echo $lang['srv_comments_unarchive'].'</p>';
-											}
-										}
-										echo '</div>';
-									}
+									echo '<div class="content">';
+									echo nl2br($rowt['text']);
+									echo '</div>';
 
 									echo '</div>';
 								}
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 6ccbac630..bf5f99a2e 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5656,4 +5656,8 @@ function show_gdpr_messeage(id_sporocila){
 	$("#general_popup").load('ajax.php?a=show_gdpr_messeage', {id_sporocila: id_sporocila, anketa: srv_meta_anketa_id});
 
 	console.log(id_sporocila);
+}
+
+function toggleCommentOptions(id) {
+	$("#options_"+id).toggleClass("displayNone");
 }
\ No newline at end of file
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index 0f9c89c5c..957172bad 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -759,6 +759,7 @@ function comment_on_comment (id, user, date, spr_id) {
 		'<button class="medium blue" onclick="$.post(\'ajax.php?a=comment_on_comment\', {id: \''+id+'\', vsebina: $(\'#vsebina_comment_on_comment_'+id+'\').val(), anketa: srv_meta_anketa_id}, function() {window.location.reload();}); return false;">'+lang['srv_comment_comment']+'</button>'+
 		'</div>'
 	);
+	$(".options_dropdown").addClass("displayNone");
 }
 
 
diff --git a/lang/1.php b/lang/1.php
index 4255c830f..68be1d71d 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4580,9 +4580,9 @@ $lang = array (
 	"srv_comments_link"							=>	"Pregled komentarjev",
 	"srv_comments_user"							=>	"Uporabnik ",
 	"srv_comments_user2"						=>	" je komentiral:",
-	"srv_comments_archive"						=>	"Arhiviraj komentar",
+	"srv_comments_archive"						=>	"Razreši",
 	"srv_comments_unarchive"						=>	"Označi kot nerešeno",
-	"srv_comments_archived"						=>	"Komentar je arhiviran",
+	"srv_comments_archived"						=>	"Komentar je razrešen",
 	"srv_comments_new"							=>	"Komentiraj",
 	"srv_zanka_profile_all"						=>	"Brez",
 	"srv_zanka_profile_session"						=>	"Za&#269;asno",
@@ -4654,6 +4654,7 @@ $lang = array (
 	"srv_done"									=>	"Končano",
 	"srv_not_relevant"							=>	"Nerelevantno",
 	"srv_comment_comment"						=>	"Odgovori",
+	"srv_comment_delete"						=>	"Izbriši",
 	"srv_edit_data_title"						=>	"Uredi podatke vprašanja",
 	"srv_edit_data_row"							=>	"Uredi celotno anketo respondenta",
 	"srv_edit_data_row_quick"					=>	"Hitro urejanje celotne ankete respondenta",
diff --git a/lang/2.php b/lang/2.php
index da68a8ca9..3bdf4525d 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4556,9 +4556,9 @@ $lang = array (
 	"srv_comments_anketa_resp"					=>	"Respondent comments to the survey",
 	"srv_comments_user"							=>	"User ",
 	"srv_comments_user2"						=>	" commented:",
-	"srv_comments_archive"						=>	"Archive comment",
-	"srv_comments_unarchive"						=>	"Unarchive",
-	"srv_comments_archived"						=>	"Comment has already been archived",
+	"srv_comments_archive"						=>	"Resolve",
+	"srv_comments_unarchive"						=>	"Mark as unresolved",
+	"srv_comments_archived"						=>	"Comment has been resolved",
 	"srv_comments_new"							=>	"Comment",
 	"srv_zanka_profile_all"						=>	"Without",
 	"srv_zanka_profile_session"					=>	"Temporary",
@@ -4629,6 +4629,7 @@ $lang = array (
 	"srv_done"									=>	"Done",
 	"srv_not_relevant"							=>	"Not relevant",
 	"srv_comment_comment"						=>	"Reply",
+	"srv_comment_delete"						=>	"Delete",
 	"srv_edit_data_title"						=>	"Edit question data",
 	"srv_edit_data_row"							=>	"Edit respondents survey",
 	"srv_edit_data_row_quick"					=>	"Quick edit respondents survey",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 2e3ae805c..37f91c6a1 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -214,4767 +214,4767 @@
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
 readers do not read off random characters that represent icons */
 .fa-500px:before {
-  content: "";
+  content: "\f26e";
 }
 
 .fa-accessible-icon:before {
-  content: "";
+  content: "\f368";
 }
 
 .fa-accusoft:before {
-  content: "";
+  content: "\f369";
 }
 
 .fa-ad:before {
-  content: "";
+  content: "\f641";
 }
 
 .fa-address-book:before {
-  content: "";
+  content: "\f2b9";
 }
 
 .fa-address-card:before {
-  content: "";
+  content: "\f2bb";
 }
 
 .fa-adjust:before {
-  content: "";
+  content: "\f042";
 }
 
 .fa-adn:before {
-  content: "";
+  content: "\f170";
 }
 
 .fa-adversal:before {
-  content: "";
+  content: "\f36a";
 }
 
 .fa-affiliatetheme:before {
-  content: "";
+  content: "\f36b";
 }
 
 .fa-air-freshener:before {
-  content: "";
+  content: "\f5d0";
 }
 
 .fa-algolia:before {
-  content: "";
+  content: "\f36c";
 }
 
 .fa-align-center:before {
-  content: "";
+  content: "\f037";
 }
 
 .fa-align-justify:before {
-  content: "";
+  content: "\f039";
 }
 
 .fa-align-left:before {
-  content: "";
+  content: "\f036";
 }
 
 .fa-align-right:before {
-  content: "";
+  content: "\f038";
 }
 
 .fa-alipay:before {
-  content: "";
+  content: "\f642";
 }
 
 .fa-allergies:before {
-  content: "";
+  content: "\f461";
 }
 
 .fa-amazon:before {
-  content: "";
+  content: "\f270";
 }
 
 .fa-amazon-pay:before {
-  content: "";
+  content: "\f42c";
 }
 
 .fa-ambulance:before {
-  content: "";
+  content: "\f0f9";
 }
 
 .fa-american-sign-language-interpreting:before {
-  content: "";
+  content: "\f2a3";
 }
 
 .fa-amilia:before {
-  content: "";
+  content: "\f36d";
 }
 
 .fa-anchor:before {
-  content: "";
+  content: "\f13d";
 }
 
 .fa-android:before {
-  content: "";
+  content: "\f17b";
 }
 
 .fa-angellist:before {
-  content: "";
+  content: "\f209";
 }
 
 .fa-angle-double-down:before {
-  content: "";
+  content: "\f103";
 }
 
 .fa-angle-double-left:before {
-  content: "";
+  content: "\f100";
 }
 
 .fa-angle-double-right:before {
-  content: "";
+  content: "\f101";
 }
 
 .fa-angle-double-up:before {
-  content: "";
+  content: "\f102";
 }
 
 .fa-angle-down:before {
-  content: "";
+  content: "\f107";
 }
 
 .fa-angle-left:before {
-  content: "";
+  content: "\f104";
 }
 
 .fa-angle-right:before {
-  content: "";
+  content: "\f105";
 }
 
 .fa-angle-up:before {
-  content: "";
+  content: "\f106";
 }
 
 .fa-angry:before {
-  content: "";
+  content: "\f556";
 }
 
 .fa-angrycreative:before {
-  content: "";
+  content: "\f36e";
 }
 
 .fa-angular:before {
-  content: "";
+  content: "\f420";
 }
 
 .fa-ankh:before {
-  content: "";
+  content: "\f644";
 }
 
 .fa-app-store:before {
-  content: "";
+  content: "\f36f";
 }
 
 .fa-app-store-ios:before {
-  content: "";
+  content: "\f370";
 }
 
 .fa-apper:before {
-  content: "";
+  content: "\f371";
 }
 
 .fa-apple:before {
-  content: "";
+  content: "\f179";
 }
 
 .fa-apple-alt:before {
-  content: "";
+  content: "\f5d1";
 }
 
 .fa-apple-pay:before {
-  content: "";
+  content: "\f415";
 }
 
 .fa-archive:before {
-  content: "";
+  content: "\f187";
 }
 
 .fa-archway:before {
-  content: "";
+  content: "\f557";
 }
 
 .fa-arrow-alt-circle-down:before {
-  content: "";
+  content: "\f358";
 }
 
 .fa-arrow-alt-circle-left:before {
-  content: "";
+  content: "\f359";
 }
 
 .fa-arrow-alt-circle-right:before {
-  content: "";
+  content: "\f35a";
 }
 
 .fa-arrow-alt-circle-up:before {
-  content: "";
+  content: "\f35b";
 }
 
 .fa-arrow-circle-down:before {
-  content: "";
+  content: "\f0ab";
 }
 
 .fa-arrow-circle-left:before {
-  content: "";
+  content: "\f0a8";
 }
 
 .fa-arrow-circle-right:before {
-  content: "";
+  content: "\f0a9";
 }
 
 .fa-arrow-circle-up:before {
-  content: "";
+  content: "\f0aa";
 }
 
 .fa-arrow-down:before {
-  content: "";
+  content: "\f063";
 }
 
 .fa-arrow-left:before {
-  content: "";
+  content: "\f060";
 }
 
 .fa-arrow-right:before {
-  content: "";
+  content: "\f061";
 }
 
 .fa-arrow-up:before {
-  content: "";
+  content: "\f062";
 }
 
 .fa-arrows-alt:before {
-  content: "";
+  content: "\f0b2";
 }
 
 .fa-arrows-alt-h:before {
-  content: "";
+  content: "\f337";
 }
 
 .fa-arrows-alt-v:before {
-  content: "";
+  content: "\f338";
 }
 
 .fa-assistive-listening-systems:before {
-  content: "";
+  content: "\f2a2";
 }
 
 .fa-asterisk:before {
-  content: "";
+  content: "\f069";
 }
 
 .fa-asymmetrik:before {
-  content: "";
+  content: "\f372";
 }
 
 .fa-at:before {
-  content: "";
+  content: "\f1fa";
 }
 
 .fa-atlas:before {
-  content: "";
+  content: "\f558";
 }
 
 .fa-atom:before {
-  content: "";
+  content: "\f5d2";
 }
 
 .fa-audible:before {
-  content: "";
+  content: "\f373";
 }
 
 .fa-audio-description:before {
-  content: "";
+  content: "\f29e";
 }
 
 .fa-autoprefixer:before {
-  content: "";
+  content: "\f41c";
 }
 
 .fa-avianex:before {
-  content: "";
+  content: "\f374";
 }
 
 .fa-aviato:before {
-  content: "";
+  content: "\f421";
 }
 
 .fa-award:before {
-  content: "";
+  content: "\f559";
 }
 
 .fa-aws:before {
-  content: "";
+  content: "\f375";
 }
 
 .fa-backspace:before {
-  content: "";
+  content: "\f55a";
 }
 
 .fa-backward:before {
-  content: "";
+  content: "\f04a";
 }
 
 .fa-balance-scale:before {
-  content: "";
+  content: "\f24e";
 }
 
 .fa-ban:before {
-  content: "";
+  content: "\f05e";
 }
 
 .fa-band-aid:before {
-  content: "";
+  content: "\f462";
 }
 
 .fa-bandcamp:before {
-  content: "";
+  content: "\f2d5";
 }
 
 .fa-barcode:before {
-  content: "";
+  content: "\f02a";
 }
 
 .fa-bars:before {
-  content: "";
+  content: "\f0c9";
 }
 
 .fa-baseball-ball:before {
-  content: "";
+  content: "\f433";
 }
 
 .fa-basketball-ball:before {
-  content: "";
+  content: "\f434";
 }
 
 .fa-bath:before {
-  content: "";
+  content: "\f2cd";
 }
 
 .fa-battery-empty:before {
-  content: "";
+  content: "\f244";
 }
 
 .fa-battery-full:before {
-  content: "";
+  content: "\f240";
 }
 
 .fa-battery-half:before {
-  content: "";
+  content: "\f242";
 }
 
 .fa-battery-quarter:before {
-  content: "";
+  content: "\f243";
 }
 
 .fa-battery-three-quarters:before {
-  content: "";
+  content: "\f241";
 }
 
 .fa-bed:before {
-  content: "";
+  content: "\f236";
 }
 
 .fa-beer:before {
-  content: "";
+  content: "\f0fc";
 }
 
 .fa-behance:before {
-  content: "";
+  content: "\f1b4";
 }
 
 .fa-behance-square:before {
-  content: "";
+  content: "\f1b5";
 }
 
 .fa-bell:before {
-  content: "";
+  content: "\f0f3";
 }
 
 .fa-bell-slash:before {
-  content: "";
+  content: "\f1f6";
 }
 
 .fa-bezier-curve:before {
-  content: "";
+  content: "\f55b";
 }
 
 .fa-bible:before {
-  content: "";
+  content: "\f647";
 }
 
 .fa-bicycle:before {
-  content: "";
+  content: "\f206";
 }
 
 .fa-bimobject:before {
-  content: "";
+  content: "\f378";
 }
 
 .fa-binoculars:before {
-  content: "";
+  content: "\f1e5";
 }
 
 .fa-birthday-cake:before {
-  content: "";
+  content: "\f1fd";
 }
 
 .fa-bitbucket:before {
-  content: "";
+  content: "\f171";
 }
 
 .fa-bitcoin:before {
-  content: "";
+  content: "\f379";
 }
 
 .fa-bity:before {
-  content: "";
+  content: "\f37a";
 }
 
 .fa-black-tie:before {
-  content: "";
+  content: "\f27e";
 }
 
 .fa-blackberry:before {
-  content: "";
+  content: "\f37b";
 }
 
 .fa-blender:before {
-  content: "";
+  content: "\f517";
 }
 
 .fa-blind:before {
-  content: "";
+  content: "\f29d";
 }
 
 .fa-blogger:before {
-  content: "";
+  content: "\f37c";
 }
 
 .fa-blogger-b:before {
-  content: "";
+  content: "\f37d";
 }
 
 .fa-bluetooth:before {
-  content: "";
+  content: "\f293";
 }
 
 .fa-bluetooth-b:before {
-  content: "";
+  content: "\f294";
 }
 
 .fa-bold:before {
-  content: "";
+  content: "\f032";
 }
 
 .fa-bolt:before {
-  content: "";
+  content: "\f0e7";
 }
 
 .fa-bomb:before {
-  content: "";
+  content: "\f1e2";
 }
 
 .fa-bone:before {
-  content: "";
+  content: "\f5d7";
 }
 
 .fa-bong:before {
-  content: "";
+  content: "\f55c";
 }
 
 .fa-book:before {
-  content: "";
+  content: "\f02d";
 }
 
 .fa-book-open:before {
-  content: "";
+  content: "\f518";
 }
 
 .fa-book-reader:before {
-  content: "";
+  content: "\f5da";
 }
 
 .fa-bookmark:before {
-  content: "";
+  content: "\f02e";
 }
 
 .fa-bowling-ball:before {
-  content: "";
+  content: "\f436";
 }
 
 .fa-box:before {
-  content: "";
+  content: "\f466";
 }
 
 .fa-box-open:before {
-  content: "";
+  content: "\f49e";
 }
 
 .fa-boxes:before {
-  content: "";
+  content: "\f468";
 }
 
 .fa-braille:before {
-  content: "";
+  content: "\f2a1";
 }
 
 .fa-brain:before {
-  content: "";
+  content: "\f5dc";
 }
 
 .fa-briefcase:before {
-  content: "";
+  content: "\f0b1";
 }
 
 .fa-briefcase-medical:before {
-  content: "";
+  content: "\f469";
 }
 
 .fa-broadcast-tower:before {
-  content: "";
+  content: "\f519";
 }
 
 .fa-broom:before {
-  content: "";
+  content: "\f51a";
 }
 
 .fa-brush:before {
-  content: "";
+  content: "\f55d";
 }
 
 .fa-btc:before {
-  content: "";
+  content: "\f15a";
 }
 
 .fa-bug:before {
-  content: "";
+  content: "\f188";
 }
 
 .fa-building:before {
-  content: "";
+  content: "\f1ad";
 }
 
 .fa-bullhorn:before {
-  content: "";
+  content: "\f0a1";
 }
 
 .fa-bullseye:before {
-  content: "";
+  content: "\f140";
 }
 
 .fa-burn:before {
-  content: "";
+  content: "\f46a";
 }
 
 .fa-buromobelexperte:before {
-  content: "";
+  content: "\f37f";
 }
 
 .fa-bus:before {
-  content: "";
+  content: "\f207";
 }
 
 .fa-bus-alt:before {
-  content: "";
+  content: "\f55e";
 }
 
 .fa-business-time:before {
-  content: "";
+  content: "\f64a";
 }
 
 .fa-buysellads:before {
-  content: "";
+  content: "\f20d";
 }
 
 .fa-calculator:before {
-  content: "";
+  content: "\f1ec";
 }
 
 .fa-calendar:before {
-  content: "";
+  content: "\f133";
 }
 
 .fa-calendar-alt:before {
-  content: "";
+  content: "\f073";
 }
 
 .fa-calendar-check:before {
-  content: "";
+  content: "\f274";
 }
 
 .fa-calendar-minus:before {
-  content: "";
+  content: "\f272";
 }
 
 .fa-calendar-plus:before {
-  content: "";
+  content: "\f271";
 }
 
 .fa-calendar-times:before {
-  content: "";
+  content: "\f273";
 }
 
 .fa-camera:before {
-  content: "";
+  content: "\f030";
 }
 
 .fa-camera-retro:before {
-  content: "";
+  content: "\f083";
 }
 
 .fa-cannabis:before {
-  content: "";
+  content: "\f55f";
 }
 
 .fa-capsules:before {
-  content: "";
+  content: "\f46b";
 }
 
 .fa-car:before {
-  content: "";
+  content: "\f1b9";
 }
 
 .fa-car-alt:before {
-  content: "";
+  content: "\f5de";
 }
 
 .fa-car-battery:before {
-  content: "";
+  content: "\f5df";
 }
 
 .fa-car-crash:before {
-  content: "";
+  content: "\f5e1";
 }
 
 .fa-car-side:before {
-  content: "";
+  content: "\f5e4";
 }
 
 .fa-caret-down:before {
-  content: "";
+  content: "\f0d7";
 }
 
 .fa-caret-left:before {
-  content: "";
+  content: "\f0d9";
 }
 
 .fa-caret-right:before {
-  content: "";
+  content: "\f0da";
 }
 
 .fa-caret-square-down:before {
-  content: "";
+  content: "\f150";
 }
 
 .fa-caret-square-left:before {
-  content: "";
+  content: "\f191";
 }
 
 .fa-caret-square-right:before {
-  content: "";
+  content: "\f152";
 }
 
 .fa-caret-square-up:before {
-  content: "";
+  content: "\f151";
 }
 
 .fa-caret-up:before {
-  content: "";
+  content: "\f0d8";
 }
 
 .fa-cart-arrow-down:before {
-  content: "";
+  content: "\f218";
 }
 
 .fa-cart-plus:before {
-  content: "";
+  content: "\f217";
 }
 
 .fa-cc-amazon-pay:before {
-  content: "";
+  content: "\f42d";
 }
 
 .fa-cc-amex:before {
-  content: "";
+  content: "\f1f3";
 }
 
 .fa-cc-apple-pay:before {
-  content: "";
+  content: "\f416";
 }
 
 .fa-cc-diners-club:before {
-  content: "";
+  content: "\f24c";
 }
 
 .fa-cc-discover:before {
-  content: "";
+  content: "\f1f2";
 }
 
 .fa-cc-jcb:before {
-  content: "";
+  content: "\f24b";
 }
 
 .fa-cc-mastercard:before {
-  content: "";
+  content: "\f1f1";
 }
 
 .fa-cc-paypal:before {
-  content: "";
+  content: "\f1f4";
 }
 
 .fa-cc-stripe:before {
-  content: "";
+  content: "\f1f5";
 }
 
 .fa-cc-visa:before {
-  content: "";
+  content: "\f1f0";
 }
 
 .fa-centercode:before {
-  content: "";
+  content: "\f380";
 }
 
 .fa-certificate:before {
-  content: "";
+  content: "\f0a3";
 }
 
 .fa-chalkboard:before {
-  content: "";
+  content: "\f51b";
 }
 
 .fa-chalkboard-teacher:before {
-  content: "";
+  content: "\f51c";
 }
 
 .fa-charging-station:before {
-  content: "";
+  content: "\f5e7";
 }
 
 .fa-chart-area:before {
-  content: "";
+  content: "\f1fe";
 }
 
 .fa-chart-bar:before {
-  content: "";
+  content: "\f080";
 }
 
 .fa-chart-line:before {
-  content: "";
+  content: "\f201";
 }
 
 .fa-chart-pie:before {
-  content: "";
+  content: "\f200";
 }
 
 .fa-check:before {
-  content: "";
+  content: "\f00c";
 }
 
 .fa-check-circle:before {
-  content: "";
+  content: "\f058";
 }
 
 .fa-check-double:before {
-  content: "";
+  content: "\f560";
 }
 
 .fa-check-square:before {
-  content: "";
+  content: "\f14a";
 }
 
 .fa-chess:before {
-  content: "";
+  content: "\f439";
 }
 
 .fa-chess-bishop:before {
-  content: "";
+  content: "\f43a";
 }
 
 .fa-chess-board:before {
-  content: "";
+  content: "\f43c";
 }
 
 .fa-chess-king:before {
-  content: "";
+  content: "\f43f";
 }
 
 .fa-chess-knight:before {
-  content: "";
+  content: "\f441";
 }
 
 .fa-chess-pawn:before {
-  content: "";
+  content: "\f443";
 }
 
 .fa-chess-queen:before {
-  content: "";
+  content: "\f445";
 }
 
 .fa-chess-rook:before {
-  content: "";
+  content: "\f447";
 }
 
 .fa-chevron-circle-down:before {
-  content: "";
+  content: "\f13a";
 }
 
 .fa-chevron-circle-left:before {
-  content: "";
+  content: "\f137";
 }
 
 .fa-chevron-circle-right:before {
-  content: "";
+  content: "\f138";
 }
 
 .fa-chevron-circle-up:before {
-  content: "";
+  content: "\f139";
 }
 
 .fa-chevron-down:before {
-  content: "";
+  content: "\f078";
 }
 
 .fa-chevron-left:before {
-  content: "";
+  content: "\f053";
 }
 
 .fa-chevron-right:before {
-  content: "";
+  content: "\f054";
 }
 
 .fa-chevron-up:before {
-  content: "";
+  content: "\f077";
 }
 
 .fa-child:before {
-  content: "";
+  content: "\f1ae";
 }
 
 .fa-chrome:before {
-  content: "";
+  content: "\f268";
 }
 
 .fa-church:before {
-  content: "";
+  content: "\f51d";
 }
 
 .fa-circle:before {
-  content: "";
+  content: "\f111";
 }
 
 .fa-circle-notch:before {
-  content: "";
+  content: "\f1ce";
 }
 
 .fa-city:before {
-  content: "";
+  content: "\f64f";
 }
 
 .fa-clipboard:before {
-  content: "";
+  content: "\f328";
 }
 
 .fa-clipboard-check:before {
-  content: "";
+  content: "\f46c";
 }
 
 .fa-clipboard-list:before {
-  content: "";
+  content: "\f46d";
 }
 
 .fa-clock:before {
-  content: "";
+  content: "\f017";
 }
 
 .fa-clone:before {
-  content: "";
+  content: "\f24d";
 }
 
 .fa-closed-captioning:before {
-  content: "";
+  content: "\f20a";
 }
 
 .fa-cloud:before {
-  content: "";
+  content: "\f0c2";
 }
 
 .fa-cloud-download-alt:before {
-  content: "";
+  content: "\f381";
 }
 
 .fa-cloud-upload-alt:before {
-  content: "";
+  content: "\f382";
 }
 
 .fa-cloudscale:before {
-  content: "";
+  content: "\f383";
 }
 
 .fa-cloudsmith:before {
-  content: "";
+  content: "\f384";
 }
 
 .fa-cloudversify:before {
-  content: "";
+  content: "\f385";
 }
 
 .fa-cocktail:before {
-  content: "";
+  content: "\f561";
 }
 
 .fa-code:before {
-  content: "";
+  content: "\f121";
 }
 
 .fa-code-branch:before {
-  content: "";
+  content: "\f126";
 }
 
 .fa-codepen:before {
-  content: "";
+  content: "\f1cb";
 }
 
 .fa-codiepie:before {
-  content: "";
+  content: "\f284";
 }
 
 .fa-coffee:before {
-  content: "";
+  content: "\f0f4";
 }
 
 .fa-cog:before {
-  content: "";
+  content: "\f013";
 }
 
 .fa-cogs:before {
-  content: "";
+  content: "\f085";
 }
 
 .fa-coins:before {
-  content: "";
+  content: "\f51e";
 }
 
 .fa-columns:before {
-  content: "";
+  content: "\f0db";
 }
 
 .fa-comment:before {
-  content: "";
+  content: "\f075";
 }
 
 .fa-comment-alt:before {
-  content: "";
+  content: "\f27a";
 }
 
 .fa-comment-dollar:before {
-  content: "";
+  content: "\f651";
 }
 
 .fa-comment-dots:before {
-  content: "";
+  content: "\f4ad";
 }
 
 .fa-comment-slash:before {
-  content: "";
+  content: "\f4b3";
 }
 
 .fa-comments:before {
-  content: "";
+  content: "\f086";
 }
 
 .fa-comments-dollar:before {
-  content: "";
+  content: "\f653";
 }
 
 .fa-compact-disc:before {
-  content: "";
+  content: "\f51f";
 }
 
 .fa-compass:before {
-  content: "";
+  content: "\f14e";
 }
 
 .fa-compress:before {
-  content: "";
+  content: "\f066";
 }
 
 .fa-concierge-bell:before {
-  content: "";
+  content: "\f562";
 }
 
 .fa-connectdevelop:before {
-  content: "";
+  content: "\f20e";
 }
 
 .fa-contao:before {
-  content: "";
+  content: "\f26d";
 }
 
 .fa-cookie:before {
-  content: "";
+  content: "\f563";
 }
 
 .fa-cookie-bite:before {
-  content: "";
+  content: "\f564";
 }
 
 .fa-copy:before {
-  content: "";
+  content: "\f0c5";
 }
 
 .fa-copyright:before {
-  content: "";
+  content: "\f1f9";
 }
 
 .fa-couch:before {
-  content: "";
+  content: "\f4b8";
 }
 
 .fa-cpanel:before {
-  content: "";
+  content: "\f388";
 }
 
 .fa-creative-commons:before {
-  content: "";
+  content: "\f25e";
 }
 
 .fa-creative-commons-by:before {
-  content: "";
+  content: "\f4e7";
 }
 
 .fa-creative-commons-nc:before {
-  content: "";
+  content: "\f4e8";
 }
 
 .fa-creative-commons-nc-eu:before {
-  content: "";
+  content: "\f4e9";
 }
 
 .fa-creative-commons-nc-jp:before {
-  content: "";
+  content: "\f4ea";
 }
 
 .fa-creative-commons-nd:before {
-  content: "";
+  content: "\f4eb";
 }
 
 .fa-creative-commons-pd:before {
-  content: "";
+  content: "\f4ec";
 }
 
 .fa-creative-commons-pd-alt:before {
-  content: "";
+  content: "\f4ed";
 }
 
 .fa-creative-commons-remix:before {
-  content: "";
+  content: "\f4ee";
 }
 
 .fa-creative-commons-sa:before {
-  content: "";
+  content: "\f4ef";
 }
 
 .fa-creative-commons-sampling:before {
-  content: "";
+  content: "\f4f0";
 }
 
 .fa-creative-commons-sampling-plus:before {
-  content: "";
+  content: "\f4f1";
 }
 
 .fa-creative-commons-share:before {
-  content: "";
+  content: "\f4f2";
 }
 
 .fa-credit-card:before {
-  content: "";
+  content: "\f09d";
 }
 
 .fa-crop:before {
-  content: "";
+  content: "\f125";
 }
 
 .fa-crop-alt:before {
-  content: "";
+  content: "\f565";
 }
 
 .fa-cross:before {
-  content: "";
+  content: "\f654";
 }
 
 .fa-crosshairs:before {
-  content: "";
+  content: "\f05b";
 }
 
 .fa-crow:before {
-  content: "";
+  content: "\f520";
 }
 
 .fa-crown:before {
-  content: "";
+  content: "\f521";
 }
 
 .fa-css3:before {
-  content: "";
+  content: "\f13c";
 }
 
 .fa-css3-alt:before {
-  content: "";
+  content: "\f38b";
 }
 
 .fa-cube:before {
-  content: "";
+  content: "\f1b2";
 }
 
 .fa-cubes:before {
-  content: "";
+  content: "\f1b3";
 }
 
 .fa-cut:before {
-  content: "";
+  content: "\f0c4";
 }
 
 .fa-cuttlefish:before {
-  content: "";
+  content: "\f38c";
 }
 
 .fa-d-and-d:before {
-  content: "";
+  content: "\f38d";
 }
 
 .fa-dashcube:before {
-  content: "";
+  content: "\f210";
 }
 
 .fa-database:before {
-  content: "";
+  content: "\f1c0";
 }
 
 .fa-deaf:before {
-  content: "";
+  content: "\f2a4";
 }
 
 .fa-delicious:before {
-  content: "";
+  content: "\f1a5";
 }
 
 .fa-deploydog:before {
-  content: "";
+  content: "\f38e";
 }
 
 .fa-deskpro:before {
-  content: "";
+  content: "\f38f";
 }
 
 .fa-desktop:before {
-  content: "";
+  content: "\f108";
 }
 
 .fa-deviantart:before {
-  content: "";
+  content: "\f1bd";
 }
 
 .fa-dharmachakra:before {
-  content: "";
+  content: "\f655";
 }
 
 .fa-diagnoses:before {
-  content: "";
+  content: "\f470";
 }
 
 .fa-dice:before {
-  content: "";
+  content: "\f522";
 }
 
 .fa-dice-five:before {
-  content: "";
+  content: "\f523";
 }
 
 .fa-dice-four:before {
-  content: "";
+  content: "\f524";
 }
 
 .fa-dice-one:before {
-  content: "";
+  content: "\f525";
 }
 
 .fa-dice-six:before {
-  content: "";
+  content: "\f526";
 }
 
 .fa-dice-three:before {
-  content: "";
+  content: "\f527";
 }
 
 .fa-dice-two:before {
-  content: "";
+  content: "\f528";
 }
 
 .fa-digg:before {
-  content: "";
+  content: "\f1a6";
 }
 
 .fa-digital-ocean:before {
-  content: "";
+  content: "\f391";
 }
 
 .fa-digital-tachograph:before {
-  content: "";
+  content: "\f566";
 }
 
 .fa-directions:before {
-  content: "";
+  content: "\f5eb";
 }
 
 .fa-discord:before {
-  content: "";
+  content: "\f392";
 }
 
 .fa-discourse:before {
-  content: "";
+  content: "\f393";
 }
 
 .fa-divide:before {
-  content: "";
+  content: "\f529";
 }
 
 .fa-dizzy:before {
-  content: "";
+  content: "\f567";
 }
 
 .fa-dna:before {
-  content: "";
+  content: "\f471";
 }
 
 .fa-dochub:before {
-  content: "";
+  content: "\f394";
 }
 
 .fa-docker:before {
-  content: "";
+  content: "\f395";
 }
 
 .fa-dollar-sign:before {
-  content: "";
+  content: "\f155";
 }
 
 .fa-dolly:before {
-  content: "";
+  content: "\f472";
 }
 
 .fa-dolly-flatbed:before {
-  content: "";
+  content: "\f474";
 }
 
 .fa-donate:before {
-  content: "";
+  content: "\f4b9";
 }
 
 .fa-door-closed:before {
-  content: "";
+  content: "\f52a";
 }
 
 .fa-door-open:before {
-  content: "";
+  content: "\f52b";
 }
 
 .fa-dot-circle:before {
-  content: "";
+  content: "\f192";
 }
 
 .fa-dove:before {
-  content: "";
+  content: "\f4ba";
 }
 
 .fa-download:before {
-  content: "";
+  content: "\f019";
 }
 
 .fa-draft2digital:before {
-  content: "";
+  content: "\f396";
 }
 
 .fa-drafting-compass:before {
-  content: "";
+  content: "\f568";
 }
 
 .fa-draw-polygon:before {
-  content: "";
+  content: "\f5ee";
 }
 
 .fa-dribbble:before {
-  content: "";
+  content: "\f17d";
 }
 
 .fa-dribbble-square:before {
-  content: "";
+  content: "\f397";
 }
 
 .fa-dropbox:before {
-  content: "";
+  content: "\f16b";
 }
 
 .fa-drum:before {
-  content: "";
+  content: "\f569";
 }
 
 .fa-drum-steelpan:before {
-  content: "";
+  content: "\f56a";
 }
 
 .fa-drupal:before {
-  content: "";
+  content: "\f1a9";
 }
 
 .fa-dumbbell:before {
-  content: "";
+  content: "\f44b";
 }
 
 .fa-dyalog:before {
-  content: "";
+  content: "\f399";
 }
 
 .fa-earlybirds:before {
-  content: "";
+  content: "\f39a";
 }
 
 .fa-ebay:before {
-  content: "";
+  content: "\f4f4";
 }
 
 .fa-edge:before {
-  content: "";
+  content: "\f282";
 }
 
 .fa-edit:before {
-  content: "";
+  content: "\f044";
 }
 
 .fa-eject:before {
-  content: "";
+  content: "\f052";
 }
 
 .fa-elementor:before {
-  content: "";
+  content: "\f430";
 }
 
 .fa-ellipsis-h:before {
-  content: "";
+  content: "\f141";
 }
 
 .fa-ellipsis-v:before {
-  content: "";
+  content: "\f142";
 }
 
 .fa-ello:before {
-  content: "";
+  content: "\f5f1";
 }
 
 .fa-ember:before {
-  content: "";
+  content: "\f423";
 }
 
 .fa-empire:before {
-  content: "";
+  content: "\f1d1";
 }
 
 .fa-envelope:before {
-  content: "";
+  content: "\f0e0";
 }
 
 .fa-envelope-open:before {
-  content: "";
+  content: "\f2b6";
 }
 
 .fa-envelope-open-text:before {
-  content: "";
+  content: "\f658";
 }
 
 .fa-envelope-square:before {
-  content: "";
+  content: "\f199";
 }
 
 .fa-envira:before {
-  content: "";
+  content: "\f299";
 }
 
 .fa-equals:before {
-  content: "";
+  content: "\f52c";
 }
 
 .fa-eraser:before {
-  content: "";
+  content: "\f12d";
 }
 
 .fa-erlang:before {
-  content: "";
+  content: "\f39d";
 }
 
 .fa-ethereum:before {
-  content: "";
+  content: "\f42e";
 }
 
 .fa-etsy:before {
-  content: "";
+  content: "\f2d7";
 }
 
 .fa-euro-sign:before {
-  content: "";
+  content: "\f153";
 }
 
 .fa-exchange-alt:before {
-  content: "";
+  content: "\f362";
 }
 
 .fa-exclamation:before {
-  content: "";
+  content: "\f12a";
 }
 
 .fa-exclamation-circle:before {
-  content: "";
+  content: "\f06a";
 }
 
 .fa-exclamation-triangle:before {
-  content: "";
+  content: "\f071";
 }
 
 .fa-expand:before {
-  content: "";
+  content: "\f065";
 }
 
 .fa-expand-arrows-alt:before {
-  content: "";
+  content: "\f31e";
 }
 
 .fa-expeditedssl:before {
-  content: "";
+  content: "\f23e";
 }
 
 .fa-external-link-alt:before {
-  content: "";
+  content: "\f35d";
 }
 
 .fa-external-link-square-alt:before {
-  content: "";
+  content: "\f360";
 }
 
 .fa-eye:before {
-  content: "";
+  content: "\f06e";
 }
 
 .fa-eye-dropper:before {
-  content: "";
+  content: "\f1fb";
 }
 
 .fa-eye-slash:before {
-  content: "";
+  content: "\f070";
 }
 
 .fa-facebook:before {
-  content: "";
+  content: "\f09a";
 }
 
 .fa-facebook-f:before {
-  content: "";
+  content: "\f39e";
 }
 
 .fa-facebook-messenger:before {
-  content: "";
+  content: "\f39f";
 }
 
 .fa-facebook-square:before {
-  content: "";
+  content: "\f082";
 }
 
 .fa-fast-backward:before {
-  content: "";
+  content: "\f049";
 }
 
 .fa-fast-forward:before {
-  content: "";
+  content: "\f050";
 }
 
 .fa-fax:before {
-  content: "";
+  content: "\f1ac";
 }
 
 .fa-feather:before {
-  content: "";
+  content: "\f52d";
 }
 
 .fa-feather-alt:before {
-  content: "";
+  content: "\f56b";
 }
 
 .fa-female:before {
-  content: "";
+  content: "\f182";
 }
 
 .fa-fighter-jet:before {
-  content: "";
+  content: "\f0fb";
 }
 
 .fa-file:before {
-  content: "";
+  content: "\f15b";
 }
 
 .fa-file-alt:before {
-  content: "";
+  content: "\f15c";
 }
 
 .fa-file-archive:before {
-  content: "";
+  content: "\f1c6";
 }
 
 .fa-file-audio:before {
-  content: "";
+  content: "\f1c7";
 }
 
 .fa-file-code:before {
-  content: "";
+  content: "\f1c9";
 }
 
 .fa-file-contract:before {
-  content: "";
+  content: "\f56c";
 }
 
 .fa-file-download:before {
-  content: "";
+  content: "\f56d";
 }
 
 .fa-file-excel:before {
-  content: "";
+  content: "\f1c3";
 }
 
 .fa-file-export:before {
-  content: "";
+  content: "\f56e";
 }
 
 .fa-file-image:before {
-  content: "";
+  content: "\f1c5";
 }
 
 .fa-file-import:before {
-  content: "";
+  content: "\f56f";
 }
 
 .fa-file-invoice:before {
-  content: "";
+  content: "\f570";
 }
 
 .fa-file-invoice-dollar:before {
-  content: "";
+  content: "\f571";
 }
 
 .fa-file-medical:before {
-  content: "";
+  content: "\f477";
 }
 
 .fa-file-medical-alt:before {
-  content: "";
+  content: "\f478";
 }
 
 .fa-file-pdf:before {
-  content: "";
+  content: "\f1c1";
 }
 
 .fa-file-powerpoint:before {
-  content: "";
+  content: "\f1c4";
 }
 
 .fa-file-prescription:before {
-  content: "";
+  content: "\f572";
 }
 
 .fa-file-signature:before {
-  content: "";
+  content: "\f573";
 }
 
 .fa-file-upload:before {
-  content: "";
+  content: "\f574";
 }
 
 .fa-file-video:before {
-  content: "";
+  content: "\f1c8";
 }
 
 .fa-file-word:before {
-  content: "";
+  content: "\f1c2";
 }
 
 .fa-fill:before {
-  content: "";
+  content: "\f575";
 }
 
 .fa-fill-drip:before {
-  content: "";
+  content: "\f576";
 }
 
 .fa-film:before {
-  content: "";
+  content: "\f008";
 }
 
 .fa-filter:before {
-  content: "";
+  content: "\f0b0";
 }
 
 .fa-fingerprint:before {
-  content: "";
+  content: "\f577";
 }
 
 .fa-fire:before {
-  content: "";
+  content: "\f06d";
 }
 
 .fa-fire-extinguisher:before {
-  content: "";
+  content: "\f134";
 }
 
 .fa-firefox:before {
-  content: "";
+  content: "\f269";
 }
 
 .fa-first-aid:before {
-  content: "";
+  content: "\f479";
 }
 
 .fa-first-order:before {
-  content: "";
+  content: "\f2b0";
 }
 
 .fa-first-order-alt:before {
-  content: "";
+  content: "\f50a";
 }
 
 .fa-firstdraft:before {
-  content: "";
+  content: "\f3a1";
 }
 
 .fa-fish:before {
-  content: "";
+  content: "\f578";
 }
 
 .fa-flag:before {
-  content: "";
+  content: "\f024";
 }
 
 .fa-flag-checkered:before {
-  content: "";
+  content: "\f11e";
 }
 
 .fa-flask:before {
-  content: "";
+  content: "\f0c3";
 }
 
 .fa-flickr:before {
-  content: "";
+  content: "\f16e";
 }
 
 .fa-flipboard:before {
-  content: "";
+  content: "\f44d";
 }
 
 .fa-flushed:before {
-  content: "";
+  content: "\f579";
 }
 
 .fa-fly:before {
-  content: "";
+  content: "\f417";
 }
 
 .fa-folder:before {
-  content: "";
+  content: "\f07b";
 }
 
 .fa-folder-minus:before {
-  content: "";
+  content: "\f65d";
 }
 
 .fa-folder-open:before {
-  content: "";
+  content: "\f07c";
 }
 
 .fa-folder-plus:before {
-  content: "";
+  content: "\f65e";
 }
 
 .fa-font:before {
-  content: "";
+  content: "\f031";
 }
 
 .fa-font-awesome:before {
-  content: "";
+  content: "\f2b4";
 }
 
 .fa-font-awesome-alt:before {
-  content: "";
+  content: "\f35c";
 }
 
 .fa-font-awesome-flag:before {
-  content: "";
+  content: "\f425";
 }
 
 .fa-font-awesome-logo-full:before {
-  content: "";
+  content: "\f4e6";
 }
 
 .fa-fonticons:before {
-  content: "";
+  content: "\f280";
 }
 
 .fa-fonticons-fi:before {
-  content: "";
+  content: "\f3a2";
 }
 
 .fa-football-ball:before {
-  content: "";
+  content: "\f44e";
 }
 
 .fa-fort-awesome:before {
-  content: "";
+  content: "\f286";
 }
 
 .fa-fort-awesome-alt:before {
-  content: "";
+  content: "\f3a3";
 }
 
 .fa-forumbee:before {
-  content: "";
+  content: "\f211";
 }
 
 .fa-forward:before {
-  content: "";
+  content: "\f04e";
 }
 
 .fa-foursquare:before {
-  content: "";
+  content: "\f180";
 }
 
 .fa-free-code-camp:before {
-  content: "";
+  content: "\f2c5";
 }
 
 .fa-freebsd:before {
-  content: "";
+  content: "\f3a4";
 }
 
 .fa-frog:before {
-  content: "";
+  content: "\f52e";
 }
 
 .fa-frown:before {
-  content: "";
+  content: "\f119";
 }
 
 .fa-frown-open:before {
-  content: "";
+  content: "\f57a";
 }
 
 .fa-fulcrum:before {
-  content: "";
+  content: "\f50b";
 }
 
 .fa-funnel-dollar:before {
-  content: "";
+  content: "\f662";
 }
 
 .fa-futbol:before {
-  content: "";
+  content: "\f1e3";
 }
 
 .fa-galactic-republic:before {
-  content: "";
+  content: "\f50c";
 }
 
 .fa-galactic-senate:before {
-  content: "";
+  content: "\f50d";
 }
 
 .fa-gamepad:before {
-  content: "";
+  content: "\f11b";
 }
 
 .fa-gas-pump:before {
-  content: "";
+  content: "\f52f";
 }
 
 .fa-gavel:before {
-  content: "";
+  content: "\f0e3";
 }
 
 .fa-gem:before {
-  content: "";
+  content: "\f3a5";
 }
 
 .fa-genderless:before {
-  content: "";
+  content: "\f22d";
 }
 
 .fa-get-pocket:before {
-  content: "";
+  content: "\f265";
 }
 
 .fa-gg:before {
-  content: "";
+  content: "\f260";
 }
 
 .fa-gg-circle:before {
-  content: "";
+  content: "\f261";
 }
 
 .fa-gift:before {
-  content: "";
+  content: "\f06b";
 }
 
 .fa-git:before {
-  content: "";
+  content: "\f1d3";
 }
 
 .fa-git-square:before {
-  content: "";
+  content: "\f1d2";
 }
 
 .fa-github:before {
-  content: "";
+  content: "\f09b";
 }
 
 .fa-github-alt:before {
-  content: "";
+  content: "\f113";
 }
 
 .fa-github-square:before {
-  content: "";
+  content: "\f092";
 }
 
 .fa-gitkraken:before {
-  content: "";
+  content: "\f3a6";
 }
 
 .fa-gitlab:before {
-  content: "";
+  content: "\f296";
 }
 
 .fa-gitter:before {
-  content: "";
+  content: "\f426";
 }
 
 .fa-glass-martini:before {
-  content: "";
+  content: "\f000";
 }
 
 .fa-glass-martini-alt:before {
-  content: "";
+  content: "\f57b";
 }
 
 .fa-glasses:before {
-  content: "";
+  content: "\f530";
 }
 
 .fa-glide:before {
-  content: "";
+  content: "\f2a5";
 }
 
 .fa-glide-g:before {
-  content: "";
+  content: "\f2a6";
 }
 
 .fa-globe:before {
-  content: "";
+  content: "\f0ac";
 }
 
 .fa-globe-africa:before {
-  content: "";
+  content: "\f57c";
 }
 
 .fa-globe-americas:before {
-  content: "";
+  content: "\f57d";
 }
 
 .fa-globe-asia:before {
-  content: "";
+  content: "\f57e";
 }
 
 .fa-gofore:before {
-  content: "";
+  content: "\f3a7";
 }
 
 .fa-golf-ball:before {
-  content: "";
+  content: "\f450";
 }
 
 .fa-goodreads:before {
-  content: "";
+  content: "\f3a8";
 }
 
 .fa-goodreads-g:before {
-  content: "";
+  content: "\f3a9";
 }
 
 .fa-google:before {
-  content: "";
+  content: "\f1a0";
 }
 
 .fa-google-drive:before {
-  content: "";
+  content: "\f3aa";
 }
 
 .fa-google-play:before {
-  content: "";
+  content: "\f3ab";
 }
 
 .fa-google-plus:before {
-  content: "";
+  content: "\f2b3";
 }
 
 .fa-google-plus-g:before {
-  content: "";
+  content: "\f0d5";
 }
 
 .fa-google-plus-square:before {
-  content: "";
+  content: "\f0d4";
 }
 
 .fa-google-wallet:before {
-  content: "";
+  content: "\f1ee";
 }
 
 .fa-gopuram:before {
-  content: "";
+  content: "\f664";
 }
 
 .fa-graduation-cap:before {
-  content: "";
+  content: "\f19d";
 }
 
 .fa-gratipay:before {
-  content: "";
+  content: "\f184";
 }
 
 .fa-grav:before {
-  content: "";
+  content: "\f2d6";
 }
 
 .fa-greater-than:before {
-  content: "";
+  content: "\f531";
 }
 
 .fa-greater-than-equal:before {
-  content: "";
+  content: "\f532";
 }
 
 .fa-grimace:before {
-  content: "";
+  content: "\f57f";
 }
 
 .fa-grin:before {
-  content: "";
+  content: "\f580";
 }
 
 .fa-grin-alt:before {
-  content: "";
+  content: "\f581";
 }
 
 .fa-grin-beam:before {
-  content: "";
+  content: "\f582";
 }
 
 .fa-grin-beam-sweat:before {
-  content: "";
+  content: "\f583";
 }
 
 .fa-grin-hearts:before {
-  content: "";
+  content: "\f584";
 }
 
 .fa-grin-squint:before {
-  content: "";
+  content: "\f585";
 }
 
 .fa-grin-squint-tears:before {
-  content: "";
+  content: "\f586";
 }
 
 .fa-grin-stars:before {
-  content: "";
+  content: "\f587";
 }
 
 .fa-grin-tears:before {
-  content: "";
+  content: "\f588";
 }
 
 .fa-grin-tongue:before {
-  content: "";
+  content: "\f589";
 }
 
 .fa-grin-tongue-squint:before {
-  content: "";
+  content: "\f58a";
 }
 
 .fa-grin-tongue-wink:before {
-  content: "";
+  content: "\f58b";
 }
 
 .fa-grin-wink:before {
-  content: "";
+  content: "\f58c";
 }
 
 .fa-grip-horizontal:before {
-  content: "";
+  content: "\f58d";
 }
 
 .fa-grip-vertical:before {
-  content: "";
+  content: "\f58e";
 }
 
 .fa-gripfire:before {
-  content: "";
+  content: "\f3ac";
 }
 
 .fa-grunt:before {
-  content: "";
+  content: "\f3ad";
 }
 
 .fa-gulp:before {
-  content: "";
+  content: "\f3ae";
 }
 
 .fa-h-square:before {
-  content: "";
+  content: "\f0fd";
 }
 
 .fa-hacker-news:before {
-  content: "";
+  content: "\f1d4";
 }
 
 .fa-hacker-news-square:before {
-  content: "";
+  content: "\f3af";
 }
 
 .fa-hackerrank:before {
-  content: "";
+  content: "\f5f7";
 }
 
 .fa-hamsa:before {
-  content: "";
+  content: "\f665";
 }
 
 .fa-hand-holding:before {
-  content: "";
+  content: "\f4bd";
 }
 
 .fa-hand-holding-heart:before {
-  content: "";
+  content: "\f4be";
 }
 
 .fa-hand-holding-usd:before {
-  content: "";
+  content: "\f4c0";
 }
 
 .fa-hand-lizard:before {
-  content: "";
+  content: "\f258";
 }
 
 .fa-hand-paper:before {
-  content: "";
+  content: "\f256";
 }
 
 .fa-hand-peace:before {
-  content: "";
+  content: "\f25b";
 }
 
 .fa-hand-point-down:before {
-  content: "";
+  content: "\f0a7";
 }
 
 .fa-hand-point-left:before {
-  content: "";
+  content: "\f0a5";
 }
 
 .fa-hand-point-right:before {
-  content: "";
+  content: "\f0a4";
 }
 
 .fa-hand-point-up:before {
-  content: "";
+  content: "\f0a6";
 }
 
 .fa-hand-pointer:before {
-  content: "";
+  content: "\f25a";
 }
 
 .fa-hand-rock:before {
-  content: "";
+  content: "\f255";
 }
 
 .fa-hand-scissors:before {
-  content: "";
+  content: "\f257";
 }
 
 .fa-hand-spock:before {
-  content: "";
+  content: "\f259";
 }
 
 .fa-hands:before {
-  content: "";
+  content: "\f4c2";
 }
 
 .fa-hands-helping:before {
-  content: "";
+  content: "\f4c4";
 }
 
 .fa-handshake:before {
-  content: "";
+  content: "\f2b5";
 }
 
 .fa-hashtag:before {
-  content: "";
+  content: "\f292";
 }
 
 .fa-haykal:before {
-  content: "";
+  content: "\f666";
 }
 
 .fa-hdd:before {
-  content: "";
+  content: "\f0a0";
 }
 
 .fa-heading:before {
-  content: "";
+  content: "\f1dc";
 }
 
 .fa-headphones:before {
-  content: "";
+  content: "\f025";
 }
 
 .fa-headphones-alt:before {
-  content: "";
+  content: "\f58f";
 }
 
 .fa-headset:before {
-  content: "";
+  content: "\f590";
 }
 
 .fa-heart:before {
-  content: "";
+  content: "\f004";
 }
 
 .fa-heartbeat:before {
-  content: "";
+  content: "\f21e";
 }
 
 .fa-helicopter:before {
-  content: "";
+  content: "\f533";
 }
 
 .fa-highlighter:before {
-  content: "";
+  content: "\f591";
 }
 
 .fa-hips:before {
-  content: "";
+  content: "\f452";
 }
 
 .fa-hire-a-helper:before {
-  content: "";
+  content: "\f3b0";
 }
 
 .fa-history:before {
-  content: "";
+  content: "\f1da";
 }
 
 .fa-hockey-puck:before {
-  content: "";
+  content: "\f453";
 }
 
 .fa-home:before {
-  content: "";
+  content: "\f015";
 }
 
 .fa-hooli:before {
-  content: "";
+  content: "\f427";
 }
 
 .fa-hornbill:before {
-  content: "";
+  content: "\f592";
 }
 
 .fa-hospital:before {
-  content: "";
+  content: "\f0f8";
 }
 
 .fa-hospital-alt:before {
-  content: "";
+  content: "\f47d";
 }
 
 .fa-hospital-symbol:before {
-  content: "";
+  content: "\f47e";
 }
 
 .fa-hot-tub:before {
-  content: "";
+  content: "\f593";
 }
 
 .fa-hotel:before {
-  content: "";
+  content: "\f594";
 }
 
 .fa-hotjar:before {
-  content: "";
+  content: "\f3b1";
 }
 
 .fa-hourglass:before {
-  content: "";
+  content: "\f254";
 }
 
 .fa-hourglass-end:before {
-  content: "";
+  content: "\f253";
 }
 
 .fa-hourglass-half:before {
-  content: "";
+  content: "\f252";
 }
 
 .fa-hourglass-start:before {
-  content: "";
+  content: "\f251";
 }
 
 .fa-houzz:before {
-  content: "";
+  content: "\f27c";
 }
 
 .fa-html5:before {
-  content: "";
+  content: "\f13b";
 }
 
 .fa-hubspot:before {
-  content: "";
+  content: "\f3b2";
 }
 
 .fa-i-cursor:before {
-  content: "";
+  content: "\f246";
 }
 
 .fa-id-badge:before {
-  content: "";
+  content: "\f2c1";
 }
 
 .fa-id-card:before {
-  content: "";
+  content: "\f2c2";
 }
 
 .fa-id-card-alt:before {
-  content: "";
+  content: "\f47f";
 }
 
 .fa-image:before {
-  content: "";
+  content: "\f03e";
 }
 
 .fa-images:before {
-  content: "";
+  content: "\f302";
 }
 
 .fa-imdb:before {
-  content: "";
+  content: "\f2d8";
 }
 
 .fa-inbox:before {
-  content: "";
+  content: "\f01c";
 }
 
 .fa-indent:before {
-  content: "";
+  content: "\f03c";
 }
 
 .fa-industry:before {
-  content: "";
+  content: "\f275";
 }
 
 .fa-infinity:before {
-  content: "";
+  content: "\f534";
 }
 
 .fa-info:before {
-  content: "";
+  content: "\f129";
 }
 
 .fa-info-circle:before {
-  content: "";
+  content: "\f05a";
 }
 
 .fa-instagram:before {
-  content: "";
+  content: "\f16d";
 }
 
 .fa-internet-explorer:before {
-  content: "";
+  content: "\f26b";
 }
 
 .fa-ioxhost:before {
-  content: "";
+  content: "\f208";
 }
 
 .fa-italic:before {
-  content: "";
+  content: "\f033";
 }
 
 .fa-itunes:before {
-  content: "";
+  content: "\f3b4";
 }
 
 .fa-itunes-note:before {
-  content: "";
+  content: "\f3b5";
 }
 
 .fa-java:before {
-  content: "";
+  content: "\f4e4";
 }
 
 .fa-jedi:before {
-  content: "";
+  content: "\f669";
 }
 
 .fa-jedi-order:before {
-  content: "";
+  content: "\f50e";
 }
 
 .fa-jenkins:before {
-  content: "";
+  content: "\f3b6";
 }
 
 .fa-joget:before {
-  content: "";
+  content: "\f3b7";
 }
 
 .fa-joint:before {
-  content: "";
+  content: "\f595";
 }
 
 .fa-joomla:before {
-  content: "";
+  content: "\f1aa";
 }
 
 .fa-journal-whills:before {
-  content: "";
+  content: "\f66a";
 }
 
 .fa-js:before {
-  content: "";
+  content: "\f3b8";
 }
 
 .fa-js-square:before {
-  content: "";
+  content: "\f3b9";
 }
 
 .fa-jsfiddle:before {
-  content: "";
+  content: "\f1cc";
 }
 
 .fa-kaaba:before {
-  content: "";
+  content: "\f66b";
 }
 
 .fa-kaggle:before {
-  content: "";
+  content: "\f5fa";
 }
 
 .fa-key:before {
-  content: "";
+  content: "\f084";
 }
 
 .fa-keybase:before {
-  content: "";
+  content: "\f4f5";
 }
 
 .fa-keyboard:before {
-  content: "";
+  content: "\f11c";
 }
 
 .fa-keycdn:before {
-  content: "";
+  content: "\f3ba";
 }
 
 .fa-khanda:before {
-  content: "";
+  content: "\f66d";
 }
 
 .fa-kickstarter:before {
-  content: "";
+  content: "\f3bb";
 }
 
 .fa-kickstarter-k:before {
-  content: "";
+  content: "\f3bc";
 }
 
 .fa-kiss:before {
-  content: "";
+  content: "\f596";
 }
 
 .fa-kiss-beam:before {
-  content: "";
+  content: "\f597";
 }
 
 .fa-kiss-wink-heart:before {
-  content: "";
+  content: "\f598";
 }
 
 .fa-kiwi-bird:before {
-  content: "";
+  content: "\f535";
 }
 
 .fa-korvue:before {
-  content: "";
+  content: "\f42f";
 }
 
 .fa-landmark:before {
-  content: "";
+  content: "\f66f";
 }
 
 .fa-language:before {
-  content: "";
+  content: "\f1ab";
 }
 
 .fa-laptop:before {
-  content: "";
+  content: "\f109";
 }
 
 .fa-laptop-code:before {
-  content: "";
+  content: "\f5fc";
 }
 
 .fa-laravel:before {
-  content: "";
+  content: "\f3bd";
 }
 
 .fa-lastfm:before {
-  content: "";
+  content: "\f202";
 }
 
 .fa-lastfm-square:before {
-  content: "";
+  content: "\f203";
 }
 
 .fa-laugh:before {
-  content: "";
+  content: "\f599";
 }
 
 .fa-laugh-beam:before {
-  content: "";
+  content: "\f59a";
 }
 
 .fa-laugh-squint:before {
-  content: "";
+  content: "\f59b";
 }
 
 .fa-laugh-wink:before {
-  content: "";
+  content: "\f59c";
 }
 
 .fa-layer-group:before {
-  content: "";
+  content: "\f5fd";
 }
 
 .fa-leaf:before {
-  content: "";
+  content: "\f06c";
 }
 
 .fa-leanpub:before {
-  content: "";
+  content: "\f212";
 }
 
 .fa-lemon:before {
-  content: "";
+  content: "\f094";
 }
 
 .fa-less:before {
-  content: "";
+  content: "\f41d";
 }
 
 .fa-less-than:before {
-  content: "";
+  content: "\f536";
 }
 
 .fa-less-than-equal:before {
-  content: "";
+  content: "\f537";
 }
 
 .fa-level-down-alt:before {
-  content: "";
+  content: "\f3be";
 }
 
 .fa-level-up-alt:before {
-  content: "";
+  content: "\f3bf";
 }
 
 .fa-life-ring:before {
-  content: "";
+  content: "\f1cd";
 }
 
 .fa-lightbulb:before {
-  content: "";
+  content: "\f0eb";
 }
 
 .fa-line:before {
-  content: "";
+  content: "\f3c0";
 }
 
 .fa-link:before {
-  content: "";
+  content: "\f0c1";
 }
 
 .fa-linkedin:before {
-  content: "";
+  content: "\f08c";
 }
 
 .fa-linkedin-in:before {
-  content: "";
+  content: "\f0e1";
 }
 
 .fa-linode:before {
-  content: "";
+  content: "\f2b8";
 }
 
 .fa-linux:before {
-  content: "";
+  content: "\f17c";
 }
 
 .fa-lira-sign:before {
-  content: "";
+  content: "\f195";
 }
 
 .fa-list:before {
-  content: "";
+  content: "\f03a";
 }
 
 .fa-list-alt:before {
-  content: "";
+  content: "\f022";
 }
 
 .fa-list-ol:before {
-  content: "";
+  content: "\f0cb";
 }
 
 .fa-list-ul:before {
-  content: "";
+  content: "\f0ca";
 }
 
 .fa-location-arrow:before {
-  content: "";
+  content: "\f124";
 }
 
 .fa-lock:before {
-  content: "";
+  content: "\f023";
 }
 
 .fa-lock-open:before {
-  content: "";
+  content: "\f3c1";
 }
 
 .fa-long-arrow-alt-down:before {
-  content: "";
+  content: "\f309";
 }
 
 .fa-long-arrow-alt-left:before {
-  content: "";
+  content: "\f30a";
 }
 
 .fa-long-arrow-alt-right:before {
-  content: "";
+  content: "\f30b";
 }
 
 .fa-long-arrow-alt-up:before {
-  content: "";
+  content: "\f30c";
 }
 
 .fa-low-vision:before {
-  content: "";
+  content: "\f2a8";
 }
 
 .fa-luggage-cart:before {
-  content: "";
+  content: "\f59d";
 }
 
 .fa-lyft:before {
-  content: "";
+  content: "\f3c3";
 }
 
 .fa-magento:before {
-  content: "";
+  content: "\f3c4";
 }
 
 .fa-magic:before {
-  content: "";
+  content: "\f0d0";
 }
 
 .fa-magnet:before {
-  content: "";
+  content: "\f076";
 }
 
 .fa-mail-bulk:before {
-  content: "";
+  content: "\f674";
 }
 
 .fa-mailchimp:before {
-  content: "";
+  content: "\f59e";
 }
 
 .fa-male:before {
-  content: "";
+  content: "\f183";
 }
 
 .fa-mandalorian:before {
-  content: "";
+  content: "\f50f";
 }
 
 .fa-map:before {
-  content: "";
+  content: "\f279";
 }
 
 .fa-map-marked:before {
-  content: "";
+  content: "\f59f";
 }
 
 .fa-map-marked-alt:before {
-  content: "";
+  content: "\f5a0";
 }
 
 .fa-map-marker:before {
-  content: "";
+  content: "\f041";
 }
 
 .fa-map-marker-alt:before {
-  content: "";
+  content: "\f3c5";
 }
 
 .fa-map-pin:before {
-  content: "";
+  content: "\f276";
 }
 
 .fa-map-signs:before {
-  content: "";
+  content: "\f277";
 }
 
 .fa-markdown:before {
-  content: "";
+  content: "\f60f";
 }
 
 .fa-marker:before {
-  content: "";
+  content: "\f5a1";
 }
 
 .fa-mars:before {
-  content: "";
+  content: "\f222";
 }
 
 .fa-mars-double:before {
-  content: "";
+  content: "\f227";
 }
 
 .fa-mars-stroke:before {
-  content: "";
+  content: "\f229";
 }
 
 .fa-mars-stroke-h:before {
-  content: "";
+  content: "\f22b";
 }
 
 .fa-mars-stroke-v:before {
-  content: "";
+  content: "\f22a";
 }
 
 .fa-mastodon:before {
-  content: "";
+  content: "\f4f6";
 }
 
 .fa-maxcdn:before {
-  content: "";
+  content: "\f136";
 }
 
 .fa-medal:before {
-  content: "";
+  content: "\f5a2";
 }
 
 .fa-medapps:before {
-  content: "";
+  content: "\f3c6";
 }
 
 .fa-medium:before {
-  content: "";
+  content: "\f23a";
 }
 
 .fa-medium-m:before {
-  content: "";
+  content: "\f3c7";
 }
 
 .fa-medkit:before {
-  content: "";
+  content: "\f0fa";
 }
 
 .fa-medrt:before {
-  content: "";
+  content: "\f3c8";
 }
 
 .fa-meetup:before {
-  content: "";
+  content: "\f2e0";
 }
 
 .fa-megaport:before {
-  content: "";
+  content: "\f5a3";
 }
 
 .fa-meh:before {
-  content: "";
+  content: "\f11a";
 }
 
 .fa-meh-blank:before {
-  content: "";
+  content: "\f5a4";
 }
 
 .fa-meh-rolling-eyes:before {
-  content: "";
+  content: "\f5a5";
 }
 
 .fa-memory:before {
-  content: "";
+  content: "\f538";
 }
 
 .fa-menorah:before {
-  content: "";
+  content: "\f676";
 }
 
 .fa-mercury:before {
-  content: "";
+  content: "\f223";
 }
 
 .fa-microchip:before {
-  content: "";
+  content: "\f2db";
 }
 
 .fa-microphone:before {
-  content: "";
+  content: "\f130";
 }
 
 .fa-microphone-alt:before {
-  content: "";
+  content: "\f3c9";
 }
 
 .fa-microphone-alt-slash:before {
-  content: "";
+  content: "\f539";
 }
 
 .fa-microphone-slash:before {
-  content: "";
+  content: "\f131";
 }
 
 .fa-microscope:before {
-  content: "";
+  content: "\f610";
 }
 
 .fa-microsoft:before {
-  content: "";
+  content: "\f3ca";
 }
 
 .fa-minus:before {
-  content: "";
+  content: "\f068";
 }
 
 .fa-minus-circle:before {
-  content: "";
+  content: "\f056";
 }
 
 .fa-minus-square:before {
-  content: "";
+  content: "\f146";
 }
 
 .fa-mix:before {
-  content: "";
+  content: "\f3cb";
 }
 
 .fa-mixcloud:before {
-  content: "";
+  content: "\f289";
 }
 
 .fa-mizuni:before {
-  content: "";
+  content: "\f3cc";
 }
 
 .fa-mobile:before {
-  content: "";
+  content: "\f10b";
 }
 
 .fa-mobile-alt:before {
-  content: "";
+  content: "\f3cd";
 }
 
 .fa-modx:before {
-  content: "";
+  content: "\f285";
 }
 
 .fa-monero:before {
-  content: "";
+  content: "\f3d0";
 }
 
 .fa-money-bill:before {
-  content: "";
+  content: "\f0d6";
 }
 
 .fa-money-bill-alt:before {
-  content: "";
+  content: "\f3d1";
 }
 
 .fa-money-bill-wave:before {
-  content: "";
+  content: "\f53a";
 }
 
 .fa-money-bill-wave-alt:before {
-  content: "";
+  content: "\f53b";
 }
 
 .fa-money-check:before {
-  content: "";
+  content: "\f53c";
 }
 
 .fa-money-check-alt:before {
-  content: "";
+  content: "\f53d";
 }
 
 .fa-monument:before {
-  content: "";
+  content: "\f5a6";
 }
 
 .fa-moon:before {
-  content: "";
+  content: "\f186";
 }
 
 .fa-mortar-pestle:before {
-  content: "";
+  content: "\f5a7";
 }
 
 .fa-mosque:before {
-  content: "";
+  content: "\f678";
 }
 
 .fa-motorcycle:before {
-  content: "";
+  content: "\f21c";
 }
 
 .fa-mouse-pointer:before {
-  content: "";
+  content: "\f245";
 }
 
 .fa-music:before {
-  content: "";
+  content: "\f001";
 }
 
 .fa-napster:before {
-  content: "";
+  content: "\f3d2";
 }
 
 .fa-neos:before {
-  content: "";
+  content: "\f612";
 }
 
 .fa-neuter:before {
-  content: "";
+  content: "\f22c";
 }
 
 .fa-newspaper:before {
-  content: "";
+  content: "\f1ea";
 }
 
 .fa-nimblr:before {
-  content: "";
+  content: "\f5a8";
 }
 
 .fa-nintendo-switch:before {
-  content: "";
+  content: "\f418";
 }
 
 .fa-node:before {
-  content: "";
+  content: "\f419";
 }
 
 .fa-node-js:before {
-  content: "";
+  content: "\f3d3";
 }
 
 .fa-not-equal:before {
-  content: "";
+  content: "\f53e";
 }
 
 .fa-notes-medical:before {
-  content: "";
+  content: "\f481";
 }
 
 .fa-npm:before {
-  content: "";
+  content: "\f3d4";
 }
 
 .fa-ns8:before {
-  content: "";
+  content: "\f3d5";
 }
 
 .fa-nutritionix:before {
-  content: "";
+  content: "\f3d6";
 }
 
 .fa-object-group:before {
-  content: "";
+  content: "\f247";
 }
 
 .fa-object-ungroup:before {
-  content: "";
+  content: "\f248";
 }
 
 .fa-odnoklassniki:before {
-  content: "";
+  content: "\f263";
 }
 
 .fa-odnoklassniki-square:before {
-  content: "";
+  content: "\f264";
 }
 
 .fa-oil-can:before {
-  content: "";
+  content: "\f613";
 }
 
 .fa-old-republic:before {
-  content: "";
+  content: "\f510";
 }
 
 .fa-om:before {
-  content: "";
+  content: "\f679";
 }
 
 .fa-opencart:before {
-  content: "";
+  content: "\f23d";
 }
 
 .fa-openid:before {
-  content: "";
+  content: "\f19b";
 }
 
 .fa-opera:before {
-  content: "";
+  content: "\f26a";
 }
 
 .fa-optin-monster:before {
-  content: "";
+  content: "\f23c";
 }
 
 .fa-osi:before {
-  content: "";
+  content: "\f41a";
 }
 
 .fa-outdent:before {
-  content: "";
+  content: "\f03b";
 }
 
 .fa-page4:before {
-  content: "";
+  content: "\f3d7";
 }
 
 .fa-pagelines:before {
-  content: "";
+  content: "\f18c";
 }
 
 .fa-paint-brush:before {
-  content: "";
+  content: "\f1fc";
 }
 
 .fa-paint-roller:before {
-  content: "";
+  content: "\f5aa";
 }
 
 .fa-palette:before {
-  content: "";
+  content: "\f53f";
 }
 
 .fa-palfed:before {
-  content: "";
+  content: "\f3d8";
 }
 
 .fa-pallet:before {
-  content: "";
+  content: "\f482";
 }
 
 .fa-paper-plane:before {
-  content: "";
+  content: "\f1d8";
 }
 
 .fa-paperclip:before {
-  content: "";
+  content: "\f0c6";
 }
 
 .fa-parachute-box:before {
-  content: "";
+  content: "\f4cd";
 }
 
 .fa-paragraph:before {
-  content: "";
+  content: "\f1dd";
 }
 
 .fa-parking:before {
-  content: "";
+  content: "\f540";
 }
 
 .fa-passport:before {
-  content: "";
+  content: "\f5ab";
 }
 
 .fa-pastafarianism:before {
-  content: "";
+  content: "\f67b";
 }
 
 .fa-paste:before {
-  content: "";
+  content: "\f0ea";
 }
 
 .fa-patreon:before {
-  content: "";
+  content: "\f3d9";
 }
 
 .fa-pause:before {
-  content: "";
+  content: "\f04c";
 }
 
 .fa-pause-circle:before {
-  content: "";
+  content: "\f28b";
 }
 
 .fa-paw:before {
-  content: "";
+  content: "\f1b0";
 }
 
 .fa-paypal:before {
-  content: "";
+  content: "\f1ed";
 }
 
 .fa-peace:before {
-  content: "";
+  content: "\f67c";
 }
 
 .fa-pen:before {
-  content: "";
+  content: "\f304";
 }
 
 .fa-pen-alt:before {
-  content: "";
+  content: "\f305";
 }
 
 .fa-pen-fancy:before {
-  content: "";
+  content: "\f5ac";
 }
 
 .fa-pen-nib:before {
-  content: "";
+  content: "\f5ad";
 }
 
 .fa-pen-square:before {
-  content: "";
+  content: "\f14b";
 }
 
 .fa-pencil-alt:before {
-  content: "";
+  content: "\f303";
 }
 
 .fa-pencil-ruler:before {
-  content: "";
+  content: "\f5ae";
 }
 
 .fa-people-carry:before {
-  content: "";
+  content: "\f4ce";
 }
 
 .fa-percent:before {
-  content: "";
+  content: "\f295";
 }
 
 .fa-percentage:before {
-  content: "";
+  content: "\f541";
 }
 
 .fa-periscope:before {
-  content: "";
+  content: "\f3da";
 }
 
 .fa-phabricator:before {
-  content: "";
+  content: "\f3db";
 }
 
 .fa-phoenix-framework:before {
-  content: "";
+  content: "\f3dc";
 }
 
 .fa-phoenix-squadron:before {
-  content: "";
+  content: "\f511";
 }
 
 .fa-phone:before {
-  content: "";
+  content: "\f095";
 }
 
 .fa-phone-slash:before {
-  content: "";
+  content: "\f3dd";
 }
 
 .fa-phone-square:before {
-  content: "";
+  content: "\f098";
 }
 
 .fa-phone-volume:before {
-  content: "";
+  content: "\f2a0";
 }
 
 .fa-php:before {
-  content: "";
+  content: "\f457";
 }
 
 .fa-pied-piper:before {
-  content: "";
+  content: "\f2ae";
 }
 
 .fa-pied-piper-alt:before {
-  content: "";
+  content: "\f1a8";
 }
 
 .fa-pied-piper-hat:before {
-  content: "";
+  content: "\f4e5";
 }
 
 .fa-pied-piper-pp:before {
-  content: "";
+  content: "\f1a7";
 }
 
 .fa-piggy-bank:before {
-  content: "";
+  content: "\f4d3";
 }
 
 .fa-pills:before {
-  content: "";
+  content: "\f484";
 }
 
 .fa-pinterest:before {
-  content: "";
+  content: "\f0d2";
 }
 
 .fa-pinterest-p:before {
-  content: "";
+  content: "\f231";
 }
 
 .fa-pinterest-square:before {
-  content: "";
+  content: "\f0d3";
 }
 
 .fa-place-of-worship:before {
-  content: "";
+  content: "\f67f";
 }
 
 .fa-plane:before {
-  content: "";
+  content: "\f072";
 }
 
 .fa-plane-arrival:before {
-  content: "";
+  content: "\f5af";
 }
 
 .fa-plane-departure:before {
-  content: "";
+  content: "\f5b0";
 }
 
 .fa-play:before {
-  content: "";
+  content: "\f04b";
 }
 
 .fa-play-circle:before {
-  content: "";
+  content: "\f144";
 }
 
 .fa-playstation:before {
-  content: "";
+  content: "\f3df";
 }
 
 .fa-plug:before {
-  content: "";
+  content: "\f1e6";
 }
 
 .fa-plus:before {
-  content: "";
+  content: "\f067";
 }
 
 .fa-plus-circle:before {
-  content: "";
+  content: "\f055";
 }
 
 .fa-plus-square:before {
-  content: "";
+  content: "\f0fe";
 }
 
 .fa-podcast:before {
-  content: "";
+  content: "\f2ce";
 }
 
 .fa-poll:before {
-  content: "";
+  content: "\f681";
 }
 
 .fa-poll-h:before {
-  content: "";
+  content: "\f682";
 }
 
 .fa-poo:before {
-  content: "";
+  content: "\f2fe";
 }
 
 .fa-poop:before {
-  content: "";
+  content: "\f619";
 }
 
 .fa-portrait:before {
-  content: "";
+  content: "\f3e0";
 }
 
 .fa-pound-sign:before {
-  content: "";
+  content: "\f154";
 }
 
 .fa-power-off:before {
-  content: "";
+  content: "\f011";
 }
 
 .fa-pray:before {
-  content: "";
+  content: "\f683";
 }
 
 .fa-praying-hands:before {
-  content: "";
+  content: "\f684";
 }
 
 .fa-prescription:before {
-  content: "";
+  content: "\f5b1";
 }
 
 .fa-prescription-bottle:before {
-  content: "";
+  content: "\f485";
 }
 
 .fa-prescription-bottle-alt:before {
-  content: "";
+  content: "\f486";
 }
 
 .fa-print:before {
-  content: "";
+  content: "\f02f";
 }
 
 .fa-procedures:before {
-  content: "";
+  content: "\f487";
 }
 
 .fa-product-hunt:before {
-  content: "";
+  content: "\f288";
 }
 
 .fa-project-diagram:before {
-  content: "";
+  content: "\f542";
 }
 
 .fa-pushed:before {
-  content: "";
+  content: "\f3e1";
 }
 
 .fa-puzzle-piece:before {
-  content: "";
+  content: "\f12e";
 }
 
 .fa-python:before {
-  content: "";
+  content: "\f3e2";
 }
 
 .fa-qq:before {
-  content: "";
+  content: "\f1d6";
 }
 
 .fa-qrcode:before {
-  content: "";
+  content: "\f029";
 }
 
 .fa-question:before {
-  content: "";
+  content: "\f128";
 }
 
 .fa-question-circle:before {
-  content: "";
+  content: "\f059";
 }
 
 .fa-quidditch:before {
-  content: "";
+  content: "\f458";
 }
 
 .fa-quinscape:before {
-  content: "";
+  content: "\f459";
 }
 
 .fa-quora:before {
-  content: "";
+  content: "\f2c4";
 }
 
 .fa-quote-left:before {
-  content: "";
+  content: "\f10d";
 }
 
 .fa-quote-right:before {
-  content: "";
+  content: "\f10e";
 }
 
 .fa-quran:before {
-  content: "";
+  content: "\f687";
 }
 
 .fa-r-project:before {
-  content: "";
+  content: "\f4f7";
 }
 
 .fa-random:before {
-  content: "";
+  content: "\f074";
 }
 
 .fa-ravelry:before {
-  content: "";
+  content: "\f2d9";
 }
 
 .fa-react:before {
-  content: "";
+  content: "\f41b";
 }
 
 .fa-readme:before {
-  content: "";
+  content: "\f4d5";
 }
 
 .fa-rebel:before {
-  content: "";
+  content: "\f1d0";
 }
 
 .fa-receipt:before {
-  content: "";
+  content: "\f543";
 }
 
 .fa-recycle:before {
-  content: "";
+  content: "\f1b8";
 }
 
 .fa-red-river:before {
-  content: "";
+  content: "\f3e3";
 }
 
 .fa-reddit:before {
-  content: "";
+  content: "\f1a1";
 }
 
 .fa-reddit-alien:before {
-  content: "";
+  content: "\f281";
 }
 
 .fa-reddit-square:before {
-  content: "";
+  content: "\f1a2";
 }
 
 .fa-redo:before {
-  content: "";
+  content: "\f01e";
 }
 
 .fa-redo-alt:before {
-  content: "";
+  content: "\f2f9";
 }
 
 .fa-registered:before {
-  content: "";
+  content: "\f25d";
 }
 
 .fa-rendact:before {
-  content: "";
+  content: "\f3e4";
 }
 
 .fa-renren:before {
-  content: "";
+  content: "\f18b";
 }
 
 .fa-reply:before {
-  content: "";
+  content: "\f3e5";
 }
 
 .fa-reply-all:before {
-  content: "";
+  content: "\f122";
 }
 
 .fa-replyd:before {
-  content: "";
+  content: "\f3e6";
 }
 
 .fa-researchgate:before {
-  content: "";
+  content: "\f4f8";
 }
 
 .fa-resolving:before {
-  content: "";
+  content: "\f3e7";
 }
 
 .fa-retweet:before {
-  content: "";
+  content: "\f079";
 }
 
 .fa-rev:before {
-  content: "";
+  content: "\f5b2";
 }
 
 .fa-ribbon:before {
-  content: "";
+  content: "\f4d6";
 }
 
 .fa-road:before {
-  content: "";
+  content: "\f018";
 }
 
 .fa-robot:before {
-  content: "";
+  content: "\f544";
 }
 
 .fa-rocket:before {
-  content: "";
+  content: "\f135";
 }
 
 .fa-rocketchat:before {
-  content: "";
+  content: "\f3e8";
 }
 
 .fa-rockrms:before {
-  content: "";
+  content: "\f3e9";
 }
 
 .fa-route:before {
-  content: "";
+  content: "\f4d7";
 }
 
 .fa-rss:before {
-  content: "";
+  content: "\f09e";
 }
 
 .fa-rss-square:before {
-  content: "";
+  content: "\f143";
 }
 
 .fa-ruble-sign:before {
-  content: "";
+  content: "\f158";
 }
 
 .fa-ruler:before {
-  content: "";
+  content: "\f545";
 }
 
 .fa-ruler-combined:before {
-  content: "";
+  content: "\f546";
 }
 
 .fa-ruler-horizontal:before {
-  content: "";
+  content: "\f547";
 }
 
 .fa-ruler-vertical:before {
-  content: "";
+  content: "\f548";
 }
 
 .fa-rupee-sign:before {
-  content: "";
+  content: "\f156";
 }
 
 .fa-sad-cry:before {
-  content: "";
+  content: "\f5b3";
 }
 
 .fa-sad-tear:before {
-  content: "";
+  content: "\f5b4";
 }
 
 .fa-safari:before {
-  content: "";
+  content: "\f267";
 }
 
 .fa-sass:before {
-  content: "";
+  content: "\f41e";
 }
 
 .fa-save:before {
-  content: "";
+  content: "\f0c7";
 }
 
 .fa-schlix:before {
-  content: "";
+  content: "\f3ea";
 }
 
 .fa-school:before {
-  content: "";
+  content: "\f549";
 }
 
 .fa-screwdriver:before {
-  content: "";
+  content: "\f54a";
 }
 
 .fa-scribd:before {
-  content: "";
+  content: "\f28a";
 }
 
 .fa-search:before {
-  content: "";
+  content: "\f002";
 }
 
 .fa-search-dollar:before {
-  content: "";
+  content: "\f688";
 }
 
 .fa-search-location:before {
-  content: "";
+  content: "\f689";
 }
 
 .fa-search-minus:before {
-  content: "";
+  content: "\f010";
 }
 
 .fa-search-plus:before {
-  content: "";
+  content: "\f00e";
 }
 
 .fa-searchengin:before {
-  content: "";
+  content: "\f3eb";
 }
 
 .fa-seedling:before {
-  content: "";
+  content: "\f4d8";
 }
 
 .fa-sellcast:before {
-  content: "";
+  content: "\f2da";
 }
 
 .fa-sellsy:before {
-  content: "";
+  content: "\f213";
 }
 
 .fa-server:before {
-  content: "";
+  content: "\f233";
 }
 
 .fa-servicestack:before {
-  content: "";
+  content: "\f3ec";
 }
 
 .fa-shapes:before {
-  content: "";
+  content: "\f61f";
 }
 
 .fa-share:before {
-  content: "";
+  content: "\f064";
 }
 
 .fa-share-alt:before {
-  content: "";
+  content: "\f1e0";
 }
 
 .fa-share-alt-square:before {
-  content: "";
+  content: "\f1e1";
 }
 
 .fa-share-square:before {
-  content: "";
+  content: "\f14d";
 }
 
 .fa-shekel-sign:before {
-  content: "";
+  content: "\f20b";
 }
 
 .fa-shield-alt:before {
-  content: "";
+  content: "\f3ed";
 }
 
 .fa-ship:before {
-  content: "";
+  content: "\f21a";
 }
 
 .fa-shipping-fast:before {
-  content: "";
+  content: "\f48b";
 }
 
 .fa-shirtsinbulk:before {
-  content: "";
+  content: "\f214";
 }
 
 .fa-shoe-prints:before {
-  content: "";
+  content: "\f54b";
 }
 
 .fa-shopping-bag:before {
-  content: "";
+  content: "\f290";
 }
 
 .fa-shopping-basket:before {
-  content: "";
+  content: "\f291";
 }
 
 .fa-shopping-cart:before {
-  content: "";
+  content: "\f07a";
 }
 
 .fa-shopware:before {
-  content: "";
+  content: "\f5b5";
 }
 
 .fa-shower:before {
-  content: "";
+  content: "\f2cc";
 }
 
 .fa-shuttle-van:before {
-  content: "";
+  content: "\f5b6";
 }
 
 .fa-sign:before {
-  content: "";
+  content: "\f4d9";
 }
 
 .fa-sign-in-alt:before {
-  content: "";
+  content: "\f2f6";
 }
 
 .fa-sign-language:before {
-  content: "";
+  content: "\f2a7";
 }
 
 .fa-sign-out-alt:before {
-  content: "";
+  content: "\f2f5";
 }
 
 .fa-signal:before {
-  content: "";
+  content: "\f012";
 }
 
 .fa-signature:before {
-  content: "";
+  content: "\f5b7";
 }
 
 .fa-simplybuilt:before {
-  content: "";
+  content: "\f215";
 }
 
 .fa-sistrix:before {
-  content: "";
+  content: "\f3ee";
 }
 
 .fa-sitemap:before {
-  content: "";
+  content: "\f0e8";
 }
 
 .fa-sith:before {
-  content: "";
+  content: "\f512";
 }
 
 .fa-skull:before {
-  content: "";
+  content: "\f54c";
 }
 
 .fa-skyatlas:before {
-  content: "";
+  content: "\f216";
 }
 
 .fa-skype:before {
-  content: "";
+  content: "\f17e";
 }
 
 .fa-slack:before {
-  content: "";
+  content: "\f198";
 }
 
 .fa-slack-hash:before {
-  content: "";
+  content: "\f3ef";
 }
 
 .fa-sliders-h:before {
-  content: "";
+  content: "\f1de";
 }
 
 .fa-slideshare:before {
-  content: "";
+  content: "\f1e7";
 }
 
 .fa-smile:before {
-  content: "";
+  content: "\f118";
 }
 
 .fa-smile-beam:before {
-  content: "";
+  content: "\f5b8";
 }
 
 .fa-smile-wink:before {
-  content: "";
+  content: "\f4da";
 }
 
 .fa-smoking:before {
-  content: "";
+  content: "\f48d";
 }
 
 .fa-smoking-ban:before {
-  content: "";
+  content: "\f54d";
 }
 
 .fa-snapchat:before {
-  content: "";
+  content: "\f2ab";
 }
 
 .fa-snapchat-ghost:before {
-  content: "";
+  content: "\f2ac";
 }
 
 .fa-snapchat-square:before {
-  content: "";
+  content: "\f2ad";
 }
 
 .fa-snowflake:before {
-  content: "";
+  content: "\f2dc";
 }
 
 .fa-socks:before {
-  content: "";
+  content: "\f696";
 }
 
 .fa-solar-panel:before {
-  content: "";
+  content: "\f5ba";
 }
 
 .fa-sort:before {
-  content: "";
+  content: "\f0dc";
 }
 
 .fa-sort-alpha-down:before {
-  content: "";
+  content: "\f15d";
 }
 
 .fa-sort-alpha-up:before {
-  content: "";
+  content: "\f15e";
 }
 
 .fa-sort-amount-down:before {
-  content: "";
+  content: "\f160";
 }
 
 .fa-sort-amount-up:before {
-  content: "";
+  content: "\f161";
 }
 
 .fa-sort-down:before {
-  content: "";
+  content: "\f0dd";
 }
 
 .fa-sort-numeric-down:before {
-  content: "";
+  content: "\f162";
 }
 
 .fa-sort-numeric-up:before {
-  content: "";
+  content: "\f163";
 }
 
 .fa-sort-up:before {
-  content: "";
+  content: "\f0de";
 }
 
 .fa-soundcloud:before {
-  content: "";
+  content: "\f1be";
 }
 
 .fa-spa:before {
-  content: "";
+  content: "\f5bb";
 }
 
 .fa-space-shuttle:before {
-  content: "";
+  content: "\f197";
 }
 
 .fa-speakap:before {
-  content: "";
+  content: "\f3f3";
 }
 
 .fa-spinner:before {
-  content: "";
+  content: "\f110";
 }
 
 .fa-splotch:before {
-  content: "";
+  content: "\f5bc";
 }
 
 .fa-spotify:before {
-  content: "";
+  content: "\f1bc";
 }
 
 .fa-spray-can:before {
-  content: "";
+  content: "\f5bd";
 }
 
 .fa-square:before {
-  content: "";
+  content: "\f0c8";
 }
 
 .fa-square-full:before {
-  content: "";
+  content: "\f45c";
 }
 
 .fa-square-root-alt:before {
-  content: "";
+  content: "\f698";
 }
 
 .fa-squarespace:before {
-  content: "";
+  content: "\f5be";
 }
 
 .fa-stack-exchange:before {
-  content: "";
+  content: "\f18d";
 }
 
 .fa-stack-overflow:before {
-  content: "";
+  content: "\f16c";
 }
 
 .fa-stamp:before {
-  content: "";
+  content: "\f5bf";
 }
 
 .fa-star:before {
-  content: "";
+  content: "\f005";
 }
 
 .fa-star-and-crescent:before {
-  content: "";
+  content: "\f699";
 }
 
 .fa-star-half:before {
-  content: "";
+  content: "\f089";
 }
 
 .fa-star-half-alt:before {
-  content: "";
+  content: "\f5c0";
 }
 
 .fa-star-of-david:before {
-  content: "";
+  content: "\f69a";
 }
 
 .fa-star-of-life:before {
-  content: "";
+  content: "\f621";
 }
 
 .fa-staylinked:before {
-  content: "";
+  content: "\f3f5";
 }
 
 .fa-steam:before {
-  content: "";
+  content: "\f1b6";
 }
 
 .fa-steam-square:before {
-  content: "";
+  content: "\f1b7";
 }
 
 .fa-steam-symbol:before {
-  content: "";
+  content: "\f3f6";
 }
 
 .fa-step-backward:before {
-  content: "";
+  content: "\f048";
 }
 
 .fa-step-forward:before {
-  content: "";
+  content: "\f051";
 }
 
 .fa-stethoscope:before {
-  content: "";
+  content: "\f0f1";
 }
 
 .fa-sticker-mule:before {
-  content: "";
+  content: "\f3f7";
 }
 
 .fa-sticky-note:before {
-  content: "";
+  content: "\f249";
 }
 
 .fa-stop:before {
-  content: "";
+  content: "\f04d";
 }
 
 .fa-stop-circle:before {
-  content: "";
+  content: "\f28d";
 }
 
 .fa-stopwatch:before {
-  content: "";
+  content: "\f2f2";
 }
 
 .fa-store:before {
-  content: "";
+  content: "\f54e";
 }
 
 .fa-store-alt:before {
-  content: "";
+  content: "\f54f";
 }
 
 .fa-strava:before {
-  content: "";
+  content: "\f428";
 }
 
 .fa-stream:before {
-  content: "";
+  content: "\f550";
 }
 
 .fa-street-view:before {
-  content: "";
+  content: "\f21d";
 }
 
 .fa-strikethrough:before {
-  content: "";
+  content: "\f0cc";
 }
 
 .fa-stripe:before {
-  content: "";
+  content: "\f429";
 }
 
 .fa-stripe-s:before {
-  content: "";
+  content: "\f42a";
 }
 
 .fa-stroopwafel:before {
-  content: "";
+  content: "\f551";
 }
 
 .fa-studiovinari:before {
-  content: "";
+  content: "\f3f8";
 }
 
 .fa-stumbleupon:before {
-  content: "";
+  content: "\f1a4";
 }
 
 .fa-stumbleupon-circle:before {
-  content: "";
+  content: "\f1a3";
 }
 
 .fa-subscript:before {
-  content: "";
+  content: "\f12c";
 }
 
 .fa-subway:before {
-  content: "";
+  content: "\f239";
 }
 
 .fa-suitcase:before {
-  content: "";
+  content: "\f0f2";
 }
 
 .fa-suitcase-rolling:before {
-  content: "";
+  content: "\f5c1";
 }
 
 .fa-sun:before {
-  content: "";
+  content: "\f185";
 }
 
 .fa-superpowers:before {
-  content: "";
+  content: "\f2dd";
 }
 
 .fa-superscript:before {
-  content: "";
+  content: "\f12b";
 }
 
 .fa-supple:before {
-  content: "";
+  content: "\f3f9";
 }
 
 .fa-surprise:before {
-  content: "";
+  content: "\f5c2";
 }
 
 .fa-swatchbook:before {
-  content: "";
+  content: "\f5c3";
 }
 
 .fa-swimmer:before {
-  content: "";
+  content: "\f5c4";
 }
 
 .fa-swimming-pool:before {
-  content: "";
+  content: "\f5c5";
 }
 
 .fa-synagogue:before {
-  content: "";
+  content: "\f69b";
 }
 
 .fa-sync:before {
-  content: "";
+  content: "\f021";
 }
 
 .fa-sync-alt:before {
-  content: "";
+  content: "\f2f1";
 }
 
 .fa-syringe:before {
-  content: "";
+  content: "\f48e";
 }
 
 .fa-table:before {
-  content: "";
+  content: "\f0ce";
 }
 
 .fa-table-tennis:before {
-  content: "";
+  content: "\f45d";
 }
 
 .fa-tablet:before {
-  content: "";
+  content: "\f10a";
 }
 
 .fa-tablet-alt:before {
-  content: "";
+  content: "\f3fa";
 }
 
 .fa-tablets:before {
-  content: "";
+  content: "\f490";
 }
 
 .fa-tachometer-alt:before {
-  content: "";
+  content: "\f3fd";
 }
 
 .fa-tag:before {
-  content: "";
+  content: "\f02b";
 }
 
 .fa-tags:before {
-  content: "";
+  content: "\f02c";
 }
 
 .fa-tape:before {
-  content: "";
+  content: "\f4db";
 }
 
 .fa-tasks:before {
-  content: "";
+  content: "\f0ae";
 }
 
 .fa-taxi:before {
-  content: "";
+  content: "\f1ba";
 }
 
 .fa-teamspeak:before {
-  content: "";
+  content: "\f4f9";
 }
 
 .fa-teeth:before {
-  content: "";
+  content: "\f62e";
 }
 
 .fa-teeth-open:before {
-  content: "";
+  content: "\f62f";
 }
 
 .fa-telegram:before {
-  content: "";
+  content: "\f2c6";
 }
 
 .fa-telegram-plane:before {
-  content: "";
+  content: "\f3fe";
 }
 
 .fa-tencent-weibo:before {
-  content: "";
+  content: "\f1d5";
 }
 
 .fa-terminal:before {
-  content: "";
+  content: "\f120";
 }
 
 .fa-text-height:before {
-  content: "";
+  content: "\f034";
 }
 
 .fa-text-width:before {
-  content: "";
+  content: "\f035";
 }
 
 .fa-th:before {
-  content: "";
+  content: "\f00a";
 }
 
 .fa-th-large:before {
-  content: "";
+  content: "\f009";
 }
 
 .fa-th-list:before {
-  content: "";
+  content: "\f00b";
 }
 
 .fa-the-red-yeti:before {
-  content: "";
+  content: "\f69d";
 }
 
 .fa-theater-masks:before {
-  content: "";
+  content: "\f630";
 }
 
 .fa-themeco:before {
-  content: "";
+  content: "\f5c6";
 }
 
 .fa-themeisle:before {
-  content: "";
+  content: "\f2b2";
 }
 
 .fa-thermometer:before {
-  content: "";
+  content: "\f491";
 }
 
 .fa-thermometer-empty:before {
-  content: "";
+  content: "\f2cb";
 }
 
 .fa-thermometer-full:before {
-  content: "";
+  content: "\f2c7";
 }
 
 .fa-thermometer-half:before {
-  content: "";
+  content: "\f2c9";
 }
 
 .fa-thermometer-quarter:before {
-  content: "";
+  content: "\f2ca";
 }
 
 .fa-thermometer-three-quarters:before {
-  content: "";
+  content: "\f2c8";
 }
 
 .fa-thumbs-down:before {
-  content: "";
+  content: "\f165";
 }
 
 .fa-thumbs-up:before {
-  content: "";
+  content: "\f164";
 }
 
 .fa-thumbtack:before {
-  content: "";
+  content: "\f08d";
 }
 
 .fa-ticket-alt:before {
-  content: "";
+  content: "\f3ff";
 }
 
 .fa-times:before {
-  content: "";
+  content: "\f00d";
 }
 
 .fa-times-circle:before {
-  content: "";
+  content: "\f057";
 }
 
 .fa-tint:before {
-  content: "";
+  content: "\f043";
 }
 
 .fa-tint-slash:before {
-  content: "";
+  content: "\f5c7";
 }
 
 .fa-tired:before {
-  content: "";
+  content: "\f5c8";
 }
 
 .fa-toggle-off:before {
-  content: "";
+  content: "\f204";
 }
 
 .fa-toggle-on:before {
-  content: "";
+  content: "\f205";
 }
 
 .fa-toolbox:before {
-  content: "";
+  content: "\f552";
 }
 
 .fa-tooth:before {
-  content: "";
+  content: "\f5c9";
 }
 
 .fa-torah:before {
-  content: "";
+  content: "\f6a0";
 }
 
 .fa-torii-gate:before {
-  content: "";
+  content: "\f6a1";
 }
 
 .fa-trade-federation:before {
-  content: "";
+  content: "\f513";
 }
 
 .fa-trademark:before {
-  content: "";
+  content: "\f25c";
 }
 
 .fa-traffic-light:before {
-  content: "";
+  content: "\f637";
 }
 
 .fa-train:before {
-  content: "";
+  content: "\f238";
 }
 
 .fa-transgender:before {
-  content: "";
+  content: "\f224";
 }
 
 .fa-transgender-alt:before {
-  content: "";
+  content: "\f225";
 }
 
 .fa-trash:before {
-  content: "";
+  content: "\f1f8";
 }
 
 .fa-trash-alt:before {
-  content: "";
+  content: "\f2ed";
 }
 
 .fa-tree:before {
-  content: "";
+  content: "\f1bb";
 }
 
 .fa-trello:before {
-  content: "";
+  content: "\f181";
 }
 
 .fa-tripadvisor:before {
-  content: "";
+  content: "\f262";
 }
 
 .fa-trophy:before {
-  content: "";
+  content: "\f091";
 }
 
 .fa-truck:before {
-  content: "";
+  content: "\f0d1";
 }
 
 .fa-truck-loading:before {
-  content: "";
+  content: "\f4de";
 }
 
 .fa-truck-monster:before {
-  content: "";
+  content: "\f63b";
 }
 
 .fa-truck-moving:before {
-  content: "";
+  content: "\f4df";
 }
 
 .fa-truck-pickup:before {
-  content: "";
+  content: "\f63c";
 }
 
 .fa-tshirt:before {
-  content: "";
+  content: "\f553";
 }
 
 .fa-tty:before {
-  content: "";
+  content: "\f1e4";
 }
 
 .fa-tumblr:before {
-  content: "";
+  content: "\f173";
 }
 
 .fa-tumblr-square:before {
-  content: "";
+  content: "\f174";
 }
 
 .fa-tv:before {
-  content: "";
+  content: "\f26c";
 }
 
 .fa-twitch:before {
-  content: "";
+  content: "\f1e8";
 }
 
 .fa-twitter:before {
-  content: "";
+  content: "\f099";
 }
 
 .fa-twitter-square:before {
-  content: "";
+  content: "\f081";
 }
 
 .fa-typo3:before {
-  content: "";
+  content: "\f42b";
 }
 
 .fa-uber:before {
-  content: "";
+  content: "\f402";
 }
 
 .fa-uikit:before {
-  content: "";
+  content: "\f403";
 }
 
 .fa-umbrella:before {
-  content: "";
+  content: "\f0e9";
 }
 
 .fa-umbrella-beach:before {
-  content: "";
+  content: "\f5ca";
 }
 
 .fa-underline:before {
-  content: "";
+  content: "\f0cd";
 }
 
 .fa-undo:before {
-  content: "";
+  content: "\f0e2";
 }
 
 .fa-undo-alt:before {
-  content: "";
+  content: "\f2ea";
 }
 
 .fa-uniregistry:before {
-  content: "";
+  content: "\f404";
 }
 
 .fa-universal-access:before {
-  content: "";
+  content: "\f29a";
 }
 
 .fa-university:before {
-  content: "";
+  content: "\f19c";
 }
 
 .fa-unlink:before {
-  content: "";
+  content: "\f127";
 }
 
 .fa-unlock:before {
-  content: "";
+  content: "\f09c";
 }
 
 .fa-unlock-alt:before {
-  content: "";
+  content: "\f13e";
 }
 
 .fa-untappd:before {
-  content: "";
+  content: "\f405";
 }
 
 .fa-upload:before {
-  content: "";
+  content: "\f093";
 }
 
 .fa-usb:before {
-  content: "";
+  content: "\f287";
 }
 
 .fa-user:before {
-  content: "";
+  content: "\f007";
 }
 
 .fa-user-alt:before {
-  content: "";
+  content: "\f406";
 }
 
 .fa-user-alt-slash:before {
-  content: "";
+  content: "\f4fa";
 }
 
 .fa-user-astronaut:before {
-  content: "";
+  content: "\f4fb";
 }
 
 .fa-user-check:before {
-  content: "";
+  content: "\f4fc";
 }
 
 .fa-user-circle:before {
-  content: "";
+  content: "\f2bd";
 }
 
 .fa-user-clock:before {
-  content: "";
+  content: "\f4fd";
 }
 
 .fa-user-cog:before {
-  content: "";
+  content: "\f4fe";
 }
 
 .fa-user-edit:before {
-  content: "";
+  content: "\f4ff";
 }
 
 .fa-user-friends:before {
-  content: "";
+  content: "\f500";
 }
 
 .fa-user-graduate:before {
-  content: "";
+  content: "\f501";
 }
 
 .fa-user-lock:before {
-  content: "";
+  content: "\f502";
 }
 
 .fa-user-md:before {
-  content: "";
+  content: "\f0f0";
 }
 
 .fa-user-minus:before {
-  content: "";
+  content: "\f503";
 }
 
 .fa-user-ninja:before {
-  content: "";
+  content: "\f504";
 }
 
 .fa-user-plus:before {
-  content: "";
+  content: "\f234";
 }
 
 .fa-user-secret:before {
-  content: "";
+  content: "\f21b";
 }
 
 .fa-user-shield:before {
-  content: "";
+  content: "\f505";
 }
 
 .fa-user-slash:before {
-  content: "";
+  content: "\f506";
 }
 
 .fa-user-tag:before {
-  content: "";
+  content: "\f507";
 }
 
 .fa-user-tie:before {
-  content: "";
+  content: "\f508";
 }
 
 .fa-user-times:before {
-  content: "";
+  content: "\f235";
 }
 
 .fa-users:before {
-  content: "";
+  content: "\f0c0";
 }
 
 .fa-users-cog:before {
-  content: "";
+  content: "\f509";
 }
 
 .fa-ussunnah:before {
-  content: "";
+  content: "\f407";
 }
 
 .fa-utensil-spoon:before {
-  content: "";
+  content: "\f2e5";
 }
 
 .fa-utensils:before {
-  content: "";
+  content: "\f2e7";
 }
 
 .fa-vaadin:before {
-  content: "";
+  content: "\f408";
 }
 
 .fa-vector-square:before {
-  content: "";
+  content: "\f5cb";
 }
 
 .fa-venus:before {
-  content: "";
+  content: "\f221";
 }
 
 .fa-venus-double:before {
-  content: "";
+  content: "\f226";
 }
 
 .fa-venus-mars:before {
-  content: "";
+  content: "\f228";
 }
 
 .fa-viacoin:before {
-  content: "";
+  content: "\f237";
 }
 
 .fa-viadeo:before {
-  content: "";
+  content: "\f2a9";
 }
 
 .fa-viadeo-square:before {
-  content: "";
+  content: "\f2aa";
 }
 
 .fa-vial:before {
-  content: "";
+  content: "\f492";
 }
 
 .fa-vials:before {
-  content: "";
+  content: "\f493";
 }
 
 .fa-viber:before {
-  content: "";
+  content: "\f409";
 }
 
 .fa-video:before {
-  content: "";
+  content: "\f03d";
 }
 
 .fa-video-slash:before {
-  content: "";
+  content: "\f4e2";
 }
 
 .fa-vihara:before {
-  content: "";
+  content: "\f6a7";
 }
 
 .fa-vimeo:before {
-  content: "";
+  content: "\f40a";
 }
 
 .fa-vimeo-square:before {
-  content: "";
+  content: "\f194";
 }
 
 .fa-vimeo-v:before {
-  content: "";
+  content: "\f27d";
 }
 
 .fa-vine:before {
-  content: "";
+  content: "\f1ca";
 }
 
 .fa-vk:before {
-  content: "";
+  content: "\f189";
 }
 
 .fa-vnv:before {
-  content: "";
+  content: "\f40b";
 }
 
 .fa-volleyball-ball:before {
-  content: "";
+  content: "\f45f";
 }
 
 .fa-volume-down:before {
-  content: "";
+  content: "\f027";
 }
 
 .fa-volume-off:before {
-  content: "";
+  content: "\f026";
 }
 
 .fa-volume-up:before {
-  content: "";
+  content: "\f028";
 }
 
 .fa-vuejs:before {
-  content: "";
+  content: "\f41f";
 }
 
 .fa-walking:before {
-  content: "";
+  content: "\f554";
 }
 
 .fa-wallet:before {
-  content: "";
+  content: "\f555";
 }
 
 .fa-warehouse:before {
-  content: "";
+  content: "\f494";
 }
 
 .fa-weebly:before {
-  content: "";
+  content: "\f5cc";
 }
 
 .fa-weibo:before {
-  content: "";
+  content: "\f18a";
 }
 
 .fa-weight:before {
-  content: "";
+  content: "\f496";
 }
 
 .fa-weight-hanging:before {
-  content: "";
+  content: "\f5cd";
 }
 
 .fa-weixin:before {
-  content: "";
+  content: "\f1d7";
 }
 
 .fa-whatsapp:before {
-  content: "";
+  content: "\f232";
 }
 
 .fa-whatsapp-square:before {
-  content: "";
+  content: "\f40c";
 }
 
 .fa-wheelchair:before {
-  content: "";
+  content: "\f193";
 }
 
 .fa-whmcs:before {
-  content: "";
+  content: "\f40d";
 }
 
 .fa-wifi:before {
-  content: "";
+  content: "\f1eb";
 }
 
 .fa-wikipedia-w:before {
-  content: "";
+  content: "\f266";
 }
 
 .fa-window-close:before {
-  content: "";
+  content: "\f410";
 }
 
 .fa-window-maximize:before {
-  content: "";
+  content: "\f2d0";
 }
 
 .fa-window-minimize:before {
-  content: "";
+  content: "\f2d1";
 }
 
 .fa-window-restore:before {
-  content: "";
+  content: "\f2d2";
 }
 
 .fa-windows:before {
-  content: "";
+  content: "\f17a";
 }
 
 .fa-wine-glass:before {
-  content: "";
+  content: "\f4e3";
 }
 
 .fa-wine-glass-alt:before {
-  content: "";
+  content: "\f5ce";
 }
 
 .fa-wix:before {
-  content: "";
+  content: "\f5cf";
 }
 
 .fa-wolf-pack-battalion:before {
-  content: "";
+  content: "\f514";
 }
 
 .fa-won-sign:before {
-  content: "";
+  content: "\f159";
 }
 
 .fa-wordpress:before {
-  content: "";
+  content: "\f19a";
 }
 
 .fa-wordpress-simple:before {
-  content: "";
+  content: "\f411";
 }
 
 .fa-wpbeginner:before {
-  content: "";
+  content: "\f297";
 }
 
 .fa-wpexplorer:before {
-  content: "";
+  content: "\f2de";
 }
 
 .fa-wpforms:before {
-  content: "";
+  content: "\f298";
 }
 
 .fa-wrench:before {
-  content: "";
+  content: "\f0ad";
 }
 
 .fa-x-ray:before {
-  content: "";
+  content: "\f497";
 }
 
 .fa-xbox:before {
-  content: "";
+  content: "\f412";
 }
 
 .fa-xing:before {
-  content: "";
+  content: "\f168";
 }
 
 .fa-xing-square:before {
-  content: "";
+  content: "\f169";
 }
 
 .fa-y-combinator:before {
-  content: "";
+  content: "\f23b";
 }
 
 .fa-yahoo:before {
-  content: "";
+  content: "\f19e";
 }
 
 .fa-yandex:before {
-  content: "";
+  content: "\f413";
 }
 
 .fa-yandex-international:before {
-  content: "";
+  content: "\f414";
 }
 
 .fa-yelp:before {
-  content: "";
+  content: "\f1e9";
 }
 
 .fa-yen-sign:before {
-  content: "";
+  content: "\f157";
 }
 
 .fa-yin-yang:before {
-  content: "";
+  content: "\f6ad";
 }
 
 .fa-yoast:before {
-  content: "";
+  content: "\f2b1";
 }
 
 .fa-youtube:before {
-  content: "";
+  content: "\f167";
 }
 
 .fa-youtube-square:before {
-  content: "";
+  content: "\f431";
 }
 
 .fa-zhihu:before {
-  content: "";
+  content: "\f63f";
 }
 
 .sr-only {
@@ -5353,22 +5353,22 @@ and open the template in the editor.
   color: #E5E5E5;
 }
 .enka-custom-radio.star::before {
-  content: "";
+  content: "\f005";
 }
 .enka-custom-radio.thumb::before {
-  content: "";
+  content: "\f164";
 }
 .enka-custom-radio.smiley::before {
-  content: "";
+  content: "\f118";
 }
 .enka-custom-radio.heart::before {
-  content: "";
+  content: "\f004";
 }
 .enka-custom-radio.flag::before {
-  content: "";
+  content: "\f024";
 }
 .enka-custom-radio.user::before {
-  content: "";
+  content: "\f007";
 }
 
 /* visual analog scale - radio buttons */
@@ -5379,25 +5379,25 @@ and open the template in the editor.
   color: #E5E5E5;
 }
 .enka-vizualna-skala.siv-61::before, .enka-vizualna-skala.siv-71::before {
-  content: "";
+  content: "\f5b4";
 }
 .enka-vizualna-skala.siv-41::before, .enka-vizualna-skala.siv-51::before, .enka-vizualna-skala.siv-62::before, .enka-vizualna-skala.siv-72::before {
-  content: "";
+  content: "\f57a";
 }
 .enka-vizualna-skala.siv-21::before, .enka-vizualna-skala.siv-31::before, .enka-vizualna-skala.siv-42::before, .enka-vizualna-skala.siv-52::before, .enka-vizualna-skala.siv-63::before, .enka-vizualna-skala.siv-73::before {
-  content: "";
+  content: "\f119";
 }
 .enka-vizualna-skala.siv-32::before, .enka-vizualna-skala.siv-53::before, .enka-vizualna-skala.siv-74::before {
-  content: "";
+  content: "\f11a";
 }
 .enka-vizualna-skala.siv-22::before, .enka-vizualna-skala.siv-33::before, .enka-vizualna-skala.siv-43::before, .enka-vizualna-skala.siv-54::before, .enka-vizualna-skala.siv-64::before, .enka-vizualna-skala.siv-75::before {
-  content: "";
+  content: "\f118";
 }
 .enka-vizualna-skala.siv-44::before, .enka-vizualna-skala.siv-55::before, .enka-vizualna-skala.siv-65::before, .enka-vizualna-skala.siv-76::before {
-  content: "";
+  content: "\f580";
 }
 .enka-vizualna-skala.siv-66::before, .enka-vizualna-skala.siv-77::before {
-  content: "";
+  content: "\f59c";
 }
 
 /*
@@ -5411,88 +5411,88 @@ and open the template in the editor.
 */
 /* icons */
 span.faicon.plus::before {
-  content: "";
+  content: "\f067";
 }
 
 span.faicon.minus::before {
-  content: "";
+  content: "\f068";
 }
 
 span.faicon.success::before,
 span.circle-check::before {
-  content: "";
+  content: "\f058";
 }
 
 span.faicon.close::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f057";
 }
 
 span.faicon.dropdown_blue::before {
   font-size: 16px;
-  content: "";
+  content: "\f13a";
 }
 
 span.faicon.dropup_blue::before {
   font-size: 16px;
-  content: "";
+  content: "\f139";
 }
 
 span.faicon.arrow_back::before {
   font-weight: 600;
   font-size: 16px;
-  content: "";
+  content: "\f137";
 }
 
 span.faicon.add::before {
   font-size: 18px;
-  content: "";
+  content: "\f055";
 }
 
 span.faicon.remove::before {
   font-size: 18px;
-  content: "";
+  content: "\f056";
 }
 
 span.faicon.delete::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f2ed";
 }
 
 span.faicon.anketa_delete::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f2ed";
 }
 
 span.faicon.copy::before {
   font-size: 18px;
-  content: "";
+  content: "\f0c5";
   font-weight: 400;
 }
 
 span.faicon.anketa_copy::before {
   font-size: 24px;
-  content: "";
+  content: "\f0c5";
   font-weight: 400;
 }
 
 span.faicon.export::before {
   font-size: 24px;
-  content: "";
+  content: "\f56e";
 }
 
 span.faicon.file-import::before {
-  content: "";
+  content: "\f56f";
   transform: scaleX(-1);
 }
 
 span.faicon.import::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f1c2";
 }
 
 /*span.faicon.import::after{
@@ -5502,137 +5502,137 @@ span.faicon.import::before {
 }*/
 span.faicon.library::before {
   font-size: 24px;
-  content: "";
+  content: "\f518";
 }
 
 span.faicon.folder::before {
   font-size: 16px;
   font-weight: 600;
-  content: "";
+  content: "\f07b";
 }
 
 span.faicon.folder_empty::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f07b";
 }
 
 span.faicon.after.sort_down_arrow::after {
-  content: "";
+  content: "\f0d7";
   margin-left: 5px;
 }
 
 span.faicon.after.sort_up_arrow::after {
-  content: "";
+  content: "\f0d8";
   margin-left: 5px;
 }
 
 span.faicon.info::before {
   font-size: 28px;
-  content: "";
+  content: "\f05a";
   vertical-align: middle;
 }
 
 span.faicon.pagination_left::before {
   margin: 0 1px 0 1px;
-  content: "";
+  content: "\f104";
 }
 
 span.faicon.pagination_right::before {
   margin: 0 0 0 1px;
-  content: "";
+  content: "\f105";
 }
 
 span.faicon.edit::before,
 span.faicon.edit2::before {
-  content: "";
+  content: "\f304";
 }
 
 span.faicon.refresh::before {
   font-size: 18px;
-  content: "";
+  content: "\f2f1";
 }
 
 span.faicon.filter::before {
   font-size: 18px;
-  content: "";
+  content: "\f0b0";
 }
 
 span.faicon.grip::before {
-  content: "";
+  content: "\f58e";
 }
 
 span.faicon.star::before,
 span.faicon.star_off::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.star_on::before {
   font-size: 14px;
   font-weight: 700;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.search::before {
   font-size: 20px;
-  content: "";
+  content: "\f002";
 }
 
 span.faicon.clipboard_notes::before {
   font-size: 20px;
-  content: "";
+  content: "\f46d";
 }
 
 span.faicon.help2::before {
   font-size: 20px;
-  content: "";
+  content: "\f059";
 }
 
 span.faicon.user::before {
   font-size: 18px;
-  content: "";
+  content: "\f007";
 }
 
 span.faicon.logout::before {
   font-size: 20px;
-  content: "";
+  content: "\f2f5";
 }
 
 .faicon.monitor::before {
-  content: "";
+  content: "\f108";
 }
 
 .faicon.mobile::before {
-  content: "";
+  content: "\f3cd";
 }
 
 .faicon.tablet::before {
-  content: "";
+  content: "\f3fa";
 }
 
 span.faicon.users::before {
-  content: "";
+  content: "\f500";
 }
 
 span.faicon.lock_open::before {
-  content: "";
+  content: "\f3c1";
 }
 
 span.faicon.lock_close::before {
-  content: "";
+  content: "\f023";
 }
 
 span.faicon.bottom_saving::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f0c7";
 }
 
 span.faicon.bottom_publish::before {
   font-size: 24px;
-  content: "";
+  content: "\f093";
 }
 
 span.faicon.bottom_preview {
@@ -5642,63 +5642,63 @@ span.faicon.bottom_preview {
 span.faicon.bottom_preview::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f15b";
 }
 
 span.faicon.bottom_preview::after {
   font-size: 14px;
-  content: "";
+  content: "\f002";
   display: inline-block;
   margin-left: -70%;
 }
 
 span.faicon.bottom_test::before {
   font-size: 24px;
-  content: "";
+  content: "\f492";
 }
 
 span.faicon.language::before {
   font-size: 24px;
-  content: "";
+  content: "\f0ac";
 }
 
 span.faicon.mobile_off::before {
   font-size: 24px;
-  content: "";
+  content: "\f3cd";
 }
 
 span.faicon.mobile_off::after {
   font-size: 24px;
-  content: "";
+  content: "\f715";
   margin-left: -23px;
 }
 
 span.faicon.comments::before {
-  content: "";
+  content: "\f27a";
   font-weight: 700;
 }
 
 span.faicon.comments_empty::before {
-  content: "";
+  content: "\f27a";
   font-weight: 400;
 }
 
 span.faicon.data_link::before {
-  content: "";
+  content: "\f0c1";
 }
 
 span.faicon.data_link_small::before {
-  content: "";
+  content: "\f0c1";
 }
 
 span.faicon.print::before {
   font-size: 24px;
-  content: "";
+  content: "\f02f";
 }
 
 span.faicon.print_small::before {
   font-size: 16px;
-  content: "";
+  content: "\f02f";
 }
 
 span.faicon.preview {
@@ -5708,11 +5708,11 @@ span.faicon.preview {
 span.faicon.preview::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f15b";
 }
 
 span.faicon.preview::after {
-  content: "";
+  content: "\f002";
   display: inline-block;
   font-size: 11px;
   margin-left: -50%;
@@ -5720,87 +5720,87 @@ span.faicon.preview::after {
 
 span.faicon.palette::before {
   font-size: 18px;
-  content: "";
+  content: "\f53f";
 }
 
 span.faicon.inline_comment::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f075";
 }
 
 span.faicon.inline_double_comment::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f086";
 }
 
 span.faicon.comments_creport::before {
   font-size: 16px;
-  content: "";
+  content: "\f086";
 }
 
 span.faicon.compress::before {
   font-size: 15px;
-  content: "";
+  content: "\f066";
 }
 
 span.faicon.expand::before {
   font-size: 15px;
-  content: "";
+  content: "\f065";
 }
 
 span.faicon.hashtag::before {
   font-size: 15px;
-  content: "";
+  content: "\f292";
 }
 
 span.faicon.bug::before {
   font-size: 15px;
-  content: "";
+  content: "\f188";
 }
 
 span.faicon.paragraph::before {
   font-size: 15px;
-  content: "";
+  content: "\f1dd";
 }
 
 span.faicon.replace::before {
   font-size: 15px;
-  content: "";
+  content: "\f362";
 }
 
 span.faicon.plus_square::before {
   font-size: 15px;
   font-weight: 400;
-  content: "";
+  content: "\f0fe";
 }
 
 span.faicon.minus_square::before {
   font-size: 15px;
   font-weight: 400;
-  content: "";
+  content: "\f146";
 }
 
 span.faicon.delete_circle::before {
   font-size: 14px;
-  content: "";
+  content: "\f056";
 }
 
 span.faicon.quick_view::before {
   font-size: 15px;
   font-weight: 400;
-  content: "";
+  content: "\f06e";
 }
 
 span.faicon.edit_square::before {
   font-size: 15px;
-  content: "";
+  content: "\f044";
 }
 
 span.faicon.test::before {
   font-size: 15px;
-  content: "";
+  content: "\f492";
 }
 
 a.faicon.if_add {
@@ -5836,7 +5836,7 @@ span.faicon.if_add:hover:before {
 }
 
 span.faicon.text_file::before {
-  content: "";
+  content: "\f15c";
 }
 
 span.faicon.text_file_small {
@@ -5846,40 +5846,40 @@ span.faicon.text_file_small {
 span.faicon.text_file_small:before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f15c";
 }
 
 span.faicon.warning::before {
   font-size: 16px;
-  content: "";
+  content: "\f071";
 }
 
 span.faicon.users_small::before {
   font-size: 16px;
-  content: "";
+  content: "\f0c0";
 }
 
 span.faicon.popup_0::before {
   font-size: 14px;
-  content: "";
+  content: "\f065";
   color: #1E88E5;
 }
 
 span.faicon.popup_1::before {
   font-size: 14px;
-  content: "";
+  content: "\f065";
   color: #0059ab;
 }
 
 span.faicon.flat_0::before {
   font-size: 14px;
-  content: "";
+  content: "\f03c";
   color: #0059ab;
 }
 
 span.faicon.flat_1::before {
   font-size: 14px;
-  content: "";
+  content: "\f03c";
   color: #1E88E5;
 }
 
@@ -5894,46 +5894,46 @@ span.basic-icon.spss::before {
 span.faicon.external_link::before {
   font-size: 14px;
   font-weight: 600;
-  content: "";
+  content: "\f35d";
 }
 
 span.faicon.cog_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "";
+  content: "\f013";
 }
 
 span.faicon.chart_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "";
+  content: "\f201";
 }
 
 span.faicon.reload_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "";
+  content: "\f021";
 }
 
 span.faicon.chart::before {
-  content: "";
+  content: "\f080";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.data::before {
-  content: "";
+  content: "\f1c0";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.publish::before {
-  content: "";
+  content: "\f093";
   font-size: 16px;
 }
 
 span.faicon.test::before {
-  content: "";
+  content: "\f492";
   font-size: 16px;
 }
 
@@ -5943,63 +5943,63 @@ button.ui-datepicker-trigger::before {
   font-family: "Font Awesome 5 Free";
   font-weight: 400;
   font-size: 16px;
-  content: "";
+  content: "\f073";
 }
 
 /* ARROWS */
 span.faicon.arrow_up::before {
   font-size: 14px;
-  content: "";
+  content: "\f062";
 }
 
 span.faicon.arrow2_r::before {
   font-size: 14px;
-  content: "";
+  content: "\f054";
 }
 
 span.faicon.arrow2_l::before {
   font-size: 14px;
-  content: "";
+  content: "\f053";
 }
 
 span.faicon.arrow2_d::before {
   font-size: 14px;
-  content: "";
+  content: "\f078";
 }
 
 span.faicon.arrow2_u::before {
   font-size: 14px;
-  content: "";
+  content: "\f077";
 }
 
 span.faicon.arrow_large2_r::before {
   font-size: 35px;
-  content: "";
+  content: "\f054";
 }
 
 span.faicon.arrow_large2_l::before {
   font-size: 35px;
-  content: "";
+  content: "\f053";
 }
 
 span.faicon.arrow_verylarge2_r::before {
   font-size: 40px;
-  content: "";
+  content: "\f054";
 }
 
 span.faicon.arrow_verylarge2_l::before {
   font-size: 40px;
-  content: "";
+  content: "\f053";
 }
 
 span.faicon.sort_descending::before {
   font-size: 14px;
-  content: "";
+  content: "\f0d7";
 }
 
 span.faicon.sort_ascending::before {
   font-size: 14px;
-  content: "";
+  content: "\f0d8";
 }
 
 /* Plus/minus sqare */
@@ -6011,127 +6011,127 @@ span.folder_plusminus {
 span.faicon.plus_orange::before {
   font-size: 12px;
   font-weight: 400;
-  content: "";
+  content: "\f0fe";
 }
 
 span.faicon.minus_orange::before {
   font-size: 12px;
   font-weight: 400;
-  content: "";
+  content: "\f146";
 }
 
 /* Spinner */
 span.faicon.spinner::before {
   font-size: 18px;
-  content: "";
+  content: "\f1ce";
 }
 
 /* Bars - mobile menu */
 span.faicon.bars::before {
   font-size: 26px;
-  content: "";
+  content: "\f0c9";
 }
 
 span.faicon.lock_open::before {
-  content: "";
+  content: "\f3c1";
 }
 
 span.faicon.lock_close::before {
-  content: "";
+  content: "\f023";
 }
 
 span.faicon.bell::before {
-  content: "";
+  content: "\f0f3";
 }
 
 span.faicon.bell_slash::before {
-  content: "";
+  content: "\f1f6";
 }
 
 span.faicon.trash::before {
-  content: "";
+  content: "\f2ed";
 }
 
 span.faicon.copy::before {
-  content: "";
+  content: "\f0c5";
 }
 
 span.faicon.circle::before {
-  content: "";
+  content: "\f111";
   vertical-align: middle;
 }
 
 span.faicon.plus::before {
-  content: "";
+  content: "\f067";
 }
 
 span.faicon.plus_circle::before {
-  content: "";
+  content: "\f055";
 }
 
 span.faicon.minus_circle::before {
-  content: "";
+  content: "\f056";
 }
 
 span.faicon.calendar_icon::before {
-  content: "";
+  content: "\f073";
 }
 
 span.faicon.clipboard::before {
-  content: "";
+  content: "\f328";
 }
 
 span.faicon.list-alt::before {
-  content: "";
+  content: "\f022";
 }
 
 span.faicon.vote-yes::before {
-  content: "";
+  content: "\f772";
 }
 
 span.faicon.file-preview::before {
-  content: "";
+  content: "\f865";
 }
 
 span.faicon.dots::before {
-  content: "";
+  content: "\f141";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.dots_ver:before {
-  content: "";
+  content: "\f142";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.open_icon::before,
 a.faicon.open_icon::before {
-  content: "";
+  content: "\f35d";
 }
 
 span.faicon.table_icon::before {
-  content: "";
+  content: "\f0ce";
 }
 
 span.faicon.list::before {
-  content: "";
+  content: "\f03a";
 }
 
 span.faicon.link-chain::before {
-  content: "";
+  content: "\f0c1";
 }
 
 span.fa-brands.html5::before {
-  content: "";
+  content: "\f13b";
 }
 
 span.faicon.stopwatch20::before {
-  content: "";
+  content: "\e06f";
 }
 
 span.faicon.checkbox-empty::before {
-  content: "";
+  content: "\f0c8";
   font-weight: 400 !important;
 }
 
@@ -6140,11 +6140,11 @@ span.faicon.fa-1::before {
 }
 
 span.faicon.phone::before {
-  content: "";
+  content: "\f095";
 }
 
 span.faicon.screwdriver::before {
-  content: "";
+  content: "\f7d9";
   font-weight: 600 !important;
 }
 
@@ -6282,23 +6282,23 @@ and open the template in the editor.
 */
 /* Toolbox na levi strani */
 span.faicon.wheel_32::before {
-  content: "";
+  content: "\f013";
 }
 
 span.faicon.radio_32::before {
-  content: "";
+  content: "\f192";
   font-weight: 400;
   font-size: 18px;
 }
 
 span.faicon.check_32::before {
-  content: "";
+  content: "\f14a";
   font-weight: 400;
   font-size: 18px;
 }
 
 span.faicon.matrix_32::before {
-  content: "\a";
+  content: "\f192\f192\a\f192\f192";
   white-space: pre;
   font-weight: 400;
   font-size: 12px;
@@ -6322,7 +6322,7 @@ span.faicon.nagovor::before {
 }
 
 span.faicon.plus_32::before {
-  content: "";
+  content: "\f055";
   font-size: 18px;
 }
 
@@ -6366,12 +6366,12 @@ span.faicon.edit-vprasanje {
 }
 span.faicon.edit-vprasanje:before {
   font-size: 18px;
-  content: "";
+  content: "\f031";
 }
 
 a.faicon.edit::before {
   font-size: 16px;
-  content: "";
+  content: "\f304";
 }
 
 a.faicon.addif::before {
@@ -6383,22 +6383,22 @@ a.faicon.addif::before {
 a.faicon.copy::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f0c5";
 }
 
 a.faicon.copycond::before {
   font-size: 18px;
-  content: "";
+  content: "\f0c5";
 }
 
 a.faicon.preview::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f15b";
 }
 
 a.faicon.preview::after {
-  content: "";
+  content: "\f002";
   display: inline-block;
   font-size: 11px;
   margin-left: -50%;
@@ -6406,25 +6406,25 @@ a.faicon.preview::after {
 
 a.faicon.arhiv::before {
   font-size: 18px;
-  content: "";
+  content: "\f044";
 }
 
 a.faicon.delete::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f2ed";
 }
 
 a.faicon.hide::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f06e";
 }
 
 a.faicon.unhide_icon::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f070";
 }
 
 /* Urejanje vrednosti inline */
@@ -6438,12 +6438,12 @@ a.faicon.unhide_icon::before {
 
 .variabla span.inline.faicon.edit2::before {
   font-size: 14px;
-  content: "";
+  content: "\f304";
 }
 
 .variabla span.inline.faicon.odg_hidden::before {
   font-size: 14px;
-  content: "";
+  content: "\f05e";
 }
 
 .variabla span.inline.faicon.odg_hidden.show-hidden::before {
@@ -6471,23 +6471,23 @@ span.inline.faicon.odg_if_not::before {
 .variabla span.inline.faicon.odg_if_follow::after {
   font-size: 14px;
   margin-left: 2px;
-  content: "";
+  content: "\f0da";
 }
 
 .variabla span.inline.faicon.correct::before {
   font-size: 14px;
   font-weight: 900;
-  content: "";
+  content: "\f00c";
 }
 
 .faicon.move_updown::before {
   font-size: 16px;
   color: #0059ab;
-  content: "";
+  content: "\f338";
 }
 
 .faicon.image_upload::before {
-  content: "";
+  content: "\f03e";
   font-weight: 400;
 }
 
@@ -6504,22 +6504,22 @@ and open the template in the editor.
 span.faicon.mapca.anketa::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f022";
 }
 
 span.faicon.table::before {
   font-size: 16px;
-  content: "";
+  content: "\f00b";
 }
 
 span.faicon.other_vprasanja::before {
   font-size: 16px;
-  content: "" !important;
+  content: "\f0ca" !important;
 }
 
 span.faicon.osnovna_vprasanja::before {
   font-size: 16px;
-  content: "";
+  content: "\f0ca";
 }
 
 span.faicon.mapca.if::before {
@@ -6547,7 +6547,7 @@ and open the template in the editor.
 */
 /* Izvozi */
 span.faicon.pdf::before {
-  content: "";
+  content: "\f1c1";
   font-size: 16px;
   font-weight: 400;
   color: #ed1c24;
@@ -6571,7 +6571,7 @@ span.faicon.pdf.black::before {
 span.faicon.xls::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c3";
   color: #008000;
 }
 
@@ -6593,7 +6593,7 @@ span.faicon.xls.black::before {
 span.faicon.rtf::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c2";
   color: #0f3ea8;
 }
 
@@ -6615,7 +6615,7 @@ span.faicon.rtf.black::before {
 span.faicon.ppt::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c4";
   color: #fa4913;
 }
 
@@ -6637,7 +6637,7 @@ span.faicon.ppt.black::before {
 span.faicon.xml::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c9";
   color: #00a000;
 }
 
@@ -6657,17 +6657,17 @@ span.faicon.xml.black::before {
 }
 
 span.faicon.arhiv::before {
-  content: "";
+  content: "\f187";
 }
 
 span.faicon.arhiv_mail::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f14d";
 }
 
 span.faicon.share-arrow::before {
-  content: "";
+  content: "\f14d";
 }
 
 /*
@@ -6717,7 +6717,7 @@ span.faicon.an_chart_bar::before {
   font-size: 14px;
   font-weight: 700;
   /*content: "\f080";*/
-  content: "";
+  content: "\f200";
 }
 
 /*
@@ -6731,35 +6731,35 @@ and open the template in the editor.
 */
 /* Invitation table */
 span.faicon.inv_sent_0::before {
-  content: "";
+  content: "\f2b6";
 }
 
 span.faicon.inv_sent_1::before {
-  content: "";
+  content: "\f0e0";
 }
 
 span.faicon.inv_responded_0::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.inv_responded_1::before {
   font-size: 14px;
   font-weight: 700;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.inv_unsubscribed_0::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f111";
 }
 
 span.faicon.inv_unsubscribed_1::before {
   font-size: 14px;
   font-weight: 700;
-  content: "";
+  content: "\f111";
   color: #FF0000;
 }
 
@@ -6860,7 +6860,7 @@ a.read-more .faicon:before {
 .qtip .qtip-wrapper .qtip-contentWrapper .qtip-content h1::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f059";
   font-size: 20px;
   color: #1E88E5;
   vertical-align: -1px;
@@ -6897,7 +6897,7 @@ a.read-more .faicon:before {
   padding-left: 8px;
   vertical-align: middle;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f054";
   font-size: 8px;
   color: #1E88E5;
   transition: 0.2s;
@@ -7220,7 +7220,7 @@ a.read-more .faicon:before {
 .divPopUp.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7261,7 +7261,7 @@ a.read-more .faicon:before {
 .divPopUp_info.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7753,7 +7753,7 @@ body.waitlong #loading {
 #check_pogoji.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7934,7 +7934,7 @@ body.waitlong #loading {
 #dropped_alert.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -9128,7 +9128,7 @@ header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLink
   right: 8px;
   top: 5px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f078";
   font-size: 10px;
   font-weight: 600;
 }
@@ -9401,7 +9401,7 @@ footer#srv_footer .footer_right span.faicon.external_link:before {
 footer#srv_footer .footer_right .right_help_button {
   position: fixed;
   right: -71px;
-  top: calc(50%);
+  top: 50%;
   width: 150px;
   padding: 4px 8px;
   border: 1px #1E88E5 solid;
@@ -9788,17 +9788,17 @@ input[type=radio]:checked + label:before, input[type=checkbox]:checked + label:b
   color: #1E88E5;
 }
 input[type=checkbox] + label:before {
-  content: "";
+  content: "\f0c8";
 }
 input[type=checkbox]:checked + label:before {
-  content: "";
+  content: "\f14a";
   font-weight: bold;
 }
 input[type=radio] + label:before {
-  content: "";
+  content: "\f111";
 }
 input[type=radio]:checked + label:before {
-  content: "";
+  content: "\f192";
 }
 input[type=checkbox][disabled] + label:before {
   color: #C4C4C4;
@@ -10413,7 +10413,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 #popup_user_access.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -10699,7 +10699,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 #survey_list .second_line .filters #folderSwitch#sortButton:after {
   position: absolute;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f078";
   right: 8px;
   top: 13px;
   font-weight: 600;
@@ -11045,13 +11045,13 @@ body.eng #survey_list .filters #folderSwitch {
   cursor: pointer;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_arrow_icon::before {
-  content: "";
+  content: "\f078";
   font-size: 14px;
   color: #333333;
   margin-right: 8px;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_icon::before {
-  content: "";
+  content: "\f07b";
   font-size: 16px;
   font-weight: 400;
   color: #1E88E5;
@@ -11061,7 +11061,7 @@ body.eng #survey_list .filters #folderSwitch {
   background-color: #F8F8F8;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_arrow_icon::before {
-  content: "";
+  content: "\f077";
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_icon::before {
   font-weight: 600;
@@ -12178,13 +12178,13 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   cursor: pointer;
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box .folder_arrow_icon::before {
-  content: "";
+  content: "\f078";
   font-size: 14px;
   color: #333333;
   margin-right: 8px;
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box .folder::before {
-  content: "";
+  content: "\f07b";
   font-size: 16px;
   font-weight: 400;
   color: #1E88E5;
@@ -12210,7 +12210,7 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   }*/
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box.open .folder_arrow_icon::before {
-  content: "";
+  content: "\f077";
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box.open .folder::before {
   font-weight: 600;
@@ -12463,7 +12463,7 @@ and open the template in the editor.
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio] + span.enka-custom-radio:before {
@@ -12471,7 +12471,7 @@ and open the template in the editor.
   display: inline-block;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox] {
   display: none !important;
@@ -12484,11 +12484,11 @@ and open the template in the editor.
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting .custom_radio_picture.obarvan > label > span.enka-custom-radio:before {
@@ -12781,7 +12781,7 @@ and open the template in the editor.
 }
 #new_anketa_div .layout_right_item .layout_right_centering .anketa_from_text .from_text_sidebyside_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f111";
   display: inline-block;
   font-size: 14px;
   color: #C4C4C4;
@@ -13394,20 +13394,20 @@ div.drop_setting_transition {
   font-weight: 400;
 }
 #branching input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #branching input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f111";
   letter-spacing: 8px;
 }
 #branching input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   color: #D3D3D3;
   letter-spacing: 8px;
 }
 #branching input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
   color: #D3D3D3;
 }
 #branching span.faicon.delete_circle::before {
@@ -20030,7 +20030,7 @@ and open the template in the editor.
   transition: 0.2s;
 }
 .tab_content .content_left ul li.folder_item .faicon.arrow:before {
-  content: "";
+  content: "\f078";
 }
 .tab_content .content_left ul li.folder_item .faicon.folder:before,
 .tab_content .content_left ul li.folder_item .faicon.clipboard:before {
@@ -20047,7 +20047,7 @@ and open the template in the editor.
   color: #1E88E5;
 }
 .tab_content .content_left ul li.folder_item.open .faicon.arrow:before {
-  content: "";
+  content: "\f077";
 }
 .tab_content .content_left ul li.folder_item.no_arrow .faicon.arrow:before {
   display: none;
@@ -20536,7 +20536,7 @@ img.mapster_el {
   border-radius: 4px;
 }
 .jquery-selectbox .jquery-selectbox-moreButton::before {
-  content: "";
+  content: "\f078";
   padding-left: 2px;
   color: #333333;
   font-size: 10px;
@@ -21443,7 +21443,7 @@ div#theme-edit-wrap div#theme-editor #picker .button_holder button:last-child {
 div#theme-edit-wrap div#theme-editor #picker.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -21806,7 +21806,7 @@ span.faicon.st-besede-popup {
 #vrednost_edit.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -22047,7 +22047,7 @@ span.faicon.st-besede-popup {
 #quota.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -22374,7 +22374,7 @@ and open the template in the editor.
 #fullscreen #preview_spremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -22447,18 +22447,18 @@ and open the template in the editor.
   -webkit-text-stroke: 0.35px;
 }
 #fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
 }
 #fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 #fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 #fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=checkbox] + span.enka-checkbox-radio,
 #fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio] + span.enka-checkbox-radio,
@@ -23354,22 +23354,22 @@ and open the template in the editor.
 }
 #preview_spremenljivka #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
   /*content: "\f096";*/
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #preview_spremenljivka #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
   /*content: "\f10c";*/
-  content: "";
+  content: "\f111";
   letter-spacing: 8px;
 }
 #preview_spremenljivka #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
   /*content: "\f046";*/
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 #preview_spremenljivka #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
   /*content: "\f192";*/
-  content: "";
+  content: "\f192";
 }
 #preview_spremenljivka input[type=radio] {
   margin: 0 8px 4px 0;
@@ -23382,7 +23382,7 @@ and open the template in the editor.
 #preview_spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 #preview_spremenljivka input[type=radio] + span.enka-custom-radio:before {
@@ -23390,7 +23390,7 @@ and open the template in the editor.
   display: inline-block;
 }
 #preview_spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 #preview_spremenljivka input[type=checkbox] {
   display: none !important;
@@ -23403,11 +23403,11 @@ and open the template in the editor.
 #preview_spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #preview_spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 
@@ -23492,7 +23492,7 @@ and open the template in the editor.
 }
 #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f111";
   display: inline-block;
   font-size: 14px;
   color: #E5E5E5;
@@ -23500,7 +23500,7 @@ and open the template in the editor.
   font-weight: 400;
 }
 #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
   color: #E5E5E5;
 }
 
@@ -23763,7 +23763,7 @@ dl.arch_email dd {
 #inv_view_arch_recipients.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -24829,6 +24829,13 @@ div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fi
 div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.add_comment_toggle,
 div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.add_comment_toggle {
   transition: 0.3s;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  width: 100%;
+  padding: 9px 8px;
+  color: #777777;
+  margin-bottom: 16px;
+  cursor: text;
 }
 div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper,
 div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper {
@@ -24839,6 +24846,7 @@ div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset
 div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment {
   display: flex;
   flex-direction: column;
+  margin-bottom: 16px;
 }
 div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment textarea,
 div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment textarea {
@@ -24896,23 +24904,23 @@ div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admi
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f111";
   letter-spacing: 8px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   color: #D3D3D3;
   letter-spacing: 8px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
   color: #D3D3D3;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio],
@@ -24929,7 +24937,7 @@ div.page_komentarji ul .spremenljivka_content input[type=radio] + span.enka-chec
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio] + span.enka-custom-radio:before,
@@ -24939,7 +24947,7 @@ div.page_komentarji_anketa ul .spremenljivka_content input[type=radio] + span.en
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio]:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox],
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox] {
@@ -24955,12 +24963,12 @@ div.page_komentarji ul .spremenljivka_content input[type=checkbox] + span.enka-c
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox]:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 div.page_komentarji ul div.question_comment_holder,
@@ -24982,11 +24990,29 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment.e
   padding-right: 62px;
   margin-right: 62px;
 }
+div.page_komentarji ul div.question_comment_holder div.question_comment div.add_comment_toggle,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.add_comment_toggle {
+  transition: 0.3s;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  width: 100%;
+  padding: 9px 8px;
+  margin-bottom: 16px;
+  color: #777777;
+  cursor: text;
+}
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_type,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_type {
   font-weight: 600;
   margin-bottom: 16px;
   text-transform: uppercase;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_type .fa-sort-amount-up,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_type .fa-sort-amount-up {
+  display: none;
 }
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box {
@@ -24996,14 +25022,72 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
   border-bottom: 1px solid #E5E5E5;
   margin-bottom: 16px;
 }
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box.archived,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box.archived {
+  color: #777777 !important;
+}
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by {
-  margin-bottom: 4px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
 }
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .user,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .user {
   font-weight: 600;
 }
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by p,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by p {
+  font-size: 14px !important;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options {
+  display: flex;
+  flex-direction: row;
+  color: #1E88E5;
+  position: relative;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .solve,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .solve {
+  margin-right: 16px;
+  cursor: pointer;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown {
+  position: absolute;
+  right: 0;
+  top: 24px;
+  display: flex;
+  z-index: 99;
+  width: auto;
+  padding: 20px 16px;
+  background: #FFFFFF;
+  border: 1px solid #E5E5E5;
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+  flex-direction: column;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line {
+  transition: 0.2s;
+  cursor: pointer;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line:not(:last-of-type),
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line:not(:last-of-type) {
+  margin-bottom: 12px;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line:hover,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line:hover {
+  color: #0059ab;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line a,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line a {
+  white-space: nowrap;
+  text-decoration: none;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line p,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line p {
+  font-size: 14px !important;
+}
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .date,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .date {
   font-size: 14px;
@@ -25013,6 +25097,22 @@ div.page_komentarji ul div.question_comment_holder div.question_comment div.comm
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content {
   margin: 16px 0;
 }
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote {
+  font-size: 14px !important;
+  border-left: 1px solid #E5E5E5;
+  padding-left: 8px;
+  margin-block-start: 0;
+  margin-block-end: 0;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:not(:last-of-type),
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:not(:last-of-type) {
+  padding-bottom: 16px;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:first-of-type,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:first-of-type {
+  margin-top: 16px;
+}
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .bottom_options,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .bottom_options {
   display: flex;
@@ -25069,6 +25169,10 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
   width: fit-content;
   margin-top: 8px;
 }
+div.page_komentarji ul div.question_comment_holder div.question_comment .new_comment,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment .new_comment {
+  margin-bottom: 16px;
+}
 
 #placeholder.komentarji {
   margin: 0px;
@@ -26938,7 +27042,7 @@ div.subpage_coding .coding-refresh .button_holder button:last-child {
 div.subpage_coding .coding-refresh.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -27120,7 +27224,7 @@ div.subpage_coding #coding .button_holder button:last-child {
 div.subpage_coding #coding.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -27444,7 +27548,7 @@ div.subpage_coding .floatRecodeSpremenljivka .button_holder button:last-child {
 div.subpage_coding .floatRecodeSpremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -27795,18 +27899,18 @@ ul#merge li {
   -webkit-text-stroke: 0.35px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox] + span.enka-checkbox-radio,
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio] + span.enka-checkbox-radio,
@@ -28305,7 +28409,7 @@ and open the template in the editor.
 #div_export_setting_show.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31399,7 +31503,7 @@ ul.vrednost_sort input[type=text] {
 .subpage_analysis_creport #anketa_custom_report #newCReportProfile.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31683,7 +31787,7 @@ and open the template in the editor.
 #dsp_inspect_cover.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -32217,7 +32321,7 @@ input#endDate {
 .mc_table_settings.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -32430,7 +32534,7 @@ input#endDate {
 #newMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -32619,7 +32723,7 @@ input#endDate {
 #renameMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -32808,7 +32912,7 @@ input#endDate {
 #deleteMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -33194,7 +33298,7 @@ button.buttons-columnVisibility.active {
 table.usersTable {
   margin-left: 14px;
   margin-right: 14px;
-  width: calc(100% - 2*14px);
+  width: calc(100% - 28px);
   white-space: nowrap;
   border-collapse: collapse !important;
 }
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index 266a1fc75..b2c675678 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -115,6 +115,15 @@ div.page_komentarji_anketa {
 
                 div.add_comment_toggle {
                     transition: 0.3s;
+
+                    border: 1px solid $gray;
+                    border-radius: 2px;
+                    width: 100%;
+                    padding: 9px 8px;
+                    color: $very-dark-gray;
+                    margin-bottom: 16px;
+
+                    cursor: text;
                 }
 
                 div.comment_wrapper {
@@ -124,6 +133,7 @@ div.page_komentarji_anketa {
                     div.new_comment {
                         display: flex;
                         flex-direction: column;
+                        margin-bottom: 16px;
     
                         textarea {
                             width: 100%;
@@ -269,10 +279,31 @@ div.page_komentarji_anketa {
                     margin-right: 62px;
                 }
 
+                div.add_comment_toggle {
+                    transition: 0.3s;
+
+                    border: 1px solid $gray;
+                    border-radius: 2px;
+                    width: 100%;
+                    padding: 9px 8px;
+                    margin-bottom: 16px;
+                    color: $very-dark-gray;
+
+                    cursor: text;
+                }
+
                 div.comment_type {
                     font-weight: $semi-bold;
                     margin-bottom: 16px;
                     text-transform: uppercase;
+
+                    display: flex;
+                    flex-direction: row;
+                    justify-content: space-between;
+
+                    .fa-sort-amount-up {
+                        display: none;
+                    }
                 }
 
                 div.comment_box {
@@ -284,11 +315,77 @@ div.page_komentarji_anketa {
 
                     margin-bottom: 16px;
 
+                    &.archived {
+                        color: $very-dark-gray !important
+                    }
+
                     .by {
-                        margin-bottom: 4px;
                         .user {
                             font-weight: $semi-bold;
                         }
+
+                        p {
+                            font-size: 14px !important;
+                        }
+
+                        display: flex;
+                        flex-direction: row;
+                        justify-content: space-between;
+
+                        .options {
+                            display: flex;
+                            flex-direction: row;
+                            .solve {
+                                margin-right: 16px;
+                                cursor: pointer;
+                            }
+
+                            color: $blue;
+
+                            position: relative;
+
+                            .options_dropdown {
+                                position: absolute;
+                                right:0;
+                                top: 24px;
+
+                                display: flex;
+
+                                z-index: 99;
+
+                                width: auto;
+                                padding: 20px 16px;
+                                background: $white;
+                                border: 1px solid $gray;
+                                
+                                box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+
+                                flex-direction: column;
+
+                                .line {
+                                    &:not(:last-of-type) {
+                                        margin-bottom: 12px;
+                                    }
+
+                                    transition: 0.2s;
+
+                                    &:hover{
+                                        color: $dark-blue;
+                                    }
+
+                                    cursor: pointer;
+
+                                    a {
+                                        white-space: nowrap;
+                                        text-decoration: none;
+                                    }
+
+                                    p {
+                                        font-size: 14px !important;
+                                    }
+                                }
+                            }
+                        }
                     }
 
                     .date {
@@ -298,6 +395,22 @@ div.page_komentarji_anketa {
 
                     .content {
                         margin: 16px 0;
+
+                        blockquote {
+                            font-size: 14px !important;
+                            border-left: 1px solid $gray;
+                            padding-left: 8px;
+
+                            margin-block-start: 0;
+                            margin-block-end: 0;
+
+                            &:not(:last-of-type) {
+                                padding-bottom: 16px;
+                            }
+                            &:first-of-type {
+                                margin-top: 16px;
+                            }
+                        }
                     }
 
                     .bottom_options {
@@ -354,6 +467,10 @@ div.page_komentarji_anketa {
                         margin-top: 8px;
                     }
                 }
+
+                .new_comment {
+                    margin-bottom: 16px;
+                }
             }
         }
     }

From 1b3d62dfaabf47f10a85e99ee2130f9a8a0ec4c8 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 19 Aug 2022 05:03:43 +0200
Subject: [PATCH 3/6] [Redizajn 1KA v2] Testiranje --> Komentarji -  v delu

Na anketo
---
 admin/survey/SurveyAdminSettings.php          | 281 +++++++++---------
 public/css/admin_new.css                      | 158 +++++++---
 .../pages/survey_testiranje/komentarji.scss   | 222 +++++++++-----
 3 files changed, 415 insertions(+), 246 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 23fd297a6..7031a702f 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -7016,22 +7016,6 @@ class SurveyAdminSettings {
 		
 		$rowa = SurveyInfo::getInstance()->getSurveyRow();
 		
-		echo '<div id="comment_question_note">';
-
-		echo $lang['srv_komentarji_imate'].' ';
-		if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo '<span class="red">';
-		echo $this->string_format((int)($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']), 'srv_cnt_komentarji');			
-		if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo '</span>';
-		
-		echo ' '.$lang['srv_komentarji_odskupno'].' ';
-		echo $this->string_format((int)($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']), 'srv_cnt_komentarji_survey_od');
-		echo '</div>';
-
-
-		echo '<div class="testni_vnos">';
-		echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank"><span class="faicon monitor link-right"></span> '.$lang['srv_survey_testdata'].'</a>';
-		echo '</div>';
-		
 		
 		# VV: privzeto naj bodo samo nerešeni komentarji
 		if (!isset($_GET['only_unresolved'])) {
@@ -7081,9 +7065,28 @@ class SurveyAdminSettings {
 		echo '<div class="komentarji_anketa_holder">';		
 		
 		// Splosni komentarji urednikov - levo
-		echo '<div class="komentarji_anketa komentarji_ured">';		
-		echo '<fieldset><legend>'.$lang['srv_comments_anketa_ured'].' ('.$comment_count['survey_admin']['unresolved'].'/'.$comment_count['survey_admin']['all'].')</legend>';
+		echo '<div class="komentarji_anketa komentarji_ured">';
 		
+		echo '<div class="comment_type">';
+
+		echo $lang['srv_admin_comment'].':';
+		echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
+		echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+		
+		echo '</div>';
+
+		// Dodajanje novega komentarja
+
+		echo '<div id="comment_toggle_0_4" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_4\')">';
+		echo $lang['srv_add_comment_toggle'];
+		echo '</div>';
+
+		echo '<div class="comment_wrapper" id="comment_wrapper_0_4">';
+		echo '<div class="new_comment" id="survey_comment_0_4">';
+		$ba = new BranchingAjax($this->anketa);
+		$ba->add_comment_field(0, '1', '4', false);
+		echo '</div>';
+		echo '</div>';
 		
 		$sql = sisplet_query("SELECT * FROM post WHERE tid='$rowa[thread]' ".$only_unresolved." ");
 		$rows = (mysqli_num_rows($sql) == 0) ? 0 : mysqli_num_rows($sql) - 1;
@@ -7094,52 +7097,71 @@ class SurveyAdminSettings {
 				
 				if (($i != 0 && $sortpostorder==0) || ($i < $rows && $sortpostorder==1)) {
 					
-					echo '<div class="comment_box">';
+					echo '<div class="comment_box '.($row['ocena']==0 ? '' : 'archived').'">';
 
 					echo '<div class="by">';
-					echo $lang['srv_comments_user'].'<span class="user">'.$f->user($row['uid']).'</span>'.$lang['srv_comments_user2'];
-					echo '</div>';
 
 					$datetime = strtotime($row['time']);
 					$datetime = date("d.m.Y G:i", $datetime);
 
-					echo '<div class="date">';
-					echo $datetime;
-					echo '</div>';
+
+					echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$f->user($row['uid']).'</span> ('.$datetime.')</p>';
+
+					
+					if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
+					
+						echo '<div class="options">';
+
+						echo '<div class="solve">';
+						if ($row['ocena']==0) {
+							echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-check link-right"></span>';
+							echo $lang['srv_comments_archive'].'</p>';
+						}
+						else {
+							echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-undo link-right"></span>';
+							echo $lang['srv_comments_unarchive'].'</p>';
+						}
+						echo '</div>';
+
+						echo '<span class="faicon pointer fa-ellipsis-h" id="dots_'.$row['id'].'" onClick="toggleCommentOptions(\''.$row['id'].'\');"></span>';
+
+							echo '<div class="options_dropdown displayNone" id="options_'.$row['id'].'">';
+							
+							echo '<div class="line">';
+							echo '<span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment']; // pri splošnih ni odgovorov?
+							echo '</div>';
+							
+							echo '<div class="line">';
+							echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+							echo $lang['srv_comment_delete'];
+							echo '</div>';
+							
+							echo '</div>';
+
+							//Klik izven razprith nastavitev - zapremo okno
+							echo '<script>
+							$(document).mouseup(function(e){
+								var container = $(".options_dropdown");
+							
+								if (!container.is(e.target) && container.has(e.target).length === 0){
+									$(".options_dropdown").addClass("displayNone");
+								}
+							});
+						</script>';
+
+
+						
+						echo '</div>'; //options
+						
+					}
+
+					echo '</div>'; //by
+
 
 					echo '<div class="content">';
 					echo $row['vsebina'];
 					echo '</div>';
 
-					
-                    if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
-
-					    echo '<div class="bottom_options">';
-
-                        if ($commentmarks == 1) {
-                            echo '	<select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});">
-                                        <option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
-                                        <option value="1"'.($row['ocena']==1?' selected="selected"':'').'>'.$lang['srv_todo'].'</option>
-                                        <option value="2"'.($row['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
-                                        <option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
-                                    </select>';
-                        } 
-                        else {
-
-                            if ($row['ocena']==0) {
-                                echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
-                                echo $lang['srv_comments_archive'].'</p>';
-                            }
-                            else {
-                                echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
-                                echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
-                                echo $lang['srv_comments_unarchive'].'</p>';
-                            }
-                        }
-
-                        echo '</div>';
-                    }
-
 					echo '</div>';
 				}
 
@@ -7157,41 +7179,33 @@ class SurveyAdminSettings {
 			}
 		}
 
-		// Dodajanje novega komentarja
 
-		echo '<div id="comment_toggle_0_4" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_4\')">';
-		echo $lang['srv_add_comment_toggle'];
-		echo '</div>';
-
-		echo '<div class="comment_wrapper" id="comment_wrapper_0_4">';
-		echo '<div class="new_comment" id="survey_comment_0_4">';
-		$ba = new BranchingAjax($this->anketa);
-		$ba->add_comment_field(0, '1', '4', false);
-		echo '</div>';
-		echo '</div>';
-
-		echo '</fieldset>';
 		echo '</div>';
 		
 		
 		// Splosni komentarji respondentov - desno
-		echo '<div class="komentarji_anketa komentarji_resp">';		
-		echo '<fieldset><legend>'.$lang['srv_comments_anketa_resp'].' ('.$comment_count['survey_resp']['unresolved'].'/'.$comment_count['survey_resp']['all'].')</legend>';
+		echo '<div class="komentarji_anketa komentarji_resp">';	
+		
+		echo '<div class="comment_type">';
+		echo $lang['srv_repondent_comment'].':';
+		echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
+		echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+		echo '</div>';
 		
 		$sql = sisplet_query("SELECT * FROM srv_comment_resp WHERE ank_id='$this->anketa' ".$only_unresolved." ORDER BY comment_time $orderby, id $orderby");
 		if (mysqli_num_rows($sql) > 0) {
 
 			while ($row = mysqli_fetch_array($sql)) {
 
-				echo '<div class="comment_box">';
+				echo '<div class="comment_box '.($row['ocena']==0 ? '' : 'archived').'">';
 
 				$datetime = strtotime($row['comment_time']);
 				$datetime = date("d.m.Y G:i", $datetime);
-				
+
+				echo '<div class="by">';
+
 				if($row['usr_id'] == 0){
-					echo '<div class="by">';
-					echo 'Respondent '.$lang['srv_comments_user2'];
-					echo '</div>';
+					echo '<p>Respondent ('.$datetime.')</p>';
 				}
 				else{
 					$sqlU = sisplet_query("SELECT name FROM users WHERE id='$row[usr_id]'");
@@ -7199,48 +7213,65 @@ class SurveyAdminSettings {
 					
 					$user = $rowU['name'];
 
-					echo '<div class="by">';
-					echo $lang['srv_comments_user'].'<span class="user">'.$user.'</span>'.$lang['srv_comments_user2'];
-					echo '</div>';
+					echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$user.'</span> ('.$datetime.')</p>';
+
 				}
 
-				echo '<div class="date">';
-				echo $datetime;
-				echo '</div>';
+				if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
+					
+					echo '<div class="options">';
+
+					echo '<div class="solve">';
+					if ($row['ocena']==0) {
+						echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-check link-right"></span>';
+						echo $lang['srv_comments_archive'].'</p>';
+					}
+					else {
+						echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-undo link-right"></span>';
+						echo $lang['srv_comments_unarchive'].'</p>';
+					}
+					echo '</div>';
+
+					echo '<span class="faicon pointer fa-ellipsis-h" id="dots_'.$row['id'].'" onClick="toggleCommentOptions(\''.$row['id'].'\');"></span>';
+
+						echo '<div class="options_dropdown displayNone" id="options_'.$row['id'].'">';
+						
+						echo '<div class="line">';
+						echo '<span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment']; // pri splošnih ni odgovorov?
+						echo '</div>';
+						
+						echo '<div class="line">';
+						echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+						echo $lang['srv_comment_delete'];
+						echo '</div>';
+						
+						echo '</div>';
+
+						//Klik izven razprith nastavitev - zapremo okno
+						echo '<script>
+						$(document).mouseup(function(e){
+							var container = $(".options_dropdown");
+						
+							if (!container.is(e.target) && container.has(e.target).length === 0){
+								$(".options_dropdown").addClass("displayNone");
+							}
+						});
+					</script>';
+
+
+					
+					echo '</div>'; //options
+					
+				}
+
+				echo '</div>'; //by
+
 
 				echo '<div class="content">';
 				echo $row['comment'];
 				echo '</div>';
 				
 				
-                if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
-
-                    echo '<div class="bottom_options">';
-                   
-                    if ($commentmarks == 1) {
-                        echo '	<select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});">
-                                    <option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
-                                    <option value="1"'.($row['ocena']==1?' selected="selected"':'').'>'.$lang['srv_todo'].'</option>
-                                    <option value="2"'.($row['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
-                                    <option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
-                                </select>';
-                    } 
-                    else {
-
-                        if ($row['ocena']==0) {
-                            echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
-                            echo $lang['srv_comments_archive'].'</p>';
-                        }
-                        else {
-                            echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
-                            echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
-                            echo $lang['srv_comments_unarchive'].'</p>';
-                        }
-                    }
-
-                    echo '</div>';
-                }
-				
 				echo '</div>';
 
 			}
@@ -7255,7 +7286,7 @@ class SurveyAdminSettings {
 				echo '<p class="bottom16">'.$lang['srv_no_comments'].'</p>';
 			}
 		}
-		// Dodajanje novega komentarja
+		/* Dodajanje novega komentarja
 		echo '<div id="comment_toggle_0_5" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_5\')">';
 		echo $lang['srv_add_comment_toggle'];
 		echo '</div>';
@@ -7266,9 +7297,8 @@ class SurveyAdminSettings {
 		$ba->add_comment_field(0, '4', '5', false);
 		echo '</div>';
 
-		echo '</div>';
+		echo '</div>';*/
 
-		echo '</fieldset>';
 		echo '</div>';
 
 		echo '</div>'; // div.komentarji_anketa_holder
@@ -7534,32 +7564,6 @@ class SurveyAdminSettings {
 		$comment_count = $this->testiranje_komentarji_count();
 		
 		
-		echo '<div id="comment_question_note">';
-				
-		echo $lang['srv_komentarji_imate'].' ';
-		if($comment_count['question']['unresolved'] > 0) echo '<span class="red">';
-		echo $this->string_format((int)$comment_count['question']['unresolved'], 'srv_cnt_komentarji');			
-		if($comment_count['question']['unresolved'] > 0) echo '</span>';
-		
-		echo ' '.$lang['srv_komentarji_odskupno'].' ';
-		echo $this->string_format((int)$comment_count['question']['all'], 'srv_cnt_komentar_na_vprs_od');
-		
-		echo '</div>';
-		
-		
-		/* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TGecho '&nbsp;<span class="tooltip clr spaceLeft">';
-		echo '<span class="expanded-tooltip bottom light" style="left: -20px;">';
-		echo '<b>' . $lang['srv_survey_testdata2'] . ':</b> '.$lang['srv_testdata_text'].'';
-		echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>';
-		echo '<span class="arrow"></span>';
-		echo '</span>';	// expanded-tooltip bottom
-		echo '</span>'; // tooltip */
-		
-		echo '<div class="testni_vnos">';
-		echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank"><span class="faicon link-right monitor"></span>'.$lang['srv_survey_testdata'].'</a>';
-		echo '</div>';
-		
-		
 		# VV: privzeto naj bodo samo nerešeni komentarji
 		if (!isset($_GET['only_unresolved'])) {
 			$_GET['only_unresolved'] = 1;
@@ -7696,6 +7700,9 @@ class SurveyAdminSettings {
 								echo '<div class="comment_type">';
 
                                 echo $lang['srv_admin_comment'].':';
+
+								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
+								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
                                 
                                 echo '</div>';
 
@@ -7980,6 +7987,8 @@ class SurveyAdminSettings {
 
 								echo '<div class="comment_type">';
 								echo $lang['srv_repondent_comment'].':';
+								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
+								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
 								echo '</div>';
 
 								if ($_GET['only_unresolved'] == 1) $only_unresolved = " AND d.text2 <= 1 "; else $only_unresolved = " ";
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 37f91c6a1..6e66ed88b 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24770,91 +24770,164 @@ div.page_komentarji_anketa div.komentarji_anketa_holder {
   margin-top: 32px;
   display: flex;
   flex-direction: row;
-  gap: 32px;
   width: 100%;
 }
 div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa,
 div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa {
   width: 50%;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset {
-  padding: 32px 24px;
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa.komentarji_ured,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa.komentarji_ured {
+  border-right: 1px solid #E5E5E5;
+  padding-right: 32px;
+  margin-right: 32px;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.add_comment_toggle,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.add_comment_toggle {
+  transition: 0.3s;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  width: 100%;
+  padding: 9px 8px;
+  margin-bottom: 16px;
+  color: #777777;
+  cursor: text;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_type,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_type {
+  font-weight: 600;
+  margin-bottom: 16px;
+  text-transform: uppercase;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_type .fa-sort-amount-up,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_type .fa-sort-amount-up {
+  display: none;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box {
   width: 100%;
   display: flex;
   flex-direction: column;
   border-bottom: 1px solid #E5E5E5;
   margin-bottom: 16px;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by {
-  margin-bottom: 4px;
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box.archived,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box.archived {
+  color: #777777 !important;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by .user,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by .user {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .user,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .user {
   font-weight: 600;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .date,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .date {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by p,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by p {
+  font-size: 14px !important;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options {
+  display: flex;
+  flex-direction: row;
+  color: #1E88E5;
+  position: relative;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .solve,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .solve {
+  margin-right: 16px;
+  cursor: pointer;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown {
+  position: absolute;
+  right: 0;
+  top: 24px;
+  display: flex;
+  z-index: 99;
+  width: auto;
+  padding: 20px 16px;
+  background: #FFFFFF;
+  border: 1px solid #E5E5E5;
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+  flex-direction: column;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line {
+  white-space: nowrap;
+  transition: 0.2s;
+  cursor: pointer;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line:not(:last-of-type),
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line:not(:last-of-type) {
+  margin-bottom: 12px;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line:hover,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line:hover {
+  color: #0059ab;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line a,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line a {
+  white-space: nowrap;
+  text-decoration: none;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line p,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line p {
+  font-size: 14px !important;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .date,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .date {
   font-size: 14px;
   color: #808080;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .content,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .content {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .content,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .content {
   margin: 16px 0;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
   margin-bottom: 16px;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .archive_comment,
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .unarchive_comment,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .archive_comment,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .unarchive_comment {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .archive_comment,
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .unarchive_comment,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .archive_comment,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .unarchive_comment {
   cursor: pointer;
   color: #1E88E5;
   transition: 0.2s;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .archived_comment,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .archived_comment {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .archived_comment,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .archived_comment {
   color: #808080;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.add_comment_toggle,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.add_comment_toggle {
-  transition: 0.3s;
-  border: 1px solid #E5E5E5;
-  border-radius: 2px;
-  width: 100%;
-  padding: 9px 8px;
-  color: #777777;
-  margin-bottom: 16px;
-  cursor: text;
-}
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper {
   display: none;
   transition: 0.3s;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment {
   display: flex;
   flex-direction: column;
   margin-bottom: 16px;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment textarea,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment textarea {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment textarea,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment textarea {
   width: 100%;
   height: 100px;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment button,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment button {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment button,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment button {
   width: fit-content;
   margin-top: 8px;
 }
@@ -25068,6 +25141,7 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
 }
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line {
+  white-space: nowrap;
   transition: 0.2s;
   cursor: pointer;
 }
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index b2c675678..418570e53 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -54,100 +54,183 @@ div.page_komentarji_anketa {
         margin-top: 32px;
         display: flex;
         flex-direction: row;
-        gap: 32px;
         width: 100%;
 
         div.komentarji_anketa {
             width: 50%;
 
-            fieldset {
-                padding: 32px 24px;
+            &.komentarji_ured {
+                border-right: 1px solid $gray;
+                padding-right: 32px;
+                margin-right: 32px;
+            }
+
+            div.add_comment_toggle {
+                transition: 0.3s;
+
+                border: 1px solid $gray;
+                border-radius: 2px;
+                width: 100%;
+                padding: 9px 8px;
+                margin-bottom: 16px;
+                color: $very-dark-gray;
+
+                cursor: text;
+            }
+
+            div.comment_type {
+                font-weight: $semi-bold;
+                margin-bottom: 16px;
+                text-transform: uppercase;
+
+                display: flex;
+                flex-direction: row;
+                justify-content: space-between;
+
+                .fa-sort-amount-up {
+                    display: none;
+                }
+            }
+
+            div.comment_box {
+                width: 100%;
+                display: flex;
+                flex-direction: column;
+
+                border-bottom: 1px solid $gray;
+
+                margin-bottom: 16px;
+
+                &.archived {
+                    color: $very-dark-gray !important
+                }
+
+                .by {
+                    .user {
+                        font-weight: $semi-bold;
+                    }
+
+                    p {
+                        font-size: 14px !important;
+                    }
 
-                div.comment_box {
-                    width: 100%;
                     display: flex;
-                    flex-direction: column;
+                    flex-direction: row;
+                    justify-content: space-between;
 
-                    border-bottom: 1px solid $gray;
-
-                    margin-bottom: 16px;
-
-                    .by {
-                        margin-bottom: 4px;
-                        .user {
-                            font-weight: $semi-bold;
-                        }
-                    }
-
-                    .date {
-                        font-size: 14px;
-                        color: $very-dark-gray2;
-                    }
-
-                    .content {
-                        margin: 16px 0;
-                    }
-
-                    .bottom_options {
+                    .options {
                         display: flex;
                         flex-direction: row;
-                        justify-content: space-between;
-                        align-items: center;
-                        margin-bottom: 16px;
-
-                        .archive_comment,
-                        .unarchive_comment {
-
+                        .solve {
+                            margin-right: 16px;
                             cursor: pointer;
-                            color: $blue;
+                        }
 
-                            transition: 0.2s;
-                            &:hover {
-                                $color: darken ($blue, 3%);
+                        color: $blue;
+
+                        position: relative;
+
+                        .options_dropdown {
+                            position: absolute;
+                            right:0;
+                            top: 24px;
+
+                            display: flex;
+
+                            z-index: 99;
+
+                            width: auto;
+                            padding: 20px 16px;
+                            background: $white;
+                            border: 1px solid $gray;
+                            
+                            box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+
+                            flex-direction: column;
+
+                            .line {
+                                &:not(:last-of-type) {
+                                    margin-bottom: 12px;
+                                }
+
+                                white-space: nowrap;
+
+                                transition: 0.2s;
+
+                                &:hover{
+                                    color: $dark-blue;
+                                }
+
+                                cursor: pointer;
+
+                                a {
+                                    white-space: nowrap;
+                                    text-decoration: none;
+                                }
+
+                                p {
+                                    font-size: 14px !important;
+                                }
                             }
                         }
-
-                        .archived_comment {
-                            color: $very-dark-gray2
-                        }
                     }
                 }
 
-                div.add_comment_toggle {
-                    transition: 0.3s;
+                .date {
+                    font-size: 14px;
+                    color: $very-dark-gray2;
+                }
 
-                    border: 1px solid $gray;
-                    border-radius: 2px;
-                    width: 100%;
-                    padding: 9px 8px;
-                    color: $very-dark-gray;
+                .content {
+                    margin: 16px 0;
+                }
+
+                .bottom_options {
+                    display: flex;
+                    flex-direction: row;
+                    justify-content: space-between;
+                    align-items: center;
                     margin-bottom: 16px;
 
-                    cursor: text;
-                }
+                    .archive_comment,
+                    .unarchive_comment {
 
-                div.comment_wrapper {
-                    display: none;
-                    transition: 0.3s;
+                        cursor: pointer;
+                        color: $blue;
 
-                    div.new_comment {
-                        display: flex;
-                        flex-direction: column;
-                        margin-bottom: 16px;
-    
-                        textarea {
-                            width: 100%;
-                            height: 100px;
-                        }
-    
-                        button {
-                            width: fit-content;
-                            margin-top: 8px;
+                        transition: 0.2s;
+                        &:hover {
+                            $color: darken ($blue, 3%);
                         }
                     }
-                }
 
+                    .archived_comment {
+                        color: $very-dark-gray2
+                    }
+                }
             }
+
+            div.comment_wrapper {
+                display: none;
+                transition: 0.3s;
+
+                div.new_comment {
+                    display: flex;
+                    flex-direction: column;
+                    margin-bottom: 16px;
+
+                    textarea {
+                        width: 100%;
+                        height: 100px;
+                    }
+
+                    button {
+                        width: fit-content;
+                        margin-top: 8px;
+                    }
+                }
+            }
+
         }
     }
 
@@ -367,6 +450,9 @@ div.page_komentarji_anketa {
                                         margin-bottom: 12px;
                                     }
 
+                                     white-space: nowrap;
+
+
                                     transition: 0.2s;
 
                                     &:hover{

From 58f5fd5516f02b335a8cd4e2b7ec5c9728953bc6 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 19 Aug 2022 05:48:25 +0200
Subject: [PATCH 4/6] [Redizajn 1KA v2] - Urejanje --> Nastavitve --> Mobilne
 nastavitve

---
 admin/survey/SurveyAdminSettings.php | 27 +++++++--------------------
 lang/1.php                           |  8 ++++----
 lang/2.php                           |  6 +++---
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 7031a702f..3e762b9b6 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1889,16 +1889,10 @@ class SurveyAdminSettings {
 			$mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly');
 
 			echo '<div class="setting_holder '.($mobile_friendly!=='1' ? 'bottom0':'').'" id="mobile_osnovno">';
-			
-			echo '<span class="setting_title" >'.$lang['srv_settings_mobile_friendly'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="mobile_friendly" id="mobile_friendly_1" '.($mobile_friendly==='1'?' checked':'').' value="1" onClick="$(\'#mobile_settings_other\').removeClass(\'displayNone\');$(\'#mobile_osnovno\').removeClass(\'bottom0\');">';
-			echo '<label for="mobile_friendly_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="mobile_friendly" id="mobile_friendly_0" '.($mobile_friendly!=='1'?' checked':'').' value="0" onClick="$(\'#mobile_settings_other\').addClass(\'displayNone\');$(\'#mobile_osnovno\').addClass(\'bottom0\');">';
-			echo '<label for="mobile_friendly_0">'.$lang['no'].'</label> ';
-			echo '</div>';
+
+            echo '<input type="hidden" name="mobile_friendly" value="0">';
+            echo '<input type="checkbox" id="mobile_friendly" name="mobile_friendly" value="1" '.($mobile_friendly == 1 ? ' checked="checked"' : '').' onChange="$(\'#mobile_settings_other\').toggleClass(\'displayNone\');$(\'#mobile_osnovno\').toggleClass(\'bottom0\');">';
+            echo '<label for="mobile_friendly">'. $lang['srv_settings_mobile_friendly'] .'</label> ';
 
 			echo '</div>';
 
@@ -1910,19 +1904,12 @@ class SurveyAdminSettings {
 			$hide_mobile_img = SurveySetting::getInstance()->getSurveyMiscSetting('hide_mobile_img');
 			echo '<div class="setting_holder">';
 
-			echo '<span class="setting_title" >'.$lang['srv_settings_mobile_img'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="hide_mobile_img" id="hide_mobile_img_0" '.($hide_mobile_img!=='1'?' checked':'').' value="0">';
-			echo '<label for="hide_mobile_img_0">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="hide_mobile_img" id="hide_mobile_img_1" '.($hide_mobile_img==='1'?' checked':'').' value="1">';			
-			echo '<label for="hide_mobile_img_1">'.$lang['no'].'</label> ';
-			echo '</div>';
+            echo '<input type="hidden" name="hide_mobile_img" value="1">';
+            echo '<input type="checkbox" id="hide_mobile_img" name="hide_mobile_img" value="0" '.($hide_mobile_img!= 1 ? ' checked="checked"' : '').'>';
+            echo '<label for="hide_mobile_img">'. $lang['srv_settings_mobile_img'] .'</label> ';
 
 			echo '</div>';
 
-			
 			// Prilagoditev tabel pri mobilnikih
 			$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
 			echo '<div class="setting_holder">';
diff --git a/lang/1.php b/lang/1.php
index 68be1d71d..7a69fc1ab 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4012,7 +4012,7 @@ $lang = array (
 	"srv_add_lang"						=>	"Omogo&#269;i ve&#269;jezi&#269;no podporo v anketi",
 	"srv_prevajanje"					=>	"Prevajanje",
 	"srv_mobile_settings"				=>	"Mobilne nastavitve",
-	"srv_mobile_settings_title"			=>	"Nastavitve prikaza pri mobilnih napravah",
+	"srv_mobile_settings_title"			=>	"Prikaz ankete na mobilnih napravah",
 	"srv_mobile_survey"					=>	"Anketa ustvarjena v mobilni aplikaciji",
 	"srv_mobile_add_question"			=>	"Dodaj vprašanje",
 	"srv_standardne_besede"				=>	"Standardne besede",
@@ -7148,10 +7148,10 @@ $lang = array (
 	'srv_tip_sample_t6_5_v4'					=>	"alergeni",
 	'srv_tip_sample_t6_5_c1'					=>	"Najbolj pomemben",
 	'srv_tip_sample_t6_5_c2'					=>	"Najmanj pomemben",
-	'srv_settings_mobile_img'					=>	"Prikaz slik na mobilniku",
-	'srv_settings_mobile_tables'				=>	"Prilagoditev tabel na mobilniku",
+	'srv_settings_mobile_img'					=>	"Prikaz slik na mobilnih napravah",
+	'srv_settings_mobile_tables'				=>	"Prilagoditev vprašanj tipa 'Tabela' na mobilnih napravah",
 	'srv_settings_mobile_tables_slide'			=>	"Da, z razpiranjem",
-	'srv_settings_mobile_friendly'				=>	"Prilagojen prikaz za mobilnike",
+	'srv_settings_mobile_friendly'				=>	"Prilagojen prikaz ankete na mobilnih napravah",
 	'srv_settings_mobile_friendly_off'			=>	"Prilagojen prikaz za mobilnike je izklopljen",
 	'srv_mySurvey_unallocated'					=>	"Nerazporejene ankete",
 	'srv_mySurvey_delete_folder'				=>	"Pobriši mapo",
diff --git a/lang/2.php b/lang/2.php
index 3bdf4525d..421a28c8d 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3982,7 +3982,7 @@ $lang = array (
 	"srv_prevajanje"					=>	"Translations",
 	"srv_standardne_besede"				=>	"Standard words",
 	"srv_mobile_settings"				=>	"Mobile settings",
-	"srv_mobile_settings_title"			=>	"Display settings for mobile devices",
+	"srv_mobile_settings_title"			=>	"Survey display on mobile devices",
 	"srv_mobile_survey"					=>	"Survey created with mobile app",
     "srv_mobile_add_question"			=>	"Add question",
 	"srv_prevajanje_dodaj"				=>	"Add translation for",
@@ -7032,9 +7032,9 @@ $lang = array (
 	'srv_tip_sample_t6_5_c1'					=>	"Most important",
 	'srv_tip_sample_t6_5_c2'					=>	"Least important",
 	'srv_settings_mobile_img'					=>	"Display images on mobile devices",
-	'srv_settings_mobile_tables'				=>	"Adjusted tables on mobile devices",
+	'srv_settings_mobile_tables'				=>	"Optimization of 'Table' type questions on mobile devices",
 	'srv_settings_mobile_tables_slide'			=>	"Yes, with expanding",
-	'srv_settings_mobile_friendly'				=>	"Mobile friendly",
+	'srv_settings_mobile_friendly'				=>	"Optimized survey display on mobile devices",
 	'srv_settings_mobile_friendly_off'			=>	"Mobile friendly survey is turned off",
 	'srv_mySurvey_unallocated'					=>	"Unallocated survey",
 	'srv_mySurvey_delete_folder'				=>	"Deleter folder",

From cf720338c82122a6812bdb37ef7624287ad90f5a Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 19 Aug 2022 06:57:30 +0200
Subject: [PATCH 5/6] [Redizajn 1KA v2] - Urejanje --> Nastavitve --> Osnovne
 nastavitve

---
 admin/survey/SurveyAdminSettings.php          | 229 +++++++-----------
 lang/1.php                                    |  26 +-
 lang/2.php                                    |  24 +-
 public/css/admin_new.css                      |   3 +
 .../admin_new/components/form/textarea.scss   |   3 +
 5 files changed, 114 insertions(+), 171 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 3e762b9b6..fd056a9d2 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -138,7 +138,7 @@ class SurveyAdminSettings {
 
 				echo '<div class="setting_holder">';
 				echo '<label for="anketa_folder">'. $lang['srv_newSurvey_survey_new_folder'] .Help::display('srv_nova_shrani').':</label>';
-				echo '<select class="dropdown large" name="anketa_folder" id="anketa_folder">';
+				echo '<select class="dropdown large w400" name="anketa_folder" id="anketa_folder">';
 				echo '<option value="0" '.($selected_folder == 0 ? ' selected="selected"' : '').'>'.$lang['srv_newSurvey_survey_new_folder_def'].'</option>';
 				while($rowF = mysqli_fetch_array($sqlF)){
 					echo '<option value="'.$rowF['id'].'" '.($rowF['id'] == $selected_folder ? ' selected="selected"' : '').'>'.$rowF['naslov'].'</option>';
@@ -208,28 +208,31 @@ class SurveyAdminSettings {
 			echo '</div>';
             
             // Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete"
-			echo '<div class="setting_holder">';
 
-			echo '<p class="bottom8">'.$lang['srv_language_link2'].':';
 			// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
             $userAccess = UserAccess::getInstance($global_user_id);
             if($userAccess->checkUserAccess($what='prevajanje')){
-                echo '&nbsp;<a href="index.php?anketa='.$this->anketa.'&a=prevajanje" title="'.$lang['srv_language_link'].'"><span class="bold">'.$lang['srv_language_link'].'</span></a></p>';
-            }
-            else{            
-                echo '&nbsp;<a href="#" onClick=popupUserAccess(\'prevajanje\'); return false;" title="'.$lang['srv_language_link'].'" class="user_access_locked"><span class="bold">'.$lang['srv_language_link'].'</span></a></p>';
-            }			
-			echo '<p>'.$lang['srv_language_mySurveys'].'.</p>';
 
+				$lang_link = 'window.location.href=\'index.php?anketa='.$this->anketa.'&a=prevajanje\'; return false;';
+				$color = 'blue';
+            }
+            else{  
+				$lang_link = 'popupUserAccess(\'prevajanje\'); return false;';
+				$color = 'yellow user_access_locked';          
+            }	
+
+			echo '<div class="button_holder top16 bottom0">';
+			echo '<button class="medium '.$color.'" onClick="'.$lang_link.'">'.$lang['srv_multi_lang'].'</button>';				
 			echo '</div>';
+
 			
 			echo '</fieldset>';
 
-			// Gumb shrani - vmes
+			/*/ Gumb shrani - vmes
 			echo '<div class="button_holder">';
 			echo '<button class="medium white-blue" onClick="window.location='.$preklici_url.';return false;">'.$lang['edit1338'].'</button>';				
 			echo '<button class="medium blue" onclick="document.settingsanketa_' . $row['id'] . '.submit(); return false;">'.$lang['edit1337'].'</button>';
-			echo '</div>';
+			echo '</div>';*/
 			
 					
 			/* INTERAKTIVNI ELEMENTI */
@@ -251,33 +254,67 @@ class SurveyAdminSettings {
 				
 			// Indikator napredka
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_te_progressbar'].' '.Help::display('srv_show_progressbar').':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="progressbar1" name="progressbar" value="1" '.($row['progressbar'] == 1 && $multiple_pages ? ' checked="checked"' : '').' '.(!$multiple_pages ? 'disabled' : '').'>';
-			echo '<label for="progressbar1" '.(!$multiple_pages ? 'disabled' : '').'>'. $lang['yes'] .'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="progressbar0" name="progressbar" value="0" '.($row['progressbar'] == 0 || !$multiple_pages ? ' checked="checked"' : '').' '.(!$multiple_pages ? 'disabled' : '').'>';
-			echo '<label for="progressbar0" '.(!$multiple_pages ? 'disabled' : '').'>'. $lang['no1'].'</label> ';
-			echo '</div>';
-
+			echo '<input type="hidden" name="progressbar" value="0">';
+            echo '<input type="checkbox" id="progressbar" name="progressbar" value="1" '.($row['progressbar'] == 1 && $multiple_pages ? ' checked="checked"' : '').' '.(!$multiple_pages ? 'disabled' : '').'>';
+            echo '<label for="progressbar">'.$lang['srv_te_progressbar'].' '.Help::display('srv_show_progressbar').'</label> ';
 			echo '</div>';
 			
 			// Naslov ankete za uporabnike
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_show_title'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="survey_hide_title1" name="survey_hide_title" value="0" '.($survey_hide_title == 0 ? ' checked="checked"' : '').'>';
-			echo '<label for="survey_hide_title1">'. $lang['yes'] .'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="survey_hide_title0" name="survey_hide_title" value="1" '.($survey_hide_title == 1 ? ' checked="checked"' : '').'>';
-			echo '<label for="survey_hide_title0">'. $lang['no1'] .'</label> ';
+			echo '<input type="hidden" name="survey_hide_title" value="1">';
+            echo '<input type="checkbox" id="survey_hide_title" name="survey_hide_title" value="0" '.($survey_hide_title == 0 ? ' checked="checked"' : '').'>';
+            echo '<label for="survey_hide_title">'.$lang['srv_show_title'].'</label> ';
 			echo '</div>';
 
+			// Nadaljuj kasneje
+			if($this->survey_type > 1){
+                echo '<div class="setting_holder">';
+				echo '<input type="hidden" name="continue_later" value="0">';
+            	echo '<input type="checkbox" id="continue_later" name="continue_later" value="1" '.($row['continue_later'] == 1 ? ' checked="checked"' : '').'>';
+            	echo '<label for="continue_later">'.$lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').'</label> ';
+                echo '</div>';
+			}
+
+			// Gumb nazaj
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="display_backlink" value="0">';
+			echo '<input type="checkbox" id="display_backlink" name="display_backlink" value="1" '.($display_backlink!=='0'?' checked':'').'>';
+			echo '<label for="display_backlink">'.$lang['srv_slideshow_sett_back_button_lbl'].'</label> ';
 			echo '</div>';
+
+			// Namig
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="survey_hint" value="0">';
+			echo '<input type="checkbox" id="survey_hint" name="survey_hint" value="1" '.($survey_hint == 1 ? ' checked="checked"' : '').'>';
+			echo '<label for="survey_hint">'.$lang['srv_hint'].' '.Help::display('srv_namig_setting').'</label> ';
+			echo '</div>';
+
+			/* KNJIZNICA */
+			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='$global_user_id'");
+			$moje = mysqli_num_rows($sqlk);
+			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='0'");
+			$javne = mysqli_num_rows($sqlk);
+			
+			if ($admin_type == 0 || $admin_type == 1) {
+
+				echo '<div class="setting_holder">';
+				echo '<input type="hidden" name="javne_ankete" value="0">';
+				echo '<input type="checkbox" id="javne_ankete" name="javne_ankete" value="1" '.($javne==1?' checked':'').' onchange="javascript:check_library();">';
+				echo '<label for="javne_ankete">'.$lang['srv_javne_ankete'].'</label> ';
+				echo '</div>';				
+			}
+			
+			echo '<div class="setting_holder" id="moje_ankete">';
+			echo '<input type="hidden" name="moje_ankete" value="0">';
+			echo '<input type="checkbox" id="moje_ankete" name="moje_ankete" value="1" '.($moje==1?' checked':'').'>';
+			echo '<label for="moje_ankete">'.$lang['srv_moje_ankete'].' '.Help::display('srv_moje_ankete_setting').'</label> ';
+			echo '</div>';
+
+			?>
+			<script>
+			check_library();
+			</script>
+			<?
 			
 			// Politika zasebnosti
 			echo '<div class="setting_holder">';
@@ -298,52 +335,6 @@ class SurveyAdminSettings {
 
 			echo '</div>';
 			
-			// Nadaljuj kasneje
-			if($this->survey_type > 1){
-                echo '<div class="setting_holder">';
-                echo '<span class="setting_title">'. $lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').':</span>';
-                
-                echo '<div class="setting_item">';
-                echo '<input type="radio" name="continue_later" value="1" id="continue_later_1"' . ($row['continue_later'] == 1 ? ' checked="checked"' : '') . '>';
-                echo '<label for="continue_later_1">'.$lang['yes'].'</label>';
-                echo '</div>';
-                echo '<div class="setting_item">';
-                echo '<input type="radio" name="continue_later" value="0" id="continue_later_0"' . ($row['continue_later'] == 0 ? ' checked="checked"' : '') . '>';
-                echo '<label for="continue_later_0">'.$lang['no1'].'</label>';
-                echo '</div>';
-
-                echo '</div>';
-			}
-			
-			// Gumb nazaj
-			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_slideshow_sett_back_button_lbl'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="display_backlink" id="display_backlink_1" '.($display_backlink!=='0'?' checked':'').' value="">';
-			echo '<label for="display_backlink_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="display_backlink" id="display_backlink_0" '.($display_backlink==='0'?' checked':'').' value="0">';
-			echo '<label for="display_backlink_0">'.$lang['no'].'</label>';
-			echo '</div>';
-
-			echo '</div>';
-			
-			// Namig
-			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_hint'].' '.Help::display('srv_namig_setting').':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="namig1" name="survey_hint" value="1"' . ($survey_hint == 1 ? ' checked="checked"' : '') . '>';
-			echo '<label for="namig1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input id="namig0" type="radio" name="survey_hint" value="0"' . ($survey_hint == 0 ? ' checked="checked"' : '') . '>';
-			echo '<label for="namig0">'.$lang['no1'].'</label>';
-			echo '</div>';
-			
-			echo '</div>';
 			
 			// Oozorilo na vprašanja
 			echo '<div class="setting_holder">';
@@ -360,7 +351,7 @@ class SurveyAdminSettings {
 			
 			echo '</div>';
 			
-			// Napredni parapodatki
+			/*/ Napredni parapodatki
 			if (($admin_type == 0 || $admin_type == 1) && $this->survey_type > 0) {
 				echo '<div class="setting_holder">';
 				echo '<span class="seting_title">'.$lang['srv_parapodatki'].':</span>';
@@ -410,7 +401,7 @@ class SurveyAdminSettings {
 				echo '</div>';
 	
 				echo '</div>';
-			}
+			}*/
  
 			echo '</fieldset>';
 					
@@ -501,44 +492,6 @@ class SurveyAdminSettings {
 				echo '</fieldset>';			
 			}
 						
-			/* KNJIZNICA */
-			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='$global_user_id'");
-			$moje = mysqli_num_rows($sqlk);
-			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='0'");
-			$javne = mysqli_num_rows($sqlk);
-			
-			echo '<fieldset>';
-			echo '<legend>'.$lang['srv_library'].'</legend>';
-			if ($admin_type == 0 || $admin_type == 1) {
-				echo '<span class="setting_title" >'.$lang['srv_javne_ankete'].':';
-
-				echo '<div class="setting_holder">';
-
-				echo '<div class="setting_item">';
-				echo '<input type="radio" id="javne_ankete0" name="javne_ankete" value="0"'.($javne==0?' checked':'').' onchange="javascript:check_library();">';
-				echo '<label for="javne_ankete0">'.$lang['no'].'</label>';
-				echo '</div>';
-				echo '<div class="setting_item">';
-				echo '<input type="radio" id="javne_ankete1" name="javne_ankete" value="1"'.($javne==1?' checked':'').' onchange="javascript:check_library();">';
-				echo '<label for="javne_ankete1">'.$lang['yes'].'</label>';
-				echo '</div>';
-				
-				echo '</div>';				
-			}
-			
-			echo '<div class="setting_holder" id="moje_ankete">';
-			echo '<span class="setting_title">'.$lang['srv_moje_ankete'].' '.Help::display('srv_moje_ankete_setting').':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="moje_ankete0" name="moje_ankete" value="0"'.($moje==0?' checked':'').'>';
-			echo '<label for="moje_ankete0">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="moje_ankete1" name="moje_ankete" value="1"'.($moje==1?' checked':'').'>';
-			echo '<label for="moje_ankete1">'.$lang['yes'].'</label>';
-			echo '</div>';
-
-			echo '</div>';
 			
 			// zamakni
 			/*echo '<div class="setting_holder">';
@@ -562,20 +515,23 @@ class SurveyAdminSettings {
 			echo '</div>';
 
 			echo '</div>';*/
-
 			
-			echo '</fieldset>';
 			
-			?>
-			<script>
-			check_library();
-			</script>
-			<?
-						
 			/* STEVILCENJE */
 			echo '<fieldset>';
 			echo '<legend>' . $lang['srv_nastavitveStevilcenje'] . '</legend>';
 
+			// Izklop prestevilcevanja
+			$enumerate = SurveySetting::getInstance()->getSurveyMiscSetting('enumerate'); if ($enumerate == '') $enumerate = 1;
+			
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="enumerate" value="0">';
+			echo '<input type="checkbox" id="enumerate" name="enumerate" value="1" '.($enumerate == 1 ? ' checked' : '').'>';
+			echo '<label for="enumerate">'.$lang['srv_nastavitvePrestevilcevanje'].'</label> ';
+			echo '</div>';
+
+			//način številčenja
+
 			echo '<div class="setting_holder">';
 			echo '<span class="setting_title"><label for="anketa_countType">' . $lang['srv_nastavitveStevilcenjeType'] . ':</label></span>';
 
@@ -598,33 +554,14 @@ class SurveyAdminSettings {
 
 			echo '</div>';
 			
-			// Izklop prestevilcevanja
-			$enumerate = SurveySetting::getInstance()->getSurveyMiscSetting('enumerate'); if ($enumerate == '') $enumerate = 1;
-			
-			echo '<div class="setting_holder">';
-			echo '<span class="setting_title"><label for="anketa_enumerate">'.$lang['srv_nastavitvePrestevilcevanje'].':</label></span>';
-
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="enumerate" id="enumerate_1" '.($enumerate == 1 ? ' checked' : '').' value="1">';
-			echo '<label for="enumerate_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="enumerate" id="enumerate_0" '.($enumerate == 0 ? ' checked' : '').' value="0">';
-			echo '<label for="enumerate_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-
 			echo '</fieldset>';
 						
 			/* JS TRACKING */
 			if ($admin_type == 0 || $admin_type == 1) {
 				echo '<fieldset><legend>'.$lang['srv_js_tracking'].'</legend>';
 				echo '<div class="setting_holder">';
-				echo '<textarea name="js_tracking">'.$row['js_tracking'].'</textarea>';
-				echo '<p>'.$lang['js_tracking_note'].'</p>';
-
+				echo '<span class="setting_title">'.$lang['js_tracking_note'].'</span>';
+				echo '<textarea class="textarea w800" name="js_tracking">'.$row['js_tracking'].'</textarea>';
 				echo '</div>';
 
 				echo '</fieldset>';
diff --git a/lang/1.php b/lang/1.php
index 7a69fc1ab..235bcd55a 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1990,12 +1990,12 @@ $lang = array (
 	"srv_settings_help"				=>	"Pomoč",
 	"srv_settingsPersonal"			=>	"Uporabni&#154;ke nastavitve",
 	"srv_nastavitveStevilcenje"			=>	"&#352;tevil&#269;enje vpra&#353;anj",
-	"srv_nastavitveStevilcenjeType"		=>	"Na&#269;in &#154;tevil&#269;enja",
+	"srv_nastavitveStevilcenjeType"		=>	"Način številčenja za respondente",
 	"srv_nastavitveStevilcenjeType0"	=>	"Brez &#154;tevil&#269;enja",
-	"srv_nastavitveStevilcenjeType1"	=>	"Z zaporedno &#353;tevilko [ 1), 2) ... ]",
+	"srv_nastavitveStevilcenjeType1"	=>	"Z zaporedno &#353;tevilko spremenljivke [ 1), 2) ... ]",
 	"srv_nastavitveStevilcenjeType2"	=>	"Z imenom spremenljivke [ V1, V2 ... ]",
-	"srv_nastavitveStevilcenjeType3"	=>	"Z imenom in zaporedno &#154;tevilko",
-	"srv_nastavitvePrestevilcevanje"	=>	"Avtomatsko preštevilčevanje",
+	"srv_nastavitveStevilcenjeType3"	=>	"Z imenom in zaporedno &#154;tevilko spremenljivke",
+	"srv_nastavitvePrestevilcevanje"	=>	"Avtomatsko preštevilčevanje vprašanj ob spreminjanju vrstnega reda vprašanj",
 	"srv_nastavitveStevilcenjePDF" =>	"O&#353;tevil&#269;i vpra&#353;anja v PDF izvozih",
 	"srv_nastavitveStevilcenjeRTF" =>	"O&#353;tevil&#269;i vpra&#353;anja v DOC (Word) izvozih",
 	"srv_nastavitveStevilcenjeFrekvence" =>	"O&#353;tevil&#269;i vpra&#353;anja v Frekvencah",
@@ -2984,8 +2984,8 @@ $lang = array (
 	"srv_podrobno_datoteke"			=>	"Datoteke",
 	"srv_pregledovanje"				=>	"Moje ankete",
 	"srv_seznam"					=>	"Seznam",
-	"srv_javne_ankete"				=>	"Javne ankete",
-	"srv_moje_ankete"				=>	"Moje ankete",
+	"srv_javne_ankete"				=>	"Dodaj anketo v javno knjižnico",
+	"srv_moje_ankete"				=>	"Dodaj anketo v mojo knjižnico",
 	"srv_javna_knjiznica"			=>	"Javna knjižnica",
 	"srv_moja_knjiznica"			=>	"Moja knjižnica",
 	"srv_javna_vprasanja"			=>	"Javna vpra&#154;anja",
@@ -3269,7 +3269,7 @@ $lang = array (
 	"srv_slideshow_sett_autostart_opt_3"	=>	"Animacijo zažene katerakoli od naštetih akcij (Gumb 'Naprej', Timer vprašanja, Klik na vprašanje)",
 	"srv_slideshow_sett_autostart_opt_3_short"	=>	"Karkoli",
 	"srv_slideshow_sett_next_button_lbl"	=>	"Prikaz gumba 'Naprej'",
-	"srv_slideshow_sett_back_button_lbl"	=>	"Prikaz gumba 'Nazaj'",
+	"srv_slideshow_sett_back_button_lbl"	=>	"Gumb 'Nazaj' je prikazan",
 	"srv_slideshow_sett_pause_button_lbl"	=>	"Prikaz gumba 'Pavza'",
 	"srv_slideshow_sett_button_opt_0"	=>	"Ne prikaži gumba",
 	"srv_slideshow_sett_button_opt_1"	=>	"Prikaži gumb",
@@ -3298,7 +3298,7 @@ $lang = array (
     "srv_fieldwork_device_pass"     =>  "Geslo naprave",
     "srv_fieldwork_device_surveyID" =>  "ID te ankete na napravi",
     "srv_fieldwork_sync_data"       =>  "Sinhroniziraj podatke",
-    "srv_hint"							=>	"Namig",
+    "srv_hint"							=>	"Možnost namiga za respondente",
 	"srv_hint_datapiping"				=>	"Pri urejanju zaključka ali vsebini e-pošte, ki ga prejme respondent uporabite za prikaz &#353;tevila to&#269;k <b>Prenos vrednosti</b>.</p><p>Vpi&#353;ite labelo spremenljivke z izra&#269;unano vrednostjo, obdano z lojtro, npr.: <B>#rezultat#</B>",
 	"srv_missing_profile_title1"		=>	"Označeni odgovori se <font class=\"red bold\">ne</font> upoštevajo pri analizah, in se obravnavajo kot manjkajo&#269;e vrednosti!",
 	"srv_missing_profile_title2"		=>	"Manjkajoče vrednosti – neopredeljeni odgovori",
@@ -4018,6 +4018,7 @@ $lang = array (
 	"srv_standardne_besede"				=>	"Standardne besede",
 	"srv_prevajanje_dodaj"				=>	"Dodaj nov prevod za",
 	"srv_base_lang"						=>	"Osnovni jezik",
+	"srv_multi_lang"						=>	"Večjezične ankete",
 	"srv_lang_elements"					=>	"Standardne besede",
 	"srv_trans_lang"					=>	"Prevod",
 	"srv_trans_langs"					=>	"Prikaži dodatni jezik",
@@ -6394,7 +6395,7 @@ $lang = array (
 	'srv_aapor_show_calculation'				=>	'Prikaz izračunov:',
 	'srv_aapor_show_approximate_calculation'	=>	'Prikaz približnih izračunov:',
     'srv_aapor_show_approximate'	            =>	'Prikaži približke',
-	'srv_show_continue_later'					=>	'Opcija za nadaljevanje kasneje',
+	'srv_show_continue_later'					=>	'Možnost kasnejšega nadaljevanja izpolnjevanja ankete',
 	'srv_themes_select'							=>	'Izbira teme',
 	'srv_themes_mod'							=>	'Prilagoditev teme',
 	'srv_themes_mod2'							=>	'Trenutno urejate temo',
@@ -6412,7 +6413,7 @@ $lang = array (
 	'srv_new_theme_alert'						=>	'Dodana je nova prilagoditev teme <b>%s</b>. Uredite jo lahko spodaj.',
 	'srv_new_theme_alert_css'					=>	'Dodana je nova CSS tema <b>%s</b>. Uredite jo lahko spodaj.',
 	'srv_js_tracking'							=>	'JavaScript koda za sledenje',
-	'js_tracking_note'							=>	'Skopirajte celotno kodo (iz npr. Google Analytics), vključno s &lt;script&gt; blokom.',
+	'js_tracking_note'							=>	'Vnesite celotno kodo za sledenje (iz npr. Google Analytics) - vključno s &lt;script&gt; blokom.',
 	'srv_editing_mode'							=>	'Napredna 1KA',
 	'srv_editing_mode_0'						=>	'Enostavno',
 	'srv_editing_mode_1'						=>	'Napredno',
@@ -6823,7 +6824,6 @@ $lang = array (
 	'srv_parapodatki'							=>	'Napredni parapodatki',
 	'pasteFromWordAlert'						=>	'<b>Kopiranje besedila močno odsvetujemo!</b> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/zakaj-priporocljivo-kopiranje-besedila?from1ka=1" target="_blank">Več >></a>',
 	'srv_interaktivni_elementi'					=>	'Interaktivni elementi',
-	'srv_hint'									=>	'Namig',
 	'srv_para_label_variables'					=>	'Spremenljivke',
 	'srv_para_label_details'					=>	'Podrobno',
 	'srv_para_label_breaks'						=>	'Prekinitve',
@@ -7127,7 +7127,7 @@ $lang = array (
 	'one_click_create'			                =>  "Enklik kreiranje",
 	'edit_hide'			                		=>  "Skrij",
 	'edit_show'			                		=>  "Prikaži",
-	'srv_show_title'			               	=>  "Naslov ankete za uporabnike",
+	'srv_show_title'			               	=>  "Naslov ankete je viden respondentom",
 	'srv_create_show_intro'			            =>  "Uvod je viden respondentom",
 	'srv_create_show_concl'			            =>  "Zaključek je viden respondentom",
 	'srv_create_show_title'			            =>  "Naslov ankete je viden respondentom",
@@ -7191,7 +7191,7 @@ $lang = array (
 	'srv_orientacija_tabela_da_ne'				=>	"Tabela DA/NE",
 	'srv_privacy_0'								=>	"Brez potrditve (povezava v nogi ankete)",
 	'srv_privacy_1'								=>	"Potrditev s klikom naprej",
-	'srv_privacy_2'								=>	"Potrditev s checkboxom",
+	'srv_privacy_2'								=>	"Potrditev s potrditvenim poljem (checkbox)",
   'cookiePopupTitle'                       	=>  'Uporaba piškotkov',
   'cookiePopupText'                       	=>  '<p>Za izbolj&#154;anje uporabni&#154;ke izku&#154;nje, vam bomo kot prijavljenim uporabnikom dodelili pi&#154;kotke (<a target="_blank" href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-piskotkov" style="color: blue; text-decoration: underline;">pojasnilo</a>).</p><p>Ali se &#382;elite prijaviti?</p>',
   'aaiPopupTitle'                         => 'AAI-prijava',
diff --git a/lang/2.php b/lang/2.php
index 421a28c8d..ce1da4a75 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1978,12 +1978,12 @@ $lang = array (
 	"srv_settings_help"				=>	"Help",
 	"srv_settingsPersonal"			=>	"Personal setting",
 	"srv_nastavitveStevilcenje"		=>	"Question numbering",
-	"srv_nastavitveStevilcenjeType"	=>	"Numbering style",
+	"srv_nastavitveStevilcenjeType"	=>	"Numbering style for respondents",
 	"srv_nastavitveStevilcenjeType0"=>	"Without numbering",
-	"srv_nastavitveStevilcenjeType1"=>	"With consecutive numbers [ 1), 2), ... ]",
+	"srv_nastavitveStevilcenjeType1"=>	"With consecutive numbers of variables [ 1), 2), ... ]",
 	"srv_nastavitveStevilcenjeType2"=>	"With variable names [ V1, V2, ... ]",
-	"srv_nastavitveStevilcenjeType3"=>	"With names and consecutive numbers",
-	"srv_nastavitvePrestevilcevanje"=>	"Automatic renumbering",
+	"srv_nastavitveStevilcenjeType3"=>	"With names and consecutive numbers of variables",
+	"srv_nastavitvePrestevilcevanje"=>	"Automatic renumbering of questions when changing the order of questions",
 	"srv_nastavitveStevilcenjePDF" 	=>	"Numbered questions in PDF",
 	"srv_nastavitveStevilcenjeRTF" 	=>	"Numbered questions in RTF",
 	"srv_nastavitveStevilcenjeFrekvence"	=> "Numbered questions in Frequency statistics",
@@ -3239,8 +3239,8 @@ $lang = array (
 	"srv_slideshow_sett_autostart_opt_2_short"	=>	"Click on first question",
 	"srv_slideshow_sett_autostart_opt_3"	=>	"Start by any action (Button 'Forward', First question timer, Click on first question)",
 	"srv_slideshow_sett_autostart_opt_3_short"	=>	"Any action",
-	"srv_slideshow_sett_next_button_lbl"	=>	"Display 'Forward' option",
-	"srv_slideshow_sett_back_button_lbl"	=>	"Display 'Back' option",
+	"srv_slideshow_sett_next_button_lbl"	=>	"Display 'Forward' button",
+	"srv_slideshow_sett_back_button_lbl"	=>	"Display 'Back' button",
 	"srv_slideshow_sett_pause_button_lbl"	=>	"Display 'Pause' opiton",
 	"srv_slideshow_sett_button_opt_0"	=>	"Don't show button",
 	"srv_slideshow_sett_button_opt_1"	=>	"Show button",
@@ -3269,7 +3269,7 @@ $lang = array (
     "srv_fieldwork_device_pass"     =>  "Device password",
     "srv_fieldwork_device_surveyID" =>  "Survey ID on the device",
     "srv_fieldwork_sync_data"       =>  "Synchronise data",
-	"srv_hint"							=>	"Hint",
+	"srv_hint"							=>	"Hint option for respondents",
 	"srv_hint_datapiping"				=>	"When editing conclusion or email, use <b>Data piping</b> to display final score.</p><p>Use question label for computed value, embraced with hash, <B>#score#</B>",
 	"srv_missing_profile_title1"		=>	"Selected values are not used in the analysis and are treated as missing values!",
 	"srv_missing_profile_title2"		=>	"Missing values - undefined answers",
@@ -3986,6 +3986,7 @@ $lang = array (
 	"srv_mobile_survey"					=>	"Survey created with mobile app",
     "srv_mobile_add_question"			=>	"Add question",
 	"srv_prevajanje_dodaj"				=>	"Add translation for",
+	"srv_multi_lang"						=>	"Multilanguage surveys",
 	"srv_base_lang"						=>	"Basic language",
 	"srv_lang_elements"					=>	"Standard text",
 	"srv_trans_lang"					=>	"Translation",
@@ -6287,7 +6288,7 @@ $lang = array (
     'srv_aapor_show_calculation'				=>	'Show calculations:',
     'srv_aapor_show_approximate_calculation'	=>	'Show approximate calculations:',
     'srv_aapor_show_approximate'	            =>	'Show approximate',
-	'srv_show_continue_later'					=>	'Display continue later option',
+	'srv_show_continue_later'					=>	'Option to continue the survey at a later date',
 	'srv_themes_select'							=>	'Theme selection',
 	'srv_themes_mod'							=>	'Theme modifiation',
 	'srv_themes_mod2'							=>	'Currently editing',
@@ -6305,7 +6306,7 @@ $lang = array (
 	'srv_new_theme_alert'						=>	'New modification theme <b>%s</b> has been added. You can edit it below.',
 	'srv_new_theme_alert_css'					=>	'New CSS theme <b>%s</b> has been added. You can edit it below.',
 	'srv_js_tracking'							=>	'JavaScript code for tracking',
-	'js_tracking_note'							=>	'Copy the entire code (e.g. from Google Analytics), including the &lt;script&gt; block.',
+	'js_tracking_note'							=>	'Enter the full tracking code (from e.g. Google Analytics), including the &lt;script&gt; block:',
 	'srv_editing_mode'							=>	'Advanced 1KA',
 	'srv_editing_mode_0'						=>	'Basic',
 	'srv_editing_mode_1'						=>	'Advanced',
@@ -6705,7 +6706,6 @@ $lang = array (
 	'srv_parapodatki'							=>	'Advanced paradata',
 	'pasteFromWordAlert'						=>	'<b>Text copying is strongly discouraged!</b> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/zakaj-priporocljivo-kopiranje-besedila?from1ka=1" target="_blank">More >></a>',
 	'srv_interaktivni_elementi'					=>	'Interactive elements',
-	'srv_hint'									=>	'Hint',
 	'srv_para_label_variables'					=>	'Variables',
 	'srv_para_label_details'					=>	'Details',
 	'srv_para_label_breaks'						=>	'Breaks',
@@ -7010,7 +7010,7 @@ $lang = array (
 	'one_click_create'			                =>  "Oneclick create",
 	'edit_hide'			                		=>  "Hide",
 	'edit_show'			                		=>  "Show",
-	'srv_show_title'			               	=>  "Survey title for respondents",
+	'srv_show_title'			               	=>  "Survey title is visible to respondents",
 	'srv_create_show_intro'			            =>  "Intro is visible to respondents",
 	'srv_create_show_concl'			            =>  "Conclusion is visible to respondents",
 	'srv_create_show_title'			            =>  "Title is visible to respondents",
@@ -7073,7 +7073,7 @@ $lang = array (
 	'srv_select_box_vse'						=>	"all",
 	'srv_orientacija_tabela_da_ne'				=>	"Table YES/NO",
 	'srv_privacy_0'								=>	"Without confirmation (link in footer)",
-	'srv_privacy_1'								=>	"Confirmation with button next",
+	'srv_privacy_1'								=>	"Confirmation with 'Next' button",
 	'srv_privacy_2'								=>	"Confirmation with checkbox",
 	'cookiePopupTitle'                       	=>  'Cookie usage',
   'cookiePopupText'                      		=>  '<p>This site uses cookies to improve user experience for logged in users.</p><p>Do you wish to proceed?</p>',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 6e66ed88b..a7d855902 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10000,6 +10000,9 @@ textarea {
 textarea.wauto {
   width: auto;
 }
+textarea.w800 {
+  width: 800px;
+}
 textarea.disabled {
   border-color: #C4C4C4;
   background-color: #E5E5E5;
diff --git a/resources/sass/admin_new/components/form/textarea.scss b/resources/sass/admin_new/components/form/textarea.scss
index 0ce88cbf6..be72e9e56 100644
--- a/resources/sass/admin_new/components/form/textarea.scss
+++ b/resources/sass/admin_new/components/form/textarea.scss
@@ -5,6 +5,9 @@ textarea {
     &.wauto {
         width: auto;
     }
+    &.w800{
+        width: 800px;
+    }
 
     border: 1px solid $dark-gray;
     box-sizing: border-box;

From f66722eabce44ebe91d59584293e5d330c0e95b6 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 19 Aug 2022 09:59:16 +0200
Subject: [PATCH 6/6] [Redizajn 1KA v2] - Urejanje --> Nastavitve --> Osnovne
 nastavitve - izbris starih odpri in zamakni gumbov

---
 admin/survey/SurveyAdminSettings.php | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index fd056a9d2..e2eb09f0a 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -492,31 +492,6 @@ class SurveyAdminSettings {
 				echo '</fieldset>';			
 			}
 						
-			
-			// zamakni
-			/*echo '<div class="setting_holder">';
-
-			echo '<span class="setting_title">'.$lang['a_show'].'</span>'; 
-			echo '<div class="setting_item">';
-			if ($row['flat'] == 0)
-				echo '<span title="'.$lang['srv_flat_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=flat&value=1">'.$lang['srv_flat_0_short'].'</a></span> ';
-			else
-				echo '<span title="'.$lang['srv_flat_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=flat&value=0">'.$lang['srv_flat_0_short'].'</a></span> ';
-			echo Help::display('srv_branching_flat');
-			echo '</div>';
-			
-			// odpri
-			echo '<div class="setting_item">';
-			if ($row['popup'] == 1)
-				echo '<span class="spaceLeft" title="'.$lang['srv_popup_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=popup&value=0">'.$lang['srv_popup_1_short'].'</a></span> ';
-			else
-				echo '<span class="spaceLeft" title="'.$lang['srv_popup_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=popup&value=1">'.$lang['srv_popup_1_short'].'</a></span> ';
-			echo Help::display('srv_branching_popup');
-			echo '</div>';
-
-			echo '</div>';*/
-			
-			
 			/* STEVILCENJE */
 			echo '<fieldset>';
 			echo '<legend>' . $lang['srv_nastavitveStevilcenje'] . '</legend>';