phcdevworks_scripts 5.7.1 → 7.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (52) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/config/phcdevworks_scripts_manifest.js +2 -0
  3. data/app/controllers/phcdevworks_scripts/script/authors_controller.rb +2 -2
  4. data/app/controllers/phcdevworks_scripts/script/extensions_controller.rb +2 -2
  5. data/app/controllers/phcdevworks_scripts/script/listings_controller.rb +2 -2
  6. data/app/controllers/phcdevworks_scripts/script/urls_controller.rb +1 -1
  7. data/app/controllers/phcdevworks_scripts/script/versions_controller.rb +2 -2
  8. data/app/controllers/phcdevworks_scripts/snippet/posts_controller.rb +1 -1
  9. data/app/controllers/phcdevworks_scripts/snippet/urls_controller.rb +1 -1
  10. data/app/models/phcdevworks_scripts/script/author.rb +7 -9
  11. data/app/models/phcdevworks_scripts/script/extension.rb +7 -7
  12. data/app/models/phcdevworks_scripts/script/listing.rb +8 -8
  13. data/app/models/phcdevworks_scripts/script/url.rb +3 -3
  14. data/app/models/phcdevworks_scripts/script/version.rb +2 -2
  15. data/app/models/phcdevworks_scripts/script_author_versions.rb +1 -1
  16. data/app/models/phcdevworks_scripts/script_extension_versions.rb +1 -1
  17. data/app/models/phcdevworks_scripts/script_listing_versions.rb +1 -1
  18. data/app/models/phcdevworks_scripts/script_url_versions.rb +1 -1
  19. data/app/models/phcdevworks_scripts/snippet/post.rb +5 -5
  20. data/app/models/phcdevworks_scripts/snippet/url.rb +1 -1
  21. data/app/views/layouts/phcdevworks_scripts/application.html.erb +65 -0
  22. data/app/views/layouts/phcdevworks_scripts/components/backend/sidebars/_side_menu.html.erb +56 -23
  23. data/app/views/phcdevworks_scripts/script/authors/_form.html.erb +8 -8
  24. data/app/views/phcdevworks_scripts/script/authors/index.html.erb +4 -4
  25. data/app/views/phcdevworks_scripts/script/extensions/_form.html.erb +6 -6
  26. data/app/views/phcdevworks_scripts/script/extensions/index.html.erb +2 -2
  27. data/app/views/phcdevworks_scripts/script/listings/_form.html.erb +22 -21
  28. data/app/views/phcdevworks_scripts/script/listings/index.html.erb +4 -4
  29. data/app/views/phcdevworks_scripts/script/urls/_form.html.erb +8 -8
  30. data/app/views/phcdevworks_scripts/snippet/posts/_form.html.erb +5 -4
  31. data/app/views/phcdevworks_scripts/snippet/posts/index.html.erb +2 -2
  32. data/app/views/phcdevworks_scripts/snippet/posts/show.html.erb +2 -2
  33. data/app/views/phcdevworks_scripts/snippet/urls/_form.html.erb +2 -2
  34. data/config/routes.rb +3 -2
  35. data/db/migrate/20170517064030_create_phcdevworks_scripts_script_extension_versions.rb +18 -0
  36. data/db/migrate/{20170517064049_create_phcdevworks_scripts_listing_versions.rb → 20170517064049_create_phcdevworks_scripts_script_listing_versions.rb} +4 -3
  37. data/db/migrate/20170517064114_create_phcdevworks_scripts_script_version_versions.rb +2 -1
  38. data/db/migrate/{20170517064030_create_phcdevworks_scripts_extension_versions.rb → 20170517064150_create_phcdevworks_scripts_script_url_versions.rb} +4 -3
  39. data/db/migrate/{20170517064150_create_phcdevworks_scripts_url_versions.rb → 20170517064208_create_phcdevworks_scripts_script_author_versions.rb} +18 -17
  40. data/db/migrate/20190818022002_create_phcdevworks_scripts_snippet_posts.rb +4 -2
  41. data/db/migrate/20190818022024_create_phcdevworks_scripts_snippet_urls.rb +3 -3
  42. data/db/migrate/20190818022939_create_phcdevworks_scripts_script_authors.rb +5 -5
  43. data/db/migrate/20190818023353_create_phcdevworks_scripts_script_listings.rb +13 -11
  44. data/db/migrate/20190818023709_create_phcdevworks_scripts_script_extensions.rb +3 -3
  45. data/db/migrate/20190818023911_create_phcdevworks_scripts_script_urls.rb +7 -7
  46. data/db/migrate/20191102092649_create_phcdevworks_scripts_snippet_url_versions.rb +0 -1
  47. data/db/migrate/20191102092711_create_phcdevworks_scripts_snippet_post_versions.rb +0 -1
  48. data/lib/phcdevworks_scripts/engine.rb +3 -0
  49. data/lib/phcdevworks_scripts/version.rb +1 -1
  50. metadata +114 -45
  51. data/db/migrate/20170517064208_create_phcdevworks_scripts_author_versions.rb +0 -17
  52. data/db/migrate/20170517064427_create_phcdevworks_scripts_licence_versions.rb +0 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2e792f1b35bd73ab395e796ee72fb962d83746dd497adcb9847764cc7abbcb06
