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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-03-02 09:51:53 +01:00
commit 41b2f3f79d
12 changed files with 1545 additions and 1456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/survey/Help.php
View File

@ -29,10 +29,16 @@ class Help {
static function edit_toggle () { static function edit_toggle () {
global $lang; global $lang;
if (isset($_COOKIE['edithelp'])) if (isset($_COOKIE['edithelp'])) {
echo '<label><a href="ajax.php?t=help&a=edit_off" title="'.$lang['help'].'">'.$lang['srv_insend'].'</a></label>'; echo '<div class="button_holder botom0">';
else echo '<button class="medium blue" onClick="window.location.href=\'ajax.php?t=help&a=edit_off\';return false;">'.$lang['srv_insend'].'</button>';
echo '<label><a href="ajax.php?t=help&a=edit_on" title="'.$lang['help'].'">'.$lang['start'].'</a></label>'; echo '</div>';
}
else {
echo '<div class="button_holder bottom0">';
echo '<button class="medium blue" onClick="window.location.href=\'ajax.php?t=help&a=edit_on\';return false;">'.$lang['start'].'</button>';
echo '</div>';
}
} }
function ajax () { function ajax () {

44
admin/survey/SurveyAdminSettings.php
View File

@ -5658,6 +5658,8 @@ class SurveyAdminSettings {
global $admin_type; global $admin_type;
global $global_user_id; global $global_user_id;
$preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/");
$preklici_url = "'". $site_url . $preklici_url . "'";
// Ni admin - nima pravic // Ni admin - nima pravic
if ($admin_type != 0) { if ($admin_type != 0) {
@ -5680,12 +5682,15 @@ class SurveyAdminSettings {
// SISTEMSKE NASTAVITVE (prej v settings_optional.php) // SISTEMSKE NASTAVITVE (prej v settings_optional.php)
echo '<fieldset><legend>'.$lang['as_basic'].'</legend>'; echo '<fieldset><legend>'.$lang['as_basic'].'</legend>';
echo '<div class="osnovne_nastavitve">';
AppSettings::getInstance()->displaySettingsGroup('basic'); AppSettings::getInstance()->displaySettingsGroup('basic');
echo '<br />';
// Kdo lahko ureja ankete // Kdo lahko ureja ankete
echo '<span class="nastavitveSpan6"><label>' . $lang['SurveyDostop'] . ':</label></span>'; echo '<div class="osnovne_nastavitve_single">';
echo '<label>' . $lang['SurveyDostop'] . ':</label>';
$result = sisplet_query("SELECT value FROM misc WHERE what='SurveyDostop'"); $result = sisplet_query("SELECT value FROM misc WHERE what='SurveyDostop'");
list ($SurveyDostop) = mysqli_fetch_row($result); list ($SurveyDostop) = mysqli_fetch_row($result);
@ -5697,10 +5702,11 @@ class SurveyAdminSettings {
echo ' <option value="3" '.($SurveyDostop=='3'?"SELECTED":"").'>'.$lang['forum_registered'].'</option>'; echo ' <option value="3" '.($SurveyDostop=='3'?"SELECTED":"").'>'.$lang['forum_registered'].'</option>';
echo '</select>'; echo '</select>';
echo '<br />'; echo '</div>';
// Default trajanje piskotka // Default trajanje piskotka
echo '<span class="nastavitveSpan6" ><label>' . $lang['SurveyCookie'] . ':</label></span>'; echo '<div class="osnovne_nastavitve_single">';
echo '<label>' . $lang['SurveyCookie'] . ':</label>';
$result = sisplet_query("SELECT value FROM misc WHERE what='SurveyCookie'"); $result = sisplet_query("SELECT value FROM misc WHERE what='SurveyCookie'");
list ($SurveyCookie) = mysqli_fetch_row($result); list ($SurveyCookie) = mysqli_fetch_row($result);
@ -5712,54 +5718,66 @@ class SurveyAdminSettings {
echo ' <option value="2" '.($SurveyCookie=='2'?"SELECTED":"").'>'.$lang['srv_cookie_2'].'</option>'; echo ' <option value="2" '.($SurveyCookie=='2'?"SELECTED":"").'>'.$lang['srv_cookie_2'].'</option>';
echo '</select>'; echo '</select>';
echo '<br />'; echo '</div>';
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
// INFO // INFO
echo '<fieldset><legend>'.$lang['as_info'].'</legend>'; echo '<fieldset><legend>'.$lang['as_info'].'</legend>';
echo '<div class="osnovne_nastavitve">';
AppSettings::getInstance()->displaySettingsGroup('info'); AppSettings::getInstance()->displaySettingsGroup('info');
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
// OMEJITVE // OMEJITVE
echo '<fieldset><legend>'.$lang['as_limits'].'</legend>'; echo '<fieldset><legend>'.$lang['as_limits'].'</legend>';
echo '<div class="osnovne_nastavitve">';
AppSettings::getInstance()->displaySettingsGroup('limits'); AppSettings::getInstance()->displaySettingsGroup('limits');
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
// SMTP NASTAVITVE // SMTP NASTAVITVE
echo '<fieldset><legend>'.$lang['as_smtp'].'</legend>'; echo '<fieldset><legend>'.$lang['as_smtp'].'</legend>';
echo '<div class="osnovne_nastavitve">';
AppSettings::getInstance()->displaySettingsGroup('smtp'); AppSettings::getInstance()->displaySettingsGroup('smtp');
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
// MODULI // MODULI
echo '<fieldset><legend>'.$lang['as_modules'].'</legend>'; echo '<fieldset><legend>'.$lang['as_modules'].'</legend>';
echo '<div class="osnovne_nastavitve">';
AppSettings::getInstance()->displaySettingsGroup('modules'); AppSettings::getInstance()->displaySettingsGroup('modules');
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
//UREJANJE OKEN S POMOČJO
echo '<br />';
echo '<fieldset>'; echo '<fieldset>';
echo '<legend>' . $lang['srv_edithelp'] . '</legend>'; echo '<legend>' . $lang['srv_edithelp'] . '</legend>';
echo '<span class="nastavitveSpan1" ><label>' . $lang['srv_edithelp'] . ' '.Help::display('srv_window_help').': </label></span>'; echo '<p class="bottom16" >' . $lang['srv_edithelp'] . ' '.Help::display('srv_window_help').':</p>';
Help :: edit_toggle(); Help :: edit_toggle();
echo '</form>'; echo '</form>';
echo '</fieldset>'; echo '</fieldset>';
// Missingi /** Missingi - zakomentirano, prenova po redizajnu
$smv = new SurveyMissingValues(); $smv = new SurveyMissingValues();
$smv->SystemFilters(); $smv->SystemFilters();
*/
// save gumb // save gumb
echo ' <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="document.settingsanketa.submit();"><span>'.$lang['edit1337'] . '</span></a></div>'; 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.submit();">'.$lang['edit1337'].'</button>';
echo '</div>';
// div za prikaz uspešnosti shranjevanja // div za prikaz uspešnosti shranjevanja
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {

20
admin/survey/classes/class.AppSettings.php
View File

@ -178,24 +178,28 @@ class AppSettings {
// Display app settings // Display app settings
public function displaySettingsGroup($group){ public function displaySettingsGroup($group){
echo '<br>';
$setting_variables = $this->variables[$group]; $setting_variables = $this->variables[$group];
foreach($setting_variables as $what){ foreach($setting_variables as $what){
$this->displaySetting($what); $this->displaySetting($what);
} }
} }
// Display app single setting // Display app single setting
public function displaySetting($what){ public function displaySetting($what){
global $lang; global $lang;
echo '<span class="nastavitveSpan6"><label>'.$lang['as_'.$what].': </label></span>';
echo '<input type="text" size="40" name="as_'.$what.'" value="'.strip_tags($this->settings[$what]).'">';
echo '<br>'; echo '<div class="osnovne_nastavitve_single">';
echo '<label>'.$lang['as_'.$what].': </label>';
echo '<input type="text" name="as_'.$what.'" value="'.strip_tags($this->settings[$what]).'">';
echo '</div>';
} }
} }

19
admin/survey/classes/class.SurveyVariableView.php
View File

@ -44,18 +44,14 @@ class VariableView {
public static function displayVariables() { public static function displayVariables() {
global $lang; global $lang;
echo '<table class="variableView">'; echo '<table class="variableView">';
echo '<thead><tr>'; echo '<tr>';
echo '<th>'.$lang['srv_variableView_h_'].'</th>'; echo '<th>'.$lang['srv_variableView_h_name'].'</th>';
echo '<th>'.$lang['srv_variableView_h_type'].'</th>'; echo '<th>'.$lang['srv_variableView_h_type'].'</th>';
echo '<th>'.$lang['srv_variableView_h_width'].'</th>';
echo '<th>'.$lang['srv_variableView_h_decimals'].'</th>';
echo '<th>'.$lang['srv_variableView_h_label'].'</th>';
echo '<th>'.$lang['srv_variableView_h_measure'].'</th>'; echo '<th>'.$lang['srv_variableView_h_measure'].'</th>';
echo '</tr></thead>'; echo '<th>'.$lang['srv_variableView_h_label'].'</th>';
echo '</tr>';
echo '<tbody>';
foreach (self::$_HEADERS AS $skey => $spremenljivka) { foreach (self::$_HEADERS AS $skey => $spremenljivka) {
@ -71,15 +67,12 @@ class VariableView {
echo '<tr>'; echo '<tr>';
echo '<td>'.$spremenljivka['variable'].'</td>'; echo '<td>'.$spremenljivka['variable'].'</td>';
echo '<td>'.$legenda['izrazanje'].'</td>'; echo '<td>'.$legenda['izrazanje'].'</td>';
echo '<td>'.(int)$spss_length['0'].'</td>';
echo '<td>'.(int)$spss_length['1'].'</td>';
echo '<td>'.$spremenljivka['naslov'].'</td>';
echo '<td>'.$legenda['skala'].'</td>'; echo '<td>'.$legenda['skala'].'</td>';
echo '<td>'.$spremenljivka['naslov'].'</td>';
echo '</tr>'; echo '</tr>';
} }
} }
echo '</tbody>';
echo '</table>'; echo '</table>';
} }
} }

5
admin/survey/classes/tracking/CrossRoad.php
View File

@ -318,7 +318,7 @@ class CrossRoad {
if ($_GET['m'] == 'anal_arch') { if ($_GET['m'] == 'anal_arch') {
$layout_menu = 'menu_left'; $layout_menu = 'menu_left';
} }
$status = 2; $status = 2;
break; break;
@ -372,6 +372,9 @@ class CrossRoad {
$layout_width = 'wide'; $layout_width = 'wide';
$layout_menu = 'menu_left'; $layout_menu = 'menu_left';
} }
elseif ($_GET['m'] == 'variables') {
$layout_width = 'narrow';
}
$status = 4; $status = 4;

14
lang/1.php
View File

@ -1257,10 +1257,10 @@ $lang = array (
"deactive_column" => "Deaktiviraj rubriko", "deactive_column" => "Deaktiviraj rubriko",
"breakedPage_title" => "Naslov prelomljene strani", "breakedPage_title" => "Naslov prelomljene strani",
"access2" => "To sporo&#269;ilo vidi <strong>avtor</strong> in", "access2" => "To sporo&#269;ilo vidi <strong>avtor</strong> in",
"forum_admin" => "administratorji", "forum_admin" => "Administratorji",
"forum_manager" => "managerji", "forum_manager" => "Managerji",
"forum_clan" => "&#269;lani", "forum_clan" => "Člani",
"forum_registered" => "registrirani uporabniki", "forum_registered" => "Registrirani uporabniki",
"ForumAvatar" => "Avatar v forumu", "ForumAvatar" => "Avatar v forumu",
"avatar_notin3" => "ne v 3-kolonskem prikazu", "avatar_notin3" => "ne v 3-kolonskem prikazu",
"upload_ur_avatar" => "Nalo&#382;i svojega", "upload_ur_avatar" => "Nalo&#382;i svojega",
@ -6178,12 +6178,12 @@ $lang = array (
'srv_te_profile_name' => 'Izbrana prilagoditev teme', 'srv_te_profile_name' => 'Izbrana prilagoditev teme',
'srv_te_theme_edit' => 'Prilagodi', 'srv_te_theme_edit' => 'Prilagodi',
'srv_te_no_profiles' => 'Nimate še lastnih tem. Za prilagoditev teme, kliknite na "Prilagodi" poleg imena trenutne teme. Uporabite lahko tudi naprednješe CSS urejanje teme.', 'srv_te_no_profiles' => 'Nimate še lastnih tem. Za prilagoditev teme, kliknite na "Prilagodi" poleg imena trenutne teme. Uporabite lahko tudi naprednješe CSS urejanje teme.',
'srv_variableView_h_name' => 'Ime', 'srv_variableView_h_name' => 'Spremenljivka',
'srv_variableView_h_type' => 'Tip', 'srv_variableView_h_type' => 'Tip',
'srv_variableView_h_width' => 'Št. celih mest', 'srv_variableView_h_width' => 'Št. celih mest',
'srv_variableView_h_decimals' => 'Št. decimalk', 'srv_variableView_h_decimals' => 'Št. decimalk',
'srv_variableView_h_label' => 'Labela', 'srv_variableView_h_label' => 'Labela',
'srv_variableView_h_measure' => 'Merjenje', 'srv_variableView_h_measure' => 'Merska lestvica',
'srv_save_set_theme' => 'Izberi to temo za temo ankete', 'srv_save_set_theme' => 'Izberi to temo za temo ankete',
'srv_lnk_back_to_data' => 'Nazaj', 'srv_lnk_back_to_data' => 'Nazaj',
'srv_lnk_vpogled' => 'Vpogled', 'srv_lnk_vpogled' => 'Vpogled',
@ -7593,7 +7593,7 @@ $lang = array (
'as_modules' => "Nastavitve dodatnih modulov", 'as_modules' => "Nastavitve dodatnih modulov",
'as_debug' => "Debug mode", 'as_debug' => "Debug mode",
'as_installation_type' => "Tip namestitve (0-lastna, 1-www, 2-aai, 3-virtualka)", 'as_installation_type' => "Tip namestitve",
'as_app_settings-app_name' => "Ime aplikacije", 'as_app_settings-app_name' => "Ime aplikacije",
'as_app_settings-admin_email' => "Email administratorja", 'as_app_settings-admin_email' => "Email administratorja",

14
lang/2.php
View File

@ -1250,10 +1250,10 @@ $lang = array (
"deactive_column" => "Deactivate column", "deactive_column" => "Deactivate column",
"breakedPage_title" => "Page break title", "breakedPage_title" => "Page break title",
"access2" => "Who can see this post?", "access2" => "Who can see this post?",
"forum_admin" => "administrators", "forum_admin" => "Administrators",
"forum_manager" => "managers", "forum_manager" => "Managers",
"forum_clan" => "members", "forum_clan" => "Members",
"forum_registered" => "registered users", "forum_registered" => "Registered users",
"ForumAvatar" => "Avatar in forum", "ForumAvatar" => "Avatar in forum",
"avatar_notin3" => "not in 3-column view", "avatar_notin3" => "not in 3-column view",
"upload_ur_avatar" => "Upload your own", "upload_ur_avatar" => "Upload your own",
@ -6076,12 +6076,12 @@ $lang = array (
'srv_te_profile_name' => 'Selected theme modification', 'srv_te_profile_name' => 'Selected theme modification',
'srv_te_theme_edit' => 'Customize', 'srv_te_theme_edit' => 'Customize',
'srv_te_no_profiles' => 'You have no user themes. To customize a theme, click on the "Customize" option, found next to the current theme name. You can also use more advanced CSS editing options.', 'srv_te_no_profiles' => 'You have no user themes. To customize a theme, click on the "Customize" option, found next to the current theme name. You can also use more advanced CSS editing options.',
'srv_variableView_h_name' => 'Name', 'srv_variableView_h_name' => 'Variable',
'srv_variableView_h_type' => 'Type', 'srv_variableView_h_type' => 'Type',
'srv_variableView_h_width' => 'Width', 'srv_variableView_h_width' => 'Width',
'srv_variableView_h_decimals' => 'Decimals', 'srv_variableView_h_decimals' => 'Decimals',
'srv_variableView_h_label' => 'Label', 'srv_variableView_h_label' => 'Label',
'srv_variableView_h_measure' => 'Measure', 'srv_variableView_h_measure' => 'Scale',
'srv_save_set_theme' => 'Select this theme for current theme', 'srv_save_set_theme' => 'Select this theme for current theme',
'srv_lnk_back_to_data' => 'Back to data', 'srv_lnk_back_to_data' => 'Back to data',
'srv_lnk_vpogled' => 'Insight into cases', 'srv_lnk_vpogled' => 'Insight into cases',
@ -7480,7 +7480,7 @@ $lang = array (
'as_modules' => "Modules settings", 'as_modules' => "Modules settings",
'as_debug' => "Debug mode", 'as_debug' => "Debug mode",
'as_installation_type' => "Installation type (0-lastna, 1-www, 2-aai, 3-virtualka)", 'as_installation_type' => "Installation type",
'as_app_settings-app_name' => "App name", 'as_app_settings-app_name' => "App name",
'as_app_settings-admin_email' => "Admin email", 'as_app_settings-admin_email' => "Admin email",

2831
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

3
resources/sass/admin_new/pages/my_surveys/my_surveys.scss
View File

@ -6,5 +6,6 @@
@import "archives"; @import "archives";
@import "import_export"; @import "import_export";
@import "missing_values"; @import "missing_values";
@import "standardne_besede" @import "standardne_besede";
@import "podatki";

3
resources/sass/admin_new/pages/my_surveys/podatki.scss Normal file
View File

@ -0,0 +1,3 @@
table.variableView {
width: 100%;
}

31
resources/sass/admin_new/pages/settings/osnovne_nastavitve.scss Normal file
View File

@ -0,0 +1,31 @@
div.osnovne_nastavitve {
width: fit-content; //ne deluje, če želimo, da so nastavitve enako poravnane v vseh fieldsetih
div.osnovne_nastavitve_single {
display: flex;
flex-direction: row;
align-items: center;
justify-content: flex-end;
margin-bottom: 16px;
&:last-of-type {
margin-bottom: 0px;
}
label {
margin-right: 8px;
cursor: default;
}
input,
select {
width: 206px;
height: 28px;
margin: 0 !important;
font-size: 16px;
}
}
}

3
resources/sass/admin_new/pages/settings/settings.scss
View File

@ -1 +1,2 @@
@import "moj_profil.scss" @import "moj_profil.scss";
@import "osnovne_nastavitve.scss"