From 4a6d8c5df5b62a2a66252c9e761d54bde29d85f5 Mon Sep 17 00:00:00 2001 From: ultimatemember Date: Sat, 10 Jan 2015 16:45:35 +0200 Subject: [PATCH] Fix Social Links --- admin/templates/directory/general.php | 9 +++++++++ admin/templates/directory/profile.php | 2 +- assets/css/um-members.css | 19 +++++++------------ assets/css/um-profile.css | 1 - assets/css/um-styles.css | 9 ++++++--- core/um-actions-members.php | 18 +++++++++--------- core/um-filters-fields.php | 5 ++++- core/um-filters-members.php | 9 +++++++++ core/um-setup.php | 3 ++- core/um-short-functions.php | 2 ++ 10 files changed, 49 insertions(+), 28 deletions(-) diff --git a/admin/templates/directory/general.php b/admin/templates/directory/general.php index 48cbb2dd..5d6acd7d 100644 --- a/admin/templates/directory/general.php +++ b/admin/templates/directory/general.php @@ -36,6 +36,15 @@

+ +

+ + + + ui_on_off('_um_has_cover_photo'); ?> + + +

diff --git a/admin/templates/directory/profile.php b/admin/templates/directory/profile.php index 4a01c865..f1bda349 100644 --- a/admin/templates/directory/profile.php +++ b/admin/templates/directory/profile.php @@ -152,7 +152,7 @@

-

+

diff --git a/assets/css/um-members.css b/assets/css/um-members.css index 846e4047..d74dbb0b 100644 --- a/assets/css/um-members.css +++ b/assets/css/um-members.css @@ -96,7 +96,9 @@ */ .um-members { - + -ms-word-break: break-all; + word-break: break-word; + word-wrap: break-word; } .um-member { @@ -226,12 +228,7 @@ - Member meta */ -.um-member-meta-main { - -} - .um-member-more { margin: 10px 0 0 0 } - .um-member-less { display: none } .um-member-more a, .um-member-less a { @@ -245,15 +242,13 @@ vertical-align: middle; line-height: 22px; } - .um-member-more a:hover, .um-member-less a:hover{color: #3ba1da} .um-member-meta { display: none; - margin: 20px 30px 0 30px; - padding: 15px 0 15px 0; - text-align: left; - border-top: 1px solid #eee; + margin: 20px 15px 0 15px; + padding: 15px 0; + border-top: 1px solid #e5e5e5; } .um-member-meta.no-animate { @@ -278,7 +273,7 @@ */ .um-member-connect { - padding: 10px 0; + padding-top: 20px; } .um-member-connect a{ diff --git a/assets/css/um-profile.css b/assets/css/um-profile.css index ee87e2e3..75797031 100644 --- a/assets/css/um-profile.css +++ b/assets/css/um-profile.css @@ -37,7 +37,6 @@ .um-profile.um-viewing .um-field-label { display: block; margin: 0 0 8px 0; - color: #999; border-bottom: solid 2px #eee; padding-bottom: 4px; } diff --git a/assets/css/um-styles.css b/assets/css/um-styles.css index 0d3d40e3..53b0068f 100644 --- a/assets/css/um-styles.css +++ b/assets/css/um-styles.css @@ -235,11 +235,14 @@ p.um-notice.err { display: none; } -.um-field-label { display: block; margin: 0 0 8px 0 } - +.um-field-label { + display: block; + margin: 0 0 8px 0; + font-weight: bold; + font-weight: 500; +} .um-field-label .um-field-label-icon { float: left; margin: 0 8px 0 0; vertical-align: middle !important; height: 22px; } .um-field-label .um-field-label-icon i { font-size: 22px; height: 22px; line-height: 22px; vertical-align: middle; } - .um-field-label label { display: inline-block; height: 22px; font-size: 16px; line-height: 22px !important; } .um-field-area { diff --git a/core/um-actions-members.php b/core/um-actions-members.php index fd47bcdc..ebd41aed 100644 --- a/core/um-actions-members.php +++ b/core/um-actions-members.php @@ -275,22 +275,22 @@ } ?> + +

+ + fields->show_social_urls(); ?> + +
+ + - +
- -
- - fields->show_social_urls(); ?> - -
- - diff --git a/core/um-filters-fields.php b/core/um-filters-fields.php index cb04a224..667d296d 100644 --- a/core/um-filters-fields.php +++ b/core/um-filters-fields.php @@ -117,7 +117,10 @@ } else { $value = implode(', ', $value); } - + + $value = str_replace('https://https://','https://',$value); + $value = str_replace('http://https://','https://',$value); + return $value; } diff --git a/core/um-filters-members.php b/core/um-filters-members.php index 1280ac55..b9fd90d7 100644 --- a/core/um-filters-members.php +++ b/core/um-filters-members.php @@ -87,6 +87,15 @@ ); } + // must have a cover photo + if ( $has_cover_photo == 1 ) { + $query_args['meta_query'][] = array( + 'key' => 'cover_photo', + 'value' => '', + 'compare' => '!=' + ); + } + // add roles to appear in directory if ( !empty( $roles ) ) { diff --git a/core/um-setup.php b/core/um-setup.php index fa22e5e7..fb79f04b 100644 --- a/core/um-setup.php +++ b/core/um-setup.php @@ -34,6 +34,7 @@ class UM_Setup { '_um_template' => 'members', '_um_mode' => 'directory', '_um_has_profile_photo' => 0, + '_um_has_cover_photo' => 1, '_um_show_social' => 0, '_um_show_userinfo' => 0, '_um_show_tagline' => 0, @@ -72,7 +73,7 @@ class UM_Setup { '_um_active_color' => '#3ba1da', '_um_secondary_color' => '#44b0ec', '_um_form_text_color' => '#666', - '_um_form_field_label' => '#888', + '_um_form_field_label' => '#555', '_um_form_icon_color' => '#aaa', '_um_form_bg_color' => '#fff', '_um_form_placeholder' => '#aaa', diff --git a/core/um-short-functions.php b/core/um-short-functions.php index e4a538db..2f93e893 100644 --- a/core/um-short-functions.php +++ b/core/um-short-functions.php @@ -19,6 +19,8 @@ } else if ( strpos($value, 'http') !== 0 ) { $value = $match . $value; } + $value = str_replace('https://https://','https://',$value); + $value = str_replace('http://https://','https://',$value); return $value; }