phcpress 50.0.0 → 51.0.0

data/app/views/layouts/phcpress/components/backend/sidebars/_side_menu.html.erb

@@ -1,8 +1,9 @@
-<!-- Sidebar -->
+<!-- Sidebar for Users and Admin -->
 <div data-scrollbar="true" data-height="100%">
-  <% if current_user %>
-    <!-- Sidebar - User Profile Menu -->
-    <ul class="nav">
+
+  <!-- Sidebar - User Profile Menu -->
+  <ul class="nav">
+    <% if current_user %>
       <li class="nav-profile">
         <a href="javascript:;" data-toggle="nav-profile">
           <div class="cover with-shadow"></div>
@@ -11,7 +12,7 @@
           </div>
           <div class="info">
             <b class="caret pull-right"></b>
-            <%= current_user.firstname %> <%= current_user.lastname  %>
+            <%= current_user.firstname + ' ' + current_user.lastname  %>
             <small><%= current_user.username %></small>
           </div>
         </a>
@@ -30,78 +31,113 @@
           </li>
         </ul>
       </li>
-    </ul>
-    <!-- Sidebar - User Profile Menu -->
-    <!-- Sidebar - Sidebar Navigation -->
-    <ul class="nav">
-      <li class="nav-header">Accounts</li>
+    <% end %>
+  </ul>
+  <!-- Sidebar - User Profile Menu -->
+  <!-- Sidebar - Sidebar Navigation -->
+  <ul class="nav">
+    
+    <% if defined?phcpress %>
+      <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
+      <li class="nav-header">Article Management</li>
       <li class="has-sub">
         <a href="javascript:;">
           <b class="caret"></b>
-          <i class="fa fa-th-large"></i>
-          <span>Accounts Dashboard</span>
+          <i class="fas fa-newspaper"></i>
+          <span>Article Posts</span>
         </a>
         <ul class="sub-menu">
-          <li><%= link_to('Settings', phcaccounts.edit_user_registration_path) %></li>
-          <li><%= link_to('Logout', phcaccounts.destroy_user_session_path, method: :delete) %></li>
+          <li class="<%= phc_menus_active_controller('phcpress/article/posts') %>"><%= link_to('Article Index', phcpress.article_posts_path) %></li>
+          <li class="<%= phc_menus_active_controller('phcpress/article/posts#new') %>"><%= link_to('New Aritcle', phcpress.new_article_post_path) %></li>
         </ul>
       </li>
-      <!-- Sidebar - Sidebar Minifier -->
-      <li>
-        <a href="javascript:;" class="sidebar-minify-btn" data-click="sidebar-minify">
-          <i class="fa fa-angle-double-left"></i>
+      <li class="has-sub">
+        <a href="javascript:;">
+          <b class="caret"></b>
+          <i class="fas fa-sitemap"></i>
+          <span>Article Categories</span>
         </a>
+        <ul class="sub-menu">
+          <li class="<%= phc_menus_active_controller('phcpress/article/categories') %>"><%= link_to('Category Index', phcpress.article_categories_path) %></li>
+          <li class="<%= phc_menus_active_controller('phcpress/article/categories#new') %>"><%= link_to('New Category', phcpress.new_article_category_path) %></li>
+        </ul>
       </li>
-      <!-- Sidebar - Sidebar Minifier -->
-    </ul>
-    <!-- Sidebar - Sidebar Navigation -->
-  <% end %>
-  <% if current_admin %>
-    <!-- Sidebar - User Profile Menu -->
-    <ul class="nav">
-      <li class="nav-profile">
-				<a href="javascript:;" data-toggle="nav-profile">
-          <div class="cover with-shadow"></div>
-          <div class="image">
-            <%= image_tag current_admin.gravatar_url %>
-          </div>
-          <div class="info">
-            <b class="caret pull-right"></b>
-            <%= current_admin.firstname + ' ' + current_admin.lastname  %>
-            <small><%= current_admin.username %></small>
-          </div>
+      <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
+    <% end %>
+
+    <% if defined?phcmembers %>
+      <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
+      <li class="nav-header">Membership Manager</li>
+      <li class="has-sub">
+        <a href="javascript:;">
+          <b class="caret"></b>
+          <i class="fas fa-users"></i>
+          <span>Member's Data</span>
         </a>
