aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/profiles.php5
-rw-r--r--view/css/mod_profiles.css8
-rw-r--r--view/theme/redbasic/css/style.css28
-rwxr-xr-xview/tpl/profile_edit.tpl435
4 files changed, 242 insertions, 234 deletions
diff --git a/mod/profiles.php b/mod/profiles.php
index 2ffe7da63..c3f5679fe 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -686,7 +686,7 @@ function profiles_content(&$a) {
'$banner' => t('Edit Profile Details'),
'$submit' => t('Submit'),
'$viewprof' => t('View this profile'),
- '$editvis' => t('Edit visibility'),
+ '$editvis' => t('Edit visibility'),
'$coverpic' => t('Change Cover Photo'),
'$profpic' => t('Change Profile Photo'),
'$cr_prof' => t('Create a new profile using these settings'),
@@ -698,7 +698,6 @@ function profiles_content(&$a) {
'$lbl_gender' => t('Your Gender'),
'$lbl_marital' => t('Marital Status'),
'$lbl_sexual' => t('Sexual Preference'),
- '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
'$baseurl' => $a->get_baseurl(true),
'$profile_id' => $r[0]['id'],
'$profile_name' => array('profile_name', t('Profile Name'), $r[0]['profile_name'], '', '*'),
@@ -713,7 +712,7 @@ function profiles_content(&$a) {
'$locality' => array('locality', t('Locality/City'), $r[0]['locality']),
'$region' => array('region', t('Region/State'), $r[0]['region']),
'$postal_code' => array('postal_code', t('Postal/Zip Code'), $r[0]['postal_code']),
- '$country_name' => array('country', t('Country'), $r[0]['country_name']),
+ '$country_name' => array('country_name', t('Country'), $r[0]['country_name']),
'$gender' => gender_selector($r[0]['gender']),
'$gender_min' => gender_selector_min($r[0]['gender']),
'$marital' => marital_selector($r[0]['marital']),
diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css
new file mode 100644
index 000000000..eec67be15
--- /dev/null
+++ b/view/css/mod_profiles.css
@@ -0,0 +1,8 @@
+#profile-upload-form {
+ display: none;
+}
+
+#profile-upload-choose {
+ padding: 7px 10px;
+ width: 100%;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f365bec1a..5aee57cad 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -260,34 +260,6 @@ footer {
clear: both;
}
-#profile-edit-links {
- padding-top: 15px;
- padding-bottom: 15px;
-}
-
-#profile-edit-links .btn {
- margin: 0 10px 15px 0;
-}
-
-.profile-import {
- vertical-align: top;
- text-align: left;
-}
-
-.profile-import b {
- color: $link_colour;
-}
-
-.profile-import input {
- color: $font_colour;
- border: none;
-}
-
-#profile-edit-drop-link {
- color: #FFF;
- font-weight: normal;
-}
-
.fn {
font-weight: bold;
font-size: 16px;
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index f7da969a2..daa56e15c 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -1,206 +1,235 @@
<div class="generic-content-wrapper">
-
-<div class="section-title-wrapper"><h2>{{$banner}}</h2></div>
-
-<div class="section-content-wrapper">
-<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" >
-
-<div id="profile-edit-links">
-<span class="btn btn-default"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></span>
-{{if $is_default}}<span class="btn btn-default"><a href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}">{{$coverpic}}</a></span>{{/if}}
-<span class="btn btn-default"><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></span>
-{{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 ! $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>
-
-
-<div class="clear"></div>
-
-{{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>
-<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>
-
-{{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}}
-</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}}
-</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>
-
-</form>
-</div>
-</div>
+ <div class="section-title-wrapper">
+ <div class="dropdown pull-right" id="profile-edit-links">
+ <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <i class="icon-caret-down"></i>
+ </button>
+ <ul class="dropdown-menu">
+ <li class="nav-item">
+ <a class="nav-link" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a>
+ </li>
+ {{if $is_default}}
+ <li class="nav-item">
+ <a href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}">{{$coverpic}}</a>
+ </li>
+ {{/if}}
+ <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>
+ </li>
+ {{/if}}
+ {{if $profile_clone_link}}
+ <li class="divider"></li>
+ <li class="nav-item">
+ <a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a>
+ </li>
+ {{/if}}
+ {{if $exportable}}
+ <li class="divider"></li>
+ <li class="nav-item">
+ <a href="profiles/export/{{$profile_id}}">{{$lbl_export}}</a>
+ </li>
+ <li class="nav-item">
+ <a href="#" onClick="openClose('profile-upload-form'); return false;">{{$lbl_import}}</a>
+ </li>
+ {{/if}}
+ {{if ! $is_default}}
+ <li class="divider"></li>
+ <li class="nav-item">
+ <a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$del_prof}}</a>
+ </li>
+ {{/if}}
+ <ul>
+ </div>
+ <h2>{{$banner}}</h2>
+ <div class="clear"></div>
+ </div>
+ <div class="section-content-tools-wrapper" id="profile-upload-form">
+ <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" >
+ {{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>
+ <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>
+
+ {{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}}
+ </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}}
+ </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>