Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

make profile nav and headlines uniform to admin nav and headlines

Browse source
This commit is contained in:
Felix Niklas 2015-06-25 12:33:25 +02:00
parent 6a77365208
commit d119cc5eac
5 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/app/views/profile/language.jst.eco
View file

@ -1,8 +1,10 @@
<form class="form-normal">
<h2><%- @T( 'Language' ) %></h2>
<p><%- @T( 'Change your language.' ) %></p>
<div class="settings-entry horizontal end">
<div class="form-item language_item flex"></div>
<button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
<div class="page-header">
<div class="page-header-title">
<h1><%- @T( 'Language' ) %></h1>
</div>
</div>
<p><%- @T( 'Change your language.' ) %></p>
<form class="settings-entry horizontal end">
<div class="form-item language_item flex"></div>
<button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
</form>

6
app/assets/javascripts/app/views/profile/linked_accounts.jst.eco
View file

@ -1,4 +1,8 @@
<h2><%- @T( 'Link Accounts' ) %></h2>
<div class="page-header">
<div class="page-header-title">
<h1><%- @T( 'Link Accounts' ) %></h1>
</div>
</div>
<ul>
<% for auth_provider in @auth_providers: %>
<li><%- @T( auth_provider.name ) %> <% if !@user['accounts'] || !@user['accounts'][auth_provider.key]: %><a href="<%= auth_provider.url %>"><%- @T('Add') %></a><% else: %>"<%= @user['accounts'][auth_provider.key]['username'] %>" <a href="#" data-uid="<%= @user['accounts'][auth_provider.key]['uid'] %>" data-provider="<%= auth_provider.key %>" data-type="remove"><%- @T('remove') %></a><% end %></li>

4
app/assets/javascripts/app/views/profile/notification.jst.eco
View file

@ -1,4 +1,6 @@
<h2><%- @T( 'Notifications' ) %></h2>
<div class="page-header">
<div class="page-header-title"><h1><%- @T( 'Notifications' ) %></h1></div>
</div>
<form>

6
app/assets/javascripts/app/views/profile/password.jst.eco
View file

@ -1,4 +1,8 @@
<h2><%- @T( 'Change your password' ) %></h2>
<div class="page-header">
<div class="page-header-title">
<h1><%- @T( 'Change your password' ) %></h1>
</div>
</div>
<form class="settings-entry">
<div class="password_item"></div>
<button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>

13
app/assets/stylesheets/zammad.css.scss
View file

@ -2320,14 +2320,19 @@ footer {
border-left: 1px solid #e6e6e6;
}
.NavBarAdmin.sidebar {
padding-top: 1px;
.NavBarAdmin.sidebar,
.NavBarProfile.sidebar, {
width: $sidebarWidth;
}
.NavBarAdmin h2 {
h2 {
margin: 21px 0 12px;
}
h2:first-child {
margin-top: 0;
}
}
.nav-stacked > li + li {
margin-top: 0;
}