forever_style_guide 3.1.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b1adc4d5aeb7c20c849d861d3a043b3af2b8f72
-  data.tar.gz: 21175bdea31f615adf97f00ca2838ad62c354ce0
+  metadata.gz: 1182afd1f951ccf60d8f6ac6a94960806102ee37
+  data.tar.gz: be516b2ee94b4bcc0b8eb3fa329b60478882dfb1
 SHA512:
-  metadata.gz: 1f05cc41d3830f31e83c1ae670e6cc0e094f3e160c2f1ddedad67b3b49e510cf3db165aa9196909ea4dc8f8cf4932747e209ccef5f3e13620cbedf2aed1fd64f
-  data.tar.gz: f63158d0b97749ba66b09c923932d2b6f42abdfd66220370562e7257dbcee97136473d040acfbeea27d5aa24d9451fa4334dd58319f0c960ba89bf8c8a7cc805
+  metadata.gz: 4c420e6e0beef8beec1e088926057d158b48a890ce649eae36652e578397d96d7f10c04f509864bb790cf7c9f07ce81effa496f2eaf9de503ce2071ff29f358b
+  data.tar.gz: 93cdfaee9d5ffa34ee744f89b3dbe3033c6e78d97d8d95726d13ae35d72f90e5042fda3c7d3479ead4f7d6048194d888c5bbb202944d862ed0c046fe080f7edc

data/app/helpers/forever_style_guide/application_helper.rb

@@ -21,10 +21,6 @@ module ForeverStyleGuide
       strip_subdomain("www", path, url)
     end
 
-    def web_app_url(path = '/', url = nil)
-      strip_subdomain("my", path, url)
-    end
-
     def strip_subdomain(sub, path = '/', url = nil)
       url ||= request.url if respond_to?(:request)
       url = URI(url)
@@ -116,39 +112,44 @@ module ForeverStyleGuide
     end
 
     def web_app_admin_url
-      web_app_url('/admin')
+      # this probably goes away
+      ('/app/admin')
     end
 
     def stop_impersonating_url
-      web_app_url('/admin/users')
+      ('/impersonations')
     end
 
     # Web App Paths
     def library_url
-      web_app_url('/#/inbox')
+      ('/app/library')
+    end
+
+    def albums_url
+      ('/app/albums')
     end
 
-    def inbox_url
-      web_app_url('/#/inbox?inbox_filter_type=unorganized-items')
+    def tags_url
+      ('/app/tags')
     end
 
     def projects_url
-      web_app_url('/#/projects')
+      ('/app/library')
     end
 
     def people_url
-      web_app_url('/#/people/family')
+      ('/app/users')
     end
 
-    def app_home_url
-      web_app_url('/#/')
+    def profile_url
+      ('/app/profile')
     end
 
-    # User settings links (store and web app)
     def user_settings_url
-      web_app_url('/#/settings')
+      ('/app/settings')
     end
 
+    # Combined Store/WWW Paths - now all available at www.forever.com
     def user_order_history_url
       www_url('/settings/orders')
     end
@@ -161,7 +162,6 @@ module ForeverStyleGuide
       www_url('/settings/my_ambassador')
     end
 
-    # Combined Store/WWW Paths - now all available at www.forever.com
     def login_url
       www_url('/sign_in')
     end
@@ -427,10 +427,6 @@ module ForeverStyleGuide
       "https://forever1.zendesk.com/hc/en-us/articles/203834518-Using-the-People-Tab-Video-"
     end
 
-    def zendesk_inbox_video_url
-      "https://forever1.zendesk.com/hc/en-us/articles/223580988-Deeper-Dive-into-How-to-Use-your-Inbox-Video-"
-    end
-
     def zendesk_albums_video_url
       "https://forever1.zendesk.com/hc/en-us/articles/226085547-Creating-an-Album-Uploading-Directly-to-an-Album-Video-"
     end

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

@@ -3,7 +3,7 @@
     <div class="color-white pull-left">
       <span class="hidden-xs">Logged in as <%= current_admin.name %>, but a</span><span class="visible-xs-inline">A</span>cting on behalf of <%= current_user.name %>
     </div>
