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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
Nejc Kovač 2022-06-17 14:37:53 +02:00
commit d834358b64
9 changed files with 203 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
admin/survey/SurveyAdminSettings.php
View File

@ -2717,34 +2717,55 @@ class SurveyAdminSettings {
echo '<p class="bottom16">'.$lang['srv_publication_survey_links_note'].'</p>'; echo '<p class="bottom16">'.$lang['srv_publication_survey_links_note'].'</p>';
//Lep URL - dodajanje
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
$userAccess = UserAccess::getInstance($global_user_id);
if(!$userAccess->checkUserAccess($what='nice_url')){
echo '<div class="button_holder">'; echo '<div class="button_holder">';
echo ' <div class="copy_survey_url_holder">';
echo ' <div class="input_box">'; echo ' <div class="input_box">';
echo ' <span class="faicon link-chain link-right blue"></span><span class="italic"></span>'; echo ' <span class="faicon link-chain link-right blue"></span><span class="italic"></span>';
echo ' <input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'" readonly/>'; echo ' <input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'" readonly/>';
echo ' </div>'; echo ' </div>';
echo ' <button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>'; echo ' <button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
echo ' </div>';
//Lep URL - dodajanje
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
$userAccess = UserAccess::getInstance($global_user_id);
if(!$userAccess->checkUserAccess($what='nice_url')){
echo ' <button type="button" class="medium yellow">'.$lang['srv_nice_url_add'].'</button>'; echo ' <button type="button" class="medium yellow">'.$lang['srv_nice_url_add'].'</button>';
echo '</div>'; // div.button_holder
echo '</div>';
} }
else{ else{
echo '<div class="button_holder">';
echo ' <div class="copy_survey_url_holder">';
echo ' <div class="input_box">';
echo ' <span class="faicon link-chain link-right blue"></span><span class="italic"></span>';
echo ' <input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'" readonly/>';
echo ' </div>';
echo ' <button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
echo ' </div>';
// Gumb za dodajanje lepega linka // Gumb za dodajanje lepega linka
echo ' <button id="nice_url_button" type="button" class="medium white-black" onclick="toggleNiceURL(\'show\');">'.$lang['srv_nice_url_add'].'</button>'; echo ' <button id="nice_url_button" type="button" class="medium white-black" onclick="toggleNiceURL(\'show\');">'.$lang['srv_nice_url_add'].'</button>';
echo ' <div id="nice_url_holder" class="displayNone">'; echo ' <div id="nice_url_holder" class="displayNone">';
echo ' <div class="url">';
echo $site_url; echo $site_url;
echo ' <input type="text" class="text large" name="nice_url" id="nice_url" value=""/>'; echo ' <input type="text" class="text large" name="nice_url" id="nice_url" value=""/>';
echo ' </div>';
echo ' <div class="buttons">';
echo ' <button type="button" class="medium blue" onclick="$.redirect(\'ajax.php?a=nice_url\', {anketa: '.$this->anketa.', nice_url: $(\'#nice_url\').val()}); return false;">'.$lang['add'].'</button>'; echo ' <button type="button" class="medium blue" onclick="$.redirect(\'ajax.php?a=nice_url\', {anketa: '.$this->anketa.', nice_url: $(\'#nice_url\').val()}); return false;">'.$lang['add'].'</button>';
echo ' <button type="button" class="medium white-blue" onclick="toggleNiceURL(\'hide\')">'.$lang['edit1338'].'</button>'; echo ' <button type="button" class="medium white-blue" onclick="toggleNiceURL(\'hide\')">'.$lang['edit1338'].'</button>';
echo ' </div>';
echo ' </div>'; echo ' </div>';
echo '</div>'; // div.button_holder echo '</div>';
if (isset($_GET['error'])) { if (isset($_GET['error'])) {

5
admin/survey/classes/class.SurveyStatistic.php
View File

@ -898,10 +898,11 @@ class SurveyStatistic {
function DisplayTopFilters(){ function DisplayTopFilters(){
global $lang; global $lang;
if($this->emailInvitation == 1 || $this->emailInvitation == 2){
echo '<div id="dashboardEmailInvitationFilter" class="filter_setting">'; echo '<div id="dashboardEmailInvitationFilter" class="filter_setting">';
echo $this->emailInvitationFilter($this->emailInvitation); $this->emailInvitationFilter($this->emailInvitation);
echo '</div>'; echo '</div>';
}
# če imamo vabila - filter za emaile # če imamo vabila - filter za emaile
$row = SurveyInfo::getSurveyRow(); $row = SurveyInfo::getSurveyRow();

10
admin/survey/classes/class.Vprasanje.php
View File

@ -4934,11 +4934,13 @@ class Vprasanje {
$otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1); $otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1);
if(mysqli_num_rows($sql) > 0){ //ce je prisotna moznost Drugo, // ce je prisotna moznost Drugo,
echo '<fieldset id = fieldset'.$row['id'].'><legend>'.$lang['srv_other_size'].'</legend>'; //pokazi fieldset if(mysqli_num_rows($sql) > 0){
echo '<fieldset id="fieldset'.$row['id'].'"><legend>'.$lang['srv_other_size'].'</legend>';
} }
else{ //drugace // drugace je to skrito
echo '<fieldset id = fieldset'.$row['id'].' hidden><legend>'.$lang['srv_other_size'].'</legend>'; //skrij fieldset else{
echo '<fieldset id="fieldset'.$row['id'].'" style="display:none;"><legend>'.$lang['srv_other_size'].'</legend>';
} }

105
public/css/admin_new.css
View File

@ -24391,32 +24391,50 @@ div#vabila div.button_holder {
align-items: center; align-items: center;
margin-bottom: 16px; margin-bottom: 16px;
} }
div#vabila div.button_holder button { div#vabila div.button_holder .copy_survey_url_holder {
margin: 0 32px 0 8px; display: flex;
min-width: 114px; flex-direction: row;
} }
div#vabila div.button_holder div.input_box { div#vabila div.button_holder .copy_survey_url_holder .input_box {
display: flex;
align-items: center;
border: 1px solid #C4C4C4; border: 1px solid #C4C4C4;
width: 300px; width: 300px;
padding: 10px 0 10px 8px; padding: 10px 0 10px 8px;
} }
div#vabila div.button_holder div.input_box input { div#vabila div.button_holder .copy_survey_url_holder .input_box input {
border: none; border: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: 16px; font-size: 16px;
width: 90%; width: 100%;
} }
div#vabila div.button_holder div#nice_url_holder { div#vabila div.button_holder .copy_survey_url_holder button {
min-width: 114px;
margin: 0 0 0 8px;
}
div#vabila div.button_holder #nice_url_button {
margin: 0 0 0 32px;
}
div#vabila div.button_holder #nice_url_holder {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
margin: 0 0 0 32px;
} }
div#vabila div.button_holder div#nice_url_holder input { div#vabila div.button_holder #nice_url_holder .url {
display: flex;
align-items: center;
}
div#vabila div.button_holder #nice_url_holder .url input {
margin: 0 8px; margin: 0 8px;
width: 200px; width: 200px;
} }
div#vabila div.button_holder div#nice_url_holder button { div#vabila div.button_holder #nice_url_holder .buttons {
display: flex;
}
div#vabila div.button_holder #nice_url_holder .buttons button {
min-width: 114px;
margin-right: 8px; margin-right: 8px;
margin-left: 0; margin-left: 0;
} }
@ -32923,6 +32941,19 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
border-radius: 1px; border-radius: 1px;
} }
.dashboard_top_settings {
flex-direction: column;
}
.dashboard_top_settings .dashboard_top_filters {
align-items: flex-start;
width: 100%;
margin-top: 16px;
}
.dashboard_top_settings .dashboard_top_filters .filter_setting {
margin-left: 0;
margin-right: 16px;
}
.dashboard_boxes { .dashboard_boxes {
flex-direction: column; flex-direction: column;
} }
@ -33307,20 +33338,28 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
width: 100% !important; width: 100% !important;
} }
.page_vabila.subpage_settings #vabila .button_holder { .page_vabila #vabila .button_holder {
flex-wrap: wrap; flex-direction: column;
align-items: flex-start;
} }
.page_vabila.subpage_settings #vabila .button_holder .input_box { .page_vabila #vabila .button_holder .copy_survey_url_holder {
display: flex; width: 100%;
width: auto !important;
} }
.page_vabila.subpage_settings #vabila .button_holder button { .page_vabila #vabila .button_holder .copy_survey_url_holder .input_box {
margin: 0 0 0 8px; width: auto;
} }
.page_vabila.subpage_settings #vabila .button_holder button#nice_url_button { .page_vabila #vabila .button_holder #nice_url_button {
margin: 16px 0 0 0; margin: 16px 0 0 0;
} }
.page_vabila.subpage_settings #vabila .more_block { .page_vabila #vabila .button_holder #nice_url_holder {
flex-direction: column;
align-items: flex-start;
margin: 16px 0 0 0;
}
.page_vabila #vabila .button_holder #nice_url_holder .buttons {
margin: 16px 0 0 0;
}
.page_vabila #vabila .more_block {
width: 100%; width: 100%;
} }
@ -33662,15 +33701,6 @@ table.invitations_settings p label input[type=password],
top: 68px; top: 68px;
} }
.subpage_append,
.subpage_merge,
.subpage_calculation,
.subpage_coding_auto,
.subpage_recoding,
.subpage_coding,
.page_export {
flex-direction: column !important;
}
.subpage_append .anketa_edit_main, .subpage_append .anketa_edit_main,
.subpage_merge .anketa_edit_main, .subpage_merge .anketa_edit_main,
.subpage_calculation .anketa_edit_main, .subpage_calculation .anketa_edit_main,
@ -33682,13 +33712,13 @@ table.invitations_settings p label input[type=password],
box-sizing: border-box; box-sizing: border-box;
margin: 0 !important; margin: 0 !important;
} }
.subpage_append .anketa_edit_left, .subpage_append .layout_left_item,
.subpage_merge .anketa_edit_left, .subpage_merge .layout_left_item,
.subpage_calculation .anketa_edit_left, .subpage_calculation .layout_left_item,
.subpage_coding_auto .anketa_edit_left, .subpage_coding_auto .layout_left_item,
.subpage_recoding .anketa_edit_left, .subpage_recoding .layout_left_item,
.subpage_coding .anketa_edit_left, .subpage_coding .layout_left_item,
.page_export .anketa_edit_left { .page_export .layout_left_item {
display: none !important; display: none !important;
} }
.subpage_append textarea, .subpage_append textarea,
@ -33837,13 +33867,6 @@ table.analysis_reports > tbody > tr > td {
white-space: nowrap; white-space: nowrap;
} }
.page_arhivi,
.page_tracking,
.subpage_anal_arch,
.subpage_view_archive,
.subpage_anal_arch {
flex-direction: column !important;
}
.page_arhivi .anketa_edit_left, .page_arhivi .anketa_edit_left,
.page_tracking .anketa_edit_left, .page_tracking .anketa_edit_left,
.subpage_anal_arch .anketa_edit_left, .subpage_anal_arch .anketa_edit_left,