+        <ul class="sub-menu">
+          <li class="<%= phc_menus_active_controller('phcmembers/member/profiles') %>"><%= link_to('Profile Index', phcmembers.member_profiles_path) %></li>
+          <li class="<%= phc_menus_active_controller('phcmembers/member/profiles#new') %>"><%= link_to('New Member Profile', phcmembers.new_member_profile_path) %></li>
+        </ul>
       </li>
-      <li>
-        <ul class="nav nav-profile">
-          <li>
-            <%= link_to phcaccounts.edit_admin_registration_path do %>
-              <i class="fas fa-cogs"></i> Account Settings
-            <% end %>
-          </li>
-          <li>
-            <%= link_to phcaccounts.destroy_admin_session_path do %>
-              <i class="fas fa-sign-out-alt"></i> Logout
-            <% end %>
-          </li>
+      <li class="has-sub">
+        <a href="javascript:;">
+          <b class="caret"></b>
+          <i class="fas fa-list-alt"></i>
+          <span>Member's Directory</span>
+        </a>
+        <ul class="sub-menu">
+          <li class="<%= phc_menus_active_controller('phcmembers/directory/categories') %>"><%= link_to('Directory Index', phcmembers.directory_categories_path) %></li>
+          <li class="<%= phc_menus_active_controller('phcmembers/directory/categories#new') %>"><%= link_to('New Directory Listing', phcmembers.new_directory_category_path) %></li>
+        </ul>
+      </li>
+      <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
+    <% end %>
+
+    <% if defined?phcscriptcdn %>
+      <!-- Sidebar - Sidebar Navigation - PHCScriptCDN(Pro) -->
+      <li class="nav-header">Script Management</li>
+      <li class="has-sub">
+        <a href="javascript:;">
+          <b class="caret"></b>
+          <i class="fas fa-newspaper"></i>
+          <span>Script Posts</span>
+        </a>
+        <ul class="sub-menu">
+          <li class="<%= phc_menus_active_controller('phcscriptcdn/script/listings') %>"><%= link_to "All Script Listings", phcscriptcdn.script_listings_path %></li>
+      		<li class="<%= phc_menus_active_controller('phcscriptcdn/script/listings#new') %>"><%= link_to "Add a New Listing", phcscriptcdn.new_script_listing_path %></li>
+        </ul>
+      </li>
+      <li class="has-sub">
+        <a href="javascript:;">
+          <b class="caret"></b>
+          <i class="fas fa-sitemap"></i>
+          <span>Script Extras</span>
+        </a>
+        <ul class="sub-menu">
+      		<li class="<%= phc_menus_active_controller('phcscriptcdn/script/authors') %>"><%= link_to "Script Authors", phcscriptcdn.script_authors_path %></li>
+      		<li class="<%= phc_menus_active_controller('phcscriptcdn/script/licences') %>"><%= link_to "Script Licences", phcscriptcdn.script_licences_path %></li>
+      		<li class="<%= phc_menus_active_controller('phcscriptcdn/script/extensions') %>"><%= link_to "Script Extensions", phcscriptcdn.script_extensions_path %></li>
+          <li class="<%= phc_menus_active_controller('phcscriptcdn/script/versions') %>"><%= link_to "Script Versions", phcscriptcdn.script_versions_path %></li>
         </ul>
       </li>
-    </ul>
-    <!-- Sidebar - User Profile Menu -->
-    <!-- Sidebar - Sidebar Navigation -->
-    <ul class="nav">
-      <li class="nav-header">Accounts Menu</li>
+      <!-- Sidebar - Sidebar Navigation - PHCScriptCDN(Pro) -->
+    <% end %>
+
+    <% if current_user %>
+      <!-- Sidebar - Sidebar Navigation - PHCAccounts -->
+      <li class="nav-header">Account Settings</li>
       <li class="has-sub">
         <a href="javascript:;">
           <b class="caret"></b>
-          <i class="fa fa-th-large"></i>
+          <i class="fas fa-user"></i>
           <span>Accounts Dashboard</span>
         </a>
         <ul class="sub-menu">
-          <li><%= link_to('Settings', phcaccountspro.edit_admin_registration_path) %></li>
-          <li><%= link_to('Logout', phcaccountspro.destroy_admin_session_path, method: :delete) %></li>
+          <li class="<%= phc_menus_active_controller('phcaccounts/admin/edit') %>"><%= link_to('Settings', phcaccounts.edit_user_registration_path) %></li>
+          <li class="<%= phc_menus_active_controller('phcaccounts/admin/new') %>"><%= link_to('Logout', phcaccounts.destroy_user_session_path, method: :delete) %></li>
         </ul>
       </li>
