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

Redesign - zamenjan gumb za aktivacijo/deaktivacijo ankete (svg)

Browse Source
This commit is contained in:
pero1203 2022-06-22 09:16:54 +02:00
parent 1adcbc9eb6
commit 23aebe3ae8
10 changed files with 56 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/survey/SurveyAdmin.php
View File

@ -5956,7 +5956,7 @@ class SurveyAdmin
echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->anketa . '\',\'' . $row['active'] . '\'); return false;">';
}
echo '<div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div>';
echo '<div id="srv_active" class="switch_anketa anketa_on"></div>';
echo '</a>';
}
@ -5975,14 +5975,7 @@ class SurveyAdmin
echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;">';
}
if ((int)$_last_active > 0) {
# anketa je zaključena
echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
}
else {
# anketa je neaktivna
echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
}
echo '<div id="srv_inactive" class="switch_anketa anketa_off"></div>';
echo '</a>';
}

11
admin/survey/SurveyAdminSettings.php
View File

@ -2673,7 +2673,7 @@ class SurveyAdminSettings {
echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->anketa . '\',\'' . $row['active'] . '\'); return false;" title="' . $lang['srv_anketa_active'] . '">';
}
echo '<div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div>';
echo '<div id="srv_active" class="switch_anketa anketa_on"></div>';
echo '</a>';
}
@ -2692,14 +2692,7 @@ class SurveyAdminSettings {
echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;" title="' . $lang['srv_anketa_noactive'] . '">';
}
if ((int)$_last_active > 0) {
# anketa je zaključena
echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
}
else {
# anketa je neaktivna
echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
}
echo '<div id="srv_inactive" class="switch_anketa anketa_off"></div>';
echo '</a>';
}

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

@ -1557,9 +1557,9 @@ class SurveyList {
// Stikalo za folderje
if($this->show_folders == 1)
echo ' <div class="switch_folders on"><span class="switch_folders_content">ON</span></div>';
echo ' <div class="switch_folders on"></div>';
else
echo ' <div class="switch_folders off"><span class="switch_folders_content">OFF</span></div>';
echo ' <div class="switch_folders off"></div>';
echo '</div>';
}

4
admin/survey/classes/mobile/class.MobileSurveyAdmin.php
View File

@ -166,7 +166,7 @@ class MobileSurveyAdmin{
echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->surveyAdminClass->anketa . '\',\'' . $row['active'] . '\'); return false;" title="' . $lang['srv_anketa_active'] . '">';
}
echo ' <div class="setting_icon"><div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div></div>';
echo ' <div class="setting_icon"><div id="srv_active" class="switch_anketa anketa_on"></div></div>';
echo ' <div class="setting_text">'.$lang['srv_anketa_active'].'</div>';
echo '</a>';
@ -187,7 +187,7 @@ class MobileSurveyAdmin{
echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;" title="' . $lang['srv_anketa_noactive'] . '">';
}
echo ' <div class="setting_icon"><div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div></div>';
echo ' <div class="setting_icon"><div id="srv_inactive" class="switch_anketa anketa_off"></div></div>';
echo ' <div class="setting_text">'.$lang['srv_anketa_noactive'].'</div>';
echo '</a>';

172
public/css/admin_new.css
View File

