Merge pull request #2847 from rabuzarus/0510-frio-edit-profile-button

frio: provide a edit profile button for the advanced profile page
This commit is contained in:
Tobias Diekershoff 2016-10-05 18:34:06 +02:00 committed by GitHub
commit 20e10a50c0
2 changed files with 21 additions and 7 deletions

View file

@ -835,17 +835,19 @@ nav.navbar a {
/*border-left: 3px solid #6fdbe8;*/ /*border-left: 3px solid #6fdbe8;*/
border-left: 3px solid $link_color; border-left: 3px solid $link_color;
color: #fff!important; color: #fff!important;
background-color: $menu_background_hover_color !important background-color: $menu_background_hover_color !important;
} }
.nav-pills.preferences .dropdown .dropdown-toggle { .nav-pills.preferences .dropdown .dropdown-toggle,
color: #bebebe .nav-pills.preferences > li > .btn {
color: #bebebe;
} }
.nav-pills.preferences .dropdown.open .dropdown-toggle, .nav-pills.preferences .dropdown.open .dropdown-toggle,
.nav-pills.preferences .dropdown.open .dropdown-toggle:hover { .nav-pills.preferences .dropdown.open .dropdown-toggle:hover {
background-color: $nav_bg background-color: $nav_bg;
} }
.nav-pills.preferences .dropdown .dropdown-toggle { .nav-pills.preferences .dropdown .dropdown-toggle,
.nav-pills.preferences > li > .btn {
padding: 2px 10px; padding: 2px 10px;
} }

View file

@ -1,5 +1,5 @@
<script> <script language="javascript" type="text/javascript">
// the following functions show/hide the specific profile page content // the following functions show/hide the specific profile page content
// in dependence of the selected nav // in dependence of the selected nav
function profileStandardActive() { function profileStandardActive() {
@ -21,6 +21,19 @@
<div id="profile-page" class="generic-page-wrapper"> <div id="profile-page" class="generic-page-wrapper">
<h3 class="">{{$title}}</h3> <h3 class="">{{$title}}</h3>
{{* The link to edit the profile*}}
{{if $profile.edit}}
<ul class="nav nav-pills preferences">
<li class="pull-right">
<a class="btn btn-link btn-sm" type="button" id="profile-edit-link" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}">
<i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;{{$profile.edit.1}}
</a>
</li>
</ul>
<div class="clear"></div>
{{/if}}
{{* Frio does split the profile information in "standard" and "advanced". This is the tab menu for swithching between this modes *}}
<ul id="profile-menu" class="nav nav-tabs" role="menubar" data-tabs="tabs"> <ul id="profile-menu" class="nav nav-tabs" role="menubar" data-tabs="tabs">
<li class="active" role="menuitem"><a id="profile-tab-standard-link" onclick="profileStandardActive(); return false;">{{$basic}}</a></li> <li class="active" role="menuitem"><a id="profile-tab-standard-link" onclick="profileStandardActive(); return false;">{{$basic}}</a></li>
<li role="menuitem"><a id="profile-tab-advanced-link" onclick="profileAdvancedActive(); return false;">{{$advanced}}</a></li> <li role="menuitem"><a id="profile-tab-advanced-link" onclick="profileAdvancedActive(); return false;">{{$advanced}}</a></li>
@ -226,4 +239,3 @@
{{/if}} {{/if}}
</div> </div>
</div> </div>