social_stream-base 0.9.14 → 0.9.15

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 (53) hide show
  1. data/app/assets/javascripts/activities.js.erb +0 -2
  2. data/app/assets/javascripts/search.js.erb +0 -4
  3. data/app/assets/stylesheets/_colors.scss +22 -0
  4. data/app/assets/stylesheets/{activities.css → activities.css.scss} +20 -23
  5. data/app/assets/stylesheets/{base.css → base.css.scss} +43 -35
  6. data/app/assets/stylesheets/{contacts.css → contacts.css.scss} +5 -3
  7. data/app/assets/stylesheets/footer.css.scss +22 -0
  8. data/app/assets/stylesheets/{frontpage.css → frontpage.css.scss} +7 -13
  9. data/app/assets/stylesheets/{header.css → header.css.scss} +23 -20
  10. data/app/assets/stylesheets/search.css +15 -17
  11. data/app/assets/stylesheets/toolbar.css +7 -0
  12. data/app/controllers/invitations_controller.rb +2 -0
  13. data/app/controllers/search_controller.rb +27 -45
  14. data/app/helpers/contacts_helper.rb +1 -5
  15. data/app/helpers/search_helper.rb +4 -4
  16. data/app/models/actor.rb +1 -3
  17. data/app/views/activity_objects/_activity_object.html.erb +1 -1
  18. data/app/views/contacts/_link.html.erb +9 -0
  19. data/app/views/frontpage/_caracteristics.html.erb +23 -0
  20. data/app/views/frontpage/index.html.erb +3 -25
  21. data/app/views/groups/_index.html.erb +1 -1
  22. data/app/views/invitation_mailer/send_invitation.html.erb +3 -3
  23. data/app/views/invitation_mailer/send_invitation.text.erb +3 -2
  24. data/app/views/invitations/_new.html.erb +2 -2
  25. data/app/views/layouts/_header_dropdown_menu.html.erb +1 -1
  26. data/app/views/layouts/_header_dropdown_menu_sessions.html.erb +1 -1
  27. data/app/views/posts/_new_activity.html.erb +1 -1
  28. data/app/views/posts/_new_activity_fields.erb +6 -0
  29. data/app/views/search/_extended_search.html.erb +14 -0
  30. data/app/views/search/_form.html.erb +25 -13
  31. data/app/views/search/_header_search.html.erb +7 -13
  32. data/app/views/search/_index.html.erb +1 -6
  33. data/app/views/search/_index_frontpage.html.erb +2 -18
  34. data/app/views/search/index.js.erb +1 -1
  35. data/app/views/subjects/_subject_with_details.html.erb +1 -1
  36. data/app/views/toolbar/_home.html.erb +1 -1
  37. data/app/views/toolbar/_messages.html.erb +1 -1
  38. data/app/views/toolbar/_subject.html.erb +10 -0
  39. data/app/views/users/_index.html.erb +1 -1
  40. data/config/locales/en.yml +13 -22
  41. data/config/locales/es.yml +356 -0
  42. data/lib/generators/social_stream/base/templates/initializer.rb +6 -0
  43. data/lib/social_stream/base/version.rb +1 -1
  44. data/lib/social_stream/models/object.rb +7 -1
  45. data/lib/social_stream-base.rb +8 -0
  46. data/social_stream-base.gemspec +2 -0
  47. data/spec/controllers/invitations_controller_spec.rb +34 -0
  48. data/spec/dummy/config/initializers/social_stream.rb +6 -0
  49. data/spec/support/thinking-sphinx.rb +10 -0
  50. metadata +50 -28
  51. data/app/assets/stylesheets/footer.css +0 -26
  52. data/app/views/search/_focus_search.html.erb +0 -17
  53. data/app/views/search/_global_search.html.erb +0 -19
