diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-12-22 20:01:22 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-12-22 20:02:44 +0100 |
| commit | c02fc0f63fb8098cd4096481ad27b31f8069d5d1 (patch) | |
| tree | 2cfea674e02fe8d3b4254efc57ffaa2430075f3a /phpBB | |
| parent | d033597c5d34fa27e4e07943882ca3d7e1d3926e (diff) | |
| download | forums-c02fc0f63fb8098cd4096481ad27b31f8069d5d1.tar forums-c02fc0f63fb8098cd4096481ad27b31f8069d5d1.tar.gz forums-c02fc0f63fb8098cd4096481ad27b31f8069d5d1.tar.bz2 forums-c02fc0f63fb8098cd4096481ad27b31f8069d5d1.tar.xz forums-c02fc0f63fb8098cd4096481ad27b31f8069d5d1.zip | |
[ticket/14378] Use consistent template variable paths
PHPBB3-14378
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/installer_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/installer_header.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/installer_update_file_status.html | 10 | ||||
| -rw-r--r-- | phpBB/phpbb/install/controller/helper.php | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html index 44010b5589..63aebec993 100644 --- a/phpBB/adm/style/installer_footer.html +++ b/phpBB/adm/style/installer_footer.html @@ -13,7 +13,7 @@ <script type="text/javascript" src="{T_JQUERY_LINK}"></script> <!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF --> -<script type="text/javascript" src="{T_ASSETS_PATH}javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <!-- INCLUDEJS admin.js --> {$SCRIPTS} diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html index c4c3427fdb..775caa7c67 100644 --- a/phpBB/adm/style/installer_header.html +++ b/phpBB/adm/style/installer_header.html @@ -6,7 +6,7 @@ <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> - <link href="{T_TEMPLATE_PATH}admin.css" rel="stylesheet" type="text/css" media="screen" /> + <link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" /> </head> <body class="{S_CONTENT_DIRECTION} nojs"> diff --git a/phpBB/adm/style/installer_update_file_status.html b/phpBB/adm/style/installer_update_file_status.html index 9f15c402e9..a27bfa6a44 100644 --- a/phpBB/adm/style/installer_update_file_status.html +++ b/phpBB/adm/style/installer_update_file_status.html @@ -4,7 +4,7 @@ <p>{L_FILES_DELETED_EXPLAIN}</p> <fieldset id="deleted"> - <legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend> + <legend><img src="{T_IMAGE_PATH}/icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend> <!-- BEGIN deleted --> <dl> <dt style="width: 100%;"><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<!-- ENDIF --><strong>{deleted.FILE_PART}</strong></dt> @@ -20,7 +20,7 @@ <p>{L_FILES_CONFLICT_EXPLAIN}</p> <fieldset id="conflict"> - <legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend> + <legend><img src="{T_IMAGE_PATH}/file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend> <!-- BEGIN conflict --> <dl> <dt style="width: 100%;"><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<!-- ENDIF --><strong>{conflict.FILE_PART}</strong></dt> @@ -36,7 +36,7 @@ <p>{L_FILES_MODIFIED_EXPLAIN}</p> <fieldset id="modified"> - <legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend> + <legend><img src="{T_IMAGE_PATH}/file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend> <!-- BEGIN modified --> <dl> <dt style="width: 100%;"><!-- IF modified.DIR_PART -->{modified.DIR_PART}<!-- ENDIF --><strong>{modified.FILE_PART}</strong></dt> @@ -52,7 +52,7 @@ <p>{L_FILES_NEW_EXPLAIN}</p> <fieldset id="new_files" style="display: none;"> - <legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend> + <legend><img src="{T_IMAGE_PATH}/file_new.gif" alt="{L_STATUS_NEW}" /></legend> <!-- BEGIN new --> <dl> <dt style="width: 100%;"><!-- IF new.DIR_PART -->{new.DIR_PART}<!-- ENDIF --><strong>{new.FILE_PART}</strong> @@ -69,7 +69,7 @@ <p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p> <fieldset id="not_modified" style="display: none;"> - <legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend> + <legend><img src="{T_IMAGE_PATH}/file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend> <!-- BEGIN not_modified --> <dl> <dt style="width: 100%;"><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<!-- ENDIF --><strong>{not_modified.FILE_PART}</strong></dt> diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php index ed817f7396..2dad42b4b6 100644 --- a/phpBB/phpbb/install/controller/helper.php +++ b/phpBB/phpbb/install/controller/helper.php @@ -270,10 +270,10 @@ class helper 'L_SELECT_LANG' => $this->language->lang('SELECT_LANG'), 'L_SKIP' => $this->language->lang('SKIP'), 'PAGE_TITLE' => $this->language->lang($page_title), - 'T_IMAGE_PATH' => $this->path_helper->get_web_root_path() . $path . 'images/', + 'T_IMAGE_PATH' => $this->path_helper->get_web_root_path() . $path . 'images', 'T_JQUERY_LINK' => $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery.min.js', - 'T_TEMPLATE_PATH' => $this->path_helper->get_web_root_path() . $path . 'style/', - 'T_ASSETS_PATH' => $this->path_helper->get_web_root_path() . $path . '../assets/', + 'T_TEMPLATE_PATH' => $this->path_helper->get_web_root_path() . $path . 'style', + 'T_ASSETS_PATH' => $this->path_helper->get_web_root_path() . $path . '../assets', 'S_CONTENT_DIRECTION' => $this->language->lang('DIRECTION'), 'S_CONTENT_FLOW_BEGIN' => ($this->language->lang('DIRECTION') === 'ltr') ? 'left' : 'right', |