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-04-07 12:48:54 +02:00
commit 9d0d0e4dbd
18 changed files with 2929 additions and 2185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/survey/SurveyAdmin.php
View File

@ -1586,11 +1586,6 @@ class SurveyAdmin
echo $lang['srv_publication_base'] . '</a>'; echo $lang['srv_publication_base'] . '</a>';
echo '</li>'; echo '</li>';
echo '<li class="'.($_GET['a'] == A_VABILA && $_GET['m'] == 'url' ? ' active' : '').'">';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_VABILA . '&m=url" title="' . $lang['srv_publication_url'] . '">';
echo $lang['srv_publication_url'] . '</a>';
echo '</li>';
echo '<li class="'.($_GET['a'] == A_INVITATIONS && $_GET['m'] != 'view_archive' ? ' active' : '').'">'; echo '<li class="'.($_GET['a'] == A_INVITATIONS && $_GET['m'] != 'view_archive' ? ' active' : '').'">';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_INVITATIONS . '" title="' . $lang['srv_inv_nav_invitations'] . '">'; echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_INVITATIONS . '" title="' . $lang['srv_inv_nav_invitations'] . '">';
echo $lang['srv_inv_nav_invitations'] . '</a>'; echo $lang['srv_inv_nav_invitations'] . '</a>';

109
admin/survey/SurveyAdminSettings.php
View File