+      <!-- Sidebar - Sidebar Navigation - PHCAccounts -->
       <!-- Sidebar - Sidebar Minifier -->
       <li>
         <a href="javascript:;" class="sidebar-minify-btn" data-click="sidebar-minify">
@@ -109,8 +145,10 @@
         </a>
       </li>
       <!-- Sidebar - Sidebar Minifier -->
-    </ul>
-    <!-- Sidebar - Sidebar Navigation -->
-  <% end %>
+    <% end %>
+
+  </ul>
+  <!-- Sidebar - Sidebar Navigation -->
+
 </div>
-<!-- Sidebar -->
+<!-- Sidebar for Users and Admin -->

data/app/views/layouts/phcpress/frontend.html.erb

@@ -1,24 +1,5 @@
-<!DOCTYPE html>
-<html>
-
-	<head>
-
-		<title>PHCPress - Rails CMS Engine</title>
-
-		<%= stylesheet_link_tag    "phcpress/application", media: "all" %>
-		<%= javascript_include_tag "phcpress/application" %>
-		<%= csrf_meta_tags %>
-
-	</head>
-
-	<body class="hold-transition skin-blue sidebar-mini">
-
-		<!-- Page Content -->
-		<div class="content-wrapper">
-			<%= yield %>
-		</div>
-		<!-- Page Content -->
-
-	</body>
-
-</html>
+<!-- Page Content -->
+<div id="content" class="content">
+  <%= yield %>
+</div>
+<!-- Page Content -->

data/app/views/phcpress/article/categories/_form.html.erb

@@ -0,0 +1,13 @@
+<%= form_with(model: article_category, local: true) do |form| %>
+
+  <!-- PHCPress - Category Form -->
+  <div class="form-group">
+    <%= form.label :catname, "Category Name" %>
+    <%= form.text_field :catname, class: "form-control" %>
+  </div>
+  <div class="actions">
+    <%= form.submit class: "btn btn-primary" %>
+  </div>
+  <!-- PHCPress - Category Form -->
+
+<% end %>

data/app/views/phcpress/{modules → article}/categories/edit.html.erb

@@ -1,8 +1,9 @@
 <!-- Title System -->
-<% phc_title "Plugin: Article Category Manager" %>
+<% phc_title "Article Category Manager" %>
 <% phc_title_tagline "Update Category Data" %>
-<% phc_breadcrumb_one link_to "Category Index", phcpress.modules_categories_path %>
-<% phc_breadcrumb_two yield(:phc_title_tagline) %>
+<% phc_breadcrumb_one yield(:phc_title) %>
+<% phc_breadcrumb_two link_to "Category Index", phcpress.article_categories_path %>
+<% phc_breadcrumb_three yield(:phc_title_tagline) %>
 <!-- Title System -->
 
 <!-- Page Content -->
@@ -17,7 +18,7 @@
 	</div>
 	<div class="panel-body">
 		<!-- Table - Category Edit Form -->
-		<%= render 'form', modules_category: @modules_category %>
+		<%= render 'form', article_category: @article_category %>
 		<!-- Table - Category Edit Form -->
 	</div>
 </div>

data/app/views/phcpress/{modules → article}/categories/index.html.erb

@@ -1,9 +1,22 @@
 <!-- Title System -->
-<% phc_title "Plugin: Article Category Manager" %>
+<% phc_title "Article Category Manager" %>
 <% phc_title_tagline "Category Index" %>
-<% phc_breadcrumb_one yield(:phc_title_tagline) %>
+<% phc_breadcrumb_one yield(:phc_title) %>
+<% phc_breadcrumb_two link_to "Category Index", phcpress.article_categories_path %>
+<% phc_breadcrumb_three yield(:phc_title_tagline) %>
 <!-- Title System -->
 
+<!-- Page Bradcrumbs -->
+<ol class="breadcrumb pull-right">
+	<li class="breadcrumb-item"><%= yield(:phc_breadcrumb_one) %></li>
+	<li class="breadcrumb-item active"><%= yield(:phc_breadcrumb_two) %></li>
+</ol>
+<!-- Page Bradcrumbs -->
+
+<!-- Page Header -->
+<h1 class="page-header"><%= yield(:phc_title) %></h1>
+<!-- Page Header -->
+			
 <!-- Page Content -->
 <div class="panel panel-inverse">
 	<div class="panel-heading">
