phcmembers 1.6.0 → 1.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (32) hide show
  1. checksums.yaml +4 -4
  2. data/app/helpers/nav_helper.rb +23 -20
  3. data/app/helpers/phcmembers/application_helper.rb +0 -10
  4. data/app/views/layouts/application.html.erb +1 -11
  5. data/app/views/layouts/phcmembers/application.html.erb +1 -0
  6. data/app/views/layouts/phcmembers/directory/directory_all.html.erb +1 -0
  7. data/app/views/layouts/phcmembers/members/members_all.html.erb +1 -0
  8. data/app/views/phcmembers/directory/categories/_form.html.erb +1 -1
  9. data/app/views/phcmembers/directory/categories/edit.html.erb +1 -1
  10. data/app/views/phcmembers/directory/categories/index.html.erb +1 -1
  11. data/app/views/phcmembers/directory/categories/new.html.erb +1 -1
  12. data/app/views/phcmembers/directory/catlists/_form.html.erb +1 -1
  13. data/app/views/phcmembers/directory/catlists/index.html.erb +1 -1
  14. data/app/views/phcmembers/directory/catlists/new.html.erb +1 -1
  15. data/app/views/phcmembers/members/contacts/_form.html.erb +1 -1
  16. data/app/views/phcmembers/members/contacts/_formpatch.html.erb +1 -1
  17. data/app/views/phcmembers/members/contacts/edit.html.erb +1 -1
  18. data/app/views/phcmembers/members/contacts/index.html.erb +1 -1
  19. data/app/views/phcmembers/members/contacts/new.html.erb +1 -1
  20. data/app/views/phcmembers/members/listings/_form.html.erb +1 -1
  21. data/app/views/phcmembers/members/listings/_formpatch.html.erb +1 -1
  22. data/app/views/phcmembers/members/listings/edit.html.erb +1 -1
  23. data/app/views/phcmembers/members/listings/index.html.erb +1 -1
  24. data/app/views/phcmembers/members/listings/new.html.erb +1 -1
  25. data/app/views/phcmembers/members/mains/_form.html.erb +1 -1
  26. data/app/views/phcmembers/members/mains/edit.html.erb +1 -1
  27. data/app/views/phcmembers/members/mains/index.html.erb +1 -1
  28. data/app/views/phcmembers/members/mains/new.html.erb +1 -1
  29. data/lib/phcmembers/version.rb +1 -1
  30. metadata +10 -6
  31. data/app/views/layouts/phcnotifi/components/_notifications.html.erb +0 -13
  32. data/app/views/layouts/phcnotifi/components/_validations.html.erb +0 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 57013bc76ba4278952b41a4bf480b00c489cb6c9
4
- data.tar.gz: 37f26ace33ab42867fe05abdc168f8fb788861f3
3
+ metadata.gz: 80a61ece3fbb02ed2e518c977d491cfb459608f4
4
+ data.tar.gz: 53da2fe72b749939c52b1fd002f7468992cec36b
5
5
  SHA512:
6
- metadata.gz: 1e95fd88de180490ac66735b21bc8dacd51b2627ec301168d29b0609dce9a419f309e98e1a2f3225537a095ff3a4e386f56fde2936c9676cb67b7ca8b3003411
7
- data.tar.gz: d6894eecd3c5143b4736f81d8beab72b5a1cc7913d1fe1db80d536ab5c844c8e090d05de7efdca9ab11ada641f462bfd53b61df83d24e8c6610f5a3dbca2f881
6
+ metadata.gz: e55d955dbafdf6fabb9da6473dfbcab106a40e1c8acd916deb5e1dac67549da0a9ca270db48b022434662068952b2580d304eab23a85a1316817a7f701c6a764
7
+ data.tar.gz: bdd4873b0c52c795940ee7ef78299e9ad3ff8fa23abff5768a158ab2d89a23e42c9d514b536ce02537da23cf980bfd16d92af45d61eca63ae129057aedbedee9
@@ -1,26 +1,29 @@
1
1
  module NavHelper
2
- def nav_link(page, &link_text)
3
- class_name = request.env['PATH_INFO'].match(page) ? 'active' : nil
4
2
 
5
- content_tag(:li, class: class_name) do
6
- link_to page do
7
- link_text.call
8
- end
9
- end
10
- end
3
+ def nav_link(page, &link_text)
4
+ class_name = request.env['PATH_INFO'].match(page) ? 'active' : nil
11
5
 
12
- def treeview_link(text, &links)
13
- content = link_to('#') do
14
- content_tag(:span, text) <<
15
- content_tag(:i, '', class: "fa pull-right fa-angle-left")
16
- end
6
+ content_tag(:li, class: class_name) do
7
+ link_to page do
8
+ link_text.call
9
+ end
10
+ end
17
11
 
18
- content << content_tag(:ul, class: 'treeview-menu') do
19
- links.call
20
- end
12
+ end
13
+
14
+ def treeview_link(text, &links)
15
+ content = link_to('#') do
16
+ content_tag(:span, text) <<
17
+ content_tag(:i, '', class: "fa pull-right fa-angle-left")
18
+ end
19
+
20
+ content << content_tag(:ul, class: 'treeview-menu') do
21
+ links.call
22
+ end
23
+
24
+ content_tag :li, class: 'treeview' do
25
+ content
26
+ end
27
+ end
21
28
 
22
- content_tag :li, class: 'treeview' do
23
- content
24
- end
25
- end
26
29
  end
@@ -1,15 +1,5 @@
1
1
  module Phcmembers
2
2
  module ApplicationHelper
3
3
 
4
- # Bootstrap Notification System
5
- def flash_class(level)
6
- case level.to_sym
7
- when :notice then "alert alert-info"
8
- when :success then "alert alert-success"
9
- when :error then "alert alert-danger"
10
- when :alert then "alert alert-warning"
11
- end
12
- end
13
-
14
4
  end
15
5
  end
@@ -26,17 +26,7 @@
26
26
  <%= render "layouts/application_sidebar" %>
27
27
  </aside>
28
28
  <aside class="right-side">
29
- <%= yield(:content_header) %>
30
-
31
- <% flash.each do |name, msg| %>
32
- <div class="pad margin no-print">
33
- <%= content_tag :div, :class => "alert alert-#{ name == :error ? "danger" : "success" } alert-dismissable", :role => "alert" do %>
34
- <button type="button" class="close" data-dismiss="alert" aria-hidden="true">x</button>
35
- <%= msg %>
36
- <% end %>
37
- </div>
38
- <% end %>
39
-
29
+ <%= render 'phcnotifi/notifications' %>
40
30
  <%= yield %>
41
31
  </aside>
42
32
  </div>
@@ -8,6 +8,7 @@
8
8
  </head>
9
9
  <body>
10
10
  <div class="container">
11
+ <%= render 'phcnotifi/notifications' %>
11
12
  <%= yield %>
12
13
  </div>
13
14
  </body>
@@ -8,6 +8,7 @@
8
8
  </head>
9
9
  <body>
10
10
  <div class="container">
11
+ <%= render 'phcnotifi/notifications' %>
11
12
  <%= yield %>
12
13
  </div>
13
14
  </body>
@@ -8,6 +8,7 @@
8
8
  </head>
9
9
  <body>
10
10
  <div class="container">
11
+ <%= render 'phcnotifi/notifications' %>
11
12
  <%= yield %>
12
13
  </div>
13
14
  </body>
@@ -1,7 +1,7 @@
1
1
  <%= form_for(@directory_category) do |f| %>
2
2
 
3
3
  <!-- PHC-Notifi Render Validation -->
4
- <%= render 'layouts/phcnotifi/components/validations', :object => @directory_category %>
4
+ <%= render 'phcnotifi/validations', :object => @directory_category %>
5
5
 
