← All changes | templates/form-topic.php +27 -36 2.4.2 → 2.2.0 View file →

		@@ -66,11 +66,9 @@
66	66	</div>
67	67
68	68	<?php endif; ?>
69	69
70		- <?php if ( ! bbp_is_single_forum() ) : ?>
71		- <?php do_action( 'bbp_template_notices' ); ?>
72		- <?php endif; ?>
	70	+ <?php do_action( 'bbp_template_notices' ); ?>
73	71
74	72	<div class="frmx-row aq-form-wrapper">
75	73
76	74	<?php bbp_get_template_part( 'form', 'anonymous' ); ?>
		@@ -78,9 +76,9 @@
78	76	<?php do_action( 'bbp_theme_before_topic_form_title' ); ?>
79	77
80	78	<div class="form-item frmx-col-md-12">
81	79	<label for="bbp_topic_title"><?php printf( esc_html__( 'Topic Title (Maximum Length: %d):', 'forumax' ),
82		- bbp_get_title_max_length() ); ?></label>
	80	+ bbp_get_title_max_length() ); ?></label><br/>
83	81	<input type="text" id="bbp_topic_title" value="<?php bbp_form_topic_title(); ?>" size="40" name="bbp_topic_title"
84	82	maxlength="<?php bbp_title_max_length(); ?>"/>
85	83	</div>
86	84
		@@ -87,11 +85,9 @@
87	85	<?php do_action( 'bbp_theme_after_topic_form_title' ); ?>
88	86
89	87	<?php do_action( 'bbp_theme_before_topic_form_content' ); ?>
90	88
91		- <div class="form-item frmx-col-md-12">
92		- <?php bbp_the_content( array( 'context' => 'topic' ) ); ?>
93		- </div>
	89	+ <?php bbp_the_content( array( 'context' => 'topic' ) ); ?>
94	90
95	91	<?php do_action( 'bbp_theme_after_topic_form_content' ); ?>
96	92
97	93	<?php if ( ! ( bbp_use_wp_editor() || current_user_can( 'unfiltered_html' ) ) ) : ?>
		@@ -108,9 +104,9 @@
108	104
109	105	<?php do_action( 'bbp_theme_before_topic_form_tags' ); ?>
110	106
111	107	<div class="form-item frmx-col-md-12">
112		- <label for="bbp_topic_tags"><?php esc_html_e( 'Topic Tags:', 'forumax' ); ?></label>
	108	+ <label for="bbp_topic_tags"><?php esc_html_e( 'Topic Tags:', 'forumax' ); ?></label><br/>
113	109	<input type="text" value="<?php bbp_form_topic_tags(); ?>" size="40" name="bbp_topic_tags"
114	110	id="bbp_topic_tags" <?php disabled( bbp_is_topic_spam() ); ?> />
115	111	</div>
116	112
		@@ -122,9 +118,9 @@
122	118
123	119	<?php do_action( 'bbp_theme_before_topic_form_forum' ); ?>
124	120
125	121	<div class="form-item frmx-col-md-4">
126		- <label for="bbp_forum_id"><?php esc_html_e( 'Forum:', 'forumax' ); ?></label>
	122	+ <label for="bbp_forum_id"><?php esc_html_e( 'Forum:', 'forumax' ); ?></label><br/>
127	123	<?php
128	124	bbp_dropdown( array(
129	125	'show_none' => esc_html__( '&mdash; No forum &mdash;', 'forumax' ),
130	126	'selected' => bbp_get_form_topic_forum()
		@@ -141,9 +137,9 @@
141	137	<?php do_action( 'bbp_theme_before_topic_form_type' ); ?>
142	138
143	139	<div class="form-item frmx-col-md-<?php echo bbp_is_single_forum() ? '6' : '4'; ?>">
144	140
145		- <label for="bbp_stick_topic"><?php esc_html_e( 'Topic Type:', 'forumax' ); ?></label>
	141	+ <label for="bbp_stick_topic"><?php esc_html_e( 'Topic Type:', 'forumax' ); ?></label><br/>
146	142
147	143	<?php bbp_form_topic_type_dropdown(); ?>
148	144
149	145	</div>
		@@ -153,9 +149,9 @@
153	149	<?php do_action( 'bbp_theme_before_topic_form_status' ); ?>
154	150
155	151	<div class="form-item frmx-col-md-<?php echo bbp_is_single_forum() ? '6' : '4'; ?>">
156	152
157		- <label for="bbp_topic_status"><?php esc_html_e( 'Topic Status:', 'forumax' ); ?></label>
	153	+ <label for="bbp_topic_status"><?php esc_html_e( 'Topic Status:', 'forumax' ); ?></label><br/>
158	154
159	155	<?php bbp_form_topic_status_dropdown(); ?>
160	156
161	157	</div>
		@@ -253,35 +249,30 @@
253	249
254	250	<?php else : ?>
255	251
256	252	<div id="no-topic-<?php bbp_forum_id(); ?>" class="bbp-no-topic">
257		- <?php if ( is_user_logged_in() ) : ?>
258		- <div class="bbp-template-notice bbp-login-required-notice">
259		- <span class="bbp-notice-icon" aria-hidden="true">
260		- <svg viewBox="0 0 24 24" width="20" height="20" fill="none" xmlns="http://www.w3.org/2000/svg">
261		- <path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10Z" stroke="currentColor" stroke-width="1.8"/>
262		- <path d="M12 10.5v6" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"/>
263		- <path d="M12 7.75h.01" stroke="currentColor" stroke-width="2.4" stroke-linecap="round"/>
264		- </svg>
265		- </span>
266		- <ul>
267		- <li><?php esc_html_e( 'You cannot create new topics.', 'forumax' ); ?></li>
268		- </ul>
269		- </div>
270		- <?php else : ?>
271		- <div class="frmx-inline-login-prompt">
272		- <h3 class="frmx-inline-login-title text-center"><?php echo esc_html__( 'Start a new topic', 'forumax' ); ?></h3>
273		- <p class="frmx-inline-login-subtitle text-center"><?php echo esc_html__( 'You must be logged in to create new topics.', 'forumax' ); ?></p>
274		- <div class="frmx-subscription-login-form">
	253	+ <div class="bbp-template-notice">
	254	+ <ul>
	255	+ <li>
275	256	<?php
276		- if ( function_exists( 'forumax_get_opt' ) && forumax_get_opt( 'topic_login_shortcode' ) ) {
277		- echo do_shortcode( forumax_get_opt( 'topic_login_shortcode' ) );
278		- } else {
279		- bbp_get_template_part( 'form', 'user-login' );
280		- }
	257	+ is_user_logged_in()
	258	+ ? esc_html_e( 'You cannot create new topics.', 'forumax' )
	259	+ : esc_html_e( 'You must be logged in to create new topics.', 'forumax' );
281	260	?>
282		- </div>
283		- </div>
	261	+ </li>
	262	+ </ul>
	263	+ </div>
	264	+
	265	+ <?php if ( ! is_user_logged_in() ) : ?>
	266	+
	267	+ <?php
	268	+ if ( forumax_get_opt('topic_login_shortcode') ) {
	269	+ echo do_shortcode(forumax_get_opt('topic_login_shortcode'));
	270	+ } else {
	271	+ bbp_get_template_part('form', 'user-login');
	272	+ }
	273	+ ?>
	274	+
284	275	<?php endif; ?>
285	276
286	277	</div>
287	278