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:
pero1203 2022-01-06 14:46:11 +01:00
commit 92b0c18fbe
9 changed files with 1481 additions and 1469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/survey/SurveyAdminSettings.php
View File

@ -3348,6 +3348,7 @@ class SurveyAdminSettings {
$row = SurveyInfo::getInstance()->getSurveyRow();
# če imamo prepoznavanje uporabnik iz CMS, potem ponudimo tudi META_REFERAL_URL
if ($rowAlert['finish_respondent_cms'] == 1)
echo '<p>'.$lang['srv_alert_instruction_meta_referer_url'].'</p>';
echo '</div>';
@ -10098,7 +10099,7 @@ class SurveyAdminSettings {
$drupal_url = ($lang['id'] == '2') ? $site_url.'d/en/' : $site_url.'d/';
//echo $userAccess->getPackageName($rowA['package_id']); - ime paketa, v delu @TG
// Ni nobenega paketa
if(mysqli_num_rows($sqlA) == 0){
@ -10106,6 +10107,8 @@ class SurveyAdminSettings {
}
else{
$rowA = mysqli_fetch_array($sqlA);
$userAccess = UserAccess::getInstance($global_user_id);
$package_name = $userAccess->getPackageName($rowA['package_id']);
// Ce ima paket 2 ali 3
if($rowA['package_id'] == '2' || $rowA['package_id'] == '3'){
@ -10114,21 +10117,21 @@ class SurveyAdminSettings {
if(strtotime($rowA['time_expire']) < time()){
$package_string = '<span>';
$package_string .= $rowA['package_name'];
$package_string .= $package_name;
$package_string .= ' ('.$lang['srv_access_package_expire'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')';
$package_string .= '</span>';
$package_string .= '</div><div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.'izvedi-nakup/'.$rowA['package_id'].'/podatki/\';">'.$lang['srv_narocila_extend'].'</button>';
}
else{
$package_string = $rowA['package_name'];
$package_string = $package_name;
$package_string .= ' ('.$lang['srv_access_package_valid'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')';
$package_string .= '</div><div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.'izvedi-nakup/'.$rowA['package_id'].'/podatki/\';">'.$lang['srv_narocila_extend'].'</button>';
}
}
else{
$package_string = $rowA['package_name'];
$package_string = $package_name;
$package_string .= ' ('.$lang['srv_access_package_free'].')';
$package_string .= '</div><div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.''.$lang['srv_narocila_buyurl'].'\';">'.$lang['srv_narocila_buy'].'</button>';

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

@ -477,6 +477,7 @@ class NewSurvey{
echo '<div class="fieldset">';
// Naslov
echo '<div class="pre-title">' . $lang['srv_newSurvey_survey_archive'] . '</div>';
echo '<div class="title">' . $lang['srv_newSurvey_survey_archive_title'] . '</div>';
echo '<p class="bottom32">'.$lang['srv_newSurvey_survey_archive_text2'].'</p>';
@ -487,7 +488,7 @@ class NewSurvey{
echo '<input type="hidden" name="has_data" value="0" />';
//echo '<input type="file" name="restore" onchange="document.restorefrm.submit();" />';
echo '<input type="file" name="restore" class="pointer" />';
echo '<label class="custom_file_upload">' . $lang['srv_newSurvey_survey_archive_choosefile'] . '<input type="file" name="restore" id="restore" /></label>';
echo $lang['srv_arhiv_datoteka_save_txt2'].'.';
@ -849,7 +850,7 @@ class NewSurvey{
// Dodamo se textbox na zadnjo vrstico ce je potrebno
$text = preg_replace(
'/(<span class="variable_title">[^<>]+<\/span>)\Z/',
'$1<br /><input type="text" />',
'$1<br /><input type="text" class="large" />',
$text
);
// Dodamo se textbox na prvo vrstico ce je potrebno

1
lang/1.php
View File

@ -7063,6 +7063,7 @@ $lang = array (
'srv_newSurvey_survey_copy_dropdown' => "-- Izberi anketo --",
'srv_newSurvey_survey_copy_text' => "Naslov obstoječe ankete",
'srv_newSurvey_survey_archive' => "Uvoz .1ka datoteke",
'srv_newSurvey_survey_archive_choosefile' => "Izberi datoteko",
'srv_newSurvey_survey_archive2' => "Uvozi 1ka anketo iz arhiva",
'srv_newSurvey_survey_archive_title' => "Restavriraj anketo iz arhivske .1ka datoteke",
'srv_newSurvey_survey_archive_text' => "Iz arhivske datoteke se bo ustvarila kopija arhivirane ankete",

1
lang/2.php
View File

@ -6949,6 +6949,7 @@ $lang = array (
'srv_newSurvey_survey_copy_dropdown' => "-- Choose a survey --",
'srv_newSurvey_survey_copy_text' => "Existing survey title",
'srv_newSurvey_survey_archive' => ".1ka file import",
'srv_newSurvey_survey_archive_choosefile' => "Choose file",
'srv_newSurvey_survey_archive2' => "Import 1ka survey from archive",
'srv_newSurvey_survey_archive_title' => "Restore survey from the .1ka archive file",
'srv_newSurvey_survey_archive_text' => "Archived survey copy will be created from the archive file",

2829
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

16
resources/sass/admin_new/pages/new_survey_page/left_menu.scss
View File

@ -2,25 +2,31 @@
.layout_left_item {
width: 308px;
height: 100% !important;
height: 100vh !important;
padding: 4px;
background-color: $white;
border-right: 1px solid $gray;
border-left: none;
border-top: none;
border-bottom: none;
box-sizing: border-box;
flex-shrink: 0;
position: absolute;
top:0;
left:0;
margin-right: 100px;
box-shadow: none;
height: fit-content;
.item {
display: flex;
align-items: center;
margin-bottom: 4px;
padding: 24px 0 24px 71px;
border: 1px solid $gray;
color: $black;
background-color: $light-gray;

2
resources/sass/admin_new/pages/new_survey_page/new_survey_page.scss
View File

@ -13,11 +13,13 @@ div#main.hide_header {
height: 100vh;
width: 100vw;
background-color: $white;
padding: 0 !important;
}
#new_anketa_div {
display: flex;
flex-direction: row;
width: 100%;
}
@import "left_menu";

80
resources/sass/admin_new/pages/new_survey_page/right_content.scss
View File

@ -23,6 +23,7 @@ $skin_selector: $red;
margin-top: 62px;
}
.layout_right_item{
margin-top: 64px;
.fieldset {
@ -80,46 +81,41 @@ $skin_selector: $red;
.radioSetting_type.active {
color: $selectors;
}
input {
padding: 0;
margin: 0;
}
select {
padding: 2px 5px;
margin: 0;
width: 302px;
font-size: 12px;
border: 1px solid $blue !important;
border-radius: 1px;
}
input[type="file"] {
height: 24px;
width: 240px;
font-size: 10px;
}
input[type="text"] {
padding: 10px 12px;
width: 310px;
font-size: 15px;
border: 1px solid $blue !important;
border-radius: 1px;
}
#novaanketa_akronim_1_chars {
float: right;
padding-right: 15px;
font-weight: 400;
font-size: 11px;
}
#novaanketa_naslov_1_chars {
float: right;
padding-right: 7px;
font-weight: 400;
font-size: 11px;
//Custom inputi
input[type="file"]#restore {
display: none;
}
//Button - medium - gray
label.custom_file_upload {
box-sizing: border-box;
cursor: pointer;
font-weight: $semi-bold;
font-family: $font_family;
box-shadow: none;
border: 0;
transition: 0.3s;
padding: 10px 32px;
min-width: 160px;
font-size: 16px;
color: $black;
background-color: $gray;
border: 1px $black solid;
&:hover {
background-color: darken($gray, 5%);
}
}
input[type="radio"] {
margin: 0 8px 4px 0;
display: none !important;
@ -182,6 +178,8 @@ $skin_selector: $red;
color: $radio_selector;
}
}
.survey_title_text_holder{
display: flex;
flex-direction: row;
@ -451,7 +449,7 @@ $skin_selector: $red;
margin-right: 32px;
textarea{
width: 469px;
width: 519px;
height: 509px;
box-sizing: border-box;
@ -474,7 +472,7 @@ $skin_selector: $red;
flex-shrink: 0;
#preview_field{
width: 469px;
width: 519px;
height: 509px;
box-sizing: border-box;
overflow: auto;

5
resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss
View File

@ -4,21 +4,24 @@ fieldset{
#obvescanje_sidebyside_holder {
display:flex;
flex-direction: row;
justify-content: space-between;
#obvescanje_sidebyside_left {
box-sizing: border-box;
flex-shrink: 0;
margin-right: 32px;
width: 560px;
}
#obvescanje_sidebyside_right {
flex-grow: 0;
width: 100%;
div.message_instructions {
background-color: $light-gray;
border: 1px solid $gray;
box-sizing: border-box;
padding: 16px;
margin-left: 32px;
width: 100%;
div.izpolnjena_spremenljivke {