proxes 0.7.0 → 0.7.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -28,6 +28,7 @@
28
28
  /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
29
29
 
30
30
  %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js' }
31
+ %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/list.js/1.5.0/list.min.js' }
31
32
  %body
32
33
  #wrapper
33
34
  = haml :'partials/navbar', locals: { title: (defined?(title) ? title : 'ProxES') }
@@ -1,14 +1,14 @@
1
- .navbar.navbar-default.navbar-static-top{ role: 'navigation', style: 'margin-bottom: 0' }
1
+ .navbar.navbar-inverse.navbar-static-top{ role: 'navigation', style: 'margin-bottom: 0' }
2
2
  .navbar-header
3
3
  %span.navbar-brand
4
- ProxES
5
- - if defined? title
6
- = "- #{title}"
4
+ %a{ href: '/_proxes' }
5
+ ProxES
7
6
  %button.navbar-toggle.collapsed{ 'type' => 'button', 'data-toggle' => 'collapse', 'data-target' => '#navbar', 'aria-expanded' => 'false', 'aria-controls' => 'navbar' }
8
7
  %span.sr-only Toggle navigation
9
8
  %span.icon-bar.bar1
10
9
  %span.icon-bar.bar2
11
10
  %span.icon-bar.bar3
11
+
12
12
  -if authenticated?
13
13
  %form.nav.navbar-top-links.navbar-form.navbar-right{ action: '/_proxes/auth/identity', method: 'post' }
14
14
  %a.btn.btn-default{ href: "/_proxes/users/profile" } My Account
@@ -2,14 +2,27 @@
2
2
  - if authenticated?
3
3
  %li
4
4
  %a{ href: '/_proxes' }
5
- %i.fa.fa-dashboard.fa-fw
6
- Dashboard
5
+ %i.fa.fa-home.fa-fw
6
+ Home
7
7
  - ProxES::Container.navigation.each do |item|
8
- - if policy(item[:target]).list?
9
- %li
10
- %a{ href: "/_proxes#{item[:link]}" }
11
- %i.fa.fa-fw{ class: "fa-#{item[:icon]}" }
12
- = item[:text]
8
+ - if item[:target].nil? || policy(item[:target]).list?
9
+ - if item[:group]
10
+ %li
11
+ %a{ href: '#' }
12
+ %i.fa.fa-fw{ class: "fa-#{item[:icon]}" }
13
+ =item[:group]
14
+ %span.fa.arrow
15
+ %ul.nav.nav-second-level
16
+ - item[:items].each do |sub_item|
17
+ %li
18
+ %a{ href: "/_proxes#{sub_item[:link]}" }
19
+ %i.fa.fa-fw{ class: "fa-#{sub_item[:icon]}" }
20
+ = sub_item[:text]
21
+ - else
22
+ %li
23
+ %a{ href: "/_proxes#{item[:link]}" }
24
+ %i.fa.fa-fw{ class: "fa-#{item[:icon]}" }
25
+ = item[:text]
13
26
  - else
14
27
  %li.active
15
28
  %a{ href: '/_proxes/auth/identity' }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: proxes
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jurgens du Toit
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-07-22 00:00:00.000000000 Z
11
+ date: 2017-08-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler