From b4aed1212930e40377665dc45271f2b1f428511f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 20 Aug 2014 23:01:25 -0700
Subject: extensible profiles - add the input form elements. Still needs
 styling and we're not yet storing the results. And right now we're ignoring
 the type and only doing type=string. Oh yeah - and I split off starting the
 second delivery chain into its own function in tag_deliver since it was
 largely duplicate code.

---
 view/tpl/profile_edit.tpl | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'view/tpl/profile_edit.tpl')

diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 0e902e9e2..87582da56 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -349,6 +349,11 @@
 <div id="education-jot-end"></div>
 {{/if}}
 
+{{if $extra_fields}}
+{{foreach $extra_fields as $field }}
+{{include file="field_input.tpl" field=$field}}
+{{/foreach}}
+{{/if}}
 
 <div class="profile-edit-submit-wrapper" >
 <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-- 
cgit v1.2.3


From 831714f0f0e5bd9a17c760a2476a12603be5d089 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 21 Aug 2014 16:46:24 -0700
Subject: profile edit - missing visibility and drop link on non-default
 profiles, re-arrange order of replacing red#matrix smilie so it works
 correctly, accept a post with body content of '0' which was interpreted by
 x() as nothing (was treated as integer).

---
 view/tpl/profile_edit.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl/profile_edit.tpl')

diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 87582da56..b453b1cfa 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -9,12 +9,12 @@
 <div id="profile-edit-links">
 <span class="btn btn-default"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></span>
 <span class="btn btn-default"><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></span>
-{{if ! $default}}<span class="btn btn-default"><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></span>{{/if}}
+{{if ! $is_default}}<span class="btn btn-default"><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></span>{{/if}}
 {{if $profile_clone_link}}<span class="btn btn-default"><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></span>{{/if}}
 {{if $exportable}}<br /><span class="btn btn-default"><a href="profiles/export/{{$profile_id}}" target="_blank">{{$lbl_export}}</a></span>
 <span class="btn btn-default profile-import"><b>{{$lbl_import}}</b> <input type="file" name="userfile" class="profile-import" ></span>
 {{/if}}
-{{if ! $default}}<span class="btn btn-danger"><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();" {{$disabled}} >{{$del_prof}}</a></span>{{/if}}
+{{if ! $is_default}}<span class="btn btn-danger"><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();" {{$disabled}} >{{$del_prof}}</a></span>{{/if}}
 </div>
 
 
-- 
cgit v1.2.3