4
- data.tar.gz: 6d50060e646613334217754d745fcb5d49f8bea8685589f696f78207266fbf97
3
+ metadata.gz: 5682b2482e2bbee1456c174331fdf9eb3f69ded62c51d1a773ee0d30a70a56f8
4
+ data.tar.gz: 2bf4592b6abb31865978196ddfd78f88cb0b76d31ac55532b1399c46b3e224f7
5
5
  SHA512:
6
- metadata.gz: f5085abf4c473139a61a9d0b39456c7b62ef470145bc8208fdc6b7de8ef2fe1f9a3da2e7a994781d13fdca66f700bdb3a38d806cde5f93890d182ab1e4e5d05b
7
- data.tar.gz: 96d25cabcc9b44b5ef2f2bfc4fe36534cca9787215b6f6eb249e9e81da6b9da156525a55d75035acc6f472e80602220ff407a67e6f359e85d990274be24e6d63
6
+ metadata.gz: ea3d050952f50510d8750d23cbdf5763f6acac5836f344dfb4968568e3457d56f7b14a64fff1330d307f15b23477b3b59ebae0fb04b2c3fb5928e9e34a25bd19
7
+ data.tar.gz: 727f0e4c4ed18a4d45cc8433691ac4b20573cf1caa9ce9eb6665d65dd9444a3ffc7c652b2dd8ecc8e26a2308234c8656a673612d6439dcf4fbd2128dbe5f1ce2
@@ -1,2 +1,4 @@
1
1
  //= link_directory ../javascripts/phcdevworks_scripts .js
2
2
  //= link_directory ../stylesheets/phcdevworks_scripts .scss
3
+ //= link phcthemes_admin_panel_pack_coloradmin.css
4
+ //= link phcthemes_admin_panel_pack_coloradmin.js
@@ -17,7 +17,7 @@ module PhcdevworksScripts
17
17
  # GET /script/authors/1
18
18
  def show
19
19
  @script_authors = Script::Author.friendly.find(params[:id])
20
- @versions = PhcdevworksScripts::AuthorVersions.where(item_id: params[:id], item_type: 'PhcdevworksScripts::Script::Author')
20
+ @versions = PhcdevworksScripts::ScriptAuthorVersions.where(item_id: params[:id], item_type: 'PhcdevworksScripts::Script::Author')
21
21
  end
22
22
 
23
23
  # GET /script/authors/new
@@ -76,7 +76,7 @@ module PhcdevworksScripts
76
76
 
77
77
  # Whitelist
78
78
  def script_author_params
79
- params.require(:script_author).permit(:author_first_name, :author_last_name, :author_website, :author_github)
79
+ params.require(:script_author).permit(:script_author_first_name, :script_author_last_name, :script_author_website, :script_author_github, :slug, :user_id, :org_id)
80
80
  end