-    <%= link_to stop_impersonating_url, class: 'btn btn-sm btn-link btn-cancel_impersonation' do %>
+    <%= link_to stop_impersonating_url, class: 'btn btn-sm btn-link btn-cancel_impersonation', method: :delete do %>
       <i class="fa fa-times"></i> Stop Managing <span class="hidden-xs"><%= current_user.name %></span>
     <% end %>
   </div>

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

@@ -81,7 +81,7 @@
 
         <li class="dropdown-menu-account-item">
 
-          <%= link_to current_admin ? stop_impersonating_url : log_out_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-sm dropdown-menu-nav-link-no_margin', title: 'Log Out of Forever' do %>
+          <%= link_to current_admin ? stop_impersonating_url : log_out_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-sm dropdown-menu-nav-link-no_margin', title: 'Log Out of Forever', method: current_admin ? :delete : :post do %>
             <i class='fa fa-share fa-fw'></i>Log Out
           <% end %>
         </li>

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

@@ -1,3 +1,3 @@
 <li>
-  <%= link_to "Inspiration", blog_url, title: 'Get Inspired at the Forever Blog', target: "_blank" %>
+  <%= link_to "Blog", blog_url, title: 'Get Inspired at the Forever Blog', target: "_blank" %>
 </li>

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

@@ -14,27 +14,27 @@
           <% if defined?(current_user) && current_user.present? %>
 
             <li>
-              <%= link_to library_url, class: 'dropdown-menu-nav-link', title: 'Organize Photos in Your Forever Library' do %>
-                <i class='fa fa-th-large'></i>Library
-              <% end %>
+              <%= link_to 'Library', library_url, class: 'dropdown-menu-nav-link', title: 'Organize Photos in Your Forever Library' %>
             </li>
 
             <li>
-              <%= link_to projects_url, class: 'dropdown-menu-nav-link', title: 'Create Print Projects' do %>
-                <i class='fa fa-paint-brush'></i>Projects
-              <% end %>
+              <%= link_to 'Albums', albums_url, class: 'dropdown-menu-nav-link', title: 'Share Albums with Friends' %>
             </li>
 
             <li>
-              <%= link_to people_url, class: 'dropdown-menu-nav-link', title: 'Share Photos with Friends and Family' do %>
-                <i class='fa fa-users'></i>People
-              <% end %>
+              <%= link_to 'Tags', tags_url, class: 'dropdown-menu-nav-link', title: 'Tag Photos of Friends and Places' %>
             </li>
 
             <li>
-              <%= link_to app_home_url, class: 'dropdown-menu-nav-link', title: 'View Your Shared Photo Albums' do %>
-                <i class='fa fa-home'></i>Home
-              <% end %>
+              <%= link_to 'Print Projects', projects_url, class: 'dropdown-menu-nav-link', title: 'Create Print Projects' %>
+            </li>
+
+            <li>
+              <%= link_to 'Friends & Family', people_url, class: 'dropdown-menu-nav-link', title: 'Share Photos with Friends and Family' %>
+            </li>
+
+            <li>
+              <%= link_to 'Profile', profile_url, class: 'dropdown-menu-nav-link', title: 'View Your Profile' %>
             </li>
 
           <% else %>
@@ -111,12 +111,6 @@
       <div class='col-grid-float-3 l-padded-thin dropdown-menu-nav-extra_column'>
         <div class="hidden-grid-float-breakpoint dropdown-menu-nav-spacer"></div>
         <ul class="list-unstyled">
-          <li>
-            <%= link_to zendesk_inbox_video_url, class: 'dropdown-menu-nav-link', title: 'How to Use Your Inbox in Forever - Video Tutorial', target: '_blank' do %>
-              <i class='fa fa-video-camera'></i>Inbox
-            <% end %>
-          </li>
-
           <li>
             <%= link_to zendesk_albums_video_url, class: 'dropdown-menu-nav-link', title: 'Organizing Photos with Albums in Forever - Video Tutorial', target: '_blank' do %>
               <i class='fa fa-video-camera'></i>Albums

data/lib/forever_style_guide/version.rb

@@ -1,3 +1,3 @@
 module ForeverStyleGuide
-  VERSION = "3.1.5"
+  VERSION = "3.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forever_style_guide
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors:
 - Nicholas McClay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails