phcmembers 14.0.1 → 15.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df6650cc83e936742c334e228f833facfe80c15e
-  data.tar.gz: 99f9fdde12babde16051e001aca1fa965e091a20
+  metadata.gz: 57a0dc275e4e0b5cdb75354a2b2344ff2095f5cc
+  data.tar.gz: 27f09abff70db31028773cda0ee49ae2a8d71df2
 SHA512:
-  metadata.gz: 7d3d07fcdfcd6dbd18a8557844ccd8c50ad2bb07ca670821976b4fae6b81c9ae93b10da6166f15a243c27658232e8b2f49d92e6ee54a7777edc9c2e7c13d9d8a
-  data.tar.gz: 67dc49028c2cae8be5e2878b782c23bf5912419773f0ba72bce2c8cabff2fbf0faca71567ac8ce386de4a2eb4ad2c2c665b4ab348984739e737c8bfdf242b3df
+  metadata.gz: 9b5fb607bd1d72a41cd85fd0d2526eb67248c70c204f8d5bbdc5cdc90d86ece9d753df7300b20a21dcb0f61e841cf48f6c33521f45e7c8c951ced6f91b3c275d
+  data.tar.gz: b56ee03c2dea64eef3dc0404892c3185ebf9a3edab27faee10e6fe625569384187ee9c1bf7db9bb93499edb1c09f3afb63c5a6b02f96b597402474dd550d217d

data/README.md

@@ -14,7 +14,7 @@ PHCMembers(2017) rails engine to manage membership information and directory lis
 
 #### Step 1 - Add PHCMembers to your gemfile and run command   
 
-	gem 'phcmembers', '~> 14.0'
+	gem 'phcmembers', '~> 15.0'
 	bundle install
 
 #### Step 2 - Add PHCMembers Database Tables  

data/app/controllers/phcmembers/directory/categories_controller.rb

@@ -15,7 +15,7 @@ module Phcmembers
     # DETAILED - Directory Category
     def show
       @directory_category = Directory::Category.find(params[:id])
-      @versions = Phcmembers::CategoryVersions.where(item_id: params[:id], item_type: 'Phcmembers::Directory::Category')
+      @directory_category_versions = Phcmembers::CategoryVersions.where(item_id: @directory_category, item_type: 'Phcmembers::Directory::Category')
     end
 
     # NEW - Directory Category

data/app/controllers/phcmembers/directory/categorylistings_controller.rb

@@ -5,7 +5,7 @@ module Phcmembers
 
     # Security & Action Filters
     before_action :set_paper_trail_whodunnit
-    before_action :set_directory_category, only: [:show]
+    before_action :set_directory_category_listing, only: [:show]
 
     # INDEX - Directory Category/Listings
     def index
@@ -14,7 +14,15 @@ module Phcmembers
 
     # DETAILED - Directory Category/Listings
     def show
-      @directory_categorylistings = Directory::Categorylisting.find(params[:id])
+      @directory_categorylisting = Directory::Categorylisting.find(params[:id])
+      @directory_categorylistings_versions = Phcmembers::CategoryListingVersions.where(item_id: @directory_category, item_type: 'Phcmembers::Directory::Category')
+    end
+
+    private
+
+    # Common Callbacks
+    def set_directory_category_listing
+      @directory_categorylisting = Directory::Categorylisting.find(params[:id])
     end
 
   end

data/app/controllers/phcmembers/member/addresses_controller.rb

@@ -18,7 +18,7 @@ module Phcmembers
     def show
       profile = Member::Profile.find(params[:profile_id])
       @member_address = profile.addresses.find(params[:id])
-      @versions = Phcmembers::AddressVersions.where(item_id: params[:id], item_type: 'Phcmembers::Member::Address')
+      @member_address_versions = Phcmembers::AddressVersions.where(item_id: @member_address, item_type: 'Phcmembers::Member::Address')
     end
 
     # NEW - Directory Listings

data/app/controllers/phcmembers/member/listings_controller.rb

@@ -17,8 +17,8 @@ module Phcmembers
     # LISTINGS DETAILS - Directory Listings
     def show
       profile = Member::Profile.find(params[:profile_id])
-      @meber_listing = profile.listings.find(params[:id])
-      @versions = Phcmembers::ListingVersions.where(item_id: params[:id], item_type: 'Phcmembers::Member::Listing')
+      @member_listing = profile.listings.find(params[:id])
+      @member_listing_versions = Phcmembers::ListingVersions.where(item_id: @member_listing, item_type: 'Phcmembers::Member::Listing')
     end
 
     # NEW - Directory Listings

data/app/controllers/phcmembers/member/profiles_controller.rb

@@ -15,7 +15,7 @@ module Phcmembers
     # DETAILED PROFILE - Member Profile
     def show
       @member_profile = Member::Profile.find(params[:id])
-      @versions = Phcmembers::ProfileVersions.where(item_id: params[:id], item_type: 'Phcmembers::Member::Profile')
+      @member_profile_versions = Phcmembers::ProfileVersions.where(item_id: @member_profile, item_type: 'Phcmembers::Member::Profile')
     end
 
     # NEW FORM - Member Profile

data/app/models/phcmembers/category_listing_versions.rb

@@ -0,0 +1,5 @@
+module Phcmembers
+  class CategoryListingVersions < PaperTrail::Version
+		self.table_name = :phcmembers_categorylisting_versions
+	end
+end

data/app/models/phcmembers/directory/categorylisting.rb

@@ -1,7 +1,10 @@
 module Phcmembers
 	class Directory::Categorylisting < ApplicationRecord
 
-		# Model Relationships
+		# Paper_tail Initialize
+		has_paper_trail :class_name => 'Phcmembers::CategoryListingVersions'
+
+		# Relationships
 		belongs_to :listing, class_name: 'Phcmembers::Member::Listing'
 		belongs_to :category, class_name: 'Phcmembers::Directory::Category'
 

data/app/models/phcmembers/member/address.rb

@@ -44,5 +44,10 @@ module Phcmembers
 			]
 		end
 
+		def country_name
+	    country = ISO3166::Country[country_code]
+	    country.translations[I18n.locale.to_s] || country.mccountry
+	  end
+
 	end
 end

data/app/views/layouts/phcmembers/components/backend/footer/_footer.html.erb

@@ -1,4 +1,4 @@
 <div class="pull-right hidden-xs">
-	<b>Version</b> 14.0.0 - 05-29-<%= Date.today.year %>
+	<b>Version</b> 15.0.0 - 05-30-<%= Date.today.year %>
 </div>
-<strong>&copy; 2012-<%= Time.now.year %> <%= link_to "https://phcnetworks.net", target: "_blank", rel: "nofollow" do %>PHCNetworks<% end %></strong>
+<strong><%= link_to "https://phcmembers.com", target: "_blank", rel: "nofollow" do %>PHCMembers 2017<% end %> &copy; 2012-<%= Time.now.year %></strong>

data/app/views/phcmembers/directory/categories/components/_category_audits.html.erb

@@ -1,12 +1,9 @@
 <div class="scroller" style="height: 320px;" data-always-visible="1" data-rail-visible1="0" data-handle-color="#D7DCE2">
 
 	<ul class="list-group feeds">
-		<% @versions.each do |version| %>
+		<% @directory_category_versions.each do |directory_category_version| %>
 			<li class="list-group-item">
-				<i class="fa fa-bell-o fa-fw"></i>
-				<strong>EVENT #<%= version.id %></strong> -
-				<i> <%= l(version.created_at, format: "%-d/%m/%Y") %> </i> -
-				<%= version.event.capitalize %> - Profile <%= l(version.created_at, format: "%H:%M %Z") %>
+				<i class="fa fa-bell-o fa-fw"></i> Category Event #<%= directory_category_version.id %> - <strong><%= directory_category_version.event.capitalize + ' ' + @directory_category.catname %> Category</strong> - on <i><%= l(directory_category_version.created_at, format: "%-d/%m/%Y") %></i> at <i><%= l(directory_category_version.created_at, format: "%H:%M %Z") %></i>
 			</li>
 		<% end %>
 	</ul>

data/app/views/phcmembers/directory/categories/components/_category_main.html.erb

@@ -1,31 +1,22 @@
-<div class="col-md-6">
-
-	<div class="panel panel-default">
-
-		<div class="panel-heading">
-			Category List
+<div class="row">
+	<div class="col-md-6">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				Category List
+			</div>
+			<div class="panel-body">
+				<%= render 'phcmembers/directory/categories/components/category_list' %>
+			</div>
 		</div>
-
-		<div class="panel-body">
-			<%= render 'phcmembers/directory/categories/components/category_list' %>
-		</div>
-
 	</div>
-
-</div>
-
-<div class="col-md-6">
-
-	<div class="panel panel-default">
-
-		<div class="panel-heading">
-			Category Change Logs
-		</div>
-
-		<div class="panel-body">
-			<%= render 'phcmembers/directory/categories/components/category_audits' %>
+	<div class="col-md-6">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				Category Change Logs
+			</div>
+			<div class="panel-body">
+				<%= render 'phcmembers/directory/categories/components/category_audits' %>
+			</div>
 		</div>
-
 	</div>
-
 </div>

data/app/views/phcmembers/directory/categories/edit.html.erb

@@ -27,9 +27,9 @@
 					<h3 class="box-title"><%= yield(:phc_title) %></h3>
 				</div>
 				<div class="box-body">
-
+					<!-- Page Form (Edit) -->
 					<%= render 'form', directory_category: @directory_category %>
-
+					<!-- Page Form (Edit) -->
 				</div>
 			</div>
 		</div>

data/app/views/phcmembers/directory/categories/new.html.erb

@@ -27,7 +27,9 @@
 					<h3 class="box-title"><%= yield(:phc_title) %></h3>
 				</div>
 				<div class="box-body">
+					<!-- Page Form (New) -->
 					<%= render 'form', directory_category: @directory_category %>
+					<!-- Page Form (New) -->
 				</div>
 			</div>
 		</div>

data/app/views/phcmembers/directory/categories/show.html.erb

@@ -20,8 +20,6 @@
 
 <!-- Main Content -->
 <section class="content">
-	<div class="row">
 		<%= render 'phcmembers/directory/categories/components/category_main' %>
-	</div>
 </section>
 <!-- Main Content -->

data/app/views/phcmembers/directory/categorylistings/components/_category_listing_audits.html.erb

@@ -0,0 +1,11 @@
+<div class="scroller" style="height: 320px;" data-always-visible="1" data-rail-visible1="0" data-handle-color="#D7DCE2">
+
+	<ul class="list-group feeds">
+		<% @directory_categorylistings_versions.each do |directory_categorylistings_version| %>
+			<li class="list-group-item">
+				<i class="fa fa-bell-o fa-fw"></i> Listing Event #<%= directory_categorylistings_version.id %> - <strong><%= directory_categorylistings_version.event.capitalize + ' ' + @directory_categorylisting.listing.mbcompanyname + ' ' + @directory_categorylisting.directory.catname %> Category</strong> - on <i><%= l(directory_categorylistings_version.created_at, format: "%-d/%m/%Y") %></i> at <i><%= l(directory_categorylistings_version.created_at, format: "%H:%M %Z") %></i>
+			</li>
+		<% end %>
+	</ul>
+
+</div>

data/app/views/phcmembers/directory/categorylistings/components/_category_listing_list.html.erb

@@ -0,0 +1,7 @@
+<ul class="list-group">
+	<% @directory_categorylisting.each do |directory_categorylisting| %>
+		<li class="list-group-item">
+			<%= link_to directory_categorylisting.mbcompanyname, phcmembers.member_profile_listing_path(member_listing.profile, member_listing) %>
+		</li>
+	<% end %>
+</ul>

data/app/views/phcmembers/directory/categorylistings/components/_category_listing_main.html.erb

@@ -0,0 +1,22 @@
+<div class="row">
+	<div class="col-md-6">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				Category List
+			</div>
+			<div class="panel-body">
+				<%= render 'phcmembers/directory/categorylistings/components/category_listing_list' %>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-6">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				Category Change Logs
+			</div>
+			<div class="panel-body">
+				<%= render 'phcmembers/directory/categorylistings/components/category_listing_audits' %>
+			</div>
+		</div>
+	</div>
+</div>

data/app/views/phcmembers/directory/categorylistings/index.html.erb

@@ -1,63 +1,62 @@
 <!-- Title Variables -->
-<% phc_title "Member Listings Manager" %>
-<% phc_title_tagline "Complete Directory Listing Index" %>
-
-<!-- Page Header -->
-<div class="row">
-	<div class="col-lg-12">
-
-		<!-- Bread Crumbs -->
-		<ol class="breadcrumb">
-			<li><%= link_to "Dashboard", directory_root_path %></li>
-			<li class="active"><%= yield(:phc_title_tagline) %></li>
-		</ol>
-
-		<!-- Page Title -->
-		<h3 class="page-title">
-			<%= yield(:phc_title) %> </br>
-			<small><%= yield(:phc_title_tagline) %></small>
-		</h3>
-
-	</div>
-</div>
+<% phc_title "Member Listings Viewer" %>
+<% phc_title_tagline "Complete Listing Index" %>
+<% phc_breadcrumb_one link_to "Dashboard", phcmembers.modules_dashboards_index_path %>
+<% phc_breadcrumb_two yield(:phc_title_tagline) %>
+<!-- Title System -->
+
+<!-- Page Title Bar -->
+<section class="content-header">
+	<!-- Page Title and BreadCrumb -->
+	<h1><%= yield(:phc_title) %> <small><%= yield(:phc_title_tagline) %></small></h1>
+	<ol class="breadcrumb">
+		<li><%= yield(:phc_breadcrumb_one) %></li>
+		<li class="active"><%= yield(:phc_breadcrumb_two) %></li>
+	</ol>
+	<!-- Page Title and BreadCrumb -->
+</section>
+<!-- Page Title Bar -->
 
 <!-- Main Content -->
-<div class="row">
-	<div class="col-lg-12">
-
-		<div class="panel panel-default">
-			<div class="panel-heading">
-
-				<div class="caption">
-					<span class="caption-subject bold uppercase"><%= yield(:phc_title_tagline) %></span>
+<section class="content">
+	<div class="row">
+		<div class="col-lg-12">
+			<div class="box">
+				<div class="box-header with-border">
+					<h3 class="box-title"><%= yield(:phc_title) %></h3>
 				</div>
+				<div class="box-body">
 
-			</div>
-			<div class="panel-body">
-
-				<div class="table-scrollable">
-					<table class="table table-striped table-bordered table-advance table-hover">
-
-						<thead>
-							<tr>
-								<th>Category</th>
-								<th>Company Name</th>
-							</tr>
-						</thead>
-
-						<tbody>
-							<% @directory_categorylistings.each do |directory_categorylisting| %>
+					<!-- Index Table -->
+					<div class="table-responsive">
+						<table class="table table-bordered table-striped table-hover">
+							<thead>
 								<tr>
-									<td><%= directory_categorylisting.category.catname %></td>
-									<td><%= directory_categorylisting.listing.mbcompanyname %></td>
+									<th>Category</th>
+									<th>Company Name</th>
+								</tr>
+							</thead>
+							<tbody>
+								<% @directory_categorylistings.each do |directory_categorylisting| %>
+									<tr>
+										<td><%= directory_categorylisting.category.catname %></td>
+										<td><%= directory_categorylisting.listing.mbcompanyname %></td>
+									</tr>
 								</tr>
 							<% end %>
 						</tbody>
-
 					</table>
 				</div>
+				<!-- Index Table -->
+
+				<!-- Panel Footer -->
+				<div class="box-footer clearfix">
+				</div>
+				<!-- Panel Footer -->
+
 			</div>
 		</div>
-
 	</div>
 </div>
+</section>
+<!-- Main Content -->

data/app/views/phcmembers/directory/categorylistings/show.html.erb

@@ -1,4 +1,25 @@
-<p id="notice"><%= notice %></p>
+<!-- Title System -->
+<% phc_title "Directory Category Manager" %>
+<% phc_title_tagline "Detailed Information for " + @directory_category.catname %>
+<% phc_breadcrumb_one link_to "Dashboard", phcmembers.modules_dashboards_index_path %>
+<% phc_breadcrumb_two link_to "Directory Category Index", phcmembers.directory_categories_path %>
+<% phc_breadcrumb_three yield(:phc_title_tagline) %>
+<!-- Title System -->
 
-<%= link_to 'Edit', edit_directory_categorylisting_path(@directory_categorylisting) %> |
-<%= link_to 'Back', directory_categorylistings_path %>
+<!-- Page Title Bar -->
+<section class="content-header">
+	<!-- Page Title and BreadCrumb -->
+	<h1><%= yield(:phc_title) %> <small><%= yield(:phc_title_tagline) %></small></h1>
+	<ol class="breadcrumb">
+		<li><%= yield(:phc_breadcrumb_one) %></li>
+		<li class="active"><%= yield(:phc_breadcrumb_two) %></li>
+	</ol>
+	<!-- Page Title and BreadCrumb -->
+</section>
+<!-- Page Title Bar -->
+
+<!-- Main Content -->
+<section class="content">
+		<%= render 'phcmembers/directory/categorylistings/components/categorylisting_main' %>
+</section>
+<!-- Main Content -->

data/app/views/phcmembers/member/addresses/_form.html.erb

@@ -37,7 +37,7 @@
 
 	<!-- Form Button -->
 	<div class="actions">
-		<%= f.submit class: "btn btn-primary" %>
+	<%= f.submit class: "btn btn-primary" %>
 	</div>
 	<!-- Form Button -->
 

data/app/views/phcmembers/member/addresses/components/_address_audits.html.erb

@@ -1,12 +1,11 @@
 <div class="scroller" style="height: 320px;" data-always-visible="1" data-rail-visible1="0" data-handle-color="#D7DCE2">
+
 	<ul class="list-group feeds">
-		<% @versions.each do |version| %>
+		<% @member_address_versions.each do |member_address_version| %>
 			<li class="list-group-item">
-				<i class="fa fa-bell-o fa-fw"></i>
-				<strong>EVENT #<%= version.id %></strong> -
-				<i> <%= l(version.created_at, format: "%-d/%m/%Y") %> </i> -
-				<%= version.event.capitalize %> - Profile <%= l(version.created_at, format: "%H:%M %Z") %>
+				<i class="fa fa-bell-o fa-fw"></i> Member Listing Event #<%= member_address_version.id %> - <strong><%= member_address_version.event.capitalize + ' ' + @member_address.mcaddressl1 %> Listing</strong> - on <i><%= l(member_address_version.created_at, format: "%-d/%m/%Y") %></i> at <i><%= l(member_address_version.created_at, format: "%H:%M %Z") %></i>
 			</li>
 		<% end %>
 	</ul>
+
 </div>

data/app/views/phcmembers/member/addresses/components/_address_list.html.erb

@@ -0,0 +1,32 @@
+<p>
+    <strong>Address Line 1:</strong>
+    <%= @member_address.mcaddressl1 %>
+</p>
+
+<p>
+    <strong>Address Line 2:</strong>
+    <%= @member_address.mcaddressl2 %>
+</p>
+
+<p>
+    <strong>City:</strong>
+    <%= @member_address.mccity %>
+</p>
+
+<p>
+    <strong>Province:</strong>
+    <%= @member_address.mcprovince %>
+</p>
+
+<p>
+    <strong>Country:</strong>
+    <%= @member_address.mccountry %>
+</p>
+
+<p>
+    <strong>PostalCode:</strong>
+    <%= @member_address.mcpostalcode %>
+</p>
+
+<%= link_to 'Update ' + @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname + ' Listing', edit_member_profile_address_path, class: "btn btn-primary" %>
+<%= link_to 'Delete ' + @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname + ' Listing', member_profile_address_path(@member_address), method: :delete, data: { confirm: 'Are you sure? This will remove the adress infromation. This action cannot be undone.' }, class: "btn btn-danger" %>

data/app/views/phcmembers/member/addresses/components/_address_main.html.erb

@@ -1,31 +1,22 @@
-<div class="col-md-6">
-
-	<div class="panel panel-default">
-
-		<div class="panel-heading">
-			<%= @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname %>
+<div class="row">
+	<div class="col-md-6">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<%= @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname %>
+			</div>
+			<div class="panel-body">
+				<%= render 'phcmembers/member/addresses/components/address_list' %>
+			</div>
 		</div>
-
-		<div class="panel-body">
-			<%= render 'phcmembers/member/addresses/components/address_address' %>
-		</div>
-
 	</div>
-
-</div>
-
-<div class="col-md-6">
-
-	<div class="panel panel-default">
-
-		<div class="panel-heading">
-			<%= @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname %> Address Change Logs
-		</div>
-
-		<div class="panel-body">
-			<%= render 'phcmembers/member/addresses/components/address_audits' %>
+	<div class="col-md-6">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<%= @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname %> Address Change Logs
+			</div>
+			<div class="panel-body">
+				<%= render 'phcmembers/member/addresses/components/address_audits' %>
+			</div>
 		</div>
-
 	</div>
-
 </div>

data/app/views/phcmembers/member/addresses/edit.html.erb

@@ -27,11 +27,9 @@
 					<h3 class="box-title"><%= yield(:phc_title) %></h3>
 				</div>
 				<div class="box-body">
-
-					<!-- Page Form (Edit) -->
+					<!-- Page Form (New) -->
 					<%= render 'form', { form_url: member_profile_address_path } %>
-					<!-- Page Form (Edit) -->
-
+					<!-- Page Form (New) -->
 				</div>
 			</div>
 		</div>

data/app/views/phcmembers/member/addresses/index.html.erb

@@ -52,23 +52,24 @@
 										<td class="highlight"><%= link_to member_address.mcpostalcode, member_profile_address_path(member_address.profile, member_address) %></td>
 										<td class="highlight"><%= link_to member_address.mctype, member_profile_address_path(member_address.profile, member_address) %></td>
 									</tr>
-								<% end %>
-							</tbody>
-						</table>
-					</div>
-					<!-- Index Table -->
-
-					<!-- Panel Footer -->
-					<div class="box-footer clearfix">
-						<%= link_to new_member_profile_address_path, class: "btn btn-primary" do %>
-							<i class="fa fa-plus"></i> <%= "Add a New Address for " + @members_profile_info.mfirstname + " " + @members_profile_info.mlastname %>
-						<% end %>
-					</div>
-					<!-- Panel Footer -->
+								</tr>
+							<% end %>
+						</tbody>
+					</table>
+				</div>
+				<!-- Index Table -->
 
+				<!-- Panel Footer -->
+				<div class="box-footer clearfix">
+					<%= link_to new_member_profile_address_path, class: "btn btn-primary" do %>
+						<i class="fa fa-plus"></i> <%= "Add a New Address for " + @members_profile_info.mfirstname + " " + @members_profile_info.mlastname %>
+					<% end %>
 				</div>
+				<!-- Panel Footer -->
+
 			</div>
 		</div>
 	</div>
+</div>
 </section>
 <!-- Main Content -->

data/app/views/phcmembers/member/addresses/new.html.erb

@@ -27,11 +27,9 @@
 					<h3 class="box-title"><%= yield(:phc_title) %></h3>
 				</div>
 				<div class="box-body">
-
 					<!-- Page Form (New) -->
 					<%= render 'form', { form_url: member_profile_addresses_path } %>
 					<!-- Page Form (New) -->
-
 				</div>
 			</div>
 		</div>

data/app/views/phcmembers/member/addresses/show.html.erb

@@ -20,8 +20,6 @@
 
 <!-- Main Content -->
 <section class="content">
-	<div class="row">
 		<%= render 'phcmembers/member/addresses/components/address_main' %>
-	</div>
 </section>
 <!-- Main Content -->

data/app/views/phcmembers/member/listings/components/_listing_audits.html.erb

@@ -1,12 +1,9 @@
 <div class="scroller" style="height: 320px;" data-always-visible="1" data-rail-visible1="0" data-handle-color="#D7DCE2">
 
 	<ul class="list-group feeds">
-		<% @versions.each do |version| %>
+		<% @member_listing_versions.each do |member_listing_version| %>
 			<li class="list-group-item">
-				<i class="fa fa-bell-o fa-fw"></i>
-				<strong>EVENT #<%= version.id %></strong> -
-				<i> <%= l(version.created_at, format: "%-d/%m/%Y") %> </i> -
-				<%= version.event.capitalize %> - Profile <%= l(version.created_at, format: "%H:%M %Z") %>
+				<i class="fa fa-bell-o fa-fw"></i> Member Listing Event #<%= member_listing_version.id %> - <strong><%= member_listing_version.event.capitalize + ' ' + @member_listing.mbcompanyname %> Listing</strong> - on <i><%= l(member_listing_version.created_at, format: "%-d/%m/%Y") %></i> at <i><%= l(member_listing_version.created_at, format: "%H:%M %Z") %></i>
 			</li>
 		<% end %>
 	</ul>

data/app/views/phcmembers/member/listings/components/{_listing_address.html.erb → _listing_list.html.erb}

@@ -46,3 +46,6 @@
 	<strong>Email:</strong>
 	<%= @member_listing.mbcontactemail %>
 </p>
+
+<%= link_to 'Update ' + @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname + ' Listing', edit_member_profile_listing_path, class: "btn btn-primary" %>
+<%= link_to 'Delete ' + @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname + ' Listing', member_profile_listing_path(@member_listing), method: :delete, data: { confirm: 'Are you sure? This will remove the listing from all directory categories. This action cannot be undone.' }, class: "btn btn-danger" %>

data/app/views/phcmembers/member/listings/components/_listing_main.html.erb

@@ -1,31 +1,22 @@
-<div class="col-md-6">
-
-	<div class="panel panel-default">
-
-		<div class="panel-heading">
-			<%= @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname + ' ' + @member_listing.mbcompanyname %>
+<div class="row">
+	<div class="col-md-6">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<%= @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname + ' ' + @member_listing.mbcompanyname %>
+			</div>
+			<div class="panel-body">
+				<%= render 'phcmembers/member/listings/components/listing_list' %>
+			</div>
 		</div>
-
-		<div class="panel-body">
-			<%= render 'phcmembers/member/listings/components/listing_address' %>
-		</div>
-
 	</div>
-
-</div>
-
-<div class="col-md-6">
-
-	<div class="panel panel-default">
-
-		<div class="panel-heading">
-			<%= @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname + ' ' + @member_listing.mbcompanyname %> Business Change Logs
-		</div>
-
-		<div class="panel-body">
-			<%= render 'phcmembers/member/listings/components/listing_audits' %>
+	<div class="col-md-6">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<%= @members_profile_info.mfirstname + ' ' + @members_profile_info.mlastname + ' ' + @member_listing.mbcompanyname %> Business Change Logs
+			</div>
+			<div class="panel-body">
+				<%= render 'phcmembers/member/listings/components/listing_audits' %>
+			</div>
 		</div>
-
 	</div>
-
 </div>

data/app/views/phcmembers/member/listings/edit.html.erb

@@ -27,11 +27,9 @@
 					<h3 class="box-title"><%= yield(:phc_title) %></h3>
 				</div>
 				<div class="box-body">
-
 					<!-- Page Form (Edit) -->
 					<%= render 'form', { form_url: member_profile_listing_path } %>
 					<!-- Page Form (Edit) -->
-
 				</div>
 			</div>
 		</div>

data/app/views/phcmembers/member/listings/index.html.erb

@@ -52,7 +52,7 @@
 										<td class="highlight"><%= link_to member_listing.mbphone, member_profile_listing_path(member_listing.profile, member_listing) %></td>
 										<td class="highlight"><%= link_to member_listing.mbcontactemail, member_profile_listing_path(member_listing.profile, member_listing) %></td>
 										<td class="highlight"><%= link_to member_listing.mbwebsite, member_profile_listing_path(member_listing.profile, member_listing) %></td>
-										<td><%= link_to 'Remove', member_profile_listing_path(member_listing.profile, member_listing), class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure? This will remove address information and cannot be reversed.' } %></td>
+										<td><%= link_to 'Remove', member_profile_listing_path(member_listing.profile, member_listing), class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure? This will remove the listing from all directory categories. This action cannot be undone.' } %></td>
 									</tr>
 								<% end %>
 							</tbody>

data/app/views/phcmembers/member/listings/new.html.erb

@@ -27,11 +27,9 @@
 					<h3 class="box-title"><%= yield(:phc_title) %></h3>
 				</div>
 				<div class="box-body">
-
 					<!-- Page Form (New) -->
 					<%= render 'form', { form_url: member_profile_listings_path } %>
 					<!-- Page Form (New) -->
-
 				</div>
 			</div>
 		</div>

data/app/views/phcmembers/member/listings/show.html.erb

@@ -20,8 +20,6 @@
 
 <!-- Main Content -->
 <section class="content">
-	<div class="row">
 		<%= render 'phcmembers/member/listings/components/listing_main' %>
-	</div>
 </section>
 <!-- Main Content -->