81
81
 
82
82
  end
@@ -17,7 +17,7 @@ module PhcdevworksScripts
17
17
  # GET /script/extensions/1
18
18
  def show
19
19
  @script_extensions = Script::Extension.friendly.find(params[:id])
20
- @versions = PhcdevworksScripts::ExtensionVersions.where(item_id: params[:id], item_type: 'PhcdevworksScripts::Script::Extension')
20
+ @versions = PhcdevworksScripts::ScriptExtensionVersions.where(item_id: params[:id], item_type: 'PhcdevworksScripts::Script::Extension')
21
21
  end
22
22
 
23
23
  # GET /script/extensions/new
@@ -76,7 +76,7 @@ module PhcdevworksScripts
76
76
 
77
77
  # Whitelist
78
78
  def script_extension_params
79
- params.require(:script_extension).permit(:extension_name, :extension_description, :extension)
79
+ params.require(:script_extension).permit(:script_extension_name, :script_extension_description, :script_extension, :slug, :user_id, :org_id)
80
80
  end
81
81
 
82
82
  end
@@ -17,7 +17,7 @@ module PhcdevworksScripts
17
17
  # GET /script/listings/1
18
18
  def show
19
19
  @script_listings = Script::Listing.friendly.find(params[:id])
20
- @versions = PhcdevworksScripts::ListingVersions.where(item_id: params[:id], item_type: 'PhcdevworksScripts::Script_::Listing')
20
+ @versions = PhcdevworksScripts::ScriptListingVersions.where(item_id: params[:id], item_type: 'PhcdevworksScripts::Script::Listing')
21
21
  end
22
22
 
23
23
  # GET /script/listings/new
@@ -76,7 +76,7 @@ module PhcdevworksScripts
76
76
 
77
77
  # Whitelist
78
78
  def script_listing_params
79
- params.require(:script_listing).permit(:listing_title, :listing_description, :listing_script_source, :listing_script_website, :listing_script_repo, :listing_script_initial_release, :listing_script_lastest_release, :listing_script_beta_release, :listing_script_lastest_release_cdn, :listing_script_status, :author_id)
79
+ params.require(:script_listing).permit(:script_listing_title, :script_listing_description, :script_listing_script_source, :script_listing_script_website, :script_listing_script_repo, :script_listing_script_initial_release, :listing_script_lastest_release, :script_listing_script_beta_release, :script_listing_script_lastest_release, :script_listing_script_lastest_release_cdn, :author_id, :slug, :user_id, :org_id)
80
80
  end
81
81
 
82
82
  end
@@ -71,7 +71,7 @@ module PhcdevworksScripts
71
71
 
72
72
  # Whitelist
73
73
  def script_url_params
74
- params.require(:script_url).permit(:cdn_url, :cdn_url_release, :cdn_url_cdn_update, :version_id, :extension_id)
74
+ params.require(:script_url).permit(:script_cdn_url, :script_cdn_url_release, :script_cdn_url_cdn_update, :version_id, :extension_id, :slug, :user_id, :org_id)
75
75
  end
76
76
 
77
77
  end
@@ -17,7 +17,7 @@ module PhcdevworksScripts
17
17
  # GET /script/versions/1
18
18
  def show
19
19
  @script_versions = Script::Version.friendly.find(params[:id])
20
- @versions = PhcdevworksScripts::ScriptversionVersions.where(item_id: params[:id], item_type: 'PhcdevworksScripts::Script::Version')
20
+ @versions = PhcdevworksScripts::ScriptVersionVersions.where(item_id: params[:id], item_type: 'PhcdevworksScripts::Script::Version')
21
21
  end
22
22
 
23
23
  # GET /script/versions/new
@@ -76,7 +76,7 @@ module PhcdevworksScripts
76
76
 
77
77
  # Whitelist
78
78
  def script_version_params
79
- params.require(:script_version).permit(:script_version_number)
79
+ params.require(:script_version).permit(:script_version_number, :slug, :user_id, :org_id)
80
80
  end
81
81
 
82
82
  end
