phcmembers 2.2.0 → 3.0.0

data/app/views/phcmembers/members/contacts/_form.html.erb

@@ -2,49 +2,37 @@
 	
 	<!-- PHC-Notifi Render Validation -->
 	<%= render 'phcnotifi/validations', :object => @members_contact %>
-	
-	<div class="form-group field_with_errors">
-		<label><%= f.label :mccontactname, "Contact Name*" %></label>
-		<%= f.text_field :mccontactname, class: "form-control", placeholder: "Mailing Contact Name" %>
-	</div>
-	<div class="form-group field_with_errors">
-		<label><%= f.label :mccompanyname, "Company Name" %></label>
-		<%= f.text_field :mccompanyname, class: "form-control", placeholder: "Company Name" %>
-	</div>
+
 	<div class="form-group field_with_errors">
-		<label><%= f.label :mcaddressl1, "Mailing Address Line1" %></label>
-		<%= f.text_field :mcaddressl1, class: "form-control", placeholder: "Mailing Street Address" %>
+		<label><%= f.label :mcaddressl1, "Address Line1" %></label>
+		<%= f.text_field :mcaddressl1, class: "form-control", placeholder: "Address Line 1 - Street Address" %>
 	</div>
 	<div class="form-group field_with_errors">
-		<label><%= f.label :mcaddressl2, "Mailing Address Line2" %></label>
-		<%= f.text_field :mcaddressl2, class: "form-control", placeholder: "Mailing Address POBox" %>
+		<label><%= f.label :mcaddressl2, "Address Line2" %></label>
+		<%= f.text_field :mcaddressl2, class: "form-control", placeholder: "Address Line 2 - Box - Suite - Floor" %>
 	</div>
 	<div class="form-group field_with_errors">
 		<label><%= f.label :mccity, "City" %></label>
-		<%= f.text_field :mccity, class: "form-control", placeholder: "Mailing City" %>
+		<%= f.text_field :mccity, class: "form-control", placeholder: "City" %>
 	</div>
 	<div class="form-group field_with_errors">
-		<label><%= f.label :mcprovince, "Province or State" %></label>
-		<%= f.text_field :mcprovince, class: "form-control", placeholder: "Mailing Province or State" %>
+		<label><%= f.label :mcprovince, "Province/State" %></label>
+		<%= f.text_field :mcprovince, class: "form-control", placeholder: "Province/State" %>
 	</div>
 	<div class="form-group field_with_errors">
 		<label><%= f.label :mccountry, "Country" %></label>
-		<%= f.text_field :mccountry, class: "form-control", placeholder: "Mailing Country" %>
+		<%= country_select("members_contact", "mccountry", { priority_countries: ["CA", "GB", "FR", "US"], selected: "CA" }, { class: 'form-control', data: { attribute: "value" } }) %>
 	</div>
 	<div class="form-group field_with_errors">
 		<label><%= f.label :mcpostalcode, "PostalCode" %></label>
-		<%= f.text_field :mcpostalcode, class: "form-control", placeholder: "Mailing PostalCode" %>
-	</div>
-	<div class="form-group field_with_errors">
-		<label><%= f.label :mcphone, "" %></label>
-		<%= f.text_field :mcphone, class: "form-control", placeholder: "Contact Phone Number" %>
+		<%= f.text_field :mcpostalcode, class: "form-control", placeholder: "PostalCode" %>
 	</div>
-	<div class="form-group field_with_errors">
-		<label><%= f.label :mcemail, "Email" %></label>
-		<%= f.text_field :mcemail, class: "form-control", placeholder: "Contact Email" %>
+	<div class="form-group">
+		<label><%= f.label :mctype, "Address Type" %></label>
+		<%= f.select :mctype, [['Billing Address','Billing'],['Street Address','Street'],['Mailing Address','Mailing'],['Home Address','Home'],['Business Address','Business']], {}, class: "form-control" %>
 	</div>
 	<div class="actions">
-		<%= f.submit "Submit", class: "btn btn-primary" %>
+		<%= f.submit "Submit", class: "btn blue-hoki" %>
 	</div>
 
 <% end %>

data/app/views/phcmembers/members/contacts/_formpatch.html.erb

@@ -2,49 +2,37 @@
 
 	<!-- PHC-Notifi Render Validation -->
 	<%= render 'phcnotifi/validations', :object => @members_contact %>
