aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevlon Duthie <duthied@gmail.com>2011-09-25 15:45:03 -0500
committerDevlon Duthie <duthied@gmail.com>2011-09-25 15:45:03 -0500
commit19963884c29b82b04cdda481837f783c19f172a6 (patch)
tree7ff2aabe93266739c211f400bac54633d9b431f1
parent45043b77f1e31ec574f11ac26dacf9453602321b (diff)
downloadvolse-hubzilla-19963884c29b82b04cdda481837f783c19f172a6.tar.gz
volse-hubzilla-19963884c29b82b04cdda481837f783c19f172a6.tar.bz2
volse-hubzilla-19963884c29b82b04cdda481837f783c19f172a6.zip
moved invite friends into 'find people' block
misc. styling tweaks
-rw-r--r--mod/contacts.php14
-rw-r--r--view/follow.tpl1
-rw-r--r--view/theme/testbubble/style.css45
3 files changed, 53 insertions, 7 deletions
diff --git a/mod/contacts.php b/mod/contacts.php
index 24613a994..6dda546d3 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -23,8 +23,6 @@ function contacts_init(&$a) {
$a->page['aside'] = '';
$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')) {
$x = get_pconfig(local_user(),'system','invites_remaining');
if($x || is_site_admin()) {
@@ -33,22 +31,26 @@ function contacts_init(&$a) {
. '</div>' . $inv;
}
}
- elseif($a->config['register_policy'] != REGISTER_CLOSED)
- $a->page['aside'] .= $inv;
$tpl = get_markup_template('follow.tpl');
$findSimilarLink = '<div class="side-link" id="side-match-link"><a href="match" >'
. 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(
'$label' => t('Connect/Follow'),
'$hint' => t('Example: bob@example.com, http://example.com/barbara'),
'$follow' => t('Follow'),
- '$findSimilar' => $findSimilarLink
+ '$findSimilar' => $findSimilarLink,
+ '$inviteFriends' => $inv
));
-
+
}
diff --git a/view/follow.tpl b/view/follow.tpl
index 8ded17424..2c024930c 100644
--- a/view/follow.tpl
+++ b/view/follow.tpl
@@ -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" />
</form>
$findSimilar
+ $inviteFriends
</div>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index f26fabccd..c1998a4cd 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -2022,7 +2022,7 @@ margin-left: 90px;
#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;}
#contact-edit-nav-wrapper { margin-left: 210px; }
#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 {
border: 1px solid #babdb6;
-webkit-border-radius: 3px;
@@ -2206,6 +2206,49 @@ margin-left: 90px;
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{
font-size: 1em;
font-weight: bold;