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

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

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-14 19:14:07 +02:00
commit 1062907dca
6 changed files with 118 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/controllers/_application_controller.js.coffee
View file

@ -557,6 +557,7 @@ class App.ControllerModal extends App.Controller
backdrop: true backdrop: true
keyboard: true keyboard: true
close: true close: true
large: false
head: '?' head: '?'
buttonClass: 'btn--success' buttonClass: 'btn--success'
centerButtons: [] centerButtons: []
@ -565,6 +566,8 @@ class App.ControllerModal extends App.Controller
options = _.extend( defaults, options ) options = _.extend( defaults, options )
@className += ' modal--large' if options.large
super(options) super(options)
if @shown if @shown

1
app/assets/javascripts/app/controllers/calendar.js.coffee
View file

@ -52,6 +52,7 @@ class Index extends App.ControllerContent
newDialog: => newDialog: =>
console.log('NEW') console.log('NEW')
@newItemModal = new App.ControllerModal @newItemModal = new App.ControllerModal
large: true
head: 'New Calendar' head: 'New Calendar'
content: App.view('calendar/new')() content: App.view('calendar/new')()
button: 'Create' button: 'Create'

2
app/assets/javascripts/app/controllers/layout_ref.js.coffee
View file

@ -1600,7 +1600,7 @@ class PrimaryEmailRef extends App.ControllerContent
@render() @render()
render: -> render: ->
@html App.view('layout_ref/primary_email') @html App.view('layout_ref/primary_email')()
App.Config.set( 'layout_ref/primary_email', PrimaryEmailRef, 'Routes' ) App.Config.set( 'layout_ref/primary_email', PrimaryEmailRef, 'Routes' )

147
app/assets/javascripts/app/views/calendar/new.jst.eco
View file

