phcdevworks_core_modules 7.3.0 → 8.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (65) hide show
  1. checksums.yaml +4 -4
  2. data/MIT-LICENSE +20 -20
  3. data/README.md +3 -0
  4. data/Rakefile +8 -8
  5. data/app/assets/config/phcdevworks_core_modules_manifest.js +2 -3
  6. data/app/controllers/phcdevworks_core_modules/affiliate/links_controller.rb +0 -0
  7. data/app/controllers/phcdevworks_core_modules/application_controller.rb +0 -0
  8. data/app/controllers/phcdevworks_core_modules/marketing/optimizations_controller.rb +0 -0
  9. data/app/controllers/phcdevworks_core_modules/post/categories_controller.rb +0 -0
  10. data/app/helpers/phcdevworks_core_modules/affiliate/links_helper.rb +0 -0
  11. data/app/helpers/phcdevworks_core_modules/application_helper.rb +0 -0
  12. data/app/helpers/phcdevworks_core_modules/marketing/optimizations_helper.rb +0 -0
  13. data/app/helpers/phcdevworks_core_modules/post/categories_helper.rb +0 -0
  14. data/app/jobs/phcdevworks_core_modules/application_job.rb +0 -0
  15. data/app/mailers/phcdevworks_core_modules/application_mailer.rb +0 -0
  16. data/app/models/phcdevworks_core_modules/affiliate/link.rb +1 -1
  17. data/app/models/phcdevworks_core_modules/affiliate.rb +0 -0
  18. data/app/models/phcdevworks_core_modules/affiliate_link_versions.rb +0 -0
  19. data/app/models/phcdevworks_core_modules/application_record.rb +0 -0
  20. data/app/models/phcdevworks_core_modules/marketing/optimization.rb +1 -1
  21. data/app/models/phcdevworks_core_modules/marketing.rb +0 -0
  22. data/app/models/phcdevworks_core_modules/marketing_optimization_versions.rb +0 -0
  23. data/app/models/phcdevworks_core_modules/modules.rb +0 -0
  24. data/app/models/phcdevworks_core_modules/post/category.rb +1 -1
  25. data/app/models/phcdevworks_core_modules/post.rb +0 -0
  26. data/app/models/phcdevworks_core_modules/post_category_versions.rb +0 -0
  27. data/app/views/layouts/phcdevworks_core_modules/application.html.erb +73 -131
  28. data/app/views/layouts/phcdevworks_core_modules/components/backend/footer/_footer.html.erb +10 -9
  29. data/app/views/layouts/phcdevworks_core_modules/components/backend/navigation/_top_menu.html.erb +26 -25
  30. data/app/views/layouts/phcdevworks_core_modules/components/backend/sidebars/_side_menu.html.erb +491 -349
  31. data/app/views/phcdevworks_core_modules/affiliate/links/_form.html.erb +19 -9
  32. data/app/views/phcdevworks_core_modules/affiliate/links/edit.html.erb +23 -31
  33. data/app/views/phcdevworks_core_modules/affiliate/links/index.html.erb +58 -66
  34. data/app/views/phcdevworks_core_modules/affiliate/links/new.html.erb +23 -31
  35. data/app/views/phcdevworks_core_modules/affiliate/links/show.html.erb +0 -0
  36. data/app/views/phcdevworks_core_modules/marketing/optimizations/_form.html.erb +16 -18
  37. data/app/views/phcdevworks_core_modules/marketing/optimizations/edit.html.erb +23 -31
  38. data/app/views/phcdevworks_core_modules/marketing/optimizations/index.html.erb +61 -69
  39. data/app/views/phcdevworks_core_modules/marketing/optimizations/new.html.erb +23 -31
  40. data/app/views/phcdevworks_core_modules/marketing/optimizations/show.html.erb +0 -0
  41. data/app/views/phcdevworks_core_modules/post/categories/_form.html.erb +4 -4
  42. data/app/views/phcdevworks_core_modules/post/categories/edit.html.erb +23 -31
  43. data/app/views/phcdevworks_core_modules/post/categories/index.html.erb +53 -61
  44. data/app/views/phcdevworks_core_modules/post/categories/new.html.erb +23 -31
  45. data/app/views/phcdevworks_core_modules/post/categories/show.html.erb +0 -0
  46. data/config/routes.rb +22 -24
  47. data/db/migrate/20170517064427_create_phcdevworks_core_modules_post_category_versions.rb +1 -1
  48. data/db/migrate/20200705223718_create_phcdevworks_core_modules_marketing_optimizations.rb +1 -1
  49. data/db/migrate/20200705225433_create_phcdevworks_core_modules_marketing_optimization_versions.rb +1 -1
  50. data/db/migrate/20200706094820_create_phcdevworks_core_modules_post_categories.rb +1 -1
  51. data/db/migrate/20201012225709_remove_phcdevworks_core_modules_post_categories.rb +1 -1
  52. data/db/migrate/20210207051304_create_phcdevworks_core_modules_affiliate_link_versions.rb +1 -1
  53. data/db/migrate/20210208130113_create_phcdevworks_core_modules_affiliate_links.rb +1 -1
  54. data/lib/phcdevworks_core_modules/engine.rb +5 -47
  55. data/lib/phcdevworks_core_modules/version.rb +3 -3
  56. data/lib/phcdevworks_core_modules.rb +6 -6
  57. data/lib/tasks/phcdevworks_core_modules_tasks.rake +4 -4
  58. metadata +24 -74
  59. data/app/assets/javascripts/phcdevworks_core_modules/affiliate/links.coffee +0 -3
  60. data/app/assets/stylesheets/phcdevworks_core_modules/affiliate/links.scss +0 -3
  61. data/app/assets/stylesheets/phcdevworks_core_modules/application.scss +0 -0
  62. data/app/assets/stylesheets/phcdevworks_core_modules/marketing/optimizations.scss +0 -3
  63. data/app/assets/stylesheets/phcdevworks_core_modules/post/categories.scss +0 -3
  64. data/app/assets/stylesheets/scaffolds.scss +0 -65
  65. data/config/spring.rb +0 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2fab22f124a2646684433df0eb111f83eaec82978ad1c151248b747900c776c3
4
- data.tar.gz: 02f6f0ad2425491cea6e86834360b926ab1ab3b2d9fef93b3a16785c12d50bfb
3
+ metadata.gz: 1abaaf09364c9b970891167db12e37a45332f761d33ea4da4eb100edc049f7f8
4
+ data.tar.gz: 1b9d89ca525bc92352f5133ebca90f9ec0c92428e04709fb14b24ce177d15528
5
5
  SHA512:
6
- metadata.gz: 121dddf38b1636a06cc23da2b08891594498d7d048438aa1a55ab72d135c078a2e76c0db9be45e367dfe9c35678df7a4941b3c6e47b25c345b6389ee74c3ce33
7
- data.tar.gz: b603fcc68ae8bb0a0d887b8a3420af92a0ad0142f0d1ff12782ada14c272610cae33ec9a1cf823a060ce9b0a0786246c5c57bd30b2bb4befa695d420f8ac6250
6
+ metadata.gz: 1a5a28a88f62b36084063492c8b4f05b82f747c61edb509afdeebc2ba38a9011024bb4a77d2f4cf4839f1af3c05c8cf6d2cf5309eb9d48d94b08c65ac7d9fa73
7
+ data.tar.gz: 121d1a5f187101b72a288eb8c07abdf5c6e0bd7206f7daa19dbc8aba9df2416290b4348584f3f4055381eed7918004220534ef08a6b64e00fad1f30930e34b6c
data/MIT-LICENSE CHANGED
@@ -1,20 +1,20 @@
1
- Copyright 2020 BradPotts
2
-
3
- Permission is hereby granted, free of charge, to any person obtaining
4
- a copy of this software and associated documentation files (the
5
- "Software"), to deal in the Software without restriction, including
6
- without limitation the rights to use, copy, modify, merge, publish,
7
- distribute, sublicense, and/or sell copies of the Software, and to
8
- permit persons to whom the Software is furnished to do so, subject to
9
- the following conditions:
10
-
11
- The above copyright notice and this permission notice shall be
12
- included in all copies or substantial portions of the Software.
13
-
14
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1
+ Copyright 2022 PHCDevworks
2
+
3
+ Permission is hereby granted, free of charge, to any person obtaining
4
+ a copy of this software and associated documentation files (the
5
+ "Software"), to deal in the Software without restriction, including
6
+ without limitation the rights to use, copy, modify, merge, publish,
7
+ distribute, sublicense, and/or sell copies of the Software, and to
8
+ permit persons to whom the Software is furnished to do so, subject to
9
+ the following conditions:
10
+
11
+ The above copyright notice and this permission notice shall be
12
+ included in all copies or substantial portions of the Software.
13
+
14
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/README.md CHANGED
@@ -0,0 +1,3 @@
1
+ ### Status
2
+
3
+ [![Gem Version](https://badge.fury.io/rb/phcdevworks_core_modules.svg)](https://badge.fury.io/rb/phcdevworks_core_modules) [![Publish to Github.com](https://github.com/phcdevworks/phcdevworks_core_modules/actions/workflows/publish_gem_github_com.yml/badge.svg)](https://github.com/phcdevworks/phcdevworks_core_modules/actions/workflows/publish_gem_github_com.yml) [![Publish to Rubygems.org](https://github.com/phcdevworks/phcdevworks_core_modules/actions/workflows/publish_gem_rubygems_org.yml/badge.svg)](https://github.com/phcdevworks/phcdevworks_core_modules/actions/workflows/publish_gem_rubygems_org.yml)
data/Rakefile CHANGED
@@ -1,8 +1,8 @@
1
- require "bundler/setup"
2
-
3
- APP_RAKEFILE = File.expand_path("spec/test_app/Rakefile", __dir__)
4
- load "rails/tasks/engine.rake"
5
-
6
- load "rails/tasks/statistics.rake"
7
-
8
- require "bundler/gem_tasks"
1
+ require "bundler/setup"
2
+
3
+ APP_RAKEFILE = File.expand_path("spec/test_app/Rakefile", __dir__)
4
+ load "rails/tasks/engine.rake"
5
+
6
+ load "rails/tasks/statistics.rake"
7
+
8
+ require "bundler/gem_tasks"
@@ -1,3 +1,2 @@
1
- //= link_directory ../stylesheets/phcdevworks_core_modules .scss
2
- //= link phcthemes_admin_panel_pack_coloradmin.css
3
- //= link phcthemes_admin_panel_pack_coloradmin.js
1
+ //= link coloradmin/default/phcthemes_admin_panel_pack_coloradmin.css
2
+ //= link coloradmin/phcthemes_admin_panel_pack_coloradmin.js
File without changes
@@ -16,7 +16,7 @@ module PhcdevworksCoreModules
16
16
  has_paper_trail versions: {class_name: "PhcdevworksCoreModules::AffiliateLinkVersions"}
17
17
 
18
18
  # Relationships for Local
19
- belongs_to :user, class_name: "PhcdevworksAccounts::User"
19
+ belongs_to :user, class_name: "PhcdevworksAccountsDevise::User"
20
20
 
21
21
  if defined?phcdevworks_press
22
22
  has_many :posts, class_name: "PhcdevworksPress::Article::Post"
File without changes
@@ -12,7 +12,7 @@ module PhcdevworksCoreModules
12
12
  has_paper_trail versions: {class_name: "PhcdevworksCoreModules::MarketingOptimizationVersions"}
13
13
 
14
14
  # Relationships for Local
15
- belongs_to :user, class_name: "PhcdevworksAccounts::User"
15
+ belongs_to :user, class_name: "PhcdevworksAccountsDevise::User"
16
16
  has_many :categories, class_name: "PhcdevworksCoreModules::Post::Category"
17
17
 
18
18
  # Relationships for PHCDevworks Plugins
File without changes
File without changes
@@ -8,7 +8,7 @@ module PhcdevworksCoreModules
8
8
  has_paper_trail :class_name => "PhcdevworksCoreModules::PostCategoryVersions"
9
9
 
10
10
  # Relationships for Local
11
- belongs_to :user, class_name: "PhcdevworksAccounts::User"
11
+ belongs_to :user, class_name: "PhcdevworksAccountsDevise::User"
12
12
  belongs_to :optimization, class_name: "PhcdevworksCoreModules::Marketing::Optimization", optional: true
13
13
 
14
14
  # Relationships for PHCDevworks Plugins
File without changes
@@ -1,131 +1,73 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
-
5
- <!-- SEO System -->
6
- <% phc_seo_title "PHCDevworks Core Modules" %>
7
- <% phc_seo_description "Ruby on Rails 6 core plugin for PHCDevworks plugins with common modules to handle functions universally handle common functions." %>
8
- <!-- SEO System -->
9
-
10
- <!-- SEO and Site Description -->
11
- <meta charset="utf-8">
12
- <title><%= yield(:phc_seo_title) %></title>
13
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
14
- <meta name="description" content="<%= yield(:phc_seo_description) %>">
15
- <!-- SEO and Site Description -->
16
-
17
- <!-- Rails Security Tags -->
18
- <%= csrf_meta_tags %>
19
- <%= csp_meta_tag %>
20
- <!-- Rails Security Tags -->
21
-
22
- <!-- CSS Styles -->
23
- <%= stylesheet_link_tag "phcthemes_admin_panel_pack_coloradmin", media: "all" %>
24
- <!-- CSS Styles -->
25
-
26
- <!-- JavaScript -->
27
- <%= javascript_include_tag "phcthemes_admin_panel_pack_coloradmin" %>
28
- <!-- JavaScript -->
29
-
30
- </head>
31
- <body>
32
-
33
- <!-- Page Container -->
34
- <div id="page-container" class="fade page-sidebar-fixed page-header-fixed">
35
-
36
- <!-- Page Header -->
37
- <div id="header" class="header navbar-default">
38
- <%= render "layouts/phcdevworks_core_modules/components/backend/navigation/top_menu" %>
39
- </div>
40
- <!-- Page Header -->
41
-
42
- <!-- Page Sidebar -->
43
- <div id="sidebar" class="sidebar">
44
- <%= render "layouts/phcdevworks_core_modules/components/backend/sidebars/side_menu" %>
45
- </div>
46
- <div class="sidebar-bg"></div>
47
- <!-- Page Sidebar -->
48
-
49
- <!-- Page Content -->
50
- <div id="content" class="content">
51
- <%= render "phcdevworks_notifications/bootstrap/notifications" %>
52
- <%= yield %>
53
- </div>
54
- <!-- Page Content -->
55
-
56
- <!-- Footer Content -->
57
- <div id="footer" class="footer mb-4">
58
- <%= render "layouts/phcdevworks_core_modules/components/backend/footer/footer" %>
59
- </div>
60
- <!-- Footer Content -->
61
-
62
- </div>
63
- <!-- Page Container -->
64
-
65
- <!-- JavaScript CKEditor -->
66
- <script>ClassicEditor
67
- .create( document.querySelector( '.editor' ), {
68
- toolbar: {
69
- items: [
70
- 'heading',
71
- '|',
72
- 'fontBackgroundColor',
73
- 'fontColor',
74
- 'horizontalLine',
75
- 'fontSize',
76
- 'fontFamily',
77
- 'highlight',
78
- '|',
79
- 'bold',
80
- 'underline',
81
- 'italic',
82
- 'strikethrough',
83
- 'link',
84
- 'removeFormat',
85
- '|',
86
- 'alignment',
87
- 'indent',
88
- 'outdent',
89
- '|',
90
- 'blockQuote',
91
- 'insertTable',
92
- 'undo',
93
- 'redo',
94
- '|',
95
- 'subscript',
96
- 'superscript',
97
- '|',
98
- 'codeBlock',
99
- 'code',
100
- '|',
101
- 'MathType',
102
- 'ChemType',
103
- 'specialCharacters'
104
- ]
105
- },
106
- language: 'en',
107
- table: {
108
- contentToolbar: [
109
- 'tableColumn',
110
- 'tableRow',
111
- 'mergeTableCells',
112
- 'tableCellProperties',
113
- 'tableProperties'
114
- ]
115
- },
116
- licenseKey: '',
117
- } )
118
- .then( editor => {
119
- window.editor = editor;
120
- } )
121
- .catch( error => {
122
- console.error( 'Oops, something gone wrong!' );
123
- console.error( 'Please, report the following error in the https://github.com/ckeditor/ckeditor5 with the build id and the error stack trace:' );
124
- console.warn( 'Build id: ulhl6ym1zxhr-qh8kt6relt0l' );
125
- console.error( error );
126
- } );
127
- </script>
128
- <!-- JavaScript CKEditor -->
129
-
130
- </body>
131
- </html>
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+
5
+ <!-- SEO System -->
6
+ <% phc_seo_title "PHCDevworks Core Modules" %>
7
+ <% phc_seo_description "Ruby on Rails 7 core plugin for PHCDevworks plugins with common modules to handle functions universally handle common functions." %>
8
+ <!-- SEO System -->
9
+
10
+ <!-- SEO and Site Description -->
11
+ <meta charset="utf-8">
12
+ <title><%= yield(:phc_seo_title) %></title>
13
+ <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
14
+ <meta name="description" content="<%= yield(:phc_seo_description) %>">
15
+ <!-- SEO and Site Description -->
16
+
17
+ <!-- Rails Security Tags -->
18
+ <%= csrf_meta_tags %>
19
+ <%= csp_meta_tag %>
20
+ <!-- Rails Security Tags -->
21
+
22
+ <!-- CSS Styles -->
23
+ <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
24
+ <%= stylesheet_link_tag "coloradmin/default/phcthemes_admin_panel_pack_coloradmin", media: "all" %>
25
+ <!-- CSS Styles -->
26
+
27
+ </head>
28
+ <body>
29
+
30
+ <!-- -PHCDev- Page Container -->
31
+ <div id="app" class="app app-header-fixed app-sidebar-fixed app-with-wide-sidebar">
32
+
33
+ <!-- -PHCDev- Page Container - Header -->
34
+ <div id="header" class="app-header">
35
+ <%= render "layouts/phcdevworks_core_modules/components/backend/navigation/top_menu" %>
36
+ </div>
37
+ <!-- -PHCDev- Page Container - Header -->
38
+
39
+ <!-- -PHCDev- Page Container - Sidebar -->
40
+ <div id="sidebar" class="app-sidebar" data-disable-slide-animation="true">
41
+ <%= render "layouts/phcdevworks_core_modules/components/backend/sidebars/side_menu" %>
42
+ </div>
43
+ <div class="app-sidebar-bg"></div>
44
+ <div class="app-sidebar-mobile-backdrop"><a href="#" data-dismiss="app-sidebar-mobile" class="stretched-link"></a></div>
45
+ <!-- -PHCDev- Page Container - Sidebar -->
46
+
47
+ <!-- -PHCDev- Page Container - Content -->
48
+ <div id="app" class="app app-content-full-height">
49
+ <div id="content" class="app-content d-flex flex-column p-0">
50
+ <!-- -PHCDev- Page Container - Main -->
51
+ <div class="app-content-padding flex-grow-1 overflow-hidden" data-scrollbar="true" data-height="100%">
52
+ <%= render "phcdevworks_notifications/bootstrap/notifications" %>
53
+ <%= yield %>
54
+ </div>
55
+ <!-- -PHCDev- Page Container - Main -->
56
+ <!-- -PHCDev- Page Container - Footer -->
57
+ <div id="footer" class="app-footer m-0">
58
+ <%= render "layouts/phcdevworks_core_modules/components/backend/footer/footer" %>
59
+ </div>
60
+ <!-- -PHCDev- Page Container - Footer -->
61
+ </div>
62
+ </div>
63
+ <!-- -PHCDev- Page Container - Content -->
64
+
65
+ </div>
66
+ <!-- -PHCDev- Page Container -->
67
+
68
+ <!-- JavaScript -->
69
+ <%= javascript_include_tag "coloradmin/phcthemes_admin_panel_pack_coloradmin" %>
70
+ <!-- JavaScript -->
71
+
72
+ </body>
73
+ </html>
@@ -1,16 +1,17 @@
1
- <!-- Footer Content - Left -->
1
+ <!-- -PHCDev- Page Container - Footer - Left -->
2
2
  <span>
3
- <!-- Footer Content - Left - Time in Production -->
3
+ <!-- -PHCDev- Page Container - Footer - Left - Copyright -->
4
4
  <i class="fab fa-osi font-weight-bolder"></i> 2012-<%= Time.now.year %> -
5
- <span class="font-weight-bold">PHC</span>Devworks Core -
6
- Engine v<%= Gem.loaded_specs["phcdevworks_core_modules"].version.to_s %>
7
- <!-- Footer Content - Left - Time in Production -->
5
+ <span class="phc_dev_strong_plugin">PHC</span><span class="phc_dev_light_plugin">Devworks</span> Core Modules - Engine v<%= Gem.loaded_specs["phcdevworks_core_modules"].version.to_s %>
6
+ <!-- -PHCDev- Page Container - Footer - Left - Copyright -->
8
7
  </span>
9
- <!-- Footer Content - Left -->
8
+ <!-- -PHCDev- Page Container - Footer - Left -->
10
9
 
11
- <!-- Footer Content - Right -->
10
+ <!-- -PHCDev- Page Container - Footer - Right -->
12
11
  <span class="float-right">
12
+ <!-- -PHCDev- Page Container - Footer - Right - Developed -->
13
13
  Developed with <i class="fas fa-heart hanna_hearts"></i> by
14
- <a class="phcnet_copyright text-dark" href="https://phcdevworks.com/"><u><span class="font-weight-bold">PHC</span>Devworks</u></a>
14
+ <a class="phcnet_copyright text-dark" href="https://phcdevworks.com/"><u><span class="phc_dev_strong_plugin">PHC</span><span class="phc_dev_light_plugin">Devworks</span></u></a>
15
+ <!-- -PHCDev- Page Container - Footer - Right - Developed -->
15
16
  </span>
16
- <!-- Footer Content - Right -->
17
+ <!-- -PHCDev- Page Container - Footer - Right -->
@@ -1,40 +1,41 @@
1
- <!-- -PHC- Topbar - Navigation Header -->
1
+ <!-- -PHCDev- Topbar - Navigation Header -->
2
2
  <div class="navbar-header">
3
3
 
4
- <%= link_to phcdevworks_core_modules.post_categories_path, class: "navbar-brand" do %>
5
- <strong>PHCDevworks</strong>Press
6
- <% end %>
7
-
8
- <button type="button" class="navbar-toggle" data-click="sidebar-toggled">
9
- <span class="icon-bar"></span>
10
- <span class="icon-bar"></span>
11
- <span class="icon-bar"></span>
4
+ <button type="button" class="navbar-mobile-toggler" data-toggle="app-sidebar-mobile">
5
+ <span class="icon-bar"></span>
6
+ <span class="icon-bar"></span>
7
+ <span class="icon-bar"></span>
12
8
  </button>
13
9
 
10
+ <%= link_to phcdevworks_accounts_devise.user_path, class: "navbar-brand" do %>
11
+ <span class="phc_dev_strong_plugin_logo">PHC</span><span class="phc_dev_light_plugin_logo">Devworks</span>
12
+ <% end %>
13
+
14
14
  </div>
15
- <!-- -PHC- Topbar - Navigation Header -->
15
+ <!-- -PHCDev- Topbar - Navigation Header -->
16
16
 
17
- <!-- -PHC- Topbar - Navigation Main -->
17
+ <!-- -PHCDev- Topbar - Navigation Main -->
18
18
  <% if current_user %>
19
- <ul class="navbar-nav navbar-right">
20
-
21
- <!-- -PHC- Topbar - Navigation Main - User Menu -->
22
- <li class="dropdown navbar-user">
23
- <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
19
+ <div class="navbar-nav">
20
+ <div class="navbar-item navbar-user dropdown">
21
+ <a href="#" class="navbar-link dropdown-toggle d-flex align-items-center" data-bs-toggle="dropdown">
24
22
  <%= image_tag current_user.gravatar_url %>
25
- <span class="d-none d-md-inline"><%= current_user.firstname + " " + current_user.lastname %></span> <b class="caret"></b>
23
+ <span>
24
+ <span class="d-none d-md-inline"><%= current_user.firstname + " " + current_user.lastname %></span>
25
+ <b class="caret"></b>
26
+ </span>
26
27
  </a>
27
- <div class="dropdown-menu dropdown-menu-right">
28
- <%= link_to phcdevworks_accounts.edit_user_registration_path, class: "dropdown-item" do %>
28
+ <div class="dropdown-menu dropdown-menu-end me-1">
29
+ <%= link_to phcdevworks_accounts_devise.edit_user_registration_path, class: "dropdown-item" do %>
29
30
  <i class="fad fa-cogs"></i> Account Settings
30
31
  <% end %>
31
- <%= link_to phcdevworks_accounts.destroy_user_session_path, method: :delete, class: "dropdown-item" do %>
32
+ <%= link_to phcdevworks_accounts_devise.destroy_user_session_path, method: :delete, class: "dropdown-item" do %>
32
33
  <i class="fad fa-sign-out-alt"></i> Logout
33
34
  <% end %>
34
35
  </div>
35
- </li>
36
- <!-- -PHC- Topbar - Navigation Main - User Menu -->
37
-
38
- </ul>
36
+ </div>
37
+ </div>
39
38
  <% end %>
40
- <!-- -PHC- Topbar - Navigation Main -->
39
+
40
+ </div>
41
+ <!-- -PHCDev- Topbar - Navigation Main -->