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

Redesign - okencek spodaj levo za stevilo aktivnih urednikov

Browse Source
This commit is contained in:
pero1203 2022-05-26 12:13:22 +02:00
parent 0c3513b06b
commit f6ebf52217
8 changed files with 75 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
admin/survey/SurveyAdmin.php
View File

@ -379,9 +379,21 @@ class SurveyAdmin
echo ' <span class="text">'.$lang['srv_saving'].'</span>';
echo ' </div> <!-- /loading -->';
// Okencki spodaj levo
echo '<div class="bottom_left_popup_holder">';
// Trenutno aktivni uredniki
echo ' <div id="active_editors_holder">';
$this->check_online_users();
echo ' </div>';
// Obvestilo o akciji (success...) spodaj levo
echo ' <div id="action_note_holder"></div>';
echo '</div>';
echo ' <div id="clipboard">';
$this->clipboard_display();
echo ' </div> <!-- /clipboard -->';
@ -801,7 +813,6 @@ class SurveyAdmin
// Pomoc
echo '<div class="anketa_header_help setting_box">';
$this->request_help();
$this->check_online_users();
echo '</div>';
echo '<script type="text/javascript">';
@ -3790,39 +3801,22 @@ class SurveyAdmin
if (!$sql) return;
if (mysqli_num_rows($sql) > 0 && $hierarhija_type < 5) {
echo '<div class="active-alert">';
echo '<span class="tooltip active-editors">';
echo '<a href="#" onclick="return false;">';
echo '<span class="square green"></span>';
echo ' <span class="active-editors">' . $lang['srv_users_viewing'] . ': <b>' . (mysqli_num_rows($sql) + 1) . '</b></span>';
echo '</a>';
echo '<div class="action_note_box active-users">';
echo ' <span class="faicon users"></span>';
echo ' <span class="text">'.$lang['srv_users_viewing3'].': ' . (mysqli_num_rows($sql) + 1) . '</span>';
/*
if(is_null($hierarhija_type) || $hierarhija_type == 1){
echo '<div class="expanded-tooltip bottom" id="request_help_content">';
echo '<div class="block">';
echo ' <span class="line semi-bold">';
echo $lang['srv_users_viewing2'];
echo ' </span>';
while ($row = mysqli_fetch_array($sql)) {
$sql1 = sisplet_query("SELECT name, surname, email FROM users WHERE id = '$row[user]'");
if ($row1 = mysqli_fetch_array($sql1)) {
echo ' <span class="line semi-bold">';
echo ' <a href="mailto:' . $row1['email'] . '" target="_blank">' . $row1['email'] . '</a> (' . $row1['name'] . ' ' . $row1['surname'] . ')';
echo ' </span>';
}
}
echo '</div>';
echo '</div>'; // expanded-tooltip bottom
}
echo '</span>'; // request-help
*/
echo '</div>';
}

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

