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

[Redizajn 1KA] - Moje ankete --> 1KA predloge - v1

Browse Source
This commit is contained in:
tejagerjovic 2022-01-06 23:13:21 +01:00
parent 84beef6fbf
commit a8d34323dc
7 changed files with 146 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
admin/survey/classes/class.NewSurvey.php
View File

@ -65,7 +65,7 @@ class NewSurvey{
if($this->subpage == 'template'){ if($this->subpage == 'template'){
echo '<ul class="template_type_menu">'; echo '<ul class="template_type_menu">';
for($i=0; $i<=10; $i++){ for($i=0; $i<=10; $i++){
echo '<li><a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template&c='.$i.'" title="'.$lang['srv_newSurvey_survey_template_cat'.$i].'"><span class="subitem '.($this->subpage == 'template' && $this->template_category == $i ? ' active' : '').'"><span class="faicon fa-file-image new_survey_menu_icon">'.$lang['srv_newSurvey_survey_template_cat'.$i].'</span></a></li>'; echo '<li><a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template&c='.$i.'" title="'.$lang['srv_newSurvey_survey_template_cat'.$i].'"><span class="subitem '.($this->subpage == 'template' && $this->template_category == $i ? ' active' : '').'">'.$lang['srv_newSurvey_survey_template_cat'.$i].'</a></li>';
} }
echo '</ul>'; echo '</ul>';
} }
@ -333,7 +333,7 @@ class NewSurvey{
// 2. sklop - izbira predloge // 2. sklop - izbira predloge
echo '<div class="fieldset noSurvey_template">'; echo '<div class="fieldset noSurvey_template">';
echo '<div class="title">' . $lang['srv_newSurvey_survey_template_cat'.$this->template_category] . '</div>'; echo '<div class="title">' . $lang['srv_newSurvey_survey_template_choose'] . '</div>';
echo '<input type="hidden" name="noSurvey_template_id" id="noSurvey_template_id" value="">'; echo '<input type="hidden" name="noSurvey_template_id" id="noSurvey_template_id" value="">';
@ -344,21 +344,23 @@ class NewSurvey{
} }
echo '</select>'; echo '</select>';
echo '<div class="noSurvey_template_wrap">';
echo '<div class="noSurvey_template_holder">';
// Prikaz predlog // Prikaz predlog
foreach($this->templates as $template_id => $template_name){ foreach($this->templates as $template_id => $template_name){
$this->displayRightContentTemplate($template_id); $this->displayRightContentTemplate($template_id);
} }
echo '</div>';
echo '</div>';
echo '</div>'; echo '</div>';
// Gumba naprej in preklici // Gumba naprej in preklici
echo '<div class="noSurvey_buttons">'; echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';
echo '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>'; echo '<button class="medium blue" onclick="newAnketaTemplate();" id="noSurvey_create" title="' . $lang['srv_create_survey']. '">'.$lang['next1'].'</button>';
echo '<a href="#" onclick="newAnketaTemplate();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>'; echo '</div>';
echo '</div>';
} }
// Pripravimo podatke o vseh predlogah na trenutni strani // Pripravimo podatke o vseh predlogah na trenutni strani
@ -406,23 +408,18 @@ class NewSurvey{
// Vsebina // Vsebina
echo '<div class="template_title">'.$template_data['naslov'].'</div>';
echo '<div class="template_content">'; echo '<div class="template_content">';
echo '<div class="template_content_white">';
echo $lang['srv_newSurvey_survey_template_type'].': <span class="bold">'.$template_data['tip'].'</span>';
echo '<br /><br /><br />';
if($template_data['opis'] != '') if($template_data['opis'] != '')
echo (strlen($template_data['opis']) > 155) ? substr($template_data['opis'], 0, 152).'...' : $template_data['opis']; echo (strlen($template_data['opis']) > 140) ? substr($template_data['opis'], 0, 137).'...' : $template_data['opis'];
else else
echo $template_data['naslov']; echo $template_data['naslov'];
echo '</div>';
echo '</div>';
echo '<span class="template_title">'.$template_data['naslov'].'</span>';
echo '</div>';
// Predogled // Predogled
echo '<a href="'.$site_url.'a/'.$template_id.'?preview=on&no_preview=1&size=full" target="_blank" class="template_preview"><span class="faicon preview"></span> '.$lang['srv_newSurvey_survey_template_preview'].'</a>'; echo '<div class="template_preview">';
echo '<a class="noline" href="'.$site_url.'a/'.$template_id.'?preview=on&no_preview=1&size=full" target="_blank"><span class="faicon preview"></span> '.$lang['srv_newSurvey_survey_template_preview'].'</a>';
echo '</div>';
echo '</div>'; echo '</div>';
} }
@ -467,7 +464,6 @@ class NewSurvey{
echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>'; echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';
echo '<button class="medium blue" onclick="newAnketaCopy();" id="noSurvey_create">'.$lang['next1'].'</button>'; echo '<button class="medium blue" onclick="newAnketaCopy();" id="noSurvey_create">'.$lang['next1'].'</button>';
echo '</div>'; echo '</div>';
echo '<div class="noSurvey_buttons">';
} }
// Vsebina za uvažanje ankete iz arhiva // Vsebina za uvažanje ankete iz arhiva

