forgeos_core 1.9.2 → 1.9.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (94) hide show
  1. data/README.textile +1 -23
  2. data/app/assets/javascripts/forgeos/admin/customselects.js +2 -0
  3. data/app/assets/javascripts/forgeos/admin/functions/forgeos_core/overlay.js +22 -3
  4. data/app/assets/javascripts/forgeos/admin/functions/forgeos_core/tinyMCE.js +1 -1
  5. data/app/assets/javascripts/forgeos/admin/functions/forgeos_core/uploads.js +55 -0
  6. data/app/assets/javascripts/forgeos/admin/functions/forgeos_core/visual.js +3 -3
  7. data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/overlays.js +4 -46
  8. data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/visual.js +17 -57
  9. data/app/assets/stylesheets/forgeos/960.css.sass +1 -125
  10. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_attachments.css.sass +13 -4
  11. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_content.css.sass +7 -2
  12. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_customer.css.sass +18 -5
  13. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_dashboard.css.sass +38 -16
  14. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_datatable.css.sass +32 -13
  15. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_generals.css.sass +75 -39
  16. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_icons.css.sass +130 -16
  17. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_lightbox.css.sass +21 -18
  18. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_notifications.css.sass +0 -1
  19. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_payment.css.sass +1 -1
  20. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_rightSidebar.css.sass +14 -14
  21. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_roles.css.sass +1 -1
  22. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_search.css.sass +6 -5
  23. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_settings.css.sass +1 -3
  24. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_sidebar.css.sass +11 -3
  25. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_uploadify.css.sass +10 -8
  26. data/app/assets/stylesheets/forgeos/admin/forgeos_core/_visuals.css.sass +12 -12
  27. data/app/assets/stylesheets/forgeos/admin/login.css.sass +30 -14
  28. data/app/assets/stylesheets/forgeos/jquery-ui/themes/forgeos.css.sass +96 -733
  29. data/app/assets/stylesheets/forgeos/jstree/themes/categories/style.css.sass +12 -18
  30. data/app/controllers/admin/administrators_controller.rb +2 -2
  31. data/app/controllers/admin/attachments_controller.rb +3 -3
  32. data/app/controllers/admin/categories_controller.rb +1 -1
  33. data/app/controllers/admin/person_sessions_controller.rb +1 -1
  34. data/app/controllers/admin/rights_controller.rb +2 -2
  35. data/app/controllers/admin/roles_controller.rb +3 -3
  36. data/app/controllers/admin/users_controller.rb +2 -2
  37. data/app/controllers/forgeos/application_controller.rb +1 -1
  38. data/app/models/category.rb +7 -3
  39. data/app/models/right.rb +1 -1
  40. data/app/models/role.rb +1 -1
  41. data/app/models/user.rb +6 -3
  42. data/app/views/admin/administrators/index.json.erb +3 -1
  43. data/app/views/admin/attachments/_attachments_popup.html.haml +4 -4
  44. data/app/views/admin/attachments/_form.html.haml +1 -1
  45. data/app/views/admin/attachments/_tabs.html.haml +1 -1
  46. data/app/views/admin/attachments/index.json.erb +4 -2
  47. data/app/views/admin/attachments/show.html.haml +1 -1
  48. data/app/views/admin/cachings/index.html.haml +2 -2
  49. data/app/views/admin/categories/index.json.erb +3 -1
  50. data/app/views/admin/import/_tabs.html.haml +1 -0
  51. data/app/views/admin/import/index.html.haml +1 -1
  52. data/app/views/admin/rights/_tabs.html.haml +1 -0
  53. data/app/views/admin/rights/index.json.erb +7 -5
  54. data/app/views/admin/roles/_tabs.html.haml +1 -0
  55. data/app/views/admin/roles/index.json.erb +5 -3
  56. data/app/views/admin/sidebars/_attachments_popups.html.haml +7 -76
  57. data/app/views/admin/users/index.json.erb +3 -1
  58. data/app/views/admin/visual/_visual_popup.html.haml +18 -107
  59. data/app/views/admin/visual/_visuals_popup.html.haml +7 -47
  60. data/app/views/layouts/admin.html.haml +2 -2
  61. data/app/views/layouts/admin_login.html.haml +2 -2
  62. data/config/locales/common/en.yml +1 -0
  63. data/config/locales/common/fr.yml +1 -0
  64. data/config/routes.rb +12 -1
  65. data/lib/forgeos/urlified.rb +16 -0
  66. data/lib/tasks/install.rake +3 -3
  67. data/lib/technoweenie/attachment_fu/backends/ftp_backend.rb +8 -12
  68. data/recipes/db.rb +1 -1
  69. metadata +52 -57
  70. data/app/controllers/admin/base_controller.rbc +0 -1305
  71. data/app/controllers/admin/dashboard_controller.rbc +0 -361
  72. data/app/controllers/admin/person_sessions_controller.rbc +0 -1248
  73. data/app/controllers/forgeos/application_controller.rbc +0 -2027
  74. data/app/helpers/admin/attachment_helper.rbc +0 -2340
  75. data/app/helpers/admin/base_helper.rbc +0 -2522
  76. data/app/helpers/forgeos/application_helper.rbc +0 -3152
  77. data/app/models/administrator.rbc +0 -415
  78. data/app/models/person.rbc +0 -1498
  79. data/app/models/person_session.rbc +0 -142
  80. data/app/models/right.rbc +0 -432
  81. data/app/models/role.rbc +0 -469
  82. data/app/models/setting.rbc +0 -699
  83. data/config/initializers/load_settings.rbc +0 -330
  84. data/config/routes.rbc +0 -2203
  85. data/lib/extensions.rbc +0 -126
  86. data/lib/extensions/form_helper_extensions.rbc +0 -295
  87. data/lib/extensions/i18n_fallbacks_config.rbc +0 -246
  88. data/lib/forgeos.rbc +0 -1942
  89. data/lib/forgeos/core.rbc +0 -325
  90. data/lib/forgeos/core/engine.rbc +0 -316
  91. data/lib/forgeos_core.rbc +0 -53
  92. data/lib/map_fields.rbc +0 -4437
  93. data/lib/sortable_attachments.rbc +0 -1399
  94. data/lib/sphinx_globalize.rbc +0 -785
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_attachments.css.sass CHANGED
@@ -1,37 +1,46 @@
1
1
  .media-image-container
