phcmemberspro 6.6.5 → 6.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/phcmemberspro/directory/catlists_controller.rb +1 -0
  3. data/app/controllers/phcmemberspro/members/mains_controller.rb +5 -0
  4. data/app/views/phcmemberspro/dashboard/mains/index.html.erb +5 -5
  5. data/app/views/phcmemberspro/members/mains/components/_profile_main.html.erb +29 -9
  6. data/app/views/phcmemberspro/members/mains/components/_profile_sidebar.html.erb +11 -9
  7. data/db/migrate/20160227212144_create_phcmemberspro_directory_catlists.rb +1 -0
  8. data/lib/phcmemberspro/version.rb +1 -1
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6be432fbb58219643df1bc417f99f37d24d9a25b
4
- data.tar.gz: bde76c564b170f9637ba41dd9a0277bcee0ab094
3
+ metadata.gz: 8efbd9f2b5680f112c4d6addc7d5e43adb0e82fc
4
+ data.tar.gz: fae7756d5ee133ce1f35baa756571fea9e7510ca
5
5
  SHA512:
6
- metadata.gz: d937f5e4ae34af09004e085e3bbb8a57e6bb36c023f57f4406e8480c7958cf6070c68639c0b2ce38fd6bdb30d46468d09903a143301489dbe0171b8a63079285
7
- data.tar.gz: 9f9a3eaa0c0d9043b0dda54948c928f9dee4b8e2f6e65fea1fb496b46f9f5aaa983949d9099ddfc3dd595dc6fb904c04157a397fe3191aacfdd1c0fe45ec079a
6
+ metadata.gz: 619a0c70dec3e05b9b534fd1826788140913ca15208a449ac44978ae3ea9218be31f384c8e44b34e784003d52427ce406c8ff6a0feee1131c9e2c7b35184ed65
7
+ data.tar.gz: 3cadd5190116c78f595370666604f1e73662a0d0123a9ac763b32862e9ea2c0087924b24cf0839782372de426a0746fc543d87f36000f6487b4382aff464745f
data/app/controllers/phcmemberspro/directory/catlists_controller.rb CHANGED
@@ -45,6 +45,7 @@ module Phcmemberspro
45
45
  @directory_catlist.user_id = current_user.id
46
46
  @directory_catlist.membership_id = membership_info.id
47
47
  @directory_catlist.oganization_id = membership_info.org_id
48
+ @directory_catlist.mains_id = Members::Business.find(params[:category_id])
48
49
  respond_to do |format|
49
50
  if @directory_catlist.save
50
51
  format.html { redirect_to directory_category_catlists_path, notice: 'Comment for Directorycategory was Successfully Created.' }
data/app/controllers/phcmemberspro/members/mains_controller.rb CHANGED
@@ -16,6 +16,11 @@ module Phcmemberspro
16
16
 
17
17
  # Detailed Member Profile
18
18
  def show
19
+ @versions = PaperTrail::Version.where(item_id: params[:id])
20
+ @members_contacts = Members::Contact.where(main_id: params[:id])
21
+ @members_businesses = Members::Business.where(main_id: params[:id])
22
+ @members_listings = Directory::Listing.where(main_id: params[:id])
23
+ @members_main = Members::Main.find(params[:id])
19
24
  end
20
25
 
21
26
  # New Member Profile
data/app/views/phcmemberspro/dashboard/mains/index.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
  <div class="col-md-3">
3
3
  <!-- BEGIN WIDGET THUMB -->
4
4
  <div class="widget-thumb widget-bg-color-white text-uppercase margin-bottom-20 bordered">
5
- <h4 class="widget-thumb-heading">MEMBERS</h4>
5
+ <h4 class="widget-thumb-heading"><%="MEMBER".pluralize(2) %></h4>
6
6
  <div class="widget-thumb-wrap">
7
7
  <i class="widget-thumb-icon bg-green icon-bulb"></i>
8
8
  <div class="widget-thumb-body">
@@ -16,7 +16,7 @@
16
16
  <div class="col-md-3">
17
17
  <!-- BEGIN WIDGET THUMB -->
18
18
  <div class="widget-thumb widget-bg-color-white text-uppercase margin-bottom-20 bordered">