@@ -25,10 +38,10 @@
 					</tr>
 				</thead>
 				<tbody>
-					<% @modules_categories.each do |modules_category| %>
+					<% @article_categories.each do |article_category| %>
 						<tr>
-							<td><%= link_to modules_category.catname, phcpress.edit_modules_category_path(modules_category) %></td>
-							<td><%= link_to 'Trash', modules_category, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %></td>
+							<td><%= link_to article_category.catname, phcpress.edit_article_category_path(article_category) %></td>
+							<td><%= link_to 'Trash', article_category, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %></td>
 						</tr>
 					<% end %>
 				</tbody>

data/app/views/phcpress/{modules → article}/categories/new.html.erb

@@ -1,8 +1,9 @@
 <!-- Title System -->
-<% phc_title "Plugin: Article Category Manager" %>
-<% phc_title_tagline "Category Details" %>
-<% phc_breadcrumb_one link_to "Category Index", phcpress.modules_categories_path %>
-<% phc_breadcrumb_two yield(:phc_title_tagline) %>
+<% phc_title "Article Category Manager" %>
+<% phc_title_tagline "Create a New Category" %>
+<% phc_breadcrumb_one yield(:phc_title) %>
+<% phc_breadcrumb_two link_to "Category Index", phcpress.article_categories_path %>
+<% phc_breadcrumb_three yield(:phc_title_tagline) %>
 <!-- Title System -->
 
 <!-- Page Content -->
@@ -16,7 +17,9 @@
 		<h4 class="panel-title"><%= yield(:phc_title_tagline) %></h4>
 	</div>
 	<div class="panel-body">
-
+		<!-- Table - Category New Form -->
+		<%= render 'form', article_category: @article_category %>
+		<!-- Table - Category New Form -->
 	</div>
 </div>
 <!-- Page Content -->

data/app/views/phcpress/article/categories/show.html.erb

@@ -0,0 +1,9 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Catname:</strong>
+  <%= @article_category.catname %>
+</p>
+
+<%= link_to 'Edit', edit_article_category_path(@article_category) %> |
+<%= link_to 'Back', article_categories_path %>

data/app/views/phcpress/article/posts/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for(@article_post, :html => {:multipart => true}) do |phc_press_article_post| %>
+<%= form_with(model: article_post, local: true) do |form| %>
 <div class="row">
 	<div class="col-md-3">
 
@@ -8,11 +8,11 @@
 			</div>
 			<div class="panel-body">
 				<div class="form-group">
-					<%= phc_press_article_post.label :pststatus, "Post Status" %>
-					<%= phc_press_article_post.select( :pststatus, [['Draft','draft'],['Published','published'],['Review','review']], {}, {class: "form-control form-control-sm"}) %>
+					<%= form.label :pststatus, "Post Status" %>
+					<%= form.select( :pststatus, [['Draft','draft'],['Published','published'],['Review','review']], {}, {class: "form-control form-control-sm"}) %>
 				</div>
 				<div class="actions">
-					<%= phc_press_article_post.submit class: "btn btn-primary waves-effect" %>
+					<%= form.submit class: "btn btn-primary waves-effect" %>
 				</div>
 			</div>
 		</div>
@@ -23,13 +23,13 @@
 			</div>
 			<div class="panel-body">
 				<div class="form-group">
-					<%= phc_press_article_post.label :pstimage, "Featured Image" %>
-					<%= phc_press_article_post.file_field :pstimage, class: "form-control" %>
+					<%= form.label :pstimage, "Featured Image" %>
+					<%= form.file_field :pstimage, class: "form-control" %>
 				</div>
-				<% if phc_press_article_post.object.pstimage? %>
-					<%= image_tag phc_press_article_post.object.pstimage_url, class: "img-responsive img-thumbnail" %>
-					<%= phc_press_article_post.label :remove_pstimage %>
-					<%= phc_press_article_post.check_box :remove_pstimage %>
+				<% if form.object.pstimage? %>
+					<%= image_tag form.object.pstimage_url, class: "img-responsive img-thumbnail" %>
+					<%= form.label :remove_pstimage %>
+					<%= form.check_box :remove_pstimage %>
 				<% end %>
 			</div>
 		</div>
