From b2d577e9a080be879136c1815067e1f5b292e2eb Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sun, 22 Jun 2014 06:35:33 +0000 Subject: [PATCH] Description column style mods, just for consistency. --- app/call_broadcast/call_broadcast.php | 2 +- app/destinations/destinations.php | 2 +- app/modules/module_edit.php | 23 ++++++++++++----------- app/modules/modules.php | 4 ++-- app/vars/vars.php | 2 +- app/xmpp/profile_list.php | 2 +- core/apps/apps.php | 2 +- core/domain_settings/domain_settings.php | 2 +- core/domain_settings/domains.php | 2 +- core/menu/menu.php | 2 +- core/users/group_permissions.php | 2 +- core/users/groups.php | 4 ++-- 12 files changed, 25 insertions(+), 24 deletions(-) diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php index 8d92303611..0cfb6652f1 100644 --- a/app/call_broadcast/call_broadcast.php +++ b/app/call_broadcast/call_broadcast.php @@ -120,7 +120,7 @@ else { echo " \n"; echo " ".$row['broadcast_concurrent_limit']." \n"; //echo " ".$row['recordingid']."\n"; - echo " ".$row['broadcast_description']." \n"; + echo " ".$row['broadcast_description']." \n"; echo " "; if (permission_exists('call_broadcast_edit')) { echo "$v_link_label_edit"; diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php index c829b5c851..d1910d1fbb 100644 --- a/app/destinations/destinations.php +++ b/app/destinations/destinations.php @@ -154,7 +154,7 @@ require_once "resources/paging.php"; echo " ".$row['destination_number']."\n"; echo " ".$row['destination_context']."\n"; echo " ".ucwords($row['destination_enabled'])."\n"; - echo " ".$row['destination_description']."\n"; + echo " ".$row['destination_description']."\n"; echo " "; echo "$v_link_label_edit"; echo "$v_link_label_delete"; diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php index c8dae7bb7b..a8574211ca 100644 --- a/app/modules/module_edit.php +++ b/app/modules/module_edit.php @@ -217,17 +217,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; - echo " ".$text['label-description'].":\n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; echo "\n"; echo " ".$text['label-module_category'].":\n"; @@ -287,6 +276,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; echo "\n"; + + echo "\n"; + echo "\n"; + echo " ".$text['label-description'].":\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo " \n"; echo " \n"; if ($action == "update") { diff --git a/app/modules/modules.php b/app/modules/modules.php index b8b4ae1186..6ada2c4ef5 100644 --- a/app/modules/modules.php +++ b/app/modules/modules.php @@ -118,10 +118,10 @@ if (strlen($_GET["a"]) > 0) { $tmp_module_header = "\n"; $tmp_module_header .= "\n"; $tmp_module_header .= "".$text['label-label']."\n"; - $tmp_module_header .= "".$text['label-description']."\n"; $tmp_module_header .= "".$text['label-status']."\n"; $tmp_module_header .= "".$text['label-action']."\n"; $tmp_module_header .= "".$text['label-enabled']."\n"; + $tmp_module_header .= "".$text['label-description']."\n"; $tmp_module_header .= ""; $tmp_module_header .= "$v_link_label_add"; $tmp_module_header .= "\n"; @@ -166,7 +166,6 @@ if (strlen($_GET["a"]) > 0) { echo $row["module_label"]; } echo " \n"; - echo " ".$row["module_description"]." \n"; if ($mod->active($row["module_name"])) { echo " ".$text['label-running']."\n"; echo " ".$text['label-stop']."\n"; @@ -188,6 +187,7 @@ if (strlen($_GET["a"]) > 0) { echo $text['option-false']; } echo "\n"; + echo " ".$row["module_description"]." \n"; echo " "; if (permission_exists('module_edit')) { echo "$v_link_label_edit"; diff --git a/app/vars/vars.php b/app/vars/vars.php index 9bab595f2c..4d611912af 100644 --- a/app/vars/vars.php +++ b/app/vars/vars.php @@ -148,7 +148,7 @@ else { echo "\n"; $var_description = str_replace("\n", "
", trim(substr(base64_decode($row['var_description']),0,40))); $var_description = str_replace(" ", "       ", $var_description); - echo " ".$var_description." \n"; + echo " ".$var_description." \n"; echo " "; if (permission_exists('var_edit')) { echo "$v_link_label_edit"; diff --git a/app/xmpp/profile_list.php b/app/xmpp/profile_list.php index 05844fdd8b..a453ea4ce4 100644 --- a/app/xmpp/profile_list.php +++ b/app/xmpp/profile_list.php @@ -45,7 +45,7 @@ foreach($profiles_array as $profile){       -   +   ".$row['category']." \n"; echo " ".$row['subcategory']." \n"; echo " ".$row['version']." \n"; - echo " ".$row['description']['en-us']." \n"; + echo " ".$row['description']['en-us']." \n"; /* // temporarily disabled echo " "; if (permission_exists('app_edit')) { diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index 7453b6cee2..f8cbbb0cab 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -170,7 +170,7 @@ require_once "resources/paging.php"; echo "  \n"; echo " \n"; echo " ".ucwords($row['domain_setting_enabled'])." \n"; - echo " ".$row['domain_setting_description']." \n"; + echo " ".$row['domain_setting_description']." \n"; echo " "; if (permission_exists('domain_setting_edit')) { echo "$v_link_label_edit"; diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php index 2d7d735c8c..437605e19f 100644 --- a/core/domain_settings/domains.php +++ b/core/domain_settings/domains.php @@ -187,7 +187,7 @@ else { echo $row['domain_name']; } echo " \n"; - echo " ".$row['domain_description']." \n"; + echo " ".$row['domain_description']." \n"; echo " "; if (permission_exists('domain_edit')) { echo "$v_link_label_edit"; diff --git a/core/menu/menu.php b/core/menu/menu.php index c21af01dc1..e25e6166ce 100644 --- a/core/menu/menu.php +++ b/core/menu/menu.php @@ -121,7 +121,7 @@ require_once "resources/paging.php"; echo "\n"; echo " ".$row['menu_name']."\n"; echo " ".$row['menu_language']."\n"; - echo " ".$row['menu_description']."\n"; + echo " ".$row['menu_description']." \n"; echo " "; echo "$v_link_label_edit"; echo "$v_link_label_delete"; diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php index e915519392..df84771123 100644 --- a/core/users/group_permissions.php +++ b/core/users/group_permissions.php @@ -391,7 +391,7 @@ require_once "resources/paging.php"; } echo "   ".$row['name']."\n"; echo " \n"; - echo " \n"; + echo " \n"; echo "   ".$row['description']."\n"; echo " \n"; echo "\n"; diff --git a/core/users/groups.php b/core/users/groups.php index 839b48d1b6..d4720f2a6b 100644 --- a/core/users/groups.php +++ b/core/users/groups.php @@ -88,9 +88,9 @@ else { $strlist = "\n"; $strlist .= "\n"; $strlist .= " \n"; - $strlist .= " \n"; $strlist .= " \n"; $strlist .= " \n"; + $strlist .= " \n"; $strlist .= " \n"; - $strlist .= "\n"; $strlist .= "\n"; + $strlist .= "\n"; $strlist .= "
".$text['label-group_name']."".$text['label-group_description']."".$text['label-group_tools']."".$text['label-group_protected']."".$text['label-group_description'].""; if (permission_exists('group_add')) { $strlist .= "$v_link_label_add"; @@ -129,7 +129,6 @@ else { } */ $strlist .= "".$group_description."\n"; if (permission_exists('group_add') || if_group("superadmin")) { $strlist .= "".$text['label-group_permissions']."  "; @@ -146,6 +145,7 @@ else { $strlist .= " \n"; } $strlist .= "".$group_description.""; /* if (permission_exists('group_edit')) {