6
6
  <div class="form-group field_with_errors">
7
7
  <label><%= f.label :catname, "Category Name" %></label>
@@ -18,7 +18,7 @@
18
18
  Update Directory Category
19
19
  </div>
20
20
  <div class="panel-body">
21
- <%= render 'layouts/phcnotifi/components/notifications' %>
21
+ <%= render 'phcnotifi/notifications' %>
22
22
  <%= render 'form' %>
23
23
  </div>
24
24
  </div>
@@ -17,7 +17,7 @@
17
17
  Directory Categories &amp; Listings
18
18
  </div>
19
19
  <div class="panel-body">
20
- <%= render 'layouts/phcnotifi/components/notifications' %>
20
+ <%= render 'phcnotifi/notifications' %>
21
21
  <table class="table table-bordered table-striped table-hover">
22
22
  <thead>
23
23
  <tr>
@@ -18,7 +18,7 @@
18
18
  Create a New Directory Category
19
19
  </div>
20
20
  <div class="panel-body">
21
- <%= render 'layouts/phcnotifi/components/notifications' %>
21
+ <%= render 'phcnotifi/notifications' %>
22
22
  <%= render 'form' %>
23
23
  </div>
24
24
  </div>
@@ -1,7 +1,7 @@
1
1
  <%= form_for([@directory_catlist.category, @directory_catlist], url: directory_category_catlists_path) do |f| %>
2
2
 
3
3
  <!-- PHC-Notifi Render Validation -->
4
- <%= render 'layouts/phcnotifi/components/validations', :object => @directory_catlist %>
4
+ <%= render 'phcnotifi/validations', :object => @directory_catlist %>
5
5
 
6
6
  <div class="form-group field_with_errors">
7
7
  <label>Select a Listing</label>
@@ -18,7 +18,7 @@
18
18
  Category Listings for <%= @category.catname %>
19
19
  </div>
20
20
  <div class="panel-body">
21
- <%= render 'layouts/phcnotifi/components/notifications' %>
21
+ <%= render 'phcnotifi/notifications' %>
22
22
  <table class="table table-bordered table-striped table-hover">
23
23
  <tbody>
24
24
  <% @directory_catlists.each do |directory_catlists| %>
@@ -18,7 +18,7 @@
18
18
  Connect an Existing Listing
19
19
  </div>
20
20
  <div class="panel-body">
21
- <%= render 'layouts/phcnotifi/components/notifications' %>
21
+ <%= render 'phcnotifi/notifications' %>
22
22
  <%= render 'form' %>
23
23
  </div>
24
24
  </div>
@@ -1,7 +1,7 @@
1
1
  <%= form_for([@members_contact.main, @members_contact], url: members_main_contacts_path) do |f| %>
2
2
 
3
3
  <!-- PHC-Notifi Render Validation -->
4
- <%= render 'layouts/phcnotifi/components/validations', :object => @members_contact %>
4
+ <%= render 'phcnotifi/validations', :object => @members_contact %>
5
5
 
6
6
  <div class="form-group field_with_errors">
7
7
  <label><%= f.label :mccontactname, "Contact Name*" %></label>
@@ -1,7 +1,7 @@
1
1
  <%= form_for([@members_contact.main, @members_contact], url: members_main_contact_path, method: :patch ) do |f| %>
2
2
 
3
3
  <!-- PHC-Notifi Render Validation -->
4
- <%= render 'layouts/phcnotifi/components/validations', :object => @members_contact %>
4
+ <%= render 'phcnotifi/validations', :object => @members_contact %>
5
5
 
6
6
  <div class="form-group field_with_errors">
7
7
  <label><%= f.label :mccontactname, "Contact Name*" %></label>
@@ -19,7 +19,7 @@
19
19
  Edit Member's Private Address
20
20
  </div>
