even more janitor work on profiles

This commit is contained in:
Mario Vavti 2016-03-15 21:38:03 +01:00
parent 01a28ddf8d
commit d98d7003ed
2 changed files with 8 additions and 18 deletions

View File

@ -696,10 +696,7 @@ function profiles_content(&$a) {
'$lbl_import' => t('Import profile from file'),
'$lbl_export' => t('Export profile to file'),
'$lbl_gender' => t('Your Gender'),
'$lbl_marital' => t('<span class="heart">&hearts;</span> Marital Status'),
'$lbl_with' => t("Who (if applicable)"),
'$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
'$lbl_howlong' => t('Since [date]'),
'$lbl_marital' => t('Marital Status'),
'$lbl_sexual' => t('Sexual Preference'),
'$lbl_homepage' => t('Homepage URL'),
'$lbl_politic' => t('Political Views'),
@ -740,8 +737,8 @@ function profiles_content(&$a) {
'$gender_min' => gender_selector_min($r[0]['gender']),
'$marital' => marital_selector($r[0]['marital']),
'$marital_min' => marital_selector_min($r[0]['marital']),
'$with' => $r[0]['with'],
'$howlong' => ($r[0]['howlong'] === NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])),
'$with' => array('with', t("Who (if applicable)"), $r[0]['with'], t('Examples: cathy123, Cathy Williams, cathy@example.com')),
'$howlong' => array('howlong', t('Since (date)'), ($r[0]['howlong'] === NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
'$sexual' => sexpref_selector($r[0]['sexual']),
'$sexual_min' => sexpref_selector_min($r[0]['sexual']),
'$about' => $r[0]['about'],

View File

@ -90,7 +90,7 @@
{{if $fields.marital }}
<div id="profile-edit-marital-wrapper" class="form-group field" >
<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span>&nbsp;{{$lbl_marital}}</label>
{{if $advanced}}
{{$marital}}
{{else}}
@ -100,21 +100,14 @@
<div class="clear"></div>
{{if $fields.with}}
<div class="form-group">
<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
<input type="text" class="form-control" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
<div class="clear"></div>
</div>
{{include file="field_input.tpl" field=$with}}
{{/if}}
{{if $fields.howlong}}
<div class="form-group">
<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
<input type="text" class="form-control" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
<div class="clear"></div>
</div>
{{include file="field_input.tpl" field=$howlong}}
{{/if}}
<div id="profile-edit-marital-end"></div>
<div class="clear"></div>
{{/if}}
{{if $fields.homepage}}