merge conflicts on extra css

Author: hugosolar

plugins/cc-global-network/cc-global-network.php

@@ -143,7 +143,8 @@
     '_bp_get_activity_action_pre_meta'
 );
 add_filter( 'bp_core_get_userid_from_nicename', '_bp_core_get_userid', 10, 2 );
-add_action( 'bp_setup_nav', 'ccgn_not_logged_in_ui', 150 );
+//We're going to avoid this filter cause it crashes with the "public only" rendering of institutional profiles
+//add_action( 'bp_setup_nav', 'ccgn_not_logged_in_ui', 150 );
 
 //add_filter( 'bp_xprofile_get_groups', 'ccgn_filter_role_groups', 999, 2 );
 add_filter( 'bp_after_has_profile_parse_args', '_bp_hide_profile_field_group' );

plugins/cc-global-network/includes/buddypress-integration.php

@@ -574,7 +574,8 @@ function ccgn_not_logged_in_ui () {
     // Actually never show these
     //    bp_core_remove_nav_item( 'activity' );
     //bp_core_remove_nav_item( 'groups' );
-    if (! is_user_logged_in() ) {
+
+    if (! is_user_logged_in() && !$institutional_member ) {
         // Just don't display people's profiles
         bp_core_remove_nav_item( 'profile' );
         // Hide the "view" subtab. Ideally we would hide the "profile" tab...
@@ -891,11 +892,18 @@ function _bp_meta_member_type () {
 }
 
 function _bp_not_signed_in_redirect () {
-    if ( bp_is_directory()
+    //Condition added to detect if the url is from a institutional member
+    // In order to leave those profiles in public
+    global $wp_query;
+    $user = get_user_by('slug',$wp_query->query_vars['name']);
+    $institutional_member = ccgn_member_is_institution($user->data->ID);
+    
+    if ( (bp_is_directory()
          || bp_is_activity_component() || bp_is_groups_component()
          // || bp_is_group_forum() // || bp_is_page( BP_MEMBERS_SLUG )
-         || bp_is_profile_component() || bp_is_forums_component()
+         || bp_is_profile_component() || bp_is_forums_component() )
          /*|| bbp_is_single_forum() || bbp_is_single_topic()*/
+         && (!$institutional_member)
     ) {
         if( ! is_user_logged_in() ) {
             wp_redirect(

themes/cc-commoners/assets/css/extra.css

@@ -242,4 +242,82 @@ table.ccgn-profile tr td.title {
 .vouch-list .vouch-item a:hover {
     background-color: #ef9c01;
     color: white;
+}
+/*///////////////////////////////////////
+    GENERAL PAGES
+////////////////////////////////////////*/
+.error404 .main-content .entry-title {
+    margin-top: 1.5rem;
+    color: #BABABA;
+    text-transform: uppercase;
+    font-size: 5rem;
+    text-align: center;
+}
+.error404 .main-content .entry-title strong {
+    display: block;
+    font-size: 9rem;
+    color: #8E8E8E;
+    line-height: 6rem;
+}
+.error404 .main-content .subtitle {
+    margin: 2rem 0;
+    font-size: 2.5rem;
+    color: #838383;
+}
+.error404 .main-content .std-text p {
+    font-size: 1.5rem;
+}
+.main-content .std-text {
+    margin-bottom: 1rem;
+    padding-bottom: 1rem;
+}
+.main-content .std-text p {
+    margin: .5rem 0;
+}
+.main-content .std-text .link-list {
+    margin-top: 1.5rem;
+    padding-left: 1.8rem;
+}
+.main-content .std-text .link-list li {
+    margin-bottom: .5rem;
+}
+.main-content .search-form {
+    position: relative;
+    width: 60%;
+    margin: 2rem auto;
+}
+.main-content .search-form .search-field {
+    padding: .5rem;
+    border: 0;
+    border-bottom: 1px solid #C0C0C0;
+    font-size: 1.2rem;
+}
+.main-content .search-form .search-field::-webkit-input-placeholder { 
+  color: #BABABA;
+  font-style: italic;
+}
+.main-content .search-form .search-field::-moz-placeholder {
+  color: #BABABA;
+  font-style: italic;
+}
+.main-content .search-form .search-field:-moz-placeholder { 
+  color: #BABABA;
+  font-style: italic;
+}
+.main-content .search-form .search-field:-ms-input-placeholder { 
+  color: #BABABA;
+  font-style: italic;
+}
+.main-content .search-form .search-submit {
+    position: absolute;
+    right: 2rem;
+    top: .3rem;
+    background-color: transparent;
+}
+
+.page-body .gform_wrapper .gform_body input:not([type="radio"]):not([type="checkbox"]):not([type="submit"]):not([type="button"]):not([type="image"]):not([type="file"]) {
+    padding: 5px 4px !important;
+    width: auto !important;
+    font-size: 1rem !important;
+    border: 1px solid lightgray;
 }