tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-second-round' into 'develop' 

Ent 9662 second round

See merge request artica/pandorafms!5655
This commit is contained in:
Jonathan Leon 2023-04-04 09:49:20 +00:00
parent e7d71cf99c 99b07a2fb2
commit 297f70c8ef
5 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/godmode/users/configure_user.php
View File

@ -1045,6 +1045,22 @@ if (!$new_user) {
);
$user_id .= $apiTokenContent;
$CodeQRContent .= html_print_div(['id' => 'qr_container_image', 'class' => 'scale-0-8'], true);
$CodeQRContent .= html_print_anchor(
['id' => 'qr_code_agent_view'],
true
);
$CodeQRContent .= '<br/>'.$custom_id_div;
// QR code div.
$CodeQRTable = html_print_div(
[
'class' => 'agent_qr',
'content' => $CodeQRContent,
],
true
);
} else {
$user_id = '<div class="label_select_simple">'.html_print_input_text_extended(
'id_user',

20
pandora_console/godmode/users/user_management.php
View File

@ -258,7 +258,7 @@ if (users_is_admin() === true) {
// Password management.
$passwordManageTable = new stdClass();
$passwordManageTable->class = 'table_section full_section';
$passwordManageTable->class = 'full_section';
$passwordManageTable->id = 'password_manage';
$passwordManageTable->style = [];
$passwordManageTable->rowclass = [];
@ -605,7 +605,7 @@ $userManagementTable->data['fields_blocksize_eventfilter'][1] = html_print_selec
if (is_metaconsole() === false) {
// Home screen table.
$homeScreenTable = new stdClass();
$homeScreenTable->class = 'w100p table_section full_section';
$homeScreenTable->class = 'w100p full_section';
$homeScreenTable->id = 'home_screen_table';
$homeScreenTable->style = [];
$homeScreenTable->rowclass = [];
@ -736,22 +736,6 @@ $userManagementTable->data['fields_addSettings'][1] .= html_print_div(
true
);
$CodeQRContent .= html_print_div(['id' => 'qr_container_image', 'class' => 'scale-0-8'], true);
$CodeQRContent .= html_print_anchor(
['id' => 'qr_code_agent_view'],
true
);
$CodeQRContent .= '<br/>'.$custom_id_div;
// QR code div.
$CodeQRTable = html_print_div(
[
'class' => 'agent_qr',
'content' => $CodeQRContent,
],
true
);
// QR Code and API Token advice.
html_print_div(
[

10
pandora_console/include/functions_html.php
View File

@ -6912,12 +6912,12 @@ function html_print_label_input_block(
function html_print_go_top()
{
$output = '</div>';
$output .= '<div onclick="topFunction()" id="top_btn" title="Go to top">';
$output .= '<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">';
$output .= '<title>Dark / 20 / arrow@svg</title>';
$output .= '<div onclick="topFunction()" id="top_btn" class="forced_title" data-title="'.__('Go to top').'" data-use_title_for_force_title="1">';
$output .= '<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="forced_title" data-title="'.__('Go to top').'" data-use_title_for_force_title="1">';
// $output .= '<title>'.__('Go to top').'</title>';
$output .= '<desc>Created with Sketch.</desc>';
$output .= '<g id="Dark-/-20-/-arrow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">';
$output .= '<path d="M3.41005051,6.39052429 C3.91472805,5.90987901 4.70885153,5.8729063 5.25805922,6.27960615 L5.38994949,6.39052429 L10,10.78 L14.6100505,6.39052429 C15.1147281,5.90987901 15.9088515,5.8729063 16.4580592,6.27960615 L16.5899495,6.39052429 C17.094627,6.87116957 17.1334484,7.62747765 16.7064135,8.15053259 L16.5899495,8.27614237 L10.9899495,13.6094757 C10.4852719,14.090121 9.69114847,14.1270937 9.14194078,13.7203939 L9.01005051,13.6094757 L3.41005051,8.27614237 C2.8633165,7.75544332 2.8633165,6.91122335 3.41005051,6.39052429 Z" id="Path-8" fill="#14524f" fill-rule="nonzero" transform="translate(10.000000, 10.000000) rotate(90.000000) translate(-10.000000, -10.000000) "></path>';
$output .= '<g id="Dark-/-20-/-arrow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" class="forced_title" data-title="'.__('Go to top').'" data-use_title_for_force_title="1">';
$output .= '<path d="M3.41005051,6.39052429 C3.91472805,5.90987901 4.70885153,5.8729063 5.25805922,6.27960615 L5.38994949,6.39052429 L10,10.78 L14.6100505,6.39052429 C15.1147281,5.90987901 15.9088515,5.8729063 16.4580592,6.27960615 L16.5899495,6.39052429 C17.094627,6.87116957 17.1334484,7.62747765 16.7064135,8.15053259 L16.5899495,8.27614237 L10.9899495,13.6094757 C10.4852719,14.090121 9.69114847,14.1270937 9.14194078,13.7203939 L9.01005051,13.6094757 L3.41005051,8.27614237 C2.8633165,7.75544332 2.8633165,6.91122335 3.41005051,6.39052429 Z" id="Path-8" fill="#14524f" fill-rule="nonzero" transform="translate(10.000000, 10.000000) rotate(90.000000) translate(-10.000000, -10.000000) " class="forced_title" data-title="'.__('Go to top').'" data-use_title_for_force_title="1"></path>';
$output .= '</g>';
$output .= '</svg>';
$output .= '</div>';

7
pandora_console/include/styles/pandora.css
View File

@ -11889,6 +11889,9 @@ label:has(span.label-alert-agent) {
margin-bottom: 10px;
}
.info_table.events > tbody > tr > td {
border-bottom: 1px solid #dedede !important;
td[id^="table_info_box"] a {
font-weight: bold;
}
.info_table.events > tbody > tr > td {
border-bottom: 1px solid #dedede !important;
}

18
pandora_console/include/styles/tables.css
View File

@ -844,3 +844,21 @@ a.mini-pandora-pagination {
input.mini-search-input {
height: 30px;
}
td#password_manage-captions_newpassword-0,
td#password_manage-fields_newpassword-0,
td#password_manage-captions_repeatpassword-0,
td#password_manage-fields_repeatpassword-0,
td#password_manage-captions_currentpassword-0,
td#password_manage-fields_currentpassword-0,
td#advanced-passwordManage_table-0,
td#home_screen_table-captions_homescreen-0,
td#home_screen_table-fields_homescreen-0,
td#advanced-homescreen_table-0 {
padding: 0px;
}
td.w75p#rightcolumn {
margin-right: 0%;
vertical-align: baseline;
}