diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-11 15:18:33 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-11 15:18:33 +0100 |
| commit | ae984025f0575554bb78fef9dcf66233748e97c8 (patch) | |
| tree | 633c4940c92626dfbd06efa70987f99e03bd0b28 /phpBB/adm | |
| parent | e02d92ac62fbe1dc08994444c18a7447d72c56e6 (diff) | |
| parent | 3850b05fbb9a292957e41023fcea797191442692 (diff) | |
| download | forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar.gz forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar.bz2 forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar.xz forums-ae984025f0575554bb78fef9dcf66233748e97c8.zip | |
Merge branch 'develop' into feature/event-dispatcher
* develop: (95 commits)
[ticket/9084] Explain the logic.
[ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
[ticket/9813] Only get posts table row count if we detected a fulltext index.
[feature/append_var] Adding test case
[ticket/7432] Delete redundant reference to "appropriate menu item".
[ticket/10618] Change phpBB 3 to phpBB 3.1.
[ticket/10685] Refactor template test defaults for php 5.4 compatibility.
[feature/append_var] Adding append_var template class function
[ticket/9813] Also use estimated row count of posts table for fulltext mysql.
[ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
[ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
[ticket/10653] Add ability to count table rows to database abstraction layer.
[ticket/9813] Use table status row count only if greater than 100000 or exact.
[ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
[ticket/8652] Comment for also updating forum watch table in user_notification.
[ticket/8652] Sending 2 emails on 2 replies
[ticket/10680] Add /phpBB/ext/* to .gitignore
[ticket/10672] Fix total post count language string in statistics and feed
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
[ticket/10453] Fixing spacing
...
Conflicts:
tests/bootstrap.php
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_users_overview.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.css | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/install_update.html | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 9237e45daf..1f10e7f66e 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -46,10 +46,6 @@ <dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd> </dl> <dl> - <dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt> - <dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" autocomplete="off" /></dd> -</dl> -<dl> <dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt> <dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off" /></dd> </dl> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 666f4921ba..ceda824e5a 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1007,11 +1007,11 @@ fieldset.submit-buttons legend { /* Input field styles ---------------------------------------- */ -input.radio, input.permissions-checkbox { +input.radio, input.checkbox, input.permissions-checkbox { width: auto !important; background-color: transparent; border: none; - cursor: default; + cursor: pointer; } input.full, diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 22d21d8314..818889c89b 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -43,6 +43,11 @@ <p>{WARNING_MSG}</p> </div> <!-- ENDIF --> + + <div class="errorbox" style="margin-top: 0;"> + <h3>{L_NOTICE}</h3> + <p>{L_BACKUP_NOTICE}</p> + </div> <form id="install_update" method="post" action="{U_ACTION}"> |