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

[Redizajn 1KA] - Urejanje --> Oblika v6

Browse Source
This commit is contained in:
tejagerjovic 2022-03-22 04:27:45 +01:00
parent e1dea0efba
commit 93e923aebf
5 changed files with 1606 additions and 1530 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
admin/survey/classes/class.SurveyTheme.php
View File

@ -350,8 +350,8 @@ class SurveyTheme {
echo '<h2 class="first">'.$lang['srv_current_theme'].'</h2>'; echo '<h2 class="first">'.$lang['srv_current_theme'].'</h2>';
//SPLOŠNA TEMA //AKTIVNA SPLOŠNA TEMA
echo '<div class="theme_list">'; echo '<div class="theme_list active_theme">';
echo '<div class="theme">'; echo '<div class="theme">';
echo '<span class="name">'.$skin_name.'</span>'; echo '<span class="name">'.$skin_name.'</span>';
@ -369,13 +369,13 @@ class SurveyTheme {
//Predogled //Predogled
$src = ''.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['id'].''; $src = ''.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['id'].'';
echo '<div class="button theme_links_preview" src="'.$src.'">'; echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>'; echo '<span class="faicon fa-desktop"></span>';
echo $lang['srv_poglejanketo2']; echo $lang['srv_poglejanketo2'];
echo '</div>'; echo '</div>';
//Prilagodi //Prilagodi
echo '<div class="button" onclick="window.location.href='.$modify_link.'">'; echo '<div class="button" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>'; echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit']; echo $lang['srv_te_theme_edit'];
echo '</div>'; echo '</div>';
@ -385,7 +385,7 @@ class SurveyTheme {
echo '</div>'; echo '</div>';
// MOBILNA TEMA //AKTIVNA MOBILNA TEMA
$simple_name = $this->current_mobile_skin; $simple_name = $this->current_mobile_skin;
if ($row['skin_profile_mobile'] == 0) { if ($row['skin_profile_mobile'] == 0) {
@ -396,7 +396,7 @@ class SurveyTheme {
$skin_name = $rowa['name']; $skin_name = $rowa['name'];
} }
echo '<div class="theme_list">'; echo '<div class="theme_list active_theme">';
echo '<div class="theme">'; echo '<div class="theme">';
echo '<span class="name">'.$skin_name.'</span>'; echo '<span class="name">'.$skin_name.'</span>';
echo '<span class="desc">('.$lang['srv_current_theme_mobile'].')</span>'; echo '<span class="desc">('.$lang['srv_current_theme_mobile'].')</span>';
@ -412,14 +412,14 @@ class SurveyTheme {
echo '<div class="options">'; echo '<div class="options">';
//Predogled //Predogled
$src = ''.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['id'].''; $src = ''.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['id'].'&mobile=1';
echo '<div class="button theme_links_preview" src="'.$src.'">'; echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>'; echo '<span class="faicon fa-desktop"></span>';
echo $lang['srv_poglejanketo2']; echo $lang['srv_poglejanketo2'];
echo '</div>'; echo '</div>';
//Prilagodi //Prilagodi
echo '<div class="button" onclick="window.location.href='.$modify_link.'">'; echo '<div class="button" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>'; echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit']; echo $lang['srv_te_theme_edit'];
echo '</div>'; echo '</div>';
@ -523,6 +523,10 @@ class SurveyTheme {
echo '</h2>'; echo '</h2>';
} }
if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) {
echo '<div id="theme_grid_holder">';
}
echo '<div class="div_theme_group '.($groupId==-1 ? ' custom' : '').'">'; echo '<div class="div_theme_group '.($groupId==-1 ? ' custom' : '').'">';
$sqlg = sisplet_query("SELECT id FROM srv_grupa WHERE ank_id='$this->sid' ORDER BY vrstni_red ASC LIMIT 1"); $sqlg = sisplet_query("SELECT id FROM srv_grupa WHERE ank_id='$this->sid' ORDER BY vrstni_red ASC LIMIT 1");
@ -573,26 +577,26 @@ class SurveyTheme {
echo '<div class="options">'; echo '<div class="options">';
//Aktiviraj //Aktiviraj
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;">'; echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
echo '<span class="faicon fa-hand-pointer"></span>'; echo '<span class="faicon fa-hand-pointer"></span>';
echo $lang['srv_te_theme_activate']; echo $lang['srv_te_theme_activate'];
echo '</div>'; echo '</div>';
//Predogled //Predogled
echo '<div class="button theme_links_preview" src="'.$src.'">'; echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>'; echo '<span class="faicon fa-desktop"></span>';
echo $lang['srv_poglejanketo2']; echo $lang['srv_poglejanketo2'];
echo '</div>'; echo '</div>';
//Prilagodi //Prilagodi
echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'">'; echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>'; echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit']; echo $lang['srv_te_theme_edit'];
echo '</div>'; echo '</div>';
//Izbriši //Izbriši
if ($groupId == -1) { if ($groupId == -1) {
echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', false); return false;">'; echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', false); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
echo '<span class="faicon trash empty"></span>'; echo '<span class="faicon trash empty"></span>';
echo $lang['srv_anketadelete_txt']; echo $lang['srv_anketadelete_txt'];
echo '</div>'; echo '</div>';
@ -625,26 +629,26 @@ class SurveyTheme {
echo '<div class="options">'; echo '<div class="options">';
//Aktiviraj //Aktiviraj
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;">'; echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
echo '<span class="faicon fa-hand-pointer"></span>'; echo '<span class="faicon fa-hand-pointer"></span>';
echo $lang['srv_te_theme_activate']; echo $lang['srv_te_theme_activate'];
echo '</div>'; echo '</div>';
//Predogled //Predogled
echo '<div class="button theme_links_preview" src="'.$src.'">'; echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>'; echo '<span class="faicon fa-desktop"></span>';
echo $lang['srv_poglejanketo2']; echo $lang['srv_poglejanketo2'];
echo '</div>'; echo '</div>';
//Prilagodi //Prilagodi
echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'">'; echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>'; echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit']; echo $lang['srv_te_theme_edit'];
echo '</div>'; echo '</div>';
//Izbriši //Izbriši
if ($groupId == -1) { if ($groupId == -1) {
echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', true); return false;">'; echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
echo '<span class="faicon trash empty"></span>'; echo '<span class="faicon trash empty"></span>';
echo $lang['srv_anketadelete_txt']; echo $lang['srv_anketadelete_txt'];
echo '</div>'; echo '</div>';
@ -657,6 +661,8 @@ class SurveyTheme {
$profiles++; $profiles++;
} }
} }
//Splošne teme - GRID
if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) { if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) {
@ -701,13 +707,13 @@ class SurveyTheme {
$gid = $groupId; $gid = $groupId;
//Aktiviraj //Aktiviraj
echo '<div class="button wtext" onclick="changeTheme(\''.$gid.'\', \''.$css.'\');">'; echo '<div class="button wtext" onclick="changeTheme(\''.$gid.'\', \''.$css.'\');" title="'.$lang['srv_te_theme_activate2'].'">';
echo '<span class="faicon fa-hand-pointer"></span>'; echo '<span class="faicon fa-hand-pointer"></span>';
echo $lang['srv_te_theme_activate']; echo $lang['srv_te_theme_activate'];
echo '</div>'; echo '</div>';
//Predogled //Predogled
echo '<div class="button theme_links_preview" src="'.$src.'">'; echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>'; echo '<span class="faicon fa-desktop"></span>';
echo '</div>'; echo '</div>';
@ -717,7 +723,7 @@ class SurveyTheme {
else else
$link = 'index.php?anketa='.$this->sid.'&a=theme-editor&profile_new='.$rowa['skin']; $link = 'index.php?anketa='.$this->sid.'&a=theme-editor&profile_new='.$rowa['skin'];
echo '<div class="button" onclick="window.location.href=\''.$link.'\'">'; echo '<div class="button" onclick="window.location.href=\''.$link.'\'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>'; echo '<span class="faicon palette"></span>';
echo '</div>'; echo '</div>';
@ -732,6 +738,10 @@ class SurveyTheme {
} }
echo '</div>'; echo '</div>';
if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) { // div#theme_grid_holder
echo '</div>';
}
} }
function changeTheme($css, $gid) { function changeTheme($css, $gid) {

2
lang/1.php
View File

@ -6229,6 +6229,8 @@ $lang = array (
'srv_te_profile_name' => 'Izbrana prilagoditev teme', 'srv_te_profile_name' => 'Izbrana prilagoditev teme',
'srv_te_theme_edit' => 'Prilagodi', 'srv_te_theme_edit' => 'Prilagodi',
'srv_te_theme_activate' => 'Aktiviraj', 'srv_te_theme_activate' => 'Aktiviraj',
'srv_te_theme_activate2' => 'Aktiviraj temo',
'srv_te_theme_delete2' => 'Izbriši temo',
'srv_te_no_profiles' => 'Nimate še lastnih tem. Za prilagoditev teme kliknite na "Prilagodi" poleg imena trenutne teme. Uporabite lahko tudi naprednješe CSS urejanje teme.', 'srv_te_no_profiles' => 'Nimate še lastnih tem. Za prilagoditev teme kliknite na "Prilagodi" poleg imena trenutne teme. Uporabite lahko tudi naprednješe CSS urejanje teme.',
'srv_variableView_h_name' => 'Spremenljivka', 'srv_variableView_h_name' => 'Spremenljivka',
'srv_variableView_h_type' => 'Tip', 'srv_variableView_h_type' => 'Tip',

2
lang/2.php
View File

@ -6123,6 +6123,8 @@ $lang = array (
'srv_te_profile_name' => 'Selected theme modification', 'srv_te_profile_name' => 'Selected theme modification',
'srv_te_theme_edit' => 'Customize', 'srv_te_theme_edit' => 'Customize',
'srv_te_theme_activate' => 'Activate', 'srv_te_theme_activate' => 'Activate',
'srv_te_theme_activate2' => 'Activate theme',
'srv_te_theme_delete2' => 'Delete theme',
'srv_te_no_profiles' => 'You have no user themes. To customize a theme, click on the "Customize" option, found next to the current theme name. You can also use more advanced CSS editing options.', 'srv_te_no_profiles' => 'You have no user themes. To customize a theme, click on the "Customize" option, found next to the current theme name. You can also use more advanced CSS editing options.',
'srv_variableView_h_name' => 'Variable', 'srv_variableView_h_name' => 'Variable',
'srv_variableView_h_type' => 'Type', 'srv_variableView_h_type' => 'Type',

2893
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

189
resources/sass/admin_new/pages/my_surveys/oblika_teme.scss
View File

@ -18,7 +18,7 @@ div.page_tema {
} }
//Polje za aktivno temo oz. lastno prilagoditev //Polje za aktivno temo oz. lastne prilagoditve
div.theme_list { div.theme_list {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -32,15 +32,21 @@ div.page_tema {
margin-bottom: 0; margin-bottom: 0;
} }
background: $light-gray; background-color: $white;
border: 1px solid $blue; border: 1px solid $gray;
box-sizing: border-box; box-sizing: border-box;
border-radius: 4px; border-radius: 4px;
&.active_theme {
background-color: $light-gray;
border-color: $blue;
}
//Ime in tip //Ime in tip
div.theme { div.theme {
span.name { span.name {
text-transform: uppercase; text-transform: uppercase;
font-weight: $semi-bold;
} }
span.desc { span.desc {
@ -79,101 +85,131 @@ div.page_tema {
color: $blue; color: $blue;
} }
transition: 0.2s;
&:hover {
background-color: darken($white,5%);
}
} }
} }
} }
div.div_theme_group {
&.custom {
display: none;
}
}
//Splošne teme - GRID //Splošne teme - GRID
div.div_theme_group { div#theme_grid_holder {
display: flex; display: flex;
flex-direction: row; justify-content: center;
justify-content: flex-start; padding: 0px 32px;
gap: 16px;
flex-wrap: wrap;
box-sizing: border-box;
&.custom { div.div_theme_group {
display: none; display: flex;
} flex-direction: row;
justify-content: flex-start;
flex-wrap: wrap;
gap: 14px;
&:not(.custom) { /*display: grid;
padding: 0 32px; grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
} grid-gap: 16px;*/
div.theme_label { box-sizing: border-box;
width: 202px;
height: 252px; div.theme_label {
width: 204px;
background-color: $light-gray; height: 247px;
box-sizing: border-box;
border: 1px solid $light-gray;
padding: 14px 16px;
.theme_label_content{
border-bottom: 1px solid $gray; background-color: $light-gray;
padding-bottom: 15px;
border: 1px solid $light-gray;
padding: 14px 16px;
img { .theme_label_content{
display: block;
clear: both;
width: 100%; border-bottom: 1px solid $gray;
margin-bottom: 15px; padding-bottom: 15px;
border: none;
}
}
.theme_label_options {
display: flex;
flex-direction: row;
justify-content: space-between;
padding-top: 16px;
div.button {
background: $white;
border: 1px solid $gray;
box-sizing: border-box; box-sizing: border-box;
border-radius: 2px;
img {
display: flex; display: block;
align-items: center; clear: both;
padding: 7px 6px; width: 100%;
margin-bottom: 15px;
font-size: 14px;
border: none;
cursor: pointer;
span.faicon {
margin: 0;
color: $blue;
} }
&.wtext { span.theme_name {
span.faicon { font-weight: $semi-bold;
margin-right: 8px;
}
padding: 5px 16px;
} }
} }
}
.theme_label_options {
display: flex;
flex-direction: row;
justify-content: space-between;
box-sizing: border-box;
padding-top: 16px;
div.button {
background: $white;
border: 1px solid $gray;
border-radius: 2px;
box-sizing: border-box;
//Aktivna tema height: 28px;
&.span_theme_current { width: fit-content;
border: 1px solid $blue;
display: flex;
align-items: center;
justify-content: center;
padding: 7px 6px;
font-size: 14px;
cursor: pointer;
span.faicon {
margin: 0;
color: $blue;
}
&.wtext {
padding: 7px 12px;
span.faicon {
margin-right: 8px;
}
}
transition: 0.2s;
&:hover {
background-color: darken($white,5%);
}
}
}
//Aktivna tema
&.span_theme_current {
border: 1px solid $blue;
}
} }
} }
} }
} }
// Oblika - prilagoditev teme // Oblika - prilagoditev teme
@ -371,7 +407,6 @@ div.button_holder {
} }
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
// Skopiran stari styling // Skopiran stari styling