diff options
| author | friendica <info@friendica.com> | 2012-07-17 17:08:14 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-17 17:08:14 -0700 |
| commit | a10e9d335ab68989a0e6e40af8ae03e5dabd27a7 (patch) | |
| tree | d28f8ab8f1b7d85719f612605875906868616beb | |
| parent | 073eb1b8455fe93e49a95125cb23c8d8accb96e2 (diff) | |
| download | volse-hubzilla-a10e9d335ab68989a0e6e40af8ae03e5dabd27a7.tar.gz volse-hubzilla-a10e9d335ab68989a0e6e40af8ae03e5dabd27a7.tar.bz2 volse-hubzilla-a10e9d335ab68989a0e6e40af8ae03e5dabd27a7.zip | |
front end for alternate profile photos
| -rw-r--r-- | mod/profile_photo.php | 10 | ||||
| -rw-r--r-- | view/cropbody.tpl | 1 | ||||
| -rw-r--r-- | view/profile_photo.tpl | 7 |
3 files changed, 17 insertions, 1 deletions
diff --git a/mod/profile_photo.php b/mod/profile_photo.php index efa8be57e..a60a6d73c 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -227,6 +227,11 @@ function profile_photo_content(&$a) { // go ahead as we have jus uploaded a new photo to crop } + $profiles = q("select `id`,`profile-name` as `name`,`is-default` as `default` from profile where uid = %d", + intval(local_user()) + ); + + if(! x($a->config,'imagecrop')) { $tpl = get_markup_template('profile_photo.tpl'); @@ -234,8 +239,10 @@ function profile_photo_content(&$a) { $o .= replace_macros($tpl,array( '$user' => $a->user['nickname'], '$lbl_upfile' => t('Upload File:'), + '$lbl_profiles' => t('Select a profile:'), '$title' => t('Upload Profile Photo'), '$submit' => t('Upload'), + '$profiles' => $profiles, '$form_security_token' => get_form_security_token("profile_photo"), '$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . $a->get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>') )); @@ -248,6 +255,7 @@ function profile_photo_content(&$a) { $tpl = get_markup_template("cropbody.tpl"); $o .= replace_macros($tpl,array( '$filename' => $filename, + '$profile' => intval($_REQUEST['profile']), '$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'], '$image_url' => $a->get_baseurl() . '/photo/' . $filename, '$title' => t('Crop Image'), @@ -262,7 +270,7 @@ function profile_photo_content(&$a) { }} -if(! function_exists('_crop_ui_head')) { +if(! function_exists('profile_photo_crop_ui_head')) { function profile_photo_crop_ui_head(&$a, $ph){ $max_length = get_config('system','max_image_length'); if(! $max_length) diff --git a/view/cropbody.tpl b/view/cropbody.tpl index b484d15bf..4c0ca3d63 100644 --- a/view/cropbody.tpl +++ b/view/cropbody.tpl @@ -42,6 +42,7 @@ $desc <form action="profile_photo/$resource" id="crop-image-form" method="post" /> <input type='hidden' name='form_security_token' value='$form_security_token'> +<input type='hidden' name='profile' value='$profile'> <input type="hidden" name="cropfinal" value="1" /> <input type="hidden" name="xstart" id="x1" /> <input type="hidden" name="ystart" id="y1" /> diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl index 0b3a1cac1..04ee8f916 100644 --- a/view/profile_photo.tpl +++ b/view/profile_photo.tpl @@ -8,6 +8,13 @@ <input name="userfile" type="file" id="profile-photo-upload" size="48" /> </div> +<label id="profile-photo-profiles-label" for="profile-photo-profiles">$lbl_profiles </label> +<select name="profile" id="profile-photo-profiles" /> +{{ for $profiles as $p }} +<option value="$p.id" {{ if $p.default }}selected="selected"{{ endif }}>$p.name</option> +{{ endfor }} +</select> + <div id="profile-photo-submit-wrapper"> <input type="submit" name="submit" id="profile-photo-submit" value="$submit"> </div> |