1
lang/1.php
View File

@ -7045,6 +7045,7 @@ $lang = array (
'srv_newSurvey_survey_template2' => "Ustvari anketo iz predloge", 'srv_newSurvey_survey_template2' => "Ustvari anketo iz predloge",
'srv_newSurvey_survey_template_type' => "Tip ankete", 'srv_newSurvey_survey_template_type' => "Tip ankete",
'srv_newSurvey_survey_template_preview' => "Predogled", 'srv_newSurvey_survey_template_preview' => "Predogled",
'srv_newSurvey_survey_template_choose' => "Izberi predlogo",
'srv_newSurvey_survey_template_cat0' => "Vse predloge", 'srv_newSurvey_survey_template_cat0' => "Vse predloge",
'srv_newSurvey_survey_template_cat1' => "Evalvacija spletne strani", 'srv_newSurvey_survey_template_cat1' => "Evalvacija spletne strani",
'srv_newSurvey_survey_template_cat2' => "Izobraževanje", 'srv_newSurvey_survey_template_cat2' => "Izobraževanje",

1
lang/2.php
View File

@ -6931,6 +6931,7 @@ $lang = array (
'srv_newSurvey_survey_template2' => "Create survey from template", 'srv_newSurvey_survey_template2' => "Create survey from template",
'srv_newSurvey_survey_template_preview' => "Preview", 'srv_newSurvey_survey_template_preview' => "Preview",
'srv_newSurvey_survey_template_type' => "Survey type", 'srv_newSurvey_survey_template_type' => "Survey type",
'srv_newSurvey_survey_template_choose' => "Choose a template",
'srv_newSurvey_survey_template_cat0' => "All templates", 'srv_newSurvey_survey_template_cat0' => "All templates",
'srv_newSurvey_survey_template_cat1' => "Evaluation of websites", 'srv_newSurvey_survey_template_cat1' => "Evaluation of websites",
'srv_newSurvey_survey_template_cat2' => "Education", 'srv_newSurvey_survey_template_cat2' => "Education",

104
public/css/admin_new.css
View File

@ -13895,10 +13895,6 @@ and open the template in the editor.
Author : podkrizniku Author : podkrizniku
*/ */
div#main.hide_header { div#main.hide_header {
position: absolute;
height: 100vh;
width: 100vw;
background-color: #FFFFFF;
padding: 0 !important; padding: 0 !important;
} }
@ -13948,21 +13944,25 @@ div#main.hide_header {
} }
#new_anketa_div .layout_left_item ul { #new_anketa_div .layout_left_item ul {
list-style-type: none; list-style-type: none;
padding-left: 30px; padding-left: 70px;
margin: 25px 0 15px 0; margin: 16px 0;
} }
#new_anketa_div .layout_left_item ul li { #new_anketa_div .layout_left_item ul li {
padding: 0 0 10px 0; margin-bottom: 3px;
}
#new_anketa_div .layout_left_item ul li:last-of-type {
margin-bottom: 0px;
} }
#new_anketa_div .layout_left_item ul li a { #new_anketa_div .layout_left_item ul li a {
font-size: 14px; font-size: 14px;
color: #777777; color: #333333;
} }
#new_anketa_div .layout_left_item ul li a:hover { #new_anketa_div .layout_left_item ul li a:hover {
color: #1E88E5; color: #1E88E5;
} }
#new_anketa_div .layout_left_item ul li .active { #new_anketa_div .layout_left_item ul li .active {
color: #1E88E5; color: #1E88E5;
font-weight: 600;
} }
/* /*
@ -13985,6 +13985,7 @@ and open the template in the editor.
} }
#new_anketa_div .layout_right_item .layout_right_centering { #new_anketa_div .layout_right_item .layout_right_centering {
max-width: 1060px; max-width: 1060px;
box-sizing: border-box;
} }
#new_anketa_div .layout_right_item .layout_right_centering span.faicon.fa-times { #new_anketa_div .layout_right_item .layout_right_centering span.faicon.fa-times {
position: absolute; position: absolute;
@ -14274,60 +14275,57 @@ and open the template in the editor.
background-color: #1E88E5; background-color: #1E88E5;
color: white !important; color: white !important;
} }
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template { #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap {
overflow: auto; display: flex;
justify-content: center;
} }
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template { #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder {
display: flex;
flex-direction: row;
justify-content: space-between;
flex-wrap: wrap;
box-sizing: border-box;
width: 90%;
}
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template {
cursor: pointer; cursor: pointer;
float: left; margin-bottom: 32px;
margin: 0 30px 30px 20px; border: solid 1px #E5E5E5;
width: 200px; width: 292px;
height: 205px;
transition: 0.1s;
} }
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template:hover { #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template:hover {
color: #777777; background-color: #fafafa;
} }
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template .template_content { #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template:hover .template_title {
overflow: hidden; background-color: #f0f0f0;
width: 200px;
height: 189px;
margin: 0 10px;
padding: 5px 5px 5px 5px;
background-color: #1E88E5;
border: none;
/*border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;*/
} }
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template .template_content:hover { #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template .template_title {
background-color: #187bd1; font-weight: 900;
border: none;
}
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template .template_content .template_content_white {
width: 190px;
height: 120px;
padding: 15px 5px;
text-align: center;
font-size: 12px;
font-weight: 400;
background-color: white;
}
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template .template_content .template_title {
font-size: 13px;
text-transform: uppercase; text-transform: uppercase;
background-color: #F8F8F8;
padding: 19px 11px 19px;
} }
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template .template_preview { #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template .template_content {
margin-right: -15px; overflow: hidden;
float: right; margin: 16px 11px;
padding: 5px 0 5px 5px;
font-size: 12px;
font-weight: 400;
} }
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template.selected { #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template .template_preview {
color: #777777; bottom: 0;
margin: 0 11px;
} }
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template.selected .template_content { #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected {
background-color: #FF0000; cursor: pointer;
border: none; border-color: #808080;
background-color: #C4C4C4;
}
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected .template_title {
background-color: #808080;
color: #FFFFFF;
}
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected .template_preview a {
color: #FFFFFF;
} }
#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template select.template_type_menu { #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template select.template_type_menu {
display: none; display: none;

