From 0cc208bb03c30ba7b95edd610ac9fb06956f2fff Mon Sep 17 00:00:00 2001 From: Nate Date: Wed, 12 Feb 2020 11:59:29 -0700 Subject: [PATCH] Domains - Edit: Sticky Domain Settings action bar. --- core/domain_settings/domain_settings.php | 22 ++++++++++++++++++++-- core/domains/domain_edit.php | 21 +++++++++------------ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index 9d2827205d..74a35d1fa0 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -135,9 +135,10 @@ } //show the content - echo "
\n"; - echo "
".$text['header-domain_settings']." (".$num_rows.")
\n"; + echo "
\n"; + echo "
".$text['header-domain_settings']." (".$num_rows.")
\n"; echo "
\n"; + echo button::create(['type'=>'button','id'=>'action_bar_sub_button_back','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'style'=>'margin-right: 15px; display: none;','link'=>'domains.php']); if (permission_exists('domain_setting_add')) { echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'link'=>PROJECT_PATH."/core/domain_settings/domain_setting_edit.php?domain_uuid=".urlencode($domain_uuid)]); } @@ -325,4 +326,21 @@ echo "\n"; echo "\n"; +//make sub action bar sticky + echo "\n"; + ?> \ No newline at end of file diff --git a/core/domains/domain_edit.php b/core/domains/domain_edit.php index 7935540751..38b4c779d7 100644 --- a/core/domains/domain_edit.php +++ b/core/domains/domain_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2019 + Portions created by the Initial Developer are Copyright (C) 2008-2020 the Initial Developer. All Rights Reserved. Contributor(s): @@ -669,25 +669,22 @@ echo "\n"; echo "\n"; - echo " \n"; - echo " \n"; - if ($action == "update") { - echo " \n"; - } - echo " \n"; - echo " \n"; - echo " "; echo ""; echo "

"; + if ($action == "update") { + echo "\n"; + } + echo "\n"; + echo ""; if ($action == "update" && permission_exists('domain_setting_view')) { - echo "
\n"; - require "core/domain_settings/domain_settings.php"; + require $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/core/domain_settings/domain_settings.php"; + echo "

\n"; } //include the footer require_once "resources/footer.php"; -?> +?> \ No newline at end of file