trusty-cms 4.0.2 → 4.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (108) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +4 -4
  3. data/app/assets/images/admin/spinner.gif +0 -0
  4. data/app/assets/javascripts/admin.js +3 -0
  5. data/app/assets/javascripts/admin/more-or-less.js +2 -2
  6. data/app/assets/javascripts/admin/tabcontrol.js.erb +1 -2
  7. data/app/assets/stylesheets/admin/_base.scss +22 -6
  8. data/app/assets/stylesheets/admin/_multi_site_main.scss +28 -29
  9. data/app/assets/stylesheets/admin/_reset.scss +5 -4
  10. data/app/assets/stylesheets/admin/_site_chooser.scss +44 -69
  11. data/app/assets/stylesheets/admin/assets.scss +138 -141
  12. data/app/assets/stylesheets/admin/main.scss +10 -12
  13. data/app/assets/stylesheets/admin/modules/_boxes.scss +0 -3
  14. data/app/assets/stylesheets/admin/modules/_buttons.scss +30 -0
  15. data/app/assets/stylesheets/admin/modules/_links.scss +1 -1
  16. data/app/assets/stylesheets/admin/partials/_actions.scss +29 -46
  17. data/app/assets/stylesheets/admin/partials/_avatars.scss +3 -2
  18. data/app/assets/stylesheets/admin/partials/_content.scss +15 -38
  19. data/app/assets/stylesheets/admin/partials/_dateinput.scss +23 -14
  20. data/app/assets/stylesheets/admin/partials/_drawer.scss +78 -0
  21. data/app/assets/stylesheets/admin/partials/_dropdown.scss +9 -12
  22. data/app/assets/stylesheets/admin/partials/_footer.scss +4 -3
  23. data/app/assets/stylesheets/admin/partials/_forms.scss +64 -493
  24. data/app/assets/stylesheets/admin/partials/_header.scss +9 -118
  25. data/app/assets/stylesheets/admin/partials/_layout.scss +26 -2
  26. data/app/assets/stylesheets/admin/partials/_login_form.scss +28 -0
  27. data/app/assets/stylesheets/admin/partials/_messages.scss +5 -5
  28. data/app/assets/stylesheets/admin/partials/_popup.scss +62 -51
  29. data/app/assets/stylesheets/admin/partials/_preferences.scss +37 -0
  30. data/app/assets/stylesheets/admin/partials/_sidebar.scss +55 -0
  31. data/app/assets/stylesheets/admin/partials/_tabcontrol.scss +24 -36
  32. data/app/assets/stylesheets/admin/partials/{_index.scss → _table.scss} +53 -84
  33. data/app/assets/stylesheets/admin/partials/_toolbar.scss +11 -6
  34. data/app/assets/stylesheets/admin/partials/_treetable.scss +1 -71
  35. data/app/assets/stylesheets/admin/partials/_typography.scss +30 -55
  36. data/app/assets/stylesheets/admin/partials/_validations.scss +6 -5
  37. data/app/assets/stylesheets/rad_social/rad_screen.scss +65 -64
  38. data/app/controllers/admin/pages_controller.rb +2 -2
  39. data/app/helpers/application_helper.rb +2 -2
  40. data/app/models/menu_renderer.rb +3 -3
  41. data/app/users/_choose_site.html.haml +3 -7
  42. data/app/views/admin/assets/_form.html.haml +2 -1
  43. data/app/views/admin/assets/_search.html.haml +2 -1
  44. data/app/views/admin/assets/edit.html.haml +8 -7
  45. data/app/views/admin/assets/index.html.haml +4 -2
  46. data/app/views/admin/assets/new.html.haml +4 -5
  47. data/app/views/admin/assets/remove.html.haml +1 -0
  48. data/app/views/admin/configuration/edit.html.haml +7 -7
  49. data/app/views/admin/configuration/show.html.haml +6 -8
  50. data/app/views/admin/layouts/_choose_site.html.haml +2 -3
  51. data/app/views/admin/layouts/_form.html.haml +13 -12
  52. data/app/views/admin/layouts/_site_chooser.html.haml +2 -2
  53. data/app/views/admin/layouts/index.html.haml +11 -4
  54. data/app/views/admin/layouts/remove.html.haml +2 -2
  55. data/app/views/admin/page_attachments/_attachment.html.haml +2 -2
  56. data/app/views/admin/page_fields/_page_field.html.haml +3 -3
  57. data/app/views/admin/page_parts/_page_part.html.haml +4 -5
  58. data/app/views/admin/pages/_asset_popups.html.haml +15 -16
  59. data/app/views/admin/pages/_assets.html.haml +8 -7
  60. data/app/views/admin/pages/_fields.html.haml +16 -13
  61. data/app/views/admin/pages/_node.html.haml +3 -3
  62. data/app/views/admin/pages/_popups.html.haml +11 -11
  63. data/app/views/admin/pages/edit.html.haml +2 -2
  64. data/app/views/admin/pages/index.html.haml +5 -2
  65. data/app/views/admin/pages/new.html.haml +3 -3
  66. data/app/views/admin/pages/remove.html.haml +2 -2
  67. data/app/views/admin/preferences/edit.html.haml +5 -5
  68. data/app/views/admin/references/filters.haml +1 -1
  69. data/app/views/admin/references/tags.haml +3 -3
  70. data/app/views/admin/removed/_assets_bucket.html.haml +3 -3
  71. data/app/views/admin/removed/_assets_container.html.haml +18 -18
  72. data/app/views/admin/removed/_bucket.html.haml +1 -1
  73. data/app/views/admin/removed/_bucket_asset.html.haml +3 -3
  74. data/app/views/admin/removed/_show_bucket_link.html.haml +1 -1
  75. data/app/views/admin/removed/_upload_to_page.html.haml +5 -5
  76. data/app/views/admin/sites/_form.haml +18 -18
  77. data/app/views/admin/sites/edit.haml +1 -1
  78. data/app/views/admin/sites/index.haml +6 -4
  79. data/app/views/admin/sites/new.haml +1 -1
  80. data/app/views/admin/snippets/_choose_site.html.haml +4 -5
  81. data/app/views/admin/snippets/_form.html.haml +8 -9
  82. data/app/views/admin/snippets/edit.html.haml +1 -1
  83. data/app/views/admin/snippets/index.html.haml +11 -4
  84. data/app/views/admin/snippets/new.html.haml +1 -1
  85. data/app/views/admin/snippets/remove.html.haml +3 -3
  86. data/app/views/admin/users/_avatar.html.haml +2 -2
  87. data/app/views/admin/users/_choose_site.html.haml +3 -7
  88. data/app/views/admin/users/_form.html.haml +18 -21
  89. data/app/views/admin/users/_password_fields.html.haml +6 -6
  90. data/app/views/admin/users/index.html.haml +13 -6
  91. data/app/views/admin/users/remove.html.haml +2 -2
  92. data/app/views/admin/welcome/login.html.haml +8 -8
  93. data/app/views/devise/passwords/edit.html.haml +6 -6
  94. data/app/views/devise/passwords/new.html.haml +3 -3
  95. data/app/views/devise/sessions/new.html.haml +8 -8
  96. data/app/views/devise/shared/_links.html.haml +2 -2
  97. data/app/views/layouts/application.html.haml +24 -19
  98. data/app/views/rad_social_mailer/social_mail_form.html.haml +15 -15
  99. data/app/views/widget/_email_form.html.haml +14 -14
  100. data/app/views/widget/_horizontal_widget.html.haml +5 -5
  101. data/lib/trusty_cms.rb +1 -1
  102. data/package.json +9 -1
  103. data/yarn.lock +1988 -0
  104. metadata +8 -7
  105. data/app/assets/stylesheets/admin/partials/_deprecated.scss +0 -65
  106. data/app/assets/stylesheets/admin/partials/_jquery-ui-structure.scss +0 -258
  107. data/app/assets/stylesheets/admin/partials/_jquery-ui-theme.scss +0 -410
  108. data/app/assets/stylesheets/admin/partials/_jquery-ui.scss +0 -650
