aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:05:40 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:05:40 +0100
commitf0eb18fffd11a97383c8ccf2ae7d2838939f09e2 (patch)
tree70790196713789f9cbe4609f9e841f7e69bb6f00 /phpBB/adm/style
parent021c186be91095397d4e76801738373989360a52 (diff)
parentac5995551ba941b2cb5d98cc86ffe921bedee200 (diff)
downloadforums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar
forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar.gz
forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar.bz2
forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar.xz
forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.zip
Merge commit 'release-3.0.6-RC2'
Diffstat (limited to 'phpBB/adm/style')
-rw-r--r--phpBB/adm/style/acp_captcha.html10
-rw-r--r--phpBB/adm/style/acp_database.html5
-rw-r--r--phpBB/adm/style/acp_inactive.html3
-rw-r--r--phpBB/adm/style/acp_logs.html5
-rw-r--r--phpBB/adm/style/acp_main.html1
-rw-r--r--phpBB/adm/style/acp_styles.html8
-rw-r--r--phpBB/adm/style/acp_users_warnings.html17
-rw-r--r--phpBB/adm/style/admin.css41
-rw-r--r--phpBB/adm/style/captcha_gd_acp.html12
-rw-r--r--phpBB/adm/style/captcha_recaptcha_acp.html10
-rw-r--r--phpBB/adm/style/install_update_diff.html24
11 files changed, 72 insertions, 64 deletions
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index 12f2251ab5..d31527b64d 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -54,10 +54,12 @@
</fieldset>
<!-- ENDIF -->
-<fieldset class="submit-buttons">
- <legend>{L_SUBMIT}</legend>
- <input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}" />&nbsp;
- <input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}" />&nbsp;
+<fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}" />&nbsp;
+ <input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}" />&nbsp;
+ </p>
{S_FORM_TOKEN}
</fieldset>
</form>
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
index e839fb1bda..de02ac6dbe 100644
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -71,8 +71,9 @@
<dl>
<dt><label for="where">{L_ACTION}:</label></dt>
<dd>
- <label><input type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
- <label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label></dd>
+ <label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
+ <label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label>
+ </dd>
</dl>
<dl>
<dt><label for="table">{L_TABLE_SELECT}:</label></dt>
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index ca65416421..3b20043dd9 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -41,6 +41,7 @@
<td style="vertical-align: top;">
{inactive.REASON}
<!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
+ </td>
<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
</tr>
<!-- BEGINELSE -->
@@ -67,7 +68,7 @@
<fieldset class="quick">
<select name="action">{S_INACTIVE_OPTIONS}</select>
<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
- <p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
+ <p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
{S_FORM_TOKEN}
</fieldset>
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index 6e93dba940..f2fa5dbc26 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -14,11 +14,12 @@
<!-- IF PAGINATION -->
<div class="pagination" style="float: right; margin: 15px 0 2px 0">
- <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+ <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
</div>
<!-- ENDIF -->
-<div class="clearfix">&nbsp;</div><br style="clear: both;" />
+<div class="clearfix">&nbsp;</div>
+<div><br style="clear: both;" /></div>
<!-- IF .log -->
<table cellspacing="1">
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 139dc825c1..46d65df7a2 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -232,6 +232,7 @@
<td style="vertical-align: top;">
{inactive.REASON}
<!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
+ </td>
</tr>
<!-- BEGINELSE -->
<tr>
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index c93d8b7d2d..5bde4008ad 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -20,7 +20,7 @@
</dl>
<dl>
<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt>
- <dd><select name="new_id">{S_REPLACE_OPTIONS}</select></dd>
+ <dd><select id="new_id" name="new_id">{S_REPLACE_OPTIONS}</select></dd>
</dl>
<p class="quick">
@@ -135,11 +135,11 @@
<div id="img_dimensions">
<dl>
<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
- <dd><input type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd>
+ <dd><input id="imgwidth" type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd>
</dl>
<dl>
<dt><label for="imgheight">{L_IMAGE_HEIGHT}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
- <dd><input type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
+ <dd><input id="imgheight" type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
</dl>
</div>
</fieldset>
@@ -266,7 +266,7 @@
<p>{L_TEMPLATE_CACHE_EXPLAIN}</p>
- <form name="acp_styles" method="post" action="{U_ACTION}">
+ <form id="acp_styles" method="post" action="{U_ACTION}">
<fieldset class="tabulated">
<legend>{L_TEMPLATE_CACHE}</legend>
diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html
index be9ef06825..d27f3800fc 100644
--- a/phpBB/adm/style/acp_users_warnings.html
+++ b/phpBB/adm/style/acp_users_warnings.html
@@ -7,17 +7,16 @@
<th>{L_REPORT_BY}</th>
<th>{L_TIME}</th>
<th>{L_FEEDBACK}</th>
- <!-- IF S_CLEARLOGS --><th>{L_MARK}</th><!-- ENDIF -->
+ <th>{L_MARK}</th>
</tr>
</thead>
<tbody>
<!-- BEGIN warn -->
<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
<td>{warn.USERNAME}</td>
<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
<td>{warn.ACTION}</td>
- <!-- IF S_CLEARLOGS --><td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td><!-- ENDIF -->
+ <td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td>
</tr>
<!-- END warn -->
</tbody>
@@ -28,12 +27,10 @@
</div>
<!-- ENDIF -->
- <!-- IF S_CLEARLOGS -->
- <fieldset class="quick">
- <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
- <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
- <p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
- </fieldset>
- <!-- ENDIF -->
+ <fieldset class="quick">
+ <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
+ <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
+ <p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
+ </fieldset>
{S_FORM_TOKEN}
</form>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index ad15036daa..9888ad3797 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -69,8 +69,8 @@ h2, caption {
h3, h4 {
font-family: "Trebuchet MS", Helvetica, sans-serif;
font-size: 1.20em;
- text-decoration: none;
- line-height: 1.20em;
+ text-decoration: none;
+ line-height: 1.20em;
margin-top: 25px;
}
@@ -97,8 +97,8 @@ hr {
height: 1px;
}
-.small {
- font-size: 0.85em;
+.small {
+ font-size: 0.85em;
}
/* General links */
@@ -195,7 +195,7 @@ li {
width: 76%;
margin: 0 0 0 3%;
min-height: 350px;
- overflow-y: auto;
+ overflow-x: auto;
}
.rtl #main {
@@ -203,8 +203,9 @@ li {
margin: 0 3% 0 0;
}
-* html #main {
- height: 350px;
+* html #main {
+ height: 350px;
+ overflow-x: visible;
}
#page-body.simple-page-body {
@@ -316,7 +317,7 @@ li {
padding: 0;
}
-span.corners-top, span.corners-bottom,
+span.corners-top, span.corners-bottom,
span.corners-top span, span.corners-bottom span {
font-size: 1px;
line-height: 1px;
@@ -795,7 +796,7 @@ label img {
fieldset.quick, p.quick {
margin: 0 0 5px;
- padding: 5px 0 0;
+ padding: 5px 0 0;
border: none;
background-color: transparent;
text-align: right;
@@ -848,7 +849,7 @@ select option.disabled {
}
/* Special case inputs */
-select#board_timezone,
+select#board_timezone,
select#full_folder_action {
width: 95%;
}
@@ -1245,12 +1246,12 @@ input.disabled {
}
/* Nice method for clearing floated blocks without having to insert any extra markup
- From http://www.positioniseverything.net/easyclearing.html
+ From http://www.positioniseverything.net/easyclearing.html
.clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
+ content: ".";
+ display: block;
+ height: 0;
+ clear: both;
visibility: hidden;
}*/
@@ -1317,7 +1318,7 @@ fieldset.permissions legend input{
height: 1.1em;
}
-/* Permission sections */
+/* Permission sections */
fieldset.permissions .permissions-simple {
text-align: left;
padding-top: 3px;
@@ -1528,7 +1529,7 @@ fieldset.permissions .padding {
background-image: url("../images/corners_right2.gif");
}
-.permissions-panel span.corners-top, .permissions-panel span.corners-bottom,
+.permissions-panel span.corners-top, .permissions-panel span.corners-bottom,
.permissions-panel span.corners-top span, .permissions-panel span.corners-bottom span {
font-size: 1px;
line-height: 1px;
@@ -1606,7 +1607,7 @@ fieldset.permissions .padding {
}
.permissions-panel th.row4 {
- background-image: none;
+ background-image: none;
background-color: #E4E8EB;
color: #536482;
border: none;
@@ -1614,8 +1615,8 @@ fieldset.permissions .padding {
.permissions-panel th a:link, .permissions-panel th a:hover, .permissions-panel th a:visited {
display: block;
- color: #FFFFFF;
- text-decoration: underline;
+ color: #FFFFFF;
+ text-decoration: underline;
}
.permissions-panel td.permissions-yes label:hover {
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
index be715401db..d0bb758cfe 100644
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ b/phpBB/adm/style/captcha_gd_acp.html
@@ -56,11 +56,13 @@
</fieldset>
-<fieldset class="submit-buttons">
- <legend>{L_SUBMIT}</legend>
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
- <input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />&nbsp;
+<fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
+ <input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />&nbsp;
+ </p>
<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
<input type="hidden" name="configure" value="1" />
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html
index fba59a9647..5b97cff984 100644
--- a/phpBB/adm/style/captcha_recaptcha_acp.html
+++ b/phpBB/adm/style/captcha_recaptcha_acp.html
@@ -34,10 +34,12 @@
<!-- INCLUDE {CAPTCHA_PREVIEW} -->
</fieldset>
-<fieldset class="submit-buttons">
- <legend>{L_SUBMIT}</legend>
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
+<fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
+ </p>
<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
<input type="hidden" name="configure" value="1" />
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index d794c5c516..b65a014312 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -15,9 +15,9 @@
// <![CDATA[
function resize_panel()
{
- var block = document.getElementById('codepanel');
+ var block = document.getElementById('codepanel');
var height;
-
+
if (window.innerHeight)
{
height = window.innerHeight - 150;
@@ -26,7 +26,7 @@ function resize_panel()
else
{
//whatever IE needs to do this
- }
+ }
}
window.onresize = resize_panel;
@@ -54,7 +54,7 @@ div#codepanel {
width: 100%;
}
<!-- ELSE -->
-div#codepanel {
+div#codepanel {
background-color: #eee;
}
<!-- ENDIF -->
@@ -149,10 +149,10 @@ table.hrdiff tbody th {
table.hrdiff tbody td.old {
border-left: 1px solid #999;
- border-right: 1px solid #999;
+ border-right: 1px solid #999;
}
table.hrdiff tbody td.new {
- border-right: 1px solid #999;
+ border-right: 1px solid #999;
}
table.hrdiff td pre {
@@ -238,18 +238,18 @@ table.hrdiff caption span {
</fieldset>
</form>
<!-- ENDIF -->
+<!-- IF S_DIFF_CONFLICT_FILE -->
+ <div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
+ <br style="clear: both;" />
+<!-- ENDIF -->
</div>
-
+
<div id="page-body">
<div id="acp">
<div class="panel" id="codepanel">
<span class="corners-top"><span></span></span>
<div id="diff_content">
<div id="main">
-
-<!-- IF S_DIFF_CONFLICT_FILE -->
- <div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
-<!-- ENDIF -->
{DIFF_CONTENT}
</div>
</div>
@@ -257,6 +257,6 @@ table.hrdiff caption span {
</div>
</div>
</div>
-
+
<!-- INCLUDE simple_footer.html --> \ No newline at end of file
generated by cgit v1.2.1 (git 2.21.0) at 2025-12-31 00:51:23 +0000