forever_style_guide 3.0.38 → 3.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b84d5592f0ffa81c8638e524250b3d98503e2f1
-  data.tar.gz: 118bad57870803d525ad2adb9b39d30a4b96aaad
+  metadata.gz: 1de5279844b631f89168ceec8b213fdb4ef5da53
+  data.tar.gz: 5ca3d87efff26da7811e8db3e4a574d3706dc67b
 SHA512:
-  metadata.gz: 1f3f48d8282f7fb70cc8c232a3a638fbc3581750a6377e5dcb029253283901b6b225e178a2e8dc9e296c83d6e0f4dfc900d9746ffc33310d082dff44b79190ff
-  data.tar.gz: 5773171943192ce079a10989198a1db51c7da649658b38e407ead7c075e109ec077e22b274bafe582c9a120aabcddf5a4c1d9dd5c4b96303c107566f1b25ffd0
+  metadata.gz: e4054b26823d6ae1c1afa6aeed8e799391eab14b23183909c24a430db319530b97e3530c115a1d116bece7855c649a94cc592219d1f12e72ef40e76d6b8015f7
+  data.tar.gz: 23efe8f5fd6a7117c854073acb8f5a7685adf24a5c63877f11596ccdd61c7174a1ec6552d2f0c294947a725c2c5e6974f5f8bfd666a8f22c757d70b34f315618

data/app/helpers/forever_style_guide/application_helper.rb

@@ -3,6 +3,19 @@ require 'pathname'
 module ForeverStyleGuide
   module ApplicationHelper
 
+    def trademark(copy)
+      case copy
+      when "Forever", "Forever Storage", "Forever Historian", "Forever Valet", "pixels2Pages", "Historian", "Forever Live!"
+        copy += "™"
+      when "Forever Account", "Forever Guarantee", "Forever Guarantee Fund", "Forever Membership", "Forever Guarantee Fund", "Forever Members", "Forever Retreats", "Forever Ambassador", "Forever Ambassadors"
+        copy[0..6] + "™" + copy[7..copy.length-1]
+      when "Forever Artisan", "Artisan"
+        copy += "®"
+      else
+        copy
+      end
+    end
+
     #Path helpers for mounted style guide use
     def www_url(path = '/', url = nil)
       strip_subdomain("www", path, url)
@@ -107,7 +120,7 @@ module ForeverStyleGuide
 
     # Web App Paths
     def library_url
-      web_app_url('/inbox')
+      web_app_url('/#/inbox')
     end
 
     def inbox_url
@@ -115,15 +128,15 @@ module ForeverStyleGuide
     end
 
     def projects_url
-      web_app_url('/projects')
+      web_app_url('/#/projects')
     end
 
     def people_url
-      web_app_url('/people/family')
+      web_app_url('/#/people/family')
     end
 
     def app_home_url
-      web_app_url('/')
+      web_app_url('/#/')
     end
 
     # User settings links (store and web app)
@@ -177,7 +190,7 @@ module ForeverStyleGuide
     end
 
     def storage_url
-      www_url('/guaranteed_storage')
+      www_url('/forever_storage')
     end
 
     def app_url

data/app/views/forever_style_guide/sections/components/footer/_footer.erb

@@ -12,9 +12,9 @@
         <div class="row">
           <div class="col-xs-6">
             <ul class="list-unstyled">
-              <li><%= link_to "Guaranteed Storage", storage_url, class: "footer-link", title: "Guaranteed Permanent Storage for Photos & Documents" %></li>
-              <li><%= link_to "Forever Artisan", artisan_url, class: "footer-link", title: "Forever Artisan 5 Digital Scrapbooking Software" %></li>
-              <li><%= link_to "Forever Historian", historian_url, class: "footer-link", title: "Photo Management Software for Windows" %></li>
+              <li><%= link_to trademark("Forever Storage"), storage_url, class: "footer-link", title: "Guaranteed Permanent Storage for Photos & Documents" %></li>
+              <li><%= link_to trademark("Forever Artisan"), artisan_url, class: "footer-link", title: "Forever Artisan 5 Digital Scrapbooking Software" %></li>
+              <li><%= link_to trademark("Forever Historian"), historian_url, class: "footer-link", title: "Photo Management Software for Windows" %></li>
             </ul>
           </div>
           <div class="col-xs-6">
@@ -60,8 +60,8 @@
       </div>
       <div class="col-xs-12 col-sm-6 footer-policy_links">
         <p class="small color-gray-400">
-          <%= link_to "Careers", careers_url, title: "Join the Forever Team", class: "footer-link footer-link-dark", target: '_blank' %> | 
-          <%= link_to "Privacy Policy", privacy_url, class: "footer-link footer-link-dark", title: "Forever Privacy Policy" %> | 
+          <%= link_to "Careers", careers_url, title: "Join the Forever Team", class: "footer-link footer-link-dark", target: '_blank' %> |
+          <%= link_to "Privacy Policy", privacy_url, class: "footer-link footer-link-dark", title: "Forever Privacy Policy" %> |
           <%= link_to "Terms of Service", tos_url, class: "footer-link footer-link-dark", title: "Forever Terms of Service" %>
         </p>
       </div>

data/app/views/forever_style_guide/sections/components/navigation/_nav_community_dropdown.erb

@@ -19,11 +19,11 @@
           </li>
 
           <li>