-	
-	<div class="form-group field_with_errors">
-		<label><%= f.label :mccontactname, "Contact Name*" %></label>
-		<%= f.text_field :mccontactname, class: "form-control", placeholder: "Mailing Contact Name" %>
-	</div>
-	<div class="form-group field_with_errors">
-		<label><%= f.label :mccompanyname, "Company Name" %></label>
-		<%= f.text_field :mccompanyname, class: "form-control", placeholder: "Company Name" %>
-	</div>
+
 	<div class="form-group field_with_errors">
-		<label><%= f.label :mcaddressl1, "Mailing Address Line1" %></label>
-		<%= f.text_field :mcaddressl1, class: "form-control", placeholder: "Mailing Street Address" %>
+		<label><%= f.label :mcaddressl1, "Address Line1" %></label>
+		<%= f.text_field :mcaddressl1, class: "form-control", placeholder: "Address Line 1 - Street Address" %>
 	</div>
 	<div class="form-group field_with_errors">
-		<label><%= f.label :mcaddressl2, "Mailing Address Line2" %></label>
-		<%= f.text_field :mcaddressl2, class: "form-control", placeholder: "Mailing Address POBox" %>
+		<label><%= f.label :mcaddressl2, "Address Line2" %></label>
+		<%= f.text_field :mcaddressl2, class: "form-control", placeholder: "Address Line 2 - Box - Suite - Floor" %>
 	</div>
 	<div class="form-group field_with_errors">
 		<label><%= f.label :mccity, "City" %></label>
-		<%= f.text_field :mccity, class: "form-control", placeholder: "Mailing City" %>
+		<%= f.text_field :mccity, class: "form-control", placeholder: "City" %>
 	</div>
 	<div class="form-group field_with_errors">
-		<label><%= f.label :mcprovince, "Province or State" %></label>
-		<%= f.text_field :mcprovince, class: "form-control", placeholder: "Mailing Province or State" %>
+		<label><%= f.label :mcprovince, "Province/State" %></label>
+		<%= f.text_field :mcprovince, class: "form-control", placeholder: "Province/State" %>
 	</div>
 	<div class="form-group field_with_errors">
 		<label><%= f.label :mccountry, "Country" %></label>
-		<%= f.text_field :mccountry, class: "form-control", placeholder: "Mailing Country" %>
+		<%= country_select("members_contact", "mccountry", { priority_countries: ["CA", "GB", "FR", "US"], selected: "CA" }, { class: 'form-control', data: { attribute: "value" } }) %>
 	</div>
 	<div class="form-group field_with_errors">
 		<label><%= f.label :mcpostalcode, "PostalCode" %></label>
-		<%= f.text_field :mcpostalcode, class: "form-control", placeholder: "Mailing PostalCode" %>
-	</div>
-	<div class="form-group field_with_errors">
-		<label><%= f.label :mcphone, "Contact Phone" %></label>
-		<%= f.text_field :mcphone, class: "form-control", placeholder: "Contact Phone Number" %>
+		<%= f.text_field :mcpostalcode, class: "form-control", placeholder: "PostalCode" %>
 	</div>
-	<div class="form-group field_with_errors">
-		<label><%= f.label :mcemail, "Contact Email" %></label>
-		<%= f.text_field :mcemail, class: "form-control", placeholder: "Contact Email" %>
+	<div class="form-group">
+		<label><%= f.label :mctype, "Address Type" %></label>
+		<%= f.select :mctype, [['Billing Address','Billing'],['Street Address','Street'],['Mailing Address','Mailing'],['Home Address','Home'],['Business Address','Business']], {}, class: "form-control" %>
 	</div>
 	<div class="actions">
-		<%= f.submit "Submit", class: "btn btn-primary" %>
+		<%= f.submit "Submit", class: "btn blue-hoki" %>
 	</div>
 
 <% end %>

data/app/views/phcmembers/members/contacts/components/_contact_address.html.erb

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

data/app/views/phcmembers/members/contacts/components/_contact_audits.html.erb

