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

Redesign - popravki mojih anket

Browse Source
This commit is contained in:
pero1203 2022-01-17 16:58:16 +01:00
parent 6cdf10ffd8
commit c4a8e28e33
8 changed files with 384 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -892,7 +892,7 @@ class SurveyList {
// Druga vrstica - filtri in iskanje // Druga vrstica - filtri in iskanje
echo '<div class="second_line">'; echo '<div class="second_line '.($this->isSearch == 1 ? 'advanced_search' : '').'">';
// Nastavitve zgoraj - nekatere niso prikazane pri searchu // Nastavitve zgoraj - nekatere niso prikazane pri searchu
if($this->isSearch != 1){ if($this->isSearch != 1){
@ -907,6 +907,12 @@ class SurveyList {
$this->displayPagiantion(); $this->displayPagiantion();
echo '</div>'; echo '</div>';
} }
else{
// Okno z nastavitvami searcha
echo '<div id="searchSettings">';
$this->displaySearchSettings();
echo '</div>';
}
// Filtri na desni // Filtri na desni
if($this->onlyPhone == false){ if($this->onlyPhone == false){
@ -1158,15 +1164,6 @@ class SurveyList {
$ankete = $this->getSurveysAsListNew($folder); $ankete = $this->getSurveysAsListNew($folder);
// Ce searchamo izrisemo napredne nastavitve za search
if($this->isSearch == 1){
echo '<div id="searchSettings">';
$this->displaySearchSettings();
echo '</div>';
echo '<div class="clr"></div>';
}
echo '<input type="hidden" id="sortby" value="'.(isset($_POST['sortby']) ? $_POST['sortby'] : null).'">'; echo '<input type="hidden" id="sortby" value="'.(isset($_POST['sortby']) ? $_POST['sortby'] : null).'">';
echo '<input type="hidden" id="sorttype" value="'.(isset($_POST['sorttype']) ? $_POST['sorttype'] : null).'">'; echo '<input type="hidden" id="sorttype" value="'.(isset($_POST['sorttype']) ? $_POST['sorttype'] : null).'">';
@ -1210,7 +1207,7 @@ class SurveyList {
// Ustvarjeno // Ustvarjeno
echo '<td class="col3">'; echo '<td class="col3">';
echo $this->createOrderUrlNew(19, $lang['srv_tip']); echo $this->createOrderUrlNew(10, $lang['srv_created']);
echo '</td>'; echo '</td>';
// Zadnji vnos // Zadnji vnos
@ -1224,7 +1221,9 @@ class SurveyList {
echo '</td>'; echo '</td>';
// Ostalo // Ostalo
echo '<td class="col6"></td>'; echo '<td class="col6">';
echo $lang['other'];
echo '</td>';
echo '</tr>'; echo '</tr>';
@ -1254,6 +1253,7 @@ class SurveyList {
// Naslov // Naslov
echo '<td class="col1">'; echo '<td class="col1">';
if(strlen($anketa['naslov']) > 60) if(strlen($anketa['naslov']) > 60)
$text = substr($anketa['naslov'],0,60); $text = substr($anketa['naslov'],0,60);
else else
@ -1274,16 +1274,82 @@ class SurveyList {
} }
} }
echo '<a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a='.A_REDIRECTLINK.'" title="'.$text.'">'; // Zgornja vrstica
echo '<span class="title">'.$text_searched.'</span>'; echo '<div class="top_line">';
echo '</a>'; echo ' <a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a='.A_REDIRECTLINK.'" title="'.$text.'">'.$text_searched.'</a>';
echo '</div>';
// Spodnja vrstica
echo '<div class="bottom_line">';
$i_time = substr($anketa['i_time'], 0, 8);
$i_time = explode('.', $i_time);
echo '<br /><span class="small">';
if($anketa['mobile_created'] == '1') if($anketa['mobile_created'] == '1')
echo '<span class="red spaceRight pointer" title="'.$lang['srv_mobile_survey'].'">M</span>'; echo '<span class="red spaceRight pointer" title="'.$lang['srv_mobile_survey'].'">M</span>';
// Ce gre za search moramo ustrezno pobarvati najden del besede
if($anketa['survey_type'] == 0)
echo $lang['srv_vrsta_survey_type_0'];
elseif($anketa['survey_type'] == 1)
echo $lang['srv_vrsta_survey_type_1'];
elseif(SurveyInfo::checkSurveyModule('hierarhija', $anketa['id']))
echo $lang['srv_vrsta_survey_type_10'];
else
echo $lang['srv_vrsta_survey_type_2'];
echo ', '.$lang['srv_h_sl_stvprasanj'].': '. $anketa['variables'];
echo '</div>';
echo '</td>';
// Trajanje - status
echo '<td class="col2">';
if ($anketa['active'] == 1) {
$now = time();
$do = explode('.', $anketa['trajanjedo']);
$do = strtotime($do[0].'.'.$do[1].'.20'.$do[2]);
$trajanje = $do - $now;
$trajanje = floor($trajanje/60/60/24) + 1;
if($trajanje >= 0){
// Ce je aktivna za vec kot 2000 dni je trajna
if($trajanje > 2000){
$status_text = $lang['srv_trajna_anketa'];
}
else{
$status_text = $lang['more'].' '.$trajanje.' '.$lang['hour_days'];
}
}
else{
$status_text = $lang['srv_trajna_anketa'];
}
$status_color = 'green';
}
else {
$sqlA = sisplet_query("SELECT sid FROM srv_activity WHERE sid='".$anketa['id']."'");
if (mysqli_num_rows($sqlA) > 0) {
# anketa je zaključena
$status_text = $lang['srv_survey_list_closed'];
$status_color = 'blue';
}
else {
# anketa je neaktivna
$status_text = $lang['srv_survey_list_inpreparation'];
$status_color = 'gray';
}
}
echo ' <div class="status_box '.$status_color.'">'.$status_text.'</div>';
echo '</td>';
// Ustvarjeno
echo '<td class="col3">';
// Ce gre za search moramo ustrezno pobarvati najden del besede
$name_searched = $anketa['i_name']; $name_searched = $anketa['i_name'];
$surname_searched = $anketa['i_surname']; $surname_searched = $anketa['i_surname'];
if($this->isSearch == 1 && $this->searchSettings['stype'] == '1'){ if($this->isSearch == 1 && $this->searchSettings['stype'] == '1'){
@ -1306,87 +1372,62 @@ 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>';
$i_time = substr($anketa['i_time'], 0, 8);
$i_time = explode('.', $i_time);
// Trajanje - status echo '<div class="top_line">';
echo '<td class="col2">'; echo $i_time[0].'.'.$i_time[1].'.20'.$i_time[2];
if ($anketa['active'] == 1) { echo '</div>';
$now = time();
$do = explode('.', $anketa['trajanjedo']);
$do = strtotime($do[0].'.'.$do[1].'.20'.$do[2]);
$trajanje = $do - $now;
$trajanje = floor($trajanje/60/60/24) + 1;
if($trajanje >= 0){
// Ce je aktivna za vec kot 2000 dni je trajna
if($trajanje > 2000)
echo $lang['srv_trajna_anketa'];
else
echo $lang['more'].' '.$trajanje.' '.$lang['hour_days'];
}
else{
echo $lang['srv_trajna_anketa'];
}
}
else {
$sqlA = sisplet_query("SELECT sid FROM srv_activity WHERE sid='".$anketa['id']."'");
if (mysqli_num_rows($sqlA) > 0) {
# anketa je zaključena
echo $lang['srv_survey_list_closed'];
} else {
# anketa je neaktivna
echo $lang['srv_survey_list_inpreparation'];
}
}
echo '</td>';
echo '<div class="bottom_line">';
echo $name_searched.' '.$surname_searched;
echo '</div>';
// Ustvarjeno
echo '<td class="col3">';
if($anketa['survey_type'] == 0)
echo $lang['srv_vrsta_survey_type_0'];
elseif($anketa['survey_type'] == 1)
echo $lang['srv_vrsta_survey_type_1'];
elseif(SurveyInfo::checkSurveyModule('hierarhija', $anketa['id']))
echo $lang['srv_vrsta_survey_type_10'];
else
echo $lang['srv_vrsta_survey_type_2'];
echo '<br /><span class="small">'.$lang['srv_h_sl_stvprasanj'].': '. $anketa['variables'].'</span>';
echo '</td>'; echo '</td>';
// Zadnji vnos // Zadnji vnos
echo '<td class="col4">'; echo '<td class="col4">';
echo '<div class="top_line">';
if($anketa['answers'] > 0){ if($anketa['answers'] > 0){
$v_time = substr($anketa['v_time_last'], 0, 8); $v_time = substr($anketa['v_time_last'], 0, 8);
$v_time = explode('.', $v_time); $v_time = explode('.', $v_time);
echo $v_time[0].'.'.$v_time[1].'.20'.$v_time[2].'<br />'; echo $v_time[0].'.'.$v_time[1].'.20'.$v_time[2];
} }
else{ else{
echo '/<br />'; echo '/';
} }
echo '<span class="small">'.$lang['srv_info_answers'].': '.$anketa['answers'].'</span>'; echo '</div>';
echo '<div class="bottom_line">';
echo $lang['srv_info_answers_no'].': '.$anketa['answers'];
echo '</div>';
echo '</td>'; echo '</td>';
// Sprememba // Sprememba
echo '<td class="col5">'; echo '<td class="col5">';
echo '<div class="top_line">';
$e_time = substr($anketa['e_time'], 0, 8); $e_time = substr($anketa['e_time'], 0, 8);
$e_time = explode('.', $e_time); $e_time = explode('.', $e_time);
echo $e_time[0].'.'.$e_time[1].'.20'.$e_time[2].'<br />'; echo $e_time[0].'.'.$e_time[1].'.20'.$e_time[2].'<br />';
echo '</div>';
echo '<div class="bottom_line">';
echo ' <span id="edit_user_'.$anketa['id'].'" euid="'.$anketa['edit_uid'].'" onclick="surveyList_user(\'e\',\'#edit_user_'.$anketa['id'].'\');">'.$anketa['e_email'].'</span>';
echo '</div>';
echo '<a href="#" onclick="surveyList_user(\'e\',\'#edit_user_'.$anketa['id'].'\');">';
echo '<span id="edit_user_'.$anketa['id'].'" euid="'.$anketa['edit_uid'].'" class="email">'.$anketa['e_email'].'</span>';
echo '</a>';
echo '</td>'; echo '</td>';
// Ostalo // Ostalo
echo '<td class="col6">'; echo '<td class="col6">';
echo ' <a>'; echo ' <a>';
echo ' <span class="faicon">...</span>'; echo ' <span class="faicon dots"></span>';
echo ' </a>'; echo ' </a>';
echo '</td>'; echo '</td>';
@ -1686,17 +1727,17 @@ class SurveyList {
echo '<form method="GET" id="1kasf2" action="'.$site_url.'admin/survey/index.php">'; echo '<form method="GET" id="1kasf2" action="'.$site_url.'admin/survey/index.php">';
// Iskano geslo // Iskano geslo
echo '<p>'; echo '<div>';
echo ' <span class="bold">'.$lang['s_search2'].':</span> <input type="text" name="search" id="searchMySurveyText" value="'.htmlentities($this->searchString).'" placeholder="' . $lang['s_search'] . '" />'; echo ' <span class="bold">'.$lang['s_search2'].':</span> <input type="text" name="search" id="searchMySurveyText" value="'.htmlentities($this->searchString).'" placeholder="' . $lang['s_search'] . '" />';
echo '</p>'; echo '</div>';
// Iskanje po naslovu ali avtorju ali besedilu // Iskanje po naslovu ali avtorju ali besedilu
echo '<p>'; echo '<div>';
echo ' <span>'.$lang['s_thru'].': </span>'; echo ' <span>'.$lang['s_thru'].': </span>';
echo ' <label for="stype_0"><input type="radio" name="stype" id="stype_0" value="0" '.($this->searchSettings['stype'] == '0' ? ' checked="checked"' : '').' />'.$lang['s_title'].'</label>'; echo ' <input type="radio" name="stype" id="stype_0" value="0" '.($this->searchSettings['stype'] == '0' ? ' checked="checked"' : '').' /><label for="stype_0">'.$lang['s_title'].'</label>';
echo ' <label for="stype_1"><input type="radio" name="stype" id="stype_1" value="1" '.($this->searchSettings['stype'] == '1' ? ' checked="checked"' : '').' />'.$lang['s_author'].'</label>'; echo ' <input type="radio" name="stype" id="stype_1" value="1" '.($this->searchSettings['stype'] == '1' ? ' checked="checked"' : '').' /><label for="stype_1">'.$lang['s_author'].'</label>';
echo ' <label for="stype_2"><input type="radio" name="stype" id="stype_2" value="2" '.($this->searchSettings['stype'] == '2' ? ' checked="checked"' : '').' />'.$lang['s_text'].'</label>'; echo ' <input type="radio" name="stype" id="stype_2" value="2" '.($this->searchSettings['stype'] == '2' ? ' checked="checked"' : '').' /><label for="stype_2">'.$lang['s_text'].'</label>';
echo '</p>'; echo '</div>';
// NAPREDNE NASTAVITVE ISKANJA // NAPREDNE NASTAVITVE ISKANJA
@ -1720,53 +1761,44 @@ class SurveyList {
// Metaadmin lahko dodatno omeji search po avtorju // Metaadmin lahko dodatno omeji search po avtorju
if(Dostop::isMetaAdmin()){ if(Dostop::isMetaAdmin()){
echo '<p>'; echo '<div>';
echo ' <span class="bold">'.$lang['s_search_metaadmin'].':</span> <input type="text" name="onlyAuthor" id="onlyAuthor" value="'.htmlentities($this->searchSettings['onlyAuthor']).'" placeholder="' . $lang['s_search'] . '" />'; echo ' <span class="bold">'.$lang['s_search_metaadmin'].':</span> <input type="text" name="onlyAuthor" id="onlyAuthor" value="'.htmlentities($this->searchSettings['onlyAuthor']).'" placeholder="' . $lang['s_search'] . '" />';
echo '</p>'; echo '</div>';
} }
// Status ankete (aktivna, neaktivna, zakljucena) // Status ankete (aktivna, neaktivna, zakljucena)
echo '<p>'; echo '<div>';
echo ' <span>'.$lang['s_activity'].': </span>'; echo ' <span>'.$lang['s_activity'].': </span>';
echo ' <label for="sstatus_0"><input type="radio" name="sstatus" id="sstatus_0" value="0" '.($this->searchSettings['sstatus'] == '0' ? ' checked="checked"' : '').' />'.$lang['s_all_surveys'].'</label>'; echo ' <label for="sstatus_0"><input type="radio" name="sstatus" id="sstatus_0" value="0" '.($this->searchSettings['sstatus'] == '0' ? ' checked="checked"' : '').' />'.$lang['s_all_surveys'].'</label>';
echo ' <label for="sstatus_1"><input type="radio" name="sstatus" id="sstatus_1" value="1" '.($this->searchSettings['sstatus'] == '1' ? ' checked="checked"' : '').' />'.$lang['s_active_surveys'].'</label>'; echo ' <label for="sstatus_1"><input type="radio" name="sstatus" id="sstatus_1" value="1" '.($this->searchSettings['sstatus'] == '1' ? ' checked="checked"' : '').' />'.$lang['s_active_surveys'].'</label>';
echo ' <label for="sstatus_2"><input type="radio" name="sstatus" id="sstatus_2" value="2" '.($this->searchSettings['sstatus'] == '2' ? ' checked="checked"' : '').' />'.$lang['s_nonactive_surveys'].'</label>'; echo ' <label for="sstatus_2"><input type="radio" name="sstatus" id="sstatus_2" value="2" '.($this->searchSettings['sstatus'] == '2' ? ' checked="checked"' : '').' />'.$lang['s_nonactive_surveys'].'</label>';
echo '</p>'; echo '</div>';
// Datum ustvarjanja ankete // Datum ustvarjanja ankete
echo '<p>'; echo '<div>';
echo ' <span class="spaceRight">'.$lang['s_itime'].': </span>'; echo ' <span class="spaceRight">'.$lang['s_itime'].': </span>';
echo ' <span class="spaceRight">'.$lang['s_from2'].' <input type="text" id="sidatefrom" name="sidatefrom" value="'.$this->searchSettings['sidatefrom'].'" autocomplete="off" size="12" /></span>'; echo ' <span class="spaceRight">'.$lang['s_from2'].' <input type="text" id="sidatefrom" name="sidatefrom" value="'.$this->searchSettings['sidatefrom'].'" autocomplete="off" size="12" /></span>';
echo ' <span>'.$lang['s_to'].' <input type="text" id="sidateto" name="sidateto" value="'.$this->searchSettings['sidateto'].'" autocomplete="off" size="12" /></span>'; echo ' <span>'.$lang['s_to'].' <input type="text" id="sidateto" name="sidateto" value="'.$this->searchSettings['sidateto'].'" autocomplete="off" size="12" /></span>';
echo '</p>'; echo '</div>';
// Datum zadnjega urejanja ankete // Datum zadnjega urejanja ankete
echo '<p>'; echo '<div>';
echo ' <span class="spaceRight">'.$lang['s_etime'].': </span>'; echo ' <span class="spaceRight">'.$lang['s_etime'].': </span>';
echo ' <span class="spaceRight">'.$lang['s_from2'].' <input type="text" id="sedatefrom" name="sedatefrom" value="'.$this->searchSettings['sedatefrom'].'" autocomplete="off" size="12" /></span>'; echo ' <span class="spaceRight">'.$lang['s_from2'].' <input type="text" id="sedatefrom" name="sedatefrom" value="'.$this->searchSettings['sedatefrom'].'" autocomplete="off" size="12" /></span>';
echo ' <span>'.$lang['s_to'].' <input type="text" id="sedateto" name="sedateto" value="'.$this->searchSettings['sedateto'].'" autocomplete="off" size="12" /></span>'; echo ' <span>'.$lang['s_to'].' <input type="text" id="sedateto" name="sedateto" value="'.$this->searchSettings['sedateto'].'" autocomplete="off" size="12" /></span>';
echo '</p>'; echo '</div>';
echo '</div>'; echo '</div>';
// Gumba isci in zapri // Gumba isci in zapri
echo '<span style="margin-top: 10px;" class="floatRight spaceRight">'; echo '<div class="button_holder">';
echo ' <div class="buttonwrapper floatLeft spaceRight">'; echo ' <a href="'.$site_url.'admin/survey/index.php"><button class="medium white-black">'.$lang['s_search_mySurvey_back'].'</button></a>';
echo ' <a class="ovalbutton ovalbutton_gray" href="'.$site_url.'admin/survey/index.php"><span>'.$lang['s_search_mySurvey_back'].'</span></a>'; echo ' <a href="#" onclick="$(\'#1kasf2\').submit(); return false;"><button class="medium white-black">'.$lang['s_search'].'</button></a>';
echo ' </div>'; echo '</div>';
echo ' <div class="buttonwrapper floatRight">';
echo ' <a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#1kasf2\').submit(); return false;"><span>'.$lang['s_search'].'</span></a>';
echo ' </div>';
echo '</span>';
// Gumb nazaj na moje ankete
/*echo '<span style="margin:5px 20px 0 5px;" class="floatRight bold">';
echo ' <a href="'.$site_url.'admin/survey/index.php"><span>'.$lang['s_search_mySurvey_back'].'</span></a>';
echo '</span>';*/
// Link na isci po knjiznici // Link na isci po knjiznici
echo '<span class="link"><a href="'.$site_url.'admin/survey/index.php?a=knjiznica&search='.$this->searchString.'">'.$lang['s_search_Library'].'</a></span>'; echo '<div class="link"><a href="'.$site_url.'admin/survey/index.php?a=knjiznica&search='.$this->searchString.'">'.$lang['s_search_Library'].'</a></div>';
echo '<input style="display: none;" value="Išči" type="submit">'; echo '<input style="display: none;" value="Išči" type="submit">';
@ -2140,11 +2172,13 @@ class SurveyList {
if ($this->sortby != $id ) { if ($this->sortby != $id ) {
$result='<div onClick="surveyList_goTo(\''.$id.'\',\'1\')">'.$txt.'</div>'; $result='<div onClick="surveyList_goTo(\''.$id.'\',\'1\')">'.$txt.'</div>';
} else { }
else {
if ($this->sorttype == 2) { if ($this->sorttype == 2) {
$result='<div class="active" onClick="surveyList_goTo(\''.$id.'\',\'1\')">'.$txt.'<span class="active faicon after sort_up_arrow icon-orange"/></div>'; $result='<div class="active" onClick="surveyList_goTo(\''.$id.'\',\'1\')">'.$txt.'<span class="active faicon after sort_up_arrow icon-orange"/></div>';
} else { }
else {
$result='<div class="active" onClick="surveyList_goTo(\''.$id.'\',\'2\')">'.$txt.'<span class="active faicon after sort_down_arrow icon-orange"/></div>'; $result='<div class="active" onClick="surveyList_goTo(\''.$id.'\',\'2\')">'.$txt.'<span class="active faicon after sort_down_arrow icon-orange"/></div>';
} }
} }

11
lang/1.php
View File

@ -415,7 +415,7 @@ $lang = array (
"lurker" => "Lurker", "lurker" => "Lurker",
"referer" => "Referer", "referer" => "Referer",
"javascript" => "Javascript", "javascript" => "Javascript",
"change" => "Sprememba", "change" => "Zadnja sprememba",
"track1" => "Brisanje povezave", "track1" => "Brisanje povezave",
"track2" => "Kreiranje povezave", "track2" => "Kreiranje povezave",
"track3" => "Dodajanje povezave v kategorije novic", "track3" => "Dodajanje povezave v kategorije novic",
@ -2419,8 +2419,9 @@ $lang = array (
"srv_cookie_continue_alert" => "Če želite izpolniti anketo, se morate strinjati z uporabo piškotka.", "srv_cookie_continue_alert" => "Če želite izpolniti anketo, se morate strinjati z uporabo piškotka.",
"srv_block_ip" => "Blokiraj ponovni IP naslov", "srv_block_ip" => "Blokiraj ponovni IP naslov",
"srv_block_ip_warning" => "Pozor! Vklop oziroma omejevanje IP naslova ima lahko negativne posledice. <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/uporaba-ip-naslovov-piskotkov-za-nadzor-nad-podvojenimi-vnosi?&from1ka=1\" target=\"_blank\">Več >></a>", "srv_block_ip_warning" => "Pozor! Vklop oziroma omejevanje IP naslova ima lahko negativne posledice. <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/uporaba-ip-naslovov-piskotkov-za-nadzor-nad-podvojenimi-vnosi?&from1ka=1\" target=\"_blank\">Več >></a>",
"srv_from_library" => "predloga", "srv_from_library" => "predloga",
"srv_last_insrt" => "Zadnji vnos", "srv_last_insrt" => "Zadnji vnos",
"srv_created" => "Ustvarjeno",
"srv_anketarestore" => "Aktiviraj arhivsko verzijo vprašalnika", "srv_anketarestore" => "Aktiviraj arhivsko verzijo vprašalnika",
"srv_anketarestoredata" => "Aktiviraj arhiv podatkov", "srv_anketarestoredata" => "Aktiviraj arhiv podatkov",
"srv_show_inserts" => "Enote", "srv_show_inserts" => "Enote",
@ -2694,6 +2695,7 @@ $lang = array (
"show_menu_forum" => "Prika&#382;i menu v forumu", "show_menu_forum" => "Prika&#382;i menu v forumu",
"using_mail_template" => "Pri obve&#154;&#269;anju se uporablja predloga ki je definirana v skinu", "using_mail_template" => "Pri obve&#154;&#269;anju se uporablja predloga ki je definirana v skinu",
"SurveyMetaOnly" => "Prika&#382;i survey samo meta adminom", "SurveyMetaOnly" => "Prika&#382;i survey samo meta adminom",
"other" => "Ostalo",
"srv_analiza_info" => "Podatki", "srv_analiza_info" => "Podatki",
"srv_analiza_stVprasanj" => "Vpra&#353;anj", "srv_analiza_stVprasanj" => "Vpra&#353;anj",
"srv_analiza_stVariable" => "Spremenljivk", "srv_analiza_stVariable" => "Spremenljivk",
@ -3045,7 +3047,7 @@ $lang = array (
"srv_h_sl_spreminjal" => "Spremenil", "srv_h_sl_spreminjal" => "Spremenil",
"srv_h_sl_trajanjeod" => "Od", "srv_h_sl_trajanjeod" => "Od",
"srv_h_sl_trajanjedo" => "Do", "srv_h_sl_trajanjedo" => "Do",
"srv_h_sl_stvprasanj" => "Št. vprašanj", "srv_h_sl_stvprasanj" => "št. vprašanj",
"srv_h_sl_phone" => "Telefonska anketa", "srv_h_sl_phone" => "Telefonska anketa",
"srv_sl_error_msg" => "Vidnost posameznih stolpcev lahko vklju&#269;ite s pomo&#269;jo potrditvenih polj.<br>Vrstni red pa nastavite s preme&#353;&#269;anjem posameznih elementov.", "srv_sl_error_msg" => "Vidnost posameznih stolpcev lahko vklju&#269;ite s pomo&#269;jo potrditvenih polj.<br>Vrstni red pa nastavite s preme&#353;&#269;anjem posameznih elementov.",
"srv_sl_setting_show" => "Prikaži ", "srv_sl_setting_show" => "Prikaži ",
@ -3458,6 +3460,7 @@ $lang = array (
"srv_info_variables" => "Spremenljivk", "srv_info_variables" => "Spremenljivk",
"srv_info_pages" => "Strani", "srv_info_pages" => "Strani",
"srv_info_answers" => "Odgovorov", "srv_info_answers" => "Odgovorov",
"srv_info_answers_no" => "Št. odgovorov",
"srv_info_answers_valid" => "Ustreznih", "srv_info_answers_valid" => "Ustreznih",
"srv_info_type" => "Tip ankete", "srv_info_type" => "Tip ankete",
"srv_info_author" => "Avtor", "srv_info_author" => "Avtor",

7
lang/2.php
View File

@ -403,7 +403,7 @@ $lang = array (
"lurker" => "Lurker", "lurker" => "Lurker",
"referer" => "Referrer", "referer" => "Referrer",
"javascript" => "Javascript", "javascript" => "Javascript",
"change" => "Change", "change" => "Last change",
"track1" => "Link delete", "track1" => "Link delete",
"track2" => "Link add", "track2" => "Link add",
"track3" => "Add link in news category", "track3" => "Add link in news category",
@ -2402,6 +2402,7 @@ $lang = array (
"srv_block_ip_warning" => "Warning! Blocking IP adresses can have negative consequences. <a href=\"https://www.1ka.si/d/en/help/manuals/using-the-ip-address-and-cookies-to-control-duplicate-entries?from1ka=1\" target=\"_blank\">More >></a>", "srv_block_ip_warning" => "Warning! Blocking IP adresses can have negative consequences. <a href=\"https://www.1ka.si/d/en/help/manuals/using-the-ip-address-and-cookies-to-control-duplicate-entries?from1ka=1\" target=\"_blank\">More >></a>",
"srv_from_library" => "from library", "srv_from_library" => "from library",
"srv_last_insrt" => "Last insert", "srv_last_insrt" => "Last insert",
"srv_created" => "Created",
"srv_anketarestore" => "Activate survey", "srv_anketarestore" => "Activate survey",
"srv_anketarestoredata" => "Activate data archive", "srv_anketarestoredata" => "Activate data archive",
"srv_show_inserts" => "Units", "srv_show_inserts" => "Units",
@ -2671,6 +2672,7 @@ $lang = array (
"show_menu_forum" => "Show menu in forum", "show_menu_forum" => "Show menu in forum",
"using_mail_template" => "Skin tem plate is used for mail alert", "using_mail_template" => "Skin tem plate is used for mail alert",
"SurveyMetaOnly" => "Show survey to meta admins only", "SurveyMetaOnly" => "Show survey to meta admins only",
"other" => "Other",
"srv_analiza_info" => "Data", "srv_analiza_info" => "Data",
"srv_analiza_stVprasanj" => "Questions", "srv_analiza_stVprasanj" => "Questions",
"srv_analiza_stVariable" => "Variables", "srv_analiza_stVariable" => "Variables",
@ -3021,7 +3023,7 @@ $lang = array (
"srv_h_sl_spreminjal" => "Modified", "srv_h_sl_spreminjal" => "Modified",
"srv_h_sl_trajanjeod" => "From", "srv_h_sl_trajanjeod" => "From",
"srv_h_sl_trajanjedo" => "To", "srv_h_sl_trajanjedo" => "To",
"srv_h_sl_stvprasanj" => "Variables", "srv_h_sl_stvprasanj" => "variables",
"srv_h_sl_phone" => "Telephone survey", "srv_h_sl_phone" => "Telephone survey",
"srv_sl_error_msg" => "Visibility of individual columns can be activated with checkbox. <br/>Order is set by moving individual elements.", "srv_sl_error_msg" => "Visibility of individual columns can be activated with checkbox. <br/>Order is set by moving individual elements.",
"srv_sl_setting_show" => "Show ", "srv_sl_setting_show" => "Show ",
@ -3429,6 +3431,7 @@ $lang = array (
"srv_info_variables" => "Variables", "srv_info_variables" => "Variables",
"srv_info_pages" => "Pages", "srv_info_pages" => "Pages",
"srv_info_answers" => "Answers", "srv_info_answers" => "Answers",
"srv_info_answers_no" => "Answers",
"srv_info_answers_valid" => "Valid", "srv_info_answers_valid" => "Valid",
"srv_info_type" => "Survey type", "srv_info_type" => "Survey type",
"srv_info_author" => "Author", "srv_info_author" => "Author",

108
public/css/admin_new.css
View File

@ -5946,6 +5946,12 @@ span.faicon.file-preview::before {
content: ""; content: "";
} }
span.faicon.dots::before {
content: "";
font-size: 16px;
font-weight: 600;
}
/* /*
To change this license header, choose License Headers in Project Properties. To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates To change this template file, choose Tools | Templates
@ -10905,6 +10911,46 @@ div#gdrp_requests_unresolved {
border-right: none; border-right: none;
border-radius: 2px 0 0 2px; border-radius: 2px 0 0 2px;
} }
#survey_list .second_line #searchSettings,
#survey_list .second_line #searchLibrarySettings {
width: 500px;
padding: 16px;
font-size: 16px;
background: #FFFFFF;
border: 1px solid #C4C4C4;
border-radius: 2px;
}
#survey_list .second_line #searchSettings span.title,
#survey_list .second_line #searchLibrarySettings span.title {
color: #1E88E5;
font-weight: 600;
font-size: 13px;
}
#survey_list .second_line #searchSettings p,
#survey_list .second_line #searchLibrarySettings p {
margin: 10px 0 12px 10px !important;
padding: 0 !important;
}
#survey_list .second_line #searchSettings input[type=text],
#survey_list .second_line #searchLibrarySettings input[type=text] {
padding: 2px 4px;
}
#survey_list .second_line #searchSettings input[type=submit],
#survey_list .second_line #searchLibrarySettings input[type=submit] {
padding: 2px 4px;
}
#survey_list .second_line #searchSettings input[type=text]#searchMySurveyText,
#survey_list .second_line #searchLibrarySettings input[type=text]#searchMySurveyText {
width: 200px;
font-size: 12px;
padding: 2px 5px;
}
#survey_list .second_line #searchSettings span.link,
#survey_list .second_line #searchLibrarySettings span.link {
float: left;
margin-top: 20px;
font-weight: 500;
}
#survey_list .second_line .filters { #survey_list .second_line .filters {
display: flex; display: flex;
justify-content: end; justify-content: end;
@ -11073,6 +11119,9 @@ div#gdrp_requests_unresolved {
visibility: visible; visibility: visible;
opacity: 1; opacity: 1;
} }
#survey_list .second_line.advanced_search .filters {
align-self: baseline;
}
#survey_list .pagination_bottom_holder { #survey_list .pagination_bottom_holder {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -11124,17 +11173,66 @@ div#gdrp_requests_unresolved {
*/ */
#survey_list .div_sl_new table#surveyList_new { #survey_list .div_sl_new table#surveyList_new {
width: 100%; width: 100%;
margin-top: 16px;
} }
#survey_list .div_sl_new table#surveyList_new tr td { #survey_list .div_sl_new table#surveyList_new tr td {
padding-left: 16px; padding: 12px 16px;
padding-right: 16px;
vertical-align: middle; vertical-align: middle;
text-align: left;
border-bottom: 1px #D3D3D3 solid; border-bottom: 1px #D3D3D3 solid;
} }
#survey_list .div_sl_new table#surveyList_new tr td.col2, #survey_list .div_sl_new table#surveyList_new tr td.col6 {
text-align: center;
}
#survey_list .div_sl_new table#surveyList_new tr td .top_line {
font-size: 14px;
line-height: 18px;
color: #333333;
}
#survey_list .div_sl_new table#surveyList_new tr td .top_line a {
font-weight: bold;
font-size: 16px;
line-height: 20px;
text-decoration: none;
}
#survey_list .div_sl_new table#surveyList_new tr td .bottom_line {
font-size: 12px;
line-height: 15px;
color: #777777;
}
#survey_list .div_sl_new table#surveyList_new tr td .bottom_line span {
cursor: pointer;
font-size: 12px;
line-height: 15px;
color: #777777;
}
#survey_list .div_sl_new table#surveyList_new tr td .status_box {
box-sizing: border-box;
width: 88px;
height: 24px;
margin: 0 auto;
text-align: center;
font-size: 14px;
line-height: 24px;
color: #333333;
border-radius: 2px;
}
#survey_list .div_sl_new table#surveyList_new tr td .status_box.green {
background-color: #E3F6DE;
}
#survey_list .div_sl_new table#surveyList_new tr td .status_box.gray {
background-color: #E5E5E5;
}
#survey_list .div_sl_new table#surveyList_new tr td .status_box.blue {
background-color: #EAF9FE;
}
#survey_list .div_sl_new table#surveyList_new tr td .dots {
color: #333333;
}
#survey_list .div_sl_new table#surveyList_new tr.sl_header_new td { #survey_list .div_sl_new table#surveyList_new tr.sl_header_new td {
cursor: pointer; cursor: pointer;
height: 62px; height: 62px;
padding: 0 8px; padding: 0 16px;
vertical-align: middle; vertical-align: middle;
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
@ -11142,6 +11240,10 @@ div#gdrp_requests_unresolved {
border-top: 1px #D3D3D3 solid; border-top: 1px #D3D3D3 solid;
border-bottom: 1px #D3D3D3 solid; border-bottom: 1px #D3D3D3 solid;
} }
#survey_list .div_sl_new .search_title {
font-size: 16px;
font-weight: 600;
}
div.izvoz_nad_tabelo { div.izvoz_nad_tabelo {
display: flex; display: flex;

2
resources/sass/admin_new/basic/colors.scss
View File

@ -6,6 +6,7 @@
$blue: #1E88E5; $blue: #1E88E5;
$dark-blue: #0059ab; $dark-blue: #0059ab;
$light-blue: #EAF9FE;
$black: #333333; $black: #333333;
$white: #FFFFFF; $white: #FFFFFF;
@ -24,4 +25,5 @@ $red: #FF0000;
$light-red: #FFEFEF; $light-red: #FFEFEF;
$green: #00C437; $green: #00C437;
$light-green: #a8eea8; $light-green: #a8eea8;
$light-green2: #E3F6DE;

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

@ -611,3 +611,11 @@ span.faicon.vote-yes::before{
span.faicon.file-preview::before{ span.faicon.file-preview::before{
content: "\f865"; content: "\f865";
} }
// 3 pikice
span.faicon.dots::before{
content: "\f141";
font-size: 16px;
font-weight: 600;
}

75
resources/sass/admin_new/pages/my_surveys/survey_list.scss
View File

@ -6,23 +6,86 @@
table#surveyList_new{ table#surveyList_new{
width: 100%; width: 100%;
margin-top: 16px;
tr{ tr{
td{ td{
padding-left: 16px; padding: 12px 16px;
padding-right: 16px;
vertical-align: middle; vertical-align: middle;
text-align: left;
border-bottom: 1px $dark-gray2 solid; border-bottom: 1px $dark-gray2 solid;
&.col2,
&.col6{
text-align: center;
}
.top_line{
font-size: 14px;
line-height: 18px;
color: $black;
a{
font-weight: bold;
font-size: 16px;
line-height: 20px;
text-decoration: none;
}
}
.bottom_line{
font-size: 12px;
line-height: 15px;
color: $very-dark-gray;
span{
cursor: pointer;
font-size: 12px;
line-height: 15px;
color: $very-dark-gray;
}
}
.status_box{
box-sizing: border-box;
width: 88px;
height: 24px;
margin: 0 auto;
text-align: center;
font-size: 14px;
line-height: 24px;
color: $black;
border-radius: 2px;
&.green{
background-color: $light-green2;
}
&.gray{
background-color: $gray;
}
&.blue{
background-color: $light-blue;
}
}
.dots{
color: $black;
}
} }
&.sl_header_new td{ &.sl_header_new td{
cursor: pointer; cursor: pointer;
height: 62px; height: 62px;
padding: 0 8px; padding: 0 16px;
vertical-align: middle; vertical-align: middle;
@ -36,4 +99,10 @@
} }
} }
} }
// Search text (st. zadetkov)
.search_title{
font-size: 16px;
font-weight: 600;
}
} }

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

@ -34,6 +34,46 @@
} }
} }
// Search settings box
#searchSettings,
#searchLibrarySettings {
width: 500px;
padding: 16px;
font-size: 16px;
background: $white;
border: 1px solid $dark-gray;
border-radius: 2px;
span.title {
color: $blue;
font-weight: 600;
font-size: 13px;
}
p {
margin: 10px 0 12px 10px !important;
padding: 0 !important;
}
input[type="text"] {
padding: 2px 4px;
}
input[type="submit"] {
padding: 2px 4px;
}
input[type="text"]#searchMySurveyText {
width: 200px;
font-size: 12px;
padding: 2px 5px;
}
span.link{
float: left;
margin-top: 20px;
font-weight: 500;
}
}
// Filtri // Filtri
.filters{ .filters{
display: flex; display: flex;
@ -190,6 +230,9 @@
} }
} }
&.advanced_search .filters{
align-self: baseline;
}
} }
// Paginacija // Paginacija