2
- +left()
2
+ +left
3
3
  color: $lightGray
4
- font-size: .7em
4
+ font-size: 0.7em
5
5
  margin-top: 25px
6
6
  overflow: hidden
7
+
7
8
  .grid_7.media-image-container
8
9
  width: 380px !important
10
+
9
11
  .image_on_top
10
12
  overflow: visible !important
11
13
  z-index: 200
14
+
12
15
  .media-image
13
16
  border: 1px solid $whiteGray
14
17
  margin-bottom: 15px
18
+
15
19
  .media-size
16
20
  background-color: $whiteGray
17
21
  text-transform: uppercase
18
22
  padding: 3px 8px
23
+
19
24
  .media-size-pixels
20
25
  padding: 3px 8px
21
26
  display: block
22
27
  margin-top: 5px
28
+
23
29
  .large-info-container
24
30
  float: right
25
- font-size: .8em
31
+ font-size: 0.8em
26
32
  margin-top: 25px
33
+
27
34
  .large-info-block
28
35
  padding: 5px 0
29
36
  border-bottom: 1px solid $whiteGray
30
37
  span
31
38
  width: 50%
32
39
  display: block
33
- +left()
40
+ +left
41
+
34
42
  .large-info-name
35
43
  color: $lightGray
44
+
36
45
  #video-player
37
46
  height: 300px
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_content.css.sass CHANGED
@@ -25,28 +25,33 @@
25
25
  position: relative
