Redesign - moje ankete - V DELU
This commit is contained in:
pero1203
parent
7a39826a2d
commit
6356dd564d
@ -981,8 +981,10 @@ class SurveyList {
|
||||
|
||||
// Paginacija - se na dnu - ni prikazana pri searchu
|
||||
if($this->isSearch != 1){
|
||||
echo '<div class="pagination bottom">';
|
||||
echo '<div class="pagination_bottom_holder">';
|
||||
echo ' <div class="pagination bottom">';
|
||||
$this->displayPagiantion();
|
||||
echo ' </div>';
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
@ -1195,47 +1197,34 @@ class SurveyList {
|
||||
|
||||
// HEADER VRSTICA
|
||||
echo '<tr class="sl_header_new">';
|
||||
|
||||
// Info ikona
|
||||
echo '<td class="col1">';
|
||||
echo '</td>';
|
||||
|
||||
// Tip ankete (forma, navadna, glasovanje)
|
||||
//echo '<td class="col2"></td>';
|
||||
// Aktivnost ankete
|
||||
echo '<td class="col2"></td>';
|
||||
|
||||
|
||||
// Naslov
|
||||
echo '<td class="col3">';
|
||||
echo '<td class="col1">';
|
||||
echo $this->createOrderUrlNew(1, $lang['title']);
|
||||
echo '</td>';
|
||||
|
||||
// Trajanje - status
|
||||
echo '<td class="col4">';
|
||||
echo '<td class="col2">';
|
||||
echo $this->createOrderUrlNew(18, 'Status');
|
||||
echo '</td>';
|
||||
|
||||
// Tip + st. vprasanj
|
||||
echo '<td class="col5">';
|
||||
echo '';
|
||||
// Ustvarjeno
|
||||
echo '<td class="col3">';
|
||||
echo $this->createOrderUrlNew(19, $lang['srv_tip']);
|
||||
echo '</td>';
|
||||
|
||||
// Zadnji vnos
|
||||
echo '<td class="col6">';
|
||||
echo '<td class="col4">';
|
||||
echo $this->createOrderUrlNew(16, $lang['srv_last_insrt']);
|
||||
echo '</td>';
|
||||
|
||||
// Sprememba
|
||||
echo '<td class="col7">';
|
||||
echo '<td class="col5">';
|
||||
echo $this->createOrderUrlNew(14, $lang['change']);
|
||||
echo '</td>';
|
||||
|
||||
// Ikona1
|
||||
echo '<td class="col8"></td>';
|
||||
|
||||
// Ikona2
|
||||
echo '<td class="col9"></td>';
|
||||
// Ostalo
|
||||
echo '<td class="col6"></td>';
|
||||
|
||||
echo '</tr>';
|
||||
|
||||
@ -1245,14 +1234,9 @@ class SurveyList {
|
||||
|
||||
echo '<tr id="anketa_list_'.$anketa['id'].'" class="anketa_list '.($this->show_folders == 1 ? ' mySurvey_draggable' : '').'" anketa_id="'.$anketa['id'].'">';
|
||||
|
||||
// Info ikona
|
||||
echo '<td class="col1">';
|
||||
//var_dump($anketa);
|
||||
echo '<span id="info_icon_'.$anketa['id'].'" anketa="'.$anketa['id'].'" class="faicon info icon-as_link pointer icon-center" title="'.$lang['srv_survey_info'].'" onClick="surveyList_info(\''.$anketa['id'].'\');"></span>';
|
||||
echo '</td>';
|
||||
|
||||
|
||||
// Aktivnost - neaktivna, aktivna, zakljucena
|
||||
echo '<td class="col2">';
|
||||
/*echo '<td class="col2">';
|
||||
if ($anketa['active'] == 1) {
|
||||
echo '<div class="dot blue" title="'.$lang['srv_anketa_active2'].'"></div>';
|
||||
} else {
|
||||
@ -1265,10 +1249,11 @@ class SurveyList {
|
||||
echo '<div class="dot grey" title="'.$lang['srv_survey_non_active_notActivated'].'"></div>';
|
||||
}
|
||||
}
|
||||
echo '</td>';
|
||||
echo '</td>';*/
|
||||
|
||||
|
||||
// Naslov
|
||||
echo '<td class="col3">';
|
||||
echo '<td class="col1">';
|
||||
if(strlen($anketa['naslov']) > 60)
|
||||
$text = substr($anketa['naslov'],0,60);
|
||||
else
|
||||
@ -1324,8 +1309,9 @@ class SurveyList {
|
||||
echo $lang['srv_h_sl_avtor'].': '.$name_searched.' '.$surname_searched.', '.$i_time[0].'.'.$i_time[1].'.20'.$i_time[2].'</span>';
|
||||
echo '</td>';
|
||||
|
||||
|
||||
// Trajanje - status
|
||||
echo '<td class="col4">';
|
||||
echo '<td class="col2">';
|
||||
if ($anketa['active'] == 1) {
|
||||
$now = time();
|
||||
$do = explode('.', $anketa['trajanjedo']);
|
||||
@ -1355,8 +1341,9 @@ class SurveyList {
|
||||
}
|
||||
echo '</td>';
|
||||
|
||||
// Tip + st. vprasanj
|
||||
echo '<td class="col5">';
|
||||
|
||||
// Ustvarjeno
|
||||
echo '<td class="col3">';
|
||||
if($anketa['survey_type'] == 0)
|
||||
echo $lang['srv_vrsta_survey_type_0'];
|
||||
elseif($anketa['survey_type'] == 1)
|
||||
@ -1369,8 +1356,9 @@ class SurveyList {
|
||||
echo '<br /><span class="small">'.$lang['srv_h_sl_stvprasanj'].': '. $anketa['variables'].'</span>';
|
||||
echo '</td>';
|
||||
|
||||
|
||||
// Zadnji vnos
|
||||
echo '<td class="col6">';
|
||||
echo '<td class="col4">';
|
||||
if($anketa['answers'] > 0){
|
||||
$v_time = substr($anketa['v_time_last'], 0, 8);
|
||||
$v_time = explode('.', $v_time);
|
||||
@ -1382,8 +1370,9 @@ class SurveyList {
|
||||
echo '<span class="small">'.$lang['srv_info_answers'].': '.$anketa['answers'].'</span>';
|
||||
echo '</td>';
|
||||
|
||||
|
||||
// Sprememba
|
||||
echo '<td class="col7">';
|
||||
echo '<td class="col5">';
|
||||
$e_time = substr($anketa['e_time'], 0, 8);
|
||||
$e_time = explode('.', $e_time);
|
||||
echo $e_time[0].'.'.$e_time[1].'.20'.$e_time[2].'<br />';
|
||||
@ -1393,13 +1382,23 @@ class SurveyList {
|
||||
echo '</a>';
|
||||
echo '</td>';
|
||||
|
||||
|
||||
// Ostalo
|
||||
echo '<td class="col6">';
|
||||
echo ' <a>';
|
||||
echo ' <span class="faicon">...</span>';
|
||||
echo ' </a>';
|
||||
echo '</td>';
|
||||
|
||||
|
||||
// Knjiznica - uporabnik
|
||||
echo '<td class="col8">';
|
||||
/*echo '<td class="col8">';
|
||||
echo '<a href="#" title="'.($anketa['lib_usr'] == 1 ? $lang['srv_ank_mylib_off'] : $lang['srv_ank_mylib_on']).'" onclick="surveyList_myknjiznica_new(\''.$anketa['id'].'\'); return false;">';
|
||||
echo '<span class="sprites '.($anketa['lib_usr'] == 1 ? ' sl_active_on': ' sl_active_off').'"></span>';
|
||||
echo '</a>';
|
||||
echo '</td>';
|
||||
|
||||
|
||||
// Knjiznica - global (samo admin)
|
||||
echo '<td class="col9">';
|
||||
if ($this->g_adminType == 0){
|
||||
@ -1407,7 +1406,7 @@ class SurveyList {
|
||||
echo '<span class="sprites '.($anketa['lib_glb'] == 1 ? ' sl_library_on': ' sl_library_off').'"></span>';
|
||||
echo '</a>';
|
||||
}
|
||||
echo '</td>';
|
||||
echo '</td>';*/
|
||||
|
||||
echo '</tr>';
|
||||
}
|
||||
@ -1495,6 +1494,7 @@ class SurveyList {
|
||||
|
||||
# ali sploh izrisujemo paginacijo
|
||||
if ($this->max_pages > 1) {
|
||||
|
||||
if ($this->onlyPhone == false) {
|
||||
$baseUrl = $site_url."admin/survey/index.php?pageno=";
|
||||
} else {
|
||||
@ -1504,12 +1504,11 @@ class SurveyList {
|
||||
# povezava na prejšnjo stran
|
||||
$prev_page = $this->pageno - 1;
|
||||
if($prev_page >= 1) {
|
||||
//echo('<div><a href="'.$baseUrl.$prev_page.'">'.$lang['previous_page_short'].'</a></div>');
|
||||
echo('<div><a href="'.$baseUrl.$prev_page.'"><span class="faicon pagination_left icon-blue"></span></a></div>');
|
||||
} else {
|
||||
echo '<a href="'.$baseUrl.$prev_page.'"><div class="arrow left"><span class="faicon pagination_left"></span></div></a>';
|
||||
}
|
||||
else {
|
||||
# brez href povezave
|
||||
//echo('<div class="disabledPage">'.$lang['previous_page_short'].'</div>');
|
||||
echo('<div class="disabledPage"><span class="faicon pagination_left icon-blue_soft"></span></div>');
|
||||
echo '<div class="arrow left disabledPage"><span class="faicon pagination_left"></span></div>';
|
||||
}
|
||||
|
||||
# povezave za vmesne strani
|
||||
@ -1517,31 +1516,35 @@ class SurveyList {
|
||||
$skipped = false;
|
||||
for($a = 1; $a <= $this->max_pages; $a++) {
|
||||
if ($this->max_pages < ((SRV_LIST_GROUP_PAGINATE+1) * 2) || $a <= SRV_LIST_GROUP_PAGINATE || $a > ($this->max_pages-SRV_LIST_GROUP_PAGINATE)
|
||||
|
||||
|| ( abs($a-$this->pageno) < SRV_LIST_GROUP_PAGINATE)) {
|
||||
if ($skipped == true) {
|
||||
|
||||
echo '<div class="spacePage">. . .</div>';
|
||||
|
||||
$skipped = false;
|
||||
}
|
||||
|
||||
if($a == $this->pageno) {
|
||||
# brez href povezave
|
||||
echo('<div class="currentPage">'.$a.'</div>');
|
||||
} else {
|
||||
echo('<div><a href="'.$baseUrl.$a.'">'.$a.'</a></div>');
|
||||
echo '<div class="page_number currentPage">'.$a.'</div>';
|
||||
}
|
||||
else {
|
||||
echo '<a href="'.$baseUrl.$a.'"><div class="page_number">'.$a.'</div></a>';
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
$skipped = true;
|
||||
}
|
||||
}
|
||||
|
||||
# povezava na naslednjo stran
|
||||
$next_page = $this->pageno + 1;
|
||||
if($next_page <= $this->max_pages) {
|
||||
//echo('<div><a href="'.$baseUrl.$next_page.'">'.$lang['next_page_short'].'</a></div>');
|
||||
echo('<div><a href="'.$baseUrl.$next_page.'"><span class="faicon pagination_right icon-blue"></span></a></div>');
|
||||
} else {
|
||||
echo '<a href="'.$baseUrl.$next_page.'"><div class="arrow right"><span class="faicon pagination_right"></span></div></a>';
|
||||
}
|
||||
else {
|
||||
# brez href povezave
|
||||
//echo('<div class="disabledPage">'.$lang['next_page_short'].'</div>');
|
||||
echo('<div class="disabledPage"><span class="faicon pagination_right icon-blue_soft"></span></div>');
|
||||
echo '<div class="arrow right disabledPage"><span class="faicon pagination_right"></span></div>';
|
||||
}
|
||||
|
||||
}
|
||||
@ -1649,8 +1652,15 @@ class SurveyList {
|
||||
echo '</div>';
|
||||
}
|
||||
else{
|
||||
echo '<div title="'.$lang['srv_mySurvey_show_folders_desc'].'" id="folderSwitch" '.($this->show_folders == 1 ? ' class="active"' : '').' onClick="switchFolder(\''.$this->show_folders.'\');">';
|
||||
echo $lang['srv_mySurvey_show_folders'];
|
||||
echo '<div title="'.$lang['srv_mySurvey_show_folders_desc'].'" id="folderSwitch" onClick="switchFolder(\''.$this->show_folders.'\');">';
|
||||
echo ' <span>'.$lang['srv_mySurvey_show_folders'].'</span>';
|
||||
|
||||
// Stikalo za folderje
|
||||
if($this->show_folders == 1)
|
||||
echo ' <div class="switch_folders on"><span class="switch_folders_content">ON</span></div>';
|
||||
else
|
||||
echo ' <div class="switch_folders off"><span class="switch_folders_content">OFF</span></div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
@ -1788,13 +1798,11 @@ class SurveyList {
|
||||
|
||||
echo '<form method="GET" id="1kasmysurvey" action="'.$site_url.'admin/survey/index.php">';
|
||||
|
||||
//echo '<span class="sprites search"></span> ';
|
||||
echo '<input id="searchMySurvey" type="text" value="" placeholder="' . $lang['s_search_mySurvey'] . '" name="search" />';
|
||||
echo '<input id="searchMySurvey" type="text" value="" placeholder="'.$lang['s_search_mySurvey'].'" name="search" />';
|
||||
|
||||
//echo '<input type="submit" value="' . $lang['s_search'] . '" />';
|
||||
echo ' <div class="buttonwrapper floatRight">';
|
||||
echo ' <a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#1kasmysurvey\').submit(); return false;"><span>'.$lang['s_search2'].'</span></a>';
|
||||
echo ' </div>';
|
||||
echo ' <button class="medium white-black" onclick="$(\'#1kasmysurvey\').submit(); return false;">';
|
||||
echo $lang['s_search2'];
|
||||
echo ' </button>';
|
||||
|
||||
echo '</form>';
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,6 +2,8 @@
|
||||
Components scss
|
||||
*/
|
||||
|
||||
@import "hover/hover";
|
||||
@import "popup/popup";
|
||||
|
||||
// Layout components
|
||||
@import "header/header";
|
||||
@ -10,6 +12,4 @@
|
||||
|
||||
// Functional components
|
||||
@import "form/form";
|
||||
@import "table/table";
|
||||
@import "popup/popup";
|
||||
@import "hover/hover";
|
||||
@import "table/table";
|
||||
@ -37,6 +37,8 @@
|
||||
|
||||
// Hover za izvoze
|
||||
#hover_export {
|
||||
@include hover_basic();
|
||||
|
||||
display: none;
|
||||
position: absolute;
|
||||
z-index: 99999;
|
||||
@ -44,14 +46,6 @@
|
||||
top: 31px;
|
||||
|
||||
width: 150px;
|
||||
padding: 10px 16px;
|
||||
|
||||
text-align: left;
|
||||
line-height: normal;
|
||||
|
||||
background-color: $white;
|
||||
|
||||
border: 1px $gray solid;
|
||||
|
||||
a {
|
||||
display: flex;
|
||||
@ -66,6 +60,14 @@
|
||||
&:hover{
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
&:first-of-type{
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
&:last-of-type{
|
||||
padding-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
span.hover_export_icon {
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
@mixin hover_basic(){
|
||||
padding: 16px;
|
||||
|
||||
color: $black;
|
||||
font-weight: 400;
|
||||
font-size: 16px;
|
||||
line-height: 20px;
|
||||
text-align: left;
|
||||
|
||||
background: $white;
|
||||
border: 1px solid $dark-gray;
|
||||
box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
|
||||
|
||||
a{
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
ul{
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
list-style-type: none;
|
||||
|
||||
li{
|
||||
margin-bottom: 16px;
|
||||
|
||||
&:last-of-type{
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -17,6 +17,20 @@
|
||||
|
||||
form{
|
||||
display: flex;
|
||||
|
||||
input[type="text"]{
|
||||
box-sizing: border-box;
|
||||
padding: 12px 14px;
|
||||
margin: 0;
|
||||
|
||||
font-size: 16px;
|
||||
|
||||
background: $white;
|
||||
border: 1px solid $dark-gray;
|
||||
border-right: none;
|
||||
border-radius: 2px 0 0 2px;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -32,13 +46,110 @@
|
||||
#sortButton,
|
||||
#folderSwitch{
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
|
||||
height: 40px;
|
||||
width: 102px;
|
||||
|
||||
box-sizing: border-box;
|
||||
margin-left: 16px;
|
||||
padding: 12px 8px;
|
||||
padding: 10px 8px;
|
||||
|
||||
border: 1px $dark-gray solid;
|
||||
border-radius: 2px;
|
||||
|
||||
transition: 0.2s;
|
||||
|
||||
&#folderSwitch{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.switch_folders {
|
||||
position: relative;
|
||||
display: block;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&#filterButton:after,
|
||||
&#sortButton:after{
|
||||
position: absolute;
|
||||
font-family: $fontawesome;
|
||||
content: "\f078";
|
||||
|
||||
right: 8px;
|
||||
top: 13px;
|
||||
|
||||
font-weight: 600;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
&:hover{
|
||||
background-color: $light-gray2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -48,22 +159,19 @@
|
||||
|
||||
#filterSettings,
|
||||
#sortSettings{
|
||||
@include hover_basic();
|
||||
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
|
||||
position: absolute;
|
||||
right: 0;
|
||||
z-index: 9999;
|
||||
|
||||
width: 200px;
|
||||
top: 40px;
|
||||
|
||||
width: 160px;
|
||||
margin-top: 12px;
|
||||
padding: 0 10px;
|
||||
|
||||
text-align: left;
|
||||
font-size: 12px;
|
||||
font-weight: 400;
|
||||
|
||||
background-color: white;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
&:hover{
|
||||
@ -85,17 +193,65 @@
|
||||
}
|
||||
|
||||
// Paginacija
|
||||
.pagination_bottom_holder{
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
||||
margin-top: 32px;
|
||||
}
|
||||
|
||||
.pagination{
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
width: auto;
|
||||
padding: 4px;
|
||||
|
||||
background: $light-gray;
|
||||
border-radius: 2px;
|
||||
|
||||
&.top{
|
||||
width: 33%;
|
||||
max-width: 33%;
|
||||
}
|
||||
|
||||
&.bottom{
|
||||
margin-top: 32px;
|
||||
a{
|
||||
color: $black;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.page_number{
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
||||
margin: 0 4px;
|
||||
|
||||
border-radius: 2px;
|
||||
|
||||
transition: 0.2s;
|
||||
|
||||
&:hover{
|
||||
background-color: $gray;
|
||||
}
|
||||
|
||||
&.currentPage{
|
||||
color: $white;
|
||||
background-color: $blue;
|
||||
}
|
||||
}
|
||||
|
||||
.arrow{
|
||||
margin: 0 4px;
|
||||
|
||||
transition: 0.2s;
|
||||
|
||||
&.disabledPage{
|
||||
color: $very-dark-gray;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user