@ -2616,8 +2616,6 @@ class SurveyAdminSettings {
global $lang; global $lang;
if ($_GET['m'] == '' || $_GET['m'] == 'settings') { if ($_GET['m'] == '' || $_GET['m'] == 'settings') {
$this->anketa_vabila_nastavitve(); $this->anketa_vabila_nastavitve();
} elseif ($_GET['m'] == 'url') {
$this->anketa_vabila_url();
} }
} }
@ -2946,46 +2944,6 @@ class SurveyAdminSettings {
} }
} }
function anketa_vabila_url() {
echo '<table width="100%">';
echo '<tr style="">';
echo '<td style="vertical-align:top;">';
$this->displayInvSurveyEmbed();
// Embed v popup je zaenkrat disablan zaradi cross domain omejitev browserjev
//$this->displayInvSurveyPopup();
echo '</td>';
echo '<td style="width:45%; vertical-align:top;">';
$this->displayInvSurveyLink();
echo '</td>';
echo '</tr>';
echo '</table>';
}
function displayInvSurveyEmbed() {
global $lang;
echo '<fieldset>';
echo '<legend>'.$lang['srv_embed_title'].':</legend>';
echo '<p><span onclick="$(\'#embed_js\').toggle(); $(\'#embed_js textarea\').click();" class="as_link">'.$lang['srv_embed_js'].Help :: display('srv_embed_js').'</span></p>';
echo '<p id="embed_js" '.($_GET['js']!='open'?'style="display:none"':'').'><textarea id="ta" style="width: 99%; height:80px" onclick="this.select();" readonly>'.$this->getEmbed().'</textarea></p>';
echo '<p><span onclick="$(\'#embed_js_fixed\').toggle(); $(\'#embed_js_fixed textarea\').click();" class="as_link">'.$lang['srv_embed_fixed'].Help :: display('srv_embed_fixed').'</span></p>';
echo '<p id="embed_js_fixed" '.($_GET['js']!='open'?'style="display:none"':'').'><textarea style="width: 99%; height:80px" onclick="this.select();" readonly>'.$this->getEmbed(false).'</textarea></p>';
echo '</fieldset>';
if ($_GET['js'] == 'open') {
?><script>
$('#ta').click();
</script><?
}
}
function displayInvSurveyPopup() { function displayInvSurveyPopup() {
global $lang; global $lang;
@ -2998,71 +2956,6 @@ class SurveyAdminSettings {
echo '</fieldset>'; echo '</fieldset>';
} }
function displayInvSurveyLink() {
global $lang, $site_url, $admin_type;
$row = SurveyInfo::getInstance()->getSurveyRow();
echo '<fieldset>';
echo '<legend>' . $lang['srv_user_base_url'] . '</legend>';
echo '<p><div class="as_link"><label onclick="$(\'#anketa_href\').toggle(); $(\'#anketa_href textarea\').click(); $(\'#space1\').toggle();" class="pointer">' . $lang['srv_anketa_href'] . ' </label></div>';
echo '<div id="anketa_href" class="displayNone"><br>'.$lang['srv_anketa_href_text'].' <textarea style="width:99%; height:24px;" onclick="this.select();" readonly id="href">';
echo '&lt;a href="'.SurveyInfo::getSurveyLink().'"&gt;'.$lang['srv_complete_survey'].'&lt;/a&gt;';
echo '</textarea></div></p>';
echo '<p><div class="as_link" ><label onclick="$(\'#anketa_href_count\').toggle(); $(\'#space2\').toggle(); $(\'#anketa_href_count textarea\').click();" class="pointer">' . $lang['srv_anketa_href_count'] . ' </label></div>';
echo '<div id="anketa_href_count" class="displayNone"><br>'.$lang['srv_anketa_href_count_text'].' <textarea style="width:99%; height:48px" onclick="this.select();" readonly>';
echo '&lt;a href="'.SurveyInfo::getSurveyLink().'"&gt;'.$lang['srv_complete_survey'].'&lt;/a&gt;&lt;img src="'.$site_url.'main/survey/view_count.php?a='.$this->anketa.'" style="display:none"/&gt;';
echo '</textarea></div></p>';
echo '</fieldset><fieldset>';
// Prikaz QR kode
$img = 'classes/phpqrcode/imgs/code'.$this->anketa.'.png';
QRcode::png(SurveyInfo::getSurveyLink(), $img, 'L', 4, 2);
echo '<div class="as_link"><label onclick="$(\'#anketa_qr_code\').toggle();" class="pointer" title="'.$lang['srv_qr_code'].'">' . $lang['srv_qr_code'] . ' </label></div>';
# echo '<p>'.$lang['srv_qr_code'].':<br>';
echo '<div id="anketa_qr_code" class="displayNone">';
echo '<img src="'.$site_url.'admin/survey/'.$img.'">';
echo '</div>';
// Prikaz ikon za deljenje (FB, twitter...)
echo '<p class="clr" style="margin-top:15px;"><span class="labelSpanWide"><label>'.$lang['srv_share'].': </label></span> ';
?>
<div class="addthis_toolbox addthis_default_style">
<a class="addthis_button_facebook" addthis:url="<?=SurveyInfo::getSurveyLink()?>" addthis:title="<?=$row['akronim']?>"></a>
<a class="addthis_button_gmail" addthis:url="<?=SurveyInfo::getSurveyLink()?>" addthis:title="<?=$row['akronim']?>"></a>
<!-- <a class="addthis_button_preferred_1" addthis:url="<?=SurveyInfo::getSurveyLink()?>" addthis:title="<?=$row['akronim']?>"></a>
<a class="addthis_button_preferred_2" addthis:url="<?=SurveyInfo::getSurveyLink()?>" addthis:title="<?=$row['akronim']?>"></a>-->
<!--
<a class="addthis_button_preferred_3" addthis:url="<?=SurveyInfo::getSurveyLink()?>" addthis:title="<?=$row['akronim']?>"></a>
<a class="addthis_button_preferred_4" addthis:url="<?=SurveyInfo::getSurveyLink()?>" addthis:title="<?=$row['akronim']?>"></a>
<a class="addthis_button_preferred_5" addthis:url="<?=SurveyInfo::getSurveyLink()?>" addthis:title="<?=$row['akronim']?>"></a>
<a class="addthis_button_preferred_6" addthis:url="<?=SurveyInfo::getSurveyLink()?>" addthis:title="<?=$row['akronim']?>"></a>
-->
<span class="addthis_separator">|</span>
<a href="https://www.addthis.com/bookmark.php?v=250" class="addthis_button_compact" addthis:url="<?=SurveyInfo::getSurveyLink()?>" addthis:title="<?=$row['akronim']?>"></a>
</div>
<script type="text/javascript" src="https://s7.addthis.com/js/250/addthis_widget.js"></script>
<script type="text/javascript">
var addthis_config = {
data_track_clickback: false,
services_exclude: 'print'
}
</script>
<?php
echo '</p>';
echo '</fieldset>';
}
/** /**
* nastavitve za obveščanje na email * nastavitve za obveščanje na email
* *
@ -9326,6 +9219,7 @@ class SurveyAdminSettings {
echo '<table id="all_users_list" class="usersTable">'; echo '<table id="all_users_list" class="usersTable">';
echo '<thead><tr>'; echo '<thead><tr>';
echo '<th>'.$lang['edit2'].'</th>';
echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>'; echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_email'] . '</th>'; echo '<th>' . $lang['srv_survey_list_users_email'] . '</th>';
echo '<th>' . $lang['admin_type'] . '</th>'; echo '<th>' . $lang['admin_type'] . '</th>';
@ -9338,7 +9232,6 @@ class SurveyAdminSettings {
echo '<th>' . $lang['users_gdpr_title'] . '</th>'; echo '<th>' . $lang['users_gdpr_title'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>'; echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>'; echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';
echo '<th>'.$lang['edit2'].'</th>';
echo '</tr></thead>'; echo '</tr></thead>';
echo '</table>'; echo '</table>';

8
admin/survey/classes/class.Dostop.php
View File

@ -1186,6 +1186,9 @@ class Dostop {
foreach ($vsi as $uporabnik) { foreach ($vsi as $uporabnik) {
$seznam[] = [ $seznam[] = [
'<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
'<span class="gray"> | </span><a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
'<span class="gray"> | </span><a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>',
iconv(mb_detect_encoding( $uporabnik->name, mb_detect_order(), true), "UTF-8", $uporabnik->name) .' '.iconv(mb_detect_encoding( $uporabnik->surname, mb_detect_order(), true), "UTF-8", $uporabnik->surname), iconv(mb_detect_encoding( $uporabnik->name, mb_detect_order(), true), "UTF-8", $uporabnik->name) .' '.iconv(mb_detect_encoding( $uporabnik->surname, mb_detect_order(), true), "UTF-8", $uporabnik->surname),
(!empty($uporabnik->second_email) ? iconv(mb_detect_encoding( $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding( $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)), (!empty($uporabnik->second_email) ? iconv(mb_detect_encoding( $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding( $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)),
$this->userTypeToText($uporabnik->type), $this->userTypeToText($uporabnik->type),
@ -1197,10 +1200,7 @@ class Dostop {
(!empty($uporabnik->st_managerjev) ? $uporabnik->st_managerjev : 0), (!empty($uporabnik->st_managerjev) ? $uporabnik->st_managerjev : 0),
$lang["users_gdpr".$uporabnik->gdpr_agree], $lang["users_gdpr".$uporabnik->gdpr_agree],
$uporabnik->registriran, $uporabnik->registriran,
$uporabnik->last_login, $uporabnik->last_login
'<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>'
]; ];
} }
} }

4
admin/survey/classes/class.SurveyParaAnalysis.php
View File

@ -904,8 +904,8 @@ class SurveyParaAnalysis{
// Dodatna stolpca zaradi izvoza za Katjo Lozar // Dodatna stolpca zaradi izvoza za Katjo Lozar
if($admin_type == '0'){ if($admin_type == '0'){
echo '<th class="center">ID VPRAŠANJA</th>'; echo '<th class="center small">ID VPRAŠANJA</th>';
echo '<th class="center">ID VARIABLE</th>'; echo '<th class="center small">ID VARIABLE</th>';
} }
echo '<th class="left">'.$lang['srv_para_variable'].'</th>'; echo '<th class="left">'.$lang['srv_para_variable'].'</th>';

27
admin/survey/classes/class.SurveyPostProcess.php
View File

@ -184,7 +184,7 @@ class SurveyPostProcess {
SurveyAnalysis::Init($this->anketa); SurveyAnalysis::Init($this->anketa);
$freq = SurveyAnalysis::getFrequencys(); $freq = SurveyAnalysis::getFrequencys();
echo '<p class="coding-refresh"><a href="index.php?anketa='.$this->anketa.'&a=data&m=coding">'.$lang['src_coding_refresh'].'</a></p>'; echo '<p class="coding-refresh bottom16"><a href="index.php?anketa='.$this->anketa.'&a=data&m=coding">'.$lang['src_coding_refresh'].'</a></p>';
SurveyVariablesProfiles::Init($this->anketa, $global_user_id); SurveyVariablesProfiles::Init($this->anketa, $global_user_id);
@ -192,12 +192,18 @@ class SurveyPostProcess {
if (SurveyVariablesProfiles::getCurentProfileId() != -1) if (SurveyVariablesProfiles::getCurentProfileId() != -1)
$variables = array(); $variables = array();
echo '<p>'.$lang['srv_hand_coding_text'] . '</p>'; echo '<p class="bottom16">'.$lang['srv_hand_coding_text'] . '</p>';
echo '<p><label id="link_variable_profile_remove" onclick="removeVariableProfile();"><input type="radio" name="filter" '.(count($variables)==0?'checked':'').'> '.$lang['srv_coding_spr_1'].'</label></p>'; echo '<div class="setting_holder">';
echo '<p><label onclick="coding_filter($(\'#mass_coding_spr_id\').val());"><input type="radio" name="filter" '.(count($variables)>0?'checked':'').' onclick="return false;"> '.$lang['srv_coding_spr'].':</label> '; echo '<div class="setting_item">';
echo '<select name="spr_id" id="mass_coding_spr_id" style="width:200px" onchange="coding_filter($(\'#mass_coding_spr_id\').val()); return false;">'; echo '<input type="radio" name="filter" '.(count($variables)==0?'checked':'').'>';
echo '<label id="link_variable_profile_remove" onclick="removeVariableProfile();"> '.$lang['srv_coding_spr_1'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="filter" '.(count($variables)>0?'checked':'').' onclick="return false;">';
echo '<label onclick="coding_filter($(\'#mass_coding_spr_id\').val());"> '.$lang['srv_coding_spr'].':</label>';
echo '<select name="spr_id" id="mass_coding_spr_id" class="dropdown large" onchange="coding_filter($(\'#mass_coding_spr_id\').val()); return false;">';
SurveyAnalysis::Init($this->anketa); SurveyAnalysis::Init($this->anketa);
$freq = SurveyAnalysis::getFrequencys(); $freq = SurveyAnalysis::getFrequencys();
@ -222,10 +228,13 @@ class SurveyPostProcess {
} }
echo '</select> '; echo '</select> ';
echo '</div>';
echo '</div>';
//echo '<input type="submit" value="'.$lang['srv_coding_filter'].'" onclick="$(this).prop(\'disabled\', true); coding_filter($(\'#mass_coding_spr_id\').val()); return false;"> ('.$lang['srv_coding_spr2'].')</p>'; //echo '<input type="submit" value="'.$lang['srv_coding_filter'].'" onclick="$(this).prop(\'disabled\', true); coding_filter($(\'#mass_coding_spr_id\').val()); return false;"> ('.$lang['srv_coding_spr2'].')</p>';
if ( count($variables)>0 ) if ( count($variables)>0 )
echo '('.$lang['srv_coding_spr2'].')'; echo '<p class="bottom16">('.$lang['srv_coding_spr2'].')</p>';
echo '</p>';
SurveyDataDisplay::displayVnosiHTML(); SurveyDataDisplay::displayVnosiHTML();

2
lang/1.php
View File

@ -6214,7 +6214,7 @@ $lang = array (
'srv_recoded_advancetNote_recoded4' => ' je že rekodirana iz druge spremenljivke, zato nadalnje rekodiranje ni mogoče.', 'srv_recoded_advancetNote_recoded4' => ' je že rekodirana iz druge spremenljivke, zato nadalnje rekodiranje ni mogoče.',
'srv_auto_coding_end_title' => 'Uspešno kodiranje', 'srv_auto_coding_end_title' => 'Uspešno kodiranje',
'srv_auto_coding_end' => 'Uspešno ste kodirali <b>%s</b> vrednosti.<br><br>Za ogled rezultatov in nadaljnje popravke kliknite na %s', 'srv_auto_coding_end' => 'Uspešno ste kodirali <b>%s</b> vrednosti.<br><br>Za ogled rezultatov in nadaljnje popravke kliknite na %s',
'srv_hand_coding_text' => 'Kliknite za izbrano vrednost v tabeli in jo spremenite (kodirajte) v oknu, ki se odpre <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kaksna-razlika-med-kodiranjem-rekodiranjem?from1ka=1" target="_blank">Več >></a>', 'srv_hand_coding_text' => 'Kliknite za izbrano vrednost v tabeli in jo spremenite (kodirajte) v oknu, ki se odpre. <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kaksna-razlika-med-kodiranjem-rekodiranjem?from1ka=1" target="_blank">Več informacij.</a>',
'srv_popup_title' => 'Vključitev ankete v pop-up oknu (znotraj istega okna brskalnika)', 'srv_popup_title' => 'Vključitev ankete v pop-up oknu (znotraj istega okna brskalnika)',
'srv_grid_add' => 'Dodaj možni odgovor', 'srv_grid_add' => 'Dodaj možni odgovor',
'srv_grid_remove' => 'Odstrani odgovor', 'srv_grid_remove' => 'Odstrani odgovor',

2
lang/2.php
View File

@ -6107,7 +6107,7 @@ $lang = array (
'srv_recoded_advancetNote_recoded4' => ' has been recoded from another variables, so further recoding is not allowed.', 'srv_recoded_advancetNote_recoded4' => ' has been recoded from another variables, so further recoding is not allowed.',
'srv_auto_coding_end_title' => 'Coding successful', 'srv_auto_coding_end_title' => 'Coding successful',
'srv_auto_coding_end' => 'You have coded <b>%s</b> values.<br><br>To view the results go to %s', 'srv_auto_coding_end' => 'You have coded <b>%s</b> values.<br><br>To view the results go to %s',
'srv_hand_coding_text' => 'Click on a value in the table and code it in the pop-up window <a href="https://www.1ka.si/d/en/help/faq/what-is-the-difference-between-coding-and-recoding?from1ka=1" target="_blank">More >></a>', 'srv_hand_coding_text' => 'Click on a value in the table and code it in the pop-up window. <a href="https://www.1ka.si/d/en/help/faq/what-is-the-difference-between-coding-and-recoding?from1ka=1" target="_blank">More information.</a>',
'srv_popup_title' => 'Embed survey in pop-up', 'srv_popup_title' => 'Embed survey in pop-up',
'srv_grid_add' => 'Add possible answer', 'srv_grid_add' => 'Add possible answer',
'srv_grid_remove' => 'Remove answer', 'srv_grid_remove' => 'Remove answer',

4762
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

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

@ -5,9 +5,4 @@
@import "archives"; @import "archives";
@import "import_export"; @import "import_export";
@import "missing_values";
@import "standardne_besede";
@import "podatki"; @import "podatki";
@import "oblika_teme";
@import "nastavitve_komentarji";

2
resources/sass/admin_new/pages/pages.scss
View File

@ -24,4 +24,6 @@
@import "survey_data/survey_data"; @import "survey_data/survey_data";
@import "survey_analysis/survey_analysis"; @import "survey_analysis/survey_analysis";
@import "users/users";

96
resources/sass/admin_new/pages/survey_data/calculations.scss
View File

@ -46,5 +46,101 @@ table#recode_table {
border-left: 1px solid $gray; border-left: 1px solid $gray;
} }
} }
}
//Ročno rekodiranje
div.subpage_coding {
.layout_right_item {
fieldset {
div#analiza_data {
max-width: 932px;
overflow-x: scroll;
}
}
}
#dataTableScroller,
#div_analiza_filtri_right {
display: none;
}
//Skopiran styling za recode popup
#vprasanje_recode_new {
position: absolute;
top: 40% !important;
height: auto;
min-height: 100px;
width: 350px;
padding: 10px;
font-size: 13px;
background-color: white;
border: 4px solid $blue;
border-radius: 7px;
-moz-border-radius: 7px 7px 7px 7px;
-webkit-border-radius: 7px;
box-shadow: 0 0 15px rgba(0, 0, 0, 0.8);
-moz-box-shadow: 0 0 15px rgba(0, 0, 0, 0.8);
-webkit-box-shadow: 0 0 15px rgba(0, 0, 0, 0.8);
}
.coding-refresh {
@include popup_general();
display: none;
position: fixed;
z-index: 1000;
left: calc(50% - 150px);
top: 20px;
text-align: center;
width: 300px;
}
#coding {
@include popup_general();
position: absolute;
min-width: 500px;
min-height: 100px;
display: none;
.new-spr {
position: absolute;
top: 3px;
right: 3px;
background-color: white;
padding: 5px;
text-align: right;
}
}
ul.recode_number_sort {
padding: 0px;
margin: 0px;
li {
list-style: none;
border: 1px solid $blue;
margin: 7px 10px 7px 0px;
padding: 3px 0px;
width: 100%;
}
}
.recoding_variable_div {
padding: 8px 3px;
}
.ui-recode-placeholder {
background: $light-blue;
border: 1px dashed $black;
}
.floatRecodeSpremenljivka {
@include popup_general();
position: fixed;
min-height: 50px;
height: auto;
top: 40vh;
left: calc(50% + 360px);
min-width: 200px;
width: auto;
z-index: 1000;
}
} }

0
resources/sass/admin_new/pages/my_surveys/missing_values.scss → resources/sass/admin_new/pages/survey_edit/missing_values.scss
View File

0
resources/sass/admin_new/pages/my_surveys/nastavitve_komentarji.scss → resources/sass/admin_new/pages/survey_edit/nastavitve_komentarji.scss
View File

0
resources/sass/admin_new/pages/my_surveys/oblika_teme.scss → resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
View File

0
resources/sass/admin_new/pages/my_surveys/standardne_besede.scss → resources/sass/admin_new/pages/survey_edit/standardne_besede.scss
View File

4
resources/sass/admin_new/pages/survey_edit/survey_edit.scss
View File

@ -14,6 +14,10 @@
// Urejanje -> Nastavitve // Urejanje -> Nastavitve
@import "survey_settings/survey_settings"; @import "survey_settings/survey_settings";
@import "oblika_teme";
@import "nastavitve_komentarji";
@import "missing_values";
@import "standardne_besede";
// Popupi // Popupi
@import "popups/popups"; @import "popups/popups";

7
resources/sass/admin_new/pages/survey_status/nonresponse.scss
View File

@ -90,6 +90,7 @@ div.page_nonresponse_graph {
white-space: nowrap; white-space: nowrap;
font-size: 14px; font-size: 14px;
td.graph_cell { td.graph_cell {
width: 100%; width: 100%;
@ -116,6 +117,12 @@ div.page_nonresponse_graph {
th { th {
background-color: $light-gray2; background-color: $light-gray2;
&.small {
font-size: 10px;
white-space: normal;
padding: 8px;
}
} }
td, th { td, th {

81
resources/sass/admin_new/pages/users/users.scss Normal file
View File

@ -0,0 +1,81 @@
//Gumbi
.dt-buttons {
margin: 0 12px 16px 12px;
}
button.dt-button {
padding: 5px 32px;
font-size: 14px;
margin-right: 4px;
color: $white;
background-color: $blue;
&:hover, .active {
background-color: darken($blue, 3%);
}
}
//Dodatni gumbi za vidnost stolpcev
.dt-button-collection {
padding-top: 48px;
}
button.buttons-columnVisibility {
color: $black;
background-color: $gray;
border: 1px solid $black;
&:hover {
background-color: darken($gray, 5%);
}
&.active {
color: $blue;
background-color: $white;
border: 1px solid $blue;
&:hover {
background-color: darken($white, 5%);
}
}
margin-bottom: 8px;
margin-right: 4px;
}
// Search + število prikazanih
.dataTables_length {
margin-left: 12px;
select {
border: 1px solid $dark-gray;
box-sizing: border-box;
border-radius: 2px;
cursor: pointer;
font-size: 16px;
padding: 3px 7px;
option {
font-size: 16px;
line-height: 18px;
}
}
}
.dataTables_filter {
input {
border: 1px solid $dark-gray;
box-sizing: border-box;
border-radius: 2px;
height: 40px;
font-size: 16px;
padding: 9px 7px;
}
}
.dataTables_info {
margin-left: 12px;
}