tusur_header 0.2.6 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d75dd3685a6fdb7878c7eda293322e6bf514f944
4
- data.tar.gz: 8a1ed7d8dcb1d644eedf239e8a22b587aed9da5f
3
+ metadata.gz: 70dda324600234e9b5391acfee08196b3aa0e8de
4
+ data.tar.gz: e6eaa582d95b66b284d0c58a61e5a31763accca4
5
5
  SHA512:
6
- metadata.gz: 379c36c8da251ff52dc6463bf6f52806b38ff0dfb0be2bbb7fc34c2549c1f520b48c7aa42988ff86e9a39085ccc647fc080f7fab3a8656e3a9dfa49b4c38b440
7
- data.tar.gz: a97fb4af3e1df476fe95084c876b71645adf05ced9f82e720c3321f83538cd30f6d813a8227cf0c9b8a8611de9d2bf5e3ec01b53447e3646656721a9c85fbeb7
6
+ metadata.gz: ef06c2e755f214146438368dc64bd9e20adae9fc285ffae45c069aa0a2ebd57bab4d3337479d0a18571cb95526a948ee5fc16d5cdf72c8af21852a593fba3a9e
7
+ data.tar.gz: f13440c08cfd6e4fd5e3bccfab6581a2730106f1ff80a175d99468068cc53e4f0c291e6fd027dcfe2e558fd2093f7130d12e169c4bdeb8754b6623418b1b9ce5
data/Gemfile CHANGED
@@ -1,3 +1,3 @@
1
- source "https://rubygems.org"
1
+ source 'https://rubygems.org'
2
2
 
3
3
  gemspec
@@ -17,47 +17,49 @@
17
17
  <% end %>
18
18
 
19
19
  <div class='tusur_header_wrapper'>
20
-
21
- <div class='navbar navbar-inverse navbar-fixed-top navbar-desktop' role='navigation' id='menu_first'>
22
- <div class='container'>
23
-
24
- <div class='navbar-header'>
25
- <a class='navbar-brand' href='/'></a>
26
- </div>
27
-
28
- <div class='navbar-collapse collapse'>
29
-
30
- <!-- Первое левое выпадающее меню -->
31
- <!--noindex-->
32
- <ul class='nav navbar-nav'>
33
- <li class='dropdown'>
34
- <a href='/' class='dropdown-toggle' data-toggle='dropdown'>Сайты ТУСУР<b class='caret'></b></a>
35
- <ul class='dropdown-menu'>
36
- <% TusurHeader::Engine.sites.each do |slug, site| %>
37
- <li><%= link_to site['title'].html_safe, site['link'] %></li>
38
- <% end %>
39
- </ul>
40
- </li>
41
- </ul>
42
- <!--/noindex-->
43
- <!-- / Первое левое выпадающее меню -->
44
-
45
- <!-- Второе левое выпадающее меню -->
46
- <% if content_for?(:tusur_header_second_menu) %>
47
- <%= yield :tusur_header_second_menu %>
48
- <% end %>
49
- <!-- / Второе левое выпадающее меню -->
50
-
51
- <!-- Правое выпадающее меню -->
52
- <% if content_for?(:tusur_header_auth_block) %>
53
- <%= yield :tusur_header_auth_block %>
54
- <% end %>
55
- <!-- / Правое выпадающее меню -->
56
-
20
+ <% begin %>
21
+ <%= render_cdn :header %>
22
+ <% rescue %>
23
+ <div class='navbar navbar-inverse navbar-fixed-top navbar-desktop' role='navigation' id='menu_first'>
24
+ <div class='container'>
25
+
26
+ <div class='navbar-header'>
27
+ <a class='navbar-brand' href='/'></a>
28
+ </div>
29
+
30
+ <div class='navbar-collapse collapse'>
31
+
32
+ <!-- Первое левое выпадающее меню -->
33
+ <!--noindex-->
34
+ <ul class='nav navbar-nav'>
35
+ <li class='dropdown'>
36
+ <a href='/' class='dropdown-toggle' data-toggle='dropdown'>Сайты ТУСУР<b class='caret'></b></a>
37
+ <ul class='dropdown-menu'>
38
+ <% TusurHeader::Engine.sites.each do |slug, site| %>
39
+ <li><%= link_to site['title'].html_safe, site['link'] %></li>
40
+ <% end %>
41
+ </ul>
42
+ </li>
43
+ </ul>
44
+ <!--/noindex-->
45
+ <!-- / Первое левое выпадающее меню -->
46
+
47
+ <!-- Второе левое выпадающее меню -->
48
+ <% if content_for?(:tusur_header_second_menu) %>
49
+ <%= yield :tusur_header_second_menu %>
50
+ <% end %>
51
+ <!-- / Второе левое выпадающее меню -->
52
+
53
+ <!-- Правое выпадающее меню -->
54
+ <% if content_for?(:tusur_header_auth_block) %>
55
+ <%= yield :tusur_header_auth_block %>
56
+ <% end %>
57
+ <!-- / Правое выпадающее меню -->
58
+
59
+ </div>
57
60
  </div>
58
61
  </div>
59
- </div>
60
-
62
+ <% end %>
61
63
  <div class='navbar navbar-inverse navbar-second-menu' role='navigation' id='menu_second'>
62
64
  <div class='container'>
63
65
 
@@ -3,6 +3,7 @@ require 'bootstrap-sass'
3
3
  require 'jquery-rails'
4
4
  require 'rest_client'
5
5
  require 'stop_ie'
6
+ require 'tusur_cdn'
6
7
 
7
8
  module TusurHeader
8
9
  class Engine < ::Rails::Engine
@@ -41,4 +42,3 @@ module TusurHeader
41
42
 
42
43
  end
43
44
  end
44
-
@@ -1,3 +1,3 @@
1
1
  module TusurHeader
2
- VERSION = '0.2.6'
2
+ VERSION = '0.2.7'
3
3
  end
data/tusur_header.gemspec CHANGED
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
17
17
 
18
18
  s.add_development_dependency 'bundler'
19
19
  s.add_dependency 'rails', '~> 4.0'
20
+ s.add_dependency 'tusur_cdn'
20
21
 
21
22
  s.add_runtime_dependency 'bootstrap-sass'
22
23
  s.add_runtime_dependency 'coffee-rails'
@@ -127,7 +127,6 @@
127
127
  +border-radius(0)
128
128
  background: #005bae
129
129
  border: none
130
- margin: 40px 0 0 0
131
130
  min-height: 40px
132
131
 
133
132
  .search
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tusur_header
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.6
4
+ version: 0.2.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Evgeny Lapin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-05-06 00:00:00.000000000 Z
11
+ date: 2016-07-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -38,6 +38,20 @@ dependencies:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '4.0'
41
+ - !ruby/object:Gem::Dependency
42
+ name: tusur_cdn
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ">="
46
+ - !ruby/object:Gem::Version
47
+ version: '0'
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ">="
53
+ - !ruby/object:Gem::Version
54
+ version: '0'
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: bootstrap-sass
43
57
  requirement: !ruby/object:Gem::Requirement