From 7abded081d5ae3d231148b0485c8605b44973229 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Sun, 17 Apr 2011 21:58:51 -0700
Subject: [feature/avatars] UCP Avatar Interface

This stubs out the avatar form fields and how form processing will
occur. Form processing is not yet implemented, but shouldn't be too
hard. After this I will refactor/duplicate some of the logic for the
ACP.

PHPBB3-10018
---
 .../prosilver/template/ucp_avatar_options.html     | 63 +++++++---------------
 .../template/ucp_avatar_options_local.html         | 14 +++++
 .../template/ucp_avatar_options_remote.html        |  4 ++
 .../template/ucp_avatar_options_upload.html        | 11 ++++
 .../prosilver/template/ucp_profile_avatar.html     | 10 +---
 5 files changed, 50 insertions(+), 52 deletions(-)
 create mode 100644 phpBB/styles/prosilver/template/ucp_avatar_options_local.html
 create mode 100644 phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
 create mode 100644 phpBB/styles/prosilver/template/ucp_avatar_options_upload.html

(limited to 'phpBB/styles/prosilver/template')

diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 7012c42f3b..680267bb10 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -7,31 +7,12 @@
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
-		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-
-	<!-- IF S_UPLOAD_AVATAR_FILE -->
-		<dl>
-			<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-			<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="uploadfile" id="uploadfile" class="inputbox autowidth" /></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_UPLOAD_AVATAR_URL -->
-		<dl>
-			<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-			<dd><input type="text" name="uploadurl" id="uploadurl" value="{AVATAR_URL}" class="inputbox" /></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_LINK_AVATAR -->
 		<dl>
-			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-			<dd><input type="text" name="remotelink" id="remotelink" value="{AVATAR_REMOTE}" class="inputbox" /></dd>
+			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
+			<!-- IF AVATAR && S_AVATARS_ENABLED --><dd><input type="submit" name="submit" id="delete" value="{LA_DELETE_AVATAR}" /></dd><!-- ENDIF -->
 		</dl>
+		<!-- IF S_AVATARS_ENABLED -->
 		<dl>
 			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 			<dd>
@@ -39,32 +20,26 @@
 				<label for="height"><input type="text" name="height" id="height" size="3" value="{AVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
 			</dd>
 		</dl>
-	<!-- ENDIF -->
+		<!-- ENDIF -->
 	</fieldset>
 
-	<!-- IF S_IN_AVATAR_GALLERY -->
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<h3>{L_AVATAR_GALLERY}</h3>
+<!-- BEGIN avatar_drivers -->
+	<h3>{avatar_drivers.L_TITLE}</h3>
+	<p>{avatar_drivers.L_EXPLAIN}</p>
 
-		<fieldset>
-			<label for="category">{L_AVATAR_CATEGORY}: <select name="category" id="category">{S_CAT_OPTIONS}</select></label>
-			<input type="submit" value="{L_GO}" name="display_gallery" class="button2" />
-			<input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />
-		</fieldset>
-
-		<div id="gallery">
-		<!-- BEGIN avatar_row --><!-- BEGIN avatar_column -->
-			<label for="av-{avatar_row.S_ROW_COUNT}-{avatar_row.avatar_column.S_ROW_COUNT}"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="" /><br />
-				<input type="radio" name="avatar_select" id="av-{avatar_row.S_ROW_COUNT}-{avatar_row.avatar_column.S_ROW_COUNT}" value="{avatar_row.avatar_column.AVATAR_FILE}" /></label>
-		<!-- END avatar_column --><!-- END avatar_row -->
-		</div>
+	<fieldset>
+	{avatar_drivers.OUTPUT}
+	</fieldset>
+	<fieldset class="submit-buttons">
+		<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
+		<input type="submit" name="submit_av_{avatar_drivers.DRIVER}" value="{L_SUBMIT}" class="button1" />
+	</fieldset>
+<!-- END avatar_drivers -->
 
+	<fieldset>
+	<!-- IF S_LINK_AVATAR -->
 	<!-- ENDIF -->
+	</fieldset>
 
 	<span class="corners-bottom"><span></span></span></div>
 </div>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
new file mode 100644
index 0000000000..2644397e0d
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -0,0 +1,14 @@
+<label for="category">{L_AVATAR_CATEGORY}: <select name="av_local_cat" id="category">
+<option value="">{L_NO_AVATAR_CATEGORY}</option>
+<!-- BEGIN av_local_cats -->
+<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
+<!-- END av_local_cats -->
+</select></label>
+<input type="submit" value="{L_GO}" name="av_local_go" class="button2" />
+
+<div id="gallery">
+<!-- BEGIN av_local_imgs -->
+	<label for="av-{av_local_imgs.S_ROW_COUNT}"><img src="{av_local_imgs.AVATAR_IMAGE}" alt="" /><br />
+	<input type="radio" name="avatar_select" id="av-{av_local_imgs.S_ROW_COUNT}" value="{av_local_imgs.AVATAR_FILE}" /></label>
+<!-- END av_local_imgs -->
+</div>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
new file mode 100644
index 0000000000..70869086a9
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
@@ -0,0 +1,4 @@
+<dl>
+	<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="text" name="remotelink" id="remotelink" value="" class="inputbox" /></dd>
+</dl>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
new file mode 100644
index 0000000000..9caab72444
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="uploadfile" id="uploadfile" class="inputbox autowidth" /></dd>
+</dl>
+
+<!-- IF S_UPLOAD_AVATAR_URL -->
+	<dl>
+		<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="text" name="uploadurl" id="uploadurl" value="{AVATAR_URL}" class="inputbox" /></dd>
+	</dl>
+<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_profile_avatar.html b/phpBB/styles/prosilver/template/ucp_profile_avatar.html
index a25c43a588..8157d8c15b 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_avatar.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_avatar.html
@@ -6,14 +6,8 @@
 
 <!-- INCLUDE ucp_avatar_options.html -->
 
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}
-	<!-- IF S_DISPLAY_GALLERY --><input type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" class="button2" />&nbsp; <!-- ENDIF -->
-	<!-- IF S_IN_AVATAR_GALLERY --><input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />&nbsp; <!-- ELSE -->
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; <!-- ENDIF -->
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
+{S_HIDDEN_FIELDS}
+{S_FORM_TOKEN}
 </form>
 
 <!-- INCLUDE ucp_footer.html -->
-- 
cgit v1.2.1