diff options
| author | friendica <info@friendica.com> | 2012-12-08 11:59:21 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-12-08 11:59:21 -0800 |
| commit | 2a39a5feee0c222e25505bfbc06e2a6d52226fb0 (patch) | |
| tree | d78a0c8167c1d5eb05a86615e8890026c50aeb48 | |
| parent | a65111b9914c99695329162939a0a76f50859acb (diff) | |
| download | volse-hubzilla-2a39a5feee0c222e25505bfbc06e2a6d52226fb0.tar.gz volse-hubzilla-2a39a5feee0c222e25505bfbc06e2a6d52226fb0.tar.bz2 volse-hubzilla-2a39a5feee0c222e25505bfbc06e2a6d52226fb0.zip | |
upstream fixes, revision updated, and mail autocomplete was lost after a recent change I made
| -rw-r--r-- | boot.php | 5 | ||||
| -rw-r--r-- | mod/profiles.php | 1 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/tpl/profile_edit.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/prv_message.tpl | 6 |
5 files changed, 12 insertions, 3 deletions
@@ -1250,8 +1250,9 @@ function profile_load(&$a, $nickname, $profile = 0) { $a->page['title'] = $a->profile['channel_name'] . " @ " . $a->config['sitename']; -// FIXME - $_SESSION['theme'] = $a->profile['theme']; + + + $_SESSION['theme'] = $a->profile['channel_theme']; /** * load/reload current theme info diff --git a/mod/profiles.php b/mod/profiles.php index 9661fac69..96fe97260 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -491,6 +491,7 @@ function profiles_content(&$a) { '$banner' => t('Edit Profile Details'), '$submit' => t('Submit'), '$viewprof' => t('View this profile'), + '$profpic' => t('Change Profile Photo'), '$cr_prof' => t('Create a new profile using these settings'), '$cl_prof' => t('Clone this profile'), '$del_prof' => t('Delete this profile'), diff --git a/version.inc b/version.inc index a69a6ee09..80e6e78db 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2012-12-06.161 +2012-12-07.162 diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index e7b17ba74..eb0bb1eed 100644 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -4,6 +4,7 @@ $default <div id="profile-edit-links"> <ul> +<li><a href="profile_photo" id="profile-photo_upload-link" title="$profpic">$profpic</a></li> <li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li> <li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li> <li></li> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index ecfef95d6..3f0bd937f 100644 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -7,7 +7,13 @@ $parent <div id="prvmail-to-label">$to</div> + +{{ if $showinputs }} +<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" /> +<input type="hidden" id="recip-complete" name="messageto" value="$preid"> +{{ else }} $select +{{ endif }} <div id="prvmail-subject-label">$subject</div> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" /> |