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

Fixes #3999 - Long role names get broken due to bad overflow

Browse source
This commit is contained in:
Mantas Masalskis 2022-03-09 22:32:12 +01:00
parent d6236a3afa
commit 513fadc8dc
2 changed files with 42 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
app/assets/javascripts/app/views/knowledge_base/permissions_dialog.jst.eco
View file

@ -1,33 +1,31 @@
<div style="padding-left: 18px; padding-top: 10px;"> <table class="settings-list settings-list--roles-permissions">
<table class="settings-list settings-list--roles-permissions"> <thead>
<thead> <th><%- @T('Role') %>
<th width=150><%- @T('Role') %> <% for key, text of @accessLevels: %>
<% for key, text of @accessLevels: %> <th><%- @T(text) %>
<th><%- @T(text) %> <% end %>
<% end %> <tbody>
<tbody> <% for role in @roles: %>
<% for role in @roles: %> <tr>
<tr> <td>
<td> <%= role.name %>
<%= role.name %>
<% for key, text of @accessLevels: %> <% for key, text of @accessLevels: %>
<td class="settings-list-control-cell settings-list-radio-cell u-clickable"> <td class="settings-list-control-cell settings-list-radio-cell u-clickable">
<label class="inline-label radio-replacement"> <label class="inline-label radio-replacement">
<input <input
type="radio" type="radio"
value="<%= key %>" value="<%= key %>"
name="<%= role.id %>" name="<%= role.id %>"
<% if @params[role.id] == key: %>checked<% end %> <% if @params[role.id] == key: %>checked<% end %>
<% if role.limit?: %> <% if role.limit?: %>
<% if key == 'editor' && role.limit != 'editor': %>disabled<% end %> <% if key == 'editor' && role.limit != 'editor': %>disabled<% end %>
<% if key == 'reader' && role.limit == 'none': %>disabled<% end %> <% if key == 'reader' && role.limit == 'none': %>disabled<% end %>
<% end %> <% end %>
/> />
<%- @Icon('radio', 'icon-unchecked') %> <%- @Icon('radio', 'icon-unchecked') %>
<%- @Icon('radio-checked', 'icon-checked') %> <%- @Icon('radio-checked', 'icon-checked') %>
</label> </label>
<% end %> <% end %>
</tr> </tr>
<% end %> <% end %>
</table>
</div>

12
app/assets/stylesheets/zammad.scss
View file

@ -10802,7 +10802,7 @@ output {
} }
td { td {
word-break: break-all; word-break: break-word;
} }
td.empty-cell { td.empty-cell {
@ -10958,6 +10958,16 @@ output {
} }
} }
.settings-list--roles-permissions {
margin-left: 18px;
margin-right: 18px;
margin-top: 10px;
th:first-child {
min-width: 150px;
}
}
.select-boxes { .select-boxes {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;