diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg new file mode 100644 index 000000000..71ccbd44e --- /dev/null +++ b/app/assets/images/sprite.svg @@ -0,0 +1,12 @@ + + + sprite + Created with Sketch (http://www.bohemiancoding.com/sketch) + + + + + + + + \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee index 62c30caf4..0a06528bd 100644 --- a/app/assets/javascripts/app/controllers/navigation.js.coffee +++ b/app/assets/javascripts/app/controllers/navigation.js.coffee @@ -1,4 +1,6 @@ class App.Navigation extends App.Controller + className: 'navigation flex vertical' + constructor: -> super @render() diff --git a/app/assets/javascripts/app/controllers/notify.js.coffee b/app/assets/javascripts/app/controllers/notify.js.coffee index 60104dd36..4f164a157 100644 --- a/app/assets/javascripts/app/controllers/notify.js.coffee +++ b/app/assets/javascripts/app/controllers/notify.js.coffee @@ -1,5 +1,4 @@ class App.Notify extends Spine.Controller - className: 'container' events: 'click .alert': 'destroy' diff --git a/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee b/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee index 49c372518..1f57e568b 100644 --- a/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee @@ -22,13 +22,13 @@ class App.Run extends App.Controller App.Auth.loginCheck() # start navbars - @setupWidget( 'Navigations', 'nav', @el.find('nav') ) + @setupWidget( 'Navigations', 'nav', @el.find('#nav') ) # start widgets - @setupWidget( 'Widgets', 'widget', @el.find('section') ) + @setupWidget( 'Widgets', 'widget', @el ) # start widgets - @setupWidget( 'Footers', 'footer', @el.find('footer') ) + # @setupWidget( 'Footers', 'footer', @el.find('footer') ) # bind to fill selected text into App.ClipBoard.bind( @el ) @@ -47,7 +47,7 @@ class App.Run extends App.Controller App.Event.trigger( event + ':ready') class App.Content extends App.Controller - className: 'content' + className: 'content flex' constructor: -> super diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco index 2462ec549..f6514f22c 100644 --- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco @@ -1,4 +1,4 @@ -
+
@@ -7,7 +7,7 @@
-
+

<%- @T( 'New Ticket' ) %> (<%- @T( @title ) %>)<% if @admin: %> <% end %>

diff --git a/app/assets/javascripts/app/views/agent_ticket_view.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view.jst.eco index bfbc8256a..224756a31 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view.jst.eco @@ -1,4 +1,4 @@ -
+
-
+
diff --git a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco index a84e55d2c..3024b1ffe 100644 --- a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco @@ -1,7 +1,7 @@ -
+
-
+
diff --git a/app/assets/javascripts/app/views/dashboard.jst.eco b/app/assets/javascripts/app/views/dashboard.jst.eco index 470646e21..cd2854c98 100644 --- a/app/assets/javascripts/app/views/dashboard.jst.eco +++ b/app/assets/javascripts/app/views/dashboard.jst.eco @@ -1,23 +1,13 @@ -
+
-
+

<%- @T( @head ) %>

- -
- -
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco b/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco index e7f44e7b5..32e6abf0f 100644 --- a/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco +++ b/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco @@ -1,4 +1,4 @@ -
+
    @@ -10,7 +10,7 @@
-
+

<%- @T( @page.head ) %> <%- @T( @page.sub_head ) %>

diff --git a/app/assets/javascripts/app/views/generic/content_two.jst.eco b/app/assets/javascripts/app/views/generic/content_two.jst.eco index 0b901d7e7..8bceca803 100644 --- a/app/assets/javascripts/app/views/generic/content_two.jst.eco +++ b/app/assets/javascripts/app/views/generic/content_two.jst.eco @@ -1,6 +1,6 @@ -
+
-
+
diff --git a/app/assets/javascripts/app/views/generic/content_two_title.jst.eco b/app/assets/javascripts/app/views/generic/content_two_title.jst.eco index c91bb61ff..0b3646c90 100644 --- a/app/assets/javascripts/app/views/generic/content_two_title.jst.eco +++ b/app/assets/javascripts/app/views/generic/content_two_title.jst.eco @@ -1,7 +1,7 @@ -
+
-
+

<%- @T( @head ) %> <%- @T( @sub_head ) %>

diff --git a/app/assets/javascripts/app/views/generic/navbar_l2.jst.eco b/app/assets/javascripts/app/views/generic/navbar_l2.jst.eco index fa62add22..610816b04 100644 --- a/app/assets/javascripts/app/views/generic/navbar_l2.jst.eco +++ b/app/assets/javascripts/app/views/generic/navbar_l2.jst.eco @@ -1,4 +1,4 @@ -
+
<% if @groups: %> @@ -15,5 +15,5 @@ <% end %>
-
+
diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco index 3336d01f0..66c9afb87 100644 --- a/app/assets/javascripts/app/views/navigation.jst.eco +++ b/app/assets/javascripts/app/views/navigation.jst.eco @@ -1,38 +1,38 @@ -
- <%- @C( 'product_name' ) %> - - +<% end %> \ No newline at end of file diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index ddd9b23a0..423ef1750 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -1,9 +1,9 @@ -
+
-
+
diff --git a/app/assets/javascripts/app/views/user_zoom.jst.eco b/app/assets/javascripts/app/views/user_zoom.jst.eco index 8c77dfc41..7c50a5d79 100644 --- a/app/assets/javascripts/app/views/user_zoom.jst.eco +++ b/app/assets/javascripts/app/views/user_zoom.jst.eco @@ -1,9 +1,9 @@ -
+
-
+
diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 5f906938a..f104c3891 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -14,7 +14,7 @@ body { .spinner { float: left; - background:url("/assets/images/spinner.gif") no-repeat; + background: url("/assets/images/spinner.gif") no-repeat; background-position: center center; padding: 44px 10px 0 10px; width: 10px; @@ -113,14 +113,7 @@ table th, table td { left: 0; } -.content-two { - top: 78px; - bottom: 0; - left: 0; - right: 0; - position: fixed; - z-index: -5000; -} + .content-two .sidebar { padding: 8px 10px 42px; @@ -300,22 +293,13 @@ table th, table td { border-right: 1px solid #563d7c; } -#global-search { - width: 150px; - border-radius: 8px; - background-color: #f4f4f4; -} -#global-search:focus { - width: 200px; - background-color: #ffffff; -} - #task { position: fixed; display: table; width: 100%; min-width: 1000px; top: 46px; + display: none; } #task > .taskbar { @@ -450,10 +434,10 @@ label { .content { overflow: auto; - padding: 10px; } .content.fit { + padding: 10px; background: #2c2d36; z-index: 1; } @@ -1039,76 +1023,6 @@ footer { color: #bbb; } -.navbar { - min-height: 46px; - min-width: 1000px; -} - -.navbar-form { - margin-top: 6px; - margin-bottom: 6px; - padding: 0; -} - -.navbar-brand { - height: auto; - line-height: 18px; - font-weight: 200; - padding-top: 13px; - padding-bottom: 13px; -} - -.navbar-nav > li > a { - line-height: 18px; - padding-top: 13px; - padding-bottom: 13px; -} - -.navbar .bell { - display: none; -} -.navbar .bell.show { - display: block; -} -.navbar .bell.show a { - color: #fff; -} - -.nav.navbar-nav.navbar-right { - padding-right: 15px; -} - -.nav.nav-tabs.nav-stacked > li > a > span { - visibility: hidden; -} -.nav.nav-tabs.nav-stacked > li > a:hover > span { - visibility: visible; -} - -.nav-sub{ - margin-left: 12px; - font-size: 12px; -} - -.nav.nav-pills > li > a > span.local { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - display: block; - margin-right: 22px; -} -.nav.nav-pills > li > a > span.badge { - margin-top: -18px; -} - -.nav.nav-pills li .glyphicon { - display: none; -} -.nav.nav-pills li:hover .glyphicon, .nav li:focus .glyphicon { - display: inline-block; - text-decoration: none; -} - .customer-info { width: 100%; padding-top: 7px; @@ -1214,3 +1128,93 @@ footer { background: #419ed7; border-color: #419ed7; } + +.logo { + width: 41px; + height: 36px; + background: url(<%= asset_path "logo.svg" %>); +} + +.navigation { + width: 260px; + background: #26272e; +} + + .navigation .navbar-nav, + .navigation .navbar-nav > li { + float: none; + } + + .nav > li.active > a, + .nav > li > a:hover, + .nav > li > a:focus { + background: none; + color: #F0FAFF; + } + + .nav > li.active > a:before, + .nav > li > a:hover:before, + .nav > li > a:focus:before { + opacity: 1; + } + + .navbar-nav > li > a { + padding: 11px 15px; + color: rgba(240, 250, 255, .25); + border-bottom: 1px solid rgba(240, 250, 255, .05); + } + + .navbar-nav > li.active a { + background: #389ed9; + } + + li.dashboard a:before, + li.overviews a:before, + li.customers a:before { + content: ''; + width: 24px; + height: 25px; + margin-right: 15px; + display: inline-block; + background: url(<%= asset_path "sprite.svg" %>) no-repeat; + vertical-align: bottom; + opacity: .25; + } + + li.overviews a:before { + background-position: -24px 0; + } + + li.customers a:before { + background-position: -48px 0; + } + +.search { + padding: 10px; + border-bottom: 1px solid rgba(240, 250, 255, .05); +} + +.search input { + padding: 5px 10px 5px 33px; + margin-right: 10px; + width: 100px; + height: 30px; + color: #ECECEC; + line-height: 20px; + background: #31373b url(<%= asset_path "sprite.svg" %>) no-repeat 10px -26px; + outline: none; + border: none; + border-radius: 15px; +} + +.sidebar { + width: 270px; + padding: 10px 20px; + background: white; + border-right: 1px solid #e6e6e6; +} + +.main { + padding: 10px 20px; + background: #f8f9fa; +} \ No newline at end of file diff --git a/app/views/init/index.html.erb b/app/views/init/index.html.erb index 5f0faeb41..be9ca7017 100644 --- a/app/views/init/index.html.erb +++ b/app/views/init/index.html.erb @@ -1,7 +1,5 @@ -
- -
-
+
+
diff --git a/config/environments/development.rb b/config/environments/development.rb index 000009e02..53df25ea9 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -34,7 +34,6 @@ Zammad::Application.configure do config.middleware.use(Rack::LiveReload, :min_delay => 500, # default 1000 :max_delay => 10_000, # default 60_000 - :live_reload_port => 67789, # default 35729 :source => :vendored ) end