Use define instead of tpl variable (#726)

* COOKIE_MARK

* Use U_INDEX

* Removed BB_ROOT

* ONLY_NEW_TOPICS, ONLY_NEW_POSTS
This commit is contained in:
Roman Kelesidis 2023-05-28 15:21:17 +07:00 committed by GitHub
commit 737b7b992b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 12 deletions

View file

@ -1118,7 +1118,6 @@ function setup_style()
$css_dir = 'styles/' . basename(TEMPLATES_DIR) . '/' . $tpl_dir_name . '/css/'; $css_dir = 'styles/' . basename(TEMPLATES_DIR) . '/' . $tpl_dir_name . '/css/';
$template->assign_vars(array( $template->assign_vars(array(
'BB_ROOT' => BB_ROOT,
'SPACER' => make_url('styles/images/spacer.gif'), 'SPACER' => make_url('styles/images/spacer.gif'),
'STYLESHEET' => make_url($css_dir . $stylesheet), 'STYLESHEET' => make_url($css_dir . $stylesheet),
'EXT_LINK_NEW_WIN' => $bb_cfg['ext_link_new_win'], 'EXT_LINK_NEW_WIN' => $bb_cfg['ext_link_new_win'],
@ -1126,7 +1125,7 @@ function setup_style()
'SITE_URL' => make_url('/'), 'SITE_URL' => make_url('/'),
)); ));
require TEMPLATES_DIR . '/' . $tpl_dir_name . '/tpl_config.php'; require_once TEMPLATES_DIR . '/' . $tpl_dir_name . '/tpl_config.php';
return array('template_name' => $tpl_dir_name); return array('template_name' => $tpl_dir_name);
} }

View file

@ -193,12 +193,8 @@ $template->assign_vars(array(
'AJAX_HTML_DIR' => AJAX_HTML_DIR, 'AJAX_HTML_DIR' => AJAX_HTML_DIR,
'ONLY_NEW_POSTS' => ONLY_NEW_POSTS,
'ONLY_NEW_TOPICS' => ONLY_NEW_TOPICS,
// Misc // Misc
'BOT_UID' => BOT_UID, 'BOT_UID' => BOT_UID,
'COOKIE_MARK' => COOKIE_MARK,
'SID' => $userdata['session_id'], 'SID' => $userdata['session_id'],
'SID_HIDDEN' => '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />', 'SID_HIDDEN' => '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />',

View file

@ -48,7 +48,7 @@
<div id="forums_wrap"> <div id="forums_wrap">
<!-- IF H_C_AL_MESS --> <!-- IF H_C_AL_MESS -->
<div class="row1 med tCenter pad_4 border bw_TRBL" style="margin: 4px 0;">{L_HIDE_CAT_MESS} &middot; <a href="index.php?sh=1">{L_SHOW_ALL}</a></div> <div class="row1 med tCenter pad_4 border bw_TRBL" style="margin: 4px 0;">{L_HIDE_CAT_MESS} &middot; <a href="{U_INDEX}?sh=1">{L_SHOW_ALL}</a></div>
<div class="spacer_2"></div> <div class="spacer_2"></div>
<!-- ENDIF --> <!-- ENDIF -->
@ -155,7 +155,7 @@
<!-- IF LOGGED_IN and SHOW_FORUMS --> <!-- IF LOGGED_IN and SHOW_FORUMS -->
<div id="mark_all_forums_read"> <div id="mark_all_forums_read">
<a href="{U_SEARCH_NEW}" class="med">{L_SEARCH_NEW}</a> &#0183; <a href="{U_SEARCH_NEW}" class="med">{L_SEARCH_NEW}</a> &#0183;
<a href="{U_INDEX}" class="med" onclick="setCookie('{COOKIE_MARK}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a> <a href="{U_INDEX}" class="med" onclick="setCookie('{#COOKIE_MARK#}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a>
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->

View file

@ -390,14 +390,14 @@ $(document).ready(function() {
<label> <label>
<input id="only_new_posts" type="checkbox" <!-- IF ONLY_NEW_POSTS_ON -->{CHECKED}<!-- ENDIF --> <input id="only_new_posts" type="checkbox" <!-- IF ONLY_NEW_POSTS_ON -->{CHECKED}<!-- ENDIF -->
onclick=" onclick="
user.set('only_new', ( this.checked ? {ONLY_NEW_POSTS} : 0 ), 365, true); user.set('only_new', ( this.checked ? {#ONLY_NEW_POSTS#} : 0 ), 365, true);
$('#only_new_topics').attr('checked', false); $('#only_new_topics').attr('checked', false);
" />{L_ONLY_NEW_POSTS} " />{L_ONLY_NEW_POSTS}
</label> </label>
<label> <label>
<input id="only_new_topics" type="checkbox" <!-- IF ONLY_NEW_TOPICS_ON -->{CHECKED}<!-- ENDIF --> <input id="only_new_topics" type="checkbox" <!-- IF ONLY_NEW_TOPICS_ON -->{CHECKED}<!-- ENDIF -->
onclick=" onclick="
user.set('only_new', ( this.checked ? {ONLY_NEW_TOPICS} : 0 ), 365, true); user.set('only_new', ( this.checked ? {#ONLY_NEW_TOPICS#} : 0 ), 365, true);
$('#only_new_posts').attr('checked', false); $('#only_new_posts').attr('checked', false);
" />{L_ONLY_NEW_TOPICS} " />{L_ONLY_NEW_TOPICS}
</label> </label>

View file

@ -10,7 +10,7 @@
<span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">{L_SELECT_INVERT}</a></span> <span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">{L_SELECT_INVERT}</a></span>
<!-- ENDIF --> <!-- ENDIF -->
&nbsp;&middot;&nbsp; &nbsp;&middot;&nbsp;
<!-- IF LOGGED_IN --><a href="#" class="med normal" onclick="setCookie('{COOKIE_MARK}', 'all_forums'); post2url ('{SITE_URL}'); return false;">{L_MARK_ALL_FORUMS_READ}</a><!-- ENDIF --> <!-- IF LOGGED_IN --><a href="#" class="med normal" onclick="setCookie('{#COOKIE_MARK#}', 'all_forums'); post2url ('{SITE_URL}'); return false;">{L_MARK_ALL_FORUMS_READ}</a><!-- ENDIF -->
</div> </div>
<!-- IF DISPLAY_AS_POSTS --> <!-- IF DISPLAY_AS_POSTS -->

View file

@ -80,7 +80,7 @@ td.topic_id { cursor: pointer; }
<a href="{U_INDEX}">{T_INDEX}</a>&nbsp;<em>&middot;</em> <a href="{U_INDEX}">{T_INDEX}</a>&nbsp;<em>&middot;</em>
<span id="show-edit-btn"><a href="#">{L_EDIT_MY_MESSAGE_LIST}</a></span> <span id="show-edit-btn"><a href="#">{L_EDIT_MY_MESSAGE_LIST}</a></span>
<span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">{L_SELECT_INVERT}</a></span><em>&middot;</em> <span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">{L_SELECT_INVERT}</a></span><em>&middot;</em>
<a href="#" class="med normal" onclick="setCookie('{COOKIE_MARK}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a> <a href="#" class="med normal" onclick="setCookie('{#COOKIE_MARK#}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a>
</div> </div>
</td> </td>
<td class="vBottom tLeft nowrap med"><b>{PAGINATION}</b></td> <td class="vBottom tLeft nowrap med"><b>{PAGINATION}</b></td>