16
resources/sass/admin_new/pages/new_survey_page/left_menu.scss
View File

@ -18,7 +18,7 @@
box-shadow: none; box-shadow: none;
height: fit-content; height: fit-content;
.item { .item {
display: flex; display: flex;
@ -51,19 +51,25 @@
ul{ ul{
list-style-type: none; list-style-type: none;
padding-left: 30px; padding-left: 70px;
margin: 25px 0 15px 0; margin: 16px 0;
li{ li{
padding: 0 0 10px 0;
margin-bottom: 3px;
&:last-of-type {
margin-bottom: 0px;
}
a{ a{
font-size: 14px; font-size: 14px;
color: $very-dark-gray; color: $black;
&:hover{ &:hover{
color: $blue; color: $blue;
} }
} }
.active{ .active{
color: $blue; color: $blue;
font-weight: $semi-bold;
} }
} }
} }

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

@ -9,10 +9,6 @@ and open the template in the editor.
*/ */
div#main.hide_header { div#main.hide_header {
position: absolute;
height: 100vh;
width: 100vw;
background-color: $white;
padding: 0 !important; padding: 0 !important;
} }

114
resources/sass/admin_new/pages/new_survey_page/right_content.scss
View File

@ -30,6 +30,7 @@ $skin_selector: $red;
.layout_right_centering { .layout_right_centering {
max-width: 1060px; max-width: 1060px;
box-sizing: border-box;
span.faicon.fa-times { span.faicon.fa-times {
position: absolute; position: absolute;
@ -393,67 +394,72 @@ $skin_selector: $red;
} }
} }
.noSurvey_template { .noSurvey_template {
overflow: auto;
.template { .noSurvey_template_wrap {
cursor: pointer; display: flex;
float: left; justify-content: center;
margin: 0 30px 30px 20px;
width: 200px;
&:hover {
color: $selectors;
}
.template_content { .noSurvey_template_holder {
overflow: hidden; display: flex;
flex-direction: row;
justify-content: space-between;
flex-wrap: wrap;
box-sizing: border-box;
width: 90%;
width: 200px; .template {
height: 189px; cursor: pointer;
margin: 0 10px; margin-bottom: 32px;
padding: 5px 5px 5px 5px; border: solid 1px $gray;
width: 292px;
height: 205px;
background-color: $default_template_background; transition: 0.1s;
border: none;
/*border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;*/
&:hover { &:hover {
background-color: darken( $default_template_background, 5% ); background-color: darken($white,2%);
border: none; .template_title{
background-color: darken($light-gray,3%);
}
}
.template_title{
font-weight: $heavy;
text-transform: uppercase;
background-color: $light-gray;
padding: 19px 11px 19px;
}
.template_content {
overflow: hidden;
margin: 16px 11px;
}
.template_preview {
bottom: 0;
margin: 0 11px;
}
&.selected {
cursor: pointer;
border-color: $very-dark-gray2;
background-color: $dark-gray;
.template_title{
background-color: $very-dark-gray2;
color: $white;
}
.template_preview {
a {
color: $white;
}
}
}
} }
.template_content_white {
width: 190px;
height: 120px;
padding: 15px 5px;
text-align: center;
font-size: 12px;
font-weight: 400;
background-color: $white_template_background;
}
.template_title{
font-size: 13px;
text-transform: uppercase;
}
}
.template_preview{
margin-right: -15px;
float: right;
padding: 5px 0 5px 5px;
font-size: 12px;
font-weight: 400;
}
}
.template.selected {
color: $selectors;
.template_content {
background-color: $skin_selector;
border: none;
} }
} }