data/app/views/phcmembers/member/profiles/components/_profile_audits.html.erb

@@ -0,0 +1,9 @@
+<div class="scroller" style="height: 320px;" data-always-visible="1" data-rail-visible1="0" data-handle-color="#D7DCE2">
+	<ul class="list-group feeds">
+		<% @member_profile_versions.each do |member_profile_version| %>
+			<li class="list-group-item">
+				<i class="fa fa-bell-o fa-fw"></i> Member Profile Event #<%= member_profile_version.id %> - <strong><%= member_profile_version.event.capitalize + ' ' + @member_profile.mfirstname + ' ' + @member_profile.mlastname + ' Profile' %></strong> - on <i><%= l(member_profile_version.created_at, format: "%-d/%m/%Y") %></i> at <i><%= l(member_profile_version.created_at, format: "%H:%M %Z") %></i>
+			</li>
+		<% end %>
+	</ul>
+</div>

data/app/views/phcmembers/member/profiles/components/_profile_main.html.erb

@@ -1,44 +1,22 @@
 <div class="row">
-
 	<div class="col-md-6">
-
 		<div class="panel panel-default">
-
 			<div class="panel-heading">
 				<%= @member_profile.mfirstname + ' ' + @member_profile.mlastname %> Member Stats
 			</div>
-
 			<div class="panel-body">
+				<%= render 'phcmembers/member/profiles/components/profile_sidebar' %>
 			</div>
-
 		</div>
-
 	</div>
 	<div class="col-md-6">
-
 		<div class="panel panel-default">
-
 			<div class="panel-heading">
 				<%= @member_profile.mfirstname + ' ' + @member_profile.mlastname %> Information Change Log
 			</div>
-
 			<div class="panel-body">
-				<div class="scroller" style="height: 320px;" data-always-visible="1" data-rail-visible1="0" data-handle-color="#D7DCE2">
-					<ul class="list-group feeds">
-						<% @versions.each do |version| %>
-							<li class="list-group-item">
-								<i class="fa fa-bell-o fa-fw"></i>
-								<strong>EVENT #<%= version.id %></strong> -
-								<i> <%= l(version.created_at, format: "%-d/%m/%Y") %> </i> -
-								<%= version.event.capitalize %> - Profile <%= l(version.created_at, format: "%H:%M %Z") %>
-							</li>
-						<% end %>
-					</ul>
-				</div>
+				<%= render 'phcmembers/member/profiles/components/profile_audits' %>
 			</div>
-
 		</div>
-
 	</div>
-
 </div>

data/app/views/phcmembers/member/profiles/components/_profile_sidebar.html.erb

@@ -7,22 +7,21 @@
 		<%= link_to 'Delete Member', @member_profile, method: :delete, data: { confirm: 'Are you sure? Removing a member will delete all records, including business information and any member directory connections.' }, class: "btn btn-danger" %>
 	</div>
 </div>
+
 <div class="card">
 	<div class="card-block">
 		<ul class="nav">
-
 		</ul>
 	</div>
 </div>
+
 <div class="card">
 	<div class="card-block">
 		<!-- STATS -->
 		<div class="row list-separated profile-stat">
-
 		</div>
 		<!-- STATS -->
 		<div>
-
 		</div>
 	</div>
 </div>

data/app/views/phcmembers/member/profiles/edit.html.erb

@@ -26,11 +26,9 @@
 					<h3 class="box-title"><%= yield(:phc_title) %></h3>
 				</div>
 				<div class="box-body">
-
 					<!-- Page Form (Edit) -->
 					<%= render 'form', member_profile: @member_profile %>
 					<!-- Page Form (Edit) -->
-
 				</div>
 			</div>
 		</div>

data/app/views/phcmembers/member/profiles/index.html.erb

@@ -46,23 +46,24 @@
 										<td class="highlight"><%= link_to member_profile.memail, member_profile %></td>
 										<td class="highlight"><%= link_to member_profile.mphone, member_profile %></td>
 									</tr>
-								<% end %>
-							</tbody>
-						</table>
-					</div>
-					<!-- Index Table -->
-
-					<!-- Panel Footer -->
-					<div class="box-footer clearfix">
-						<%= link_to new_member_profile_path, class: "btn btn-primary" do %>
-							<i class="fa fa-plus"></i> Create a New Member
-						<% end %>
-					</div>
-					<!-- Panel Footer -->
+								</tr>
+							<% end %>
+						</tbody>
+					</table>
+				</div>
+				<!-- Index Table -->
 
+				<!-- Panel Footer -->
+				<div class="box-footer clearfix">
+					<%= link_to new_member_profile_path, class: "btn btn-primary" do %>
+						<i class="fa fa-plus"></i> Create a New Member
+					<% end %>
 				</div>
+				<!-- Panel Footer -->
+
 			</div>
 		</div>
 	</div>
+</div>
 </section>
 <!-- Main Content -->

data/app/views/phcmembers/member/profiles/new.html.erb

