diff --git a/Gemfile b/Gemfile index 14d86d3..9a25111 100644 --- a/Gemfile +++ b/Gemfile @@ -12,11 +12,11 @@ gem 'cancan', '~> 1.6.7' gem 'squeel', '~> 0.9.3' gem 'sentient_user', '~> 0.3.2' gem 'userstamp_basic', '~> 0.1.0' -gem 'active_scaffold', :git => 'https://github.com/activescaffold/active_scaffold.git' +gem 'active_scaffold', git: 'https://github.com/activescaffold/active_scaffold.git' # :path => '/home/clyfe/dev/active_scaffold' # '~> 3.2.0' -gem 'pjax_rails', '~> 0.1.10' -gem 'validates_hostname', '~> 1.0.0', :git => 'https://github.com/KimNorgaard/validates_hostname.git' +gem 'pjax_rails', '~> 0.1.7', git: 'https://github.com/rails/pjax_rails.git' +gem 'validates_hostname', '~> 1.0.0', git: 'https://github.com/KimNorgaard/validates_hostname.git' gem 'nilify_blanks', '~> 1.0.0' gem 'rails_config', '~> 0.2.4' # gem 'rails-settings-cached', :require => 'rails-settings' @@ -25,6 +25,8 @@ gem 'mail_form', '~> 1.3.0' gem 'switch_user', '~> 0.6.0' gem 'simple_form', '~> 2.0.0' gem 'concerned_with', '~> 0.1.0' +gem 'navigasmic', '~> 0.5.6', git: 'https://github.com/jejacks0n/navigasmic.git' +gem 'rails-backbone', '~> 0.7.0' # Gems used only for assets and not required # in production environments by default. diff --git a/Gemfile.lock b/Gemfile.lock index e8513ea..ccda4d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,6 +11,19 @@ GIT active_scaffold (3.2.0) rails (>= 3.1.3) +GIT + remote: https://github.com/jejacks0n/navigasmic.git + revision: 6108afe7930fd4b3282cbe8942240bf4f70e2f74 + specs: + navigasmic (0.5.6) + +GIT + remote: https://github.com/rails/pjax_rails.git + revision: e79a1cf58a8935eb132f4910f300cf86d081ae6d + specs: + pjax_rails (0.1.7) + jquery-rails + GEM remote: http://rubygems.org/ specs: @@ -92,6 +105,7 @@ GEM railties (~> 3.1) warden (~> 1.1.1) diff-lcs (1.1.3) + ejs (1.0.0) erubis (2.7.0) execjs (1.3.0) multi_json (~> 1.0) @@ -146,8 +160,6 @@ GEM activesupport (>= 3.0.0) nokogiri (1.5.0) orm_adapter (0.0.6) - pjax_rails (0.1.10) - jquery-rails polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) @@ -166,6 +178,10 @@ GEM activesupport (= 3.2.0) bundler (~> 1.0) railties (= 3.2.0) + rails-backbone (0.7.0) + coffee-script (~> 2.2.0) + ejs (~> 1.0.0) + railties (>= 3.1.0) rails_config (0.2.5) activesupport (>= 3.0) railties (3.2.0) @@ -266,9 +282,11 @@ DEPENDENCIES mail_form (~> 1.3.0) mongrel (>= 1.2.0.pre2) mysql2 + navigasmic (~> 0.5.6)! nilify_blanks (~> 1.0.0) - pjax_rails (~> 0.1.10) + pjax_rails (~> 0.1.7)! rails (= 3.2.0) + rails-backbone (~> 0.7.0) rails_config (~> 0.2.4) rb-inotify (~> 0.8.8) rspec-rails (~> 2.8.1) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index cc368ee..402fb46 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -7,7 +7,8 @@ #= require jquery #= require jquery-ui #= require jquery_ujs -#= require pjax +#= require jquery.pjax +#= require pjax/page_triggers #= require active_scaffold #= require slides #= require twitter/bootstrap @@ -16,3 +17,9 @@ $ -> $('[rel=popover]').popover() $('[rel=tooltip]').tooltip() + + $('.pjax-nav a:not([data-remote]):not([data-behavior]):not([data-skip-pjax])').pjax('[data-pjax-container]') + + $(document).on 'pjax:success', (event, data, status, xhr, options) -> + $('ul.pjax-nav').find('li.active').removeClass 'active' + $("ul.pjax-nav a[href=\"#{window.location.pathname}\"]").parents('li').addClass 'active' diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb index 22ff4e4..a9cd664 100644 --- a/app/views/devise/shared/_links.erb +++ b/app/views/devise/shared/_links.erb @@ -1,8 +1,8 @@ - +<% semantic_navigation :devise_nav, html: { class: 'nav nav-pills pjax-nav' } do |n| %> + <%= n.item "Sign in", link: new_session_path(resource_name) %> + <%= n.item "Sign up", link: new_registration_path(resource_name) %> + <%= n.item "Forgot your password?", link: new_password_path(resource_name) %> + <%= n.item "Didn't receive confirmation instructions?", link: new_confirmation_path(resource_name) %> + <%= n.item "Didn't receive unlock instructions?", link: new_unlock_path(resource_name) %> +<% end %> diff --git a/app/views/fragments/_navigation.html.erb b/app/views/fragments/_navigation.html.erb index e47c324..2c20af5 100644 --- a/app/views/fragments/_navigation.html.erb +++ b/app/views/fragments/_navigation.html.erb @@ -8,7 +8,7 @@ - <%= link_to('EntryDNS', root_path, class: 'brand', data: {pjax: '#main'}) %> + <%= link_to('EntryDNS', root_path, class: 'brand') %>
<% if user_signed_in? %> diff --git a/app/views/fragments/navigation/_application.html.erb b/app/views/fragments/navigation/_application.html.erb index 8ec4d80..b16906d 100644 --- a/app/views/fragments/navigation/_application.html.erb +++ b/app/views/fragments/navigation/_application.html.erb @@ -1,51 +1,34 @@ - - - + <%= n.group do %> + <%= n.item '', link: edit_user_registration_path, html: { rel: 'tooltip', title: "IP: #{client_remote_ip}" } do %> + Settings + <% end %> + <%= n.item '', link: destroy_user_session_path, link_html: { data: { :'skip-pjax' => true } } do %> + Sign out + <% end %> + <% end %> + +<% end %> diff --git a/app/views/fragments/navigation/_public.html.erb b/app/views/fragments/navigation/_public.html.erb index 2f73ac9..aec759f 100644 --- a/app/views/fragments/navigation/_public.html.erb +++ b/app/views/fragments/navigation/_public.html.erb @@ -1,32 +1,21 @@ - +<% semantic_navigation :public_nav, html: { class: 'nav pjax-nav' } do |n| %> + <%= n.item 'About', link: page_path('about') %> + <%= n.item 'Team', link: page_path('team') %> + <%= n.item 'Contact', link: page_path('contact') %> + <%= n.item 'Help & Support', link: page_path('help') %> +<% end %> - +<% semantic_navigation :session_nav, html: { class: 'nav pull-right pjax-nav' } do |n| %> + <%= n.item '', link: Settings.news_link, html: { rel: 'tooltip', title: Settings.news_link } do %> + News + <% end %> + <%= n.item '', link: page_path('donate'), html: { rel: 'tooltip', title: 'PayPal', class: 'highlight' } do %> + Donate + <% end %> + <%= n.item '', link: new_user_registration_path do %> + Sign up + <% end %> + <%= n.item '', link: new_user_session_path do %> + Sign in + <% end %> +<% end %> diff --git a/config/initializers/navigasmic.rb b/config/initializers/navigasmic.rb new file mode 100644 index 0000000..8c497f2 --- /dev/null +++ b/config/initializers/navigasmic.rb @@ -0,0 +1,42 @@ +Navigasmic.setup do |config| + config.highlighted_class = 'active' + config.with_group_class = 'dropdown-menu' +end + +module Navigasmic + # lazy monkey patch, makes it work with twitter bootstrap + class HtmlNavigationBuilder + + def item(label = '', options = {}, &proc) + buffer = block_given? ? template.capture(self, &proc) : '' + label = (label + buffer).html_safe + + item = NavigationItem.new(label, options, template) + + options[:html] ||= {} + options[:html][:class] = template.add_html_class(options[:html][:class], Navigasmic.disabled_class) if item.disabled? + options[:html][:class] = template.add_html_class(options[:html][:class], Navigasmic.highlighted_class) if item.highlighted?(template.request.path, template.params, template) + + label = label_for_item(label) + link = item.link.is_a?(Proc) ? template.instance_eval(&item.link) : item.link + + label = template.link_to(label, link, options.delete(:link_html)) unless !item.link? || item.disabled? + + item.hidden? ? '' : template.content_tag(Navigasmic.item_tag, label, options.delete(:html)) + end + + def group(options = {}, &proc) + raise ArgumentError, "Missing block" unless block_given? + + options[:html] ||= {} + options[:html][:class] = template.add_html_class(options[:html][:class], Navigasmic.with_group_class) + + buffer = template.capture(self, &proc) + group = template.content_tag(Navigasmic.group_tag, buffer, options.delete(:html)) + + visible = options[:hidden_unless].nil? ? true : options[:hidden_unless].is_a?(Proc) ? template.instance_eval(&options[:hidden_unless]) : options[:hidden_unless] + visible ? group.html_safe : '' + end + + end +end \ No newline at end of file