diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-22 00:00:45 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-22 00:00:45 +0100 |
| commit | 5289dc52a322f760b6a2108f5fed1b4ff365e1d4 (patch) | |
| tree | d07a71d9182fb4cdd423837952db3ba32fa1a549 /phpBB/styles | |
| parent | 8a01bc171837be40818f285035ccefa5ac819213 (diff) | |
| download | forums-5289dc52a322f760b6a2108f5fed1b4ff365e1d4.tar forums-5289dc52a322f760b6a2108f5fed1b4ff365e1d4.tar.gz forums-5289dc52a322f760b6a2108f5fed1b4ff365e1d4.tar.bz2 forums-5289dc52a322f760b6a2108f5fed1b4ff365e1d4.tar.xz forums-5289dc52a322f760b6a2108f5fed1b4ff365e1d4.zip | |
[feature/avatars] Add support for modularized avatars to ucp groups
This seems to be the last component where the new avatars system was still
missing.
PHPBB3-10018
Diffstat (limited to 'phpBB/styles')
4 files changed, 34 insertions, 67 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index e7300a075d..354ddcc69c 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -38,10 +38,12 @@ </div> <!-- END avatar_drivers --> </div> +<!-- IF not S_GROUP_MANAGE --> <fieldset class="submit-buttons"> <input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> </fieldset> +<!-- ENDIF --> </div> </div> diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index 6b017ea3fa..f6fcfa043d 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -70,9 +70,7 @@ <fieldset class="submit-buttons"> {S_HIDDEN_FIELDS} - <!-- IF S_DISPLAY_GALLERY --><input type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" class="button2" /> <!-- ENDIF --> - <!-- IF S_IN_AVATAR_GALLERY --><input type="submit" name="cancel" value="{L_CANCEL}" class="button2" /> <!-- ELSE --> - <input type="reset" value="{L_RESET}" name="reset" class="button2" /> <!-- ENDIF --> + <input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="update" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html index 12319c9e4e..e15335f4e1 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html @@ -60,74 +60,43 @@ </tr> <tr> <td class="row1" width="35%"><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></td> - <td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="delete" /> <span>{L_DELETE_AVATAR}</span></td> + <td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="av_delete" /> <span>{L_DELETE_AVATAR}</span></td> </tr> - <!-- IF not S_IN_AVATAR_GALLERY --> - <!-- IF S_UPLOAD_AVATAR_FILE --> - <tr> - <td class="row1" width="35%"><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></td> - <td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></td> - </tr> - <!-- ENDIF --> - <!-- IF S_UPLOAD_AVATAR_URL --> - <tr> - <td class="row1" width="35%"><label for="uploadurl">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> - <td class="row2"><input name="uploadurl" type="text" id="uploadurl" value="" /></td> - </tr> - <!-- ENDIF --> - <!-- IF S_LINK_AVATAR --> - <tr> - <td class="row1" width="35%"><label for="remotelink">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> - <td class="row2"><input name="remotelink" type="text" id="remotelink" value="" /></td> - </tr> - <tr> - <td class="row1" width="35%"><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td> - <td class="row2"><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></td> - </tr> - <!-- ENDIF --> - <!-- IF S_DISPLAY_GALLERY --> - <tr> - <td class="row1" width="35%"><label>{L_AVATAR_GALLERY}{L_COLON}</label></td> - <td class="row2"><input class="btnmain" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></td> - </tr> - <!-- ENDIF --> - <!-- ELSE --> - - <tr> - <th colspan="2">{L_AVATAR_GALLERY}</th> - </tr> - <tr> - <td class="row1" width="35%"><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></td> - <td class="row2"><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="btnmain" type="submit" value="{L_GO}" name="display_gallery" /></td> - </tr> - <tr> - <td class="row1" width="35%"> - <table cellspacing="1"> - <!-- BEGIN avatar_row --> - <tr> - <!-- BEGIN avatar_column --> - <td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td> - <!-- END avatar_column --> - </tr> - <tr> - <!-- BEGIN avatar_option_column --> - <td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td> - <!-- END avatar_option_column --> - </tr> - <!-- END avatar_row --> - </table> - </td> - <td class="row2"><input class="btnmain" type="submit" name="cancel" value="{L_CANCEL}" /></td> - </tr> - - <!-- ENDIF --> +<!-- IF not S_AVATARS_ENABLED --> + <tr> + <td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td> + </tr> +<!-- ENDIF --> + <tr> + <th colspan="2">{L_AVATAR_SELECT}</th> + </tr> + <tr> + <td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td> + <td class="row2"> + <select name="avatar_driver" id="avatar_driver"> + <option value="">{L_NO_AVATAR_CATEGORY}</option> + <!-- BEGIN avatar_drivers --> + <option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option> + <!-- END avatar_drivers --> + </select></td> + </tr> +<!-- BEGIN avatar_drivers --> + <tr class="av_option_{avatar_drivers.DRIVER}"> + <td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td> + </tr> + <tr class="av_option_{avatar_drivers.DRIVER}"> + <td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td> + </tr> +<!-- END avatar_drivers --> <tr> - <td class="cat" colspan="2" align="center"><input class="btnlite" type="submit" id="submit" name="update" value="{L_SUBMIT}" /> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" id="submit" name="update" value="{L_SUBMIT}" /> <input class="btnmain" type="reset" id="reset" name="reset" value="{L_RESET}" /></td> </tr> </table> +<!-- INCLUDEJS template/avatars.js --> + <!-- ELSEIF S_LIST --> <h1>{L_GROUP_MEMBERS}</h1> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index f8129e60e6..4e65b37e3c 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -12,7 +12,7 @@ <tr> <td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}{L_COLON} </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td> <td class="row2" align="center"><br /> - <!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="delete" /> <span class="gensmall">{L_DELETE_AVATAR}</span> + <!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="av_delete" /> <span class="gensmall">{L_DELETE_AVATAR}</span> <!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /> <!-- ENDIF --></td> </tr> @@ -43,11 +43,9 @@ </tr> <!-- END avatar_drivers --> -<!-- IF S_DISPLAY_GALLERY or S_IN_AVATAR_GALLERY or S_LINK_AVATAR or S_UPLOAD_AVATAR_URL or S_UPLOAD_AVATAR_FILE or AVATAR --> <tr> <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <!-- IF S_IN_AVATAR_GALLERY --><input class="btnlite" type="submit" name="cancel" value="{L_CANCEL}" /><!-- ELSE --><input class="btnlite" type="reset" value="{L_RESET}" name="reset" /><!-- ENDIF --></td> </tr> -<!-- ENDIF --> </table> <!-- INCLUDEJS template/avatars.js --> |