Changeset 5158
- Timestamp:
- 09/20/2011 07:06:51 PM (13 years ago)
- File:
-
- 1 edited
-
trunk/bp-forums/bp-forums-admin.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-forums/bp-forums-admin.php
r5074 r5158 37 37 if ( isset( $_REQUEST['reinstall'] ) || !bp_forums_is_installed_correctly() ) : 38 38 39 // Delete the bb-config.php location option 40 bp_delete_option( 'bb-config-location' ); 39 41 bp_forums_bbpress_install_wizard(); 40 42 41 43 else : ?> 42 44 43 <p><?php printf( __( 'bbPress forum integration in BuddyPress has been set up correctly. If you are having problems you can <a href="%s" title="Reinstall bbPress">re-install</a>.', 'buddypress' ), $action ); ?> 44 <p><?php _e( 'NOTE: The forums directory will only work if your bbPress tables are in the same database as your WordPress tables. If you are not using an existing bbPress install you can ignore this message.', 'buddypress' ); ?></p> 45 45 <div style="width: 45%; float: left;"> 46 <h3><?php _e( '(Installed)', 'buddypress' ); ?> <?php _e( 'Forums for Groups', 'buddypress' ) ?></h3> 47 48 <p><?php _e( 'Each individual Group can have it\'s own discussion forum. Choose this if you\'d like to isolate the conversations your members have into distinctly separate areas.' , 'buddypress' ); ?></p> 49 <p class="description"><?php _e( 'You may use an existing bbPress installation if you have one.', 'buddypress' ); ?></p> 50 51 <h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4> 52 <ul class="description" style="list-style: square; margin-left: 30px;"> 53 <li><?php _e( 'Group Integration', 'buddypress' ); ?></p></li> 54 <li><?php _e( 'Member Profile Integration', 'buddypress' ); ?></p></li> 55 <li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li> 56 <li><?php _e( '@ Mention Integration', 'buddypress' ); ?></p></li> 57 </ul> 58 59 <div> 60 <a class="button button-primary" href="<?php echo $action ?>"><?php _e( 'Uninstall Group Forums', 'buddypress' ) ?></a> 61 </div> 62 </div> 63 64 <div style="width: 45%; float: left; margin-left: 20px; padding: 0 20px 20px 20px; border: 1px solid #ddd; background-color: #fff;"> 65 <h3><?php _e( 'New! Site Wide Forums', 'buddypress' ) ?></h3> 66 <p><?php _e( 'Your site will have central forums that are not isolated to any specific group. Choose this if you\'d like to have a central forum area for your members.', 'buddypress' ) ?></p> 67 <p class="description"><?php _e( 'You may activate both Group and Site Wide forums, but this may create a poor experience for your members.', 'buddypress' ) ?></p> 68 69 <h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4> 70 <ul class="description" style="list-style: square; margin-left: 30px;"> 71 <li><?php _e( 'Central Discussion Area', 'buddypress' ); ?></p></li> 72 <li><?php _e( 'Forum Plugins Available', 'buddypress' ); ?></p></li> 73 <li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li> 74 <li><?php _e( '@ Mention Integration', 'buddypress' ); ?></p></li> 75 </ul> 76 <div> 77 <a class="button thickbox button-primary" href="<?php bp_admin_url( add_query_arg( array( 'tab' => 'plugin-information', 'plugin' => 'bbpress', 'TB_iframe' => 'true', 'width' => '640', 'height' => '500' ), 'plugin-install.php' ) ); ?>"><?php _e( 'Install Site Wide Forums', 'buddypress' ) ?></a> 78 </div> 79 </div> 80 46 81 <?php endif; ?> 47 82 … … 57 92 switch( $step ) { 58 93 case 'existing': 59 if ( 1 == (int)$_REQUEST['doinstall']) {94 if ( isset( $_REQUEST['doinstall'] ) && ( 1 == (int) $_REQUEST['doinstall'] ) ) { 60 95 if ( !bp_forums_configure_existing_install() ) { 61 96 _e( 'The bb-config.php file was not found at that location, please try again.', 'buddypress' ); … … 116 151 </div> 117 152 118 <?php } else { ?> 119 120 <p><?php _e( 'Forums in BuddyPress make use of a bbPress installation to function. You can choose to either let BuddyPress set up a new bbPress install, or use an already existing bbPress install. Please choose one of the options below.', 'buddypress' ) ?></p> 121 122 <a class="button" href="<?php echo $post_url . '&step=new' ?>"><?php _e( 'Set up a new bbPress installation', 'buddypress' ) ?></a> 123 <a class="button" href="<?php echo $post_url . '&step=existing' ?>"><?php _e( 'Use an existing bbPress installation', 'buddypress' ) ?></a> 153 <?php } else { 154 155 // Include the plugin install 156 157 add_thickbox(); 158 wp_enqueue_script( 'plugin-install' ); 159 wp_admin_css( 'plugin-install' ); 160 ?> 161 162 <div style="width: 45%; float: left;"> 163 <h3><?php _e( 'Forums for Groups', 'buddypress' ) ?></h3> 164 165 <p><?php _e( 'Each individual Group can have it\'s own discussion forum. Choose this if you\'d like to isolate the conversations your members have into distinctly separate areas.' , 'buddypress' ); ?></p> 166 <p class="description"><?php _e( 'You may use an existing bbPress installation if you have one.', 'buddypress' ); ?></p> 167 168 <h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4> 169 <ul class="description" style="list-style: square; margin-left: 30px;"> 170 <li><?php _e( 'Group Integration', 'buddypress' ); ?></p></li> 171 <li><?php _e( 'Member Profile Integration', 'buddypress' ); ?></p></li> 172 <li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li> 173 <li><?php _e( '@ Mention Integration', 'buddypress' ); ?></p></li> 174 </ul> 175 176 <div> 177 <a class="button button-primary" href="<?php echo $post_url . '&step=new' ?>"><?php _e( 'Install Group Forums', 'buddypress' ) ?></a> 178 <a class="button" href="<?php echo $post_url . '&step=existing' ?>"><?php _e( 'Use Existing Installation', 'buddypress' ) ?></a> 179 </div> 180 </div> 181 182 <div style="width: 45%; float: left; margin-left: 20px; padding: 0 20px 20px 20px; border: 1px solid #ddd; background-color: #fff;"> 183 <h3><?php _e( 'New! Site Wide Forums', 'buddypress' ) ?></h3> 184 <p><?php _e( 'Your site will have central forums that are not isolated to any specific group. Choose this if you\'d like to have a central forum area for your members.', 'buddypress' ) ?></p> 185 <p class="description"><?php _e( 'You may activate both Group and Site Wide forums, but this may create a poor experience for your members.', 'buddypress' ) ?></p> 186 187 <h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4> 188 <ul class="description" style="list-style: square; margin-left: 30px;"> 189 <li><?php _e( 'Central Discussion Area', 'buddypress' ); ?></p></li> 190 <li><?php _e( 'Forum Plugins Available', 'buddypress' ); ?></p></li> 191 <li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li> 192 <li><?php _e( '@ Mention Integration', 'buddypress' ); ?></p></li> 193 </ul> 194 <div> 195 <a class="button thickbox button-primary" href="<?php bp_admin_url( add_query_arg( array( 'tab' => 'plugin-information', 'plugin' => 'bbpress', 'TB_iframe' => 'true', 'width' => '640', 'height' => '500' ), 'plugin-install.php' ) ); ?>"><?php _e( 'Install Site Wide Forums', 'buddypress' ) ?></a> 196 </div> 197 </div> 124 198 125 199 <?php }
Note: See TracChangeset
for help on using the changeset viewer.