@ -8883,51 +8883,15 @@ header #top_line #xtradiv #xtradivSettings a .faicon:before {
width: 46px;
height: 16px;
}
.switch_anketa .switch_anketa_content {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding-top: 1px;
color: white;
font-size: 12px;
font-weight: 400;
line-height: 12px;
background-color: #1E88E5;
border-radius: 16px;
.switch_anketa.anketa_on {
background-image: url("../../public/img/icons/toggle_active.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.switch_anketa .switch_anketa_content:before {
position: absolute;
content: "";
height: 14px;
width: 14px;
bottom: 1px;
background-color: white;
border-radius: 50%;
}
.switch_anketa.anketa_on .switch_anketa_content {
padding-left: 20px;
background-color: #1E88E5;
}
.switch_anketa.anketa_on .switch_anketa_content:before {
left: 1px;
}
.switch_anketa.anketa_on:hover .switch_anketa_content {
background-color: #0059ab;
}
.switch_anketa.anketa_off .switch_anketa_content {
padding-left: 6px;
background-color: #C4C4C4;
}
.switch_anketa.anketa_off .switch_anketa_content:before {
right: 1px;
}
.switch_anketa.anketa_off:hover .switch_anketa_content {
background-color: #b7b7b7;
.switch_anketa.anketa_off {
background-image: url("../../public/img/icons/toggle_inactive.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
header #surveyNavigation {
@ -10639,65 +10603,19 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
width: 41px;
height: 16px;
}
#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders .switch_folders_content,
#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders .switch_folders_content,
#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders .switch_folders_content {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding-top: 1px;
color: white;
font-size: 10px;
font-weight: 400;
line-height: 13px;
background-color: #1E88E5;
border-radius: 16px;
#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.on,
#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.on,
#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.on {
background-image: url("../../public/img/icons/toggle_active.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders .switch_folders_content:before,
#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders .switch_folders_content:before,
#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders .switch_folders_content:before {
position: absolute;
content: "";
height: 14px;
width: 14px;
bottom: 1px;
background-color: white;
border-radius: 50%;
}
#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.on .switch_folders_content,
#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.on .switch_folders_content,
#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.on .switch_folders_content {
padding-left: 20px;
background-color: #1E88E5;
}
#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.on .switch_folders_content:before,
#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.on .switch_folders_content:before,
#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.on .switch_folders_content:before {
left: 1px;
}
#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.on:hover .switch_folders_content,
#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.on:hover .switch_folders_content,
#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.on:hover .switch_folders_content {
background-color: #0059ab;
}
#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.off .switch_folders_content,
#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.off .switch_folders_content,
#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.off .switch_folders_content {
padding-left: 6px;
background-color: #808080;
}
#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.off .switch_folders_content:before,
#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.off .switch_folders_content:before,
#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.off .switch_folders_content:before {
right: 1px;
}
#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.off:hover .switch_folders_content,
#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.off:hover .switch_folders_content,
#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.off:hover .switch_folders_content {
background-color: #777777;
#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.off,
#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.off,
#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.off {
background-image: url("../../public/img/icons/toggle_inactive.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
#survey_list .second_line .filters #filterButton#filterButton:after, #survey_list .second_line .filters #filterButton#sortButton:after,
#survey_list .second_line .filters #sortButton#filterButton:after,
@ -24395,56 +24313,6 @@ div#vabila div.top_note div.top_note_activate {
div#vabila div.top_note div.top_note_activate p {
margin-right: 12px;
}
div#vabila div.top_note div.top_note_activate .switch_anketa {
position: relative;
display: block;
width: 46px;
height: 16px;
}
div#vabila div.top_note div.top_note_activate .switch_anketa .switch_anketa_content {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding-top: 1px;
color: white;
font-size: 12px;
font-weight: 400;
line-height: 12px;
background-color: #1E88E5;
border-radius: 16px;
}
div#vabila div.top_note div.top_note_activate .switch_anketa .switch_anketa_content:before {
position: absolute;
content: "";
height: 14px;
width: 14px;
bottom: 1px;
background-color: white;
border-radius: 50%;
}
div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_on .switch_anketa_content {
padding-left: 20px;
background-color: #1E88E5;
}
div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_on .switch_anketa_content:before {
left: 1px;
}
div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_on:hover .switch_anketa_content {
background-color: #0059ab;
}
div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_off .switch_anketa_content {
padding-left: 6px;
background-color: #808080;
}
div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_off .switch_anketa_content:before {
right: 1px;
}
div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_off:hover .switch_anketa_content {
background-color: #777777;
}
div#vabila div.title {
display: flex;
flex-direction: row;