@@ -75,7 +75,7 @@ module PhcdevworksScripts
75
75
 
76
76
  # Whitelist
77
77
  def snippet_post_params
78
- params.require(:snippet_post).permit(:snippet_title, :snippet_code)
78
+ params.require(:snippet_post).permit(:snippet_post_title, :snippet_post_code, :slug, :user_id, :org_id)
79
79
  end
80
80
 
81
81
  end
@@ -70,7 +70,7 @@ module PhcdevworksScripts
70
70
 
71
71
  # Whitelist
72
72
  def snippet_url_params
73
- params.require(:snippet_url).permit(:snippet_url, :post_id, :slug, :user_id, :org_id)
73
+ params.require(:snippet_url).permit(:snippet_post_url, :post_id, :slug, :user_id, :org_id)
74
74
  end
75
75
 
76
76
  end
@@ -11,24 +11,22 @@ module PhcdevworksScripts
11
11
  has_many :listings, class_name: 'PhcdevworksScripts::Script::Listing'
12
12
 
13
13
  # Form Fields Validation
14
- validates :author_first_name,
15
- presence: true
14
+ validates :script_author_first_name,
15
+ presence: true
16
16
 
17
- validates :author_website,
17
+ validates :script_author_website,
18
18
  presence: true,
19
19
  format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
20
20
 
21
- validates :author_github,
21
+ validates :script_author_github,
22
22
  presence: true,
23
23
  format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
24
24
 
25
25
  # Clean URL Define
26
- friendly_id :phcdev_script_author_nice_urls, use: [:slugged, :finders]
26
+ friendly_id :script_author_nice_urls, use: [:slugged, :finders]
27
27
 
28
- def phcdev_script_author_nice_urls
29
- [
30
- [:author_first_name, :author_last_name]
31
- ]
28
+ def script_author_nice_urls
29
+ [:script_author_first_name, :script_author_last_name]
32
30
  end
33
31
 
34
32
  end
@@ -12,20 +12,20 @@ module PhcdevworksScripts
12
12
  has_many :urls, class_name: 'PhcdevworksScripts::Script::Url'
13
13
 
14
14
  # Form Fields Validation
15
- validates :extension_name,
15
+ validates :script_extension_name,
16
16
  presence: true
17
17
 
18
- validates :extension_description,
18
+ validates :script_extension_description,
19
19
  presence: true
20
20
 
21
- validates :extension,
21
+ validates :script_extension,
22
22
  presence: true
23
-
23
+
24
24
  # Clean URL Define
25
- friendly_id :phcdev_script_extension_nice_urls, use: [:slugged, :finders]
25
+ friendly_id :script_extension_nice_urls, use: [:slugged, :finders]
26
26
 
27
- def phcdev_script_extension_nice_urls
28
- [:extension]
27
+ def script_extension_nice_urls
28
+ [:script_extension]
29
29
  end
30
30
 
31
31
  end
@@ -12,26 +12,26 @@ module PhcdevworksScripts
12
12
  belongs_to :author, class_name: 'PhcdevworksScripts::Script::Author'
13
13
 
14
14
  # Form Fields Validation
15
- validates :listing_title,
15
+ validates :script_listing_title,
16
16
  presence: true
17
17
 
18
- validates :listing_description,
18
+ validates :script_listing_description,
19
19
  presence: true
20
20
 
21
- validates :listing_script_source,
21
+ validates :script_listing_script_source,
22
22
  format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
23
23
 
24
- validates :listing_script_website,
24
+ validates :script_listing_script_website,
25
25
  format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
26
26
 
27
- validates :listing_script_repo,
27
+ validates :script_listing_script_repo,
28
28
  format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
29
29
 
30
30
  # Clean URL Define
31
- friendly_id :phcdev_script_listing_nice_urls, use: [:slugged, :finders]
31
+ friendly_id :script_listing_nice_urls, use: [:slugged, :finders]
32
32
 
33
- def phcdev_script_listing_nice_urls
34
- [:listing_title]
33
+ def script_listing_nice_urls
34
+ [:script_listing_title]
35
35
  end