26
26
  span
27
27
  color: $lightGray
28
- font-size: .5em
28
+ font-size: 0.5em
29
29
  position: absolute
30
30
  right: 0px
31
31
  top: 13px
32
+
32
33
  .content
33
34
  padding: 0 20px 20px
35
+
34
36
  .content-background
35
37
  height: 0
36
38
  border-top: 1px solid $contentHeaderBorder
39
+
37
40
  .inner-content
38
41
  padding: 10px 20px
39
42
  p
40
43
  font-size: 0.7em
41
44
  .map_fields
42
45
  overflow-x: auto
46
+
43
47
  .big-header
44
48
  .field_name,.orange_input
45
- +element_form_name()
49
+ +element_form_name
46
50
  &.firstname,&.lastname
47
51
  min-width: 8em
48
52
  max-width: 12.5em
49
53
  width: auto
54
+
50
55
  .field_error
51
56
  color: red
52
57
 
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_customer.css.sass CHANGED
@@ -1,9 +1,11 @@
1
1
  .fieldset.noborder
2
2
  border-width: 0px
3
+
3
4
  #customer-see
4
5
  width: 720px
5
6
  .datatable td
6
7
  vertical-align: middle
8
+
7
9
  .customer-header
8
10
  background-position: 0 -1464px
9
11
  background-color: $white
@@ -14,55 +16,66 @@
14
16
  font-size: 1.2em
15
17
  background-position: 0 -2447px
16
18
  padding-left: 25px
19
+
17
20
  .main-infos p, .order-delivery p, .main-infos h4, .order-delivery h4
18
21
  padding-top: 2px
19
22
  margin: 0
20
23
  clear: both
24
+
21
25
  #customer-see .padding-wrap
22
26
  border-top: 1px solid $whiteGray
27
+
23
28
  .big-separation
24
29
  height: 200px !important
30
+
25
31
  .all-width
26
32
  width: 100%
33
+
27
34
  .checkbox-container
28
- +left()
35
+ +left
29
36
  width: 30%
30
37
  margin: 1%
31
38
  input
32
- +left()
39
+ +left
33
40
  label
34
41
  margin: 5px !important
42
+
35
43
  .multi-select-div
36
44
  position: absolute
37
45
  top: -10px
38
46
  right: 20px
39
47
  a
40
48
  display: block
41
- +left()
49
+ +left
42
50
  margin: 0 2px
43
51
  background-color: $whiteGray
44
52
  padding: 2px 5px
45
53
  color: $lightGray
54
+
46
55
  .tool-tip-settings
47
56
  font-size: 0.7em
48
57
  margin-top: 20px
49
58
  padding: 10px 10px
50
59
  background-color: $lightYellowBg
51
60
  color: $darkBrown
61
+
52
62
  .fieldset.grid_11
53
63
  width: 635px
64
+
54
65
  #ui-datepicker-div
55
66
  z-index: 999
67
+
56
68
  .email
57
69
  width: 150px
70
+
58
71
  .fieldset
59
72
  .firstname-input
60
73
  clear: both
61
- +left()
74
+ +left
62
75
  input
63
76
  width: 186px
64
77
  .lastname-input
65
- +left()
78
+ +left
66
79
  margin-left: 20px
67
80
  input
68
81
  width: 186px
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_dashboard.css.sass CHANGED
@@ -3,12 +3,13 @@
3
3
  height: auto !important
4
4
  height: 500px
5
5
  background-color: $white
6
- font-size: .9em
6
+ font-size: 0.9em
7
7
  color: $lightGray
8
8
  padding-bottom: 20px
9
9
  h2
10
10
  &.orders
11
11
  background-position: 0 -2446px
12
+
12
13
  .summary
13
14
  em
14
15
  color: $black
@@ -18,43 +19,50 @@
18
19
  color: $black
19
20
  text-decoration: underline
20
21
  background-color: $lightYellowBg
22
+
21
23
  .quick-action-button
22
24
  padding: 12px 5px
23
- font-size: .9em
24
- +block()
25
- +left()
25
+ font-size: 0.9em
26
+ +block
27
+ +left
26
28
  margin: 0 5px
27
- border: 1px solid $lightBlueBg - #1A0601
28
- +borderCorner()
29
- background: $lightBlueBg url(/assets/forgeos/admin/backgrounds/background-right-sidebar.png) repeat-x scroll center top
29
+ border: 1px solid $lightBlueBg - #1a0601
30
+ +borderCorner
31
+ background: $lightBlueBg url(/images/admin/backgrounds/background-right-sidebar.png) repeat-x scroll center top
30
32
  span
31
33
  color: $blueLink
32
34
  padding-top: 2px
35
+
33
36
  .see-stats
34
37
  background-position: 0 -3215px
38
+
35
39
  #dashboard h2
36
40
  clear: both
37
41
  color: $gray
38
42
  font-size: 1.5em
39
43
  font-weight: normal
40
44
  margin: 10px 0
45
+
41
46
  #dashboard table
42
47
  border-collapse: collapse
43
48
  width: 100%
44
- font-size: .9em
49
+ font-size: 0.9em
45
50
  margin-bottom: 5px
46
51
  td
47
52
  padding: 5px
48
53
  .even
49
54
  background-color: $whiteGray
55
+
50
56
  .table-price
51
57
  font-weight: bold
58
+
52
59
  .table-product
53
60
  width: 35%
54
- color: blueLink
61
+ color: $blueLink
55
62
  font-weight: bold
56
63
  span
57
64
  padding-top: 2px
65
+
58
66
  .shipped
59
67
  color: $shipped
60
68
  .closed
@@ -69,38 +77,45 @@
69
77
  color: $orangeRed
70
78
  .table-time
71
79
  font-weight: bold
80
+
72
81
  .see-all-orders
73
82
  color: $blueLink
74
83
  background-color: $lightBlueBg
75
84
  padding: 3px 8px
76
85
  margin-left: 8px
77
- font-size: .8em
86
+ font-size: 0.8em
87
+
78
88
  .latest-activity
79
89
  border: 1px solid $contentHeaderBorder
80
90
  padding: 8px 0
91
+
81
92
  .sales-info-block
82
93
  border: 1px solid $lightOrangeRedBg
83
- +borderCorner()
94
+ +borderCorner
84
95
  background-color: $lightOrangeYellowBg
85
96
  margin: 5px 0
86
97
  padding: 5px
87
98
  color: $darkBrown
88
- font-size: .8em
99
+ font-size: 0.8em
89
100
  position: relative
101
+
90
102
  .first-block
91
103
  height: 2em
92
104
  line-height: 2em
93
105
  padding-bottom: 2px
94
106
  padding-left: 8px
95
- border-bottom: 1px solid $lightOrangeYellowBg - #001B57
107
+ border-bottom: 1px solid $lightOrangeYellowBg - #001b57
108
+
96
109
  .second-block
97
110
  height: 2em
98
111
  line-height: 2em
99
112
  padding-top: 8px
100
113
  padding-left: 8px
114
+
101
115
  .today-sales span
102
116
  color: $orangeRed
103
- .sales-info-block
117
+
118
+ .sales-info-block
104
119
  span
105
120
  display: block
106
121
  &.right
@@ -114,15 +129,17 @@
114
129
  line-height: 2.2em
115
130
  sup
116
131
  font-weight: normal
117
- font-size: .4em
132
+ font-size: 0.4em
118
133
  width: 2.9em
119
134
  display: block
120
135
  position: absolute
121
136
  line-height: 1.2em
122
137
  top: 0
123
138
  right: 0
139
+
124
140
  .last-week-sales, .week-sales, .month-sales, .last-month-sales
125
141
  width: 77%
142
+
126
143
  .diff-negative
127
144
  width: 20%