@@ -7,8 +7,6 @@ $(function() {
7
7
  $('#new_<%= SocialStream.activity_forms.first %>').show();
8
8
  $('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
9
9
  $('#security').chosen();
10
- $("#input_activities").Watermark("<%= I18n.t('activity.input') %>","#666");
11
- $("#event_name").Watermark("<%= I18n.t('event.input') %>","#666");
12
10
  });
13
11
 
14
12
 
@@ -1,7 +1,3 @@
1
1
  // index
2
2
  //= require ajax.paginate
3
3
  //= require jquery.validate
4
-
5
- $(document).ready(function(){
6
- $("#global_search_input").Watermark("<%= I18n.t('search.write') %>");
7
- });
@@ -0,0 +1,22 @@
1
+ /**NOTICE**/
2
+ $alert-color: #9F6000;
3
+ $alert-background: #FEEFB3;
4
+ $error-color: #D8000C;
5
+ $error-background: #FFBABA;
6
+ $success-color: #4F8A10;
7
+ $success-background: #DFF2BF;
8
+
9
+ /**BLUES**/
10
+ $auxiliar-color: #879EB5;
11
+ $input-border-color: #BDC7D8;
12
+ $main-color: #1F4A75; /* #2A3890*/
13
+ $secondary-color: #DEEFF8;
14
+ $separation-color: #D4E4EA;
15
+
16
+ /**GREYS**/
17
+ $details-color: #666;
18
+ $fill-color: #f5f5f5;
19
+
20
+ /**OTHERS**/
21
+ $sentence-color: #000;
22
+ $text-over-main: #FFF;
@@ -3,6 +3,7 @@
3
3
  *= require chosen
4
4
  */
5
5
 
6
+ @import "colors";
6
7
 
7
8
  /****************** WALL - ACTIVITIES *********************/
8
9
  #wrapper_activities {}
@@ -10,30 +11,30 @@
10
11
 
11
12
 
12
13
  /****************** WALL - HEADER *********************/
13
- #wrapper_activities_header { padding-top: 5px; padding-bottom: 5px; background-color: #deeff8;}
14
+ #wrapper_activities_header { padding-top: 5px; padding-bottom: 5px; background-color: $secondary-color;}
14
15
  #activities_title { vertical-align: top; margin-left: 10px; font-weight: bold;}
15
16
  #activities_header { width: 100%; margin-bottom: 5px; text-align: center; padding-top: 5px;}
16
- #activities_header input[type="text"] { border-color: #0656a4; color: #2A3890; padding: 5px 5px 5px 5px;
17
- border:1px solid #BDC7D8; width:95%;}
17
+ #activities_header input[type="text"] { color: $main-color; padding: 5px 5px 5px 5px; width:95%;
18
+ border:1px solid $input-border-color;}
18
19
  #activities_share_btn { text-align: right; padding: 5px 16px 0px 10px; vertical-align: middle;}
19
20
  #securities{ display:inline-block; text-align:left; float: left; padding-left:5px;}
20
21
 
21
22
  /******************* WALL - ACTIVITY ***************/
22
23
  .super_activity{width: 95%;}
23
24
  .activity { text-align:left; display: block; vertical-align: top; padding: 10px 0px 5px 0px;
24
- display: inline-block; color: #000; font-size: 13px; color: #2A3890;border-bottom:1px solid #E9E9E9;}
25
+ display: inline-block; color: $sentence-color; font-size: 13px; color: $main-color;border-bottom:1px solid #E9E9E9;}
25
26
  .actor_logo { width: 38px; padding: 8px 0px 5px 5px; display: inline-block; vertical-align: top;}
26
- .activity_content { padding: 0px; display: inline-block; color: #000; width: 89%;}
27
+ .activity_content { padding: 0px; display: inline-block; color: $sentence-color; width: 89%;}
27
28
  .actor_name {font-size: 13px;}
28
29
  .actor_name a{font-weight: bold;}
29
- .post a { color: #2A3890;}
30
+ .post a { color: $main-color;}
30
31
 
31
32
  /***************** ACTIVITY OPTIONS ***/
32
- .activity_options { color: #2A3890; font-size: 10px; display: inline-block;}
33
- .actor_name-activity_objects, .actor_name_new_comment{ font-weight: bold; color: #2A3890; font-size:12px; margin: 5px 0px;}
33
+ .activity_options { color: $main-color; font-size: 10px; display: inline-block;}
34
+ .actor_name-activity_objects, .actor_name_new_comment{ font-weight: bold; color: $main-color; font-size:12px; margin: 5px 0px;}
34
35
  .activity_objects{padding-bottom:5px;}
35
- .subactivity_objects{ color: #000; font-weight:normal; font-size:11px;}
36
- .post_time_ago { color: #6c6d6f;}
36
+ .subactivity_objects{ color: $sentence-color; font-weight:normal; font-size:11px;}
37
+ .post_time_ago { color: $details-color;}
37
38
  .activity_options { list-style:none; margin:0; padding:0;}
38
39
  .activity_options li { padding-left:0px; padding-right:5px; float:left;}
39
40
  .activity_options li a { text-decoration:none;}
@@ -48,31 +49,27 @@
48
49
  /************* ACTIVITY - FOOTER *********/
49
50
  .space_comments { padding-top: 1px; padding-bottom: 1px;}
50
51
  .space_activities { text-align:center; padding: 0px 0px 0px 1px; width:100%;}
51
- .space_sub_activities{ padding: 1px 30px 0px 30px; border-bottom: thin solid #D4E4E4;
52
- width:100%; text-align:center; display: inline;}
53
- .space_sub{ display: inline; padding: 1px 200px 1px 200px; border-bottom: thin solid #D4E4E4;
52
+ .space_sub{ display: inline; padding: 1px 200px 1px 200px; border-bottom: thin solid $separation-color;
54
53
  font-size: 2px; text-align:center;}
55
54
 
56
55
 
57
56
  /****************** SUB-ACTIVITY by ACTIVITY ********/
58
57
 
59
58
 
60
- .activity_new_comment{ font-size: 11px; padding-left: 5px; background: #deeff8;
61
- border: thin solid #D4E4E4; padding-top: 3px; padding-bottom: 3px;display:none;}
59
+ .activity_new_comment{ font-size: 11px; padding-left: 5px; background: $secondary-color;
60
+ border: thin solid $separation-color; padding-top: 3px; padding-bottom: 3px;display:none;}
62
61
  .actor_logo_subactivity, .actor_logo_new_comment{ width: 40px; padding: 5px 3px 5px 2px; display: inline-block;
63
62
  vertical-align: top;}
64
- .input_new_comments{ border:1px solid #BDC7D8; width:98%; padding: 2px; color:#2A3890; resize: none;
65
- position: absolute; height: 100%; overflow: hidden; font-size:inherit;}
66
- .subactivity{ font-size: 11px; padding: 0px 5px 0px 5px; background: #deeff8;
67
- border: thin solid #D4E4E4; display:block; }
63
+ .input_new_comments{ border:1px solid $input-border-color; width:98%; padding: 2px; color:$main-color;
64
+ resize: none; position: absolute; height: 100%; overflow: hidden; font-size:inherit;}
65
+ .subactivity{ font-size: 11px; padding: 0px 5px 0px 5px; background: $secondary-color;
66
+ border: thin solid $separation-color; display:block; }
68
67
  .space_comments { padding-top: 1px; padding-bottom: 1px;}
69
- #input_activities { border-color: #0656a4; color: #2A3890; padding: 5px 5px 5px 5px;
70
- border:1px solid #BDC7D8;}
71
68
  #activities_share_btn { text-align: right; padding: 5px 16px 0px 10px; vertical-align: middle;}
72
69
  .activities_comment_btn{ text-align: right; padding: 5px 5px 2px 10px; vertical-align: middle;}
73
70
 
74
- .hide_show_comments{font-size: 11px; padding: 3px 10px; background: #deeff8;
75
- border: thin solid #D4E4E4;}
71
+ .hide_show_comments{font-size: 11px; padding: 3px 10px; background: $secondary-color;
72
+ border: thin solid $separation-color;}
76
73
  .new_comment{ width: 465px;}
77
74
  .new_comment_shown{ width: 410px;}
78
75
 
@@ -1,3 +1,5 @@
1
+ @import "colors";
2
+
1
3
  /*************Basic SECTION ********************/
2
4
  * { margin: 0; padding: 0; font-family: Arial; }
3
5
  html, body {height: auto;}
@@ -8,15 +10,15 @@ img { border: 0px;}
8
10
  div { margin: 0px; padding: 0px; font-family: Helvetica; font-size: 11px;}
9
11
  .AbsWrap { width: 100%; position: relative;}
10
12
  .rowWrap { width: 100%;}
11
- a:link,a:visited { color: #2A3890; text-decoration: inherit;}
13
+ a:link,a:visited { color: $main-color; text-decoration: inherit;}
12
14
  a:hover { text-decoration: underline;}
13
15
  .clearfloat { clear: both; height: 0px;}
14
16
  h2{padding-left:10px;}
15
17
 
16
18
 
17
19
  /******* Main Structure SECTION***************************/
18
- body{font-size:1.0em; color:#2A3890; background-color:#ffffff; overflow-y: scroll;}
19
- #wrapper { background-color: #f5f5f5; width: 100%; margin: 0px auto; }
20
+ body{font-size:1.0em; color: $main-color; background-color:$text-over-main; overflow-y: scroll;}
21
+ #wrapper { background-color: $fill-color; width: 100%; margin: 0px auto; }
20
22
  #wrapper_body{min-height: 552px; width: 960px; margin:0px auto; margin-left: auto; margin-right: auto;
21
23
  margin-top: auto; margin-bottom:auto; background-image:none; padding-bottom: 9px;}
22
24
 
@@ -36,37 +38,41 @@ margin-top: auto; margin-bottom:auto; background-image:none; padding-bottom: 9px
36
38
  margin-left:40px;
37
39
 
38
40
  }
39
- label.validation_error{color: #D8000C;background-color: #FFBABA;border: 1px solid;
41
+ label.validation_error{color: $error-color;background-color: $error-background;border: 1px solid;
40
42
  display: block;padding-left:5px;padding-right:5px;width:90%;}
41
- .notice {border-color:#BDC7D8; color: #1F4A75;background-color: #DEEFF8;background-image: url('btn/info.png');}
42
- .success {color: #4F8A10;background-color: #DFF2BF;background-image:url('btn/success.png');}
43
- .alert {color: #9F6000;background-color: #FEEFB3;background-image: url('btn/warning.png');}
44
- .error, #error_explanation {color: #D8000C;background-color: #FFBABA;background-image: url('btn/error.png');}
43
+ .notice {border-color:$input-border-color; color: $main-color;background-color: $secondary-color;
44
+ background-image: url('btn/info.png');}
45
+ .success {border-color: $success-color;color: $success-color;background-color: $success-background;
46
+ background-image:url('btn/success.png');}
47
+ .alert {border-color: $alert-color; color: $alert-color;background-color: $alert-background;
48
+ background-image: url('btn/warning.png');}
49
+ .error, #error_explanation {border-color: $error-color; color: $error-color;background-color: $error-background;
50
+ background-image: url('btn/error.png');}
45
51
 
46
52
  /************Forms SECTION **************/
47
- input.other_blue{ background-color:#497FC1 !important; border:0px; cursor:pointer; line-height:135%;
53
+ input.other_blue{ background-color:$auxiliar-color !important; border:0px; cursor:pointer; line-height:135%;
48
54
  padding: 1px 5px !important; margin: 5px 0px !important;}
49
- textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
55
+ textarea.new_contact_text_area{ height: 100px; color: $main-color;}
50
56
  .colum_field_title{ text-align: center; }
51
- .needed{color:#6C6D6F;font-weight: normal;}
52
- .select_relations select{ font-size: 12px; color: white; background-color:#1F4A75;}
57
+ .needed{color:$details-color;font-weight: normal;}
58
+ .select_relations select{ font-size: 12px; color: white; background-color:$main-color;}
53
59
 
54
60
  /************ Forms - Buttons SECTION ***************************/
55
61
 
56
62
 
57
- button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;color:#FFFFFF;
58
- background-color: #1F4A75; -moz-border-radius: 6px; -webkit-border-radius: 6px;
63
+ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;color:$text-over-main;
64
+ background-color: $main-color; -moz-border-radius: 6px; -webkit-border-radius: 6px;
59
65
  border-radius: 6px; font-size: 13px;}
60
66
  .optionHeader {
61
- color: #fff;
67
+ color: $text-over-main;
62
68
  overflow: hidden;
63
- background-color: #1F4A75;
69
+ background-color: $main-color;
64
70
  }
65
71
 
66
72
 
67
73
  /************** BLOCK DIV SECTION *********/
68
74
  .block { display:block;}
69
- .block .brief { color: #6C6D6F;}
75
+ .block .brief { color: $details-color;}
70
76
  .block .center{ text-align:center;}
71
77
  .block .close { float:right; vertical-align:top;}
72
78
  .block .content{ padding: 5px 4px 5px 4px; }
@@ -84,16 +90,15 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
84
90
  .block .close_add_contact { float:right; vertical-align:top; margin-right: 1%; }
85
91
 
86
92
  /******BLOCK TAB CONTENT SECTION********/
87
- .block .tab { margin-top: 2px; background: #fff; /*border-top: thin solid #D4E4EA;*/
88
- padding: 2px 0px 2px 0px;}
93
+ .block .tab { margin-top: 2px; background: $text-over-main; padding: 2px 0px 2px 0px;}
89
94
  .block .tab_content{ padding:5px; text-align:center;}
90
95
  .block .tab li { display: inline; list-style: none; padding-right: 2px;}
91
- .block .tab li a { background-color: #deeff8; text-decoration: none; padding: 4px 3px; outline: none;}
92
- .block .tab ul { background: #deeff8;}
96
+ .block .tab li a { background-color: $secondary-color; text-decoration: none; padding: 4px 3px; outline: none;}
97
+ .block .tab ul { background: $secondary-color;}
93
98
  .block .tab li a:hover,
94
99
  .block .tab li.ui-tabs-nav a,
95
100
  .block .tab li.ui-tabs-selected a,
96
- .block .tab li a:active { background-color: #deeff8; font-weight: bold; text-decoration: none;}
101
+ .block .tab li a:active { background-color: $separation-color; font-weight: bold; text-decoration: none;}
97
102
  .block .tab_browse{ width:49%; display:inline-block;}
98
103
  .ui-tabs-hide { display: none;}
99
104
 
@@ -101,15 +106,16 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
101
106
  /******** FORMS SECTION *******/
102
107
  .block .form_comment{ font-weight:normal;}
103
108
  .block .field{ display:inline; padding: 0px; width:50%;}
104
- .block .form_tag{border-color: #0656a4; color: #2A3890; padding: 5px 5px 5px 5px; border:1px solid #BDC7D8; width:90%;}
105
- .block .form_tag_long{border-color: #0656a4; color: #2A3890; padding: 5px 5px 5px 5px; border:1px solid #BDC7D8; width:91%;}
109
+ .block .form_tag{color: $main-color; padding: 5px 5px 5px 5px; border:1px solid $input-border-color; width:90%;}
110
+ .block .form_tag_long{color: $main-color; padding: 5px 5px 5px 5px; border:1px solid $input-border-color; width:91%;}
106
111
  .block .form_label{display:inline-block; width:25%; font-weight:bold; vertical-align:10%; padding-top:3px;}
107
112
  .block .form_field{ display:inline-block; padding: 0px; width:73%;}
108
113
  .block .form_row {display: block; padding:5px; padding-left:20px;}
109
114
  .block .form_sub_row {display: block; padding:5px; padding-left:30px;}
110
115
  .block .label{ display:inline-block; width:49%; }
111
116
  .block .two_columns_container { margin-top: 5px; }
112
- .block .form_column_left { display: block; padding:5px; padding-left:20px; float: left; width:60%; text-align: center;}
117
+ .block .form_column_left { display: block; padding:5px; padding-left:20px; float: left; width:60%;
118
+ text-align: center;}
113
119
  .block .form_column_right { display: block; padding: 5px 10px 5px 10px; float:right; width:31%; text-align: center;}
114
120
  .block .form_bottom { display: block; padding:5px; padding-left:20px; clear:both; text-align: center; }
115
121
  .block .select_relations{ padding-top:20px; text-align: center; }
@@ -127,10 +133,9 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
127
133
  .line{ display:block; margin:10px 2px 10px 10px;}
128
134
 
129
135
  /*************MENU ICON SECTION**********/
130
- .menu_header{ border-bottom: thin solid #D4E4EA; width:14.5em; padding-left:3px; padding-right:3px;}
131
- .menu_icon{ vertical-align: middle; padding-bottom: 3px; padding-right: 3px; padding-left: 3px; display: inline-block;}
132
-
133
-
136
+ .menu_header{ border-bottom: thin solid $separation-color; width:14.5em; padding-left:3px; padding-right:3px;}
137
+ .menu_icon{ vertical-align: middle; padding-bottom: 3px; padding-right: 3px; padding-left: 3px;
138
+ display: inline-block;}
134
139
 
135
140
  /*************SPACES SECTION *************/
136
141
  .space_center { padding-top: 9px; padding-right: 4px; text-align: center;}
@@ -154,7 +159,7 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
154
159
  left: 23px;
155
160
  float: left;
156
161
  position: absolute;
157
- background: #E0EEF5;
162
+ background: $secondary-color;
158
163
  opacity: 0.8;
159
164
  width: 119px;
160
165
  height: 18px;
@@ -175,7 +180,7 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
175
180
  margin-right: 10px;
176
181
  margin-bottom: 5px;
177
182
  border: 2px solid transparent;
178
- color: #000000;
183
+ color: $sentence-color;
179
184
  }
180
185
 
181
186
  .activities_title_header img{
@@ -213,18 +218,21 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
213
218
  display: inline;
214
219
  }
215
220
  .menu_plain_list li span:hover {
216
- background: #CFDEFF;
217
- color: #2A3890;
221
+ background: $separation-color;
218
222
  }
219
223
  .menu_plain_list li a:hover {
220
224
  text-decoration: none;
221
225
  }
222
226
  .menu_plain_list li span {
223
227
  padding: 5px 10px;
224
- background-color: #E1EEF5;
228
+ background-color: $secondary-color;
225
229
  }
226
230
  .menu_plain_list li span.selected {
227
- border: solid 1px #2A3890;
231
+ border: solid 1px $main-color;
232
+ }
233
+ .menu_plain_list li span.disabled {
234
+ background-color: $fill-color;
235
+ color: $input-border-color;
228
236
  }
229
237
 
230
238
  .menu_plain_list img{
@@ -1,3 +1,5 @@
1
+ @import "colors";
2
+
1
3
  #contact-form {
2
4
  margin: 25px 45px 25px 45px;
3
5
  }
@@ -15,7 +17,7 @@
15
17
 
16
18
  div.sphere-name {
17
19
  font-weight: bold;
18
- color: #1F4A75;
20
+ color: $main-color;
19
21
  }
20
22
 
21
23
  #relation-new {
@@ -39,7 +41,7 @@ div.sphere-name {
39
41
  }
40
42
 
41
43
  .ui-radio-state-disabled, .ui-radio-state-checked-disabled, .ui-radio-state-disabled-hover, .ui-radio-state-checked-disabled-hover {
42
- color: #999;
44
+ color: $details-color;
43
45
  }
44
46
 
45
47
  span.ui-checkbox, span.ui-radio {
@@ -87,6 +89,6 @@ span.ui-radio-state-checked-hover {
87
89
  }
88
90
 
89
91
  .checked-option{
90
- background-color: #dfecf1;
92
+ background-color: $secondary-color;
91
93
  }
92
94
 
@@ -0,0 +1,22 @@
1
+ @import "colors";
2
+
3
+ #sponsor-wrapper{ text-align:right; vertical-align:middle;}
4
+ #sponsor{width:960px;margin:0 auto;color:$details-color; }
5
+
6
+ #footer{width: 960px;margin-left: auto;margin-right: auto;padding: 0;position: relative; text-align:center;
7
+ clear:left;font-size:0.9166em;line-height:1.6363;color:$details-color;padding:0.75em 0;}
8
+ #footer ul, #sponsor ul{list-style-type:none;margin:0 0.5em; }
9
+ #footer ul li,#sponsor ul li{display:inline-block;margin-right:0.25em;position:relative;}
10
+ #footer ul li#trade_mark,#sponsor ul li#trademark{font-weight:bold;color:$sentence-color;}
11
+ #footer ul li#trade_mark_logo{font-weight:normal;}
12
+ #footer a, #sponsor a{color:$details-color;}
13
+ #footer a:hover, #sponsor a:hover{color:$sentence-color; text-decoration: underline;}
14
+ #footer .icon,#global .icon{margin-bottom:-4px;}
15
+ #footer-wrapper{background-color:$secondary-color;}
16
+ #footer_right{font-weight:normal;}
17
+ #footer_right{ font-size: 10px; line-height: 1.1em;}
18
+
19
+
20
+ #footerFront { width: 100%; padding: 0; background: $secondary-color;}
21
+
22
+ .rowfooter{float:right;}
@@ -1,27 +1,21 @@
1
+ @import "colors";
2
+
1
3
  /********************** BÚSQUEDA *****************/
2
4
  .banner_busqueda { width:960px; height:61px; margin-left:auto; margin-right:auto; padding:0;
3
5
  position:relative; padding-top:10px;}
4
- .div_busqueda { color:#0656a4; width:248px; display:inline-block; text-align: right;
5
- vertical-align: top; font-size: 12px;}
6
- .div_busqueda #subtexto_busqueda { padding-bottom: 8px; height:12px;}
7
- .div_busqueda #input_find{ position:relative; border-color:#0656a4; padding: 0px; border: 1px inset;}
8
- .div_busqueda #find_button{ width:15px; border:0px; height:15px;}
9
- .div_busqueda .a_border{ border-right:thin solid; color:#0656a4; padding:0px 7px; text-decoration:underline;}
10
- .div_busqueda a{ color:#0656a4; padding:0px 7px; text-decoration:underline;}
11
- #espacio_busqueda { width:652px; margin-left:20px; height:45px; margin-bottom:0px; float:left;
12
- display:inline;}
6
+ #espacio_busqueda { width:652px; margin-left:20px; height:45px; margin-bottom:0px; float:left; display:inline;}
13
7
  #form_busqueda{ padding-top:3px;}
14
8
  span.find{ padding-right:5px;}
15
9
 
16
10
  /************** sub structure Frontpage **************/
17
11
  #devise_links {padding: 20px 0 5px 5px; margin-left: 20%;}
18
- #devise_links a{font-weight: bold;line-height: 15px; color: #777;}
12
+ #devise_links a{font-weight: bold;line-height: 15px; color: $details-color;}
19
13
  #login{ padding-top: 5px;}
20
14
  .instructions{text-align: left; padding-bottom: 5px;}
21
15
  #remember{padding-left:22%; text-align: left;}
22
16
  #welcome #user_password_confirmation{vertical-align: 30%;}
23
17
  #welcome #user_password_confirmation_label {padding-top: 0;}
24
- #welcome{ margin: 50px auto 50px auto; width:330px; padding:20px; border: 4px solid #BDC7D8;
18
+ #welcome{ margin: 50px auto 50px auto; width:330px; padding:20px; border: 4px solid $input-border-color;
25
19
  background-color: white;-moz-border-radius: 20px;
26
20
  -webkit-border-radius: 20px; border-radius: 20px;}
27
21
  #welcome .form_field{ width: 75%;}
@@ -37,7 +31,7 @@ span.find{ padding-right:5px;}
37
31
 
38
32
  /***************** content Frontpage *****************/
39
33
  .espacio{height:10px;}
40
- #frontpage_title{ font-size: 17px; font-weight:bold; color: #1F4A75; vertical-align: top; margin: 0px;
34
+ #frontpage_title{ font-size: 17px; font-weight:bold; color: $main-color; vertical-align: top; margin: 0px;
41
35
  text-align: center; padding: 0px;}
42
36
  .icon{ display:inline-block; width:60px }
43
37
  #icon_share{ background: transparent url(frontpage/share.png); width:56px; height:57px;}
@@ -50,7 +44,7 @@ span.find{ padding-right:5px;}
50
44
  .sentences li.purple{ list-style-image:url("frontpage/purple_sq.png");}
51
45
  .sentences li.green{ list-style-image:url("frontpage/green_sq.png");}
52
46
  .sentences li.yellow{ list-style-image:url("frontpage/yellow_sq.png");}
53
- #text_bottom_title{ font-size: 14px; color: #000; font-weight: bold;}
47
+ #text_bottom_title{ font-size: 14px; color: $sentence-color; font-weight: bold;}
54
48
 
55
49
 
56
50
  /*********** TEXT Frontpage **********/
@@ -1,5 +1,7 @@
1
+ @import "colors";
2
+
1
3
  /****************** HEADER STRUCTURE ******/
2
- #headerFront { width: 100%; padding: 0; background: #1F4A75; padding: 2px 0px 0px 0px;}
4
+ #headerFront { width: 100%; padding: 0; background: $main-color; padding: 2px 0px 0px 0px;}
3
5
  #header_left { left: 0px; float: left; padding-left: 5px;}
4
6
  #header_right { right: 0px; float: right; padding-right: 10px; }
5
7
  .banner_top{ width: 960px; margin-left: auto; margin-right: auto; margin-top: 3px; padding-bottom: 3px;
@@ -7,11 +9,11 @@
7
9
  .banner_top_height{ height:23px;}
8
10
 
9
11
  /********** CONTENT ************/
10
- #headerFront .div_login a{ color:#FFFFFF; padding-right: 2px; }
12
+ #headerFront .div_login a{ color:$text-over-main; padding-right: 2px; }
11
13
  #headerFront .div_login a:hover{text-decoration:underline; }
12
14
  #logo{ width:218px; height:50px; float:left; vertical-align:top; }
13
- #logo_txt {color: #fff; display: inline; vertical-align: top; padding-top: 2px; }
14
- .div_login { color:#FFF; width:65%; display:inline-block; text-align: right; vertical-align: top;
15
+ #logo_txt {color: $text-over-main; display: inline; vertical-align: top; padding-top: 2px; }
16
+ .div_login { color:$text-over-main; width:65%; display:inline-block; text-align: right; vertical-align: top;
15
17
  padding-top: 5px; font-weight:normal; margin-top:3px; float:right; }
16
18
  .div_login #username{ height:10px; }
17
19
  .div_login, .input_username{ position:relative; padding: 0px; border: 0px; }
@@ -19,16 +21,16 @@
19
21
  .div_login #login_data{display: block;}
20
22
  .div_login .login_data_block{ display: inline-block; padding-left: 10px;}
21
23
  .div_login .login_data_block input{ width: 250px;}
22
- .div_login a.login{ background-color:#497FC1; padding-right:2px; padding-left:2px; color:white; }
23
24
  .div_login .subtexto{ padding-top: 8px; height:20px; font-size: 11px; }
24
25
  .div_login .a_border{ border-right:thin solid; padding-right:7px; text-decoration:underline; }
25
26
  #new_representation { display: inline-block;}
26
- #header_notifications a{color: white; background: transparent url('btn/header_notifications.png') no-repeat center center;padding: 4px 10px 6px 11px;}
27
- #header_inbox_count a{ color: white; background-color: #879eb5; padding: 2px 7px 2px 7px;}
27
+ #header_notifications a{color: white; padding: 4px 10px 6px 11px;
28
+ background: transparent url('btn/header_notifications.png') no-repeat center center;}
29
+ #header_inbox_count a{ color: white; background-color: $auxiliar-color; padding: 2px 7px 2px 7px;}
28
30
  #representation { display: inline; padding-left:3px; padding-right:3px;}
29
- .txt_config {color: #fff; vertical-align: top; display: inline; padding-top: 2px; border-right: thin solid;
30
- padding-right: 3px;}
31
- .txt_config2 {color: #fff; vertical-align: top; display: inline; padding-top: 2px; padding-right: 3px;}
31
+ .txt_config {color: $text-over-main; vertical-align: top; display: inline; padding-top: 2px;
32
+ border-right: thin solid; padding-right: 3px;}
33
+ .txt_config2 {color: $text-over-main; vertical-align: top; display: inline; padding-top: 2px; padding-right: 3px;}
32
34
 
33
35
 
34
36
  /******** MENU HEADER *******/
@@ -38,20 +40,21 @@
38
40
  #menu_home ul {list-style: none; margin: 0px; float:left;}
39
41
  #menu_home ul li {line-height:20px; vertical-align:top;}
40
42
 
41
- #header_dropdown_menu,.header_dropdown_li {width: 120px;display:inline-block;vertical-align: top; height:22px; color:#FFF;}
43
+ #header_dropdown_menu,.header_dropdown_li {width: 120px;display:inline-block;vertical-align: top; height:22px;
44
+ color:$text-over-main;}
42
45
 
43
46
  #header_dropdown_menu ul li {width: 120px;line-height: 15px;}
44
47
  #header_dropdown_menu ul li a{padding: .40em 1em .70em 2.5em;}
45
- #header_dropdown_menu ul li a:hover{color:#1F4A75;}
48
+ #header_dropdown_menu ul li a:hover{color:$main-color;}
46
49
  #header_dropdown_menu ul li ul li a{padding: .40em 1em .70em 1em;}
47
50
  #header_dropdown_menu ul li ul li ul li a{padding: .40em 1em .70em 2.5em;}
48
51
  #header_dropdown_menu ul li ul li ul{position: absolute; left: -120px;}
49
52
  #header_dropdown_menu a.session_change{background: transparent url('btn/arrow_session_change.png') no-repeat 3px 6px;}
50
53
 
51
54
  #menu_home ul li.pipe,#menu_account ul li.pipe{padding:0; margin:0;font-size: 20px;font-weight: bold;}
52
- .menu_white{display:inline-block; color:#fff;}
55
+ .menu_white{display:inline-block; color:$text-over-main;}
53
56
  .white_link{padding-top:3px; vertical-align:top; display:inline-block;}
54
- .black{color:#000; font-weight:bold;}
57
+ .black{color:$sentence-color; font-weight:bold;}
55
58
 
56
59
 
57
60
  /*** ESSENTIAL STYLES ***/
@@ -117,24 +120,24 @@ ul.sf-menu li li li.sfHover ul {
117
120
  text-decoration:none;
118
121
  }
119
122
  .sf-menu a, .sf-menu a:visited { /* visited pseudo selector so IE6 applies text colour*/
120
- color: #fff;
123
+ color: $text-over-main;
121
124
  padding-right:0px;
122
125
 
123
126
  }
124
127
  .sf-menu li {
125
- background: #1F4A75;
128
+ background: $main-color;
126
129
  }
127
130
 
128
131
  .sf-menu li li {
129
- background: #1F4A75;
132
+ background: $main-color;
130
133
  }
131
134
  .sf-menu li li li {
132
- background: #1F4A75;
135
+ background: $main-color;
133
136
  }
134
137
  .sf-menu li:hover, .sf-menu li.sfHover,
135
138
  .sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
136
- background: #CFDEFF;
137
- color: #1F4A75;
139
+ background: $secondary-color;
140
+ color: $main-color;
138
141
  outline: 0;
139
142
  }
140
143
 
@@ -36,7 +36,7 @@
36
36
  overflow: hidden;
37
37
  position: absolute;
38
38
  z-index: 2000;
39
- background: whiteSmoke;
39
+ background: #f5f5f5;
40
40
  text-align: left;
41
41
  }
42
42
  #header_search_display a {
@@ -53,7 +53,7 @@
53
53
  border-top: solid 1px #B9B9B9;
54
54
  font-size: 10px;
55
55
  height: 35px;
56
- background: whiteSmoke;
56
+ background: #f5f5f5;
57
57
  overflow: hidden;
58
58
  text-align: center;
59
59
  }
@@ -79,7 +79,7 @@
79
79
  #header_search_display li .link {
80
80
  display: none;
81
81
  }
82
- #header_search_display li.subject_result {
82
+ #header_search_display li.result {
83
83
  padding: 0px;
84
84
  height: 45px;
85
85
  text-align: left;
@@ -111,13 +111,23 @@
111
111
  .search_row {
112
112
  text-align: center;
113
113
  }
114
- .subject_with_details {
114
+ .model_with_details {
115
115
  padding: 5px;
116
116
  }
117
117
  .subject_search_results {
118
- width: 280px;
118
+ width: 186px;
119
119
  text-align: center;
120
120
  }
121
+ .subject_search_results img {
122
+ width: 48px;
123
+ height: 48px;
124
+ }
125
+ .subject_search_results .sub-block {
126
+ width: 62%;
127
+ word-wrap: break-word;
128
+ height: 50px;
129
+ overflow: hidden;
130
+ }
121
131
  #search_results {
122
132
  text-align: center;
123
133
  }
@@ -129,20 +139,8 @@
129
139
  float: right;
130
140
  padding: 0;
131
141
  }
132
- #search_results .title {
133
- width: 540px;
134
- margin: auto;
135
- background-color: #E1EEF5;
136
- padding: 5px;
137
- font-weight: bold;
138
- text-align: center;
139
- }
140
- #search_results .subject_search_results .title {
141
- width: 260px;
142
- }
143
142
  /********************************* Form and errors *********/
144
143
  #search_form .error {
145
144
  display: none;
146
145
  }
147
-
148
146
  /******************** Search css END ***********************/
@@ -1,3 +1,10 @@
1
1
  /*
2
2
  *= require menu
3
3
  */
4
+
5
+ #toolbar .model_with_details .sub-block{
6
+ width:62%;
7
+ word-wrap: break-word;
8
+ height: 50px;
9
+ overflow: hidden;
10
+ }
@@ -1,4 +1,6 @@
1
1
  class InvitationsController < ApplicationController
2
+ before_filter :authenticate_user!
3
+
2
4
  def new
3
5
 
4
6
  end