@@ -1,4 +1,4 @@
-<!-- Title System -->
+	<!-- Title System -->
 <% phc_title "Members Manager" %>
 <% phc_title_tagline "Create a New Member" %>
 <% phc_breadcrumb_one link_to "Dashboard", phcmembers.modules_dashboards_index_path %>
@@ -26,11 +26,9 @@
 					<h3 class="box-title"><%= yield(:phc_title) %></h3>
 				</div>
 				<div class="box-body">
-
 					<!-- Page Form (New) -->
-					<%= render 'form', member_profile: @member_profile %>
+						<%= render 'form', member_profile: @member_profile %>
 					<!-- Page Form (New) -->
-
 				</div>
 			</div>
 		</div>

data/app/views/phcmembers/member/profiles/show.html.erb

@@ -19,13 +19,6 @@
 
 <!-- Main Content -->
 <section class="content">
-	<div class="row">
-		<div class="col-md-3">
-			<%= render 'phcmembers/member/profiles/components/profile_sidebar' %>
-		</div>
-		<div class="col-md-9">
-			<%= render 'phcmembers/member/profiles/components/profile_main' %>
-		</div>
-	</div>
+		<%= render 'phcmembers/member/profiles/components/profile_main' %>
 </section>
 <!-- Main Content -->

data/lib/phcmembers/version.rb

@@ -1,3 +1,3 @@
 module Phcmembers
-  VERSION = "14.0.1"
+  VERSION = "15.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcmembers
 version: !ruby/object:Gem::Version
-  version: 14.0.1
+  version: 15.0.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -669,6 +669,7 @@ files:
 - app/mailers/phcmembers/application_mailer.rb
 - app/models/phcmembers/address_versions.rb
 - app/models/phcmembers/application_record.rb
+- app/models/phcmembers/category_listing_versions.rb
 - app/models/phcmembers/category_versions.rb
 - app/models/phcmembers/connections.rb
 - app/models/phcmembers/directory.rb
@@ -695,25 +696,29 @@ files:
 - app/views/phcmembers/directory/categories/index.html.erb
 - app/views/phcmembers/directory/categories/new.html.erb
 - app/views/phcmembers/directory/categories/show.html.erb
+- app/views/phcmembers/directory/categorylistings/components/_category_listing_audits.html.erb
+- app/views/phcmembers/directory/categorylistings/components/_category_listing_list.html.erb
+- app/views/phcmembers/directory/categorylistings/components/_category_listing_main.html.erb
 - app/views/phcmembers/directory/categorylistings/index.html.erb
 - app/views/phcmembers/directory/categorylistings/show.html.erb
 - app/views/phcmembers/member/addresses/_form.html.erb
-- app/views/phcmembers/member/addresses/components/_address_address.html.erb
 - app/views/phcmembers/member/addresses/components/_address_audits.html.erb
+- app/views/phcmembers/member/addresses/components/_address_list.html.erb
 - app/views/phcmembers/member/addresses/components/_address_main.html.erb
 - app/views/phcmembers/member/addresses/edit.html.erb
 - app/views/phcmembers/member/addresses/index.html.erb
 - app/views/phcmembers/member/addresses/new.html.erb
 - app/views/phcmembers/member/addresses/show.html.erb
 - app/views/phcmembers/member/listings/_form.html.erb
-- app/views/phcmembers/member/listings/components/_listing_address.html.erb
 - app/views/phcmembers/member/listings/components/_listing_audits.html.erb
+- app/views/phcmembers/member/listings/components/_listing_list.html.erb
 - app/views/phcmembers/member/listings/components/_listing_main.html.erb
 - app/views/phcmembers/member/listings/edit.html.erb
 - app/views/phcmembers/member/listings/index.html.erb
 - app/views/phcmembers/member/listings/new.html.erb
 - app/views/phcmembers/member/listings/show.html.erb
 - app/views/phcmembers/member/profiles/_form.html.erb
+- app/views/phcmembers/member/profiles/components/_profile_audits.html.erb
 - app/views/phcmembers/member/profiles/components/_profile_main.html.erb
 - app/views/phcmembers/member/profiles/components/_profile_sidebar.html.erb
 - app/views/phcmembers/member/profiles/edit.html.erb

data/app/views/phcmembers/member/addresses/components/_address_address.html.erb

@@ -1,29 +0,0 @@
-<p>
-    <strong>Address Line 1:</strong>
-    <%= @member_address.mcaddressl1 %>
-</p>
-
-<p>
-    <strong>Address Line 2:</strong>
-    <%= @member_address.mcaddressl2 %>
-</p>
-
-<p>
-    <strong>City:</strong>
-    <%= @member_address.mccity %>
-</p>
-
-<p>
-    <strong>Province:</strong>
-    <%= @member_address.mcprovince %>
-</p>
-
-<p>
-    <strong>Country:</strong>
-    <%= @member_address.mccountry %>
-</p>
-
-<p>
-    <strong>PostalCode:</strong>
-    <%= @member_address.mcpostalcode %>
-</p>