1
resources/sass/admin_new/mobile/pages/archive.scss
View File

@ -4,7 +4,6 @@
.subpage_anal_arch, .subpage_anal_arch,
.subpage_view_archive, .subpage_view_archive,
.subpage_anal_arch{ .subpage_anal_arch{
flex-direction: column !important;
.anketa_edit_left{ .anketa_edit_left{
display: none !important; display: none !important;

3
resources/sass/admin_new/mobile/pages/data.scss
View File

@ -133,7 +133,6 @@ body.data_fullscreen{
.subpage_recoding, .subpage_recoding,
.subpage_coding, .subpage_coding,
.page_export{ .page_export{
flex-direction: column !important;
.anketa_edit_main{ .anketa_edit_main{
width: 100% !important; width: 100% !important;
@ -142,7 +141,7 @@ body.data_fullscreen{
margin: 0 !important; margin: 0 !important;
} }
.anketa_edit_left{ .layout_left_item{
display: none !important; display: none !important;
} }

29
resources/sass/admin_new/mobile/pages/publish.scss
View File

@ -1,22 +1,35 @@
.page_vabila.subpage_settings #vabila{ .page_vabila #vabila{
.button_holder{ .button_holder{
flex-wrap: wrap; flex-direction: column;
align-items: flex-start;
.copy_survey_url_holder{
width: 100%;
// Url ankete in kopiranje url-ja
.input_box { .input_box {
display: flex; width: auto;
width: auto !important; }
} }
button{ // Nice URL - gumb
margin: 0 0 0 8px; #nice_url_button{
margin: 16px 0 0 0;
}
&#nice_url_button{ // Nice URL - dodajanje
#nice_url_holder {
flex-direction: column;
align-items: flex-start;
margin: 16px 0 0 0;
.buttons{
margin: 16px 0 0 0; margin: 16px 0 0 0;
} }
} }
} }
.more_block{ .more_block{

16
resources/sass/admin_new/mobile/pages/status.scss
View File

@ -1,3 +1,19 @@
.dashboard_top_settings{
flex-direction: column;
.dashboard_top_filters{
align-items: flex-start;
width: 100%;
margin-top: 16px;
.filter_setting{
margin-left: 0;
margin-right: 16px;
}
}
}
.dashboard_boxes{ .dashboard_boxes{
flex-direction: column; flex-direction: column;

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

@ -161,12 +161,15 @@ div#vabila {
align-items: center; align-items: center;
margin-bottom: 16px; margin-bottom: 16px;
button { .copy_survey_url_holder{
margin: 0 32px 0 8px; display: flex;
min-width: 114px; flex-direction: row;
}
// Url ankete in kopiranje url-ja
.input_box {
display: flex;
align-items: center;
div.input_box {
border: 1px solid $dark-gray; border: 1px solid $dark-gray;
width: 300px; width: 300px;
padding: 10px 0 10px 8px; padding: 10px 0 10px 8px;
@ -176,27 +179,51 @@ div#vabila {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: 16px; font-size: 16px;
width: 90% width: 100%
} }
} }
//Nice URL button{
div#nice_url_holder { min-width: 114px;
margin: 0 0 0 8px;
}
}
// Nice URL - gumb
#nice_url_button{
margin: 0 0 0 32px;
}
// Nice URL - dodajanje
#nice_url_holder {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
margin: 0 0 0 32px;
.url{
display: flex;
align-items: center;
input { input {
margin: 0 8px; margin: 0 8px;
width: 200px; width: 200px;
} }
}
.buttons{
display: flex;
button { button {
min-width: 114px;
margin-right: 8px; margin-right: 8px;
margin-left: 0; margin-left: 0;
} }
} }
} }
}
div#nice_url_error { div#nice_url_error {
width: 100%; width: 100%;