forever_style_guide 3.0.34 → 3.0.35

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 61069c05d5c6305ea2c8934ea837ae6b37e59670
4
- data.tar.gz: 0e04c28d58507845103f3432eaea140fe8c707cd
3
+ metadata.gz: 2f7a1f01f49d14af333453734595114df52300b3
4
+ data.tar.gz: ac79af2d7ea0b3b34b1898def2b934da66ae3e58
5
5
  SHA512:
6
- metadata.gz: 9c69a167a445da4c1c9fe2fe66608034e4c3846c22afafa7c59470fd7c8ce881816b279b15b5dc2a1f6a6ae53e29f41387e3ced96c91170766cc0b017110dd73
7
- data.tar.gz: 453bbf33fe47bb7b5842dfa3d098958dd7e32d1ea810c61678b143a5ba0e511972243555f8dcc1c0791fc9097bc8e97b7a1967ae46e87ce639209847a7641f42
6
+ metadata.gz: 7130f214f7088cf90b3868a426a45689bb9736d48f30cf079dc9dd44eea2db5c89a1e9300228fdc68a57f842d6f6a95a518bea8c3f9e34d5587fc0c959e77026
7
+ data.tar.gz: 71f64690b2fc9e770e0daacfa724e64291c99165d6678a08147bbe06a55ba5f4a0709cef98de52b7c912c0ab913ece8f989fd6a1fe658dead32e319dd1ef9296
@@ -34,7 +34,7 @@
34
34
  <div class="dropdown-ambassador-basic_info">
35
35
  <h4 class="color-ambassador-light dropdown-ambassador-name"><%= current_ambassador.name %></h4>
36
36
  <p class="color-gray-300 page-title dropdown-ambassador-rank"><%= current_ambassador.rank %></p>
37
- <p class="color-gray-300 page-title dropdown-ambassador-city"><%= current_ambassador.city %>, <%= current_ambassador.region %></p>
37
+ <p class="color-gray-300 page-title dropdown-ambassador-city"><%= current_ambassador.address.try(:city) || current_ambassador.city %>, <%= current_ambassador.address.try(:region) || current_ambassador.region %></p>
38
38
  </div>
39
39
 
40
40
  <div class='dropdown-menu-account-divider'></div>
@@ -48,7 +48,7 @@
48
48
  </div>
49
49
  <% end %>
50
50
 
51
- <% if current_ambassador.phone %>
51
+ <% if current_ambassador.phone.present? %>
52
52
  <div class="col-grid-float-6">
53
53
  <%= link_to ('tel:+' + number_to_phone(current_ambassador.phone)), title: 'Call ' + current_ambassador.name, class: 'btn btn-default btn-link btn-action dropdown-ambassador-contact_btn' do %>
54
54
  <i class="fa fa-fw fa-phone btn-action-icon"></i><span class="btn-action-label"><%= number_to_phone(current_ambassador.phone) %></span>
@@ -1,3 +1,3 @@
1
1
  module ForeverStyleGuide
2
- VERSION = "3.0.34"
2
+ VERSION = "3.0.35"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: forever_style_guide
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.34
4
+ version: 3.0.35
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicholas McClay
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-11-11 00:00:00.000000000 Z
11
+ date: 2016-11-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails