close creativecommons#367 - improve applicant flow when log in

Author: hugosolar

frontend-redesign/scss/widgets.scss

@@ -61,7 +61,13 @@
                 .status-content {
                     display: flex;
                     .status-action {
+                        display: flex;
                         margin-left: 1rem;
+                        .button {
+                            &:first-child {
+                                margin-right: .5rem;
+                            }
+                        }
                     }
                 }
             }

plugins/cc-global-network/includes/application-state.php

@@ -382,8 +382,10 @@ function ccgn_show_current_application_status($user_id) {
             'title' => "Let's get started",
             'msg' => 'You should begin your application process',
             'class' => 'success',
-            'link' => $link_form,
-            'link_text' => 'Application form'   
+            'link' => site_url('sign-up/individual/form'),
+            'link_text' => 'Individual Application',
+            'link2' => site_url('sign-up/institution/form'),
+            'link_text2' => 'Institutional Application',
         ),
         'charter-form' => array(
             'step' => 1,

themes/cc-commoners-2019/assets/css/style.css

@@ -6716,7 +6716,10 @@ a {
   .widget.user-status .widget-content .dropdown-pane .status-content {
     display: flex; }
     .widget.user-status .widget-content .dropdown-pane .status-content .status-action {
+      display: flex;
       margin-left: 1rem; }
+      .widget.user-status .widget-content .dropdown-pane .status-content .status-action .button:first-child {
+        margin-right: .5rem; }
 
 .widget.big-search {
   position: relative;

themes/cc-commoners-2019/functions.php

@@ -97,6 +97,9 @@
     ),
 	'Logged inactive - Home - second row' => array(
         'name' => 'home-logged-inactive-second'
+    ),
+	'Logged inactive (no form yet) - Home - second row' => array(
+        'name' => 'home-logged-inactive-no-form-second'
     ),
 	'Logged inactive - Home - third row' => array(
         'name' => 'home-logged-inactive-third'

themes/cc-commoners-2019/header.php

@@ -49,8 +49,14 @@
     if ( is_user_logged_in() ) {
         $current_user = get_user_by( 'ID', get_current_user_id());
         $member_or_applicant = ( bp_commoners::current_user_is_accepted() )? 'member' : 'applicant';
-        $individual_or_institutional = (ccgn_member_is_individual( get_current_user_id() )) ? 'Individual' : 'Institutional';
-        $user_type = ' ( '.$individual_or_institutional.' '.$member_or_applicant.' ) ';
+        //$individual_or_institutional = () ? 'Individual' : 'Institutional';
+        $usert_type = '';
+        if ( ccgn_user_is_individual_applicant( get_current_user_id() ) ) {
+            $user_type = ' ( Individual '.$member_or_applicant.' ) ';
+        } else if ( ccgn_user_is_institutional_applicant( get_current_user_id() ) ) {
+            $user_type = ' ( Insitutional '.$member_or_applicant.' ) ';
+        }
+        
         echo '<div class="status-bar">';
             echo '<div class="grid-container">';
                 echo '<div class="grid-x align-justify">';

themes/cc-commoners-2019/inc/partials/home-logged-in-not-accepted.php

@@ -7,6 +7,15 @@
         </div>
     </section>
 <?php endif; ?>
+<?php if ( is_active_sidebar( 'home-logged-inactive-no-form-second' ) && ( !ccgn_user_is_individual_applicant( get_current_user_id() ) && !ccgn_user_is_institutional_applicant( get_current_user_id() ) ) ): ?>
+    <section class="sidebar sidebar-second no-form inner-space">
+        <div class="grid-container">
+            <div class="grid-x">
+                <?php dynamic_sidebar( 'home-logged-inactive-no-form-second' ) ?>
+            </div>
+        </div>
+    </section>
+<?php endif; ?>
 <?php if ( is_active_sidebar( 'home-logged-inactive-second' ) ): ?>
     <section class="sidebar sidebar-second inner-space">
         <div class="grid-container">

themes/cc-commoners-2019/inc/widgets/ccgn_widget_user_status.php

@@ -57,7 +57,10 @@ function widget($args, $instance) {
                                 echo '<p>'.$application_status['step']['msg'].'</p>';
                                 echo '<div class="status-action">';
                                 if ( !empty( $application_status['step']['link'] ) ) {
-                                    echo '<a href="'.$application_status['step']['link'].'" class="button primary">'.$application_status['step']['link_text'].'</a>';
+                                    echo '<a href="'.$application_status['step']['link'].'" class="button small primary">'.$application_status['step']['link_text'].'</a>';
+                                }
+                                if ( !empty( $application_status['step']['link2'] ) ) {
+                                    echo '<a href="'.$application_status['step']['link2'].'" class="button small primary">'.$application_status['step']['link_text2'].'</a>';
                                 }
                                 echo '</div>';
                             echo '</div>';
@@ -71,6 +74,9 @@ function widget($args, $instance) {
                                 if ( !empty( $application_status['step']['link'] ) ) {
                                     echo '<a href="'.$application_status['step']['link'].'" class="button primary">'.$application_status['step']['link_text'].'</a>';
                                 }
+                                if ( !empty( $application_status['step']['link2'] ) ) {
+                                    echo '<a href="'.$application_status['step']['link2'].'" class="button primary">'.$application_status['step']['link_text2'].'</a>';
+                                }
                                 echo '</div>';
                             echo '</div>';