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

[Redizajn 1KA] Popupi: Status > Povzetek - Nastavitev obdobja

Browse Source
This commit is contained in:
tejagerjovic 2022-05-05 11:31:12 +02:00
parent a5b9ddc25a
commit 4f94c8b66f
8 changed files with 1616 additions and 1453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/survey/SurveyAdminSettings.php
View File

@ -7964,7 +7964,10 @@ class SurveyAdminSettings {
}
echo '</div>';
}
echo '</div>';
}
echo '</div>';
echo '</div>'; #div.question_comment_holder
}
}

82
admin/survey/classes/class.SurveyTimeProfiles.php
View File

@ -461,26 +461,52 @@ class SurveyTimeProfiles {
echo '<div id="timeProfileCoverDiv"></div>';
// div za kreacijo novega
echo '<div id="newProfileDiv">'.$lang['srv_missing_profile_name'].': ';
echo '<input id="newProfileName" name="newProfileName" type="text" value="" size="50" />';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'do_create\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_save'].'</span></a></span></span>';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel_create\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
echo '<div id="newProfileDiv">';
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" value=""/>';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="timeProfileAction(\'cancel_create\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo '<button class="medium blue" onclick="timeProfileAction(\'do_create\'); return false;">'.$lang['srv_analiza_arhiviraj_save'].'</button>';
echo '</div>';
echo '</div>';
// div za preimenovanje
echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': ';
echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" size="50" />';
echo '<div id="renameProfileDiv">';
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
echo '<input id="renameProfileName" class="text large" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" size="50" />';
echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '" />';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'do_rename\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel_rename\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="timeProfileAction(\'cancel_rename\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo '<button class="medium blue" onclick="timeProfileAction(\'do_rename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
echo '</div>';
echo '</div>';
// div za brisanje
echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . $currentFilterProfile['name'] . '</b>?';
echo '<div id="deleteProfileDiv">';
echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . $currentFilterProfile['name'] . '</span>?';
echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '" />';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'do_delete\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel_delete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="timeProfileAction(\'cancel_delete\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo '<button class="medium blue" onclick="timeProfileAction(\'do_delete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
echo '</div>';
}
/** Funkcija prikaze osnovnih informacije profila
@ -502,22 +528,30 @@ class SurveyTimeProfiles {
$time = $p_data['interval_txt'];
}
echo '<input type="radio" name="type" id="time_date_type" value="0" '.($type == '0' ? ' checked="checked"' : '').' autocomplete="off"><label> ' . $lang['srv_time_profile_from'] . ': </label>';
echo '<input id="startDate" type="text" name="startDate" value="' . $p_data['starts'] . '" onclick="changeTimeProfileType();" readonly="true" '.' autocomplete="off"/>&nbsp;';
echo '<span class="faicon calendar_icon icon-as_link" id="starts_img"></span>';
echo '<label> ' . $lang['srv_time_profile_to'] . ': </label>';
echo '<input id="endDate" type="text" name="endDate" value="' . $p_data['ends'] . '" onclick="changeTimeProfileType();" readonly="true" '.'cautocomplete="off"/>&nbsp;';
echo '<span class="faicon calendar_icon icon-as_link" id="expire_img"></span>' . "\n" ;
echo '<br />';
echo '<p><input type="radio" name="type" id="time_date_interval" value="1" '.($type == '0' ? '' : ' checked="checked"').' autocomplete="off">'.$lang['srv_statistic_period_label'].':';
echo '<select name="stat_interval" id="stat_interval" onclick="changeTimeProfileType(\'interval\');" '.'autocomplete="off">';
echo '<div class="setting_holder">';
echo '<p class="setting_title">' . $lang['srv_time_profile_time'] . '</p>';
echo '<div class="setting_item">';
echo '<input type="radio" name="type" id="time_date_type" value="0" '.($type == '0' ? ' checked="checked"' : '').' autocomplete="off"><label>' . $lang['srv_time_profile_from'] . ':</label>';
echo '<input id="startDate" type="text" class="text medium" name="startDate" value="' . $p_data['starts'] . '" onclick="changeTimeProfileType();" readonly="true" '.' autocomplete="off"/>&nbsp;';
echo '<span class="faicon calendar_icon pointer blue" id="starts_img"></span>';
echo '<label>' . $lang['srv_time_profile_to'] . ':</label>';
echo '<input id="endDate" type="text" class="text medium" name="endDate" value="' . $p_data['ends'] . '" onclick="changeTimeProfileType();" readonly="true" '.'cautocomplete="off"/>&nbsp;';
echo '<span class="faicon calendar_icon pointer blue" id="expire_img"></span>' . "\n" ;
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="type" id="time_date_interval" value="1" '.($type == '0' ? '' : ' checked="checked"').' autocomplete="off"><label>'.$lang['srv_statistic_period_label'].':</label>';
echo '<select class="dropdown medium" name="stat_interval" id="stat_interval" onclick="changeTimeProfileType(\'interval\');" '.'autocomplete="off">';
echo '<option value="" selected="true">'.$lang['srv_time_profile_choose_interval'].'</option>';
foreach (self::$STP_ARRAYS as $INTERVAL) {
echo '<option value="'.$INTERVAL.'"' . ($time == $INTERVAL ? ' selected' : '') . '>'.$lang['srv_diagnostics_'.$INTERVAL].'</option>';
}
echo '</select>';
echo '</p>';
echo '</div>';
echo '</div>';
echo '<script type="text/javascript">';
# za profil id=0 (privzet profil ne pustimo spreminjat
echo

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

@ -127,6 +127,9 @@ class CrossRoad {
$second_action = NAVI_TESTIRANJE_KOMENTARJI;
$layout_width = 'narrow';
if ($_GET['a'] == 'komentarji')
$layout_width = 'wide';
$layout_menu = '';
$status = 0;

3
lang/1.php
View File

@ -4621,7 +4621,8 @@ $lang = array (
"srv_quick_view_off" => "Onemogoči spreminjanje vnosov",
"without_changes" => "Brez sprememb",
"srv_time_profile_default" => "Vsi",
"srv_time_profile_from" => "za obdobje od",
"srv_time_profile_time" => "Za obdobje:",
"srv_time_profile_from" => "od",
"srv_time_profile_to" => "do",
"srv_time_profile_choose_interval" => "Izberite interval",
"srv_time_profile_link" => "Obdobje", # časovni interval

3
lang/2.php
View File

@ -4595,7 +4595,8 @@ $lang = array (
"srv_quick_view_off" => "Disable data editing",
"without_changes" => "Without changes",
"srv_time_profile_default" => "All",
"srv_time_profile_from" => "for a period from",
"srv_time_profile_time" => "For a period:",
"srv_time_profile_from" => "from",
"srv_time_profile_to" => "to",
"srv_time_profile_choose_interval" => "Choose interval",
"srv_time_profile_link" => "Dates",

2902
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

71
resources/sass/admin_new/components/popup/page_specific.scss Normal file
View File

@ -0,0 +1,71 @@
//STATUS
// Povzetek > Nastavitev obdobja
div#div_time_profiles {
//Vsebina popupa
div.popup_main {
div#time_profile_content {
.setting_holder {
margin-bottom: 16px;
display: flex;
flex-direction: column;
&:first-of-type{
margin-top: 0;
}
.setting_item {
margin-top: 8px;
label {
margin-right: 0;
}
input.text {
margin: 0 4px 0 4px;
}
span.faicon {
margin-right: 16px;
}
select.dropdown {
margin-left: 4px;
width: 130px;
}
}
}
}
}
//Nov profil, preimenuj profil
div#newProfileDiv,
div#renameProfileDiv {
.setting_holder {
margin-bottom: 16px;
display: flex;
flex-direction: column;
&:first-of-type{
margin-top: 0;
}
.setting_item {
margin-top: 8px;
label {
margin-right: 0;
}
input.text {
margin-left: 4px;
width: 469px;
}
}
}
}
}

2
resources/sass/admin_new/components/popup/popup.scss
View File

@ -13,3 +13,5 @@
@import "error";
@import "success_save";
@import "preview";
@import "page_specific";