Merge pull request #1 from friendica/master

Red master has been merged

1 files changed, 100 insertions, 61 deletions

diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 196b3ac6d..0e902e9e2 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -1,23 +1,27 @@
-{{$default}}
+{{if $is_default}}
+<p id="profile-edit-default-desc">{{$default}}</p>
+{{/if}}
 
 <h1>{{$banner}}</h1>
 
-<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" 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>
-<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
+<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" >
 
-</ul>
+<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 $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}}
 </div>
 
+
 <div id="profile-edit-links-end"></div>
 
 
 <div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 <div id="profile-edit-profile-name-wrapper" >
@@ -32,19 +36,28 @@
 </div>
 <div id="profile-edit-name-end"></div>
 
+
+{{if $fields.pdesc}}
 <div id="profile-edit-pdesc-wrapper" >
 <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
 <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
 </div>
 <div id="profile-edit-pdesc-end"></div>
+{{/if}}
 
-
+{{if $fields.gender}}
 <div id="profile-edit-gender-wrapper" >
 <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
+{{if $advanced}}
 {{$gender}}
+{{else}}
+{{$gender_min}}
+{{/if}}
 </div>
 <div id="profile-edit-gender-end"></div>
+{{/if}}
 
+{{if $fields.dob}}
 <div id="profile-edit-dob-wrapper" >
 <label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
 <div id="profile-edit-dob" >
@@ -52,6 +65,7 @@
 </div>
 </div>
 <div id="profile-edit-dob-end"></div>
+{{/if}}
 
 {{$hide_friends}}
 
@@ -60,100 +74,124 @@
 </div>
 <div class="profile-edit-submit-end"></div>
 
-
+{{if $fields.address}}
 <div id="profile-edit-address-wrapper" >
 <label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
 <input type="text" size="32" name="address" id="profile-edit-address" value="{{$address}}" />
 </div>
 <div id="profile-edit-address-end"></div>
+{{/if}}
 
+{{if $fields.locality}}
 <div id="profile-edit-locality-wrapper" >
 <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
 <input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" />
 </div>
 <div id="profile-edit-locality-end"></div>
+{{/if}}
 
-
+{{if $fields.postal_code}}
 <div id="profile-edit-postal-code-wrapper" >
 <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
 <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
 </div>
 <div id="profile-edit-postal-code-end"></div>
+{{/if}}
 
-
+{{if $fields.region}}
 <div id="profile-edit-region-wrapper" >
 <label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
 <input type="text" size="32" name="region" id="profile-edit-region" value="{{$region}}" />
 </div>
 <div id="profile-edit-region-end"></div>
+{{/if}}
 
+{{if $fields.country_name}}
 <div id="profile-edit-country-name-wrapper" >
 <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
 <input type="text" size="32" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" />
 </div>
 <div id="profile-edit-country-name-end"></div>
+{{/if}}
 
+{{if $fields.hometown}}
 <div id="profile-edit-hometown-wrapper" >
 <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
 <input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
 </div>
 <div id="profile-edit-hometown-end"></div>
+{{/if}}
 
 <div class="profile-edit-submit-wrapper" >
 <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
 </div>
 <div class="profile-edit-submit-end"></div>
 
+{{if $fields.marital }}
 <div id="profile-edit-marital-wrapper" >
 <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
+{{if $advanced}}
 {{$marital}}
+{{else}}
+{{$marital_min}}
+{{/if}}
 </div>
 <div class="clear"></div>
+{{if $fields.with}}
 <label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
 <input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
 <div class="clear"></div>
+{{/if}}
+{{if $fields.howlong}}
 <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
 <input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
-
+<div class="clear"></div>
+{{/if}}
 <div id="profile-edit-marital-end"></div>
+{{/if}}
 
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
-{{$sexual}}
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
+{{if $fields.homepage}}
 <div id="profile-edit-homepage-wrapper" >
 <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
 <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
 </div>
 <div id="profile-edit-homepage-end"></div>
+{{/if}}
 
+{{if $fields.sexual}}
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
+{{$sexual}}
+</div>
+<div id="profile-edit-sexual-end"></div>
+{{/if}}
+
+{{if $fields.politic}}
 <div id="profile-edit-politic-wrapper" >
 <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
 <input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" />
 </div>
 <div id="profile-edit-politic-end"></div>
