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

date + time layoutRef

Browse source
This commit is contained in:
Felix Niklas 2015-09-29 15:54:14 +02:00
parent 51963fe859
commit 1ad13c2b59
4 changed files with 682 additions and 610 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -848,6 +848,8 @@ class TicketZoomRef extends App.ControllerContent
startDate: new Date().toLocaleDateString("en-US") # returns 9/25/2015
container: @$('.js-datepicker').parent()
@$('.js-timepicker').timepicker()
# for testing purposes the highlights get stored in localStorage
loadHighlights: ->
if highlights = localStorage['highlights']

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

@ -39,7 +39,7 @@
<p>
Enter the link provided by the plugin at the end of the installation to link the two systems:
</p>
<div class="form-group fromGroup--standalone">
<div class="form-group formGroup--standalone">
<label for="otrs-link">OTRS Link</label>
<div class="u-positionOrigin">
<input type="url" id="otrs-link" class="form-control" placeholder="http://otrs.company.de/otrs">

75
app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco
View file

@ -1,3 +1,4 @@
<div class="tabsSidebar-holder">
<div class="main no-padding flex tabsSidebar-sidebarSpacer tabsSidebar-tabsSpacer">
<div class="ticketZoom">
@ -447,15 +448,24 @@ Oliver<br></div>
pending reminder
</option>
</select>
<%- @Icon('arrow-down', 'dropdown-arrow') %>
</div><span class="help-inline"></span> <span class="help-block"></span>
</div>
</div>
<div class="datetime form-group">
<div class="formGroup-bundle">
<div class="date form-group flex">
<div class="formGroup-label">
<label for="Ticket_187247_pending_time">Pending till <span>*</span></label>
</div>
<div class="controls">
<input type="text" class="form-control js-datepicker">
<input type="text" value="10/28/2015" class="form-control js-datepicker">
</div>
</div>
<div class="formGroup-bundle-label">at</div>
<div class="datetime form-group">
<div class="controls">
<input type="text" value="08:00" class="form-control time js-timepicker">
</div>
</div>
</div>
<div class="select form-group">
@ -475,6 +485,7 @@ Oliver<br></div>
3 high
</option>
</select>
<%- @Icon('arrow-down', 'dropdown-arrow') %>
</div><span class="help-inline"></span> <span class="help-block"></span>
</div>
</div>
@ -617,8 +628,62 @@ Oliver<br></div>
</div>
</div>
<div class="tabsSidebar-tabs vertical justified">
<div class="tabsSidebar-tab active" data-tab="ticket"></div>
<div class="tabsSidebar-tab" data-tab="customer"></div>
<div class="tabsSidebar-tab" data-tab="organization"></div>
<div class="tabsSidebar-tab active" data-tab="ticket">
<%- @Icon('message') %>
</div>
<div class="tabsSidebar-tab" data-tab="customer">
<%- @Icon('person') %>
</div>
<div class="tabsSidebar-tab" data-tab="organization">
<%- @Icon('group') %>
</div>
</div>
</div>
<div class="attributeBar">
<form class="form-inline is-closed hide" role="form">
<div class="form-group">
<label for="update_ticket_1_state_id123" class="input-group-addon u-clickable">State</label>
<select id="update_ticket_1_state_id123" class="form-control level-1" name="state_id">
<option value="4">closed</option>
<option value="1" selected="">new</option>
<option value="2">open</option>
<option value="3">pending</option>
</select>
<%- @Icon('arrow-down', 'dropdown-arrow') %>
</div>
<div class="form-group is-changed">
<label for="update_ticket_1_priority_id123" class="input-group-addon u-clickable">Priority</label>
<select id="update_ticket_1_priority_id123" class="form-control" name="priority_id">
<option value="1">1 low</option>
<option value="2" selected="">2 normal</option>
<option value="3">3 high</option>
</select>
<svg class="icon icon-arrow-down dropdown-arrow"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-arrow-down"></use></svg>
</div>
<div class="form-group">
<label for="update_ticket_1_group_id123" class="input-group-addon u-clickable">Group</label>
<select id="update_ticket_1_group_id123" class="form-control" name="group_id">
<option value="4">FillGroup::450863</option>
<option value="3">FillGroup::918672</option>
<option value="2">Twitter</option>
<option value="1" selected="">Users</option>
</select>
<svg class="icon icon-arrow-down dropdown-arrow"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-arrow-down"></use></svg>
</div>
<div class="form-group">
<label for="update_ticket_1_owner_id123" class="input-group-addon u-clickable">Owner</label>
<select id="update_ticket_1_owner_id123" class="form-control" name="owner_id">
<option value="">-</option>
<option value="3">Felix Niklas</option>
</select>
<svg class="icon icon-arrow-down dropdown-arrow"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-arrow-down"></use></svg>
</div>
</form>
<form class="form-inline">
<div class="form-group">
<button type="submit" class="btn btn--primary js-submit pull-right">Update</button>
<button type="submit" class="btn js-reset pull-right hide">Discard your unsaved changes.</button>
</div>
</form>
</div>
</div>

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

@ -867,7 +867,7 @@ fieldset {
}
}
fieldset .form-group {
fieldset > .form-group {
padding: 0 4px;
&:last-child {
@ -875,11 +875,6 @@ fieldset .form-group {
}
}
fieldset > *:not(.form-group) .form-control {
margin-left: 4px;
margin-right: 4px;
}
.form-group {
margin-bottom: 16px;
@ -888,7 +883,7 @@ fieldset > *:not(.form-group) .form-control {
}
}
.datetime.form-group .controls {
.date.form-group .controls {
position: relative;
}
@ -1071,10 +1066,20 @@ fieldset > *:not(.form-group) .form-control {
}
}
.fromGroup--standalone .form-control {
.formGroup--standalone .form-control {
margin-bottom: 0;
}
.formGroup-bundle {
display: flex;
align-items: flex-end;
margin: 0 4px;
.formGroup-bundle-label {
margin: 0 5px 27px 11px;
}
}
input[type="radio"],
input[type="checkbox"] {
margin: 0;