36
36
 
37
37
  end
@@ -10,14 +10,14 @@ module PhcdevworksScripts
10
10
  belongs_to :version, class_name: 'PhcdevworksScripts::Script::Version', optional: true
11
11
 
12
12
  # Form Fields Validation
13
- validates :cdn_url,
13
+ validates :script_cdn_url,
14
14
  presence: true,
15
15
  format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
16
16
 
17
- validates :cdn_url_release,
17
+ validates :script_cdn_url_release,
18
18
  presence: true
19
19
 
20
- validates :cdn_url_cdn_update,
20
+ validates :script_cdn_url_cdn_update,
21
21
  presence: true
22
22
 
23
23
  end
@@ -16,9 +16,9 @@ module PhcdevworksScripts
16
16
  presence: true
17
17
 
18
18
  # Clean URL Define
19
- friendly_id :phcdev_script_version_nice_urls, use: [:slugged, :finders]
19
+ friendly_id :script_version_nice_urls, use: [:slugged, :finders]
20
20
 
21
- def phcdev_script_version_nice_urls
21
+ def script_version_nice_urls
22
22
  [:script_version_number]
23
23
  end
24
24
 
@@ -1,5 +1,5 @@
1
1
  module PhcdevworksScripts
2
2
  class ScriptAuthorVersions < PaperTrail::Version
3
- self.table_name = :phcdevworks_scripts_author_versions
3
+ self.table_name = :phcdevworks_scripts_script_author_versions
4
4
  end
5
5
  end
@@ -1,5 +1,5 @@
1
1
  module PhcdevworksScripts
2
2
  class ScriptExtensionVersions < PaperTrail::Version
3
- self.table_name = :phcdevworks_scripts_extension_versions
3
+ self.table_name = :phcdevworks_scripts_script_extension_versions
4
4
  end
5
5
  end
@@ -1,5 +1,5 @@
1
1
  module PhcdevworksScripts
2
2
  class ScriptListingVersions < PaperTrail::Version
3
- self.table_name = :phcdevworks_scripts_listing_versions
3
+ self.table_name = :phcdevworks_scripts_script_listing_versions
4
4
  end
5
5
  end
@@ -1,5 +1,5 @@
1
1
  module PhcdevworksScripts
2
2
  class ScriptUrlVersions < PaperTrail::Version
3
- self.table_name = :phcdevworks_scripts_url_versions
3
+ self.table_name = :phcdevworks_scripts_script_url_versions
4
4
  end
5
5
  end
@@ -11,17 +11,17 @@ module PhcdevworksScripts
11
11
  has_many :urls, class_name: 'PhcdevworksScripts::Snippet::Url'
12
12
 
13
13
  # Form Fields Validation
14
- validates :snippet_title,
14
+ validates :snippet_post_title,
15
15
  presence: true
16
16
 
17
- validates :snippet_code,
17
+ validates :snippet_post_code,
18
18
  presence: true
19
19
 
20
20
  # Clean URL Define
21
- friendly_id :phcdev_snippet_post_nice_urls, use: [:slugged, :finders]
21
+ friendly_id :snippet_post_nice_urls, use: [:slugged, :finders]
22
22
 
23
- def phcdev_snippet_post_nice_urls
24
- [:snippet_title]
23
+ def snippet_post_nice_urls
24
+ [:snippet_post_title]
25
25
  end
26
26
 
27
27
  end
@@ -11,7 +11,7 @@ module PhcdevworksScripts
11
11
  belongs_to :post, class_name: 'PhcdevworksScripts::Snippet::Post'
12
12
 
13
13
  # Form Fields Validation
14
- validates :snippet_url,
14
+ validates :snippet_post_url,
15
15
  presence: true,
16
16
  format: { :with => phc_domain_regx, message: "Please follow this URL format http or https://www.**********.com" }
17
17
 
@@ -67,5 +67,70 @@
67
67
  <%= javascript_include_tag "phcdevworks_scripts/application", "data-turbolinks-track": "reload" %>
68
68
  <!-- JavaScript -->
