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-10-18 20:43:31 +02:00
commit c82afde66b
12 changed files with 155 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2055,6 +2055,15 @@ class chatWindowRef extends Spine.Controller
scrollToBottom: ->
@scrollHolder.scrollTop(@scrollHolder.prop('scrollHeight'))
class AdminLoadRef extends App.ControllerContent
constructor: ->
super
@render()
render: ->
@html App.view('layout_ref/admin_loading')()
App.Config.set( 'layout_ref/admin_loading', AdminLoadRef, 'Routes' )
App.Config.set( 'LayoutRef', { prio: 1700, parent: '#current_user', name: 'Layout Reference', translate: true, target: '#layout_ref', role: [ 'Admin' ] }, 'NavBarRight' )

29
app/assets/javascripts/app/controllers/ticket_zoom.coffee
View file

@ -258,23 +258,34 @@ class App.TicketZoom extends App.Controller
positionPageHeaderStop: =>
@main.unbind('scroll', @positionPageHeaderUpdate)
@scrollHeaderPos: undefined
positionPageHeaderUpdate: =>
headerHeight = @scrollPageHeader.outerHeight()
mainScrollHeigth = @main.prop('scrollHeight')
mainHeigth = @main.height()
# if page header is possible to use, show page header
top = 0
if mainScrollHeigth > mainHeigth + headerHeight
scroll = @main.scrollTop()
if scroll <= headerHeight
top = (scroll - headerHeight)
scroll = @main.scrollTop()
# if page header is not possible to use - mainScrollHeigth to low - hide page header
else
top = -headerHeight
if not mainScrollHeigth > mainHeigth + headerHeight
@scrollPageHeader.css('transform', "translateY(#{-headerHeight}px)")
@scrollPageHeader.css('transform', "translateY(#{top}px)")
if scroll > headerHeight
scroll = headerHeight
if scroll is @scrollHeaderPos
return
#marginTop: 0 .. headerHeight
@main.css('margin-top', scroll)
# translateY: 0 .. -headerHeight
@ticketZoom.css('transform', "translateY(-#{scroll}px)")
# translateY: headerHeight .. 0
@scrollPageHeader.css('transform', "translateY(#{scroll - headerHeight}px)")
@scrollHeaderPos = scroll
render: =>

96
app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco Normal file
View file

@ -0,0 +1,96 @@
<div class="sidebar NavBarAdmin">
<h2>Manage</h2>
<ul class="nav nav-pills nav-stacked">
<li class="">
<a href="#manage/users">Users</a>
<li>
<a href="#manage/groups">Groups</a>
<li>
<a href="#manage/organizations">Organizations</a>
<li>
<a href="#manage/overviews">Overviews</a>
<li>
<a href="#manage/text_modules">TextModules</a>
<li>
<a href="#manage/slas">SLAs</a>
<li>
<a href="#manage/schedulers">Schedulers</a>
<li>
<a href="#manage/triggers">Triggers</a>
</ul>
<h2>Channels</h2>
<ul class="nav nav-pills nav-stacked">
<li>
<a href="#channels/web">Web</a>
<li class="active">
<a href="#channels/email">Email</a>
<li>
<a href="#channels/chat">Chat</a>
<li>
<a href="#channels/twitter">Twitter</a>
<li>
<a href="#channels/facebook">Facebook</a>
</ul>
<h2>Settings</h2>
<ul class="nav nav-pills nav-stacked">
<li>
<a href="#settings/system">System</a>
<li>
<a href="#settings/security">Security</a>
<li>
<a href="#settings/import">Import</a>
<li>
<a href="#settings/ticket">Ticket</a>
</ul>
<h2>System</h2>
<ul class="nav nav-pills nav-stacked">
<li>
<a href="#system/package">Packages</a>
<li>
<a href="#system/object_manager">Objects</a>
<li>
<a href="#system/translation">Translations</a>
<li>
<a href="#system/maintenance">Maintenance</a>
<li>
<a href="#system/sessions">Sessions</a>
</ul>
</div>
<div class="main flex">
<div class="page-header">
<div class="page-header-title">
<h1>Email <small></small></h1>
</div>
</div>
<ul class="nav nav-tabs" role="tablist">
<li class="active"><a href="#c-account" role="tab" data-toggle="tab" aria-expanded="true">Accounts</a></li>
<li><a href="#c-filter" role="tab" data-toggle="tab">Filter</a></li>
<li><a href="#c-signature" role="tab" data-toggle="tab">Signatures</a></li>
<li><a href="#c-setting" role="tab" data-toggle="tab">Settings</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="c-account">
<h2>Email</h2>
<div class="action action--loading">
<div class="small loading icon"></div>
<div class="action-loading-label">Collecting Email Settings..</div>
</div>
</div>
</div>
</div>