@ -12,7 +12,7 @@
<div class="formGroup-label"> <div class="formGroup-label">
<label for="name">Timezone <span>*</span></label> <label for="name">Timezone <span>*</span></label>
</div> </div>
<div class="controls"> <div class="controls" style="position: relative">
<select class="form-control js-selectTimezone" name="timezone"> <select class="form-control js-selectTimezone" name="timezone">
<option value="Africa/Abidjan">Africa/Abidjan (GMT0)</option> <option value="Africa/Abidjan">Africa/Abidjan (GMT0)</option>
@ -563,98 +563,87 @@
<label for="name">Business Hours <span>*</span></label> <label for="name">Business Hours <span>*</span></label>
</div> </div>
<div class="controls"> <div class="controls">
<table class="settings-list"> <table class="settings-list settings-list--stretch settings-list--toggleColumn">
<thead> <thead>
<tr> <tr>
<th style="text-align: center"> <th style="text-align: center">
<%- @T('Day') %> <label class="day-name"><input class="js-activateColumn" data-target="monday" type="checkbox" checked> Monday</label>
<th style="text-align: center"> <th style="text-align: center">
<%- @T('From/Till') %> <label class="day-name"><input class="js-activateColumn" data-target="tuesday" type="checkbox" checked> Tuesday</label>
<th style="text-align: center"> <th style="text-align: center">
<%- @T('From/Till') %> <label class="day-name"><input class="js-activateColumn" data-target="wednesday" type="checkbox" checked> Wednesday</label>
<th style="text-align: center">
<label class="day-name"><input class="js-activateColumn" data-target="thursday" type="checkbox" checked> Thursday</label>
<th style="text-align: center">
<label class="day-name"><input class="js-activateColumn" data-target="friday" type="checkbox" checked> Friday</label>
<th style="text-align: center">
<label class="day-name"><input class="js-activateColumn" data-target="saturday" type="checkbox"> Saturday</label>
<th style="text-align: center">
<label class="day-name"><input class="js-activateColumn" data-target="sunday" type="checkbox"> Sunday</label>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td><%- @T('Monday') %></td> <td data-column="monday" class="form-group day-time is-active">
<td> <label for="monday_start_time">from</label>
<input type="text" name="mon_start_time" value="07:00" class="time time--12 js-time"> <input type="text" id="monday_start_time" value="07:00" class="form-control form-control--small time js-time">
<input type="text" name="mon_end_time" value="18:00" class="time time--12 js-time"> <label for="monday_end_time">till</label>
</td> <input type="text" id="monday_end_time" value="18:00" class="form-control form-control--small time js-time">
<td>
<input type="text" name="mon_start_time" value="" class="time time--12 js-time"> <td data-column="tuesday" class="form-group day-time is-active">
<input type="text" name="mon_end_time" value="" class="time time--12 js-time"> <label for="tuesday_start_time">from</label>
</td> <input type="text" id="tuesday_start_time" value="07:00" class="form-control form-control--small time js-time">
<label for="tuesday_end_time">till</label>
<input type="text" id="tuesday_end_time" value="18:00" class="form-control form-control--small time js-time">
<td data-column="wednesday" class="form-group day-time is-active">
<label for="wednesday_start_time">from</label>
<input type="text" id="wednesday_start_time" value="07:00" class="form-control form-control--small time js-time">
<label for="wednesday_end_time">till</label>
<input type="text" id="wednesday_end_time" value="18:00" class="form-control form-control--small time js-time">
<td data-column="thursday" class="form-group day-time is-active">
<label for="thursday_start_time">from</label>
<input type="text" id="thursday_start_time" value="07:00" class="form-control form-control--small time js-time">
<label for="thursday_end_time">till</label>
<input type="text" id="thursday_end_time" value="18:00" class="form-control form-control--small time js-time">
<td data-column="friday" class="form-group day-time is-active">
<label for="friday_start_time">from</label>
<input type="text" id="friday_start_time" value="07:00" class="form-control form-control--small time js-time">
<label for="friday_end_time">till</label>
<input type="text" id="friday_end_time" value="13:00" class="form-control form-control--small time js-time">
<td data-column="saturday" class="form-group day-time">
<label for="saturday_start_time">from</label>
<input type="text" id="saturday_start_time" value="07:00" class="form-control form-control--small time js-time">
<label for="saturday_end_time">till</label>
<input type="text" id="saturday_end_time" value="18:00" class="form-control form-control--small time js-time">
<td data-column="sunday" class="form-group day-time">
<label for="sunday_start_time">from</label>
<input type="text" id="sunday_start_time" value="07:00" class="form-control form-control--small time js-time">
<label for="sunday_end_time">till</label>
<input type="text" id="sunday_end_time" value="18:00" class="form-control form-control--small time js-time">
</tr> </tr>
<tr> <tr>
<td><%- @T('Tuesday') %></td> <td data-column="monday" class="settings-list-action-cell js-add-time is-active">
<td> <%- @Icon('plus') %>
<input type="text" name="tue_start_time" value="07:00" class="time time--12 js-time"> <td data-column="tuesday" class="settings-list-action-cell js-add-time is-active">
<input type="text" name="tue_end_time" value="18:00" class="time time--12 js-time"> <%- @Icon('plus') %>
</td> <td data-column="wednesday" class="settings-list-action-cell js-add-time is-active">
<td> <%- @Icon('plus') %>
<input type="text" name="tue_start_time" value="" class="time time--12 js-time"> <td data-column="thursday" class="settings-list-action-cell js-add-time is-active">
<input type="text" name="tue_end_time" value="" class="time time--12 js-time"> <%- @Icon('plus') %>
</td> <td data-column="friday" class="settings-list-action-cell js-add-time is-active">
</tr> <%- @Icon('plus') %>
<tr> <td data-column="saturday" class="settings-list-action-cell js-add-time">
<td><%- @T('Wednesday') %></td> <%- @Icon('plus') %>
<td> <td data-column="sunday" class="settings-list-action-cell js-add-time">
<input type="text" name="wed_start_time" value="07:00" class="time time--12 js-time"> <%- @Icon('plus') %>
<input type="text" name="wed_end_time" value="18:00" class="time time--12 js-time">
</td>
<td>
<input type="text" name="wed_start_time" value="" class="time time--12 js-time">
<input type="text" name="wed_end_time" value="" class="time time--12 js-time">
</td>
</tr>
<tr>
<td><%- @T('Thursday') %></td>
<td>
<input type="text" name="thu_start_time" value="07:00" class="time time--12 js-time">
<input type="text" name="thu_end_time" value="18:00" class="time time--12 js-time">
</td>
<td>
<input type="text" name="thu_start_time" value="" class="time time--12 js-time">
<input type="text" name="thu_end_time" value="" class="time time--12 js-time">
</td>
</tr>
<tr>
<td><%- @T('Friday') %></td>
<td>
<input type="text" name="fri_start_time" value="07:00" class="time time--12 js-time">
<input type="text" name="fri_end_time" value="18:00" class="time time--12 js-time">
</td>
<td>
<input type="text" name="fri_start_time" value="" class="time time--12 js-time">
<input type="text" name="fri_end_time" value="" class="time time--12 js-time">
</td>
</tr>
<tr>
<td><%- @T('Saturday') %></td>
<td>
<input type="text" name="sat_start_time" value="" class="time time--12 js-time">
<input type="text" name="sat_end_time" value="" class="time time--12 js-time">
</td>
<td>
<input type="text" name="sat_start_time" value="" class="time time--12 js-time">
<input type="text" name="sat_end_time" value="" class="time time--12 js-time">
</td>
</tr>
<tr>
<td><%- @T('Sunday') %></td>
<td>
<input type="text" name="sun_start_time" value="" class="time time--12 js-time">
<input type="text" name="sun_end_time" value="" class="time time--12 js-time">
</td>
<td>
<input type="text" name="sun_start_time" value="" class="time time--12 js-time">
<input type="text" name="sun_end_time" value="" class="time time--12 js-time">
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>

