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

Popravek noge in searcha pri aai instalaciji

Browse Source
This commit is contained in:
pero1203 2021-01-05 10:23:50 +01:00
parent 573c5ce576
commit 7076d54f16
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/survey/SurveyAdmin.php
View File

@ -265,6 +265,7 @@ class SurveyAdmin
global $lang; global $lang;
global $admin_type; global $admin_type;
global $site_domain; global $site_domain;
global $aai_instalacija;
$sql = sisplet_query("SELECT email FROM users WHERE id='$global_user_id'"); $sql = sisplet_query("SELECT email FROM users WHERE id='$global_user_id'");
$row = mysqli_fetch_assoc($sql); $row = mysqli_fetch_assoc($sql);
@ -291,6 +292,8 @@ class SurveyAdmin
echo '<form method="GET" id="1kasf" action="'.$drupal_search_url.'">'; echo '<form method="GET" id="1kasf" action="'.$drupal_search_url.'">';
echo '<input type="hidden" id="drupal_search_url" name="drupal_search_url" value="'.$drupal_search_url.'" />'; echo '<input type="hidden" id="drupal_search_url" name="drupal_search_url" value="'.$drupal_search_url.'" />';
echo '<input type="hidden" id="drupal_search_aai" name="drupal_search_aai" value="'.($aai_instalacija ? '1' : '1').'" />';
echo '<a href="#" onclick="showSearch();"><span class="faicon search pointer"></span></a> '; echo '<a href="#" onclick="showSearch();"><span class="faicon search pointer"></span></a> ';
echo '<input id="searchSurvey" type="text" value="" placeholder="' . $lang['s_search_frontend'] . '" name="search" />'; echo '<input id="searchSurvey" type="text" value="" placeholder="' . $lang['s_search_frontend'] . '" name="search" />';
echo '<input type="button" style="display: none;" value="' . $lang['s_search'] . '" />'; echo '<input type="button" style="display: none;" value="' . $lang['s_search'] . '" />';
@ -569,6 +572,7 @@ class SurveyAdmin
global $lang; global $lang;
global $app_settings; global $app_settings;
global $site_frontend; global $site_frontend;
global $aai_instalacija;
echo '<div id="srv_footer">'; echo '<div id="srv_footer">';
@ -584,12 +588,15 @@ class SurveyAdmin
else{ else{
echo $lang['srv_footer_links']; echo $lang['srv_footer_links'];
if(isset($aai_instalacija) && $aai_instalacija == true){
echo ' | <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-arnes-aai-prijavi-uporabi-orodja-1ka" target="_blank">'.$lang['aa4'].'</a>';
}
echo '<br />'; echo '<br />';
// Verzijo izpišemo samo za admine // Verzijo izpišemo samo za admine
if ($admin_type == 0) { if ($admin_type == 0) {
// Verzija 1ka // Verzija 1ka
$sqlVersion = sisplet_query("SELECT value FROM misc WHERE what='version'", "obj"); $sqlVersion = sisplet_query("SELECT value FROM misc WHERE what='version'", "obj");
if (!empty($sqlVersion)) { if (!empty($sqlVersion)) {
@ -618,6 +625,9 @@ class SurveyAdmin
if (Common::checkModule('gorenje')){ if (Common::checkModule('gorenje')){
echo '<a href="https://helpdesk.gorenje.com/SubmitSR.jsp" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>'; echo '<a href="https://helpdesk.gorenje.com/SubmitSR.jsp" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
} }
elseif(isset($aai_instalacija) && $aai_instalacija == true){
echo '<a href="https://www.1ka.si/help1KA" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
}
else{ else{
// Slovenski jezik // Slovenski jezik
if ($lang['id'] == 1) if ($lang['id'] == 1)

7
admin/survey/script/script.js
View File

@ -3921,10 +3921,17 @@ function executeDrupalSearch() {
//var url = 'https://www.1ka.si/d/sl/search/node/'; //var url = 'https://www.1ka.si/d/sl/search/node/';
var url = $('#drupal_search_url').val(); var url = $('#drupal_search_url').val();
var from_aai = $('#drupal_search_aai').val();
var searchString = $('#searchSurvey').val(); var searchString = $('#searchSurvey').val();
if(from_aai == '1'){
window.open(url + encodeURIComponent(searchString), '_blank');
}
else{
window.location = url + encodeURIComponent(searchString); window.location = url + encodeURIComponent(searchString);
} }
}
function showAdvancedSearch(){ function showAdvancedSearch(){