21
21
  <div class="panel-body">
22
- <%= render 'layouts/phcnotifi/components/notifications' %>
22
+ <%= render 'phcnotifi/notifications' %>
23
23
  <%= render 'formpatch' %>
24
24
  </div>
25
25
  </div>
@@ -18,7 +18,7 @@
18
18
  Member's Contact Index
19
19
  </div>
20
20
  <div class="panel-body">
21
- <%= render 'layouts/phcnotifi/components/notifications' %>
21
+ <%= render 'phcnotifi/notifications' %>
22
22
  <table class="table table-bordered table-striped table-hover">
23
23
  <thead>
24
24
  <tr>
@@ -19,7 +19,7 @@
19
19
  Create a New Member's Private Address
20
20
  </div>
21
21
  <div class="panel-body">
22
- <%= render 'layouts/phcnotifi/components/notifications' %>
22
+ <%= render 'phcnotifi/notifications' %>
23
23
  <%= render 'form' %>
24
24
  </div>
25
25
  </div>
@@ -1,7 +1,7 @@
1
1
  <%= form_for([@members_listing.main, @members_listing], url: members_main_listings_path) do |f| %>
2
2
 
3
3
  <!-- PHC-Notifi Render Validation -->
4
- <%= render 'layouts/phcnotifi/components/validations', :object => @members_listing %>
4
+ <%= render 'phcnotifi/validations', :object => @members_listing %>
5
5
 
6
6
  <div class="form-group field_with_errors">
7
7
  <label><%= f.label :mlcontactname, "Company Contact" %></label>
@@ -1,7 +1,7 @@
1
1
  <%= form_for([@members_listing.main, @members_listing], url: members_main_listing_path, method: :patch) do |f| %>
2
2
 
3
3
  <!-- PHC-Notifi Render Validation -->
4
- <%= render 'layouts/phcnotifi/components/validations', :object => @members_listing %>
4
+ <%= render 'phcnotifi/validations', :object => @members_listing %>
5
5
 
6
6
  <div class="form-group field_with_errors">
7
7
  <label><%= f.label :mlcontactname, "Company Contact" %></label>
@@ -19,7 +19,7 @@
19
19
  Edit Listing for Member
20
20
  </div>
21
21
  <div class="panel-body">
22
- <%= render 'layouts/phcnotifi/components/notifications' %>
22
+ <%= render 'phcnotifi/notifications' %>
23
23
  <%= render 'formpatch' %>
24
24
  </div>
25
25
  </div>
@@ -18,7 +18,7 @@
18
18
  Member's Directory Listing Index
19
19
  </div>
20
20
  <div class="panel-body">
21
- <%= render 'layouts/phcnotifi/components/notifications' %>
21
+ <%= render 'phcnotifi/notifications' %>
22
22
  <table class="table table-bordered table-striped table-hover">
23
23
  <thead>
24
24
  <tr>
@@ -18,7 +18,7 @@
18
18
  Create a New Listing for Member
19
19
  </div>
20
20
  <div class="panel-body">
21
- <%= render 'layouts/phcnotifi/components/notifications' %>
21
+ <%= render 'phcnotifi/notifications' %>
22
22
  <%= render 'form' %>
23
23
  </div>
24
24
  </div>
@@ -1,7 +1,7 @@
1
1
  <%= form_for(@members_main) do |f| %>
2
2
 
3
3
  <!-- PHC-Notifi Render Validation -->
4
- <%= render 'layouts/phcnotifi/components/validations', :object => @members_main %>
4
+ <%= render 'phcnotifi/validations', :object => @members_main %>
5
5
 
6
6
  <div class="form-group field_with_errors">
7
7
  <label><%= f.label :mfirstname, "First Name*" %></label>
@@ -18,7 +18,7 @@
18
18
  Update Member's Information
19
19
  </div>
20
20
  <div class="panel-body">
21
- <%= render 'layouts/phcnotifi/components/notifications' %>
21
+ <%= render 'phcnotifi/notifications' %>
22
22
  <%= render 'form' %>
23
23
  </div>
24
24
  </div>
@@ -17,7 +17,7 @@
17
17
  Member's Index
18
18
  </div>
19
19
  <div class="panel-body">
20
- <%= render 'layouts/phcnotifi/components/notifications' %>
20
+ <%= render 'phcnotifi/notifications' %>
21
21
  <table class="table table-bordered table-striped table-hover">
22
22
  <thead>
23
23
  <tr>
@@ -18,7 +18,7 @@
18
18
  Create a New Member
19
19
  </div>
20
20
  <div class="panel-body">
21
- <%= render 'layouts/phcnotifi/components/notifications' %>
21
+ <%= render 'phcnotifi/notifications' %>
22
22
  <%= render 'form' %>
23
23
  </div>
24
24
  </div>
@@ -1,3 +1,3 @@
1
1
  module Phcmembers
2
- VERSION = "1.6.0"
2
+ VERSION = "1.7.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcmembers
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0
4
+ version: 1.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - BradPotts
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-18 00:00:00.000000000 Z
11
+ date: 2016-03-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -36,14 +36,20 @@ dependencies:
36
36
  requirements:
37
37
  - - "~>"
38
38
  - !ruby/object:Gem::Version
39
- version: 0.2.1
39
+ version: '2.0'
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ version: 2.0.1
40
43
  type: :runtime
41
44
  prerelease: false
42
45
  version_requirements: !ruby/object:Gem::Requirement
43
46
  requirements:
44
47
  - - "~>"
45
48
  - !ruby/object:Gem::Version
46
- version: 0.2.1
49
+ version: '2.0'
50
+ - - ">="
51
+ - !ruby/object:Gem::Version
52
+ version: 2.0.1
47
53
  - !ruby/object:Gem::Dependency
48
54
  name: jquery-rails
49
55
  requirement: !ruby/object:Gem::Requirement
@@ -421,8 +427,6 @@ files:
421
427
  - app/views/layouts/phcmembers/application.html.erb
422
428
  - app/views/layouts/phcmembers/directory/directory_all.html.erb
423
429
  - app/views/layouts/phcmembers/members/members_all.html.erb
424
- - app/views/layouts/phcnotifi/components/_notifications.html.erb
425
- - app/views/layouts/phcnotifi/components/_validations.html.erb
426
430
  - app/views/phcmembers/api/catsapi/index.json.rabl
427
431
  - app/views/phcmembers/api/listapi/index.json.rabl
428
432
  - app/views/phcmembers/directory/categories/_form.html.erb
@@ -1,13 +0,0 @@
1
- <div class="row">
2
- <div class=".col-md-12">
3
- <div class="alert alert-dismissible alert-warning hidden alert-please-update" role="alert">
4
- <button aria-label="Close" class="close" data-dismiss="alert" type="button"><span aria-hidden="true"> ×</span></button><strong>Please update</strong>Despite the fact that the record doens't show on your screen you must save it to delete it!
5
- </div>
6
- <% flash.each do |key, value| %>
7
- <div class="<%= flash_class(key) %> fade in">
8
- <a href="#" data-dismiss="alert" class="close">×</a>
9
- <%= value %>
10
- </div>
11
- <% end %>
12
- </div>
13
- </div>
@@ -1,11 +0,0 @@
1
- <% if object.errors.any? %>
2
- <div class="alert alert alert-danger alert-dismissible" role="alert">
3
- <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
4
- <h4>The form contains <%= pluralize(object.errors.count, "error") %>.</h4>
5
- <ul class="list-group">
6
- <% object.errors.full_messages.each do |msg| %>
7
- <li class="list-group-item list-group-item-danger borderless"><%= msg %></li>
8
- <% end %>
9
- </ul>
10
- </div>
11
- <% end %>