19
- <h4 class="widget-thumb-heading">BUSINESSES</h4>
19
+ <h4 class="widget-thumb-heading"><%="BUSINESS".pluralize(2) %></h4>
20
20
  <div class="widget-thumb-wrap">
21
21
  <i class="widget-thumb-icon bg-red icon-layers"></i>
22
22
  <div class="widget-thumb-body">
@@ -30,9 +30,9 @@
30
30
  <div class="col-md-3">
31
31
  <!-- BEGIN WIDGET THUMB -->
32
32
  <div class="widget-thumb widget-bg-color-white text-uppercase margin-bottom-20 bordered">
33
- <h4 class="widget-thumb-heading">LISTINGS</h4>
33
+ <h4 class="widget-thumb-heading"><%="LISTING".pluralize(2) %></h4>
34
34
  <div class="widget-thumb-wrap">
35
- <i class="widget-thumb-icon bg-purple icon-screen-desktop"></i>
35
+ <i class="widget-thumb-icon bg-purple icon-list"></i>
36
36
  <div class="widget-thumb-body">
37
37
  <span class="widget-thumb-subtitle">ACTIVE TOTAL</span>
38
38
  <span class="widget-thumb-body-stat" data-counter="counterup" data-value="<%= @directory_catlists.count(:all) %>">0</span>
@@ -44,7 +44,7 @@
44
44
  <div class="col-md-3">
45
45
  <!-- BEGIN WIDGET THUMB -->
46
46
  <div class="widget-thumb widget-bg-color-white text-uppercase margin-bottom-20 bordered">
47
- <h4 class="widget-thumb-heading">DIRECTORY</h4>
47
+ <h4 class="widget-thumb-heading"><%="DIRECTORY".pluralize(2) %></h4>
48
48
  <div class="widget-thumb-wrap">
49
49
  <i class="widget-thumb-icon bg-blue icon-bar-chart"></i>
50
50
  <div class="widget-thumb-body">
data/app/views/phcmemberspro/members/mains/components/_profile_main.html.erb CHANGED
@@ -1,4 +1,5 @@
1
1
  <div class="row">
2
+
2
3
  <div class="col-md-6">
3
4
  <div class="portlet light ">
4
5
  <div class="portlet-title">
@@ -7,14 +8,6 @@
7
8
  <span class="caption-subject font-blue-madison bold uppercase"><%= @members_main.mfirstname + ' ' + @members_main.mlastname %> Member Stats</span>
8
9
  </div>
9
10
  <div class="actions">
10
- <div class="btn-group btn-group-devided" data-toggle="buttons">
11
- <label class="btn btn-transparent grey-salsa btn-circle btn-sm active">
12
- <input type="radio" name="options" class="toggle" id="option1">Today</label>
13
- <label class="btn btn-transparent grey-salsa btn-circle btn-sm">
14
- <input type="radio" name="options" class="toggle" id="option2">Week</label>
15
- <label class="btn btn-transparent grey-salsa btn-circle btn-sm">
16
- <input type="radio" name="options" class="toggle" id="option2">Month</label>
17
- </div>
18
11
  </div>
19
12
  </div>
20
13
  <div class="portlet-body">
@@ -45,18 +38,45 @@
45
38
  </div>
46
39
  </div>
47
40
  </div>
41
+
48
42
  <div class="col-md-6">
49
43
  <div class="portlet light ">
50
44
  <div class="portlet-title">
51
45
  <div class="caption caption-md">
52
46
  <i class="icon-globe theme-font hide"></i>
53
- <span class="caption-subject font-blue-madison bold uppercase"><%= @members_main.mfirstname + ' ' + @members_main.mlastname %> Coming Soon</span>
47
+ <span class="caption-subject font-blue-madison bold uppercase"><%= @members_main.mfirstname + ' ' + @members_main.mlastname %> Audit Log</span>
54
48
  </div>
55
49
  <div class="actions">
56
50
  </div>
57
51
  </div>
58
52
  <div class="portlet-body">