@@ -0,0 +1,25 @@
+<div class="scroller" style="height: 320px;" data-always-visible="1" data-rail-visible1="0" data-handle-color="#D7DCE2">
+	<ul class="feeds">
+		<% @versions.each do |version| %>
+			<li>
+				<div class="col1">
+					<div class="cont">
+						<div class="cont-col1">
+							<div class="label label-sm label-success">
+								<i class="fa fa-bell-o"></i>
+							</div>
+						</div>
+						<div class="cont-col2">
+							<div class="desc">
+								<strong>LOG #<%= version.id %></strong> - <i> <%= l(version.created_at, format: "%-d/%m/%Y") %> </i>  - <i> <%= l(version.created_at, format: "%-d/%m/%Y") %> </i> - <%= version.event.capitalize %> - <%= @members_main.mfirstname + ' ' + @members_main.mlastname %> - Address
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="col2">
+					<div class="date"> <%= l(version.created_at, format: "%H:%M %Z") %> </div>
+				</div>
+			</li>
+		<% end %>
+	</ul>
+</div>

data/app/views/phcmembers/members/contacts/components/_contact_main.html.erb

@@ -0,0 +1,21 @@
+<div class="col-md-6">
+	<div class="card">
+		<div class="card-header">
+			<%= @members_main.mfirstname + ' ' + @members_main.mlastname %> Address
+		</div>
+		<div class="card-block">
+			<%= render 'phcmembers/members/contacts/components/contact_address' %>
+		</div>
+	</div>
+</div>
+
+<div class="col-md-6">
+	<div class="card">
+		<div class="card-header">
+			<%= @members_main.mfirstname + ' ' + @members_main.mlastname %> Address Change Log
+		</div>
+		<div class="card-block">
+			<%= render 'phcmembers/members/contacts/components/contact_audits' %>
+		</div>
+	</div>
+</div>

data/app/views/phcmembers/members/contacts/edit.html.erb

@@ -1,27 +1,46 @@
-<!-- Bread Crumbs -->
-<div class="row wrapper border-bottom white-bg page-heading">
+<!-- Title System -->
+<% phc_title "PHCMembers - Members Address Manager" %>
+<% phc_title_tagline "Update Address Information for " + @members_main.mfirstname + " " + @members_main.mlastname %>
+
+<!-- BreadCrumbs -->
+<div class="row">
 	<div class="col-lg-12">
-		<h2>Member's Contact Information</h2>
+
+		<!-- Bread Crumb -->
 		<ol class="breadcrumb">
-			<li><%= link_to "Home", members_root_path %></li>
+			<li><%= link_to "Members Home", members_root_path %></li>
 			<li><%= link_to "Members List", members_mains_path %></li>
-			<li><%= link_to "Members Contact", members_main_contacts_path %></li>
-			<li class="active">Edit Member's Private Address</li>
+			<li><%= link_to @members_main.mfirstname + " " + @members_main.mlastname + " Addresses", members_main_contacts_path %></li>
+			<li class="active"><%= yield(:phc_title_tagline) %></li>
 		</ol>
+
+	</div>
+</div>
+
+<!-- Page Title -->
+<div class="row">
+	<div class="col-lg-12">
+
+		<h3 class="page-title">
+			<%= yield(:phc_title) %> </br>
+			<small><%= yield(:phc_title_tagline) %></small>
+		</h3>
+
 	</div>
 </div>
 
 <!-- Main Content -->
 <div class="row">
 	<div class="col-lg-12">
-		<div class="panel panel-primary">
-			<div class="panel-heading">
-				Edit Member's Private Address
+
+		<div class="card">
+			<div class="card-header">
+				<%= yield(:phc_title_tagline) %>
 			</div>
-			<div class="panel-body">
-				<%= render 'phcnotifi/notifications' %>
+			<div class="card-block">
 				<%= render 'formpatch' %>
 			</div>
 		</div>
+
 	</div>
 </div>

data/app/views/phcmembers/members/contacts/index.html.erb

@@ -1,55 +1,75 @@
-<!-- Bread Crumbs -->
+<!-- Title System -->
+<% phc_title "PHCMembers - Members Address Manager" %>
+<% phc_title_tagline "Address Index for " + @members_main.mfirstname + " " + @members_main.mlastname %>
+
+<!-- BreadCrumbs -->
 <div class="row">
 	<div class="col-lg-12">
-		<h2>Member's Information</h2>
+
+		<!-- Bread Crumb -->
 		<ol class="breadcrumb">
