alchemy_cms 2.2.4 → 2.3.rc5
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +1 -1
- data/.travis.yml +3 -4
- data/Gemfile +1 -0
- data/README.md +10 -6
- data/alchemy_cms.gemspec +5 -2
- data/app/assets/images/alchemy/icons.png +0 -0
- data/app/assets/images/sassy-ie-overlay.png +0 -0
- data/app/assets/javascripts/alchemy/alchemy.base.js +50 -59
- data/app/assets/javascripts/alchemy/alchemy.buttons.js +14 -4
- data/app/assets/javascripts/alchemy/alchemy.datepicker.js +8 -2
- data/app/assets/javascripts/alchemy/alchemy.elements_window.js +11 -3
- data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee +14 -1
- data/app/assets/javascripts/alchemy/alchemy.preview.js +1 -1
- data/app/assets/javascripts/alchemy/alchemy.preview_window.js +12 -4
- data/app/assets/javascripts/alchemy/alchemy.uploader.js +4 -1
- data/app/assets/javascripts/alchemy/alchemy.windows.js +18 -8
- data/app/assets/stylesheets/alchemy/_defaults.scss +84 -120
- data/app/assets/stylesheets/alchemy/alchemy.css +2 -2
- data/app/assets/stylesheets/alchemy/archive.css.scss +288 -0
- data/app/assets/stylesheets/alchemy/base.css.scss +95 -390
- data/app/assets/stylesheets/alchemy/dashboard.css.scss +4 -4
- data/app/assets/stylesheets/alchemy/elements.css.scss +83 -118
- data/app/assets/stylesheets/alchemy/flash.css.scss +1 -1
- data/app/assets/stylesheets/alchemy/form_elements.css.scss +528 -0
- data/app/assets/stylesheets/alchemy/frame.css.scss +13 -39
- data/app/assets/stylesheets/alchemy/icons.css.scss +217 -228
- data/app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss +48 -50
- data/app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss +1 -1
- data/app/assets/stylesheets/alchemy/login.css.scss +1 -5
- data/app/assets/stylesheets/alchemy/menubar.css.scss +19 -29
- data/app/assets/stylesheets/alchemy/pagination.css.scss +3 -4
- data/app/assets/stylesheets/alchemy/sitemap.css.scss +81 -81
- data/app/assets/stylesheets/alchemy/tables.css.scss +63 -57
- data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss +57 -57
- data/app/assets/stylesheets/alchemy/upload.css.scss +6 -6
- data/app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss +6 -10
- data/app/controllers/alchemy/admin/attachments_controller.rb +5 -4
- data/app/controllers/alchemy/admin/base_controller.rb +1 -9
- data/app/controllers/alchemy/admin/contents_controller.rb +4 -6
- data/app/controllers/alchemy/admin/elements_controller.rb +2 -2
- data/app/controllers/alchemy/admin/pages_controller.rb +2 -2
- data/app/controllers/alchemy/admin/pictures_controller.rb +74 -15
- data/app/controllers/alchemy/attachments_controller.rb +8 -2
- data/app/controllers/alchemy/base_controller.rb +47 -5
- data/app/controllers/alchemy/elements_controller.rb +1 -1
- data/app/controllers/alchemy/messages_controller.rb +12 -12
- data/app/controllers/alchemy/pages_controller.rb +5 -1
- data/app/controllers/alchemy/pictures_controller.rb +9 -4
- data/app/controllers/alchemy/user_sessions_controller.rb +2 -4
- data/app/helpers/alchemy/admin/base_helper.rb +98 -19
- data/app/helpers/alchemy/admin/contents_helper.rb +2 -2
- data/app/helpers/alchemy/admin/elements_helper.rb +2 -3
- data/app/helpers/alchemy/base_helper.rb +6 -5
- data/app/helpers/alchemy/elements_helper.rb +2 -2
- data/app/helpers/alchemy/essences_helper.rb +4 -5
- data/app/helpers/alchemy/pages_helper.rb +15 -79
- data/app/helpers/alchemy/url_helper.rb +67 -0
- data/app/mailers/alchemy/messages.rb +1 -1
- data/app/mailers/alchemy/notifications.rb +1 -1
- data/app/models/alchemy/attachment.rb +11 -2
- data/app/models/alchemy/cell.rb +20 -10
- data/app/models/alchemy/content.rb +4 -3
- data/app/models/alchemy/element.rb +170 -178
- data/app/models/alchemy/language/code.rb +4 -1
- data/app/models/alchemy/message.rb +19 -3
- data/app/models/alchemy/page.rb +45 -40
- data/app/models/alchemy/picture.rb +24 -2
- data/app/models/alchemy/user.rb +2 -3
- data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +12 -12
- data/app/views/alchemy/admin/attachments/_attachment.html.erb +1 -1
- data/app/views/alchemy/admin/attachments/create.js.erb +1 -0
- data/app/views/alchemy/admin/attachments/edit.html.erb +9 -3
- data/app/views/alchemy/admin/attachments/index.html.erb +3 -2
- data/app/views/alchemy/admin/contents/_missing.html.erb +1 -1
- data/app/views/alchemy/admin/contents/create.js.erb +54 -0
- data/app/views/alchemy/admin/contents/new.html.erb +9 -4
- data/app/views/alchemy/admin/elements/{_add_content.html.erb → _add_picture.html.erb} +4 -4
- data/app/views/alchemy/admin/elements/_elements_select.html.erb +2 -1
- data/app/views/alchemy/admin/elements/_new_element_form.html.erb +1 -1
- data/app/views/alchemy/admin/elements/{_picture_editor.html.erb → _picture_gallery_editor.html.erb} +7 -11
- data/app/views/alchemy/admin/elements/fold.js.erb +46 -0
- data/app/views/alchemy/admin/elements/index.html.erb +24 -24
- data/app/views/alchemy/admin/elements/list.js.erb +11 -9
- data/app/views/alchemy/admin/essence_files/assign.js.erb +3 -1
- data/app/views/alchemy/admin/essence_pictures/destroy.js.erb +28 -0
- data/app/views/alchemy/admin/pages/_contactform_links.html.erb +8 -6
- data/app/views/alchemy/admin/pages/_external_link.html.erb +11 -9
- data/app/views/alchemy/admin/pages/_file_link.html.erb +10 -8
- data/app/views/alchemy/admin/pages/_internal_link.html.erb +14 -10
- data/app/views/alchemy/admin/pages/_new_page_form.html.erb +1 -1
- data/app/views/alchemy/admin/pages/_page.html.erb +1 -1
- data/app/views/alchemy/admin/pages/_page_for_links.html.erb +32 -21
- data/app/views/alchemy/admin/pages/configure.html.erb +2 -2
- data/app/views/alchemy/admin/pages/configure_external.html.erb +13 -13
- data/app/views/alchemy/admin/pages/edit.html.erb +2 -2
- data/app/views/alchemy/admin/pages/index.html.erb +26 -24
- data/app/views/alchemy/admin/pages/link.html.erb +2 -5
- data/app/views/alchemy/admin/partials/_upload_form.html.erb +28 -12
- data/app/views/alchemy/admin/pictures/_archive.html.erb +54 -0
- data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +10 -7
- data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +21 -22
- data/app/views/alchemy/admin/pictures/_filter_bar.html.erb +31 -0
- data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +9 -0
- data/app/views/alchemy/admin/pictures/_picture.html.erb +36 -6
- data/app/views/alchemy/admin/pictures/_tag_list.html.erb +27 -0
- data/app/views/alchemy/admin/pictures/archive_overlay.js.erb +3 -1
- data/app/views/alchemy/admin/pictures/create.js.erb +4 -5
- data/app/views/alchemy/admin/pictures/edit.html.erb +26 -0
- data/app/views/alchemy/admin/pictures/edit_multiple.html.erb +39 -0
- data/app/views/alchemy/admin/pictures/index.html.erb +81 -70
- data/app/views/alchemy/admin/pictures/index.js.erb +3 -0
- data/app/views/alchemy/admin/pictures/new.html.erb +1 -0
- data/app/views/alchemy/admin/resources/index.html.erb +3 -1
- data/app/views/alchemy/admin/users/_table.html.erb +1 -1
- data/app/views/alchemy/admin/users/index.html.erb +27 -23
- data/app/views/alchemy/elements/_article_editor.html.erb +7 -2
- data/app/views/alchemy/elements/_bild_editor.html.erb +1 -1
- data/app/views/alchemy/elements/_bild_text_editor.html.erb +6 -1
- data/app/views/alchemy/elements/_bild_text_view.html.erb +3 -3
- data/app/views/alchemy/elements/_image_mosaic_editor.html.erb +1 -1
- data/app/views/alchemy/elements/_image_mosaic_view.html.erb +2 -2
- data/app/views/alchemy/elements/_intro_image_text_view.html.erb +4 -4
- data/app/views/alchemy/elements/_searchresult_editor.html.erb +4 -1
- data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_picture_editor.html.erb +2 -3
- data/app/views/alchemy/essences/_essence_picture_tools.html.erb +1 -1
- data/app/views/alchemy/search/_form.html.erb +8 -0
- data/app/views/alchemy/search/_result.html.erb +3 -2
- data/app/views/alchemy/search/_results.html.erb +28 -0
- data/app/views/alchemy/user_sessions/leave.html.erb +4 -4
- data/app/views/alchemy/user_sessions/login.html.erb +1 -2
- data/app/views/layouts/alchemy/admin.html.erb +30 -10
- data/app/views/layouts/alchemy/login.html.erb +2 -39
- data/config/alchemy/elements.yml +1 -2
- data/config/alchemy/page_layouts.yml +8 -5
- data/config/authorization_rules.rb +27 -18
- data/config/initializers/localeapp.rb +9 -0
- data/config/locales/alchemy.de.yml +93 -56
- data/config/locales/alchemy.en.yml +73 -50
- data/config/routes.rb +3 -1
- data/db/migrate/20120704181529_add_upload_hash_to_alchemy_picture.rb +5 -0
- data/db/migrate/20120705214247_acts_as_taggable_on_migration.rb +28 -0
- data/db/migrate/20120728185830_add_cached_tag_list_to_alchemy_pictures.rb +5 -0
- data/db/migrate/20120831135441_set_alchemy_languages_country_code_default_to_empty_string.rb +9 -0
- data/lib/alchemy/capistrano.rb +2 -2
- data/lib/alchemy/essence.rb +14 -0
- data/lib/alchemy/page_layout.rb +0 -6
- data/lib/alchemy/resource.rb +9 -15
- data/lib/alchemy/upgrader.rb +18 -3
- data/lib/alchemy/version.rb +5 -1
- data/lib/alchemy_cms.rb +4 -1
- data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb +16 -6
- data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt +17 -3
- data/lib/rails/generators/alchemy/elements/elements_generator.rb +6 -1
- data/lib/rails/generators/alchemy/elements/templates/editor.html.erb +10 -1
- data/lib/rails/generators/alchemy/elements/templates/view.html.erb +17 -18
- data/lib/rails/generators/alchemy/scaffold/files/pages.html.erb +4 -2
- data/lib/tasks/fleximage.rake +2 -2
- data/spec/controllers/admin/contents_controller_spec.rb +2 -2
- data/spec/controllers/admin/elements_controller_spec.rb +30 -1
- data/spec/controllers/admin/pages_controller_spec.rb +35 -18
- data/spec/controllers/admin/trash_controller_spec.rb +40 -16
- data/spec/controllers/attachments_controller_spec.rb +62 -0
- data/spec/controllers/base_controller_spec.rb +43 -42
- data/spec/controllers/elements_controller_spec.rb +30 -0
- data/spec/controllers/pages_controller_spec.rb +22 -5
- data/spec/controllers/pictures_controller_spec.rb +82 -0
- data/spec/dummy/app/models/event.rb +2 -1
- data/spec/dummy/config/database.yml +3 -2
- data/spec/dummy/db/schema.rb +51 -27
- data/spec/factories.rb +29 -8
- data/spec/helpers/admin/base_helper_spec.rb +134 -21
- data/spec/helpers/admin/contents_helper_spec.rb +2 -2
- data/spec/helpers/admin/elements_helper_spec.rb +17 -9
- data/spec/helpers/admin/essences_helper_spec.rb +7 -6
- data/spec/helpers/essences_helper_spec.rb +8 -7
- data/spec/helpers/pages_helper_spec.rb +208 -325
- data/spec/helpers/url_helper_spec.rb +171 -0
- data/spec/integration/admin/link_overlay_spec.rb +53 -0
- data/spec/integration/admin/modules_integration_spec.rb +22 -26
- data/spec/integration/admin/pages_controller_spec.rb +10 -19
- data/spec/integration/admin/picture_library_integration_spec.rb +52 -0
- data/spec/integration/admin/resources_integration_spec.rb +68 -75
- data/spec/integration/pages_controller_spec.rb +70 -61
- data/spec/integration/security_spec.rb +3 -5
- data/spec/integration/translation_integration_spec.rb +56 -0
- data/spec/libraries/essence_spec.rb +18 -0
- data/spec/libraries/resource_spec.rb +101 -79
- data/spec/libraries/resources_helper_spec.rb +3 -0
- data/spec/models/content_spec.rb +63 -60
- data/spec/models/element_spec.rb +203 -93
- data/spec/models/language_spec.rb +90 -65
- data/spec/models/page_layout_spec.rb +37 -0
- data/spec/models/page_spec.rb +181 -113
- data/spec/models/picture_spec.rb +73 -26
- data/spec/models/resource_spec.rb +52 -23
- data/spec/support/alchemy/specs_helpers.rb +2 -0
- data/spec/support/image.png +0 -0
- data/spec/{helpers/url_helpers_spec.rb → url_helpers_spec.rb} +0 -0
- data/vendor/assets/javascripts/jquery_plugins/jquery.selectBoxIt.js +1909 -0
- data/vendor/assets/javascripts/jquery_plugins/preloadCssImages.jQuery_v5.js +152 -0
- metadata +106 -33
- data/app/assets/stylesheets/alchemy/buttons.css.scss +0 -361
- data/app/assets/stylesheets/alchemy/jquery.sb.css.scss +0 -260
- data/app/views/alchemy/admin/contents/create.js.coffee +0 -49
- data/app/views/alchemy/admin/elements/fold.js.coffee +0 -37
- data/app/views/alchemy/admin/essence_pictures/destroy.js.coffee +0 -19
- data/app/views/alchemy/admin/pictures/_pictures_list.html.erb +0 -16
- data/app/views/alchemy/admin/pictures/update.js.erb +0 -3
- data/spec/dummy/config/locales/en.yml +0 -5
- data/spec/dummy/config/locales/fo.yml +0 -5
- data/spec/page_layout_spec.rb +0 -35
- data/vendor/assets/javascripts/jquery_plugins/jquery.in-place-edit.js +0 -172
- data/vendor/assets/javascripts/jquery_plugins/jquery.sb.min.js +0 -14
@@ -1,31 +1,60 @@
|
|
1
1
|
@import "alchemy/defaults";
|
2
2
|
|
3
|
+
html {
|
4
|
+
height: 100%;
|
5
|
+
}
|
6
|
+
|
7
|
+
noscript {
|
8
|
+
position: fixed;
|
9
|
+
top: 0;
|
10
|
+
left: 0;
|
11
|
+
z-index: 1000;
|
12
|
+
width: 100%;
|
13
|
+
text-align: center;
|
14
|
+
line-height: 1em;
|
15
|
+
border-bottom: 1px solid #c4c19c;
|
16
|
+
color: #726d23;
|
17
|
+
background-color: #f3f0c1;
|
18
|
+
h1, p {
|
19
|
+
margin: 16px 0;
|
20
|
+
}
|
21
|
+
}
|
22
|
+
|
23
|
+
body {
|
24
|
+
margin: 0;
|
25
|
+
padding: 0;
|
26
|
+
color: $text-color;
|
27
|
+
font: $default-font-style;
|
28
|
+
background-color: $light-gray;
|
29
|
+
height: 100%;
|
30
|
+
cursor: default;
|
31
|
+
}
|
32
|
+
|
3
33
|
h1 {
|
4
34
|
margin: 0 0 10px;
|
5
35
|
padding: 0;
|
6
36
|
font-weight: bold;
|
7
|
-
font-size:
|
37
|
+
font-size: $default-font-size;
|
8
38
|
}
|
9
39
|
|
10
40
|
h2 {
|
11
|
-
margin:
|
41
|
+
margin: $default-margin 0;
|
12
42
|
padding-bottom: 5px;
|
13
43
|
clear: both;
|
14
44
|
font-weight: bold;
|
15
|
-
font-size:
|
45
|
+
font-size: $default-font-size;
|
16
46
|
}
|
17
47
|
|
18
48
|
h3 {
|
19
|
-
margin:
|
49
|
+
margin: $default-margin 0;
|
20
50
|
padding-bottom: 5px;
|
21
|
-
font-size:
|
51
|
+
font-size: $default-font-size;
|
22
52
|
font-weight: bold;
|
23
53
|
}
|
24
54
|
|
25
55
|
p {
|
26
|
-
margin: 0 0
|
27
|
-
|
28
|
-
font-size: 12px;
|
56
|
+
margin: 0 0 2*$default-margin 0;
|
57
|
+
white-space: normal;
|
29
58
|
}
|
30
59
|
|
31
60
|
a {
|
@@ -36,6 +65,11 @@ a {
|
|
36
65
|
text-decoration: underline;
|
37
66
|
}
|
38
67
|
|
68
|
+
&:focus {
|
69
|
+
@include default-focus-style(rgba(white, 0.5), none);
|
70
|
+
color: black;
|
71
|
+
}
|
72
|
+
|
39
73
|
img {
|
40
74
|
border: none;
|
41
75
|
}
|
@@ -87,10 +121,10 @@ a.drop_down_select img {
|
|
87
121
|
#alchemy a.search_field_clear {
|
88
122
|
width: 16px;
|
89
123
|
height: 16px;
|
90
|
-
background:
|
124
|
+
background: url('ui-icons_666666_256x240.png') no-repeat -80px -128px;
|
91
125
|
position: absolute;
|
92
126
|
right: 8px;
|
93
|
-
top:
|
127
|
+
top: 7px;
|
94
128
|
@include rounded-corner;
|
95
129
|
}
|
96
130
|
|
@@ -98,37 +132,6 @@ a.drop_down_select img {
|
|
98
132
|
margin-bottom: 4px;
|
99
133
|
}
|
100
134
|
|
101
|
-
.js_filter_field_box {
|
102
|
-
position: relative;
|
103
|
-
float: right;
|
104
|
-
margin-left: 4px;
|
105
|
-
}
|
106
|
-
|
107
|
-
.js_filter_field_box .js_filter_field {
|
108
|
-
width: 170px;
|
109
|
-
text-align: left;
|
110
|
-
@include rounded-search-field;
|
111
|
-
padding: 3px 24px 2px;
|
112
|
-
height: 19px;
|
113
|
-
}
|
114
|
-
|
115
|
-
.js_filter_field_box label {
|
116
|
-
text-shadow: #fefefe 1px 1px 0;
|
117
|
-
font-size: 10px;
|
118
|
-
display: inline-block;
|
119
|
-
text-align: center;
|
120
|
-
}
|
121
|
-
|
122
|
-
.js_filter_field_box .js_filter_field_clear {
|
123
|
-
width: 15px;
|
124
|
-
height: 15px;
|
125
|
-
background: image-url('alchemy/icons.png') no-repeat 0 -70px;
|
126
|
-
position: absolute;
|
127
|
-
right: 8px;
|
128
|
-
top: 4px;
|
129
|
-
@include rounded-corner;
|
130
|
-
}
|
131
|
-
|
132
135
|
div.source_editor textarea {
|
133
136
|
width: 100%;
|
134
137
|
height: 358px;
|
@@ -185,26 +188,6 @@ div#page {
|
|
185
188
|
background-position: right;
|
186
189
|
}
|
187
190
|
|
188
|
-
.picture_tool_delete {
|
189
|
-
width: 16px;
|
190
|
-
height: 16px;
|
191
|
-
position: absolute;
|
192
|
-
background-color: white;
|
193
|
-
top: 3px;
|
194
|
-
right: 4px;
|
195
|
-
padding: 1px;
|
196
|
-
z-index: 1;
|
197
|
-
display: none;
|
198
|
-
}
|
199
|
-
|
200
|
-
.picture_tool_delete a {
|
201
|
-
display: block;
|
202
|
-
width: 16px;
|
203
|
-
height: 16px;
|
204
|
-
background: image-url('alchemy/icons.png') no-repeat -63px -72px;
|
205
|
-
cursor: pointer;
|
206
|
-
}
|
207
|
-
|
208
191
|
div.tip {
|
209
192
|
background-color: #eff8d0;
|
210
193
|
border: 1px solid #cce21c;
|
@@ -272,9 +255,9 @@ div#user_list_legend {
|
|
272
255
|
|
273
256
|
#toolbar {
|
274
257
|
z-index: 10;
|
275
|
-
padding:
|
276
|
-
height:
|
277
|
-
background: $medium-gray
|
258
|
+
padding: 4px;
|
259
|
+
height: 44px;
|
260
|
+
background: $medium-gray url('shading.png') repeat-x 0 -40px;
|
278
261
|
margin-right: 0px;
|
279
262
|
border: $default-border;
|
280
263
|
border-top-style: none;
|
@@ -293,7 +276,7 @@ div#user_list_legend {
|
|
293
276
|
#toolbar div.button_with_label form {
|
294
277
|
float: none;
|
295
278
|
margin: 0;
|
296
|
-
|
279
|
+
@include inline-block;
|
297
280
|
line-height: 5px;
|
298
281
|
}
|
299
282
|
|
@@ -447,19 +430,10 @@ table td.tools .icon, table td.icon .icon {
|
|
447
430
|
@include disable-user-select;
|
448
431
|
margin-top: 0;
|
449
432
|
background-repeat: no-repeat;
|
450
|
-
|
451
|
-
display: inline-block;
|
433
|
+
@include inline-block;
|
452
434
|
margin-right: 4px;
|
453
435
|
}
|
454
436
|
|
455
|
-
input#search_input_field {
|
456
|
-
width: 170px;
|
457
|
-
text-align: left;
|
458
|
-
@include rounded-search-field;
|
459
|
-
padding: 3px 24px 2px;
|
460
|
-
height: 18px;
|
461
|
-
}
|
462
|
-
|
463
437
|
.list li.table_row div.table_right span {
|
464
438
|
float: left;
|
465
439
|
text-align: left;
|
@@ -480,49 +454,11 @@ input#search_input_field {
|
|
480
454
|
|
481
455
|
#archive_all {
|
482
456
|
padding: 4*$default-padding;
|
483
|
-
}
|
484
|
-
|
485
|
-
#archive_all .padding_left_right {
|
486
|
-
padding-right: 8px;
|
487
|
-
padding-left: 8px;
|
488
|
-
}
|
489
457
|
|
490
|
-
.
|
491
|
-
|
492
|
-
|
493
|
-
|
494
|
-
top: -8px;
|
495
|
-
width: 204px;
|
496
|
-
z-index: 10;
|
497
|
-
height: 60px;
|
498
|
-
border: $default-border;
|
499
|
-
@include rounded-corner;
|
500
|
-
}
|
501
|
-
|
502
|
-
.inplace-edit input.save-button {
|
503
|
-
float: right;
|
504
|
-
}
|
505
|
-
|
506
|
-
.inplace-edit div.buttons input.cancel-button {
|
507
|
-
float: left;
|
508
|
-
}
|
509
|
-
|
510
|
-
.inplace-edit div.buttons {
|
511
|
-
margin-top: 4px;
|
512
|
-
position: absolute;
|
513
|
-
bottom: 4px;
|
514
|
-
width: 196px;
|
515
|
-
padding-right: 4px;
|
516
|
-
padding-left: 4px;
|
517
|
-
}
|
518
|
-
|
519
|
-
.inplace-edit input.thin_border {
|
520
|
-
width: 186px;
|
521
|
-
font-family: "Courier New", Courier, mono;
|
522
|
-
position: absolute;
|
523
|
-
left: 4px;
|
524
|
-
top: 4px;
|
525
|
-
height: 18px;
|
458
|
+
.padding_left_right {
|
459
|
+
padding-right: 8px;
|
460
|
+
padding-left: 8px;
|
461
|
+
}
|
526
462
|
}
|
527
463
|
|
528
464
|
div.spinner {
|
@@ -611,42 +547,6 @@ div.all_rights {
|
|
611
547
|
margin-top: 10px;
|
612
548
|
}
|
613
549
|
|
614
|
-
textarea.thin_border {
|
615
|
-
border-style: inset;
|
616
|
-
font: $default-font-style;
|
617
|
-
padding: $default-padding;
|
618
|
-
border-width: 1px;
|
619
|
-
@include rounded-corner;
|
620
|
-
height: auto;
|
621
|
-
}
|
622
|
-
|
623
|
-
.thin_border, .input_field {
|
624
|
-
margin: 0;
|
625
|
-
@include rounded-corner;
|
626
|
-
background: #fff;
|
627
|
-
border: 1px inset #e5e5e5;
|
628
|
-
width: 210px;
|
629
|
-
font-size: 12px;
|
630
|
-
line-height: 19px;
|
631
|
-
height: 25px;
|
632
|
-
padding: 1px $default-padding;
|
633
|
-
}
|
634
|
-
|
635
|
-
.thin_border.dirty {
|
636
|
-
background-color: #fff8df;
|
637
|
-
}
|
638
|
-
|
639
|
-
select.select_box {
|
640
|
-
border: 1px solid #9a9a9a;
|
641
|
-
color: $text-color;
|
642
|
-
padding: 1px;
|
643
|
-
margin: 0;
|
644
|
-
font-size: 12px;
|
645
|
-
@include rounded-corner;
|
646
|
-
background: #f4f4f4;
|
647
|
-
height: 21px;
|
648
|
-
}
|
649
|
-
|
650
550
|
#tooltip {
|
651
551
|
border: 1px solid #0b5c84;
|
652
552
|
color: #333333;
|
@@ -794,7 +694,7 @@ p.foot_note {
|
|
794
694
|
|
795
695
|
div#jscropper {
|
796
696
|
padding: 2*$default-padding;
|
797
|
-
|
697
|
+
@include inline-block;
|
798
698
|
}
|
799
699
|
|
800
700
|
div#crop_explain.tip {
|
@@ -827,193 +727,6 @@ textarea#essence_picture_caption {
|
|
827
727
|
@include rounded-corner;
|
828
728
|
}
|
829
729
|
|
830
|
-
div#image_assign_filter_and_image_sizing {
|
831
|
-
width: 100%;
|
832
|
-
height: 40px;
|
833
|
-
}
|
834
|
-
|
835
|
-
#assign_image_list {
|
836
|
-
padding: 2*$default-padding;
|
837
|
-
overflow: hidden;
|
838
|
-
text-align: center;
|
839
|
-
}
|
840
|
-
|
841
|
-
/* @group Picture Thumbnails */
|
842
|
-
|
843
|
-
.picture_thumbnail {
|
844
|
-
padding: $default-padding;
|
845
|
-
margin: 2px 1px 2px 2px;
|
846
|
-
background-color: #fff;
|
847
|
-
float: none;
|
848
|
-
display: inline;
|
849
|
-
display: inline-block;
|
850
|
-
border: 1px solid #c0c0c0;
|
851
|
-
position: relative;
|
852
|
-
@include rounded-corner;
|
853
|
-
}
|
854
|
-
|
855
|
-
#pictures {
|
856
|
-
padding: 2*$default-padding;
|
857
|
-
border: $default-border;
|
858
|
-
@include rounded-corner;
|
859
|
-
margin: -2*$default-padding;
|
860
|
-
background-color: $medium-gray;
|
861
|
-
}
|
862
|
-
|
863
|
-
#pictures, #picture_archive .pagination {
|
864
|
-
text-align: center;
|
865
|
-
}
|
866
|
-
|
867
|
-
#pictures .picture_thumbnail {
|
868
|
-
margin: 0 16px 16px 0;
|
869
|
-
display: inline-block;
|
870
|
-
float: none;
|
871
|
-
}
|
872
|
-
|
873
|
-
#pictures .picture_thumbnail:hover .picture_tool_delete {
|
874
|
-
display: block;
|
875
|
-
}
|
876
|
-
|
877
|
-
.picture_thumbnail .thumbnail_background {
|
878
|
-
display: table-cell;
|
879
|
-
width: 160px;
|
880
|
-
height: 120px;
|
881
|
-
background-color: $dark-gray;
|
882
|
-
text-align: center;
|
883
|
-
vertical-align: middle;
|
884
|
-
padding: 0;
|
885
|
-
line-height: 0;
|
886
|
-
}
|
887
|
-
|
888
|
-
.picture_thumbnail.small .thumbnail_background {
|
889
|
-
width: 80px;
|
890
|
-
height: 60px;
|
891
|
-
}
|
892
|
-
|
893
|
-
.picture_thumbnail.medium .thumbnail_background {
|
894
|
-
width: 160px;
|
895
|
-
height: 120px;
|
896
|
-
}
|
897
|
-
|
898
|
-
.picture_thumbnail.large .thumbnail_background {
|
899
|
-
width: 240px;
|
900
|
-
height: 180px;
|
901
|
-
}
|
902
|
-
|
903
|
-
#pictures .picture_thumbnail .thumbnail_background {
|
904
|
-
cursor: -webkit-zoom-in;
|
905
|
-
cursor: -moz-zoom-in;
|
906
|
-
cursor: -ms-zoom-in;
|
907
|
-
cursor: -o-zoom-in;
|
908
|
-
cursor: image-url('alchemy/lupe.cur'), zoom-in, pointer;
|
909
|
-
}
|
910
|
-
|
911
|
-
div.picture_thumbnail.small {
|
912
|
-
width: 80px;
|
913
|
-
height: 75px;
|
914
|
-
}
|
915
|
-
|
916
|
-
div.picture_thumbnail.medium {
|
917
|
-
width: 160px;
|
918
|
-
height: 140px;
|
919
|
-
}
|
920
|
-
|
921
|
-
div.picture_thumbnail.large {
|
922
|
-
width: 240px;
|
923
|
-
height: 195px;
|
924
|
-
}
|
925
|
-
|
926
|
-
.picture_thumbnail .picture_name {
|
927
|
-
height: 12px;
|
928
|
-
display: block;
|
929
|
-
text-align: center;
|
930
|
-
white-space: nowrap;
|
931
|
-
overflow: hidden;
|
932
|
-
position: absolute;
|
933
|
-
bottom: 1px;
|
934
|
-
left: 0;
|
935
|
-
font-family: "Courier New", Courier, mono;
|
936
|
-
line-height: 11px;
|
937
|
-
padding: 2px 0;
|
938
|
-
margin-right: 4px;
|
939
|
-
margin-left: 4px;
|
940
|
-
}
|
941
|
-
|
942
|
-
.picture_thumbnail .picture_name.rename.hover {
|
943
|
-
cursor: text;
|
944
|
-
}
|
945
|
-
|
946
|
-
.picture_thumbnail.small .picture_name {
|
947
|
-
width: 80px;
|
948
|
-
}
|
949
|
-
|
950
|
-
.picture_thumbnail.medium .picture_name {
|
951
|
-
width: 160px;
|
952
|
-
bottom: 3px;
|
953
|
-
}
|
954
|
-
|
955
|
-
.picture_thumbnail.large .picture_name {
|
956
|
-
width: 240px;
|
957
|
-
}
|
958
|
-
|
959
|
-
div.assign_image_list_image {
|
960
|
-
text-align: center;
|
961
|
-
overflow: hidden;
|
962
|
-
position: relative;
|
963
|
-
}
|
964
|
-
|
965
|
-
div.picture_thumbnail.small div.image_spinner img {
|
966
|
-
top: 14px;
|
967
|
-
left: 25px;
|
968
|
-
}
|
969
|
-
|
970
|
-
div.picture_thumbnail.medium div.image_spinner img {
|
971
|
-
top: 42px;
|
972
|
-
left: 64px;
|
973
|
-
}
|
974
|
-
|
975
|
-
div.picture_thumbnail.large div.image_spinner img {
|
976
|
-
top: 74px;
|
977
|
-
left: 108px;
|
978
|
-
}
|
979
|
-
|
980
|
-
div.image_spinner {
|
981
|
-
background-color: $dark-gray;
|
982
|
-
width: 1px;
|
983
|
-
margin: $default-margin;
|
984
|
-
}
|
985
|
-
|
986
|
-
div.picture_thumbnail.small .image_spinner {
|
987
|
-
height: 60px;
|
988
|
-
margin: $default-margin;
|
989
|
-
}
|
990
|
-
|
991
|
-
div.picture_thumbnail.medium .image_spinner {
|
992
|
-
height: 120px;
|
993
|
-
margin: $default-margin;
|
994
|
-
}
|
995
|
-
|
996
|
-
div.picture_thumbnail.large .image_spinner {
|
997
|
-
height: 180px;
|
998
|
-
}
|
999
|
-
|
1000
|
-
div.image_spinner img {
|
1001
|
-
position: absolute;
|
1002
|
-
z-index: 0;
|
1003
|
-
top: 32px;
|
1004
|
-
left: 40px;
|
1005
|
-
}
|
1006
|
-
|
1007
|
-
#assign_image_list div.assign_image_list_image img {
|
1008
|
-
border-style: none;
|
1009
|
-
}
|
1010
|
-
|
1011
|
-
#assign_image_list div.assign_image_list_image span {
|
1012
|
-
|
1013
|
-
}
|
1014
|
-
|
1015
|
-
/* @end */
|
1016
|
-
|
1017
730
|
div#errors {
|
1018
731
|
margin-bottom: 8px;
|
1019
732
|
padding: 8px 8px 4px 28px;
|
@@ -1050,20 +763,6 @@ div#errors {
|
|
1050
763
|
padding: 2*$default-padding;
|
1051
764
|
}
|
1052
765
|
|
1053
|
-
#page_select {
|
1054
|
-
width: 120px;
|
1055
|
-
margin-left: 8px;
|
1056
|
-
}
|
1057
|
-
|
1058
|
-
#new_page_form th, #new_page_form td {
|
1059
|
-
white-space: nowrap;
|
1060
|
-
padding: 2px;
|
1061
|
-
}
|
1062
|
-
|
1063
|
-
#new_page_form tbody tr td.second_row div.selectbox a.display {
|
1064
|
-
width: 123px;
|
1065
|
-
}
|
1066
|
-
|
1067
766
|
input.with_border {
|
1068
767
|
margin: 0;
|
1069
768
|
padding: 1px;
|
@@ -1092,11 +791,15 @@ input#user_admin {
|
|
1092
791
|
|
1093
792
|
#alchemy div#overlay_toolbar div#image_assign_filter_and_image_sizing form {
|
1094
793
|
float: right;
|
1095
|
-
width:
|
794
|
+
width: 310px;
|
1096
795
|
height: 25px;
|
1097
796
|
margin-top: 2px;
|
1098
797
|
padding: 0 !important;
|
1099
798
|
margin-right: 0;
|
799
|
+
|
800
|
+
.button {
|
801
|
+
margin: 0;
|
802
|
+
}
|
1100
803
|
}
|
1101
804
|
|
1102
805
|
div#image_assign_filter_and_image_sizing form div.search_field {
|
@@ -1234,38 +937,41 @@ div.elements_from_page_selector {
|
|
1234
937
|
|
1235
938
|
div.elements_for_page {
|
1236
939
|
position: absolute;
|
1237
|
-
right:
|
1238
|
-
top:
|
940
|
+
right: 32px;
|
941
|
+
top: -7px;
|
1239
942
|
z-index: 15;
|
1240
943
|
background-color: white;
|
1241
944
|
width: 240px;
|
945
|
+
height: 33px;
|
1242
946
|
padding: $default-padding;
|
1243
|
-
border:
|
1244
|
-
|
1245
|
-
-moz-box-shadow: #9ea09f 0px 0px 4px;
|
1246
|
-
-o-box-shadow: #9ea09f 0px 0px 4px;
|
1247
|
-
box-shadow: #9ea09f 0px 0px 4px;
|
1248
|
-
line-height: 13px;
|
947
|
+
border: $default-border;
|
948
|
+
@include box-shadow(#9ea09f 0px 0px 4px);
|
1249
949
|
@include rounded-corner;
|
950
|
+
|
951
|
+
img {
|
952
|
+
width: 20px;
|
953
|
+
height: 20px;
|
954
|
+
margin-left: 4px;
|
955
|
+
margin-top: 7px;
|
956
|
+
}
|
957
|
+
|
958
|
+
.alchemy_selectbox {
|
959
|
+
float: left;
|
960
|
+
width: 217px;
|
961
|
+
}
|
1250
962
|
}
|
1251
963
|
|
1252
964
|
a.close_elements_from_page_selector {
|
1253
965
|
position: absolute;
|
1254
966
|
right: 0;
|
1255
|
-
top:
|
967
|
+
top: 12px;
|
1256
968
|
font-size: 0;
|
1257
|
-
|
1258
|
-
|
1259
|
-
|
1260
|
-
background: image-url('alchemy/icons.png') no-repeat 0 -72px;
|
969
|
+
width: 8px;
|
970
|
+
height: 8px;
|
971
|
+
background: url('icons.png') no-repeat 0 -72px;
|
1261
972
|
cursor: pointer;
|
1262
973
|
}
|
1263
974
|
|
1264
|
-
.elements_for_page img {
|
1265
|
-
width: 20px;
|
1266
|
-
height: 20px;
|
1267
|
-
}
|
1268
|
-
|
1269
975
|
#alchemy .ui-dialog-content ul#sitemap ul .sitemap_row a {
|
1270
976
|
color: black;
|
1271
977
|
text-decoration: none;
|
@@ -1278,7 +984,7 @@ a.close_elements_from_page_selector {
|
|
1278
984
|
width: 16px;
|
1279
985
|
height: 16px;
|
1280
986
|
position: relative;
|
1281
|
-
background:
|
987
|
+
background: url('icons.png') no-repeat -512px -72px;
|
1282
988
|
margin: 2px;
|
1283
989
|
font-size: 0;
|
1284
990
|
text-decoration: none;
|
@@ -1337,11 +1043,6 @@ div.assign_file_file_icon img {
|
|
1337
1043
|
width: 195px;
|
1338
1044
|
}
|
1339
1045
|
|
1340
|
-
.elements_for_page .alchemy_selectbox {
|
1341
|
-
float: left;
|
1342
|
-
width: 217px;
|
1343
|
-
}
|
1344
|
-
|
1345
1046
|
table.window_form td.checkbox {
|
1346
1047
|
text-align: left;
|
1347
1048
|
}
|
@@ -1362,24 +1063,27 @@ select#url_protocol.medium {
|
|
1362
1063
|
width: 129px;
|
1363
1064
|
}
|
1364
1065
|
|
1365
|
-
#alchemy .ui-dialog-content input.long,
|
1366
|
-
#alchemy .ui-dialog-content textarea.long {
|
1367
|
-
margin: 0;
|
1066
|
+
#alchemy .ui-dialog-content input.long, #alchemy .ui-dialog-content textarea.long {
|
1368
1067
|
width: 240px;
|
1369
1068
|
}
|
1370
1069
|
|
1371
1070
|
#alchemy .ui-dialog-content input.very_long {
|
1372
1071
|
width: 300px;
|
1373
|
-
margin: 0;
|
1374
1072
|
}
|
1375
1073
|
|
1376
|
-
#alchemy .ui-dialog-content p
|
1377
|
-
|
1074
|
+
#alchemy .ui-dialog-content p.buttons {
|
1075
|
+
text-align: right;
|
1076
|
+
line-height: 32px;
|
1077
|
+
|
1078
|
+
label {
|
1079
|
+
float: left;
|
1080
|
+
}
|
1378
1081
|
}
|
1379
1082
|
|
1380
1083
|
#alchemy .ui-dialog-content p a.button.small {
|
1381
1084
|
float: none;
|
1382
|
-
|
1085
|
+
@include inline-block;
|
1086
|
+
vertical-align: inherit;
|
1383
1087
|
}
|
1384
1088
|
|
1385
1089
|
.assign_file_file.selected_file {
|
@@ -1397,12 +1101,12 @@ div.info ol li {
|
|
1397
1101
|
}
|
1398
1102
|
|
1399
1103
|
div#overlay_toolbar {
|
1400
|
-
background: $medium-gray
|
1104
|
+
background: $medium-gray url('shading.png') repeat-x 0 -42px;
|
1401
1105
|
border: $default-border;
|
1402
|
-
height:
|
1106
|
+
height: 44px;
|
1403
1107
|
border-left-style: none;
|
1404
1108
|
border-right-style: none;
|
1405
|
-
padding:
|
1109
|
+
padding: $default-padding;
|
1406
1110
|
}
|
1407
1111
|
|
1408
1112
|
div#overlay_toolbar div.toolbar_spacer {
|
@@ -1477,6 +1181,7 @@ div#overlay_toolbar a.button:active {
|
|
1477
1181
|
height: 310px;
|
1478
1182
|
overflow-x: hidden;
|
1479
1183
|
overflow-y: auto;
|
1184
|
+
margin-bottom: 1em;
|
1480
1185
|
}
|
1481
1186
|
|
1482
1187
|
.mceEditor table {
|