still more janitor work on profiles

This commit is contained in:
Mario Vavti 2016-03-16 13:45:24 +01:00
parent 4188419b30
commit d22b21c56f
2 changed files with 42 additions and 185 deletions

View File

@ -698,25 +698,6 @@ function profiles_content(&$a) {
'$lbl_gender' => t('Your Gender'),
'$lbl_marital' => t('Marital Status'),
'$lbl_sexual' => t('Sexual Preference'),
'$lbl_homepage' => t('Homepage URL'),
'$lbl_politic' => t('Political Views'),
'$lbl_religion' => t('Religious Views'),
'$lbl_pubkey' => t('Keywords'),
'$lbl_likes' => t('Likes'),
'$lbl_dislikes' => t('Dislikes'),
'$lbl_ex2' => t('Example: fishing photography software'),
'$lbl_pubdsc' => t("Used in directory listings"),
'$lbl_about' => t('Tell us about yourself...'),
'$lbl_hobbies' => t('Hobbies/Interests'),
'$lbl_social' => t('Contact information and Social Networks'),
'$lbl_channels' => t('My other channels'),
'$lbl_music' => t('Musical interests'),
'$lbl_book' => t('Books, literature'),
'$lbl_tv' => t('Television'),
'$lbl_film' => t('Film/dance/culture/entertainment'),
'$lbl_love' => t('Love/romance'),
'$lbl_work' => t('Work/employment'),
'$lbl_school' => t('School/education'),
'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
'$baseurl' => $a->get_baseurl(true),
'$profile_id' => $r[0]['id'],
@ -741,24 +722,24 @@ function profiles_content(&$a) {
'$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'],
'$homepage' => $r[0]['homepage'],
'$about' => array('about', t('Tell us about yourself'), $r[0]['about']),
'$homepage' => array('homepage', t('Homepage URL'), $r[0]['homepage']),
'$hometown' => array('hometown', t('Hometown'), $r[0]['hometown']),
'$politic' => $r[0]['politic'],
'$religion' => $r[0]['religion'],
'$keywords' => $r[0]['keywords'],
'$likes' => $r[0]['likes'],
'$dislikes' => $r[0]['dislikes'],
'$music' => $r[0]['music'],
'$book' => $r[0]['book'],
'$tv' => $r[0]['tv'],
'$film' => $r[0]['film'],
'$interest' => $r[0]['interest'],
'$romance' => $r[0]['romance'],
'$work' => $r[0]['work'],
'$education' => $r[0]['education'],
'$contact' => $r[0]['contact'],
'$channels' => $r[0]['channels'],
'$politic' => array('politic', t('Political Views'), $r[0]['politic']),
'$religion' => array('religion', t('Religious Views'), $r[0]['religion']),
'$keywords' => array('keywords', t('Keywords used in directory listings'), $r[0]['keywords'], t('Example: fishing photography software')),
'$likes' => array('likes', t('Likes'), $r[0]['likes']),
'$dislikes' => array('dislikes', t('Dislikes'), $r[0]['dislikes']),
'$music' => array('music', t('Musical interests'), $r[0]['music']),
'$book' => array('book', t('Books, literature'), $r[0]['book']),
'$tv' => array('tv', t('Television'), $r[0]['tv']),
'$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']),
'$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
'$romance' => array('romance',t('Love/romance'), $r[0]['romance']),
'$work' => array('work', t('Work/employment'), $r[0]['work']),
'$education' => array('education', t('School/education'), $r[0]['education']),
'$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']),
'$channels' => array('channels', t('My other channels'), $r[0]['channels']),
'$extra_fields' => $extra_fields,
));

View File

