cm-admin 1.2.2 → 1.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/app/assets/stylesheets/cm_admin/pages/history_page.scss +27 -40
  4. data/app/views/cm_admin/main/_actions_dropdown.html.slim +5 -1
  5. data/app/views/cm_admin/main/history.html.slim +11 -11
  6. data/lib/cm_admin/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f2b9f1cf37a3437b3fd5d0c759579d58899c58454294fed88a21bd77c33ff5c1
4
- data.tar.gz: 12430d2c8fbee0722d022c7c93a48ade59fc12ea05a2e298e8dfda7c8a29275d
3
+ metadata.gz: 2a5441ee465f81a38a87aca50f03be7b93364612a1c009c0459da7aa229f90d2
4
+ data.tar.gz: 40b464190eb0c6f99fea77b435f32f8d7ea76eec1aa21484d52bf1a691bad10a
5
5
  SHA512:
6
- metadata.gz: b3585639e36e464ee71b24ad6a9b67ab3c247563df9cd02671bc0e6e8cd79fc792e87622b7137b38e6c99cd2530dbe04c370637e58443b5b544cac1acf2d54f5
7
- data.tar.gz: 3a60816b1cc72c53d25290bb338b85b3a7580223bca9137c27678a7da8f95f839e277c0e5dd2f5328415fa73d0029a0090b7b62ed79c5dd0d4959aff28f343cc
6
+ metadata.gz: af42d7bf84785cb9d485a9f5d6c648ae2745d6fc684684c040fd9c2b65c280d253af6d29a6b0cf1972ba720975047aa94eb9133a430918ece96dd162be9389f0
7
+ data.tar.gz: 8de410310ee77d14f76765d282e69bd0f9d5540e54142bcf1c4df7473b3734f837fe44dd2cd079ddbbea22080c642328b9541797d380ccdc7fd8dafb60fbd07d
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cm-admin (1.2.2)
4
+ cm-admin (1.2.3)
5
5
  caxlsx_rails
6
6
  cocoon (~> 1.2.15)
7
7
  csv-importer (~> 0.8.2)
data/app/assets/stylesheets/cm_admin/pages/history_page.scss CHANGED
@@ -1,48 +1,35 @@
1
1
  @import "../helpers/index.scss";
2
2
 
3
- // History page styles
4
- .history-box {
5
- width: 752px;
6
- padding: 24px;
7
- background: #ffffff;
8
- border: 1px solid $grey-light-clr;
9
- border-radius: 4px;
3
+ .history-items-list {
4
+ position: relative;
5
+ list-style: none;
6
+ padding: 0;
10
7
  .history-item {
11
- display: grid;
12
- grid-template-columns: 32px 1fr;
13
- grid-gap: 8px;
14
- align-items: center;
15
- margin-bottom: 32px;
16
- &:nth-last-child(1) {
17
- margin-bottom: 0;
8
+ position: relative;
9
+ padding: 0 0 40px 8px;
10
+ &::after {
11
+ content: "";
12
+ position: absolute;
13
+ top: 9px;
14
+ left: -3px;
15
+ display: block;
16
+ height: 5px;
17
+ width: 5px;
18
+ background-color: var(--bs-secondary-color);
19
+ border-radius: $circle;
18
20
  }
19
- .profile-pic {
20
- img {
21
- width: 32px;
22
- height: 32px;
23
- object-fit: cover;
24
- border-radius: 50%;
25
- }
21
+ &::before {
22
+ content: "";
23
+ position: absolute;
24
+ top: 9px;
25
+ left: -1px;
26
+ height: 100%;
27
+ border-left: 1px solid var(--bs-border-color);
26
28
  }
27
- .history-info {
28
- display: inline-flex;
29
- font-family: 'Open Sans', sans-serif;
30
- font-size: 14px;
31
- line-height: 22px;
32
- .bold-text {
33
- font-weight: 600;
34
- color: #1d21d9;
35
- margin-right: 4px;
36
- }
37
- .normal-text {
38
- font-weight: 400;
39
- color: #1d21d9;
40
- margin-right: 4px;
41
- }
42
- .light-text {
43
- font-weight: 400;
44
- color: $ink-lighter-clr;
45
- margin-right: 4px;
29
+ &:last-child {
30
+ padding-bottom: 0;
31
+ &::before {
32
+ border: none;
46
33
  }
47
34
  }
48
35
  }
data/app/views/cm_admin/main/_actions_dropdown.html.slim CHANGED
@@ -10,7 +10,11 @@
10
10
  i.fa.fa-bars.bolder
11
11
  .popup-card.table-export-popup.hidden
12
12
  - if edit_action.present?
13
- = link_to cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object.id) do
13
+ - if @associated_model
14
+ - path = cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object.id, referrer: request.path)
15
+ - else
16
+ - path = cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object.id)
17
+ = link_to path do
14
18
  .popup-option
15
19
  span
16
20
  i.fa.fa-edit
data/app/views/cm_admin/main/history.html.slim CHANGED
@@ -3,14 +3,14 @@
3
3
  == render 'cm_admin/main/top_navbar'
4
4
  == render 'cm_admin/main/tabs'
5
5
  .show-page__inner
6
- .history-box
7
- - @ar_object.action_trails.each do |at|
8
- .history-item
9
- .profile-pic
10
- img alt=("profile") src="https://www.pngitem.com/pimgs/m/264-2647677_avatar-icon-human-user-avatar-svg-hd-png.png"
11
- .history-info
12
- span.bold-text = at.actor.first_name
13
- span.normal-text = at.trail_type.titleize
14
- span.normal-text the
15
- span.bold-text = at.entity_type
16
- span.light-text = at.created_at.strftime("%B")
6
+ .card.col-7
7
+ .card-body
8
+ ul.history-items-list
9
+ - @ar_object.action_trails.each do |at|
10
+ li.history-item
11
+ .d-inline-flex.mb-2
12
+ span.fw-bold.me-1 = at.actor.first_name
13
+ span.me-1 = at.trail_type.titleize
14
+ span.me-1 the
15
+ span.fw-bold.me-1 = at.entity_type
16
+ span.text-body-tertiary.me-1 = at.created_at.strftime("%B")
data/lib/cm_admin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CmAdmin
2
- VERSION = '1.2.2'
2
+ VERSION = '1.2.3'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cm-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.2
4
+ version: 1.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - sajinmp
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: exe
12
12
  cert_chain: []
13
- date: 2023-10-10 00:00:00.000000000 Z
13
+ date: 2023-10-11 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails