trusty-cms 2.0.7.pre.beta → 2.0.8.pre.beta

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZWY5YjBlNDg4Yzg4M2NkYWUxZWJjZmE2MGU2YzY4NmQxYzI2MmZlNw==
4
+ N2RhNDMwYWRhZTExZTk2MTc0NWQzMGVmM2U3MDY2NzM1ZTNiYjY4OA==
5
5
  data.tar.gz: !binary |-
6
- NzAyMTkyYWI4ZTJmNWQwNGJjMWMzNjMwZTgwMmQ3NjdkZGM1ZThmOA==
6
+ MjgzYmVlYjU4YTNhZDIxODFmNWE2NDBiODRmMDcyYzYxZWUzYmY4MQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MTQyNmUzZWFiY2IyMmU3NGQ1ZDBkNzdkMmVhMzE4ZmJlNjFiYjVlZWFiODkz
10
- OWU0MDFhMDU2MTAxNTU0ZGE1OWQwYjExZjRlZDRiZTM1ZWU3ZmMzMjFkMDdk
11
- ZGIwMTA0YWM1ZmMwNTlmYTVlY2QyYzAwYTkwMDFkNDNkZWQ5YmU=
9
+ MWE2MjFkMzVlM2NmZGMxYTkxY2VmMGIxMTMxODQ2ODZkMTU1ODIwYmQzYTNk
10
+ NjNmM2Y2Njc5OWE3NmMzMTNlZGRhZGU3ZTZhOGJmMjIxNTEzYzI5OTUyZjJm
11
+ MWVjODUwNTQ0YzE0NDE4ZWQxMDIxYWNlMjAzNTQ1MzdkMjQ5OWQ=
12
12
  data.tar.gz: !binary |-
13
- OTUxMGRjMGFmM2M1NTc5ZGNhZWFhYTU0OGJkY2U0NjY0YTBlY2MzOTE3NDFj
14
- Y2UyNDdiNzNkZDExMGJmYTU1MGY2MDRiOTk2YmQwMDQ0Nzg5Mjk0YTM1NmQ4
15
- YzIzM2VhNmUyZWY5NjAwNzUxOThlZWYyODQyMTk5ZTE2Y2U0MzM=
13
+ ZThkNTQ3NDIyMjZmZTJiZTIwZTUzZjQwODBlZmVlZGRkOGI1MmIwNTA5NzMz
14
+ YzdiYjI2ZDM1ZDBmYmQ0YzI0MDIzYjczYTkwZWVkNjkxMmYxZWYyMDQ3MjI4
15
+ ZWFjMGMzNjUxNjQ1NmJiMGE1ZjI2NDdkZDFhMWUyNzEyMzU3ZTI=
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (2.0.7.pre.beta)
4
+ trusty-cms (2.0.8.pre.beta)
5
5
  RedCloth (~> 4.2)
6
6
  acts_as_tree (~> 2.1)
7
7
  bundler (~> 1.7)
@@ -31,22 +31,24 @@
31
31
  #page
32
32
  #header
33
33
  - if logged_in?
34
- #site_links
35
- = %{#{t('logged_in_as')} #{link_to h(current_user.name), edit_admin_preferences_path}   (#{link_to t('log_out'), logout_path})}.html_safe
36
-  
37
- = link_to t('view_site'), root_path, :id=>"view_site"
38
- %ul#navigation
39
- - nav_tabs.each do |tab|
40
- - if tab.visible?(current_user)
41
- %li{:class=>('current ' if current_tab?(tab)).to_s}
42
- = link_to translate_with_default(tab.name), (tab.first.relative_url if tab.first)
43
- #toolbar
44
- - if @current_tab and @current_tab.size > 1
45
- %ul#secondary_navigation
46
- - @current_tab.each do |sub_item|
47
- - if sub_item.visible?(current_user)
48
- %li= link_to translate_with_default(sub_item.name), sub_item.relative_url, :class=>('current' if current_item?(sub_item))
49
- = yield :toolbar
34
+ = render_region :before_nav
35
+ - render_region :navigation do |navigation|
36
+ #site_links
37
+ = %{#{t('logged_in_as')} #{link_to h(current_user.name), edit_admin_preferences_path}   (#{link_to t('log_out'), logout_path})}.html_safe
38
+  
39
+ = link_to t('view_site'), root_path, :id=>"view_site"
40
+ %ul#navigation
41
+ - nav_tabs.each do |tab|
42
+ - if tab.visible?(current_user)
43
+ %li{:class=>('current ' if current_tab?(tab)).to_s}
44
+ = link_to translate_with_default(tab.name), (tab.first.relative_url if tab.first)
45
+ #toolbar
46
+ - if @current_tab and @current_tab.size > 1
47
+ %ul#secondary_navigation
48
+ - @current_tab.each do |sub_item|
49
+ - if sub_item.visible?(current_user)
50
+ %li= link_to translate_with_default(sub_item.name), sub_item.relative_url, :class=>('current' if current_item?(sub_item))
51
+ = yield :toolbar
50
52
  #main
51
53
  - if flash[:notice]
52
54
  #notice
data/lib/trusty_cms.rb CHANGED
@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
2
2
 
3
3
  unless defined? TrustyCms::VERSION
4
4
  module TrustyCms
5
- VERSION = "2.0.7-beta"
5
+ VERSION = "2.0.8-beta"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.7.pre.beta
4
+ version: 2.0.8.pre.beta
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-29 00:00:00.000000000 Z
11
+ date: 2015-07-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: tzinfo