-            <%= link_to 'Artisan FAQ', artisan_faq_url, class: 'dropdown-menu-nav-link', title: 'Forever Artisan Frequently Asked Questions', target: '_blank' %>
+            <%= link_to "#{trademark('Artisan')} FAQ", artisan_faq_url, class: 'dropdown-menu-nav-link', title: 'Forever Artisan Frequently Asked Questions', target: '_blank' %>
           </li>
 
           <li>
-            <%= link_to 'Historian FAQ', historian_faq_url, class: 'dropdown-menu-nav-link', title: 'Forever Historian Frequently Asked Questions', target: '_blank' %>
+            <%= link_to "#{trademark('Historian')} FAQ", historian_faq_url, class: 'dropdown-menu-nav-link', title: 'Forever Historian Frequently Asked Questions', target: '_blank' %>
           </li>
 
           <li>
@@ -59,11 +59,11 @@
 
         <ul class="list-unstyled">
           <li>
-            <%= link_to 'Forever Live!', forever_live_url, class: 'dropdown-menu-nav-link', title: 'Scrapbooking and Memory Keeping Conference', target: '_blank' %>
+            <%= link_to trademark('Forever Live!'), forever_live_url, class: 'dropdown-menu-nav-link', title: 'Scrapbooking and Memory Keeping Conference', target: '_blank' %>
           </li>
 
           <li>
-            <%= link_to 'Forever Retreats', retreats_url, class: 'dropdown-menu-nav-link', title: 'Creative Weekend Events for Scrapbooking and Memory Keeping' %>
+            <%= link_to trademark('Forever Retreats'), retreats_url, class: 'dropdown-menu-nav-link', title: 'Creative Weekend Events for Scrapbooking and Memory Keeping' %>
           </li>
         </ul>
       </div>

data/app/views/forever_style_guide/sections/components/navigation/_nav_my_forever_dropdown.erb

@@ -60,7 +60,7 @@
 
         <ul class="list-unstyled">
           <li>
-            <%= link_to 'The Forever Guarantee', guarantee_url, class: 'dropdown-menu-nav-link', title: 'Forever Guarantee' %>
+            <%= link_to "The #{trademark('Forever Guarantee')}", guarantee_url, class: 'dropdown-menu-nav-link', title: 'Forever Guarantee' %>
           </li>
 
           <li>

data/app/views/forever_style_guide/sections/components/navigation/_nav_products_dropdown.erb

@@ -12,7 +12,7 @@
         <ul class="list-unstyled">
           <li>
             <%= link_to storage_url, class: 'dropdown-menu-nav-link', title: 'Guaranteed Permanent Storage for Photos & Documents' do %>
-              Permanent <span class='hidden-md'>Cloud </span> Storage
+              <%= trademark("Forever Storage") %>
             <% end %>
             <small class="dropdown-menu-nav-link-subhead">View Pricing, Benefits and Features</small>
           </li>
@@ -25,7 +25,7 @@
           </li>
 
           <li>
-            <%= link_to 'Forever Historian', historian_url, class: 'dropdown-menu-nav-link', title: 'Photo Management Software for Windows' %>
+            <%= link_to trademark('Forever Historian'), historian_url, class: 'dropdown-menu-nav-link', title: 'Photo Management Software for Windows' %>
               <small class="dropdown-menu-nav-link-subhead">Windows Photo Software</small>
           </li>
 
@@ -35,7 +35,7 @@
           </li>
 
           <li>
-            <%= link_to 'Forever Valet', valet_url, class: 'dropdown-menu-nav-link', title: 'Forever Valet Desktop Photo Uploader'  %>
+            <%= link_to trademark('Forever Valet'), valet_url, class: 'dropdown-menu-nav-link', title: 'Forever Valet Desktop Photo Uploader'  %>
             <small class="dropdown-menu-nav-link-subhead">Desktop Uploader</small>
           </li>
         </ul>
@@ -47,7 +47,7 @@
         <ul class="list-unstyled">
 
           <li>
-            <%= link_to 'Forever Artisan', artisan_url, class: 'dropdown-menu-nav-link', title: 'Forever Artisan 5 Digital Scrapbooking Software' %>
+            <%= link_to trademark('Forever Artisan'), artisan_url, class: 'dropdown-menu-nav-link', title: 'Forever Artisan 5 Digital Scrapbooking Software' %>
               <small class="dropdown-menu-nav-link-subhead">Windows Scrapbooking Software</small>
           </li>
 
@@ -76,7 +76,7 @@
           </li>
 
           <li>
-            <%= link_to 'pixels2Pages', p2p_url, class: 'dropdown-menu-nav-link', title: 'Premium Training and Resources' %>
+            <%= link_to trademark('pixels2Pages'), p2p_url, class: 'dropdown-menu-nav-link', title: 'Premium Training and Resources' %>
             <small class="dropdown-menu-nav-link-subhead">Premium Training and Resources</small>
           </li>
 

data/lib/forever_style_guide/version.rb

@@ -1,3 +1,3 @@
 module ForeverStyleGuide
-  VERSION = "3.0.38"
+  VERSION = "3.0.39"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forever_style_guide
 version: !ruby/object:Gem::Version
-  version: 3.0.38
+  version: 3.0.39
 platform: ruby
 authors:
 - Nicholas McClay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -315,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A live style guide and component API for the Forever brand