@@ -3,16 +3,19 @@
3
3
  // Common Variables and Modules
4
4
  @import "base";
5
5
  @import "reset";
6
+ @import "tablesaw/dist/stackonly/tablesaw.stackonly.scss";
6
7
 
7
8
  // Partials
8
9
  @import "partials/typography";
9
10
  @import "partials/layout";
10
11
  @import "partials/header";
12
+ @import "partials/sidebar";
13
+ @import "partials/table";
11
14
  @import "partials/avatars";
12
15
  @import "partials/dropdown";
16
+ @import "partials/drawer";
13
17
  @import "partials/messages";
14
18
  @import "partials/forms";
15
- @import "partials/index";
16
19
  @import "partials/content";
17
20
  @import "partials/actions";
18
21
  @import "partials/footer";
@@ -21,19 +24,14 @@
21
24
  @import "partials/dateinput";
22
25
  @import "partials/toolbar";
23
26
  @import "partials/validations";
27
+ @import "partials/preferences";
24
28
  @import "partials/treetable";
25
-
29
+ @import "partials/login_form";
26
30
  @import "multi_site_main";
27
31
  @import "site_chooser";
28
32
 
29
- // JQueryUI Partials
30
- @import "partials/jquery-ui";
31
- @import "partials/jquery-ui-structure";
32
- @import "partials/jquery-ui-theme";
33
- .ui-state-highlight { height: 5em; line-height: 1.2em; }
34
-
35
- // Deprecated
36
- @import "partials/deprecated";
33
+ .ui-state-highlight {
34
+ height: 5em;
35
+ line-height: 1.2em;
36
+ }
37
37
 
