aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-01-16 16:15:31 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-01-16 16:15:31 +0100
commit19b6ea8cf748034c041f88370bac620924fe1d7b (patch)
tree83fc9d93e6ea24db857a0aaf6e8948cbd4982ca9 /phpBB/adm/style
parent37014abd022be4f7824a590b93a329f74aef442c (diff)
parentf63e115ae90edb9d65bc3bb23fc4d3c0ce81b763 (diff)
downloadforums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar
forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar.gz
forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar.bz2
forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar.xz
forums-19b6ea8cf748034c041f88370bac620924fe1d7b.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (205 commits) [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/11201] Remove database column on update [ticket/10431] Remove .left class from reply-all [ticket/10431] Remove reply-all custom css [ticket/10431] Adjustments for large buttons [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11201] Remove MSN/WLM fields [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone ...
Diffstat (limited to 'phpBB/adm/style')
-rw-r--r--phpBB/adm/style/acp_forums.html1
-rw-r--r--phpBB/adm/style/acp_main.html4
-rw-r--r--phpBB/adm/style/acp_users_overview.html1
-rw-r--r--phpBB/adm/style/acp_users_profile.html4
-rw-r--r--phpBB/adm/style/ajax.js80
-rw-r--r--phpBB/adm/style/install_header.html6
-rw-r--r--phpBB/adm/style/install_update_diff.html2
-rw-r--r--phpBB/adm/style/overall_footer.html2
-rw-r--r--phpBB/adm/style/overall_header.html1
-rw-r--r--phpBB/adm/style/simple_footer.html1
-rw-r--r--phpBB/adm/style/simple_header.html1
-rw-r--r--phpBB/adm/style/timezone.js4
12 files changed, 53 insertions, 54 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 9a3706c2f0..d6c06bf6d8 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -241,6 +241,7 @@
<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
</dl>
+ <!-- EVENT acp_forums_normal_settings_append -->
</fieldset>
<fieldset>
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 8b591294d4..b644862ce1 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -76,6 +76,8 @@
</div>
<!-- ENDIF -->
+ <!-- EVENT acp_main_notice_after -->
+
<table cellspacing="1">
<caption>{L_FORUM_STATS}</caption>
<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
@@ -202,6 +204,8 @@
<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
</dl>
</form>
+
+ <!-- EVENT acp_main_actions_append -->
</fieldset>
<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index b7e3a9822e..a8e862c141 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -53,6 +53,7 @@
<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
</dl>
+<!-- EVENT acp_users_overview_options_append -->
<p class="quick">
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 3232e8d1f5..36e9f340d4 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -11,10 +11,6 @@
<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
</dl>
<dl>
- <dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
- <dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
- </dl>
- <dl>
<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
</dl>
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 3ccb368665..294a35b615 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -2,11 +2,11 @@
"use strict";
-var img_templates = {
+var imgTemplates = {
up: $('.template-up-img'),
- up_disabled: $('.template-up-img-disabled'),
+ upDisabled: $('.template-up-img-disabled'),
down: $('.template-down-img'),
- down_disabled: $('.template-down-img-disabled')
+ downDisabled: $('.template-down-img-disabled')
};
/**
@@ -15,20 +15,19 @@ var img_templates = {
* an item is moved up. It moves the row up or down, and deactivates /
* activates any up / down icons that require it (the ones at the top or bottom).
*/
-phpbb.add_ajax_callback('row_down', function() {
+phpbb.addAjaxCallback('row_down', function() {
var el = $(this),
tr = el.parents('tr'),
- tr_swap = tr.next();
+ trSwap = tr.next();
/*
* If the element was the first one, we have to:
* - Add the up-link to the row we moved
* - Remove the up-link on the next row
*/
- if (tr.is(':first-child'))
- {
- var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
- tr.find('.up').html(up_img);
+ if (tr.is(':first-child')) {
+ var upImg = imgTemplates.up.clone().attr('href', tr.attr('data-up'));
+ tr.find('.up').html(upImg);
phpbb.ajaxify({
selector: tr.find('.up').children('a'),
@@ -36,45 +35,43 @@ phpbb.add_ajax_callback('row_down', function() {
overlay: false
});
- tr_swap.find('.up').html(img_templates.up_disabled.clone());
+ trSwap.find('.up').html(imgTemplates.upDisabled.clone());
}
- tr.insertAfter(tr_swap);
+ tr.insertAfter(trSwap);
/*
* As well as:
* - Remove the down-link on the moved row, if it is now the last row
* - Add the down-link to the next row, if it was the last row
*/
- if (tr.is(':last-child'))
- {
- tr.find('.down').html(img_templates.down_disabled.clone());
+ if (tr.is(':last-child')) {
+ tr.find('.down').html(imgTemplates.downDisabled.clone());
- var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down'));
- tr_swap.find('.down').html(down_img);
+ var downImg = imgTemplates.down.clone().attr('href', trSwap.attr('data-down'));
+ trSwap.find('.down').html(downImg);
phpbb.ajaxify({
- selector: tr_swap.find('.down').children('a'),
+ selector: trSwap.find('.down').children('a'),
callback: 'row_down',
overlay: false
});
}
});
-phpbb.add_ajax_callback('row_up', function() {
+phpbb.addAjaxCallback('row_up', function() {
var el = $(this),
tr = el.parents('tr'),
- tr_swap = tr.prev();
+ trSwap = tr.prev();
/*
* If the element was the last one, we have to:
* - Add the down-link to the row we moved
* - Remove the down-link on the next row
*/
- if (tr.is(':last-child'))
- {
- var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
- tr.find('.down').html(down_img);
+ if (tr.is(':last-child')) {
+ var downImg = imgTemplates.down.clone().attr('href', tr.attr('data-down'));
+ tr.find('.down').html(downImg);
phpbb.ajaxify({
selector: tr.find('.down').children('a'),
@@ -82,25 +79,24 @@ phpbb.add_ajax_callback('row_up', function() {
overlay: false
});
- tr_swap.find('.down').html(img_templates.down_disabled.clone());
+ trSwap.find('.down').html(imgTemplates.downDisabled.clone());
}
- tr.insertBefore(tr_swap);
+ tr.insertBefore(trSwap);
/*
* As well as:
* - Remove the up-link on the moved row, if it is now the first row
* - Add the up-link to the previous row, if it was the first row
*/
- if (tr.is(':first-child'))
- {
- tr.find('.up').html(img_templates.up_disabled.clone());
+ if (tr.is(':first-child')) {
+ tr.find('.up').html(imgTemplates.upDisabled.clone());
- var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up'));
- tr_swap.find('.up').html(up_img);
+ var upImg = imgTemplates.up.clone().attr('href', trSwap.attr('data-up'));
+ trSwap.find('.up').html(upImg);
phpbb.ajaxify({
- selector: tr_swap.find('.up').children('a'),
+ selector: trSwap.find('.up').children('a'),
callback: 'row_up',
overlay: false
});
@@ -112,29 +108,26 @@ phpbb.add_ajax_callback('row_up', function() {
* It does this by replacing the text, and replacing all instances of "activate"
* in the href with "deactivate", and vice versa.
*/
-phpbb.add_ajax_callback('activate_deactivate', function(res) {
+phpbb.addAjaxCallback('activate_deactivate', function(res) {
var el = $(this),
- new_href = el.attr('href');
+ newHref = el.attr('href');
el.text(res.text);
- if (new_href.indexOf('deactivate') !== -1)
- {
- new_href = new_href.replace('deactivate', 'activate')
- }
- else
- {
- new_href = new_href.replace('activate', 'deactivate')
+ if (newHref.indexOf('deactivate') !== -1) {
+ newHref = newHref.replace('deactivate', 'activate')
+ } else {
+ newHref = newHref.replace('activate', 'deactivate')
}
- el.attr('href', new_href);
+ el.attr('href', newHref);
});
/**
* The removes the parent row of the link or form that triggered the callback,
* and is good for stuff like the removal of forums.
*/
-phpbb.add_ajax_callback('row_delete', function() {
+phpbb.addAjaxCallback('row_delete', function() {
$(this).parents('tr').remove();
});
@@ -145,8 +138,7 @@ $('[data-ajax]').each(function() {
ajax = $this.attr('data-ajax'),
fn;
- if (ajax !== 'false')
- {
+ if (ajax !== 'false') {
fn = (ajax !== 'true') ? ajax : null;
phpbb.ajaxify({
selector: this,
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 6826654ded..5631b83e17 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -5,7 +5,7 @@
<!-- IF META -->{META}<!-- ENDIF -->
<title>{PAGE_TITLE}</title>
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
<script type="text/javascript">
// <![CDATA[
@@ -49,7 +49,7 @@ function dE(n, s, type)
</form>
<!-- ENDIF -->
</div>
-
+
<div id="page-body">
<div id="tabs">
<ul>
@@ -73,5 +73,5 @@ function dE(n, s, type)
<!-- END l_block2 -->
</ul>
</div>
-
+
<div id="main" class="install-body">
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index ecdc40e157..1f30fe4d13 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -5,7 +5,7 @@
<!-- IF META -->{META}<!-- ENDIF -->
<title>{PAGE_TITLE}</title>
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
<script type="text/javascript">
// <![CDATA[
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 2bc9ee52d7..2a8b46d458 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -42,5 +42,7 @@
<!-- INCLUDEJS ajax.js -->
{SCRIPTS}
+<!-- EVENT acp_overall_footer_after -->
+
</body>
</html>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index f7902e6d2e..8170931221 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -155,6 +155,7 @@ function switch_menu()
// ]]>
</script>
+<!-- EVENT acp_overall_header_head_append -->
</head>
<body class="{S_CONTENT_DIRECTION}">
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 1d5c62b0a3..906a9bebed 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -18,6 +18,7 @@
<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- EVENT acp_simple_footer_after -->
</body>
</html>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 0ba445ca2a..6e0c360600 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -101,6 +101,7 @@ function find_username(url)
// ]]>
</script>
+<!-- EVENT acp_simple_header_head_append -->
</head>
<body class="{S_CONTENT_DIRECTION}">
diff --git a/phpBB/adm/style/timezone.js b/phpBB/adm/style/timezone.js
index 4556ea5f94..419d37c34f 100644
--- a/phpBB/adm/style/timezone.js
+++ b/phpBB/adm/style/timezone.js
@@ -1,11 +1,11 @@
(function($) { // Avoid conflicts with other libraries
$('#tz_date').change(function() {
- phpbb.timezone_switch_date(false);
+ phpbb.timezoneSwitchDate(false);
});
$(document).ready(
- phpbb.timezone_enable_date_selection
+ phpbb.timezoneEnableDateSelection
);
})(jQuery); // Avoid conflicts with other libraries
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-24 20:00:27 +0000