diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-27 17:43:55 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-27 17:43:55 +0000 |
| commit | 945afbc5fa427f6e6fa15f3e2f5c67969121b01e (patch) | |
| tree | 1742cf822c3339eec48d8d54e6ce08c51316b59b /phpBB/adm/style | |
| parent | b9da985180730252133699242ef639f91da2880e (diff) | |
| download | forums-945afbc5fa427f6e6fa15f3e2f5c67969121b01e.tar forums-945afbc5fa427f6e6fa15f3e2f5c67969121b01e.tar.gz forums-945afbc5fa427f6e6fa15f3e2f5c67969121b01e.tar.bz2 forums-945afbc5fa427f6e6fa15f3e2f5c67969121b01e.tar.xz forums-945afbc5fa427f6e6fa15f3e2f5c67969121b01e.zip | |
Unused Code inside function update_forum_data [Bug #6606]
Copy permissions protection for groups [Bug #6594]
HTML issues in ACP [Bug #6580, #6578]
Always send the correct encoding [related to bug #6576]
Mass email fixes for first loop iteration [Bug #6570]
Extension groups to be allowed in PM's and/or Posts [Bug #6558]
Extension allowance checking clarified (no longer using forum id 0 for private messaging)
Using request_var() array method for some variables [Bug #6556]
Added confirmation for deletion of ranks/smilies/icons/word censores [Bug #6548, #6530, #6512, #6466]
Only show postable forums in dropdown list for moving posts on forum deletion as well as correct re-indexing [Bug #6510, #6476, #6384]
Jabber password being password field in jabber settings screen [Bug #6478]
user activity language variable if viewing not own profile [Bug #6432]
Show moderator group/user-name colour [Bug #6402]
Log rank creation/updating/removing [Bug #6398]
Update check permission changed from a_ to a_board [Bug #6392]
git-svn-id: file:///svn/phpbb/trunk@6816 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/acp_attachments.html | 13 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_database.html | 21 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_groups.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_jabber.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_search.html | 9 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_words.html | 5 |
6 files changed, 30 insertions, 22 deletions
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 698ea77f01..d34a3a6a22 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -2,6 +2,10 @@ <a name="maincontent"></a> +<!-- IF U_BACK --> + <a href="{U_BACK}" style="float: right">« {L_BACK}</a> +<!-- ENDIF --> + <h1>{L_TITLE}</h1> <p>{L_TITLE_EXPLAIN}</p> @@ -234,17 +238,18 @@ </thead> <tbody> <!-- BEGIN groups --> - <!-- IF groups.S_ADD_SPACER --> + <!-- IF groups.S_ADD_SPACER and not groups.S_FIRST_ROW --> <tr> <td class="spacer" colspan="3"> </td> </tr> <!-- ENDIF --> <tr> - <td><a href="{groups.U_EDIT}">{groups.GROUP_NAME}</a> + <td><strong>{groups.GROUP_NAME}</strong> <!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>» {L_NOT_ALLOWED_IN_PM}</span><!-- ENDIF --> + <!-- IF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>» {L_ONLY_ALLOWED_IN_PM}</span><!-- ENDIF --> </td> <td>{groups.CATEGORY}</td> - <td align="center" valign="middle" style="white-space: nowrap;"> <a href="{groups.U_EDIT}">{L_EDIT}</a> | <a href="{groups.U_DELETE}">{L_DELETE}</a> | <a href="{groups.U_ACT_DEACT}">{groups.L_ACT_DEACT}</a> </td> + <td align="center" valign="middle" style="white-space: nowrap;"> <a href="{groups.U_EDIT}">{ICON_EDIT}</a> <a href="{groups.U_DELETE}">{ICON_DELETE}</a> </td> </tr> <!-- END groups --> </tbody> @@ -323,7 +328,7 @@ <form id="orphan" method="post" action="{U_ACTION}"> - <fieldset> + <fieldset class="tabulated"> <legend>{L_TITLE}</legend> <table cellspacing="1"> diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index 11daffa06d..8341d36c70 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -12,7 +12,7 @@ <fieldset> <legend>{L_RESTORE_OPTIONS}</legend> <dl> - <dt><label for="user">{L_SELECT_FILE}:</label></dt> + <dt><label for="file">{L_SELECT_FILE}:</label></dt> <dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd> </dl> @@ -53,26 +53,27 @@ <fieldset> <legend>{L_BACKUP_OPTIONS}</legend> <dl> - <dt><label for="user">{L_BACKUP_TYPE}:</label></dt> - <dd><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP} <input type="radio" name="type" class="radio" value="structure" id="type" /> {L_STRUCTURE_ONLY} <input type="radio" class="radio" name="type" value="data" id="type" /> {L_DATA_ONLY}</dd> + <dt><label for="type">{L_BACKUP_TYPE}:</label></dt> + <dd><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP} <input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY} <input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</dd> </dl> <dl> - <dt><label for="user">{L_FILE_TYPE}:</label></dt> + <dt><label for="method">{L_FILE_TYPE}:</label></dt> <dd><!-- BEGIN methods --> - <input name="method" id="method" type="radio" class="radio" value="{methods.TYPE}"<!-- IF methods.S_FIRST_ROW -->checked="checked"<!-- ENDIF --> /> {methods.TYPE} + <input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE} <!-- END methods --></dd> </dl> <dl> - <dt><label for="user">{L_ACTION}:</label></dt> - <dd><input type="radio" class="radio" name="where" value="store_and_download" id="where" checked="checked" /> {L_STORE_AND_DOWNLOAD} <input type="radio" class="radio" name="where" value="store" id="where" /> {L_STORE_LOCAL} <input type="radio" class="radio" name="where" value="download" id="where" /> {L_DOWNLOAD}</dd> + <dt><label for="where">{L_ACTION}:</label></dt> + <dd><input type="radio" class="radio" name="where" value="store_and_download" id="where" checked="checked" /> {L_STORE_AND_DOWNLOAD} <input type="radio" class="radio" name="where" value="store" /> {L_STORE_LOCAL} <input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</dd> </dl> <dl> - <dt><label for="user">{L_TABLE_SELECT}:</label></dt> - <dd><select id="table" name="table[]" size="10" multiple="true"> + <dt><label for="table">{L_TABLE_SELECT}:</label></dt> + <dd><select id="table" name="table[]" size="10" multiple="multiple"> <!-- BEGIN tables --> <option value="{tables.TABLE}">{tables.TABLE}</option> <!-- END tables --> - </select><br /><br /><div align="right"><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a><br /><a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></div></dd> + </select></dd> + <dd><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></dd> </dl> <p class="submit-buttons"> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index e2ed9d4529..753cfd0f63 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -44,7 +44,7 @@ <input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" /> <!-- ENDIF --> - <!-- IF S_ADD_GROUP --> + <!-- IF S_ADD_GROUP and S_GROUP_PERM --> <dl> <dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> <dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd> diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 22c38446f2..a94b25e52b 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -35,7 +35,7 @@ </dl> <dl> <dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt> - <dd><input type="text" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd> + <dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd> </dl> <dl> <dt><label for="jab_resource">{L_JAB_RESOURCE}:</label><br /><span>{L_JAB_RESOURCE_EXPLAIN}</span></dt> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 104f6362a8..c52a7ac2ec 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -91,10 +91,13 @@ <!-- BEGIN backend --> <!-- IF backend.S_STATS --> - + <form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}"> - {backend.S_HIDDEN_FIELDS} + <fieldset class="tabulated"> + + {backend.S_HIDDEN_FIELDS} + <legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend> <table cellspacing="1"> @@ -130,7 +133,7 @@ <!-- ENDIF --> </p> </fieldset> - + </form> <!-- END backend --> diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 17f734c29f..f0062e9600 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -52,7 +52,7 @@ <tr> <th>{L_WORD}</th> <th>{L_REPLACEMENT}</th> - <th colspan="2">{L_ACTION}</th> + <th>{L_ACTION}</th> </tr> </thead> <tbody> @@ -60,8 +60,7 @@ <!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td style="text-align: center;">{words.WORD}</td> <td style="text-align: center;">{words.REPLACEMENT}</td> - <td> <a href="{words.U_EDIT}">{L_EDIT}</a> </td> - <td> <a href="{words.U_DELETE}">{L_DELETE}</a> </td> + <td> <a href="{words.U_EDIT}">{ICON_EDIT}</a> <a href="{words.U_DELETE}">{ICON_DELETE}</a> </td> </tr> <!-- END words --> </tbody> |