From f3df09cd71228caabe8ad081fd7b531afb9f98a3 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Wed, 26 Feb 2014 06:21:37 +0000 Subject: [PATCH] Unstack list control icons. --- core/domain_settings/domain_settings.php | 24 +++++++----------------- core/domain_settings/domains.php | 20 +++++++------------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index 5931a007ef..15c94c97cb 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -117,14 +117,10 @@ require_once "resources/paging.php"; echo th_order_by('domain_setting_value', $text['label-value'], $order_by, $order); echo th_order_by('domain_setting_enabled', $text['label-enabled'], $order_by, $order); echo th_order_by('domain_setting_description', $text['label-description'], $order_by, $order); - echo "\n"; + echo ""; if (permission_exists('domain_setting_add')) { - echo " $v_link_label_add\n"; + echo "$v_link_label_add"; } - else { - echo "  \n"; - } - echo "\n"; echo "\n"; } @@ -159,12 +155,12 @@ require_once "resources/paging.php"; echo " \n"; echo " ".$row['domain_setting_enabled']." \n"; echo " ".$row['domain_setting_description']." \n"; - echo " \n"; + echo " "; if (permission_exists('domain_setting_edit')) { - echo " $v_link_label_edit\n"; + echo "$v_link_label_edit"; } if (permission_exists('domain_setting_delete')) { - echo " $v_link_label_delete\n"; + echo "$v_link_label_delete"; } echo " \n"; echo "\n"; @@ -180,12 +176,9 @@ require_once "resources/paging.php"; echo " \n"; echo "  \n"; echo " $paging_controls\n"; - echo " \n"; + echo " "; if (permission_exists('domain_setting_add')) { - echo " $v_link_label_add\n"; - } - else { - echo "  \n"; + echo "$v_link_label_add"; } echo " \n"; echo " \n"; @@ -195,14 +188,11 @@ require_once "resources/paging.php"; echo ""; echo ""; - echo "

"; - echo "

"; echo ""; echo ""; echo ""; echo ""; - echo "

"; //include the footer require_once "resources/footer.php"; diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php index 64423516ab..b41dcf07a8 100644 --- a/core/domain_settings/domains.php +++ b/core/domain_settings/domains.php @@ -168,12 +168,9 @@ else { echo "\n"; echo th_order_by('domain_name', $text['label-domain'], $order_by, $order); echo th_order_by('domain_description', $text['label-description'], $order_by, $order); - echo "\n"; + echo ""; if (permission_exists('domain_add')) { - echo " $v_link_label_add\n"; - } - else { - echo "  \n"; + echo "$v_link_label_add"; } echo "\n"; echo "\n"; @@ -183,12 +180,12 @@ else { echo "\n"; echo " ".$row['domain_name']." \n"; echo " ".$row['domain_description']." \n"; - echo " \n"; + echo " "; if (permission_exists('domain_edit')) { - echo " $v_link_label_edit\n"; + echo "$v_link_label_edit"; } if (permission_exists('domain_delete')) { - echo " $v_link_label_delete\n"; + echo "$v_link_label_delete"; } echo " \n"; echo "\n"; @@ -203,12 +200,9 @@ else { echo " \n"; echo "  \n"; echo " $paging_controls\n"; - echo " \n"; + echo " "; if (permission_exists('domain_add')) { - echo " $v_link_label_add\n"; - } - else { - echo "  \n"; + echo "$v_link_label_add"; } echo " \n"; echo " \n";