forgeos_core 1.9.2 → 1.9.3

Sign up to get free protection for your applications and to get access to all the features.
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/_lightbox.css.sass CHANGED
@@ -4,8 +4,10 @@
4
4
  .add-link
5
5
  padding-left: 30px
6
6
  background-position: 10px -1434px
7
+
7
8
  .media-hoverlay
8
9
  padding: 0px !important
10
+
9
11
  .media-hoverlay-header
10
12
  background-color: $white
11
13
  height: 35px
@@ -21,7 +23,7 @@
21
23
  #search
22
24
  margin-right: 0
23
25
  font:
24
- size: .9em
26
+ size: 0.9em
25
27
  weight: normal
26
28
  .button
27
29
  margin: 5px 5px 5px 15px
@@ -30,6 +32,7 @@
30
32
  float: left
31
33
  span
32
34
  padding: 1px 20px 0 30px
35
+
33
36
  .media-hoverlay-content
34
37
  background-color: $white
35
38
  float: right
@@ -37,14 +40,16 @@
37
40
  min-height: 400px
38
41
  height: auto !important
39
42
  height: 400px
40
- font-size: .8em
43
+ font-size: 0.8em
41
44
  table
42
45
  width: 100% !important
43
46
  .datatable
44
- font-size: .8em
47
+ font-size: 0.8em
48
+
45
49
  .media-hoverlay-sidebar
46
50
  padding: 10px
47
51
  width: 25%
52
+
48
53
  .display-mode
49
54
  float: right
50
55
  width: 90px
@@ -54,9 +59,10 @@
54
59
  height: 100%
55
60
  margin: 0 10px
56
61
  width: 3px
57
- +left()
62
+ +left
58
63
  .display-list
59
- +left()
64
+ +left
65
+ background: transparent url(/images/admin/big-icons-27-27-verti.png) 0 -80px no-repeat
60
66
  background: transparent url(/assets/forgeos/admin/big-icons-27-27-verti.png) 0 -80px no-repeat
61
67
  width: 27px
62
68
  height: 27px
@@ -64,34 +70,34 @@
64
70
  &.off
65
71
  background: transparent url(/assets/forgeos/admin/big-icons-27-27-verti.png) 0 1px no-repeat
66
72
  .display-thumbnails
67
- +left()
73
+ +left
68
74
  background: transparent url(/assets/forgeos/admin/big-icons-27-27-verti.png) 0 -242px no-repeat
69
75
  width: 27px
70
76
  height: 27px
71
77
  &.off
72
78
  background: transparent url(/assets/forgeos/admin/big-icons-27-27-verti.png) 0 -161px no-repeat
79
+
73
80
  div.tree-link
74
81
  padding-top: 10px !important
75
82
  padding-bottom: 10px !important
76
83
  label
77
- +left()
84
+ +left
78
85
  margin-bottom: 8px
79
86
  color: $lightGray
80
87
  width: 95px
81
88
  clear: left
82
89
  select
83
- +left()
90
+ +left
84
91
  input, textarea
85
- +left()
92
+ +left
86
93
  border: 2px solid $gray
87
- +borderCorner(2px,2px,2px,2px)
94
+ +borderCorner(2px, 2px, 2px, 2px)
88
95
  width: 390px
89
96
  padding: 2px
90
-
91
97
  &.external
92
98
  color: red
93
99
  .linked-to-span
94
- +left()
100
+ +left
95
101
  background-color: $lightBlueBg
96
102
  padding: 0 5px 2px 20px
97
103
  a
@@ -99,19 +105,15 @@ div.tree-link
99
105
 
100
106
  .linked-to
101
107
  display: none
102
-
103
108
  .link
104
- +left()
109
+ +left
105
110
  padding: 0 5px 2px 0px
106
111
  a
107
112
  color: $blueLink
108
113
  .back-link
109
114
  text-decoration: underline
110
115
  .button
