friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

contact-edit cleanup

This commit is contained in:
Mike Macgirvin 2010-07-28 20:16:45 -07:00
parent 050be99034
commit 8aeb1976b8
4 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/contacts.php
View File

@ -191,6 +191,7 @@ function contacts_content(&$a) {
'$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ), '$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
'$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ), '$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
'$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''), '$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
'$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),
'$rating' => contact_reputation($r[0]['rating']), '$rating' => contact_reputation($r[0]['rating']),
'$reason' => $r[0]['reason'], '$reason' => $r[0]['reason'],
'$groups' => '', // group_selector(), '$groups' => '', // group_selector(),
@ -263,6 +264,8 @@ function contacts_content(&$a) {
} }
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$img_hover' => t('Visit ') . $rr['name'] . t('\'s profile'),
'$edit_hover' => t('Edit contact'),
'$id' => $rr['id'], '$id' => $rr['id'],
'$alt_text' => $alt_text, '$alt_text' => $alt_text,
'$dir_icon' => $dir_icon, '$dir_icon' => $dir_icon,
@ -271,6 +274,7 @@ function contacts_content(&$a) {
'$url' => (($direction != DIRECTION_IN) ? "redir/{$rr['id']}" : $rr['url'] ) '$url' => (($direction != DIRECTION_IN) ? "redir/{$rr['id']}" : $rr['url'] )
)); ));
} }
$o .= '<div id="contact-edit-end"></div>';
} }
return $o; return $o;
} }

1
view/contact_edit.tpl
View File

@ -27,6 +27,7 @@
<div id="contact-edit-end" ></div> <div id="contact-edit-end" ></div>
$blocked $blocked
$ignored
<form action="contacts/$contact_id" method="post" > <form action="contacts/$contact_id" method="post" >
<input type="hidden" name="contact_id" value="$contact_id"> <input type="hidden" name="contact_id" value="$contact_id">

31
view/contact_template.tpl
View File

@ -1,23 +1,24 @@
<div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" > <div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
<div class="contact-entry-photo-wrapper" > <div class="contact-entry-photo-wrapper" >
<img class="contact-entry-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" /> <div class="contact-entry-nav-wrapper" >
<div class="contact-entry-photo" id="contact-entry-photo-$id" > <div class="contact-entry-direction-wrapper" >
<a href="$url" title="Visit $name's profile" /><img src="$thumb" alt="$name" /></a> <img class="contact-entry-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
</div> </div>
<div class="contact-entry-photo-end" ></div> <div class="contact-entry-direction-end" ></div>
</div> <div class="contact-entry-edit-links" >
<div class="contact-entry-nav-wrapper" > <a href="contacts/$id" class="contact-entry-edit-link" ><img src="images/b_edit.gif" alt="$edit_hover" title="$edit_hover" /></a>
<div class="contact-entry-name" id="contact-entry-name-$id" >$name</div> </div>
<div class="contact-entry-edit-end"></div>
<div class="contact-entry-break"></div>
<div class="contact-entry-edit-links" >
<a href="contacts/$id" class="contact-entry-edit-link" ><img src="images/b_edit.gif" alt="Edit contact" title="Edit contact" /></a>
</div> </div>
<div class="contact-entry-nav-end"></div> <div class="contact-entry-nav-end"></div>
<div class="contact-entry-photo" id="contact-entry-photo-$id" >
<a href="$url" title="$img_hover" /><img src="$thumb" alt="$name" /></a>
</div>
</div> </div>
<div class="contact-entry-photo-end" ></div>
<div class="contact-entry-name" id="contact-entry-name-$id" >$name</div>
<div class="contact-entry-end" ></div> <div class="contact-entry-end" ></div>
</div> </div>
<hr />

34
view/style.css
View File

@ -437,37 +437,37 @@ input#dfrn-url {
#contacts-main { #contacts-main {
margin-bottom: 20px; margin-bottom: 20px;
} }
.contact-entry-photo-wrapper {
.contact-entry-wrapper {
float: left; float: left;
width: 180px;
} }
.contact-entry-direction-icon { .contact-entry-direction-icon {
margin-top: 24px; margin-top: 24px;
float: left;
margin-right: 2px; margin-right: 2px;
} }
.contact-entry-photo img { .contact-entry-photo img {
border: none; border: none;
} }
.contact-entry-photo-end { .contact-entry-photo-end {
clear: both; clear: both;
} }
.contact-entry-edit-links {
float: left;
margin-top: 10px;
}
.contact-entry-name { .contact-entry-name {
float: left; float: left;
margin-left: 30px;
}
.contact-entry-edit-links {
margin-top: 6px;
margin-left: 10px;
width: 16px;
} }
.contact-entry-nav-wrapper { .contact-entry-nav-wrapper {
float: left; float: left;
margin-left: 10px; margin-left: 10px;
} }
.contact-entry-nav-end {
clear: both;
}
.contact-entry-break {
clear: both;
}
.contact-entry-edit-links img { .contact-entry-edit-links img {
border: none; border: none;
margin-right: 15px; margin-right: 15px;
@ -478,6 +478,14 @@ input#dfrn-url {
.contact-entry-end { .contact-entry-end {
clear: both; clear: both;
} }
/*
.contact-entry-nav-end {
clear: both;
}
*/
#contact-edit-end {
clear: both;
}
.wall-item-outside-wrapper { .wall-item-outside-wrapper {
margin-top: 10px; margin-top: 10px;
@ -900,7 +908,7 @@ input#dfrn-url {
margin-left: 50px; margin-left: 50px;
} }
#block-message { #block-message, #ignore-message {
margin-top: 20px; margin-top: 20px;
width: 180px; width: 180px;
color: #FF0000; color: #FF0000;