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

Redesign - popravki glave pri neodgovor spremenljivke

Browse Source
This commit is contained in:
pero1203 2022-05-03 08:19:15 +02:00
parent cdb934c800
commit fd7695aa22
5 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
admin/survey/SurveyAdmin.php
View File

@ -3837,7 +3837,7 @@ class SurveyAdmin
echo '<span class="tooltip request-help">'; echo '<span class="tooltip request-help">';
echo '<a href="#" onclick="return false;" title="' . $lang['srv_request_help'] . '">'; echo '<a href="#" onclick="return false;">';
echo ' <span class="faicon users icon-as_link"></span>'; echo ' <span class="faicon users icon-as_link"></span>';
echo '</a>'; echo '</a>';
@ -5935,8 +5935,7 @@ class SurveyAdmin
echo '<div class="anketa_header_url setting_box tooltip">'; echo '<div class="anketa_header_url setting_box tooltip">';
if ($row['active'] == 1 && !SurveyInfo::getInstance()->checkSurveyModule('hierarhija')) { if ($row['active'] == 1 && !SurveyInfo::getInstance()->checkSurveyModule('hierarhija')) {
echo '<a href="' . $link . '" title="' . $lang['srv_urlankete'] . '" target="_blank">'.$link.'</a>'; echo '<a href="' . $link . '" target="_blank">'.$link.'</a>';
} }
elseif (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')) { elseif (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')) {
echo '<a href="'.$site_url.'sa" target="_blank">'.$site_url.'sa</a>'; echo '<a href="'.$site_url.'sa" target="_blank">'.$site_url.'sa</a>';
@ -5964,14 +5963,14 @@ class SurveyAdmin
# V kolikor gre za hierarhijo in uporabnik ni administrator hierarhije # V kolikor gre za hierarhijo in uporabnik ni administrator hierarhije
if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')){ if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')){
if ($hierarhija_type == 1) { if ($hierarhija_type == 1) {
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_HIERARHIJA_SUPERADMIN . '&amp;m=' . M_ADMIN_AKTIVACIJA . '" class="srv_ico" title="' . $lang['srv_anketa_noactive'] . '">'; echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_HIERARHIJA_SUPERADMIN . '&amp;m=' . M_ADMIN_AKTIVACIJA . '" class="srv_ico">';
} }
else{ else{
echo '<a href="#" class="srv_ico" title="' . $lang['srv_anketa_active'] . '" style="cursor:text !important;">'; echo '<a href="#" class="srv_ico" style="cursor:text !important;">';
} }
} }
else { else {
echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->anketa . '\',\'' . $row['active'] . '\'); return false;" title="' . $lang['srv_anketa_active'] . '">'; echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->anketa . '\',\'' . $row['active'] . '\'); return false;">';
} }
echo '<div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div>'; echo '<div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div>';
@ -5984,13 +5983,13 @@ class SurveyAdmin
//Preden anketo aktiviramo preverimo, če gre tudi za izgradnjo hierarhije in če anketa še ni bila aktivirana //Preden anketo aktiviramo preverimo, če gre tudi za izgradnjo hierarhije in če anketa še ni bila aktivirana
if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')){ if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')){
if ($hierarhija_type == 1) { if ($hierarhija_type == 1) {
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_HIERARHIJA_SUPERADMIN . '&amp;m=' . M_ADMIN_AKTIVACIJA . '" class="srv_ico" title="' . $lang['srv_anketa_noactive'] . '">'; echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_HIERARHIJA_SUPERADMIN . '&amp;m=' . M_ADMIN_AKTIVACIJA . '" class="srv_ico">';
} else{ } else{
echo '<a href="#" class="srv_ico" title="' . $lang['srv_anketa_noactive'] . '">'; echo '<a href="#" class="srv_ico">';
} }
} }
else { else {
echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;" title="' . $lang['srv_anketa_noactive'] . '">'; echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;">';
} }
if ((int)$_last_active > 0) { if ((int)$_last_active > 0) {
@ -6019,17 +6018,17 @@ class SurveyAdmin
$prevent_unlock = (SurveyInfo::getSurveyModules('hierarhija') == 2 || $d->checkDostopSub('lock') && $row['locked'] == 1 && ($admin_type != 0 && $admin_type != 1)) ? 1 : 0; $prevent_unlock = (SurveyInfo::getSurveyModules('hierarhija') == 2 || $d->checkDostopSub('lock') && $row['locked'] == 1 && ($admin_type != 0 && $admin_type != 1)) ? 1 : 0;
if ($prevent_unlock == 1) { if ($prevent_unlock == 1) {
echo '<input type="hidden" name="prevent_unlock" id="prevent_unlock" value="1">'; echo '<input type="hidden" name="prevent_unlock" id="prevent_unlock" value="1">';
echo '<a class="anketa_img_nav" title="' . $lang['srv_anketa_locked_close'] . '">'; echo '<a class="anketa_img_nav">';
echo '<span class="faicon lock_close"></span>'; echo '<span class="faicon lock_close"></span>';
echo '</a>'; echo '</a>';
} }
else { else {
# zaklepanje # zaklepanje
if ($hierarhija_type == 10) { if ($hierarhija_type == 10) {
echo '<a href="#" class="anketa_img_nav" title="' . $lang['srv_anketa_locked_' . $row['locked']] . '" style="cursor:text !important;">'; echo '<a href="#" class="anketa_img_nav" style="cursor:text !important;">';
} }
else { else {
echo '<a class="anketa_img_nav" href="javascript:anketa_lock(\'' . $this->anketa . '\', \'' . ($row['locked'] == 0 ? '1' : '0') . '\', \''.$row['mobile_created'].'\');" title="' . $lang['srv_anketa_locked_' . $row['locked']] . '">'; echo '<a class="anketa_img_nav" href="javascript:anketa_lock(\'' . $this->anketa . '\', \'' . ($row['locked'] == 0 ? '1' : '0') . '\', \''.$row['mobile_created'].'\');" >';
} }
echo '<span class="faicon lock' . ($row['locked'] == 0 ? '_open' : '_close') . '"></span>'; echo '<span class="faicon lock' . ($row['locked'] == 0 ? '_open' : '_close') . '"></span>';
echo '</a>'; echo '</a>';
@ -6048,7 +6047,7 @@ class SurveyAdmin
echo '<div class="anketa_header_test setting_box tooltip">'; echo '<div class="anketa_header_test setting_box tooltip">';
echo ' <a href="' . $link . '&preview=on&testdata=on' . $preview_options . '" title="'.$lang['srv_survey_testdata'].'" target="_blank"><span class="faicon monitor"></span></a> '; echo ' <a href="' . $link . '&preview=on&testdata=on' . $preview_options . '" target="_blank"><span class="faicon monitor"></span></a> ';
echo ' <div class="expanded-tooltip bottom" id="test_data_content">'; echo ' <div class="expanded-tooltip bottom" id="test_data_content">';
$this->tooltip_test_data(); $this->tooltip_test_data();
@ -6061,7 +6060,7 @@ class SurveyAdmin
// Predogled in testiranje (ikona monitor) // Predogled in testiranje (ikona monitor)
echo '<div class="anketa_header_preview setting_box tooltip">'; echo '<div class="anketa_header_preview setting_box tooltip">';
echo ' <a href="' . $link . '&preview=on' . $preview_options . '" target="_blank" title="'.$lang['srv_monitor_toolbox_title'].'"><span class="faicon monitor"></span><span class="text">'.$lang['srv_poglejanketo2'].'</span></a> '; echo ' <a href="' . $link . '&preview=on' . $preview_options . '" target="_blank"><span class="faicon monitor"></span><span class="text">'.$lang['srv_poglejanketo2'].'</span></a> ';
echo ' <div class="expanded-tooltip bottom" id="preview_data_content">'; echo ' <div class="expanded-tooltip bottom" id="preview_data_content">';
$this->tooltip_preview_data(); $this->tooltip_preview_data();

7
admin/survey/classes/class.SurveyStaticHtml.php
View File

@ -448,20 +448,21 @@ class SurveyStaticHtml
echo '</div>'; echo '</div>';
$borderLeft = ' class="borderLeft"'; $borderLeft = ' class="borderLeft"';
} // Link nazaj na podatke - Spremenljivke }
// Link nazaj na podatke - Spremenljivke
elseif ($podstran == 'para_analysis_graph') { elseif ($podstran == 'para_analysis_graph') {
// Info o neodgovorih // Info o neodgovorih
echo '<div id="nonresponse_info">'; echo '<div id="nonresponse_info">';
echo $lang['srv_para_graph_text2']; echo $lang['srv_para_graph_text2'];
echo '</div>'; echo '</div>';
$borderLeft = ' class="borderLeft"';
echo '<div id="additional_navigation" ' . $borderLeft . ' style="padding-left: 40px;">'; echo '<div id="additional_navigation" class="nonresponse">';
echo '<span ' . (!isset($_GET['m']) || $_GET['m'] == '' ? 'class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '">' . $lang['srv_para_label_variables'] . '</a></span>'; echo '<span ' . (!isset($_GET['m']) || $_GET['m'] == '' ? 'class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '">' . $lang['srv_para_label_variables'] . '</a></span>';
echo '<span ' . ($_GET['m'] === 'breaks' ? 'class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '&m=breaks">' . $lang['srv_para_label_breaks'] . '</a></span>'; echo '<span ' . ($_GET['m'] === 'breaks' ? 'class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '&m=breaks">' . $lang['srv_para_label_breaks'] . '</a></span>';
echo '<span ' . ($_GET['m'] === 'advanced' ? 'class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '&m=advanced">' . $lang['srv_para_label_details'] . '</a></span>'; echo '<span ' . ($_GET['m'] === 'advanced' ? 'class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '&m=advanced">' . $lang['srv_para_label_details'] . '</a></span>';
echo '</div>'; echo '</div>';
$borderLeft = ' class="borderLeft"'; $borderLeft = ' class="borderLeft"';
} }
elseif ($podstran == 'aapor') { elseif ($podstran == 'aapor') {

10
public/css/admin_new.css
View File

@ -6916,6 +6916,7 @@ a.help {
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #C4C4C4; border: 1px solid #C4C4C4;
box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07); box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
cursor: auto;
margin-top: 14px; margin-top: 14px;
padding: 12px; padding: 12px;
border-radius: 2px; border-radius: 2px;
@ -8612,8 +8613,8 @@ header #topSettingsHolder {
border-bottom: 1px #E5E5E5 solid; border-bottom: 1px #E5E5E5 solid;
} }
header #topSettingsHolder .borderLeft { header #topSettingsHolder .borderLeft {
padding-left: 20px; padding-left: 32px;
border-left: 1px dotted #E5E5E5; border-left: 1px solid #E5E5E5;
} }
header #topSettingsHolder .left_options_holder { header #topSettingsHolder .left_options_holder {
display: flex; display: flex;
@ -8644,6 +8645,11 @@ header #topSettingsHolder .left_options_holder #additional_navigation span span.
line-height: 0px; line-height: 0px;
margin-right: 32px; margin-right: 32px;
} }
header #topSettingsHolder .left_options_holder #additional_navigation.nonresponse {
margin-left: 32px;
padding-left: 0;
border-left: 1px #E5E5E5 solid;
}
header #topSettingsHolder .left_options_holder #dataOnlyValid { header #topSettingsHolder .left_options_holder #dataOnlyValid {
position: relative; position: relative;
display: flex; display: flex;

11
resources/sass/admin_new/components/header/navigation.scss
View File

@ -258,8 +258,8 @@ header{
border-bottom: 1px $gray solid; border-bottom: 1px $gray solid;
.borderLeft { .borderLeft {
padding-left: 20px; padding-left: 32px;
border-left: 1px dotted $gray; border-left: 1px solid $gray;
} }
@ -301,6 +301,13 @@ header{
margin-right: 32px; margin-right: 32px;
} }
} }
&.nonresponse{
margin-left: 32px;
padding-left: 0;
border-left: 1px $gray solid;
}
} }
// Veljavni/ustrezni // Veljavni/ustrezni

1
resources/sass/admin_new/components/hover/qtip.scss
View File

@ -175,6 +175,7 @@
.expanded-tooltip-box{ .expanded-tooltip-box{
@include hover_basic(); @include hover_basic();
cursor: auto;
margin-top: 14px; margin-top: 14px;
padding: 12px; padding: 12px;