From 9b3183ed72e9b0b367d1d0284f548aaace5e7c09 Mon Sep 17 00:00:00 2001 From: Dale Harvey Date: Mon, 18 Jun 2012 16:27:42 +0100 Subject: [PATCH] s/enemy/ignore --- application/controllers/buddies.php | 4 ++-- application/controllers/preferences.php | 2 +- application/controllers/user.php | 20 ++++++++++---------- application/views/buddies.php | 20 ++++++++++---------- application/views/thread.php | 6 +++--- public/css/forum.css | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/application/controllers/buddies.php b/application/controllers/buddies.php index 1d9bb68..2d1cdab 100644 --- a/application/controllers/buddies.php +++ b/application/controllers/buddies.php @@ -114,9 +114,9 @@ function error($error_id = 0) $error_id = (int) $error_id; $error_alert = ''; if ($error_id === 1) { - $error_alert = 'That user is already your buddy/enemy.'; + $error_alert = 'That user is already your buddy/ignored.'; } elseif ($error_id === 2) { - $error_alert = 'Please don\'t buddy/enemy yourself.'; + $error_alert = 'Please don\'t buddy/ignore yourself.'; } $this->load->view('shared/header'); $this->load->view('buddies', array( diff --git a/application/controllers/preferences.php b/application/controllers/preferences.php index eae7e86..139a7a9 100644 --- a/application/controllers/preferences.php +++ b/application/controllers/preferences.php @@ -70,7 +70,7 @@ function index() $this->form_validation->set_rules('email', 'Email Address', 'trim|xss_clean|valid_email'); $this->form_validation->set_rules('random_titles', 'Show Random Titles', 'trim|xss_clean|integer'); $this->form_validation->set_rules('new_post_notification', 'New Post Notification', 'trim|xss_clean|integer'); - $this->form_validation->set_rules('hide_enemy_posts', 'Hide Enemy Posts', 'trim|xss_clean|integer'); + $this->form_validation->set_rules('hide_enemy_posts', 'Toggle Ignore', 'trim|xss_clean|integer'); $this->form_validation->set_rules('chat_fixed_size', 'Chat Window Fixed Size', 'trim|xss_clean|integer'); $this->form_validation->set_rules('website_1','Website 1', 'trim|xss_clean'); $this->form_validation->set_rules('website_2','Website 2', 'trim|xss_clean'); diff --git a/application/controllers/user.php b/application/controllers/user.php index 5c0620f..d881a14 100644 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -48,18 +48,18 @@ function load($username) (strtotime($data['user_data']->last_login) == null) ? " hasn't logged in yet." : ' last logged in on ' . $logged_in .'.'; - + $data['user_data']->online_status = ((int) $data['user_data']->latest_activity) > (time() - 300) ? 'ONLINE' : 'NOT ONLINE'; - + $data['user_data']->friendly_status = ""; if ($data['user_data']->buddy_check == '1') { $data['user_data']->friendly_status = "BUDDY"; } elseif ($data['user_data']->enemy_check == '1') { - $data['user_data']->friendly_status = "ENEMY"; + $data['user_data']->friendly_status = "IGNORED"; } - + $data['recent_posts'] = $this->user_dal ->get_user_recent_posts((int)$data['user_data']->id); @@ -89,7 +89,7 @@ function load($username) $this->load->view('user', $data); $this->load->view('shared/footer'); } - + function check($username, $filter, $pagination = 0) { switch($filter) @@ -104,28 +104,28 @@ function check($username, $filter, $pagination = 0) $type = 1; $filter = 'buddyof'; } - + $users_count = $this->user_dal->get_acquaintance_count($username, $type); $display = 40; $end = min(array($pagination + $display, $users_count)); - + $this->pagination->initialize(array( 'base_url' => '/user/'. $username .'/'. $filter .'/p/', 'total_rows' => $users_count, 'uri_segment' => '2', 'per_page' => $display )); - + $users = $this->user_dal->get_acquaintance_information($username, $type, (int)$pagination, $display); - + $this->load->view('shared/header'); $this->load->view('acquaintances', array('users' => $users, 'pagination' => $this->pagination->create_links().'' . ($pagination + 1) . ' - ' . $end . ' of ' . $users_count . ' Users', 'user_count' => $users_count, 'type' => $type)); $this->load->view('shared/footer'); - + } } diff --git a/application/views/buddies.php b/application/views/buddies.php index 6b0f6ec..b04f1ec 100644 --- a/application/views/buddies.php +++ b/application/views/buddies.php @@ -28,14 +28,14 @@
-

We'll highlight your buddies posts and show you when they are online. Remember to use your enemies so that you can ignore all those YH users you just can't tolerate.

+

We'll highlight your buddies posts and show you when they are online and you can ignore all those YH users you just can't tolerate.

-
Add a Buddy / Enemy
- +
Add a Buddy / Ignore
+
@@ -53,7 +53,7 @@ - +
@@ -79,7 +79,7 @@
remove - enemize + ignore @@ -88,7 +88,7 @@
-
Enemies
+
Ignores
@@ -126,7 +126,7 @@ function(data) { } ); }); - + var b2e = function(){ link = $(this); master = $(this).parent(); @@ -140,7 +140,7 @@ function (data) { } ); }; - + var e2b = function(){ link = $(this); master = $(this).parent(); @@ -150,11 +150,11 @@ function (data) { function (data) { if (data == 1) master.appendTo('#buddy-listings').attr('class', 'buddy-listing'); - link.html('enemize'); + link.html('ignore'); } ); }; - + $('.enemy-listing .toggle-acq').bind('click', e2b); $('.buddy-listing .toggle-acq').bind('click', b2e); diff --git a/application/views/thread.php b/application/views/thread.php index 0131602..45b1eb8 100755 --- a/application/views/thread.php +++ b/application/views/thread.php @@ -34,7 +34,7 @@ enemies > 0) { ?>
- enemies ?> ENEMY POSTenemies == 1 ? '' : 'S') ?> IGNORED + enemies ?> POSTenemies == 1 ? '' : 'S') ?> IGNORED
@@ -80,7 +80,7 @@ -
+
@@ -104,7 +104,7 @@