69
69
 
70
+ <!-- JavaScript CKEditor -->
71
+ <script>ClassicEditor
72
+ .create( document.querySelector( '.editor' ), {
73
+ toolbar: {
74
+ items: [
75
+ 'heading',
76
+ '|',
77
+ 'fontBackgroundColor',
78
+ 'fontColor',
79
+ 'horizontalLine',
80
+ 'fontSize',
81
+ 'fontFamily',
82
+ 'highlight',
83
+ '|',
84
+ 'bold',
85
+ 'underline',
86
+ 'italic',
87
+ 'strikethrough',
88
+ 'link',
89
+ 'removeFormat',
90
+ '|',
91
+ 'alignment',
92
+ 'indent',
93
+ 'outdent',
94
+ '|',
95
+ 'blockQuote',
96
+ 'insertTable',
97
+ 'undo',
98
+ 'redo',
99
+ '|',
100
+ 'subscript',
101
+ 'superscript',
102
+ '|',
103
+ 'codeBlock',
104
+ 'code',
105
+ '|',
106
+ 'MathType',
107
+ 'ChemType',
108
+ 'specialCharacters'
109
+ ]
110
+ },
111
+ language: 'en',
112
+ table: {
113
+ contentToolbar: [
114
+ 'tableColumn',
115
+ 'tableRow',
116
+ 'mergeTableCells',
117
+ 'tableCellProperties',
118
+ 'tableProperties'
119
+ ]
120
+ },
121
+ licenseKey: '',
122
+ } )
123
+ .then( editor => {
124
+ window.editor = editor;
125
+ } )
126
+ .catch( error => {
127
+ console.error( 'Oops, something gone wrong!' );
128
+ console.error( 'Please, report the following error in the https://github.com/ckeditor/ckeditor5 with the build id and the error stack trace:' );
129
+ console.warn( 'Build id: ulhl6ym1zxhr-qh8kt6relt0l' );
130
+ console.error( error );
131
+ } );
132
+ </script>
133
+ <!-- JavaScript CKEditor -->
134
+
70
135
  </body>
71
136
  </html>
@@ -25,7 +25,7 @@
25
25
  <% end %>
26
26
  </li>
27
27
  <li>
28
- <%= link_to phcdevworks_accounts.destroy_user_session_path do %>
28
+ <%= link_to phcdevworks_accounts.destroy_user_session_path, method: :delete do %>
29
29
  <i class="fad fa-sign-out-alt"></i> Logout
30
30
  <% end %>
31
31
  </li>
@@ -45,18 +45,40 @@
45
45
  <a href="javascript:;">
46
46
  <b class="caret"></b>
47
47
  <i class="fad fa-newspaper"></i>
48
- <span>Article Posts</span>
48
+ <span>Blog Articles</span>
49
49
  </a>
50
50
  <ul class="sub-menu">
51
51
  <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts") %>"><%= link_to("Article Index", phcdevworks_press.article_posts_path) %></li>
52
- <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts#new") %>"><%= link_to("New Aritcle", phcdevworks_press.new_article_post_path) %></li>
52
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts#new") %>"><%= link_to("Add a New Aritcle", phcdevworks_press.new_article_post_path) %></li>
53
+ </ul>
54
+ </li>
55
+ <li class="has-sub">
56
+ <a href="javascript:;">
57
+ <b class="caret"></b>
58
+ <i class="fad fa-star-half"></i>
59
+ <span>Review Articles</span>
60
+ </a>
61
+ <ul class="sub-menu">
62
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/review/posts") %>"><%= link_to("Reviews Index", phcdevworks_press.review_posts_path) %></li>
63
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/review/posts#new") %>"><%= link_to("Add a New Review", phcdevworks_press.new_review_post_path) %></li>
64
+ </ul>
65
+ </li>
66
+ <li class="has-sub">
67
+ <a href="javascript:;">
68
+ <b class="caret"></b>
69
+ <i class="fad fa-th-list"></i>
70
+ <span>List Articles</span>
71
+ </a>
72
+ <ul class="sub-menu">
73
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/list/posts") %>"><%= link_to("Lists Index", phcdevworks_press.list_posts_path) %></li>
74
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/list/posts#new") %>"><%= link_to("Add a New List", phcdevworks_press.new_list_post_path) %></li>
53
75
  </ul>
