From ff699a71c8560ef94f072a6cad766163d5b44904 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Wed, 26 Feb 2014 04:27:31 +0000 Subject: [PATCH] Unstack list control icons. --- app/conference_centers/app_languages.php | 12 +++++----- app/conference_centers/conference_centers.php | 23 ++++++++----------- .../conference_room_edit.php | 7 ++---- app/conference_centers/conference_rooms.php | 18 ++++++--------- 4 files changed, 25 insertions(+), 35 deletions(-) diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php index 49f7410a06..f38784673e 100644 --- a/app/conference_centers/app_languages.php +++ b/app/conference_centers/app_languages.php @@ -137,14 +137,14 @@ $text['label-sessions']['pt-pt'] = "Sessões"; $text['label-sessions']['fr-fr'] = "Sessions"; - $text['label-true']['en-us'] = "true"; - $text['label-true']['es-cl'] = "verdadero"; - $text['label-true']['pt-pt'] = "sim"; + $text['label-true']['en-us'] = "True"; + $text['label-true']['es-cl'] = "Verdadero"; + $text['label-true']['pt-pt'] = "Sim"; $text['label-true']['fr-fr'] = "Oui"; - $text['label-false']['en-us'] = "false"; - $text['label-false']['es-cl'] = "falso"; - $text['label-false']['pt-pt'] = "não"; + $text['label-false']['en-us'] = "False"; + $text['label-false']['es-cl'] = "Falso"; + $text['label-false']['pt-pt'] = "Não"; $text['label-false']['fr-fr'] = "Non"; $text['label-description']['en-us'] = "Description"; diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index c94dccc8a3..8fe2edbc96 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -109,9 +109,9 @@ else { $rows_per_page = 10; $param = ""; $page = $_GET['page']; - if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } - list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); - $offset = $rows_per_page * $page; + if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } + list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); + $offset = $rows_per_page * $page; //get the list if (if_group("superadmin") || if_group("admin")) { @@ -146,9 +146,9 @@ else { //echo th_order_by('conference_center_order', 'Order', $order_by, $order); echo th_order_by('conference_center_enabled', $text['label-enabled'], $order_by, $order); echo th_order_by('conference_center_description', $text['label-description'], $order_by, $order); - echo "\n"; + echo ""; if (permission_exists('conference_center_add')) { - echo " $v_link_label_add\n"; + echo "$v_link_label_add"; } else { echo "  \n"; @@ -166,12 +166,12 @@ else { //echo " ".$row['conference_center_order']." \n"; echo " ".$row['conference_center_enabled']." \n"; echo " ".$row['conference_center_description']." \n"; - echo " \n"; + echo " "; if (permission_exists('conference_center_edit')) { - echo " $v_link_label_edit\n"; + echo "$v_link_label_edit"; } if (permission_exists('conference_center_delete')) { - echo " $v_link_label_delete\n"; + echo "$v_link_label_delete"; } echo " \n"; echo "\n"; @@ -186,12 +186,9 @@ else { echo " \n"; echo "  \n"; echo " $paging_controls\n"; - echo " \n"; + echo " "; if (permission_exists('conference_center_add')) { - echo " $v_link_label_add\n"; - } - else { - echo "  \n"; + echo "$v_link_label_add"; } echo " \n"; echo " \n"; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 58f5521e62..5431d5956e 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -571,13 +571,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { foreach($result as $field) { echo " \n"; echo " ".$field['username']."\n"; - echo " \n"; + echo " \n"; if ($result_count > 1) { echo " $v_link_label_delete\n"; } - else { - echo "  "; - } echo " \n"; echo " \n"; } @@ -590,7 +587,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "order by username asc "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); - echo " \n"; echo " \n"; $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); foreach($result as $field) { diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index 457a3f745f..ce3e758740 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -257,8 +257,8 @@ else { } echo "\n"; - echo " ".$moderator_pin." \n"; - echo " ".$participant_pin." \n"; + echo " ".$moderator_pin."\n"; + echo " ".$participant_pin."\n"; //echo " ".$row['conference_center_uuid']." \n"; //echo " ".$row['meeting_uuid']." \n"; //echo " ".$row['profile']." \n"; @@ -339,13 +339,12 @@ else { echo "  \n"; echo " \n"; - echo " \n"; - echo "  \n"; + echo " "; if (permission_exists('conference_room_edit')) { - echo " $v_link_label_edit\n"; + echo "$v_link_label_edit"; } if (permission_exists('conference_room_delete')) { - echo " $v_link_label_delete\n"; + echo "$v_link_label_delete"; } echo " \n"; @@ -362,12 +361,9 @@ else { echo " \n"; echo "  \n"; echo " $paging_controls\n"; - echo " \n"; + echo " "; if (permission_exists('conference_room_add')) { - echo " $v_link_label_add\n"; - } - else { - echo "  \n"; + echo "$v_link_label_add"; } echo " \n"; echo " \n";