diff options
| -rw-r--r-- | phpBB/install/schemas/mysql_schema.sql | 1 | ||||
| -rw-r--r-- | phpBB/language/en/lang_main.php | 3 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/posting_body.html | 20 |
3 files changed, 17 insertions, 7 deletions
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index 7b8faa32c1..c2b399b6e2 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -612,6 +612,7 @@ CREATE TABLE phpbb_topics ( topic_title varchar(60) NOT NULL, topic_poster mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_time int(11) DEFAULT '0' NOT NULL, + topic_time_limit int(11) DEFAULT '0' NOT NULL, topic_views mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_replies mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_replies_real mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php index f1aaf7e00d..9964419bd0 100644 --- a/phpBB/language/en/lang_main.php +++ b/phpBB/language/en/lang_main.php @@ -549,6 +549,9 @@ $lang += array( 'POST_REPLY' => 'Post a reply', 'POST_TOPIC_AS' => 'Post topic as', 'CHANGE_TOPIC_TO' => 'Change topic type to', + 'STICK_TOPIC_FOR' => 'Stick topic for', + 'STICKY_ANNOUNCE_TIME_LIMIT' => 'Sticky/Announcement time limit', + 'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 or leave blank for a never ending Sticky/Announcement', 'EDIT_POST' => 'Edit post', 'OPTIONS' => 'Options', 'MOD_OPTIONS' => 'Moderator Options', diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index db1d745705..59ae0078d8 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -199,12 +199,6 @@ function checkForm() <td class="row2"><input type="checkbox" name="delete" /> <span class="gensmall">[ {L_DELETE_POST_WARN} ]</span></td> </tr> <!-- ENDIF --> - <!-- IF S_DISPLAY_USERNAME --> - <tr> - <td class="row1"><b class="genmed">{L_USERNAME}:</b></td> - <td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></td> - </tr> - <!-- ENDIF --> <!-- IF S_SHOW_TOPIC_ICONS --> <tr> <td class="row1"><b class="genmed">{L_ICON}:</b></td> @@ -215,6 +209,12 @@ function checkForm() </table></td> </tr> <!-- ENDIF --> + <!-- IF S_DISPLAY_USERNAME --> + <tr> + <td class="row1"><b class="genmed">{L_USERNAME}:</b></td> + <td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></td> + </tr> + <!-- ENDIF --> <tr> <td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td> <td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="60" tabindex="2" value="{SUBJECT}" /></td> @@ -332,12 +332,18 @@ function checkForm() <!-- ENDIF --> <!-- IF S_TYPE_TOGGLE --> <tr> - <td></td> + <td> </td> <td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->: <!-- BEGIN topic_type --><input type="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE} <!-- END topic_type --></td> </tr> <!-- ENDIF --> </table></td> </tr> + <!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY --> + <tr> + <td class="row1"><b class="genmed">{L_STICK_TOPIC_FOR}</b><br /><span class="gensmall">{L_STICKY_ANNOUNCE_TIME_LIMIT}</span></td> + <td class="row2"><input class="post" type="text" name="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" /> <b class="gen">{L_DAYS}</b> <span class="gensmall">{L_STICK_TOPIC_FOR_EXPLAIN}</span></td> + </tr> + <!-- ENDIF --> <!-- IF S_LOCK_TOPIC_ALLOWED or S_LOCK_POST_ALLOWED --> <tr> <td class="row1" valign="top"><b class="genmed">{L_MOD_OPTIONS}:</b></td> |