Skip to content

Commit

Permalink
s/enemy/ignore
Browse files Browse the repository at this point in the history
  • Loading branch information
@daleharvey
daleharvey committed Jun 18, 2012
1 parent 4c8b696 commit 9b3183e
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions application/controllers/buddies.php
View file
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/preferences.php
View file
Expand Up @@ -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');
Expand Down
20 changes: 10 additions & 10 deletions application/controllers/user.php
View file
Expand Up @@ -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);

Expand Down Expand Up @@ -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)
Expand All @@ -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().'<span class="paging-text">' . ($pagination + 1) . ' - ' . $end . ' of ' . $users_count . ' Users</span>',
'user_count' => $users_count,
'type' => $type));
$this->load->view('shared/footer');

}
}

Expand Down
20 changes: 10 additions & 10 deletions application/views/buddies.php
View file
Expand Up @@ -28,14 +28,14 @@

<div id="new-thread">

<p>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.</p>
<p>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.</p>

<div class="dotted-bar"></div>

<form action="/buddies" method="post">

<div class="biglabel">Add a Buddy / Enemy</div>
<div class="biglabel">Add a Buddy / Ignore</div>

<?php if ($error_alert!='') { ?><div class="error_alert"><?php echo $error_alert; ?></div><?php } ?>

<div id="buddy-input">
Expand All @@ -53,7 +53,7 @@
<?php echo form_label('Buddy', $commands['buddy']['id']); ?>

<?php echo form_radio($commands['enemy']); ?>
<?php echo form_label('Enemy', $commands['enemy']['id']); ?>
<?php echo form_label('Ignore', $commands['enemy']['id']); ?>
</div>
</div>

Expand All @@ -79,7 +79,7 @@
</div>
<div class="online-status <?php echo $online_status; ?>"><?php echo $online_status; ?></div>
<a class="remove-acq" rel="<?php echo $buddy->id; ?>">remove</a>
<a class="toggle-acq" rel="<?php echo $buddy->id; ?>">enemize</a>
<a class="toggle-acq" rel="<?php echo $buddy->id; ?>">ignore</a>
</div>

<?php }} ?>
Expand All @@ -88,7 +88,7 @@

<div class="blueline"></div>

<div class="biglabel">Enemies</div>
<div class="biglabel">Ignores</div>

<div id="enemy-listings">

Expand Down Expand Up @@ -126,7 +126,7 @@ function(data) {
}
);
});

var b2e = function(){
link = $(this);
master = $(this).parent();
Expand All @@ -140,7 +140,7 @@ function (data) {
}
);
};

var e2b = function(){
link = $(this);
master = $(this).parent();
Expand All @@ -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);
</script>
Expand Down
6 changes: 3 additions & 3 deletions application/views/thread.php
View file
Expand Up @@ -34,7 +34,7 @@

<?php if ($information->enemies > 0) { ?>
<div class="toggle-enemy">
<?=$information->enemies ?> ENEMY POST<?=($information->enemies == 1 ? '' : 'S') ?> IGNORED
<?=$information->enemies ?> POST<?=($information->enemies == 1 ? '' : 'S') ?> IGNORED
</div>
<?php } ?>
</div>
Expand Down Expand Up @@ -80,7 +80,7 @@
<?php
} ?>

<div id="comment-<?=$row->comment_id ?>" class="comment userid-<?=$row->author_id, $row->author_acquaintance_name, ($row->owner ? ' mycomment' : '') ?>">
<div id="comment-<?=$row->comment_id ?>" class="comment userid-<?=$row->author_id;?> <?=$row->author_acquaintance_name; ?> <?=($row->owner ? ' mycomment' : ''); ?>">
<div id="comment-container-<?=$row->comment_id; ?>" class="comment-container">
<div class="cmd-bar">
<span>
Expand All @@ -104,7 +104,7 @@
<div class="user-information" style="background: url(/img/emoticons/<?=$row->emoticon ? $row->author_id : '0'; ?>.gif);">
<ul>
<?php if ($logged_in) { ?>
<li><a href="/buddies/<?=$row->url_safe_author_name ?>"><?php echo ($row->author_acquaintance_name)? "Your $row->author_acquaintance_name!" : 'BUDDY? ENEMY?'; ?></a></li>
<li><a href="/buddies/<?=$row->url_safe_author_name ?>"><?php echo ($row->author_acquaintance_name === 'buddy')? "Your $row->author_acquaintance_name!" : 'BUDDY? IGNORE?'; ?></a></li>
<li><a href="/message/send/<?=$row->url_safe_author_name ?>">SEND A MESSAGE</a></li>
<?php } else { ?>
<li>&nbsp;</li>
Expand Down
2 changes: 1 addition & 1 deletion public/css/forum.css
View file
Expand Up @@ -1014,7 +1014,7 @@ h3.recent-thread-title {
text-transforum: uppercase;
}
.small_profile_caps .buddy, .small_profile_caps .online {color: #00AEEF;}
.small_profile_caps .enemy {color: #ED135A;}
.small_profile_caps .ignored {color: #ED135A;}

.standard_profile_info_box h3 {
border-bottom: dotted 1px #545454;
Expand Down

0 comments on commit 9b3183e

Please sign in to comment.