111
- -moz-border-radius-bottomleft: 2px
112
- -moz-border-radius-bottomright: 2px
113
- -moz-border-radius-topleft: 2px
114
- -moz-border-radius-topright: 2px
116
+ +borderCorner(2px, 2px, 2px, 2px)
115
117
  background-color: $whiteGray
116
118
  background-position: 0 -10px
117
119
  border: 1px solid $gray
@@ -123,6 +125,7 @@ div.tree-link
123
125
  text-align: center
124
126
  text-decoration: none
125
127
  font-size: 1.1em
128
+
126
129
  .upload-lightbox-container,
127
130
  .media-hoverlay
128
131
  display: none
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_notifications.css.sass CHANGED
@@ -14,7 +14,6 @@
14
14
  z-index: 550
15
15
  +borderCorner()
16
16
  .notification .gray-destroy
17
- filter: alpha(opacity=100)
18
17
  opacity: 1
19
18
  .notification a
20
19
  color: #FFF
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_payment.css.sass CHANGED
@@ -1,6 +1,6 @@
1
1
  #accordion_payments
2
2
  input[type="text"]
3
- +borderCorner(3px,3px,3px,3px)
3
+ +borderCorner(3px, 3px, 3px, 3px)
4
4
  background:
5
5
  image: url("/assets/forgeos/admin/backgrounds-verti.png")
6
6
  position: 0 -600px
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_rightSidebar.css.sass CHANGED
@@ -1,4 +1,4 @@
1
- #right-sidebar
1
+ #right-sidebar
2
2
  .step
3
3
  background: $lightBlueBg url(/assets/forgeos/admin/backgrounds/background-right-sidebar.png) repeat-x top
4
4
  padding: 5px 10px
@@ -20,7 +20,7 @@
20
20
  .text
21
21
  background-color: $white
22
22
  border: 1px solid $contentHeaderBorder
23
- +borderCorner()
23
+ +borderCorner
24
24
  height: 130px
25
25
  padding: 5px
26
26
  margin-left: -5px
@@ -54,7 +54,7 @@
54
54
  margin: 0 0 5px 0
55
55
  border-left: 1px solid $greenBlue
56
56
  &.open .inner-step
57
- +block()
57
+ +block
58
58
  .tags
59
59
  a, label
60
60
  display: inline-block !important
@@ -67,10 +67,10 @@
67
67
  span
68
68
  padding: 5px
69
69
  position: relative
70
- +left()
71
- +borderCorner(3px,3px,3px,3px)
70
+ +left
71
+ +borderCorner(3px, 3px, 3px, 3px)
72
72
  background-color: $white
73
- margin: 2px
73
+ margin 2px
74
74
  .status p
75
75
  padding: 0
76
76
  margin: 5px 0 0 10px
@@ -94,7 +94,7 @@
94
94
  .tags
95
95
  background-color: $white
96
96
  border: 1px solid $contentHeaderBorder
97
- +borderCorner()
97
+ +borderCorner
98
98
  a
99
99
  background-color: $contentHeaderBorder
100
100
  color: $black
@@ -103,7 +103,7 @@
103
103
  span
104
104
  padding: 2px 20px 2px 5px
105
105
  border: 1px solid $contentHeaderBorder
106
- color: #000 !important
106
+ color: black !important
107
107
  font-weight: bold
108
108
  margin: 2px
109
109
  a
@@ -124,7 +124,7 @@
124
124
  color: $lightGray
125
125
  font-style: italic
126
126
  width: 85px
127
- +left()
127
+ +left
128
128
  border: 0
129
129
  padding: 2px 5px
130
130
  margin: 2px
@@ -150,19 +150,19 @@
150
150
  #tag_autocomplete
151
151
  width: 150px
152
152
  background:
153
- color: #FFF
153
+ color: white
154
154
  padding: 0
155
155
  border: 0
156
- +borderCorner(0,0,0,0)
156
+ +borderCorner(0, 0, 0, 0)
157
157
  margin: 0
158
158
  span
159
159
  display: block