+{{/if}}
 
+{{if $fields.religion}}
 <div id="profile-edit-religion-wrapper" >
 <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
 <input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" />
 </div>
 <div id="profile-edit-religion-end"></div>
+{{/if}}
 
+{{if $fields.keywords}}
 <div id="profile-edit-pubkeywords-wrapper" >
 <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
 <input type="text" size="32" name="keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$keywords}}" />
 </div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
 <div id="profile-edit-pubkeywords-end"></div>
+{{/if}}
 
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
 
+{{if $fields.about}}
 <div id="about-jot-wrapper" >
 <p id="about-jot-desc" >
 {{$lbl_about}}
@@ -163,8 +201,22 @@
 
 </div>
 <div id="about-jot-end"></div>
+{{/if}}
+
+{{if $fields.contact}}
+<div id="contact-jot-wrapper" >
+<p id="contact-jot-desc" >
+{{$lbl_social}}
+</p>
+
+<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+{{/if}}
 
 
+{{if $fields.interest}}
 <div id="interest-jot-wrapper" >
 <p id="interest-jot-desc" >
 {{$lbl_hobbies}}
@@ -174,8 +226,9 @@
 
 </div>
 <div id="interest-jot-end"></div>
+{{/if}}
 
-
+{{if $fields.likes}}
 <div id="likes-jot-wrapper" >
 <p id="likes-jot-desc" >
 {{$lbl_likes}}
@@ -185,8 +238,9 @@
 
 </div>
 <div id="likes-jot-end"></div>
+{{/if}}
 
-
+{{if $fields.dislikes}}
 <div id="dislikes-jot-wrapper" >
 <p id="dislikes-jot-desc" >
 {{$lbl_dislikes}}
@@ -196,18 +250,9 @@
 
 </div>
 <div id="dislikes-jot-end"></div>
+{{/if}}
 
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-{{$lbl_social}}
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
+{{if $fields.channels}}
 <div id="channels-jot-wrapper" >
 <p id="channels-jot-desc" >
 {{$lbl_channels}}
@@ -217,13 +262,9 @@
 
 </div>
 <div id="channels-jot-end"></div>
+{{/if}}
 
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
+{{if $fields.music}}
 <div id="music-jot-wrapper" >
 <p id="music-jot-desc" >
 {{$lbl_music}}
@@ -233,7 +274,9 @@
 
 </div>
 <div id="music-jot-end"></div>
+{{/if}}
 
+{{if $fields.book}}
 <div id="book-jot-wrapper" >
 <p id="book-jot-desc" >
 {{$lbl_book}}
@@ -243,9 +286,9 @@
 
 </div>
 <div id="book-jot-end"></div>
+{{/if}}
 
-
-
+{{if $fields.tv}}
 <div id="tv-jot-wrapper" >
 <p id="tv-jot-desc" >
 {{$lbl_tv}} 
@@ -255,9 +298,9 @@
 
 </div>
 <div id="tv-jot-end"></div>
+{{/if}}
 
-
-
+{{if $fields.film}}
 <div id="film-jot-wrapper" >
 <p id="film-jot-desc" >
 {{$lbl_film}}
@@ -267,14 +310,10 @@
 
 </div>
 <div id="film-jot-end"></div>
+{{/if}}
 
 
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
+{{if $fields.romance}}
 <div id="romance-jot-wrapper" >
 <p id="romance-jot-desc" >
 {{$lbl_love}}
@@ -284,9 +323,9 @@
 
 </div>
 <div id="romance-jot-end"></div>
+{{/if}}
 
-
-
+{{if $fields.work}}
 <div id="work-jot-wrapper" >
 <p id="work-jot-desc" >
 {{$lbl_work}}
@@ -296,9 +335,9 @@
 
 </div>
 <div id="work-jot-end"></div>
+{{/if}}
 
-
-
+{{if $fields.education}}
 <div id="education-jot-wrapper" >
 <p id="education-jot-desc" >
 {{$lbl_school}} 
@@ -308,7 +347,7 @@
 
 </div>
 <div id="education-jot-end"></div>
-
+{{/if}}
 
 
 <div class="profile-edit-submit-wrapper" >