-			<li><%= link_to "Home", members_root_path %></li>
+			<li><%= link_to "Members Home", members_root_path %></li>
 			<li><%= link_to "Members List", members_mains_path %></li>
-			<li class="active"><%= @members_main.mfirstname + ' ' + @members_main.mlastname %> Private Address Index</li>
+			<li class="active"><%= yield(:phc_title_tagline) %></li>
 		</ol>
+
+	</div>
+</div>
+
+<!-- Page Title -->
+<div class="row">
+	<div class="col-lg-12">
+
+		<h3 class="page-title">
+			<%= yield(:phc_title) %> </br>
+			<small><%= yield(:phc_title_tagline) %></small>
+		</h3>
+
 	</div>
 </div>
 
 <!-- Main Content -->
 <div class="row">
 	<div class="col-lg-12">
-		<div class="panel panel-primary">
-			<div class="panel-heading">
-				Member's Contact Index
+
+		<div class="card">
+			<div class="card-header">
+				<%= yield(:phc_title) %>
 			</div>
-			<div class="panel-body">
-				<%= render 'phcnotifi/notifications' %>
-				<table class="table table-bordered table-striped table-hover">
-					<thead>
-						<tr>
-							<th>Full Name</th>
-							<th>Company Name</th>
-							<th>City</th>
-							<th>Province</th>
-							<th>Country</th>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<% @members_contact.each do |members_contact| %>
+			<div class="card-block">
+				<div class="table-responsive">
+					<table class="table table-striped table-bordered table-hover">
+	
+						<thead class="thead-inverse">
 							<tr>
-								<td><%= members_contact.mccontactname %></td>
-								<td><%= members_contact.mccompanyname %></td>
-								<td><%= members_contact.mccity %></td>
-								<td><%= members_contact.mcprovince %></td>
-								<td><%= members_contact.mccountry %></td>
-								<td><div class="btn-group" role="group" aria-label="Member Adresses Group">
-										<%= link_to 'Show', members_main_contact_path(members_contact.main, members_contact), class: "btn btn-primary" %>
-										<%= link_to 'Edit', edit_members_main_contact_path(members_contact.main, members_contact), class: "btn btn-primary" %>
-										<%= link_to 'Delete', members_main_contact_path(members_contact.main, members_contact), class: "btn btn-danger", method: :delete, data: { confirm: 'Are you sure?' } %>
-									</div>
-								</td>
+								<th>Address Line 1</th>
+								<th>Address Line 2</th>
+								<th>City</th>
+								<th>Province</th>
+								<th>Country</th>
+								<th>PostalCode</th>
+								<th>Type</th>
 							</tr>
-						<% end %>
-					</tbody>
-				</table>
-				<%= link_to 'Add a Private Address', new_members_main_contact_path, class: "btn btn-primary" %>
+						</thead>
+
+						<tbody>
+							<% @members_contacts.each do |members_contact| %>
+								<tr>
+									<td class="highlight"><%= link_to members_contact.mcaddressl1, members_main_contact_path(members_contact.main, members_contact) %></td>
+									<td class="highlight"><%= link_to members_contact.mcaddressl2, members_main_contact_path(members_contact.main, members_contact) %></td>
+									<td class="highlight"><%= link_to members_contact.mccity, members_main_contact_path(members_contact.main, members_contact) %></td>
+									<td class="highlight"><%= link_to members_contact.mcprovince, members_main_contact_path(members_contact.main, members_contact) %></td>
+									<td class="highlight"><%= link_to members_contact.mccountry, members_main_contact_path(members_contact.main, members_contact) %></td>
+									<td class="highlight"><%= link_to members_contact.mcpostalcode, members_main_contact_path(members_contact.main, members_contact) %></td>
+									<td class="highlight"><%= link_to members_contact.mctype, members_main_contact_path(members_contact.main, members_contact) %></td>
+								</tr>
+							<% end %>
+						</tbody>
+
+					</table>
+				</div>
 			</div>
 		</div>
+
 	</div>
 </div>

data/app/views/phcmembers/members/contacts/new.html.erb

@@ -1,27 +1,46 @@
-<!-- Bread Crumbs -->
-<div class="row wrapper border-bottom white-bg page-heading">
+<!-- Title System -->
+<% phc_title "PHCMembers - Members Address Manager" %>
+<% phc_title_tagline "Update Address for " + @members_main.mfirstname + " " + @members_main.mlastname %>
+
+<!-- BreadCrumbs -->
+<div class="row">
 	<div class="col-lg-12">