160
- color: #000
160
+ color: black
161
161
  float: none !important
162
162
  margin: 0
163
163
  padding: 5px
164
- +borderCorner(0,0,0,0)
164
+ +borderCorner(0, 0, 0, 0)
165
165
  &:hover
166
- color: #FFF !important
166
+ color: white !important
167
167
  background:
168
168
  color: $blueLink
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_roles.css.sass CHANGED
@@ -1,7 +1,7 @@
1
1
  .admins-list
2
2
  .admin
3
3
  span
4
- +left()
4
+ +left
5
5
  a
6
6
  font-weight: bold
7
7
  margin: 5px !important
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_search.css.sass CHANGED
@@ -8,7 +8,7 @@
8
8
  &.open
9
9
  border: 1px solid $gray
10
10
  border-bottom: 0
11
- +borderCorner(4px,4px,0,0)
11
+ +borderCorner(4px, 4px, 0, 0)
12
12
  background-color: $white
13
13
  &.thumbnails
14
14
  display: block
@@ -21,6 +21,7 @@
21
21
  color: $lightGray
22
22
  font-size: 0.8em
23
23
  text-decoration: underline
24
+
24
25
  .search-form,
25
26
  .search-form-image,
26
27
  .search-form-thumbnails,
@@ -33,18 +34,18 @@
33
34
  background-position: 0 -270px
34
35
  display: none
35
36
  border: 1px solid $gray
36
- +borderCorner(4px,0,4px,4px)
37
+ +borderCorner(4px, 0, 4px, 4px)
37
38
  height: 22px
38
39
  width: 190px
39
40
  .button-ok
40
41
  background-position: 0 0
41
- +left()
42
+ +left
42
43
  border: 1px solid $gray
43
- +borderCorner(3px,3px,3px,3px)
44
+ +borderCorner(3px, 3px, 3px, 3px)
44
45
  margin-left: 10px
45
46
  color: $black
46
47
  font-size: 0.7em
47
48
  padding: 3px
48
49
  input
49
- +left()
50
+ +left
50
51
  width: 140px
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_settings.css.sass CHANGED
@@ -43,10 +43,8 @@
43
43
  padding: 0
44
44
  min-height: 600px
45
45
  .big-header
46
- background-position: 0 -234px
46
+ background-position: 0 -250px
47
47
  height: auto
48
- padding: 0 0
49
- font-size: 0.8em
50
48
  .interact-links
51
49
  margin-top: 7px
52
50
 
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_sidebar.css.sass CHANGED
@@ -12,14 +12,17 @@
12
12
  color: $darkBrown
13
13
  a
14
14
  color: $darkBrown
15
+
15
16
  .sidebar-background
16
17
  background:
17
18
  position: 0px -1042px
18
19
  color: transparent
19
20
  height: 16px
20
21
  +opacity(0.6)
22
+
21
23
  .header
22
24
  border-bottom: 1px solid $contentHeaderBorder
25
+
23
26
  .ui-resizable-handle.ui-resizable-e
24
27
  background:
25
28
  image: url(/assets/forgeos/admin/borders/drag-and-drop.png)
@@ -28,12 +31,15 @@
28
31
  height: 40px
29
32
  right: -27px
30
33
  width: 40px
31
- +block()
34
+ +block
32
35
  z-index: 1
36
+
33
37
  .action-button
34
38
  margin-left: 5px
39
+
35
40
  .sidebar_dragg
36
- background: #FFD976 !important
41
+ background: #ffd976 !important
42
+
37
43
  span.shadow
38
44
  background:
39
45
  color: $black !important
@@ -45,9 +51,11 @@ span.shadow
45
51
  z-index: -1 !important
46
52
  +opacity(0.2)
47
53
  display: none
54
+
48
55
  .create-list,
49
56
  .update-list
50
57
  overflow: hidden
58
+
51
59
  #yellow-sidebar
52
60
  background: $lightYellowBg