128
145
  position: absolute
@@ -135,6 +152,7 @@
135
152
  color: $orangeRed
136
153
  text-align: center
137
154
  font-weight: bold
155
+
138
156
  .diff-positive
139
157
  width: 20%
140
158
  position: absolute
@@ -147,14 +165,17 @@
147
165
  color: $lightGreen
148
166
  text-align: center
149
167
  font-weight: bold
168
+
150
169
  .live-stats-content span
151
170
  display: block
152
171
  border-bottom: 1px solid $contentHeaderBorder
153
172
  padding: 2px 0
154
- font-size: .8em
173
+ font-size: 0.8em
174
+
155
175
  #order-see .order-see-wrap, #media-modify .media-modify-wrap
156
176
  font-size: 1em
157
177
  padding-left: 10px
178
+
158
179
  .big-header
159
180
  .order-price
160
181
  font-size: 1.4em
@@ -165,5 +186,6 @@
165
186
  color: $orange
166
187
  font-weight: bold
167
188
  padding-left: 5px
189
+
168
190
  .product-th
169
191
  width: 30%
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_datatable.css.sass CHANGED
@@ -3,16 +3,19 @@
3
3
  //--------------------- ----------
4
4
  .odd
5
5
  background-color: $oddBg
6
+
6
7
  table
7
8
  .image
8
9
  text-align: right
9
10
  width: 70px
10
11
  padding: 0
12
+
11
13
  #table_wrapper
12
14
  .dataTables_filter
13
15
  display: none
14
16
  .dataTables_paginate, .dataTables_length
15
17
  float: left
18
+
16
19
  .datatable
17
20
  border-collapse: collapse
18
21
  width: 100% !important
@@ -20,19 +23,19 @@ table
20
23
  text-align: left
21
24
  thead
22
25
  height: 30px
23
- background: #EFEFEF
26
+ background: #efefef
24
27
  color: $lightGray
25
28
  cursor: pointer
26
29
  th
27
30
  padding: 5px
28
- border-left: 2px solid #E7E7E7
31
+ border-left: 2px solid #e7e7e7
29
32
  padding: 5px
30
33
  text-align: left
31
34
  text-transform: capitalize
32
35
  &:first-child
33
36
  border-left: 0
34
37
  &.sorting_desc, &.sorting_asc
35
- background-color: #E0E0E0
38
+ background-color: #e0e0e0
36
39
  background-image: url(/assets/forgeos/admin/small-icons-16-16-verti.png)
37
40
  background-repeat: no-repeat
38
41
  &.sorting_desc
@@ -59,7 +62,7 @@ table
59
62
  span.odd
60
63
  background-color: transparent
61
64
  border: 0
62
- color: #000
65
+ color: black
63
66
  span.even
64
67
  background-color: transparent
65
68
  border: 0
@@ -82,6 +85,7 @@ table
82
85
  color: $white
83
86
  .actions
84
87
  width: 65px !important
88
+
85
89
  .dataTables_wrapper
86
90
  margin: 0 0 30px 1px
87
91
  .top
@@ -90,6 +94,7 @@ table
90
94
  height: 16px
91
95
  margin-top: 10px
92
96
  margin-left: 22px
97
+
93
98
  //--------------------- ----------
94
99
  // PAGINATE BUTTONS
95
100
  //--------------------- ----------
@@ -100,6 +105,7 @@ table
100
105
  margin: 0 2px
101
106
  display: inline-block
102
107
  cursor: pointer
108
+
103
109
  .paginate_button
104
110
  padding: 2px 5px
105
111
  font-size: 0.7em
@@ -119,9 +125,11 @@ table
119
125
  &.next
120
126
  background-position: right -1342px
121
127
  padding-right: 18px
128
+
122
129
  .paginate_active
123
130
  background-color: $blueLink
124
131
  color: $white
132
+
125
133
  //--------------------- ----------
126
134
  // BUTTONS
127
135
  //--------------------- ----------
@@ -130,8 +138,8 @@ tr
130
138
  height: 0 !important
131
139
  padding: 0
132
140
  width: 16px
133
- +block()
134
- +left()
141
+ +block
142
+ +left
135
143
  margin: 0 3px
136
144
  outline: none
137
145
  p
@@ -152,26 +160,32 @@ tr
152
160
  background: url(/assets/forgeos/admin/small-icons/dark-blue-minus.png) no-repeat -1px
153
161
  p
154
162
  display: block !important
163
+
155
164
  //--------------------- ----------
156
165
  // SOME VARIANTS
157
166
  //--------------------- ----------
158
167
  .one-product
159
168
  padding-left: 25px
169
+
160
170
  .some-variants
161
171
  .image
162
172
  background: url(/assets/forgeos/admin/small-icons/dark-blue-plus.png) no-repeat -1px
173
+
163
174
  .image img
164
175
  width: 55px
165
176
  height: 55px
177
+
166
178
  //--------------------- ----------
167
179
  // DATASLIDES
168
180
  //--------------------- ----------
169
181
  .dataSlides_info
170
182
  display: none
171
183
  clear: both
184
+
172
185
  .dataSlides_paginate.paging_full_numbers
173
186
  margin: 20px
174
187
  clear: both
188
+
175
189
  .thumbnails
176
190
  .datatable
177
191
  width: 100% !important
@@ -181,9 +195,9 @@ tr
181
195
  .tr
182
196
  width: 123px
183
197
  height: 170px
184
- +left()
198
+ +left
185
199
  margin: 1%
186
- border: 2px solid #FFF
200
+ border: 2px solid white
187
201
  text-align: center
188
202
  color: $lightGray
189
203
  background-color: transparent !important
@@ -200,6 +214,7 @@ tr
200
214
  border: 2px solid $blueLink
201
215
  span
202
216
  font-weight: bold
217
+
203
218
  //--------------------- ----------
204
219
  // SELECTABLE ROWS
205
220
  //--------------------- ----------
@@ -210,6 +225,7 @@ tr
210
225
  .selectable_rows
211
226
  tr
212
227
  cursor: pointer
228
+
213
229
  //--------------------- ----------
214
230
  // DRAGGABLE ROWS
215
231
  //--------------------- ----------
@@ -220,7 +236,7 @@ tr
220
236
  color: $selectedRow !important
221
237
  td:first-child
222
238
  background:
223
- color: $selectedRow - #3D0F38 !important
239
+ color: $selectedRow - #3d0f38 !important
224
240
  //--------------------- ----------
225
241
  // HANDLER
226
242
  //--------------------- ----------
@@ -229,7 +245,7 @@ tr
229
245
  min-height: 25px
230
246
  height: auto !important
231
247
  height: 16px
232
- padding-left: 25px
248
+ padding-left: 10px
233
249
  .small-icons
234
250
  height: 16px
235
251
  .handler
@@ -239,22 +255,25 @@ tr
239
255
  position: absolute !important
240
256
  top: 0
241
257
  left: 0
258
+
242
259
  .ui-helper
243
260
  font-weight: bold
244
261
  font-size: 110%
245
262
  color: $blueLink
246
263
  background-color: $selectedRow
247
- padding: .5em 1em
248
- border: 1px solid $selectedRow - #3D0F38
264
+ padding: 0.5em 1em
265
+ border: 1px solid $selectedRow - #3d0f38
249
266
  overflow: hidden
250
267
  white-space: nowrap
251
268
  overflow: hidden
252
269
  width: 150px
253
270
  +opacity(0.7)
271
+
254
272
  .ui-droppable.ui-state-hover
255
- background-color: #FF3E00 !important
273
+ background-color: #ff3e00 !important
256
274
  background-repeat: no-repeat
257
275
  border: 0
258
276
  color: white !important
277
+
259
278
  #category_sort
260
279
  display: none