keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

moved invite friends into 'find people' block

Browse source 
misc. styling tweaks
This commit is contained in:
Devlon Duthie 2011-09-25 15:45:03 -05:00
parent 45043b77f1
commit 19963884c2
3 changed files with 53 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mod/contacts.php
View file

@ -23,8 +23,6 @@ function contacts_init(&$a) {
$a->page['aside'] = ''; $a->page['aside'] = '';
$a->page['aside'] .= group_side('contacts','group',false,0,$contact_id); $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
$inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
if(get_config('system','invitation_only')) { if(get_config('system','invitation_only')) {
$x = get_pconfig(local_user(),'system','invites_remaining'); $x = get_pconfig(local_user(),'system','invites_remaining');
if($x || is_site_admin()) { if($x || is_site_admin()) {
@ -33,19 +31,23 @@ function contacts_init(&$a) {
. '</div>' . $inv; . '</div>' . $inv;
} }
} }
elseif($a->config['register_policy'] != REGISTER_CLOSED)
$a->page['aside'] .= $inv;
$tpl = get_markup_template('follow.tpl'); $tpl = get_markup_template('follow.tpl');
$findSimilarLink = '<div class="side-link" id="side-match-link"><a href="match" >' $findSimilarLink = '<div class="side-link" id="side-match-link"><a href="match" >'
. t('Similar Interests') . '</a></div>'; . t('Similar Interests') . '</a></div>';
$inv = '';
if($a->config['register_policy'] != REGISTER_CLOSED) {
$inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
}
$a->page['aside'] .= replace_macros($tpl,array( $a->page['aside'] .= replace_macros($tpl,array(
'$label' => t('Connect/Follow'), '$label' => t('Connect/Follow'),
'$hint' => t('Example: bob@example.com, http://example.com/barbara'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
'$follow' => t('Follow'), '$follow' => t('Follow'),
'$findSimilar' => $findSimilarLink '$findSimilar' => $findSimilarLink,
'$inviteFriends' => $inv
)); ));

1
view/follow.tpl
View file

@ -4,5 +4,6 @@
<input id="side-follow-url" type="text" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" /> <input id="side-follow-url" type="text" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
</form> </form>
$findSimilar $findSimilar
$inviteFriends
</div> </div>

45
view/theme/testbubble/style.css
View file

@ -2022,7 +2022,7 @@ margin-left: 90px;
#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;} #contact-edit-direction-icon { position: absolute; top: 60px; left:0px;}
#contact-edit-nav-wrapper { margin-left: 210px; } #contact-edit-nav-wrapper { margin-left: 210px; }
#contact-edit-links { float: left; margin-top: 43px; } #contact-edit-links { float: left; margin-top: 43px; }
#contact-drop-links {position: absolute; top: 150px; left: 348px;} #contact-drop-links {/*position: absolute; top: 150px; left: 348px;*/}
#contact-edit-nav-wrapper .icon { #contact-edit-nav-wrapper .icon {
border: 1px solid #babdb6; border: 1px solid #babdb6;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
@ -2206,6 +2206,49 @@ margin-left: 90px;
color: #efefef; color: #efefef;
} }
#side-invite-link {
width: 180px;
padding: 10px;
margin: auto;
margin-bottom: 20px;
-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
box-shadow:inset 0px 1px 0px 0px #cfcfcf;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
background-color:#bdbdbd;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
padding: 5px 10px 5px 10px;
color: #efefef;
font-size: 1.2em;
text-align: center;
}
#side-invite-link:hover {
color: #efefef;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
}
#side-invite-link:active {
background-color: #b20202;
position:relative;
top:1px;
}
#side-invite-link a {
color: #efefef;
}
#invite-message, #invite-recipients, #invite-recipient-text {
padding: 10px;
}
#side-follow-wrapper{ #side-follow-wrapper{
font-size: 1em; font-size: 1em;
font-weight: bold; font-weight: bold;