38
- // Font Awesome
39
- @import url("//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css");
@@ -1,7 +1,4 @@
1
1
  @mixin alt-box {
2
- background-image: linear-gradient(to bottom, #ffffff, #cccccc);
3
2
  background: #d8d8d8;
4
- border-radius: 8px;
5
- box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 3px;
6
3
  padding: 12px 10px;
7
4
  }
@@ -0,0 +1,30 @@
1
+ @mixin button {
2
+ background-color: $dark-blue;
3
+ color: $white;
4
+ padding: 0.5em 2em;
5
+ transition: all .3s ease-in-out;
6
+ &:hover {
7
+ background-color: darken($dark-blue, 15%);
8
+ cursor: pointer;
9
+ transition: all .3s ease-in-out;
10
+ }
11
+ }
12
+
13
+ .button {
14
+ @include button;
15
+ font-size: 1em;
16
+ text-decoration: none;
17
+ }
18
+
19
+
20
+ .cancel-button {
21
+ @include button;
22
+ background-color: $light-red;
23
+ color: $dark-red;
24
+ text-decoration: none;
25
+
26
+ &:hover {
27
+ background-color: $dark-red;
28
+ color: $white;
29
+ }
30
+ }
@@ -18,7 +18,7 @@
18
18
  color: #333333;
19
19
  text-decoration: none;
20
20
  &:hover {
21
- text-decoration: underline;
22
21
  color: $base-link-color;
22
+ text-decoration: underline;
23
23
  }
24
24
  }
@@ -7,82 +7,82 @@
7
7
  }
8
8
 
9
9
  #actions {
10
- position: fixed;
10
+ bottom: 0;
11
11
  left: 0;
12
+ margin: 1em 0.15em;
13
+ position: fixed;
12
14
  right: 0;
