move buttons to dropdown menu and some cleanup

This commit is contained in:
Mario Vavti 2016-03-16 23:07:29 +01:00
parent d22b21c56f
commit 2165733ddc
4 changed files with 239 additions and 231 deletions

View File

@ -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']),

View File

@ -0,0 +1,8 @@
#profile-upload-form {
display: none;
}
#profile-upload-choose {
padding: 7px 10px;
width: 100%;
}

View File

@ -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;

View File

@ -1,30 +1,61 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper"><h2>{{$banner}}</h2></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" >
<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}}'>
@ -106,7 +137,6 @@
{{if $fields.howlong}}
{{include file="field_input.tpl" field=$howlong}}
{{/if}}
<div class="clear"></div>
{{/if}}
@ -198,9 +228,8 @@
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</form>
</div>
</div>
</div>