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:
tejagerjovic 2022-03-22 13:12:26 +01:00
commit d8225bfdc0
7 changed files with 1688 additions and 1606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
admin/survey/Branching.php
View File

@ -2279,13 +2279,15 @@ class Branching {
$string = '';
// statusi: reminder, timer, in še kaj
if ($row['sistem'] == 1)
$string = $string . $lang['srv_system_text'] . ' | ';
$string .= '<span class="item">'.$lang['srv_system_text'].'</span>';
if ($row['visible'] == 0)
$string .= $lang['srv_hidden_text'] . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$lang['srv_hidden_text'].'</span>';
if ($row['dostop'] != 4) {
$string = $string . $lang['srv_visible_dostop'].' ';
$string .= '<span class="item">'.$lang['srv_visible_dostop'].' ';
switch ($row['dostop']) {
case 3: $string .= strtolower($lang['see_registered']);
break;
@ -2296,65 +2298,62 @@ class Branching {
case 0; $string .= strtolower($lang['see_admin']);
break;
}
$string .= '&nbsp;|&nbsp;';
$string .= '</span>';
}
if ($row['reminder'] > 0) {
if ($row['reminder'] == 1) {
// echo '<img src="img_'.$this->skin.'/reminder_soft.png" alt="'.$lang['srv_reminder_soft'].'" />';
$string = $string . $lang['srv_reminder_soft'];
} else {
// echo '<img src="img_'.$this->skin.'/reminder_hard.png" alt="'.$lang['srv_reminder_hard'].'" />';
$string = $string . $lang['srv_reminder_hard'];
$string .= '<span class="item">'.$lang['srv_reminder_soft'].'</span>';
}
else {
$string .= '<span class="item">'.$lang['srv_reminder_hard'].'</span>';
}
$string = $string . '&nbsp;|&nbsp;';
}
$sqlv = sisplet_query("SELECT spr_id, if_id FROM srv_validation WHERE spr_id = '$spremenljivka'");
if (mysqli_num_rows($sqlv) > 0) {
$string = $string . $lang['srv_validation'];
$string = $string . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$lang['srv_validation'].'</span>';
}
if ($row['timer'] > 0) {
$string = $string . $lang['srv_timer_on_time'];
$string = $string . (substr(bcdiv($row['timer'], 60), 0, 4)) . '' . $lang['srv_minutes'] . ' ';
$string = $string . (bcmod($row['timer'], 60)) . '' . $lang['srv_seconds'] . '';
$string = $string . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$lang['srv_timer_on_time'];
$string .= (substr(bcdiv($row['timer'], 60), 0, 4)) . '' . $lang['srv_minutes'] . ' ';
$string .= (bcmod($row['timer'], 60)) . '' . $lang['srv_seconds'] . '';
$string .= '</span>';
}
//izrišemo še ostale statuse: statistika, orientacija, sortiranje
if ($row['tip'] <= 3 && $row['stat'] && $this->survey_type != 0) {
$string = $string . $lang['srv_stat_on'] . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$lang['srv_stat_on'].'</span>';
}
// Status orentacije - navadna vprasanja
if((in_array($row['tip'], array('1', '2', '21', '7', '8')) && $row['orientation'] != '1') || ($row['tip'] == '3' && $row['orientation'] == '1')){
$string .= $this->getVprasanjeOrientationString($row['tip'], $row['orientation']) . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$this->getVprasanjeOrientationString($row['tip'], $row['orientation']) . '</span>';
}
// Status orentacije - tabele
elseif(in_array($row['tip'], array('6', '16')) && $row['enota'] != '0'){
$string .= $this->getVprasanjeOrientationString($row['tip'], $row['enota']) . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$this->getVprasanjeOrientationString($row['tip'], $row['enota']) . '</span>';
}
if ($row['tip'] == 1 && $row['hidden_default'] == 1) {
$string = $string . $lang['srv_potrditev'] . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$lang['srv_potrditev'].'</span>';
}
if ($row['random']) {
$arrayRandomText = array (
0 => $lang['srv_random_off'],
1 => $lang['srv_random_on'],
2 => $lang['srv_sort_asc'],
3 => $lang['srv_sort_desc']
0 => $lang['srv_random_off'],
1 => $lang['srv_random_on'],
2 => $lang['srv_sort_asc'],
3 => $lang['srv_sort_desc']
);
$string = $string . $arrayRandomText[$row['random']] . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$arrayRandomText[$row['random']].'</span>';
}
//skriti checkboxi
if ($row['checkboxhide'] != 0)
$string = $string . $lang['srv_checkboxhide_disabled'] . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$lang['srv_checkboxhide_disabled'].'</span>';
// Kljucavnica ce je vprasanje zaklenjeno
if($question_locked){
@ -2362,22 +2361,20 @@ class Branching {
}
// Ce je zaklenjeno ampak ga lahko ureja ker je admin ali avtor
elseif($row['locked']){
$string = $string . $lang['srv_locked_text'] . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$lang['srv_locked_text'].'</span>';
}
// Ce je onemogoceno vprasanje
$disabled_vprasanje = $spremenljivkaParams->get('disabled_vprasanje') ? $spremenljivkaParams->get('disabled_vprasanje') : 0;
if($disabled_vprasanje){
$string = $string . $lang['srv_disabled_text'] . '&nbsp;|&nbsp;';
$string .= '<span class="item">'.$lang['srv_disabled_text'].'</span>';
}
//zbrisemo zadnji "|" iz niza
$string = substr($string, 0, -7);
$string = '<span class="red">' . $string . '</span>';
echo $string;
echo '</div>';
echo '</div>'; // - spremenljivka_settings
// --- Zgornja vrstica pri editiranju vprasanj -->

2
admin/survey/classes/class.Vprasanje.php
View File

@ -47,7 +47,7 @@ class Vprasanje {
echo '<div class="vprasanje_edit_holder">';
echo '<div id="vprasanje_header">';
echo $lang['settings'];
echo ' <span class="faicon edit"></span>'.$lang['settings'];
echo '</div>';
echo '<div id="vprasanje_tabs">';

14
admin/survey/script/branching.js
View File

@ -108,7 +108,7 @@ function branching_click(event) {
}
// spremeni tip skale (ordinalna/nominalna) za tip 1,3,6
if (ta.is('div.spr_edit a.scale_ordnom')) {
if (ta.is('div.spr_edit .scale_ordnom button')) {
var id = ta.parent().parent().attr('id');
id = id.replace('edit_', '');
@ -450,14 +450,12 @@ function branching_mouseover(event) {
scale = 1;
if(scale == 1){
scale_string = '<span class="scale_ordnom"><a class="scale_ordnom">' + lang['srv_skala_0'] + '</a>' +
' / ' +
'<span class="bold">' + lang['srv_skala_1'] + '</span></span>';
scale_string = '<div class="scale_ordnom"><button class="small">' + lang['srv_skala_0'] + '</button>' +
'<button class="small active">' + lang['srv_skala_1'] + '</button></div>';
}
else{
scale_string = '<span class="scale_ordnom"><span class="bold">' + lang['srv_skala_0'] + '</span>' +
' / ' +
'<a class="scale_ordnom">' + lang['srv_skala_1'] + '</a></span>';
scale_string = '<div class="scale_ordnom"><button class="small active">' + lang['srv_skala_0'] + '</button>' +
'<button class="small">' + lang['srv_skala_1'] + '</button></div>';
}
}
@ -512,7 +510,7 @@ function branching_mouseover(event) {
}
html_snippet = html_snippet +
'<a title="' + lang['srv_predogled_spremenljivka'] + '" class="preview faicon"></a>';
'<a title="' + lang['srv_predogled_spremenljivka'] + '" class="monitor faicon"></a>';
}
// zarad tega so errorji
if (vprasanje_tracking == 2)

2995
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

2
resources/sass/admin_new/basic/icons/standard.scss
View File

@ -194,7 +194,7 @@ span.faicon.logout::before{
content: "\f2f5";
}
span.faicon.monitor::before{
.faicon.monitor::before{
content: "\f108";
}
span.faicon.users::before{

44
resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
View File

@ -31,20 +31,31 @@
box-sizing: border-box;
width: 305px;
border: 1px solid $gray;
border: 1px solid $blue;
background-color: $white;
// Naslovna vrstica
#vprasanje_header{
height: 45px;
padding: 0 7px;
padding: 0 9px;
color: $white;
color: $black;
font-weight: 600;
font-size: 14px;
line-height: 45px;
line-height: 43px;
text-transform: uppercase;
background-color: $blue;
background-color: $white;
border-bottom: 1px $gray solid;
.faicon{
margin-right: 8px;
&:before{
font-size: 14px;
color: $blue;
}
}
}
// Tabi na vrhu
@ -56,7 +67,7 @@
flex-wrap: nowrap;
width: 100%;
height: 45px;
height: 41px;
margin-bottom: 16px;
@ -69,9 +80,26 @@
justify-content: center;
width: 100%;
height: 45px;
height: 41px;
padding: 0 5px;
span{
width: 100%;
padding: 0 5px;
line-height: 25px;
text-align: center;
}
/*&#tab_link_0 span{
border-right: 1px $gray solid;
}
&#tab_link_7 span{
border-left: 1px $gray solid;
}
&#tab_link_0.active span,
&#tab_link_7.active span{
border: 0;
}*/
&.active {
background-color: $white;

178
resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
View File

@ -72,21 +72,20 @@ li.spr{
top: 0;
right: 0;
color: $black;
height: 45px;
padding: 10px 14px;
color: $blue;
padding: 10px 16px;
a{
display: inline-block;
margin-left: 8px;
width: 20px;
height: 20px;
margin-left: 16px;
color: $black;
line-height: 24px;
color: $blue;
&:before,
&:after{
color: $black;
color: $blue;
font-size: 16px;
}
.arhiv {
@ -102,19 +101,52 @@ li.spr{
}
}
span.scale_ordnom {
vertical-align: 2px;
margin-right: 20px;
.scale_ordnom {
display: inline-block;
height: 24px;
padding-right: 16px;
vertical-align: 1px;
a,
span {
display: inline-block;
height: 20px;
width: auto;
margin: 0;
border-right: 1px $gray solid;
font-size: 14px;
}
button{
cursor: pointer;
box-sizing: border-box;
padding: 0 16px;
margin: 0;
height: 24px;
width: auto;
min-width: auto;
font-size: 12px;
font-weight: 400;
line-height: 15px;
color: #A9A9A9;
background-color: $white;
border: 1px solid $gray;
&:first-child{
border-radius: 2px 0px 0px 2px;
border-right: 1px $blue solid !important;
}
&:nth-child(2){
border-radius: 0px 2px 2px 0px;
border-left: 0 !important;
}
&.active,
&:hover{
color: $blue;
background-color: $light-blue;
border-color: $blue;
}
}
}
}
@ -123,8 +155,6 @@ li.spr{
display: block;
}
}
.spremenljivka_content{
@ -135,12 +165,27 @@ li.spr{
background-color: white;
border: 1px solid $gray;
border-radius: 2px;
transition: 0.2s;
&:hover {
background-color: white;
.add-variable {
display: block;
}
background-color: white;
/*.spremenljivka_settings {
background-color: $white !important;
border-bottom: 1px $gray solid;
}
// komentarji na dnu
.comment_container_inline{
background-color: $white;
}*/
}
// Glava v vprasanju
@ -166,12 +211,22 @@ li.spr{
.spr_settings{
display: flex;
font-size: 14px;
margin-left: 16px;
span,
div{
padding-left: 16px;
font-size: 14px;
height: 24px;
line-height: 24px;
margin-right: 8px;
padding: 0 8px;
font-size: 12px;
color: $blue;
background: $medium-blue;
border: 1px solid $blue;
border-radius: 2px;
}
.lock_holder {
@ -327,62 +382,47 @@ li.spr{
right: 40px;
top: 25px;
}
// komentarji na dnu
.comment_container_inline{
display: flex;
height: 32px;
margin: 0px;
padding: 0 16px;
background-color: $light-gray;
border-top: 1px solid $gray;
}
}
}
// Aktiven element - urejanje vprasanja
li.spr_editing {
.spr_edit {
display: block;
a,
span{
color: white !important;
&:before,
&:after{
color: white !important;
}
}
}
.spremenljivka_content {
background-color: white;
border: 1px solid $blue;
.spremenljivka_settings {
color: white !important;
background-color: $blue !important;
border: 1px solid $blue;
.spr_settings{
span.red {
color: white !important;
}
}
#spr_settings_intro_concl{
div.red{
color: white !important;
}
}
}
.content_div_normalmode{
border: 1px solid $blue;
}
.comment_container_inline {
border-top: none;
border-left: 1px solid $blue;
border-right: 1px solid $blue;
border-bottom: 1px solid $blue;
}
.spremenljivka_tekst_form {
border: 1px solid $blue;
background-color: $white !important;
border-bottom: 1px $gray solid;
}
.add-variable {
display: none;
}
// komentarji na dnu
.comment_container_inline{
background-color: $white;
}
}
.content_div_normalmode {
@ -398,14 +438,8 @@ li.spr_editing {
color: $black;
}
.variable_name {
color: $white !important;
}
}
.variable_holder.clr {
height: auto;
@ -575,13 +609,3 @@ table.text_vrednost {
color: $gray;
font-weight: 500;
}
.comment_container_inline {
margin: 0px;
padding: 4px 15px;
background-color: $blue;
border-top: 1px solid $blue;
a.surveycomment {
font-size: 10px;
}
}