13
- bottom: 0;
14
- background: #777777;
15
- background-image: linear-gradient(to bottom, #555555, #666666, #777777, #777777);
15
+ width: max-content;
16
+
16
17
  ul {
17
18
  padding: 14px 8px;
18
19
  }
20
+
19
21
  li {
20
22
  display: inline;
21
23
  margin-right: 5px;
22
24
  }
25
+
23
26
  .pagination {
24
- position: relative;
25
- overflow: hidden;
26
27
  float: right;
27
28
  margin-right: 24px;
29
+ overflow: hidden;
28
30
  padding: 0 5px 5px 0;
31
+ position: relative;
32
+
29
33
  a, span.current, span.disabled {
30
- display: block;
31
- float: left;
32
- padding: 6px 12px 6px 12px;
33
- margin-right: 1px;
34
34
  background: #dddddd;
35
- background-image: linear-gradient(to bottom, #c5c5c5, #f0f0f0 20%, #ffffff 35%, #ffffff);
36
35
  color: #999999;
36
+ display: block;
37
+ float: left;
37
38
  font-size: 80%;
39
+ margin-right: 1px;
40
+ padding: 6px 12px 6px 12px;
38
41
  text-decoration: none;
39
- border-bottom-left-radius: 5px;
40
- border-bottom-right-radius: 5px;
41
- border-top-left-radius: 0;
42
- border-top-right-radius: 0;
43
42
  }
43
+
44
44
  a {
45
- text-shadow: 1px 1px 1px #eeeeee;
46
45
  &:hover {
47
46
  background: #d8d8d8;
48
- background-image: linear-gradient(to bottom, #ffffff, #ffffff, #dddddd);
49
47
  color: #0076a3;
50
- @include button-shadow;
51
48
  }
49
+
52
50
  &:active {
53
51
  color: black;
54
- @include no-button-shadow;
55
52
  }
56
53
  }
54
+
57
55
  span.disabled {
58
- color: #666666;
59
56
  background-color: #999999;
60
- background-image: linear-gradient(to bottom, #888888, #999999, #999999, #999999);
57
+ color: #666666;
61
58
  }
59
+
62
60
  span.current {
63
- color: black;
64
61
  background: white;
65
- font-weight: bold;
66
62
  background-image: none;
67
- @include button-shadow;
63
+ color: black;
64
+ font-weight: bold;
68
65
  }
66
+
69
67
  span.gap {
68
+ color: #cccccc;
70
69
  display: block;
71
70
  float: left;
72
71
  padding: 6px;
73
- color: #cccccc;
74
72
  }
75
73
  }
74
+
76
75
  .depaginate {
77
76
  float: right;
78
77
  padding: 6px 12px;
78
+
79
79
  a {
80
- @include no-button-shadow;
81
80
  background: none;
82
- font-size: 80%;
83
81
  color: #cccccc;
84
- text-shadow: none;
82
+ font-size: 80%;
85
83
  text-decoration: none;
84
+ text-shadow: none;
85
+
86
86
  &:hover {
87
87
  color: white;
88
88
  }
@@ -95,25 +95,8 @@
95
95
  }
96
96
 
97
97
  .action_button {
98
- display: inline;
99
- background: #d8d8d8;
100
- background-image: linear-gradient(to bottom, #ffffff, #cccccc);
101
- color: #333333;
102
- font-size: 80%;
103
- padding: 8px 12px;
104
98
  text-decoration: none;
105
- text-shadow: 1px 1px 1px #eeeeee;
106
- border-radius: 5px;
107
- @include button-shadow;
108
- &:hover {
109
- color: #0076a3;
110
- text-shadow: 1px 1px 1px white;
111
- }
112
- &:active {
113
- background: white;
114
- @include no-button-shadow;
115
- color: black;
116
- }
99
+
117
100
  img {
118
101
  vertical-align: -20%;
119
102
  }
@@ -1,12 +1,13 @@
1
1
  img.avatar {
2
2
  background: white;
3
3
  border: none;
4
- padding: 4px;
5
4
  border-radius: 3px;
6
5
  box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.25);
6
+ padding: 4px;
7
+
7
8
  &.avatar_32x32 {
8
- padding: 2px;
9
9
  border-radius: 2px;
10
10
  box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
11
+ padding: 2px;
11
12
  }
12
13
  }
@@ -1,26 +1,19 @@
1
- #main {
1
+ main {
2
2
  float: left;
3
+ grid-area: content;
3
4
  width: 100%;
4
5
  }
5
6
 
6
- #content {
7
- font-size: 95%;
8
- line-height: 1.2em;
9
- padding: 20px;
10
- }
11
-
12
- .outset {
13
- margin: -20px;
14
- margin-bottom: 20px;
7
+ .reversed main {
8
+ .content {
9
+ padding: 1em;
10
+ }
15
11
  }
16
12
 
17
13
  table.fieldset {
18
- th {
19
- padding: 6px;
20
- }
21
14
  td.field textarea {
22
- width: 99.5%;
23
15
  margin-right: -5px;
16
+ width: 99.5%;
24
17
  }
25
18
  }
26
19
 
@@ -28,28 +21,16 @@ body.reversed {
28
21
  fieldset h1 {
29
22
  font-size: 1.5em;
30
23
  }
31
- #content > h1:first-of-type {
32
- font-size: 2em;
33
- }
34
- h1 {
35
- color: #94BDC3;
36
- border-bottom: 1px solid #94BDC3;
37
- background: #fff;
38
- font-size: 125%;
39
- margin: -20px -20px 20px;
40
- padding: 15px 20px;
41
- text-shadow: 0px 0px 20px rgba(255, 255, 255, 0.1);
42
- }
43
24
  }
44
25
 
45
26
  .fullcover {
46
- position: absolute;
47
- width: 100%;
48
- height: 100%;
49
- top: 0;
50
- right: 0;
51
27
  bottom: 0;
28
+ height: 100%;
52
29
  left: 0;
30
+ position: absolute;
31
+ right: 0;
32
+ top: 0;
33
+ width: 100%;
53
34
  }
54
35
 
55
36
  .clipped {
@@ -57,7 +38,6 @@ body.reversed {
57
38
  }
58
39
 
59
40
  .grey_out {
60
- background: #666666;
61
41
  background: rgba(0, 0, 0, 0.7);
62
42
  }
63
43
 
@@ -67,15 +47,12 @@ body.reversed {
67
47
 
68
48
  .preview_tools {
69
49
  color: black;
50
+ opacity: 0.7;
70
51
  position: fixed;
71
- top: 10px;
72
52
  right: 20px;
73
- opacity: 0.7;
74
- @include alt-box;
53
+ top: 10px;
54
+
75
55
  &:hover {
76
56
  opacity: 1;
77
57
  }
78
- a {
79
- @include alt-link;
80
- }
81
58
  }
@@ -1,64 +1,73 @@
1
1
  input.date {
2
2
  background: white image_url("admin/calendar_down.gif") right no-repeat;
3
- padding-right: 26px;
4
- width: 11em;
5
3
  }
6
4
 
7
5
  .calendar_popup {
8
- box-shadow: 0 5px #333;
9
- border-radius: 5px;
10
- z-index: 1000;
11
- border: 1px solid #b2b2b2;
12
6
  background-color: white;
13
- padding: 5px;
7
+ border: 1px solid #b2b2b2;
8
+ border-radius: 5px;
9
+ box-shadow: 0 5px #333;
14
10
  line-height: 140% !important;
11
+ padding: 5px;
12
+ z-index: 1000;
13
+
15
14
  a {
16
15
  border-radius: 5px;
17
16
  }
17
+
18
18
  table.calendar {
19
19
  font-size: 90%;
20
20
  margin: 0 !important;
21
+
21
22
  tr.day_header th {
22
- border-top: 1px solid #e4e4e4;
23
23
  border-bottom: 1px solid #e4e4e4;
24
+ border-top: 1px solid #e4e4e4;
24
25
  color: #cccccc;
25
26
  padding: 2px;
26
27
  }
28
+
27
29
  th, td {
28
30
  text-align: center;
29
31
  }
32
+
30
33
  th {
31
34
  &.back, &.month_year, &.forward {
32
35
  padding-bottom: 3px;
33
36
  }
34
37
  }
38
+
35
39
  td {
36
40
  height: 1em;
37
- padding: 3px !important;
38
41
  margin: 0;
42
+ padding: 3px !important;
43
+
39
44
  &.today {
40
- border-radius: 5px;
41
45
  background-color: #e5e5e5;
46
+ border-radius: 5px;
42
47
  }
48
+
43
49
  &.today a {
44
50
  background-color: white;
45
51
  }
52
+
46
53
  &.selected a {
47
- color: white;
48
54
  background-color: #dd6600;
55
+ color: white;
49
56
  }
50
57
  }
58
+
51
59
  a {
52
60
  color: black;
53
61
  display: block;
54
62
  font-family: $base-font-family;
55
- text-decoration: none;
63
+ padding: 0.2em 0;
56
64
  text-align: center;
65
+ text-decoration: none;
57
66
  width: 2.25em;
58
- padding: 0.2em 0;
67
+
59
68
  &:hover {
60
- color: white !important;
61
69
  background-color: #3257f4 !important;
70
+ color: white !important;
62
71
  }
63
72
  }
64
73
  }
@@ -0,0 +1,78 @@
1
+ .drawer {
2
+ border-top: 1px solid $gray;
3
+ margin-bottom: 1em;
4
+
5
+ .drawer_contents {
6
+ //display: none;
7
+ table.fieldset {
8
+ margin: 0;
9
+ padding: 0;
10
+ width: 100%;
11
+
12
+ tr {
13
+ &:hover td {
14
+ background: none;
15
+ border-bottom: none;
16
+ }
17
+ }
18
+
19
+ th, td {
20
+ border-top: 1px $gray solid;
21
+ padding: 0.5em 1em;
22
+ }
23
+
24
+ th {
25
+ &.label {
26
+ font-size: 85%;
27
+ text-align: left;
28
+ width: 1%;
29
+ }
30
+ }
31
+
32
+ td {
33
+ &.field {
34
+ padding-left: 0px;
35
+ padding-right: 10px;
36
+ text-align: right;
37
+ width: auto;
38
+
39
+ input.textbox {
40
+ font-size: 110%;
41
+ width: 99.5%;
42
+ }
43
+ }
44
+
45
+ &.actions {
46
+ text-align: left;
47
+ vertical-align: middle;
48
+ width: 40px;
49
+ }
50
+ }
51
+
52
+ tr:first-child {
53
+ td, th {
54
+ border-top: none;
55
+ }
56
+ }
57
+ }
58
+ }
59
+ }
60
+
61
+ .drawer_handle {
62
+ padding: 4px 0 5px;
63
+
64
+ a {
65
+ background: $dark-gray;
66
+ color: $white;
67
+ font-size: 80%;
68
+ padding: 4px 21px 5px 10px;
69
+ position: relative;
70
+ text-decoration: none;
71
+
72
+ &.more, &.less {
73
+ svg {
74
+ margin-left: 10px;
75
+ }
76
+ }
77
+ }
78
+ }