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

Merge branch 'interface' of github.com:martini/zammad into interface

Browse source
This commit is contained in:
Martin Edenhofer 2014-09-30 15:27:23 +02:00
commit 965893eace
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -1,5 +1,5 @@
<h2><%- @T( 'Change your password' ) %></h2> <h2><%- @T( 'Change your password' ) %></h2>
<form class="form-normal"> <form class="settings-entry">
<div class="password_item"></div> <div class="password_item"></div>
<button type="submit" class="btn"><%- @T( 'Submit' ) %></button> <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
</form> </form>