Redesign - popupi v analizah - V DELU

This commit is contained in:
pero1203 2022-02-21 11:23:05 +01:00
parent ac39d7b742
commit 109efddbe4
14 changed files with 1995 additions and 2243 deletions

View File

@ -7763,12 +7763,8 @@ class Branching {
echo '<div class="condition_editing_preview">';
//echo '<div class="condition_editing_naslov">'.$lang['sintaksa_if'].'</div>';
echo '<div class="condition_editing_naslov_holder">';
echo '<div id="div_condition_editing_conditions">';
//zacetni oklepaj za if
// echo '<span class="zacetni-oklepaj" id="zacetni_oklepaj_'.$if.'" style="display:none;"></span>';
$this->conditions_display($if, 1, 1);
echo '</div>';
echo '</div>';

View File

@ -71,40 +71,56 @@ class SurveyCondition
$popUp->setHeaderText($lang[''].'Filtriranje s pogoji');
#vsebino shranimo v buffer
ob_start();
echo '<div class="popup_main with_menu">';
echo '<input type="hidden" id="chooseProfileJSAction" value="'.$this->_chooseProfileJSAction.'" />';
echo '<div class="condition_profile_holder">';
echo '<div class="popup_left condition_profile_holder">';
echo '<div id="condition_profile" class="select">';
if (count($this->_conditions) > 0)
{
echo '<div id="condition_profile" class="list select">';
if (count($this->_conditions) > 0){
foreach ($this->_conditions as $key => $value) {
echo '<div class="option' . ( $pid == $value['id'] ? ' active' : '') . '" data-cid="' . $value['id'] . '" onclick="showSurveyCondition(\''.$value['id'].'\')">' . $value['name'] .'</div>';
echo '<div class="list_item option' . ( $pid == $value['id'] ? ' active' : '') . '" data-cid="' . $value['id'] . '" onclick="showSurveyCondition(\''.$value['id'].'\')">' . $value['name'] .'</div>';
}
}
echo '</div>';
echo '</div>';
# tukaj prikazemo vsebino ifa
echo '<div id="div_cp_preview">';
echo '<div id="div_cp_preview class="popup_right">';
echo '<div id="div_cp_preview_content">';
if ($pid > 0)
{
if ($pid > 0){
$b = new Branching($this->_sid);
$b->condition_editing($pid, -2);
} else {
}
else {
echo 'Dodaj nov pogoj:';
echo '<input id="newSurveyConditionName" placeholder="Ime pogoja" >';
echo '<a href="#" onclick="newSurveyCondition(); return false;" class="faicon if_add" style="margin-left: 5px;" title="Dodaj nov pogoj"> Dodaj nov pogoj</a>';
}
echo '</div>';
echo '</div>';
echo '</div>';
echo '<div id="surveyConditionCover"></div>';
echo '<div id="renameProfileDiv"></div>';
$content = ob_get_clean();
#dodamo vsebino
$popUp->setContent($content);
@ -113,8 +129,7 @@ class SurveyCondition
#dodamo gumb izberi profil
$confirmAction = 'genericAlertPopup(\'alert_no_action_set\')';
if (isset($this->_chooseProfileJSAction) && !empty($this->_chooseProfileJSAction))
{
if (isset($this->_chooseProfileJSAction) && !empty($this->_chooseProfileJSAction)){
$confirmAction = $this->_chooseProfileJSAction;
}
$button = new PopUpButton($lang['srv_choose_profile']);
@ -137,9 +152,7 @@ class SurveyCondition
$popUp->addButton($button);
}
echo $popUp;
echo $popUp;
}
private function newCondition()

View File

@ -202,38 +202,48 @@ class SurveyConditionProfiles
echo '<div class="popup_close"><a href="#" onClick="conditionProfileAction(\'cancle\'); return false;">✕</a></div>';
if ( self :: $currentProfileId != SCP_DEFAULT_PROFILE ) {
echo '<div id="not_default_setting">';
echo '<div id="not_default_setting" class="popup_note">';
echo $lang['srv_not_default_setting'];
echo '</div><br class="clr displayNone">';
echo '</div>';
}
echo '<div class="condition_profile_holder">';
echo '<div class="popup_main with_menu">';
echo '<div class="popup_left condition_profile_holder">';
echo '<div id="condition_profile" class="select">';
foreach (self :: $profiles as $key => $value) {
echo ' <div class="option' . ( $_currMPID == $value['id'] ? ' active' : '') . '" id="condition_profile_' . $value['id'] . '" value="'.$value['id'].'">';
echo $value['name'];
if($_currMPID == $value['id']){
if ( self :: $profiles[$_currMPID]['if_id'] != 0) {
echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="conditionProfileAction(\'deleteAsk\'); return false;"><span class="faicon delete floatRight"></span></a>';
}
if ( self :: $profiles[$_currMPID]['if_id'] != 0) {
echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="conditionProfileAction(\'renameAsk\'); return false;"><span class="faicon edit floatRight spaceRight"></span></a>';
}
}
echo '</div>';
}
echo '</div>';
echo '<div class="clr"></div>';
echo '<div id="condition_profile" class="list select">';
foreach (self :: $profiles as $key => $value) {
echo '<div class="list-item option' . ( $_currMPID == $value['id'] ? ' active' : '') . '" id="condition_profile_' . $value['id'] . '" value="'.$value['id'].'">';
echo $value['name'];
if($_currMPID == $value['id']){
echo '<div class="profile_icons">';
if ( self :: $profiles[$_currMPID]['if_id'] != 0) {
echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="conditionProfileAction(\'deleteAsk\'); return false;"><span class="faicon delete floatRight"></span></a>';
}
if ( self :: $profiles[$_currMPID]['if_id'] != 0) {
echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="conditionProfileAction(\'renameAsk\'); return false;"><span class="faicon edit floatRight spaceRight"></span></a>';
}
echo '</div>';
}
echo '</div>';
}
echo '</div>';
echo '<button class="small white-black" onclick="conditionProfileAction(\'newName\'); return false;"><span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'].'</button>';
echo '</div>';
// tukaj prikazemo vsebino ifa
echo '<div id="div_cp_preview">';
echo '<div id="div_cp_preview" class="popup_right">';
echo ' <div id="div_cp_preview_content">';
if (self :: $profiles[$_currMPID]['if_id'] > 0) {
@ -245,17 +255,17 @@ class SurveyConditionProfiles
}
echo ' </div>';
echo '</div>';
echo '</div>';
echo '<div id="conditionProfileButtons">';
// gumbi: preklici, ustvari nov, pozeni trenutni
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="conditionProfileAction(\'run\'); return false;"><span>'.$lang['srv_run_selected_profile'].'</span></a></span></span>';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="conditionProfileAction(\'newName\'); return false;"><span>'.$lang['srv_create_new_profile'].'</span></a></span></span>';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="conditionProfileAction(\'cancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
echo '<div id="conditionProfileButtons" class="button_holder">';
echo ' <button class="medium white-blue" onclick="conditionProfileAction(\'cancle\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo ' <button class="medium blue" onclick="conditionProfileAction(\'run\'); return false;">'.$lang['srv_run_selected_profile'].'</button>';
echo '</div>';

View File

@ -632,6 +632,8 @@ class SurveyDataSettingProfiles {
echo $profile['name'];
if($current_pid == $id){
echo '<div class="profile_icons">';
# sistemskega ne moremo izbrisati
if ($current_pid != 0) {
echo ' <a href="#" onclick="dataSettingProfileAction(\'show_delete\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
@ -640,6 +642,8 @@ class SurveyDataSettingProfiles {
if ($current_pid > 0) {
echo ' <a href="#" onclick="dataSettingProfileAction(\'show_rename\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
}
echo '</div>';
}
echo '</div>';

View File

@ -629,31 +629,42 @@ class SurveyInspect {
}
function showInspectListSpr() {
global $lang, $site_url;
$all_spr = Cache::cache_all_srv_spremenljivka($this->sid);
$vars = $_SESSION['dataSetting_profile'][$this->sid]['InspectListVars'];
echo '<div id="dsp_inspect_cover">';
echo '<div id="dsp_inspect_spr_select">';
echo '<span>'.$lang['srv_inspect_choose'].'</span>';
echo '<div id="dsp_inspect_cover">';
echo '<h2>'.$lang['srv_questions'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="$(\'#inspect_cover_div\').hide(); $(\'#fullscreen\').removeClass(\'z-index200\').fadeOut();">✕</a></div>';
echo '<div id="dsp_inspect_spr_select" class="popup_main">';
echo '<div class="setting_line">'.$lang['srv_inspect_choose'].'</div>';
echo '<div class="settings_block">';
foreach ($all_spr AS $id => $spremenljivka) {
echo '<div class="dsp_inspect_var">';
echo '<input name="dsp_inspect_vars" id="dsp_inspect_var_'.$spremenljivka['id'].'" value="'.$spremenljivka['id'].'" type="checkbox"'
.(is_array($vars) && in_array($spremenljivka['id'],$vars) ? ' checked' : '').'>';
echo '<label for="dsp_inspect_var_'.$spremenljivka['id'].'">'.$spremenljivka['variable'].' - '.strip_tags($spremenljivka['naslov']).'</label>';
echo '<div class="setting_line dsp_inspect_var">';
echo ' <input name="dsp_inspect_vars" id="dsp_inspect_var_'.$spremenljivka['id'].'" value="'.$spremenljivka['id'].'" type="checkbox"'.(is_array($vars) && in_array($spremenljivka['id'],$vars) ? ' checked' : '').'>';
echo ' <label for="dsp_inspect_var_'.$spremenljivka['id'].'">'.$spremenljivka['variable'].' - '.strip_tags($spremenljivka['naslov']).'</label>';
echo '</div>';
}
echo '</div>';
echo '</div>';
echo '<div class="inv_FS_btm">';
echo '<div id="navigationBottom" class="printHide">';
echo '<span id="dsp_inspect_cancel" class="floatLeft spaceLeft buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#"><span>'.$lang['srv_cancel'].'</span></a></span>';
echo '<span id="dsp_inspect_save" class="floatRight spaceRight buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#"><span>'.$lang['srv_zapri'].'</span></a></span>';
echo '<div class="clr" />';
echo '<div class="button_holder">';
echo ' <button id="dsp_inspect_cancel" class="medium white-blue">'.$lang['srv_cancel'].'</button>';
echo ' <button id="dsp_inspect_save" class="medium blue">'.$lang['srv_zapri'].'</button>';
echo '</div>';
#echo '</div>';
echo '</div>';
}

View File

@ -95,38 +95,44 @@ class SurveyMissingProfiles
}
if ( self::$currentProfileId != SMP_DEFAULT_PROFILE ) {
echo '<div id="not_default_setting">';
echo '<div id="not_default_setting" class="popup_note">';
echo $lang['srv_not_default_setting'];
echo '</div><br class="clr displayNone">';
echo '</div>';
}
echo ' <div id="missing_profile_holder">';
echo '<div class="popup_main with_menu">';
echo ' <div id="missing_profile_holder" class="popup_left">';
self :: DisplayProfileOptions($pid);
echo '<button class="small white-black" onclick="missingProfileAction(\'newName\'); return false;"><span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'].'</button>';
echo ' </div>';
echo ' <div id="missing_profile_data_holder">';
echo ' <div id="missing_profile_data_holder" class="popup_right">';
self :: DisplayProfileData($pid);
echo ' </div>';
echo '</div>';
// GUMBI
echo '<div style="margin: 15px 0 0 0; float:right;">';
# shrani kot seja
echo '<div class="button_holder">';
# preklici - zapri
echo '<button class="medium white-blue" onclick="missingProfileAction(\'cancle\'); return false;">'.$lang['srv_close_profile'].'</button>';
# shrani kot seja
if (self::$profiles[$pid]['system'] == 1 || $pid == -1) {
$run_lbl = $lang['srv_run_as_session_profile'];
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="missingProfileAction(\'runSession\'); return false;"><span>'.$run_lbl.'</span></a></span></span>';
} else {
echo '<button class="medium blue" onclick="missingProfileAction(\'runSession\'); return false;">'.$run_lbl.'</</button>';
}
else {
# shrani - pozeni
$run_lbl = $lang['srv_run_profile'];
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="missingProfileAction(\'run\'); return false;"><span>'.$run_lbl.'</span></a></span></span>';
echo '<button class="medium blue" onclick="missingProfileAction(\'run\'); return false;">'.$run_lbl.'</</button>';
}
# shrani kot nov profil
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="missingProfileAction(\'newName\'); return false;"><span>'.$lang['srv_create_new_profile'].'</span></a></span></span>';
# preklici - zapri
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="missingProfileAction(\'cancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
echo '</div>';
echo '</div>';
// cover Div
@ -247,20 +253,25 @@ class SurveyMissingProfiles
static function DisplayProfileOptions($pid) {
global $lang;
echo '<div id="missing_profile" class="select">';
echo '<div id="missing_profile" class="list select">';
foreach ( self::$profiles as $key => $profile ) {
echo '<div id="missing_profile_'.$profile['id'].'" class="option' . ($profile['id'] == $pid ? ' active' : '') . '" value="' . $profile['id'] . '">';
echo '<div id="missing_profile_'.$profile['id'].'" class="list-item option' . ($profile['id'] == $pid ? ' active' : '') . '" value="' . $profile['id'] . '">';
echo $profile['name'];
if($profile['id'] == $pid){
echo '<div class="profile_icons">';
if (self::$profiles[$pid]['system'] != 1 ) {
echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="missingProfileAction(\'deleteAsk\'); return false;"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="missingProfileAction(\'deleteAsk\'); return false;"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
}
if (self::$profiles[$pid]['system'] != 1 && $pid != -1) {
echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="missingProfileAction(\'renameAsk\'); return false;"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="missingProfileAction(\'renameAsk\'); return false;"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
}
echo '</div>';
}
echo '</div>';
@ -268,11 +279,8 @@ class SurveyMissingProfiles
echo '</div>';
echo '<script>';
echo '$(function() {';
echo 'scrollToProfile("#missing_profile_'.$pid.'");';
echo '});';
echo ' $( function(){scrollToProfile("#missing_profile_'.$pid.'");} );';
echo '</script>';
}
/** klici ajax funkcij

View File

@ -291,68 +291,84 @@ class SurveyVariablesProfiles
if ($cvp == null)
$cvp = self::$currentId;
$svp_ap = self::$profiles;
$svp_pv = self :: getProfileVariables($cvp);
$svp_av = self::$SDF->getSurveyVariables();
if ( self::$currentId != SVP_DEFAULT_PROFILE ) {
echo '<div id="not_default_setting">';
echo '<div id="not_default_setting" class="popup_note">';
echo $lang['srv_not_default_setting'];
echo '</div>';
echo '<br class="clr" />';
}
echo '<div class="variable_profile_holder">';
echo ' <div id="variable_profile" class="select">';
echo '<div class="popup_main with_menu">';
echo '<div class="variable_profile_holder popup_left">';
echo ' <div id="variable_profile" class="list select">';
foreach ($svp_ap as $key => $value) {
echo '<div class="option'.($cvp==$value['id']?' active':'').'" value="'.$value['id'].'" '.($cvp==$value['id'] ? '' : ' onclick="changeVariableProfile(\''.$value['id'].'\');"').'>';
echo '<div class="list-item option'.($cvp==$value['id']?' active':'').'" value="'.$value['id'].'" '.($cvp==$value['id'] ? '' : ' onclick="changeVariableProfile(\''.$value['id'].'\');"').'>';
echo $value['name'];
if($cvp == $value['id']){
echo '<div class="profile_icons">';
// izbriši
if ((int)$cvp != 0){
echo ' <a href="#" onclick="variableProfileAction(\'deleteAsk\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
echo ' <a href="#" onclick="variableProfileAction(\'deleteAsk\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
}
// preimenuj
if ((int)$cvp != 0){
echo ' <a href="#" onclick="variableProfileAction(\'renameAsk\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit icon-as_link floatRight spaceRight"></span></a>'."\n";
echo ' <a href="#" onclick="variableProfileAction(\'renameAsk\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit icon-as_link floatRight spaceRight"></span></a>'."\n";
}
echo '</div>';
}
echo '</div>';
}
echo ' </div>';
// izberi / odznaci vse
echo '<div style="position:absolute; bottom:20px; left:20px;">';
echo '<a href="#" onClick="variableProfileSelectAll(1); return false;">'.$lang['srv_select_all'].'</a>';
echo ' / <a href="#" onClick="variableProfileSelectAll(0); return false;">'.$lang['srv_deselect_all'].'</a>';
echo '</div>';
echo '</div>';
echo '<div id="vp_list">';
echo '<div id="vp_list" class="popup_right">';
$empty = count($svp_pv) == 0;
echo '<ul id="vp_list_ul" class="left">';
if (count($svp_av) > 0)
{
foreach($svp_av as $key => $variabla)
{
echo '<div id="vp_list_ul" class="settings_block">';
if (count($svp_av) > 0){
foreach($svp_av as $key => $variabla){
$_name = self::$SDF->getVariableName($key);
$checked = ($empty || in_array($key, $svp_pv));
echo '<li'.($checked?' class="selected"':'').'>';
echo '<label>';
echo '<input type="checkbox" '.($checked?' checked="checekd"':'').' name="vp_list_li" value="'.$key.'" id="variable_'.$key.'" onchange="variableProfileCheckboxChange(this);">'.limitString($_name);
echo '</label></li>';
echo '<div class="setting_line">';
echo ' <input type="checkbox" '.($checked?' checked="checekd"':'').' name="vp_list_li" value="'.$key.'" id="variable_'.$key.'" onchange="variableProfileCheckboxChange(this);">';
echo ' <label for="variable_'.$key.'">'.limitString($_name).'</label>';
echo '</div>';
}
}
echo '</ul>';
echo '</div>';
// izberi / odznaci vse
echo '<div class="settings_block">';
echo ' <div class="setting_line">';
echo ' <a href="#" onClick="variableProfileSelectAll(1); return false;">'.$lang['srv_select_all'].'</a> / <a href="#" onClick="variableProfileSelectAll(0); return false;">'.$lang['srv_deselect_all'].'</a>';
echo ' </div>';
echo '</div>';
echo '</div>';
echo '</div>';
// cover Div
echo '<div id="variableProfileCoverDiv"></div>';
@ -400,35 +416,29 @@ class SurveyVariablesProfiles
#dodamo vsebino
$popUp->setContent($content);
# gumb izberi
$button = new PopUpButton($lang['srv_choose_profile']);
$button -> setFloat('right')
->setButtonColor('orange')
-> addAction('onClick','variableProfileAction(\'choose\'); return false;');
# dodamo gumb Preklici
$button = new PopUpCancelButton();
$popUp->addButton($button);
# gumb shrani
if ((int)$cvp != 0)
{
if ((int)$cvp != 0){
$button = new PopUpButton($lang['srv_save_profile']);
$button -> setFloat('right')
->setButtonColor('gray')
-> addAction('onClick','variableProfileAction(\'save\'); return false;');
$button->addAction('onClick','variableProfileAction(\'save\'); return false;');
$popUp->addButton($button);
}
# gumb shrani kot now
$button = new PopUpButton($lang['srv_new_profile_name']);
$button -> setFloat('right')
-> addAction('onClick','variableProfileAction(\'newName\'); return false;');
$button->addAction('onClick','variableProfileAction(\'newName\'); return false;');
$popUp->addButton($button);
# dodamo gumb Preklici
$button = new PopUpCancelButton();
$button -> setFloat('right');
# gumb izberi
$button = new PopUpButton($lang['srv_choose_profile']);
$button -> setFloat('right')
->setButtonColor('orange')
-> addAction('onClick','variableProfileAction(\'choose\'); return false;');
$popUp->addButton($button);
echo $popUp;
}

View File

@ -174,6 +174,7 @@ class SurveyZankaProfiles {
break;
}
}
static function showProfiles ($pid = null) {
global $lang;
@ -206,49 +207,61 @@ class SurveyZankaProfiles {
}
}
}
#echo '<div id="currentZankaProfile">'.$lang['srv_analiza_selected_profile'].': <b>' . self::$profiles[$pid]['name'] . '</b></div >'.NEW_LINE;
if ( self::$currentProfileId != SZP_DEFAULT_PROFILE ) {
echo '<div id="not_default_setting">';
echo '<div id="not_default_setting" class="popup_note">';
echo $lang['srv_not_default_setting'];
echo '</div><br class="clr displayNone">';
echo '</div>';
}
echo '<div class="zanka_profile_holder">'.NEW_LINE;
echo ' <div id="zanka_profile" class="select">'.NEW_LINE;
echo '<div class="popup_main with_menu">';
echo '<div class="popup_left zanka_profile_holder">'.NEW_LINE;
echo ' <div id="zanka_profile" class="list select">'.NEW_LINE;
if (count(self::$profiles) > 0 ){
foreach (self::$profiles as $key => $value) {
if ($value['id'] != null) {
echo '<div class="option' . ($pid == $value['id'] ? ' active' : '') . '" id="zanka_profile_' . $value['id'] . '" value="'.$value['id'].'">';
echo '<div class="list-item option' . ($pid == $value['id'] ? ' active' : '') . '" id="zanka_profile_' . $value['id'] . '" value="'.$value['id'].'">';
echo $value['name'];
if($value['id'] == $pid){
echo '<div class="profile_icons">';
if ( $pid != 0) {
# sistemskega ne pustimo izbrisat
# sistemskega ne pustimo izbrisat
echo ' <a href="#" title="'.$lang['srv_delete_profile'].'" onclick="zankaProfileAction(\'deleteAsk\'); return false;"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'.NEW_LINE;
}
if ( $pid > 0) {
# seje in sistemskega ne pustimo preimenovat
# seje in sistemskega ne pustimo preimenovat
echo ' <a href="#" title="'.$lang['srv_rename_profile'].'" onclick="zankaProfileAction(\'renameAsk\'); return false;"><span class="faicon edit icon-as_link floatRight spaceRight"></span></a>'.NEW_LINE;
}
}
echo '</div>';
}
echo '</div>'.NEW_LINE;
}
}
}
echo ' <button class="small white-black" onclick="zankaProfileAction(\'newName\'); return false;">'.$lang['srv_save_new_profile'].'</button>'.NEW_LINE;
echo ' </div>'.NEW_LINE;
echo '<div class="clr"></div>'.NEW_LINE;
echo '</div>'.NEW_LINE;
// izrišemo dva stolpca z možnostjo premikanja enih in drugih variabelS
echo '<div id="fs_list">'.NEW_LINE;
echo '<div id="fs_list" class="popup_right">'.NEW_LINE;
echo '<div class="left link_no_decoration">'.NEW_LINE;
echo $lang['srv_select'].NEW_LINE;
echo '<a href="#" onclick="return $.dds.selectAll(\'fs_list_3\');">'.$lang['srv_all'].'</a>'.NEW_LINE;
@ -303,22 +316,27 @@ class SurveyZankaProfiles {
echo '});'.NEW_LINE;
echo '</script>'.NEW_LINE;
echo '<br class="clr" />'.NEW_LINE;
echo '</div>'.NEW_LINE;
echo '<div id="missingProfilebuttons">'.NEW_LINE;
if ((int)$pid < 0 ) {// pri seji in sistemskem ne pustimo shranjevanja
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zankaProfileAction(\'runSession\'); return false;"><span>'.$lang['srv_run_as_session_profile'].'</span></a></span></span>'.NEW_LINE;
} else {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zankaProfileAction(\'run\'); return false;"><span>'.$lang['srv_save_and_run_profile'].'</span></a></span></span>'.NEW_LINE;
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'runSession\'); return false;"><span>'.$lang['srv_run_as_session_profile'].'</span></a></span></span>'.NEW_LINE;
echo '</div>';
echo '<div id="missingProfilebuttons" class="button_holder">'.NEW_LINE;
echo '<button class="medium white-blue" onclick="zankaProfileAction(\'cancle\'); return false;">'.$lang['srv_close_profile'].'</button>'.NEW_LINE;
// pri seji in sistemskem ne pustimo shranjevanja
if ((int)$pid < 0 ) {
echo '<button class="medium blue" onclick="zankaProfileAction(\'runSession\'); return false;">'.$lang['srv_run_as_session_profile'].'</button>'.NEW_LINE;
}
else {
echo '<button class="medium white-blue" onclick="zankaProfileAction(\'runSession\'); return false;">'.$lang['srv_run_as_session_profile'].'</button>'.NEW_LINE;
echo '<button class="medium blue" onclick="zankaProfileAction(\'run\'); return false;">'.$lang['srv_save_and_run_profile'].'</button>'.NEW_LINE;
}
echo '<span class="floatRight spaceLeft"><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'newName\'); return false;"><span>'.$lang['srv_save_new_profile'].'</span></a></span></span>'.NEW_LINE;
echo '<span class="floatRight spaceLeft"><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'cancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'.NEW_LINE;
echo '</div>'.NEW_LINE;
echo '<div id="zankaProfileCoverDiv"></div>'.NEW_LINE;
// div za shranjevanje novega profila

View File

@ -236,6 +236,8 @@ class SurveyZoom
echo $profile['name'];
if($current_pid == $id){
echo '<div class="profile_icons">';
# sistemskega ne moremo izbrisati
if ($current_pid != 0) {
echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="zoomProfileAction(\'showDelete\'); return false;"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
@ -245,6 +247,8 @@ class SurveyZoom
if ($current_pid > 0) {
echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="zoomProfileAction(\'showRename\'); return false;"><span class="faicon edit icon-as_link floatRight spaceRight"></span></a>'."\n";
}
echo '</div>';
}
echo '</div>';
@ -369,7 +373,7 @@ class SurveyZoom
while ($row = mysqli_fetch_assoc($sql)) {
echo ' <div class="setting_line indent">';
echo ' <input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'_'.$row['id'].'" value="'.$spremenljivka['id'].'_'.$row['id'].'" type="checkbox" '.(is_array($vars) && in_array($spremenljivka['id'].'_'.$row['id'],$vars) ? ' checked' : '').'>';
echo ' <label for="">'.strip_tags($row['variable']).' - '.strip_tags($row['naslov']).'</label>';
echo ' <label for="zoom_var_'.$spremenljivka['id'].'_'.$row['id'].'">'.strip_tags($row['variable']).' - '.strip_tags($row['naslov']).'</label>';
echo ' </div>';
}

View File

@ -85,51 +85,48 @@ class PopUp
return $this;
}
public function display()
{
public function display(){
$this->_displayed = true;
#začnemo osnovni div
echo '<div';
if ($this->_id != null)
{
if ($this->_id != null){
echo ' id="'.$this->_id.'"';
}
if (count($this->_css) > 0)
{
if (count($this->_css) > 0){
echo ' class="'. implode(' ',$this->_css).'"';
}
echo '>';
#dodamo header
if ($this->_headerText != null)
{
if ($this->_headerText != null){
echo '<div class="divPopUp_top">';
echo $this->_headerText;
echo '</div>'; #PM_top
}
#dodamo vsebino - content
echo '<div class="divPopUp_content">';
echo '<div class="popup_main">';
echo $this->_content;
echo '</div>'; # class="divPopUp_content"
echo '</div>';
# začnemo div z gumbi
echo '<div class="divPopUp_btm">';
# izrišemo gumbe
# div z gumbi
echo '<div class="button_holder">';
if (count($this->_buttons) > 0) {
foreach ($this->_buttons AS $button)
{
foreach ($this->_buttons AS $button){
echo $button;
}
}
#zaključimo div z gumbi
echo '</div>'; #class="inv_FS_btm clr"
#zaključimo div z gumbi
echo '</div>';
#zaključimo osnovni div
echo '</div>';
return $this;
}

View File

@ -51,7 +51,7 @@ class PopUpButton
private $_float = 'floatLeft';
private $_space = 'spaceLeft';
private $_buttonColor = 'gray';
private $_buttonColor = 'white-blue';
private $_actions = array();
public function __construct($caption = null)
@ -99,11 +99,11 @@ class PopUpButton
{
switch ($buttonColor) {
case 'orange':
$this->_buttonColor = 'orange';
$this->_buttonColor = 'blue';
break;
default:
$this->_buttonColor = 'gray';
$this->_buttonColor = 'white-blue';
break;
}
@ -121,13 +121,10 @@ class PopUpButton
}
public function __toString() {
$str = '<div class="'.$this->_float.' '.$this->_space.'">';
$str .= '<div class="buttonwrapper" title="'.$this->_title.'">';
$str .= '<a class="ovalbutton ovalbutton_'.$this->_buttonColor.'" href="#" '.implode(' ', $this->_actions).'>';
$str .= '<span>'.$this->_caption.'</span>';
$str .= '</a>';
$str .= '</div>';
$str .= '</div>';
$str = '<button class="medium '.$this->_buttonColor.'" title="'.$this->_title.'" '.implode(' ', $this->_actions).'>';
$str .= $this->_caption;
$str .= '</button>';
return $str;
}
}

File diff suppressed because it is too large Load Diff

View File

@ -125,6 +125,7 @@
box-sizing: border-box;
width: 216px;
min-width: 216px;
padding-right: 16px;
margin-right: 16px;
@ -136,6 +137,8 @@
.list-item{
cursor: pointer;
display: flex;
justify-content: space-between;
box-sizing: border-box;
padding: 8px;
@ -153,6 +156,10 @@
background-color: $light-gray;
border-color: $blue;
}
.profile_icons a{
margin-left: 8px;
}
}
}
@ -180,6 +187,7 @@
.popup_right{
overflow-y: auto;
max-height: 70vh;
width: 100%;
.popup_right_note{
margin-bottom: 16px;
@ -203,6 +211,10 @@
}
}
span{
font-size: 14px;
}
.setting_line{
margin-bottom: 8px;
@ -289,6 +301,10 @@
display: none;
position: relative;
z-index: 81;
.divPopUp {
display: block !important;
}
}
/* basic popup */
@ -296,36 +312,6 @@
display: none;
position: relative;
.buttons_holder{
position: absolute;
bottom: 20px;
right: 20px;
}
div.divPopUp_top {
display: inline-block;
height: auto;
top: 0;
left: 0;
right: 0;
}
div.divPopUp_content {
height: 100%;
}
div.divPopUp_btm {
display: inline-block;
bottom: 0;
left: 0;
right: 0;
width: 100%;
height: auto;
padding: 20px 0px 0px 0px !important;
margin-right: 0;
margin-bottom: 0;
}
}
}
}

View File

@ -19,82 +19,17 @@ and open the template in the editor.
}
}
#dsp_inspect_cover {
@include popup_general();
}
#fade .popup_holder #fullscreen.z-index200{
position: absolute;
}
.condition_profile_holder {
float: left;
width: 190px;
height: 150px;
margin: 8px 8px 8px 0px;
}
.zanka_profile_holder {
float: left;
width: 190px;
height: 150px;
color: $blue;
}
.variable_profile_holder {
float: left;
width: 190px;
height: 150px;
color: $blue;
}
#zanka_profile {
overflow: auto;
cursor: pointer;
width: 190px;
.option {
padding: 2px 5px;
margin-bottom: 5px;
}
.active {
padding: 2px 5px;
border: 1px solid $blue;
background-color: $white;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
}
}
#variable_profile {
overflow: auto;
cursor: pointer;
.option {
padding: 2px 5px;
margin-bottom: 5px;
}
.active {
padding: 2px 5px;
border: 1px solid $blue;
background-color: $white;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
}
}
#condition_profile {
height: 200px;
overflow: auto;
cursor: pointer;
.option {
padding: 2px 5px;
margin-bottom: 5px;
}
.active {
padding: 2px 5px;
border: 1px solid $blue;
background-color: $white;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
}
}
#variableProfileCoverDiv {
display: none;
@ -224,11 +159,7 @@ fieldset#missingProfileFieldset {
margin-bottom: 5px;
font-size: 11px;
}
#missingProfilebuttons {
position: absolute;
bottom: 20px;
right: 20px;
}
#div_missing_profiles {
display: none;
position: relative;
@ -244,16 +175,7 @@ fieldset#missingProfileFieldset {
background-color: $white;
}
}
#fs_list {
overflow: auto;
float: right;
width: 490px;
height: 320px;
padding: 10px;
color: $gray;
border: 1px solid $blue;
background-color: $white;
}
.fs_container {
height: 280px;
width: 235px;
@ -388,19 +310,7 @@ fieldset#missingProfileFieldset {
background: #cfc;
}
}
#div_cp_preview {
float: right;
display: inline-block;
width: 780px;
margin: 8px 8px 40px 0px;
max-height: 500px;
border: 1px solid $blue;
background-color: $white;
}
#div_cp_preview_content {
display: block;
margin: 6px;
}
.statistic_profile_left_right {
width: auto;
height: 190px;
@ -465,141 +375,17 @@ fieldset#missingProfileFieldset {
-webkit-border-radius: 4px;
}
}
#statistic_profile_content {
float: left;
width: auto;
height: 80px;
padding: 5px;
margin-bottom: 10px;
color: $gray;
}
#time_profile_content {
float: left;
width: auto;
height: 80px;
padding: 5px;
margin-bottom: 10px;
color: $gray;
}
.statistic_profile_button_left_holder {
width: auto;
max-width: 180px;
}
.statistic_profile_button_right_holder {
position: absolute;
bottom: 10px;
right: 10px;
}
.time_profile_button_right_holder {
position: absolute;
bottom: 20px;
right: 20px;
}
.statistic_profile_note {
width: 430px;
padding: 3px;
color: black;
font-size: 11px;
border: 1px solid $blue;
background-color: $white;
}
#missing_profile_holder {
float: left;
width: 190px;
height: 150px;
margin: 0px 8px 8px 0px;
color: $blue;
}
#status_profile_holder {
float: left;
width: 190px;
height: 150px;
margin: 0px 8px 8px 0px;
color: $blue;
height: auto;
}
#divStatusProfile {
position: relative;
}
#missing_profile {
height: 150px;
overflow: auto;
cursor: pointer;
width: 190px;
div.option {
padding: 2px 5px;
margin-bottom: 5px;
}
div.active {
padding: 2px 5px;
border: 1px solid $blue;
background-color: $white;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
}
}
#status_profile {
height: 150px;
overflow: auto;
cursor: pointer;
width: 190px;
div.option {
padding: 2px 5px;
margin-bottom: 5px;
}
div.active {
padding: 2px 5px;
border: 1px solid $blue;
background-color: $white;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
}
}
#status_casi {
height: 150px;
overflow: auto;
cursor: pointer;
width: 190px;
}
#missing_profile_data_holder {
float: right;
width: 490px;
padding: 10px;
border: 1px solid $blue;
background-color: $white;
}
#status_profile_data_holder {
float: right;
width: 490px;
padding: 10px;
border: 1px solid $blue;
background-color: $white;
}
#missingProfileFieldsetHolder {
width: 470px;
padding: 5px;
margin: 0px;
margin-bottom: 5px;
font-size: 11px;
}
#statusProfileFieldsetHolder {
width: 470px;
padding: 5px;
margin: 0px;
margin-bottom: 5px;
font-size: 11px;
}
#conditionProfileButtons {
position: absolute;
bottom: 20px;
right: 20px;
}
#tbl_color_ersidual {
font-size: 11px;
line-height: 12px;
@ -607,16 +393,16 @@ fieldset#missingProfileFieldset {
margin: 0px;
margin-left: 5px;
}
@mixin profile_note() {
display: inline-block;
width: auto;
padding: 3px 10px;
margin-bottom: 4px;
line-height: 2em;
vertical-align: middle;
border: 1px solid $blue;
background-color: $white;
margin-bottom: 16px;
padding: 8px;
font-size: 14px;
border: 1px $dark-gray solid;
}
#variableTypeNote {
@include profile_note();
}
@ -633,12 +419,7 @@ fieldset#missingProfileFieldset {
@include profile_note();
}
#not_default_setting {
padding: 5px;
width: auto;
margin-bottom: 15px;
border: 1px solid $red;
background-color: $red;
@include profile_note();
}
input#startDate {
width: 80px;
@ -647,44 +428,6 @@ input#endDate {
width: 80px;
}
#vp_list {
float: right;
overflow: auto;
width: 430px;
padding: 10px;
margin: 0 10px;
color: $gray;
border: 1px solid $blue;
background-color: $white;
ul {
display: inline-block;
padding: 0 3px;
max-height: 400px;
width: auto;
li {
list-style-type: none;
display: inline-block;
width: 100%;
max-width: 400px;
padding: 5px;
margin-bottom: 5px;
background-color: $white;
color: $gray;
label {
display: inline-block;
width: 100%;
height: 100%;
}
}
li.selected {
background-color: $white !important;
outline: 0 !important;
color: $blue !important;
}
}
}
@mixin profiles_popup(){
display: none;
@ -700,11 +443,6 @@ input#endDate {
width: 620px;
@include profiles_popup();
}
#div_zanka_profiles {
width: 730px;
height: 430px;
@include profiles_popup();
}
@mixin new_profile_popup(){