aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-03-17 11:50:53 +0100
committerMario Vavti <mario@mariovavti.com>2016-03-17 11:50:53 +0100
commita41a05e6c0b0fa5f9497f0880a2db9d8d7374092 (patch)
tree954e2cf1993c6b4338aaecb7bfb9cc8a9ca0b59e /view
parenta83cdbeb39a915f77d24b316ce63197e0f5ca2d3 (diff)
downloadvolse-hubzilla-a41a05e6c0b0fa5f9497f0880a2db9d8d7374092.tar.gz
volse-hubzilla-a41a05e6c0b0fa5f9497f0880a2db9d8d7374092.tar.bz2
volse-hubzilla-a41a05e6c0b0fa5f9497f0880a2db9d8d7374092.zip
bring more structure to profiles edit
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/tpl/admin_profiles.tpl2
-rwxr-xr-xview/tpl/profile_advanced.tpl2
-rwxr-xr-xview/tpl/profile_edit.tpl393
-rwxr-xr-xview/tpl/profile_vcard.tpl2
-rwxr-xr-xview/tpl/profile_vcard_short.tpl2
6 files changed, 230 insertions, 173 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5aee57cad..4115ea764 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -128,8 +128,6 @@ pre {
.heart {
color: #FF0000;
- font-size: 100%;
- margin-right: 5px;
}
nav,
diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl
index 8962c21b3..dd7250df0 100644
--- a/view/tpl/admin_profiles.tpl
+++ b/view/tpl/admin_profiles.tpl
@@ -1,5 +1,5 @@
<div class="generic-content-wrapper">
-<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-xs pull-right" href="admin/profs/new"><i class="icon-plus-sign">&nbsp;{{$new}}</i></a><h2>{{$title}}</h2>
+<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-xs pull-right" href="admin/profs/new"><i class="icon-plus-sign"></i>&nbsp;{{$new}}</a><h2>{{$title}}</h2>
<div class="clear"></div>
</div>
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index a724c41bb..f928aa3ee 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -71,7 +71,7 @@
{{if $f == 'marital'}}
{{if $profile.marital}}
<dl id="aprofile-marital" class="aprofile">
- <dt><span class="heart">&hearts;</span> {{$profile.marital.0}}</dt>
+ <dt><span class="heart"><i class="icon-heart"></i>&nbsp;</span>{{$profile.marital.0}}</dt>
<dd>{{$profile.marital.1}}{{if in_array('with',$fields)}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd>
</dl>
{{/if}}
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index daa56e15c..c7da20f81 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -14,11 +14,14 @@
</li>
{{/if}}
<li class="nav-item">
+ <a href="thing" id="profile-edit-thing-link" title="{{$addthing}}">{{$addthing}}</a>
+ </li>
+ <li class="nav-item">
<a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a>
</li>
{{if ! $is_default}}
<li class="nav-item">
- <a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a>
+ <a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}">{{$editvis}}</a>
</li>
{{/if}}
{{if $profile_clone_link}}
@@ -51,185 +54,241 @@
<label id="profile-upload-choose-label" for="profile-upload-choose" >{{$lbl_import}}</label>
<input id="profile-upload-choose" type="file" name="userfile">
</div>
- <div class="section-content-wrapper">
+
<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" >
+ <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
{{if $is_default}}
<div class="section-content-info-wrapper">{{$default}}</div>
{{/if}}
- <div id="profile-edit-wrapper" >
- <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
- {{include file="field_input.tpl" field=$profile_name}}
- {{include file="field_input.tpl" field=$name}}
-
- {{if $fields.pdesc}}
- {{include file="field_input.tpl" field=$pdesc}}
- {{/if}}
-
- {{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>
- {{if $advanced}}
- {{$gender}}
- {{else}}
- {{$gender_min}}
- {{/if}}
+ <div class="panel-group" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true">
+ <div class="panel">
+ <div class="section-subtitle-wrapper" role="tab" id="personal">
+ <h3>
+ <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#personal-collapse" aria-expanded="true" aria-controls="personal-collapse">
+ {{$personal}}
+ </a>
+ </h3>
+ </div>
+ <div id="personal-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="personal">
+ <div class="section-content-tools-wrapper">
+ {{include file="field_input.tpl" field=$profile_name}}
+
+ {{include file="field_input.tpl" field=$name}}
+
+ {{if $fields.pdesc}}
+ {{include file="field_input.tpl" field=$pdesc}}
+ {{/if}}
+
+ {{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>
+ {{if $advanced}}
+ {{$gender}}
+ {{else}}
+ {{$gender_min}}
+ {{/if}}
+ </div>
+ <div class="clear"></div>
+ {{/if}}
+
+ {{if $fields.dob}}
+ {{$dob}}
+ {{/if}}
+
+ {{include file="field_checkbox.tpl" field=$hide_friends}}
+
+ <div class="form-group" >
+ <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+ </div>
+ <div class="clear"></div>
+ </div>
+ </div>
</div>
- <div class="clear"></div>
- {{/if}}
-
- {{if $fields.dob}}
- {{$dob}}
- {{/if}}
-
- {{include file="field_checkbox.tpl" field=$hide_friends}}
-
- <div class="form-group" >
- <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+ {{if $fields.address || $fields.locality || $fields.postal_code || $fields.region || $fields.country_name || $fields.hometown}}
+ <div class="panel">
+ <div class="section-subtitle-wrapper" role="tab" id="location">
+ <h3>
+ <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#location-collapse" aria-expanded="true" aria-controls="location-collapse">
+ {{$location}}
+ </a>
+ </h3>
+ </div>
+ <div id="location-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="location">
+ <div class="section-content-tools-wrapper">
+ {{if $fields.address}}
+ {{include file="field_input.tpl" field=$address}}
+ {{/if}}
+
+ {{if $fields.locality}}
+ {{include file="field_input.tpl" field=$locality}}
+ {{/if}}
+
+ {{if $fields.postal_code}}
+ {{include file="field_input.tpl" field=$postal_code}}
+ {{/if}}
+
+ {{if $fields.region}}
+ {{include file="field_input.tpl" field=$region}}
+ {{/if}}
+
+ {{if $fields.country_name}}
+ {{include file="field_input.tpl" field=$country_name}}
+ {{/if}}
+
+ {{if $fields.hometown}}
+ {{include file="field_input.tpl" field=$hometown}}
+ {{/if}}
+
+ <div class="form-group" >
+ <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+ </div>
+ <div class="clear"></div>
+ </div>
+ </div>
</div>
- <div class="clear"></div>
-
- {{if $fields.address}}
- {{include file="field_input.tpl" field=$address}}
- {{/if}}
-
- {{if $fields.locality}}
- {{include file="field_input.tpl" field=$locality}}
- {{/if}}
-
- {{if $fields.postal_code}}
- {{include file="field_input.tpl" field=$postal_code}}
- {{/if}}
-
- {{if $fields.region}}
- {{include file="field_input.tpl" field=$region}}
- {{/if}}
-
- {{if $fields.country_name}}
- {{include file="field_input.tpl" field=$country_name}}
- {{/if}}
-
- {{if $fields.hometown}}
- {{include file="field_input.tpl" field=$hometown}}
- {{/if}}
-
- <div class="form-group" >
- <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
- </div>
- <div class="clear"></div>
-
- {{if $fields.marital }}
- <div id="profile-edit-marital-wrapper" class="form-group field" >
- <label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span>&nbsp;{{$lbl_marital}}</label>
- {{if $advanced}}
- {{$marital}}
- {{else}}
- {{$marital_min}}
{{/if}}
+ {{if $fields.marital || $fields.sexual}}
+ <div class="panel">
+ <div class="section-subtitle-wrapper" role="tab" id="relation">
+ <h3>
+ <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="true" aria-controls="relation-collapse">
+ {{$relation}}
+ </a>
+ </h3>
+ </div>
+ <div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
+ <div class="section-content-tools-wrapper">
+ {{if $fields.marital }}
+ <div id="profile-edit-marital-wrapper" class="form-group field" >
+ <label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart"><i class="icon-heart"></i>&nbsp;</span>{{$lbl_marital}}</label>
+ {{if $advanced}}
+ {{$marital}}
+ {{else}}
+ {{$marital_min}}
+ {{/if}}
+ </div>
+ <div class="clear"></div>
+
+ {{if $fields.with}}
+ {{include file="field_input.tpl" field=$with}}
+ {{/if}}
+
+ {{if $fields.howlong}}
+ {{include file="field_input.tpl" field=$howlong}}
+ {{/if}}
+ {{/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>
+ {{$sexual}}
+ </div>
+ <div class="clear"></div>
+ {{/if}}
+
+ <div class="form-group" >
+ <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+ </div>
+ <div class="clear"></div>
+ </div>
+ </div>
</div>
- <div class="clear"></div>
-
- {{if $fields.with}}
- {{include file="field_input.tpl" field=$with}}
- {{/if}}
-
- {{if $fields.howlong}}
- {{include file="field_input.tpl" field=$howlong}}
{{/if}}
- <div class="clear"></div>
- {{/if}}
-
- {{if $fields.homepage}}
- {{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>
- {{$sexual}}
+ {{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.romance || $fields.education || $extra_fields}}
+ <div class="panel">
+ <div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
+ <h3>
+ <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="true" aria-controls="miscellaneous-collapse">
+ {{$miscellaneous}}
+ </a>
+ </h3>
+ </div>
+ <div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
+ <div class="section-content-tools-wrapper">
+ {{if $fields.homepage}}
+ {{include file="field_input.tpl" field=$homepage}}
+ {{/if}}
+
+ {{if $fields.keywords}}
+ {{include file="field_input.tpl" field=$keywords}}
+ {{/if}}
+
+ {{if $fields.politic}}
+ {{include file="field_input.tpl" field=$politic}}
+ {{/if}}
+
+ {{if $fields.religion}}
+ {{include file="field_input.tpl" field=$religion}}
+ {{/if}}
+
+ {{if $fields.about}}
+ {{include file="field_textarea.tpl" field=$about}}
+ {{/if}}
+
+ {{if $fields.contact}}
+ {{include file="field_textarea.tpl" field=$contact}}
+ {{/if}}
+
+ {{if $fields.interest}}
+ {{include file="field_textarea.tpl" field=$interest}}
+ {{/if}}
+
+ {{if $fields.likes}}
+ {{include file="field_textarea.tpl" field=$likes}}
+ {{/if}}
+
+ {{if $fields.dislikes}}
+ {{include file="field_textarea.tpl" field=$dislikes}}
+ {{/if}}
+
+ {{if $fields.channels}}
+ {{include file="field_textarea.tpl" field=$channels}}
+ {{/if}}
+
+ {{if $fields.music}}
+ {{include file="field_textarea.tpl" field=$music}}
+ {{/if}}
+
+ {{if $fields.book}}
+ {{include file="field_textarea.tpl" field=$book}}
+ {{/if}}
+
+ {{if $fields.tv}}
+ {{include file="field_textarea.tpl" field=$tv}}
+ {{/if}}
+
+ {{if $fields.film}}
+ {{include file="field_textarea.tpl" field=$film}}
+ {{/if}}
+
+ {{if $fields.romance}}
+ {{include file="field_textarea.tpl" field=$romance}}
+ {{/if}}
+
+ {{if $fields.work}}
+ {{include file="field_textarea.tpl" field=$work}}
+ {{/if}}
+
+ {{if $fields.education}}
+ {{include file="field_textarea.tpl" field=$education}}
+ {{/if}}
+
+ {{if $extra_fields}}
+ {{foreach $extra_fields as $field }}
+ {{include file="field_input.tpl" field=$field}}
+ {{/foreach}}
+ {{/if}}
+ <div class="form-group" >
+ <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+ </div>
+ <div class="clear"></div>
+ </div>
+ </div>
</div>
- <div class="clear"></div>
- {{/if}}
-
- {{if $fields.politic}}
- {{include file="field_input.tpl" field=$politic}}
{{/if}}
-
- {{if $fields.religion}}
- {{include file="field_input.tpl" field=$religion}}
- {{/if}}
-
- {{if $fields.keywords}}
- {{include file="field_input.tpl" field=$keywords}}
- {{/if}}
-
- {{if $fields.about}}
- {{include file="field_textarea.tpl" field=$about}}
- {{/if}}
-
- {{if $fields.contact}}
- {{include file="field_textarea.tpl" field=$contact}}
- {{/if}}
-
-
- {{if $fields.interest}}
- {{include file="field_textarea.tpl" field=$interest}}
- {{/if}}
-
- {{if $fields.likes}}
- {{include file="field_textarea.tpl" field=$likes}}
- {{/if}}
-
- {{if $fields.dislikes}}
- {{include file="field_textarea.tpl" field=$dislikes}}
- {{/if}}
-
- {{if $fields.channels}}
- {{include file="field_textarea.tpl" field=$channels}}
- {{/if}}
-
- {{if $fields.music}}
- {{include file="field_textarea.tpl" field=$music}}
- {{/if}}
-
- {{if $fields.book}}
- {{include file="field_textarea.tpl" field=$book}}
- {{/if}}
-
- {{if $fields.tv}}
- {{include file="field_textarea.tpl" field=$tv}}
- {{/if}}
-
- {{if $fields.film}}
- {{include file="field_textarea.tpl" field=$film}}
- {{/if}}
-
-
- {{if $fields.romance}}
- {{include file="field_textarea.tpl" field=$romance}}
- {{/if}}
-
- {{if $fields.work}}
- {{include file="field_textarea.tpl" field=$work}}
- {{/if}}
-
- {{if $fields.education}}
- {{include file="field_textarea.tpl" field=$education}}
- {{/if}}
-
- {{if $extra_fields}}
- {{foreach $extra_fields as $field }}
- {{include file="field_input.tpl" field=$field}}
- {{/foreach}}
- {{/if}}
-
- <div class="form-group" >
- <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
- </div>
- <div class="clear"></div>
</div>
</form>
- </div>
</div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 943cc6339..cff1e4e14 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -45,7 +45,7 @@
{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
- {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+ {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="icon-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl
index 91102306c..d3762d950 100755
--- a/view/tpl/profile_vcard_short.tpl
+++ b/view/tpl/profile_vcard_short.tpl
@@ -26,7 +26,7 @@
{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
- {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+ {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="icon-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}