53
- font-size: .8em
61
+ font-size: 0.8em
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_uploadify.css.sass CHANGED
@@ -1,19 +1,21 @@
1
1
  .uploadifyQueueItem
2
2
  font: 11px Verdana, Geneva, sans-serif
3
- background-color: #F5F5F5
4
- border: 3px solid #E5E5E5
3
+ background-color: #f5f5f5
4
+ border: 3px solid #e5e5e5
5
5
  margin-top: 5px
6
6
  padding: 10px
7
7
  width: 300px
8
8
  .cancel
9
9
  float: right
10
+
10
11
  .uploadifyProgress
11
- background-color: #FFFFFF
12
- border-top: 1px solid #808080
13
- border-left: 1px solid #808080
14
- border-right: 1px solid #C5C5C5
15
- border-bottom: 1px solid #C5C5C5
12
+ background-color: white
13
+ border-top: 1px solid gray
14
+ border-left: 1px solid gray
15
+ border-right: 1px solid #c5c5c5
16
+ border-bottom: 1px solid #c5c5c5
16
17
  margin-top: 10px
17
18
  width: 100%
19
+
18
20
  .uploadifyProgressBar
19
- background-color: #0099FF
21
+ background-color: #0099ff
data/app/assets/stylesheets/forgeos/admin/forgeos_core/_visuals.css.sass CHANGED
@@ -1,6 +1,6 @@
1
1
  #picture-picture,#image-picture
2
2
  li
3
- +left()
3
+ +left
4
4
  position: relative
5
5
  width: 200px
6
6
  margin: 5px 2px 0 0
@@ -15,14 +15,14 @@
15
15
  img
16
16
  width: 158px
17
17
  height: 158px
18
- .trash, .edit
18
+ .delete, .edit
19
19
  display: block
20
20
  position: absolute
21
21
  height: 0
22
22
  width: 0
23
23
  padding: 0
24
24
  top: 1px
25
- .trash
25
+ .delete
26
26
  background-position: 0 -879px
27
27
  right: 5px
28
28
  top: 7px
@@ -30,11 +30,11 @@
30
30
  background-position: 0 -824px
31
31
  left: 1px
32
32
  &:hover
33
- .trash, .edit
33
+ .delete, .edit
34
34
  height: 24px !important
35
35
  width: 24px !important
36
36
  .handler
37
- background-color: #F2F2F2
37
+ background-color: #f2f2f2
38
38
  border: 1px solid $contentHeaderBorder
39
39
  margin-top: -5px
40
40
  padding: 3px 0
@@ -49,11 +49,11 @@
49
49
  width: 110px
50
50
  margin: auto
51
51
  font-size: 0.9em
52
- +block()
52
+ +block
53
53
 
54
54
  #visuals-picture
55
55
  li
56
- +left()
56
+ +left
57
57
  position: relative
58
58
  width: 50px
59
59
  height: 65px
@@ -70,25 +70,25 @@
70
70
  img
71
71
  width: 158px
72
72
  height: 158px
73
- .trash, .edit
73
+ .delete, .edit
74
74
  display: block
75
75
  position: absolute
76
76
  height: 0
77
77
  width: 0
78
78
  padding: 0
79
79
  top: 1px
80
- .trash
80
+ .delete
81
81
  background-position: 0 -879px
82
82
  left: 24px
83
83
  .edit
84
84
  background-position: 0 -824px
85
85
  left: 1px
86
86
  &:hover
87
- .trash, .edit
87
+ .delete, .edit
88
88
  height: 24px !important
89
89
  width: 24px !important
90
90
  .handler
91
- background-color: #F2F2F2
91
+ background-color: #f2f2f2
92
92
  border: 1px solid $contentHeaderBorder
93
93
  margin-top: -5px
94
94
  padding: 3px 0
@@ -103,7 +103,7 @@
103
103
  width: 110px
104
104
  margin: auto
105
105
  font-size: 0.9em
106
- +block()
106
+ +block
107
107
 
108
108
  .element_form_name
109
109
  width: 600px