@ -265,9 +265,6 @@ class Prevajanje {
//Standardne besede
echo '<p class="top16">'.$lang['srv_language_std_bes1'].'<a href="index.php?anketa='.$this->anketa.'&a=jezik">'.$lang['srv_language_std_bes2'].'</a>.</p>';
//Jezik administrativnega vmesnika
echo '<p class="bottom16 top16">'.$lang['srv_language_admin_surveyA'].'<a href="index.php?anketa='.$this->anketa.'&a=nastavitve">'.$lang['srv_language_admin_survey'].'</a>'.$lang['srv_language_admin_surveyB'].'</p>';
echo '</form>';
}
@ -439,7 +436,7 @@ class Prevajanje {
echo '</span></span>';
$d = new Dostop();
if ($d->checkDostopSub('edit'))
echo ' - '.$lang['srv_edit_in_edit'].' <a href="index.php?anketa='.$this->anketa.'">'.$lang['srv_social_settings_text6'].'</a>';
echo ' - '.$lang['srv_edit_in_edit'].' <a href="index.php?anketa='.$this->anketa.'" style="pointer-events:auto;">'.$lang['srv_social_settings_text6'].'</a>';
echo '</div>';
// Desna stran

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

@ -5550,7 +5550,7 @@ function actionNotePopup(name, type){
// Zapri note popup spodaj levo
function actionNotePopupClose(){
$('.action_note_box').fadeOut(function(){
$('#action_note_holder .action_note_box').fadeOut(function(){
$('#action_note_holder').html('');
});
}

1
lang/1.php
View File

@ -6566,6 +6566,7 @@ $lang = array (
'srv_test_sett_txt' => 'Uredniške nastavitve testiranja in komentarjev',
'srv_users_viewing' => 'aktivnih urednikov',
'srv_users_viewing2' => 'Trenutno aktivni uredniki',
'srv_users_viewing3' => 'Število aktivnih urednikov',
'srv_users_add_new' => 'Nov uporabnik',
"srv_users_add_new_title" => 'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span>',
'srv_users_add_assigned' => 'Dodajte pregled nad uporabniki',

1
lang/2.php
View File

@ -6455,6 +6455,7 @@ $lang = array (
'srv_test_sett_txt' => '',
'srv_users_viewing' => 'active editors',
'srv_users_viewing2' => 'Currently active editors',
'srv_users_viewing3' => 'Currently active editors',
'srv_users_add_new' => 'Add new user',
"srv_users_add_new_title" => 'Create new user in the system<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span>',
'srv_users_add_assigned' => 'Add assigned users',

43
public/css/admin_new.css
View File

@ -7499,16 +7499,20 @@ body.waitlong #loading {
font-size: 14px;
}
/* Action spodaj desno (npr. uspesno kopiranje...) */
#action_note_holder {
.bottom_left_popup_holder {
display: flex;
flex-direction: column-reverse;
z-index: 900;
z-index: 78;
position: fixed;
bottom: 16px;
left: 16px;
/* Action spodaj levo (npr. uspesno kopiranje...) */
}
#action_note_holder .action_note_box {
.bottom_left_popup_holder #action_note_holder {
display: flex;
flex-direction: column-reverse;
}
.bottom_left_popup_holder .action_note_box {
display: flex;
align-items: center;
position: relative;
@ -7516,33 +7520,34 @@ body.waitlong #loading {
width: 275px;
height: 38px;
padding: 0 16px;
margin-top: 16px;
font-size: 14px;
background-color: #FFFFFF;
border: 1px solid #1E88E5;
border-radius: 2px;
}
#action_note_holder .action_note_box.success {
.bottom_left_popup_holder .action_note_box.success, .bottom_left_popup_holder .action_note_box.active-users {
border-color: #1E88E5;
}
#action_note_holder .action_note_box.success .faicon:before {
.bottom_left_popup_holder .action_note_box.success .faicon:before, .bottom_left_popup_holder .action_note_box.active-users .faicon:before {
color: #1E88E5;
}
#action_note_holder .action_note_box.error {
.bottom_left_popup_holder .action_note_box.error {
border-color: #FF0000;
}
#action_note_holder .action_note_box.error .faicon:before {
.bottom_left_popup_holder .action_note_box.error .faicon:before {
color: #FF0000;
}
#action_note_holder .action_note_box span.faicon {
.bottom_left_popup_holder .action_note_box span.faicon {
margin-right: 8px;
}
#action_note_holder .action_note_box span.faicon::before {
.bottom_left_popup_holder .action_note_box span.faicon::before {
font-size: 15px;
}
#action_note_holder .action_note_box span.text {
.bottom_left_popup_holder .action_note_box span.text {
font-size: 14px;
}
#action_note_holder .action_note_box .close {
.bottom_left_popup_holder .action_note_box .close {
cursor: pointer;
position: absolute !important;
top: 10px;
@ -7551,14 +7556,14 @@ body.waitlong #loading {
font-size: 12px !important;
color: #777777;
}
#action_note_holder .action_note_box .close:hover {
.bottom_left_popup_holder .action_note_box .close:hover {
color: #333333;
}
#action_note_holder .action_note_box .close span {
.bottom_left_popup_holder .action_note_box .close span {
color: #777777;
text-decoration: none;
}
#action_note_holder .action_note_box .close span:hover {
.bottom_left_popup_holder .action_note_box .close span:hover {
color: #333333;
}
@ -21962,6 +21967,14 @@ div.prevajanje_holder .section .jezik_row .jezik_left div.comment_container_inli
div.prevajanje_holder .section .jezik_row .jezik_right div.comment_container_inline {
display: none;
}
div.prevajanje_holder .section .jezik_row .jezik_left .icons_holder,
div.prevajanje_holder .section .jezik_row .jezik_left .add-variable,
div.prevajanje_holder .section .jezik_row .jezik_left .inline_move,
div.prevajanje_holder .section .jezik_row .jezik_right .icons_holder,
div.prevajanje_holder .section .jezik_row .jezik_right .add-variable,
div.prevajanje_holder .section .jezik_row .jezik_right .inline_move {
display: none;
}
div.prevajanje_holder .section .jezik_row .jezik_left.vert_middle,
div.prevajanje_holder .section .jezik_row .jezik_right.vert_middle {
display: flex;

25
resources/sass/admin_new/components/popup/loader.scss
View File

@ -55,16 +55,24 @@ body.waitlong {
}
}
/* Action spodaj desno (npr. uspesno kopiranje...) */
#action_note_holder {
// Popupi spodaj levo
.bottom_left_popup_holder{
display: flex;
flex-direction: column-reverse;
z-index: 900;
position: fixed;
bottom: 16px;
z-index: 78;
position: fixed;
bottom: 16px;
left: 16px;
/* Action spodaj levo (npr. uspesno kopiranje...) */
#action_note_holder {
display: flex;
flex-direction: column-reverse;
}
.action_note_box{
display: flex;
align-items: center;
@ -74,6 +82,7 @@ body.waitlong {
width: 275px;
height: 38px;
padding: 0 16px;
margin-top: 16px;
font-size: 14px;
@ -81,7 +90,8 @@ body.waitlong {
border: 1px solid $blue;
border-radius: 2px;
&.success{
&.success,
&.active-users{
border-color: $blue;
.faicon:before{
@ -134,5 +144,6 @@ body.waitlong {
}
}
}
}

6
resources/sass/admin_new/pages/survey_edit/jezik.scss
View File

@ -42,7 +42,13 @@ div.prevajanje_holder {
//Skrita ikona za komentarje na vprašanja
div.comment_container_inline {
display: none;
}
// Skrite ikone za urejanje
.icons_holder,
.add-variable,
.inline_move{
display: none;
}