diff options
author | Bart van Bragt <bartvb@users.sourceforge.net> | 2001-12-10 16:52:16 +0000 |
---|---|---|
committer | Bart van Bragt <bartvb@users.sourceforge.net> | 2001-12-10 16:52:16 +0000 |
commit | 7c0e6ff4db26992204005c231fa76806da83e613 (patch) | |
tree | ae4b6bc5131d19da6915247066a2d1b4ba3cc2f1 | |
parent | 3f1678141d6e81eab5afb27fa4d7af9a8103b0e8 (diff) | |
download | forums-7c0e6ff4db26992204005c231fa76806da83e613.tar forums-7c0e6ff4db26992204005c231fa76806da83e613.tar.gz forums-7c0e6ff4db26992204005c231fa76806da83e613.tar.bz2 forums-7c0e6ff4db26992204005c231fa76806da83e613.tar.xz forums-7c0e6ff4db26992204005c231fa76806da83e613.zip |
Fixed #490848 and introduced $current_template_path
git-svn-id: file:///svn/phpbb/trunk@1547 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r-- | phpBB/includes/functions.php | 3 | ||||
-rw-r--r-- | phpBB/templates/subSilver/posting_body.tpl | 2 | ||||
-rw-r--r-- | phpBB/templates/subSilver/subSilver.cfg | 114 |
3 files changed, 61 insertions, 58 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ba500f1daa..8d5915368c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -328,6 +328,7 @@ function setup_style($style) if( $template ) { + $current_template_path = $template_path . $template_name . '/'; @include($phpbb_root_path . $template_path . $template_name . '/' . $template_name . '.cfg'); if( !defined("TEMPLATE_CONFIG") ) @@ -1176,4 +1177,4 @@ function message_die($msg_code, $msg_text = "", $msg_title = "", $err_line = "", } -?>
\ No newline at end of file +?> diff --git a/phpBB/templates/subSilver/posting_body.tpl b/phpBB/templates/subSilver/posting_body.tpl index 498036c1dc..50fd95c0c8 100644 --- a/phpBB/templates/subSilver/posting_body.tpl +++ b/phpBB/templates/subSilver/posting_body.tpl @@ -331,7 +331,7 @@ function storeCaret(textEl) { <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">Default</option> <option style="color:darkred; background-color: #DEE3E7" value="darkred" class="genmed">Dark Red</option> - <option style="color:red; background-color: #DEE3E7" value="darkred" class="genmed">Red</option> + <option style="color:red; background-color: #DEE3E7" value="red" class="genmed">Red</option> <option style="color:orange; background-color: #DEE3E7" value="orange" class="genmed">Orange</option> <option style="color:brown; background-color: #DEE3E7" value="brown" class="genmed">Brown</option> <option style="color:yellow; background-color: #DEE3E7" value="yellow" class="genmed">Yellow</option> diff --git a/phpBB/templates/subSilver/subSilver.cfg b/phpBB/templates/subSilver/subSilver.cfg index 9dd52dcc3e..66608a6e6b 100644 --- a/phpBB/templates/subSilver/subSilver.cfg +++ b/phpBB/templates/subSilver/subSilver.cfg @@ -21,73 +21,75 @@ define(TEMPLATE_CONFIG, TRUE); // by the template // +$current_template_images = $current_template_path . "/images"; + $smilies_url = "images/smiles"; -$images['icon_quote'] = "templates/subSilver/images/icon_quote.gif"; -$images['icon_edit'] = "templates/subSilver/images/icon_edit.gif"; -$images['icon_search'] = "templates/subSilver/images/icon_search.gif"; -$images['icon_profile'] = "templates/subSilver/images/icon_profile.gif"; -$images['icon_pm'] = "templates/subSilver/images/icon_pm.gif"; -$images['icon_email'] = "templates/subSilver/images/icon_email.gif"; -$images['icon_delpost'] = "templates/subSilver/images/icon_delete.gif"; -$images['icon_ip'] = "templates/subSilver/images/icon_ip.gif"; -$images['icon_www'] = "templates/subSilver/images/icon_www.gif"; -$images['icon_icq'] = "templates/subSilver/images/icon_icq_add.gif"; -$images['icon_aim'] = "templates/subSilver/images/icon_aim.gif"; -$images['icon_yim'] = "templates/subSilver/images/icon_yim.gif"; -$images['icon_msnm'] = "templates/subSilver/images/icon_msnm.gif"; -$images['icon_minipost'] = "templates/subSilver/images/icon_minipost.gif"; -$images['icon_gotopost'] = "templates/subSilver/images/icon_minipost.gif"; -$images['icon_minipost_new'] = "templates/subSilver/images/icon_minipost_new.gif"; -$images['icon_latest_reply'] = "templates/subSilver/images/icon_latest_reply.gif"; -$images['icon_newest_reply'] = "templates/subSilver/images/icon_newest_reply.gif"; +$images['icon_quote'] = "$current_template_images/icon_quote.gif"; +$images['icon_edit'] = "$current_template_images/icon_edit.gif"; +$images['icon_search'] = "$current_template_images/icon_search.gif"; +$images['icon_profile'] = "$current_template_images/icon_profile.gif"; +$images['icon_pm'] = "$current_template_images/icon_pm.gif"; +$images['icon_email'] = "$current_template_images/icon_email.gif"; +$images['icon_delpost'] = "$current_template_images/icon_delete.gif"; +$images['icon_ip'] = "$current_template_images/icon_ip.gif"; +$images['icon_www'] = "$current_template_images/icon_www.gif"; +$images['icon_icq'] = "$current_template_images/icon_icq_add.gif"; +$images['icon_aim'] = "$current_template_images/icon_aim.gif"; +$images['icon_yim'] = "$current_template_images/icon_yim.gif"; +$images['icon_msnm'] = "$current_template_images/icon_msnm.gif"; +$images['icon_minipost'] = "$current_template_images/icon_minipost.gif"; +$images['icon_gotopost'] = "$current_template_images/icon_minipost.gif"; +$images['icon_minipost_new'] = "$current_template_images/icon_minipost_new.gif"; +$images['icon_latest_reply'] = "$current_template_images/icon_latest_reply.gif"; +$images['icon_newest_reply'] = "$current_template_images/icon_newest_reply.gif"; -$images['forum'] = "templates/subSilver/images/folder_big.gif"; -$images['forum_new'] = "templates/subSilver/images/folder_new_big.gif"; -$images['forum_locked'] = "templates/subSilver/images/folder_locked_big.gif"; +$images['forum'] = "$current_template_images/folder_big.gif"; +$images['forum_new'] = "$current_template_images/folder_new_big.gif"; +$images['forum_locked'] = "$current_template_images/folder_locked_big.gif"; -$images['folder'] = "templates/subSilver/images/folder.gif"; -$images['folder_new'] = "templates/subSilver/images/folder_new.gif"; -$images['folder_hot'] = "templates/subSilver/images/folder_hot.gif"; -$images['folder_hot_new'] = "templates/subSilver/images/folder_new_hot.gif"; -$images['folder_locked'] = "templates/subSilver/images/folder_lock.gif"; -$images['folder_locked_new'] = "templates/subSilver/images/folder_lock_new.gif"; -$images['folder_sticky'] = "templates/subSilver/images/folder_sticky.gif"; -$images['folder_sticky_new'] = "templates/subSilver/images/folder_sticky_new.gif"; -$images['folder_announce'] = "templates/subSilver/images/folder_announce.gif"; -$images['folder_announce_new'] = "templates/subSilver/images/folder_announce_new.gif"; +$images['folder'] = "$current_template_images/folder.gif"; +$images['folder_new'] = "$current_template_images/folder_new.gif"; +$images['folder_hot'] = "$current_template_images/folder_hot.gif"; +$images['folder_hot_new'] = "$current_template_images/folder_new_hot.gif"; +$images['folder_locked'] = "$current_template_images/folder_lock.gif"; +$images['folder_locked_new'] = "$current_template_images/folder_lock_new.gif"; +$images['folder_sticky'] = "$current_template_images/folder_sticky.gif"; +$images['folder_sticky_new'] = "$current_template_images/folder_sticky_new.gif"; +$images['folder_announce'] = "$current_template_images/folder_announce.gif"; +$images['folder_announce_new'] = "$current_template_images/folder_announce_new.gif"; -$images['post_new'] = "templates/subSilver/images/post.gif"; -$images['post_locked'] = "templates/subSilver/images/reply-locked.gif"; -$images['reply_new'] = "templates/subSilver/images/reply.gif"; -$images['reply_locked'] = "templates/subSilver/images/reply-locked.gif"; +$images['post_new'] = "$current_template_images/post.gif"; +$images['post_locked'] = "$current_template_images/reply-locked.gif"; +$images['reply_new'] = "$current_template_images/reply.gif"; +$images['reply_locked'] = "$current_template_images/reply-locked.gif"; -$images['pm_inbox'] = "templates/subSilver/images/msg_inbox.gif"; -$images['pm_outbox'] = "templates/subSilver/images/msg_outbox.gif"; -$images['pm_savebox'] = "templates/subSilver/images/msg_savebox.gif"; -$images['pm_sentbox'] = "templates/subSilver/images/msg_sentbox.gif"; -$images['pm_readmsg'] = "templates/subSilver/images/folder.gif"; -$images['pm_unreadmsg'] = "templates/subSilver/images/folder_new.gif"; -$images['pm_replymsg'] = "templates/subSilver/images/reply.gif"; -$images['pm_postmsg'] = "templates/subSilver/images/msg_newpost.gif"; -$images['pm_quotemsg'] = "templates/subSilver/images/icon_quote.gif"; -$images['pm_editmsg'] = "templates/subSilver/images/icon_edit.gif"; +$images['pm_inbox'] = "$current_template_images/msg_inbox.gif"; +$images['pm_outbox'] = "$current_template_images/msg_outbox.gif"; +$images['pm_savebox'] = "$current_template_images/msg_savebox.gif"; +$images['pm_sentbox'] = "$current_template_images/msg_sentbox.gif"; +$images['pm_readmsg'] = "$current_template_images/folder.gif"; +$images['pm_unreadmsg'] = "$current_template_images/folder_new.gif"; +$images['pm_replymsg'] = "$current_template_images/reply.gif"; +$images['pm_postmsg'] = "$current_template_images/msg_newpost.gif"; +$images['pm_quotemsg'] = "$current_template_images/icon_quote.gif"; +$images['pm_editmsg'] = "$current_template_images/icon_edit.gif"; $images['pm_new_msg'] = ""; $images['pm_no_new_msg'] = ""; $images['topic_watch'] = ""; $images['topic_un_watch'] = ""; -$images['topic_mod_lock'] = "templates/subSilver/images/topic_lock.gif"; -$images['topic_mod_unlock'] = "templates/subSilver/images/topic_unlock.gif"; -$images['topic_mod_split'] = "templates/subSilver/images/topic_split.gif"; -$images['topic_mod_move'] = "templates/subSilver/images/topic_move.gif"; -$images['topic_mod_delete'] = "templates/subSilver/images/topic_delete.gif"; +$images['topic_mod_lock'] = "$current_template_images/topic_lock.gif"; +$images['topic_mod_unlock'] = "$current_template_images/topic_unlock.gif"; +$images['topic_mod_split'] = "$current_template_images/topic_split.gif"; +$images['topic_mod_move'] = "$current_template_images/topic_move.gif"; +$images['topic_mod_delete'] = "$current_template_images/topic_delete.gif"; -$images['voting_graphic'][0] = "templates/subSilver/images/voting_bar.gif"; -$images['voting_graphic'][1] = "templates/subSilver/images/voting_bar.gif"; -$images['voting_graphic'][2] = "templates/subSilver/images/voting_bar.gif"; -$images['voting_graphic'][3] = "templates/subSilver/images/voting_bar.gif"; -$images['voting_graphic'][4] = "templates/subSilver/images/voting_bar.gif"; +$images['voting_graphic'][0] = "$current_template_images/voting_bar.gif"; +$images['voting_graphic'][1] = "$current_template_images/voting_bar.gif"; +$images['voting_graphic'][2] = "$current_template_images/voting_bar.gif"; +$images['voting_graphic'][3] = "$current_template_images/voting_bar.gif"; +$images['voting_graphic'][4] = "$current_template_images/voting_bar.gif"; $images['auth_can_read'] = ""; $images['auth_cannot_read'] = ""; @@ -108,4 +110,4 @@ $images['auth_mod'] = ""; $board_config['vote_graphic_length'] = 205; $board_config['privmsg_graphic_length'] = 175; -?>
\ No newline at end of file +?> |