diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-26 18:41:26 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-26 18:41:26 +0000 |
| commit | fc295f5f0eef6b761c7c2d825bc01501e8882a25 (patch) | |
| tree | 8a2b6d3519dffe95bb03422ecdfe58d90a45eeff /phpBB/styles | |
| parent | 78f16d70a292afee3470710669d4082d5b6212eb (diff) | |
| download | forums-fc295f5f0eef6b761c7c2d825bc01501e8882a25.tar forums-fc295f5f0eef6b761c7c2d825bc01501e8882a25.tar.gz forums-fc295f5f0eef6b761c7c2d825bc01501e8882a25.tar.bz2 forums-fc295f5f0eef6b761c7c2d825bc01501e8882a25.tar.xz forums-fc295f5f0eef6b761c7c2d825bc01501e8882a25.zip | |
checking in some fixes. ;) Most of them are really minor, including:
- correctly enter report notification into db
- fix double-quote pm issue
git-svn-id: file:///svn/phpbb/trunk@7409 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles')
7 files changed, 22 insertions, 12 deletions
diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html index 1bb23b8eac..de46720baf 100644 --- a/phpBB/styles/prosilver/template/attachment.html +++ b/phpBB/styles/prosilver/template/attachment.html @@ -7,25 +7,23 @@ <!-- IF _file.S_THUMBNAIL --> <dl class="thumbnail"> <dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt> - <!-- IF _file.COMMENT --><dd> {_file.COMMENT}</dd><!-- ENDIF --> </dl> <!-- ENDIF --> <!-- IF _file.S_IMAGE --> - - <img src="{_file.U_DOWNLOAD_LINK}" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /> - - <p>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</p> + <dl class="file"> + <dt><img src="{_file.U_DOWNLOAD_LINK}" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt> + <!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF --> + <dd>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd> + </dl> <!-- ENDIF --> <!-- IF _file.S_FILE --> <dl class="file"> <dt><!-- IF _file.UPLOAD_ICON -->{_file.UPLOAD_ICON} <!-- ENDIF --><a class="postlink" href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a></dt> - <!-- IF not _file.S_THUMBNAIL and _file.COMMENT --> - <dd><em>{_file.COMMENT}</em></dd> - <!-- ENDIF --> + <!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF --> <dd>({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd> </dl> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 7e34ee2702..1be69178dd 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -62,7 +62,7 @@ <th>{L_REPORT_BY}</th> <th style="text-align: center">{L_IP}</th> <th style="text-align: center">{L_TIME}</th> - <th>{L_ACTION}</th> + <th>{L_ACTION_NOTE}</th> <!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF --> </tr> </thead> diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 0db9af4bf4..07fa6069f6 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -90,6 +90,10 @@ function insert_single(user) <dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd> </dl> <dl> + <dt><label for="search_group_id">{L_GROUP}:</label></dt> + <dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd> + </dl> + <dl> <dt><label for="sk" class="label3">{L_SORT_BY}:</label></dt> <dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd> </dl> diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index b6433a1f8a..a9408c3cab 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -17,7 +17,7 @@ <dl class="left-box details" style="width: 80%;"> <dt>{L_USERNAME}:</dt> <dd> - <!-- IF USER_COLOR --><span style="color: {USER_COLOR}"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span> + <!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span> <!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF --> <!-- IF U_SWITCH_PERMISSIONS --> [ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]<!-- ENDIF --> </dd> diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index 70f68f2c60..8babd7fc1b 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -1,6 +1,9 @@ <div class="panel"> <div class="inner"><span class="corners-top"><span></span></span> + <!-- IF not S_UPLOAD_AVATAR_FILE and not S_UPLOAD_AVATAR_URL and not S_LINK_AVATAR and not S_DISPLAY_GALLERY --> + <p>{L_AVATAR_FEATURES_DISABLED}</p> + <!-- ENDIF --> <fieldset> <!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_options.html b/phpBB/styles/subsilver2/template/ucp_pm_options.html index 7e2326c084..4802b06720 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_options.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_options.html @@ -76,8 +76,8 @@ </tr> <!-- BEGIN rule --> <tr> - <td class="row1" width="25" align="center"><span class="gen">{rule.COUNT}</span></td> - <td class="row2" width="120"><span class="gen">{rule.CHECK}</span></td> + <td class="row1" width="25" align="center"><span class="gen">#{rule.COUNT}</span></td> + <td class="row2" width="120"><span class="gen"><strong>{L_IF}</strong> {rule.CHECK}</span></td> <td class="row1" width="120"><span class="gen">{rule.RULE}</span></td> <td class="row2" width="120"><span class="gen"><!-- IF rule.STRING -->{rule.STRING}<!-- ENDIF --></span></td> <td class="row1"><span class="gen">{rule.ACTION}<!-- IF rule.FOLDER --> -> {rule.FOLDER}<!-- ENDIF --></span></td> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index 00a2e4f415..27e9118b96 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -16,6 +16,11 @@ <!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /> <!-- ENDIF --></td> </tr> +<!-- IF not S_UPLOAD_AVATAR_FILE and not S_UPLOAD_AVATAR_URL and not S_LINK_AVATAR and not S_DISPLAY_GALLERY --> + <tr> + <td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td> + </tr> +<!-- ENDIF --> <!-- IF S_UPLOAD_AVATAR_FILE --> <tr> <td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}: </b></td> |