From e0ca08d7469ff868ed474d2b75f9ea17abe3f2b3 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 13 Jan 2022 10:17:19 +0100
Subject: [PATCH] [Redizajn 1KA] - Urejanje --> Nastavitve --> Standardne
 besede - v2

---
 admin/survey/SurveyAdminSettings.php          |  7 +++---
 public/css/admin_new.css                      | 25 +++++++++++++++++--
 .../sass/admin_new/basic/icons/standard.scss  |  4 +--
 .../popup/page_specific/page_specific.scss    |  4 ++-
 .../page_specific/standardne_besede.scss      | 24 ++++++++++++++++++
 5 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 resources/sass/admin_new/components/popup/page_specific/standardne_besede.scss

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 8b51c045f..32a58e775 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2248,14 +2248,15 @@ class SurveyAdminSettings {
 			$next_uvod = $lang_id == '' ? $admin_lang['srv_nextpage_uvod_desc'] : $resp_lang['srv_nextpage_uvod_desc'];
 		
 		echo '<tr class="standardna-beseda">';
-		echo '<td>'.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? '<span class="gray italic">('.$next_uvod.')</span>' : '').'</td> ';
+		echo '<td>'.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? ' ('.$next_uvod.')' : '').'</td> ';
 		echo '<td>'.$lang[$text].'</td>';
-		echo '<td><div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div></td>';
+		echo '<td><div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div>';
 
 		if($editor == 1) 
 			echo '<span class="faicon edit2 sb-edit"'.$onclick.' style="float:right; margin-top:1px; display:none;"></span>';
-        
+
 		echo '<textarea name="srvlang_'.$text.$lang_id.'" id="polje_srvlang_'.$text.$lang_id.'"  style="display:none;">'.$value.'</textarea>';
+		echo '</td>';
         
 		echo '</tr>';
 	}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index d662fc595..c348c5a01 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5416,8 +5416,8 @@ span.faicon.pagination_right::before {
   content: "\f105";
 }
 
-span.faicon.edit::before {
-  font-size: 16px;
+span.faicon.edit::before,
+span.faicon.edit2::before {
   content: "\f304";
 }
 
@@ -10736,6 +10736,27 @@ and open the template in the editor.
   height: 60px;
 }
 
+.fixed-position {
+  position: fixed;
+  z-index: 101;
+  top: 50%;
+  left: 50%;
+}
+.fixed-position #vrednost_edit {
+  display: block;
+  margin-top: -200px;
+  margin-left: -300px;
+}
+.fixed-position #vrednost_edit span.buttonwrapper a.ovalbutton_gray {
+  color: #1E88E5;
+}
+.fixed-position #vrednost_edit span.buttonwrapper a.ovalbutton_gray:hover span {
+  color: white;
+}
+.fixed-position #vrednost_edit span.buttonwrapper a.ovalbutton_orange span {
+  color: white;
+}
+
 /* 
     Specific pages scss
 */
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index 3c112f8a7..8ca4157d4 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -132,8 +132,8 @@ span.faicon.pagination_right::before{
         content: "\f105";
 }
 
-span.faicon.edit::before{
-        font-size: 16px;
+span.faicon.edit::before,
+span.faicon.edit2::before{
         content: "\f304";
 }
 
diff --git a/resources/sass/admin_new/components/popup/page_specific/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific/page_specific.scss
index 24dbff1cd..31d5e3487 100644
--- a/resources/sass/admin_new/components/popup/page_specific/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific/page_specific.scss
@@ -8,4 +8,6 @@
 
 @import "custom_report";
 
-@import "survey_edit";
\ No newline at end of file
+@import "survey_edit";
+
+@import "standardne_besede";
diff --git a/resources/sass/admin_new/components/popup/page_specific/standardne_besede.scss b/resources/sass/admin_new/components/popup/page_specific/standardne_besede.scss
new file mode 100644
index 000000000..b3a96d1dd
--- /dev/null
+++ b/resources/sass/admin_new/components/popup/page_specific/standardne_besede.scss
@@ -0,0 +1,24 @@
+.fixed-position {
+	position: fixed;
+	z-index: 101;
+	top: 50%;
+	left: 50%;
+
+	#vrednost_edit {
+		display: block;
+		margin-top: -200px;
+		margin-left: -300px;
+		
+		span.buttonwrapper a.ovalbutton_gray{
+			color: $blue;
+			
+			&:hover span{
+				color: white;
+			}
+		}
+		
+		span.buttonwrapper a.ovalbutton_orange span{
+			color: white;
+        }
+	}
+}
\ No newline at end of file