1
app/assets/javascripts/app/views/layout_ref/index.jst.eco
View file

@ -4,6 +4,7 @@
<ul>
<li><a href="#layout_ref/admin_loading">Admin Loading Screen</a></li>
<li><a href="#layout_ref/customer_chat">Customer Chat</a></li>
<li><a href="#layout_ref/ticket_zoom">Ticket Zoom</a></li>
<li><a href="#layout_ref/primary_email">Primary Email (New/Edit User)</a></li>

1
app/assets/stylesheets/svg-dimensions.css
View file

@ -63,6 +63,7 @@
.icon-reopening { width: 68px; height: 47px; }
.icon-reply-all { width: 16px; height: 16px; }
.icon-reply { width: 16px; height: 16px; }
.icon-report { width: 20px; height: 20px; }
.icon-signout { width: 15px; height: 19px; }
.icon-split { width: 16px; height: 16px; }
.icon-status-modified-inner-circle { width: 16px; height: 16px; }

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

@ -1186,7 +1186,7 @@ fieldset > .form-group {
float: left;
.form-control {
min-width: auto;
min-width: initial;
}
}
@ -4290,7 +4290,7 @@ footer {
.tabsSidebar-sidebarSpacer {
margin-right: $sidebarWidth;
transition: margin 500ms;
transition: marginRight 500ms;
}
.tabsSidebar-sidebarSpacer.is-closed {
@ -6464,6 +6464,16 @@ output {
}
}
&.action--loading {
min-height: 300px;
align-items: center;
justify-content: center;
.action-loading-label {
margin-left: 10px;
}
}
.action-flow {
display: flex;
flex-wrap: wrap;

BIN
contrib/icon-sprite.sketch
View file

Binary file not shown.

2
public/assets/images/icons.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

2
public/assets/images/icons/arrow-down.svg
View file

@ -6,7 +6,7 @@
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="arrow-down" sketch:type="MSArtboardGroup" fill="#50E3C2">
<path d="M7.203553,3.45693561 L2.98934,7.76411261 L4.417766,9.16397061 L9.317766,4.16397061 L10.01066,3.45693561 L9.31066,2.75693461 L4.41066,-2.14306539 L2.996446,-0.728851394 L7.203553,3.45693561 L7.203553,3.45693561 Z" sketch:type="MSShapeGroup" transform="translate(6.500000, 3.510453) rotate(90.000000) translate(-6.500000, -3.510453) "></path>
<path d="M6.553517,4.21400561 L2.24634,-0.000207393944 L0.846482,1.42821861 L5.846482,6.32821861 L6.553517,7.02111261 L7.253518,6.32111261 L12.153518,1.42111261 L10.739304,0.00689860606 L6.553517,4.21400561 L6.553517,4.21400561 Z" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 990 B

After

Width:  |  Height:  |  Size: 906 B

2
public/assets/images/icons/arrow-up.svg
View file

@ -6,7 +6,7 @@
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="arrow-up" sketch:type="MSArtboardGroup" fill="#50E3C2">
<path d="M10.064178,-0.76432 L8.63575201,-2.164178 L3.73575201,2.835822 L3.04285801,3.542857 L3.74285801,4.242858 L8.64285801,9.142858 L10.057072,7.728644 L5.94996501,3.542857 L10.064178,-0.76432 Z" sketch:type="MSShapeGroup" transform="translate(6.553518, 3.489340) rotate(90.000000) translate(-6.553518, -3.489340) "></path>
<path d="M10.807178,7 L12.207036,5.571574 L7.20703601,0.671574 L6.50000101,-0.02132 L5.80000001,0.67868 L0.900000013,5.57868 L2.31421401,6.992894 L6.50000101,2.885787 L10.807178,7 Z" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 963 B

After

Width:  |  Height:  |  Size: 854 B

2
public/assets/images/icons/logotype.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

12
public/assets/images/icons/report.svg Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
<title>report</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="report" sketch:type="MSArtboardGroup" fill="#50E3C2">
<path d="M0,6 L5,6 L5,20 L0,20 L0,6 Z M7,0 L13,0 L13,20 L7,20 L7,0 Z M15,13 L20,13 L20,20 L15,20 L15,13 Z" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 776 B