may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gumba prekliči / shrani v nastavitvah - v1

Browse Source
This commit is contained in:
tejagerjovic 2021-11-22 02:10:28 +01:00
parent f6ae1083c1
commit 079a094715
7 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdmin.php
View File

@ -2293,8 +2293,6 @@ class SurveyAdmin
|| $_GET['a'] == 'json_survey_export' || $_GET['a'] == 'json_survey_export'
){ ){
//TODO: stari divi okrog nastavitev - kam prestaviti pogoje? @TG2
if ($this->isAnketar) { if ($this->isAnketar) {
return; return;
} }

10
admin/survey/SurveyAdminSettings.php
View File

@ -1682,11 +1682,11 @@ class SurveyAdminSettings {
if ($_GET['a'] != 'jezik' && $_GET['a'] != 'trajanje' && $_GET['a'] != A_GDPR && $_GET['a'] != 'dostop') { if ($_GET['a'] != 'jezik' && $_GET['a'] != 'trajanje' && $_GET['a'] != A_GDPR && $_GET['a'] != 'dostop') {
echo '<br class="clr" />';
echo '<div class="buttonwrapper">';
echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="document.settingsanketa_' . $row['id'] . '.submit(); return false;"><span>'; echo '<button class="medium white-blue" onClick="window.location.reload();">'.$lang['edit1338'].'</button>';
echo $lang['edit1337'] . '</span></a></div></span>'; echo '<button class="medium blue" onclick="document.settingsanketa_' . $row['id'] . '.submit(); return false;">'.$lang['edit1337'].'</button>';
echo '<div class="clr"></div>'; echo '</div>';
} }
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {

10
admin/survey/redesign_test.php
View File

@ -157,7 +157,7 @@
</div> </div>
<div class="setting_holder"> <div class="setting_holder">
<label for="dropdown1" class="input_label">Veliki dropdown meni:</label> <label for="dropdown1">Veliki dropdown meni:</label>
<form> <form>
<select id="dropdown1" class="dropdown large"> <select id="dropdown1" class="dropdown large">
<option>Q1: veliko besedilaaaaa</option> <option>Q1: veliko besedilaaaaa</option>
@ -168,7 +168,7 @@
</div> </div>
<div class="setting_holder"> <div class="setting_holder">
<label for="dropdown2" class="input_label">Srednji dropdown meni:</label> <label for="dropdown2">Srednji dropdown meni:</label>
<form> <form>
<select id="dropdown2" class="dropdown medium"> <select id="dropdown2" class="dropdown medium">
<option>Q1: veliko besedilaaaaa</option> <option>Q1: veliko besedilaaaaa</option>
@ -179,9 +179,9 @@
</div> </div>
<div class="setting_holder"> <div class="setting_holder">
<label for="dropdown3" class="input_label" disabled>Mali dropdown meni - disabled:</label> <label for="dropdown3" disabled>Mali dropdown meni - disabled:</label>
<form> <form>
<select id="dropdown3" class="dropdown small disabled"> <select id="dropdown3">
<option>Q1: veliko besedilaaaaa</option> <option>Q1: veliko besedilaaaaa</option>
<option>Q2: manj besedila</option> <option>Q2: manj besedila</option>
<option>Q3: malo</option> <option>Q3: malo</option>
@ -241,7 +241,7 @@
<div class="setting_holder"> <div class="setting_holder">
<label class="input_label">Gumbi:</label><br><br> <label>Gumbi:</label><br><br>
<button class="small red">Gumb - majhen rdeč</button> <br><br> <button class="small red">Gumb - majhen rdeč</button> <br><br>
<button class="large blue">Gumb - velik moder</button> <br><br> <button class="large blue">Gumb - velik moder</button> <br><br>

1
lang/1.php
View File

@ -349,6 +349,7 @@ $lang = array (
"or_current" => "<font color=\"red\"><br><b>ALI</b></font> obstoje&#269;e", "or_current" => "<font color=\"red\"><br><b>ALI</b></font> obstoje&#269;e",
"edit4" => "Spremeni", "edit4" => "Spremeni",
"edit1337" => "Shrani spremembe", "edit1337" => "Shrani spremembe",
"edit1338" => "Prekliči",
"reset_translation" => "Ponastavi prevod", "reset_translation" => "Ponastavi prevod",
"delete_account" => "Izbriši račun 1KA", "delete_account" => "Izbriši račun 1KA",
"delete_account_conformation" => "Ste prepričani, da želite trajno izbrisati vaš račun? Po potrditvi se ne boste več mogli prijaviti s tem računom!", "delete_account_conformation" => "Ste prepričani, da želite trajno izbrisati vaš račun? Po potrditvi se ne boste več mogli prijaviti s tem računom!",

1
lang/2.php
View File

@ -337,6 +337,7 @@ $lang = array (
"or_current" => "<font color=\"red\"><br><b>OR</b></font> current", "or_current" => "<font color=\"red\"><br><b>OR</b></font> current",
"edit4" => "Change", "edit4" => "Change",
"edit1337" => "Save changes", "edit1337" => "Save changes",
"edit1338" => "Cancel",
"reset_translation" => "Reset translation", "reset_translation" => "Reset translation",
"delete_account" => "Delete 1KA account", "delete_account" => "Delete 1KA account",
"delete_account_conformation" => "Are you sure you want to permanently delete your account? After confirmation, you will no longer be able to sign in with this account!", "delete_account_conformation" => "Are you sure you want to permanently delete your account? After confirmation, you will no longer be able to sign in with this account!",

5
public/css/admin_new.css
View File

@ -5228,6 +5228,11 @@ div.layout_left_item ul.menu_left-list a:hover {
/* /*
Form scss - input fields, buttons... Form scss - input fields, buttons...
*/ */
div.buttonwrapper {
display: flex;
flex-direction: row;
}
button, button,
submit { submit {
box-sizing: border-box; box-sizing: border-box;

5
resources/sass/admin_new/components/form/button.scss
View File

@ -1,3 +1,8 @@
div.buttonwrapper {
display: flex;
flex-direction: row;
}
button, button,
submit{ submit{
box-sizing: border-box; box-sizing: border-box;