54
76
  </li>
55
77
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
56
78
  <% end %>
57
79
 
58
80
  <% if defined?phcdevworks_portfolio %>
59
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
81
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Portfolio -->
60
82
  <li class="nav-header">Portfolio</li>
61
83
  <li class="has-sub">
62
84
  <a href="javascript:;">
@@ -80,7 +102,7 @@
80
102
  <li class="<%= phc_menu_active_controller("phcdevworks_portfolio/project/posts#new") %>"><%= link_to("New Types", phcdevworks_portfolio.new_project_type_path) %></li>
81
103
  </ul>
82
104
  </li>
83
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
105
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Portfolio -->
84
106
  <% end %>
85
107
 
86
108
  <% if defined?phcdevworks_tutorials %>
@@ -112,23 +134,6 @@
112
134
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Tutorials -->
113
135
  <% end %>
114
136
 
115
- <% if defined?phcdevworks_core_modules %>
116
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
117
- <li class="nav-header">Core Modules</li>
118
- <li class="has-sub">
119
- <a href="javascript:;">
120
- <b class="caret"></b>
121
- <i class="fad fa-sitemap"></i>
122
- <span>Categories</span>
123
- </a>
124
- <ul class="sub-menu">
125
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/modules/categories") %>"><%= link_to("Category Index", phcdevworks_core_modules.modules_categories_path) %></li>
126
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/modules/categories#new") %>"><%= link_to("New Category", phcdevworks_core_modules.new_modules_category_path) %></li>
127
- </ul>
128
- </li>
129
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
130
- <% end %>
131
-
132
137
  <% if defined?phcdevworks_members %>
133
138
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Members -->
134
139
  <li class="nav-header">Membership Manager</li>
@@ -227,6 +232,34 @@
227
232
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks RealEstate -->
228
233
  <% end %>
229
234
 
235
+ <% if defined?phcdevworks_core_modules %>
236
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
237
+ <li class="nav-header">Core Modules</li>
238
+ <li class="has-sub">
239
+ <a href="javascript:;">
240
+ <b class="caret"></b>
241
+ <i class="fad fa-sitemap"></i>
242
+ <span>Categories</span>
243
+ </a>
244
+ <ul class="sub-menu">
245
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories") %>"><%= link_to("Category Index", phcdevworks_core_modules.post_categories_path) %></li>
246
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories#new") %>"><%= link_to("New Category", phcdevworks_core_modules.new_post_category_path) %></li>
247
+ </ul>
248
+ </li>
249
+ <li class="has-sub">
250
+ <a href="javascript:;">
251
+ <b class="caret"></b>
252
+ <i class="fad fa-analytics"></i>
253
+ <span>Marketing</span>
254
+ </a>
255
+ <ul class="sub-menu">
256
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations") %>"><%= link_to("SEO Data Index", phcdevworks_core_modules.marketing_optimizations_path) %></li>
257
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations#new") %>"><%= link_to("Add SEO Data", phcdevworks_core_modules.new_marketing_optimization_path) %></li>
258
+ </ul>
259
+ </li>
260
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
261
+ <% end %>
262
+
230
263
  <% if current_user && current_user.admin? %>
231
264
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
232
265
  <li class="nav-header">User Administration</li>
@@ -237,7 +270,7 @@
237
270
  <span>Admin</span>
238
271
  </a>
239
272
  <ul class="sub-menu">
240
- <li class="<%= phc_menu_active_controller("phcdevworks_accounts/admin/users") %>"><%= link_to "User List", phcdevworks_accounts.admin_users_index_path %></li>
273
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts/admin/users") %>"><%= link_to "User List", phcdevworks_accounts.admin_users_all_path %></li>
241
274
  </ul>
242
275
  </li>
243
276
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->