5
public/img/icons/toggle_active.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="95" height="35" viewBox="0 0 95 35" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="94.0625" height="35" rx="17.5" fill="#1E88E5"/>
<rect x="2.1875" y="2.1875" width="30.625" height="30.625" rx="15.3125" fill="white"/>
<path d="M52.7513 27.315C51.3163 27.315 50.0388 26.9475 48.9188 26.2125C47.8163 25.4775 46.95 24.4362 46.32 23.0887C45.7075 21.7412 45.4013 20.1487 45.4013 18.3112C45.4013 16.4737 45.7075 14.8987 46.32 13.5862C46.95 12.2562 47.8163 11.2412 48.9188 10.5412C50.0388 9.82375 51.3163 9.465 52.7513 9.465C54.2038 9.465 55.4813 9.82375 56.5838 10.5412C57.6863 11.2412 58.5525 12.2562 59.1825 13.5862C59.8125 14.8987 60.1275 16.4737 60.1275 18.3112C60.1275 20.1487 59.8125 21.7412 59.1825 23.0887C58.5525 24.4362 57.6863 25.4775 56.5838 26.2125C55.4813 26.9475 54.2038 27.315 52.7513 27.315ZM52.7513 25.3987C53.7838 25.3987 54.6763 25.11 55.4288 24.5325C56.1988 23.9375 56.7938 23.115 57.2138 22.065C57.6338 20.9975 57.8438 19.7462 57.8438 18.3112C57.8438 16.1762 57.38 14.4875 56.4525 13.245C55.525 12.0025 54.2913 11.3812 52.7513 11.3812C51.2113 11.3812 49.9775 12.0025 49.05 13.245C48.1225 14.4875 47.6588 16.1762 47.6588 18.3112C47.6588 19.7462 47.8688 20.9975 48.2888 22.065C48.7088 23.115 49.3038 23.9375 50.0738 24.5325C50.8438 25.11 51.7363 25.3987 52.7513 25.3987ZM63.8304 27V9.78H66.0879L72.3091 20.595L74.1729 24.165H74.2779C74.2254 23.29 74.1641 22.3887 74.0941 21.4612C74.0416 20.5162 74.0154 19.5887 74.0154 18.6787V9.78H76.0891V27H73.8316L67.5841 16.1587L65.7204 12.615H65.6154C65.6854 13.4725 65.7466 14.3562 65.7991 15.2662C65.8691 16.1762 65.9041 17.0862 65.9041 17.9962V27H63.8304Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

5
public/img/icons/toggle_inactive.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="95" height="35" viewBox="0 0 95 35" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="94.0628" height="35.0001" rx="17.5001" fill="#CCCCCC"/>
<rect x="61.2502" y="2.1875" width="30.6251" height="30.6251" rx="15.3125" fill="white"/>
<path d="M21.2341 26.4763C19.9187 26.4763 18.7476 26.1394 17.7209 25.4656C16.7103 24.7919 15.9162 23.8374 15.3387 22.6022C14.7773 21.367 14.4966 19.9072 14.4966 18.2228C14.4966 16.5384 14.7773 15.0947 15.3387 13.8915C15.9162 12.6724 16.7103 11.7419 17.7209 11.1003C18.7476 10.4426 19.9187 10.1137 21.2341 10.1137C22.5655 10.1137 23.7366 10.4426 24.7472 11.1003C25.7578 11.7419 26.5519 12.6724 27.1294 13.8915C27.7069 15.0947 27.9957 16.5384 27.9957 18.2228C27.9957 19.9072 27.7069 21.367 27.1294 22.6022C26.5519 23.8374 25.7578 24.7919 24.7472 25.4656C23.7366 26.1394 22.5655 26.4763 21.2341 26.4763ZM21.2341 24.7197C22.1805 24.7197 22.9987 24.455 23.6885 23.9256C24.3943 23.3802 24.9397 22.6262 25.3247 21.6637C25.7097 20.6852 25.9022 19.5382 25.9022 18.2228C25.9022 16.2657 25.4771 14.7177 24.6269 13.5787C23.7767 12.4397 22.6457 11.8703 21.2341 11.8703C19.8224 11.8703 18.6915 12.4397 17.8413 13.5787C16.991 14.7177 16.5659 16.2657 16.5659 18.2228C16.5659 19.5382 16.7584 20.6852 17.1434 21.6637C17.5284 22.6262 18.0739 23.3802 18.7797 23.9256C19.4855 24.455 20.3037 24.7197 21.2341 24.7197ZM31.39 26.1875V10.4025H40.4856V12.0868H33.3872V17.4287H39.4028V19.1131H33.3872V26.1875H31.39ZM43.2803 26.1875V10.4025H52.3759V12.0868H45.2775V17.4287H51.2931V19.1131H45.2775V26.1875H43.2803Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

65
resources/sass/admin_new/components/header/top_line.scss
View File

@ -327,63 +327,16 @@ header #top_line{
width: 46px;
height: 16px;
.switch_anketa_content {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding-top: 1px;
color: white;
font-size: 12px;
font-weight: 400;
line-height: 12px;
background-color: $blue;
border-radius: 16px;
&.anketa_on{
background-image: url("../../public/img/icons/toggle_active.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.switch_anketa_content:before {
position: absolute;
content: "";
height: 14px;
width: 14px;
bottom: 1px;
background-color: white;
border-radius: 50%;
}
}
.switch_anketa.anketa_on{
.switch_anketa_content{
padding-left: 20px;
background-color: $blue;
}
.switch_anketa_content:before{
left: 1px;
}
&:hover{
.switch_anketa_content{
background-color: $dark-blue;
}
}
}
.switch_anketa.anketa_off{
.switch_anketa_content{
padding-left: 6px;
background-color: $dark-gray;
}
.switch_anketa_content:before{
right: 1px;
}
&:hover{
.switch_anketa_content{
background-color: darken($dark-gray, 5%);
}
&.anketa_off{
background-image: url("../../public/img/icons/toggle_inactive.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
}

66
resources/sass/admin_new/pages/my_surveys/top_filters.scss
View File

@ -245,64 +245,16 @@
width: 41px;
height: 16px;
.switch_folders_content {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding-top: 1px;
color: white;
font-size: 10px;
font-weight: 400;
line-height: 13px;
background-color: $blue;
border-radius: 16px;
&.on{
background-image: url("../../public/img/icons/toggle_active.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.switch_folders_content:before {
position: absolute;
content: "";
height: 14px;
width: 14px;
bottom: 1px;
background-color: white;
border-radius: 50%;
}
}
.switch_folders.on{
.switch_folders_content{
padding-left: 20px;
background-color: $blue;
}
.switch_folders_content:before{
left: 1px;
}
&:hover{
.switch_folders_content{
background-color: $dark-blue;
}
}
}
.switch_folders.off{
.switch_folders_content{
padding-left: 6px;
background-color: $very-dark-gray2;
}
.switch_folders_content:before{
right: 1px;
}
&:hover{
.switch_folders_content{
background-color: $very-dark-gray;
}
&.off{
background-image: url("../../public/img/icons/toggle_inactive.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
}
}

68
resources/sass/admin_new/pages/survey_objava/pregled.scss
View File

@ -36,74 +36,6 @@ div#vabila {
p {
margin-right: 12px;
}
// Gumb za aktivacijo ankete - kopirano iz headerja
.switch_anketa {
position: relative;
display: block;
width: 46px;
height: 16px;
.switch_anketa_content {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding-top: 1px;
color: white;
font-size: 12px;
font-weight: 400;
line-height: 12px;
background-color: $blue;
border-radius: 16px;
}
.switch_anketa_content:before {
position: absolute;
content: "";
height: 14px;
width: 14px;
bottom: 1px;
background-color: white;
border-radius: 50%;
}
}
.switch_anketa.anketa_on{
.switch_anketa_content{
padding-left: 20px;
background-color: $blue;
}
.switch_anketa_content:before{
left: 1px;
}
&:hover{
.switch_anketa_content{
background-color: $dark-blue;
}
}
}
.switch_anketa.anketa_off{
.switch_anketa_content{
padding-left: 6px;
background-color: $very-dark-gray2;
}
.switch_anketa_content:before{
right: 1px;
}
&:hover{
.switch_anketa_content{
background-color: $very-dark-gray;
}
}
}
}
}