@ -18,7 +18,7 @@
</div>
<div id="profile-edit-links-end"></div>
<div class="clear"></div>
{{if $is_default}}
<div class="section-content-info-wrapper">{{$default}}</div>
@ -38,14 +38,14 @@
{{if $fields.gender}}
<div id="profile-edit-gender-wrapper" class="form-group field select" >
<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
<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>
<div class="clear"></div>
{{/if}}
{{if $fields.dob}}
@ -111,204 +111,81 @@
{{/if}}
{{if $fields.homepage}}
<div id="profile-edit-homepage-wrapper" class="form-group field" >
<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
<input type="text" class="form-control" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
</div>
<div id="profile-edit-homepage-end"></div>
{{include file="field_input.tpl" field=$homepage}}
{{/if}}
{{if $fields.sexual}}
<div id="profile-edit-sexual-wrapper" class="form-group field" >
<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label>
{{$sexual}}
</div>
<div id="profile-edit-sexual-end"></div>
<div class="clear"></div>
{{/if}}
{{if $fields.politic}}
<div id="profile-edit-politic-wrapper" class="form-group field" >
<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
<input class="form-control" type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" />
</div>
<div id="profile-edit-politic-end"></div>
{{include file="field_input.tpl" field=$politic}}
{{/if}}
{{if $fields.religion}}
<div id="profile-edit-religion-wrapper" class="form-group field" >
<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
<input type="text" class="form-control" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" />
</div>
<div id="profile-edit-religion-end"></div>
{{include file="field_input.tpl" field=$religion}}
{{/if}}
{{if $fields.keywords}}
<div id="profile-edit-pubkeywords-wrapper" class="form-group field" >
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
<input type="text" class="form-control" size="32" name="keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$keywords}}" />
</div>
<span class="help-block">{{$lbl_pubdsc}}</span>
<div id="profile-edit-pubkeywords-end"></div>
{{include file="field_input.tpl" field=$keywords}}
{{/if}}
<br /><br />
{{if $fields.about}}
<div id="about-jot-wrapper" class="form-group field" >
<p id="about-jot-desc" >
{{$lbl_about}}
</p>
<textarea class="form-control" rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea>
</div>
<div id="about-jot-end"></div>
{{include file="field_textarea.tpl" field=$about}}
{{/if}}
{{if $fields.contact}}
<div id="contact-jot-wrapper" class="form-group field" >
<p id="contact-jot-desc" >
{{$lbl_social}}
</p>
<textarea class="form-control" rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea>
</div>
<div id="contact-jot-end"></div>
{{include file="field_textarea.tpl" field=$contact}}
{{/if}}
{{if $fields.interest}}
<div id="interest-jot-wrapper" class="form-group field" >
<p id="interest-jot-desc" >
{{$lbl_hobbies}}
</p>
<textarea class="form-control" rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea>
</div>
<div id="interest-jot-end"></div>
{{include file="field_textarea.tpl" field=$interest}}
{{/if}}
{{if $fields.likes}}
<div id="likes-jot-wrapper" class="form-group field" >
<p id="likes-jot-desc" >
{{$lbl_likes}}
</p>
<textarea class="form-control" rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea>
</div>
<div id="likes-jot-end"></div>
{{include file="field_textarea.tpl" field=$likes}}
{{/if}}
{{if $fields.dislikes}}
<div id="dislikes-jot-wrapper" class="form-group field" >
<p id="dislikes-jot-desc" >
{{$lbl_dislikes}}
</p>
<textarea class="form-control" rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea>
</div>
<div id="dislikes-jot-end"></div>
{{include file="field_textarea.tpl" field=$dislikes}}
{{/if}}
{{if $fields.channels}}
<div id="channels-jot-wrapper" class="form-group field" >
<p id="channels-jot-desc" >
{{$lbl_channels}}
</p>
<textarea class="form-control" rows="10" cols="72" id="channels-jot-text" name="channels" >{{$channels}}</textarea>
</div>
<div id="channels-jot-end"></div>
{{include file="field_textarea.tpl" field=$channels}}
{{/if}}
{{if $fields.music}}
<div id="music-jot-wrapper" class="form-group field" >
<p id="music-jot-desc" >
{{$lbl_music}}
</p>
<textarea class="form-control" rows="10" cols="72" id="music-jot-text" name="music" >{{$music}}</textarea>
</div>
<div id="music-jot-end"></div>
{{include file="field_textarea.tpl" field=$music}}
{{/if}}
{{if $fields.book}}
<div id="book-jot-wrapper" class="form-group field" >
<p id="book-jot-desc" >
{{$lbl_book}}
</p>
<textarea class="form-control" rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea>
</div>
<div id="book-jot-end"></div>
{{include file="field_textarea.tpl" field=$book}}
{{/if}}
{{if $fields.tv}}
<div id="tv-jot-wrapper" class="form-group field" >
<p id="tv-jot-desc" >
{{$lbl_tv}}
</p>
<textarea class="form-control" rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea>
</div>
<div id="tv-jot-end"></div>
{{include file="field_textarea.tpl" field=$tv}}
{{/if}}
{{if $fields.film}}
<div id="film-jot-wrapper" class="form-group field" >
<p id="film-jot-desc" >
{{$lbl_film}}
</p>
<textarea class="form-control" rows="10" cols="72" id="film-jot-text" name="film" >{{$film}}</textarea>
</div>
<div id="film-jot-end"></div>
{{include file="field_textarea.tpl" field=$film}}
{{/if}}
{{if $fields.romance}}
<div id="romance-jot-wrapper" class="form-group field" >
<p id="romance-jot-desc" >
{{$lbl_love}}
</p>
<textarea class="form-control" rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea>
</div>
<div id="romance-jot-end"></div>
{{include file="field_textarea.tpl" field=$romance}}
{{/if}}
{{if $fields.work}}
<div id="work-jot-wrapper" class="form-group field" >
<p id="work-jot-desc" >
{{$lbl_work}}
</p>
<textarea class="form-control" rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea>
</div>
<div id="work-jot-end"></div>
{{include file="field_textarea.tpl" field=$work}}
{{/if}}
{{if $fields.education}}
<div id="education-jot-wrapper" class="form-group field" >
<p id="education-jot-desc" >
{{$lbl_school}}
</p>
<textarea class="form-control" rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea>
</div>
<div id="education-jot-end"></div>
{{include file="field_textarea.tpl" field=$education}}
{{/if}}
{{if $extra_fields}}
@ -317,11 +194,10 @@
{{/foreach}}
{{/if}}
<div class="profile-edit-submit-wrapper" >
<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
<div class="form-group" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
<div class="profile-edit-submit-end"></div>
<div class="clear"></div>
</form>
</div>