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
@@ -1,139 +1,30 @@
1
- #header {
2
- font-size: 90%;
3
- background: $header;
4
- background-image: linear-gradient(to bottom, #000000, #000000, #000000);
1
+ header {
2
+ background-color: $header;
3
+ grid-area: header;
4
+ min-height: 50px;
5
5
  position: relative;
6
- &:after {
7
- content: "\0020";
8
- display: block;
9
- clear: both;
10
- overflow: hidden;
11
- height: 2px;
12
- width: 100%;
13
- position: absolute;
14
- background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0));
15
- }
16
6
  }
17
7
 
18
8
  #site_links {
19
9
  color: mix($header, white, 15%);
20
- font-size: 80%;
21
10
  float: right;
22
- padding: 12px 10px 0 5px;
11
+ font-size: 80%;
23
12
  height: 16px;
13
+ padding: 12px 10px 0 5px;
14
+
24
15
  a {
25
16
  color: white;
26
17
  }
18
+
27
19
  a:hover, strong a {
28
20
  text-decoration: none;
29
21
  }
30
22
  }
31
23
 
32
24
  #view_site {
33
- font-size: 90%;
34
25
  background: rgba(black, 0.45);
35
- border-radius: 5px;
36
26
  display: inline;
27
+ font-size: 90%;
37
28
  padding: 3px 10px 4px;
38
29
  text-decoration: none;
39
30
  }
40
-
41
- ul#navigation {
42
- float: left;
43
- margin-top: 6px;
44
- li {
45
- float: left;
46
- height: 30px;
47
- margin: 4px 0 0 8px;
48
- white-space: nowrap;
49
- a {
50
- background: $primary-tab;
51
- color: mix($header, white, 15%);
52
- display: block;
53
- height: 30px;
54
- line-height: 30px;
55
- padding: 0 20px;
56
- position: relative;
57
- text-decoration: none;
58
- border-top-left-radius: 6px;
59
- border-top-right-radius: 6px;
60
- }
61
- &:hover a {
62
- background: opacify($primary-tab, 0.2);
63
- color: white;
64
- }
65
- &.current a {
66
- background: white;
67
- color: #333333;
68
- font-weight: bold;
69
- }
70
- }
71
- }
72
-
73
- #toolbar {
74
- background: white;
75
- background-image: linear-gradient(to bottom, #ffffff, #f2f2f2, #cccccc);
76
- font-size: 95%;
77
- clear: both;
78
- margin: 0;
79
- width: 100%;
80
- height: 38px;
81
- &:after {
82
- clear: both;
83
- content: "";
84
- display: block;
85
- }
86
- .right {
87
- float: right;
88
- }
89
- form.search {
90
- padding: 8px 8px 0;
91
- input[type=search] {
92
- font-size: 12px;
93
- border-radius: 100px;
94
- border: 1px solid #cccccc;
95
- border-top-color: #999999;
96
- border-left-color: #b0b0b0;
97
- border-right-color: #bbbbbb;
98
- background: white image_url("admin/search.png") 4px center no-repeat;
99
- box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.2);
100
- width: 180px;
101
- padding: 2px 8px 2px 20px;
102
- }
103
- }
104
- }
105
-
106
- ul#secondary_navigation {
107
- float: left;
108
- margin-right: 8px;
109
- li {
110
- float: left;
111
- display: block;
112
- border-right: 1px solid #d3d3d3;
113
- a {
114
- color: #555555;
115
- display: block;
116
- font-weight: normal;
117
- float: left;
118
- line-height: 38px;
119
- margin: 0;
120
- padding: 0 26px;
121
- height: 38px;
122
- text-decoration: none;
123
- &:hover {
124
- background-image: linear-gradient(to bottom, #e4f9ff, #d2ebfd 30%, #b1d1f1 50%, #9bc5ed 50%, #caecff);
125
- color: #444444;
126
- }
127
- &.current {
128
- background: #dddddd;
129
- background-image: linear-gradient(to bottom, #ffffff, #e6e6e6 35%, #d9d9d9 50%, #cccccc 50%, #d9d9d9);
130
- color: #333333;
131
- font-weight: bold;
132
- &:hover {
133
- background-image: linear-gradient(to bottom, #e0f9fe, #c4e2f8 30%, #98c3e7 50%, #79aedb 50%, #b1ddef);
134
- color: #222222;
135
- }
136
- }
137
- }
138
- }
139
- }
@@ -1,10 +1,19 @@
1
+ .trusty-container {
2
+ display: grid;
3
+ grid-template-areas: "header header header" "nav toolbar content";
4
+ grid-template-columns: auto auto 1fr;
5
+ grid-template-rows: auto 1fr;
6
+ height: 100vh;
7
+ }
8
+
1
9
  body.reversed {
2
- background-color: #737272;
10
+ background-color: $light-gray;
3
11
  }
4
12
 
5
13
  body.single_form {
6
- #content {
14
+ .content {
7
15
  text-align: center;
16
+
8
17
  #single_form {
9
18
  margin: 6em auto 0;
10
19
  text-align: left;
@@ -19,3 +28,18 @@ body.reversed.login_form {
19
28
  body.reversed.password_form {
20
29
  background-color: #fff;
21
30
  }
31
+
32
+ .set {
33
+ div {
34
+ display: inline-block;
35
+ }
36
+ }
37
+
38
+ .page-actions {
39
+ margin: 0.5em 0;
40
+ }
41
+
42
+ .updated_line {
43
+ margin: 0.5em 0;
44
+ @include subtle-text-reversed;
45
+ }
@@ -0,0 +1,28 @@
1
+ .login-form-content {
2
+ display: flex;
3
+ flex-flow: wrap;
4
+ justify-content: center;
5
+ margin-top: 5em;
6
+
7
+ .visual {
8
+ img {
9
+ float: right;
10
+ height: 300px;
11
+ }
12
+ }
13
+
14
+ .login {
15
+ form {
16
+ padding: 1em;
17
+
18
+ .field #user_email, .field #user_password, .field #user_password_confirmation {
19
+ max-width: 200px;
20
+ }
21
+ }
22
+
23
+ .error {
24
+ display: block;
25
+ margin: 1em;
26
+ }
27
+ }
28
+ }
@@ -1,13 +1,13 @@
1
- #notice, #error {
2
- padding: 1px 1em;
1
+ .notice, .error, .warning {
2
+ padding: 1em;
3
3
  }
4
4
 
5
- #notice {
5
+ .notice {
6
6
  background-color: #b2e5b2;
7
7
  color: #006600;
8
8
  }
9
9
 
10
- #error {
10
+ .error, .warning {
11
11
  background-color: #f3c2c2;
12
- color: #770000;
12
+ color: $alt-link-color;
13
13
  }
@@ -1,104 +1,117 @@
1
- div.popup {
2
- color: #333333;
3
- background-color: white;
1
+ .popup {
2
+ background-color: $white;
4
3
  border: 1px solid #777777;
5
- padding: 10px 20px;
4
+ color: #333333;
6
5
  display: none;
6
+ padding: 10px 20px;
7
+
7
8
  strong {
8
9
  font-weight: bold;
9
10
  }
11
+
10
12
  em {
11
13
  font-style: italic;
12
14
  }
15
+
13
16
  .busy {
14
17
  float: right;
15
18
  margin-top: 9px;
16
19
  }
20
+
17
21
  .popup_title {
18
- background: #c5dff5;
19
- background-image: linear-gradient(to bottom, #e5f5ff, #c5dff5);
20
- border-bottom: 1px solid #a7cdf0;
22
+ background: $darker-blue;
23
+ border-bottom: 1px solid $darker-blue;
24
+ color: $white;
21
25
  font-weight: bold;
22
- font-size: 100%;
23
26
  margin: -10px -20px 20px -20px;
24
- padding: 6px 10px;
27
+ padding: 0.75em;
25
28
  }
29
+
26
30
  p.intro {
27
31
  font-size: 90%;
28
32
  }
33
+
29
34
  label {
35
+ color: $dark-gray;
30
36
  display: block;
31
37
  font-size: 85%;
38
+
32
39
  &.inline {
33
40
  display: inline;
34
41
  }
42
+
35
43
  span.hint {
36
- font-size: 90%;
37
44
  color: #666666;
45
+ font-size: 90%;
38
46
  }
39
47
  }
48
+
40
49
  input.button {
41
50
  font-size: 120%;
42
51
  }
52
+
43
53
  .viewport {
44
- background: white;
45
- border: 1px solid #dddddd;
46
- border-top: 1px solid #cccccc;
47
- border-left: 1px solid #cccccc;
48
- box-shadow: 1px 1px 0 white;
54
+ background: $white;
55
+ border: 1px solid $light-gray;
49
56
  margin: 1em 0;
50
57
  overflow: auto;
58
+
51
59
  table.index {
52
60
  margin: -1px 0 0;
53
61
  }
54
62
  }
63
+
55
64
  .buttons {
56
- border-top: 1px solid #e5e5e5;
57
65
  text-align: right;
66
+
58
67
  input.button {
59
68
  font-size: 120%;
60
69
  }
70
+
61
71
  button {
62
72
  &.default {
63
73
  border: 1px solid #154ca6;
64
- box-shadow: inset 0 2px 1px #c7e0f6;
65
74
  color: white;
66
- background-image: linear-gradient(to bottom, #67b4e1, #78b9e1);
67
75
  }
76
+
68
77
  &:active {
69
78
  border: 1px solid #888888;
70
- box-shadow: none;
71
- background-image: linear-gradient(to bottom, #cccccc 0%, #dddddd 15%, #eeeeee 100%);
72
79
  }
80
+
73
81
  &.default:active {
74
82
  border: 1px solid #002c86;
75
- background-image: linear-gradient(to bottom, #4794c1, #78b9e1);
76
83
  }
84
+
77
85
  &:focus {
78
86
  border-width: 2px;
79
87
  }
80
88
  }
89
+
81
90
  a.cancel {
82
91
  color: $alt-link-color;
83
92
  }
84
93
  }
94
+
85
95
  .tag_description, .snippet_description {
86
96
  border-bottom: 1px dotted silver;
87
97
  font-size: 95%;
88
98
  padding: 6px 0;
99
+
89
100
  h4 {
90
101
  color: green;
91
102
  font-size: 120%;
92
- margin-top: 0;
93
103
  margin-bottom: 8px;
104
+ margin-top: 0;
94
105
  }
106
+
95
107
  code {
96
108
  background-color: whitesmoke;
97
109
  color: #666666;
98
110
  font-family: Monaco, "Courier New", Courier, monospace;
99
- padding-top: 1px;
100
111
  padding-bottom: 1px;
112
+ padding-top: 1px;
101
113
  }
114
+
102
115
  pre {
103
116
  background-color: whitesmoke;
104
117
  border: 1px solid #dddddd;
@@ -108,24 +121,27 @@ div.popup {
108
121
  padding: 10px;
109
122
  }
110
123
  }
124
+
111
125
  .reference {
112
- font-size: 90%;
113
126
  border: 1px solid silver;
127
+ font-size: 90%;
128
+ height: 300px;
129
+ line-height: 140%;
114
130
  overflow: auto;
115
- overflow-y: auto;
116
131
  overflow-x: hidden;
117
- line-height: 140%;
132
+ overflow-y: auto;
118
133
  padding: 12px;
119
134
  padding-top: 1px;
120
- height: 300px;
121
135
  width: 40em;
136
+
122
137
  code {
123
138
  background-color: whitesmoke;
124
139
  color: #666666;
125
140
  font-family: Monaco, "Courier New", Courier, monospace;
126
- padding-top: 1px;
127
141
  padding-bottom: 1px;
142
+ padding-top: 1px;
128
143
  }
144
+
129
145
  pre {
130
146
  background-color: whitesmoke;
131
147
  border: 1px solid #dddddd;
@@ -134,8 +150,10 @@ div.popup {
134
150
  overflow: auto;
135
151
  padding: 10px;
136
152
  }
153
+
137
154
  table {
138
155
  width: 100%;
156
+
139
157
  th {
140
158
  color: green;
141
159
  font-size: 120%;
@@ -143,30 +161,34 @@ div.popup {
143
161
  padding-left: 0;
144
162
  padding-right: 0;
145
163
  }
164
+
146
165
  td {
147
166
  border-bottom: 1px dotted silver;
148
- padding-top: 8px;
149
167
  padding-bottom: 8px;
168
+ padding-top: 8px;
150
169
  text-align: left;
151
170
  }
171
+
152
172
  h1 {
153
173
  color: black;
154
174
  margin: 0;
155
175
  margin-bottom: 0.5em;
156
176
  }
177
+
157
178
  acronym {
158
179
  border-bottom: 1px dotted silver;
159
180
  }
181
+
160
182
  blockquote {
161
183
  border-left: 4px solid silver;
184
+ margin-bottom: 1em;
185
+ margin-top: 1em;
162
186
  padding-left: 1em;
163
187
  padding-right: 1em;
164
- margin: 0;
165
- margin-top: 1em;
166
- margin-bottom: 1em;
167
188
  }
168
189
  }
169
190
  }
191
+
170
192
  .close_link {
171
193
  font-size: 85%;
172
194
  text-align: center;
@@ -177,12 +199,13 @@ div.popup {
177
199
  color: green;
178
200
  cursor: pointer;
179
201
  font-size: 120%;
180
- margin-top: 0;
181
202
  margin-bottom: 8px;
203
+ margin-top: 0;
182
204
  }
183
205
 
184
206
  .tag_options {
185
207
  margin-left: 1em;
208
+
186
209
  li {
187
210
  margin-bottom: 8px;
188
211
  }
@@ -190,14 +213,18 @@ div.popup {
190
213
 
191
214
  .tag_option_value_list {
192
215
  margin-left: 1em;
216
+
193
217
  li {
194
218
  display: inline;
219
+
195
220
  &:last-child {
196
221
  border: none;
197
222
  }
223
+
198
224
  code {
199
225
  padding-left: 0.3em;
200
226
  padding-right: 0.3em;
227
+
201
228
  &:hover {
202
229
  background: #666666;
203
230
  color: white;
@@ -209,10 +236,11 @@ div.popup {
209
236
  div.popup .reference table {
210
237
  th {
211
238
  border-bottom: 1px dotted silver;
212
- padding-top: 8px;
213
239
  padding-bottom: 8px;
240
+ padding-top: 8px;
214
241
  text-align: left;
215
242
  }
243
+
216
244
  h2, h3, h4 {
217
245
  color: black;
218
246
  margin: 0;
@@ -220,23 +248,6 @@ div.popup .reference table {
220
248
  }
221
249
  }
222
250
 
223
- div.popup.textured {
224
- background: #eeeeee;
225
- .head {
226
- background: white;
227
- padding: 10px 20px;
228
- margin: -20px -20px 20px;
229
- border-bottom: 1px solid #cccccc;
230
- box-shadow: 0 1px 0 white;
231
- }
232
- .buttons {
233
- border-top: 1px solid white;
234
- margin: 20px -20px -10px;
235
- padding: 20px;
236
- box-shadow: 0 -1px 0 #ccc;
237
- }
238
- }
239
-
240
251
  div#popup_window {
241
252
  display: none;
242
253
  position: absolute;