-		<h2>Member's Contact Information</h2>
+
+		<!-- Bread Crumb -->
 		<ol class="breadcrumb">
-			<li><%= link_to "Home", members_root_path %></li>
+			<li><%= link_to "Members Home", members_root_path %></li>
 			<li><%= link_to "Members List", members_mains_path %></li>
-			<li><%= link_to "Members Contact", members_main_contacts_path %></li>
-			<li class="active">Create a New Member's Private Address</li>
+			<li><%= link_to @members_main.mfirstname + " " + @members_main.mlastname + " Addresses", members_main_contacts_path %></li>
+			<li class="active"><%= yield(:phc_title_tagline) %></li>
 		</ol>
+
+	</div>
+</div>
+
+<!-- Page Title -->
+<div class="row">
+	<div class="col-lg-12">
+
+		<h3 class="page-title">
+			<%= yield(:phc_title) %> </br>
+			<small><%= yield(:phc_title_tagline) %></small>
+		</h3>
+
 	</div>
 </div>
 
 <!-- Main Content -->
 <div class="row">
 	<div class="col-lg-12">
-		<div class="panel panel-primary">
-			<div class="panel-heading">
-				Create a New  Member's Private Address
+
+		<div class="card">
+			<div class="card-header">
+				<%= yield(:phc_title_tagline) %>
 			</div>
-			<div class="panel-body">
-				<%= render 'phcnotifi/notifications' %>
+			<div class="card-block">
 				<%= render 'form' %>
 			</div>
 		</div>
+
 	</div>
 </div>

data/app/views/phcmembers/members/contacts/show.html.erb

@@ -1,51 +1,35 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Mccontactname:</strong>
-  <%= @members_contact.mccontactname %>
-</p>
-
-<p>
-  <strong>Mccompanyname:</strong>
-  <%= @members_contact.mccompanyname %>
-</p>
-
-<p>
-  <strong>Mcaddressl1:</strong>
-  <%= @members_contact.mcaddressl1 %>
-</p>
-
-<p>
-  <strong>Mcaddressl2:</strong>
-  <%= @members_contact.mcaddressl2 %>
-</p>
-
-<p>
-  <strong>Mccity:</strong>
-  <%= @members_contact.mccity %>
-</p>
-
-<p>
-  <strong>Mlprovince:</strong>
-  <%= @members_contact.mcprovince %>
-</p>
-
-<p>
-  <strong>Mccountry:</strong>
-  <%= @members_contact.mccountry %>
-</p>
-
-<p>
-  <strong>Mcpostalcode:</strong>
-  <%= @members_contact.mcpostalcode %>
-</p>
-
-<p>
-  <strong>Mcphone:</strong>
-  <%= @members_contact.mcphone %>
-</p>
-
-<p>
-  <strong>Mlemail:</strong>
-  <%= @members_contact.mcemail %>
-</p>
+<!-- Title System -->
+<% phc_title "PHCMembers - Members Address Manager" %>
+<% phc_title_tagline "Detailed Address Information for " + @members_main.mfirstname + " " + @members_main.mlastname %>
+
+<!-- BreadCrumbs -->
+<div class="row">
+	<div class="col-lg-12">
+
+		<!-- Bread Crumb -->
+		<ol class="breadcrumb">
+			<li><%= link_to "Members Home", members_root_path %></li>
+			<li><%= link_to "Members List", members_mains_path %></li>
+			<li><%= link_to @members_main.mfirstname + " " + @members_main.mlastname + " Addresses", members_main_contacts_path %></li>
+			<li class="active"><%= yield(:phc_title_tagline) %></li>
+		</ol>
+
+	</div>
+</div>
+
+<!-- Page Title -->
+<div class="row">
+	<div class="col-lg-12">
+
+		<h3 class="page-title">
+			<%= yield(:phc_title) %> </br>
+			<small><%= yield(:phc_title_tagline) %></small>
+		</h3>
+
+	</div>
+</div>
+
+<!-- Main Content -->
+<div class="row">
+	<%= render 'phcmembers/members/contacts/components/contact_main' %>
+</div>