2
app/assets/javascripts/app/views/layout_ref/primary_email.jst.eco
View file

@ -5,7 +5,7 @@
<form> <form>
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<div class="modal-close js-close"></div> <div class="modal-close js-close"><%- @Icon('diagonal-cross') %></div>
<h1 class="modal-title">New: User</h1> <h1 class="modal-title">New: User</h1>
</div> </div>

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

@ -779,7 +779,7 @@ label,
display: block; display: block;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
letter-spacing: 0.1em; letter-spacing: 0.05em;
margin-bottom: 4px; margin-bottom: 4px;
text-align: left; text-align: left;
padding: 0; padding: 0;
@ -1054,6 +1054,10 @@ input.time {
box-sizing: content-box; box-sizing: content-box;
padding: 0 6px; padding: 0 6px;
line-height: 42px; line-height: 42px;
&.form-control--small {
line-height: 31px;
}
} }
input.time.time--12 { input.time.time--12 {
@ -4514,6 +4518,9 @@ footer {
margin-top: 35px; margin-top: 35px;
margin-bottom: 35px; margin-bottom: 35px;
} }
.modal--large .modal-dialog {
max-width: 740px;
}
.modal-dialog.wizard { .modal-dialog.wizard {
max-width: 460px; max-width: 460px;
} }
@ -5773,13 +5780,28 @@ output {
} }
.form-group.day-time { .form-group.day-time {
padding: 5px; padding-bottom: 4px;
label {
text-align: center;
}
.form-control {
margin-left: auto;
margin-right: auto;
margin-bottom: 5px;
}
} }
.settings-list { .settings-list {
border-collapse: separate; border-collapse: separate;
color: hsl(60,1%,34%); color: hsl(60,1%,34%);
background: white; background: white;
table-layout: auto;
&.settings-list--stretch {
width: 100%;
}
&:not(:last-child) { &:not(:last-child) {
margin-bottom: 34px; margin-bottom: 34px;
@ -5799,7 +5821,7 @@ output {
th, td { th, td {
padding: 10px; padding: 5px;
border: 1px solid hsl(198,18%,86%); border: 1px solid hsl(198,18%,86%);
} }
@ -5807,6 +5829,8 @@ output {
font-weight: normal; font-weight: normal;
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 12px;
padding-top: 8px;
padding-bottom: 8px;
letter-spacing: 1px; letter-spacing: 1px;
background: hsl(197,20%,93%); background: hsl(197,20%,93%);
border-bottom: none; border-bottom: none;
@ -5853,6 +5877,23 @@ output {
} }
} }
.settings-list-action-cell {
@extend .u-clickable;
text-align: center;
background: hsl(197,22%,96%);
&:hover {
.icon {
fill: hsl(60,1%,34%);
}
}
.icon {
fill: hsl(198,19%,72%);
vertical-align: top;
}
}
.select-boxes { .select-boxes {
display: flex; display: flex;