@@ -39,7 +39,7 @@
 				<h4 class="panel-title">Post Categories</h4>
 			</div>
 			<div class="panel-body">
-				<%= phc_press_article_post.collection_check_boxes :category_ids, Phcpress::Modules::Category.all, :id, :catname do |post_category| %>
+				<%= form.collection_check_boxes :category_ids, Phcpress::Article::Category.where(org_id: current_user.org_id), :id, :catname do |post_category| %>
 					<%= post_category.check_box %>
 					<%= post_category.label %></br>
 				<% end %>
@@ -52,17 +52,6 @@
 		<!-- PHCNotifi Render Validation -->
 		<%= render 'phcnotifi/validations', :object => @article_post %>
 		<!-- PHCNotifi Render Validation -->
-		<div class="panel panel-inverse">
-			<div class="panel-heading">
-				<h4 class="panel-title">Article TItle</h4>
-			</div>
-			<div class="panel-body">
-				<div class="form-group">
-					<%= phc_press_article_post.label :psttitle, "Article Title" %>
-					<%= phc_press_article_post.text_field :psttitle, class: "form-control" %>
-				</div>
-			</div>
-		</div>
 
 		<div class="panel panel-inverse">
 			<div class="panel-heading">
@@ -73,9 +62,13 @@
 				</div>
 				<h4 class="panel-title"><%= yield(:phc_title_tagline) %></h4>
 			</div>
-			<div class="panel-body panel-form">
+			<div class="panel-body ">
+				<div class="form-group">
+					<%= form.label :psttittle, "Article Title" %>
+					<%= form.text_field :psttittle, class: "form-control" %>
+				</div>
 				<div class="form-group">
-					<%= phc_press_article_post.text_area :psttext, :class => "ckeditor form-control", :id => "editor1", :rows => 20, :cols => 60 %>
+					<%= form.text_area :psttext, :class => "ckeditor form-control", :id => "editor1", :rows => 20, :cols => 60 %>
 				</div>
 			</div>
 		</div>

data/app/views/phcpress/article/posts/edit.html.erb

@@ -1,33 +1,23 @@
 <!-- Title System -->
 <% phc_title "Article Manager" %>
 <% phc_title_tagline "Update Article" %>
-<% phc_breadcrumb_one link_to "Article Index", phcpress.article_posts_path %>
-<% phc_breadcrumb_two yield(:phc_title_tagline) %>
+<% phc_breadcrumb_one yield(:phc_title) %>
+<% phc_breadcrumb_two link_to "Article Index", phcpress.article_posts_path %>
+<% phc_breadcrumb_three yield(:phc_title_tagline) %>
 <!-- Title System -->
 
+<!-- Page Bradcrumbs -->
+<ol class="breadcrumb pull-right">
+	<li class="breadcrumb-item"><%= yield(:phc_breadcrumb_one) %></li>
+	<li class="breadcrumb-item"><%= yield(:phc_breadcrumb_two) %></li>
+	<li class="breadcrumb-item active"><%= yield(:phc_breadcrumb_three) %></li>
+</ol>
+<!-- Page Bradcrumbs -->
+
 <!-- Page Header -->
-<div class="row wrapper border-bottom white-bg page-heading">
-	<div class="col-sm-8">
-		<h2><%= yield(:phc_title) %></h2>
-		<!-- Bread Crumb -->
-		<ol class="breadcrumb">
-			<li><%= yield(:phc_breadcrumb_one) %></li>
-			<li class="active"><%= yield(:phc_breadcrumb_two) %></li>
-		</ol>
-		<!-- Bread Crumb -->
-	</div>
-	<div class="col-sm-4">
-		<div class="title-action">
-			<%= link_to phcpress.article_posts_path, class: "btn btn-default" do %>
-				<i class="fa fa fa-arrow-left"></i> Back to Article Index
-			<% end %>
-		</div>
-	</div>
-</div>
+<h1 class="page-header"><%= yield(:phc_title) %></h1>
 <!-- Page Header -->
-
+			
 <!-- Page Content -->
-<div class="wrapper wrapper-content animated fadeInRight">
-	<%= render 'form', article_post: @article_post %>
-</div>
+<%= render 'form', article_post: @article_post %>
 <!-- Page Content -->