friendica/Mistpark
2
0
Fork 0
Code Releases Activity

a few more fsw tweaks

Browse source
This commit is contained in:
Mike Macgirvin 2010-10-26 19:01:16 -07:00
commit eb5e6aae72
11 changed files with 48 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
view/acl_selectors.php
View file

@ -49,11 +49,11 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
$r = q("SELECT `id`, `name`, `url` FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `network` = 'dfrn'
$r = q("SELECT `id`, `name`, `url`, `network` FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0
$sql_extra
ORDER BY `name` ASC ",
$_SESSION['uid']
intval(local_user())
);
if(count($r)) {
@ -62,7 +62,11 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
$selected = " selected=\"selected\" ";
else
$selected = '';
$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
if($rr['network'] === 'stat')
$disabled = ' disabled="true" ' ;
else
$disabled = '';
$o .= "<option value=\"{$rr['id']}\" $selected $disabled title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
}
}

1
view/contact_edit.tpl
View file

@ -31,6 +31,7 @@
</div>
<div id="contact-edit-end" ></div>
$insecure
$blocked
$ignored

7
view/contact_selectors.php
View file

@ -1,10 +1,13 @@
<?php
function contact_profile_assign($current) {
function contact_profile_assign($current,$foreign_net) {
$o = '';
$o .= "<select id=\"contact-profile-selector\" name=\"profile-assign\" />\r\n";
$disabled = (($foreign_net) ? ' disabled="true" ' : '');
$o .= "<select id=\"contact-profile-selector\" $disabled name=\"profile-assign\" />\r\n";
$r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d",
intval($_SESSION['uid']));

2
view/magicsig.tpl
View file

@ -5,5 +5,5 @@ $data
</me:data>
<me:encoding>$encoding</me:encoding>
<me:alg>$algorithm</me:alg>
<me:sig keyash="$keyhash">$signature</me:sig>
<me:sig keyhash="$keyhash">$signature</me:sig>
</me:env>

11
view/theme/default/style.css
View file

@ -1288,9 +1288,8 @@ input#dfrn-url {
margin-left: 50px;
}
#block-message, #ignore-message {
#block-message, #ignore-message, #profile-edit-insecure {
margin-top: 20px;
width: 180px;
color: #FF0000;
font-size: 1.1em;
border: 1px solid #FF8888;
@ -1298,6 +1297,14 @@ input#dfrn-url {
padding: 10px;
}
#block-message, #ignore-message {
width: 180px;
}
#profile-edit-insecure {
width: 600px;
}
.profile-tabs {
float: left;
padding: 4px;