53
+ <div class="scroller" style="height: 320px;" data-always-visible="1" data-rail-visible1="0" data-handle-color="#D7DCE2">
54
+ <ul class="feeds">
55
+ <% @versions.each do |version| %>
56
+ <li>
57
+ <div class="col1">
58
+ <div class="cont">
59
+ <div class="cont-col1">
60
+ <div class="label label-sm label-success">
61
+ <i class="fa fa-bell-o"></i>
62
+ </div>
63
+ </div>
64
+ <div class="cont-col2">
65
+ <div class="desc">
66
+ <strong>EVENT #<%= version.id %></strong> - <i> <%= l(version.created_at, format: "%-d/%m/%Y") %> </i> - Event: <%= version.event.capitalize %> Member
67
+ </div>
68
+ </div>
69
+ </div>
70
+ </div>
71
+ <div class="col2">
72
+ <div class="date"> <%= l(version.created_at, format: "%H:%M %Z") %> </div>
73
+ </div>
74
+ </li>
75
+ <% end %>
76
+ </ul>
77
+ </div>
59
78
  </div>
60
79
  </div>
61
80
  </div>
81
+
62
82
  </div>
data/app/views/phcmemberspro/members/mains/components/_profile_sidebar.html.erb CHANGED
@@ -42,16 +42,16 @@
42
42
  <!-- STATS -->
43
43
  <div class="row list-separated profile-stat">
44
44
  <div class="col-md-4 col-sm-4 col-xs-6">
45
- <div class="uppercase profile-stat-title"> 0 </div>
46
- <div class="uppercase profile-stat-text"> Addresses </div>
45
+ <div class="uppercase profile-stat-title"> <%= @members_contacts.count(:all) %> </div>
46
+ <div class="uppercase profile-stat-text"> <%= "Contact".pluralize(2) %> </div>
47
47
  </div>
48
48
  <div class="col-md-4 col-sm-4 col-xs-6">
49
- <div class="uppercase profile-stat-title"> 0 </div>
50
- <div class="uppercase profile-stat-text"> Businesses </div>
49
+ <div class="uppercase profile-stat-title"> <%= @members_businesses.count(:all) %> </div>
50
+ <div class="uppercase profile-stat-text"> <%= "Business".pluralize(2) %> </div>
51
51
  </div>
52
52
  <div class="col-md-4 col-sm-4 col-xs-6">
53
- <div class="uppercase profile-stat-title"> 0 </div>
54
- <div class="uppercase profile-stat-text"> Listings </div>
53
+ <div class="uppercase profile-stat-title"> <%= @members_businesses.count(:all) %> </div>
54
+ <div class="uppercase profile-stat-text"> <%= "Listing".pluralize(2) %> </div>
55
55
  </div>
56
56
  </div>
57
57
  <!-- STATS -->
@@ -59,8 +59,10 @@
59
59
  <h4 class="profile-desc-title">Member Notes</h4>
60
60
  <span class="profile-desc-text"><%= @members_main.mnotes %></span>
61
61
  <div class="margin-top-20 profile-desc-link">
62
- <i class="fa fa-envelope"></i>
63
- <%= mail_to @members_main.memail, @members_main.memail %>
62
+ <%= mail_to @members_main.memail do %>
63
+ <i class="fa fa-envelope"></i>
64
+ <%= @members_main.memail %>
65
+ <% end %>
64
66
  </div>
65
67
  <div class="margin-top-20 profile-desc-link">
66
68
  <i class="fa fa-twitter"></i>
@@ -75,4 +77,4 @@
75
77
  <a href="https://www.linkedin.com/in/<%= @members_main.smlinkedin %>"><%= @members_main.smfacebook %></a>
76
78
  </div>
77
79
  </div>
78
- </div>
80
+ </div>
data/db/migrate/20160227212144_create_phcmemberspro_directory_catlists.rb CHANGED
@@ -4,6 +4,7 @@ class CreatePhcmembersproDirectoryCatlists < ActiveRecord::Migration
4
4
 
5
5
  t.integer :category_id
6
6
  t.integer :subcategory_id
7
+ t.integer :mains_id
7
8
  t.integer :business_id
8
9
 
9
10
  t.string :user_id
data/lib/phcmemberspro/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Phcmemberspro
2
- VERSION = "6.6.5"
2
+ VERSION = "6.7.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcmemberspro
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.6.5
4
+ version: 6.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-06-09 00:00:00.000000000 Z
11
+ date: 2016-06-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails