mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
This commit is contained in:
commit
f49b8a0e3e
7 changed files with 9 additions and 9 deletions
|
@ -37,7 +37,7 @@ function insert_single(user)
|
|||
}
|
||||
// ]]>
|
||||
</script>
|
||||
<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
|
||||
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script>
|
||||
<!-- ENDIF -->
|
||||
|
||||
<h2 class="solo">{L_FIND_USERNAME}</h2>
|
||||
|
|
|
@ -81,8 +81,8 @@
|
|||
|
||||
// ]]>
|
||||
</script>
|
||||
<script type="text/javascript" src="{T_TEMPLATE_PATH}/styleswitcher.js"></script>
|
||||
<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
|
||||
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/styleswitcher.js"></script>
|
||||
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script>
|
||||
|
||||
<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
|
||||
<link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
// ]]>
|
||||
</script>
|
||||
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
|
||||
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
|
||||
|
||||
<!-- IF S_BBCODE_ALLOWED -->
|
||||
<div id="colour_palette" style="display: none;">
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
var text_name = 'message';
|
||||
// ]]>
|
||||
</script>
|
||||
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
|
||||
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
|
||||
|
||||
<h2>{L_SMILIES}</h2>
|
||||
<div class="panel">
|
||||
|
|
|
@ -46,8 +46,8 @@
|
|||
|
||||
// ]]>
|
||||
</script>
|
||||
<script type="text/javascript" src="{T_TEMPLATE_PATH}/styleswitcher.js"></script>
|
||||
<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
|
||||
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/styleswitcher.js"></script>
|
||||
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script>
|
||||
|
||||
<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
|
||||
<link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
// ]]>
|
||||
</script>
|
||||
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
|
||||
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
|
||||
|
||||
<!-- IF S_BBCODE_ALLOWED -->
|
||||
<input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
var text_name = 'message';
|
||||
// ]]>
|
||||
</script>
|
||||
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
|
||||
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
|
||||
|
||||
<table width="100%" cellspacing="1" cellpadding="4" border="0">
|
||||
<tr>
|
||||
|
|
Loading…
Add table
Reference in a new issue