woople-theme 0.6.10 → 0.6.11

Sign up to get free protection for your applications and to get access to all the features.
@@ -0,0 +1,17 @@
1
+ $(function() {
2
+ if (!phone()) {
3
+ $('#organization-accounts').popover({
4
+ selector: '.status-alert',
5
+ placement: 'top',
6
+ template: '<div class="popover status-popover"><div class="arrow"></div><div class="popover-inner"><div class="popover-content"><p></p></div></div></div>'
7
+ });
8
+ }
9
+
10
+ $('#organization-accounts button').click(function() {
11
+ alert('Coming soon!');
12
+ });
13
+
14
+ if (phone()) {
15
+ $('#organization-accounts button').addClass('btn-large');
16
+ }
17
+ });
@@ -9,6 +9,8 @@
9
9
  //= require twitter/bootstrap/alert
10
10
  //= require twitter/bootstrap/tab
11
11
  //= require twitter/bootstrap/collapse
12
+ //= require twitter/bootstrap/tooltip
13
+ //= require twitter/bootstrap/popover
12
14
  //= require fastclick.min_
13
15
  //= require jwplayer/jwplayer
14
16
  //= require_tree .
@@ -1,10 +1,113 @@
1
+ @import 'twitter/bootstrap/mixins';
2
+ @import 'woople-theme/variables.css.less';
1
3
  @import 'woople-theme/colours.css.less';
2
4
 
5
+ @status-height: 25px;
6
+ @alert-padding: 2px;
7
+
3
8
  #organization-accounts {
4
- margin: 16px 8px 0px 8px;
9
+ margin: 16px 8px 0 8px;
5
10
  padding-bottom: 8px;
6
11
 
7
12
  .accordion-heading {
8
13
  background-color: @highlightBackground;
9
14
  }
15
+
16
+ .accordion-inner {
17
+ padding-top: 0;
18
+ padding-bottom: 8px;
19
+ }
20
+
21
+ .row-fluid {
22
+ margin-top: 8px;
23
+ }
24
+
25
+ img {
26
+ .border-radius(4px);
27
+ .box-shadow(0 1px 3px rgba(0, 0, 0, 0.125));
28
+ }
29
+
30
+ .span8 {
31
+ padding-top: 1px;
32
+
33
+ a {
34
+ margin-left: 4px;
35
+ vertical-align: middle;
36
+ font-size: 18px;
37
+ font-weight: @title-font-weight;
38
+ }
39
+ }
40
+
41
+ .status-alert {
42
+ margin: 0;
43
+ padding: @alert-padding;
44
+ min-height: @status-height;
45
+ background-image: asset-url('woople-theme/certification/yellow-icon.png');
46
+ background-position: @alert-padding @alert-padding;
47
+
48
+ strong {
49
+ margin-top: 3px;
50
+ margin-left: @status-height + @alert-padding;
51
+ font-size: 18px;
52
+ }
53
+
54
+ span {
55
+ display: none;
56
+ }
57
+ }
58
+
59
+ .status-alert.alert-error {
60
+ background-image: asset-url('woople-theme/certification/red-icon.png');
61
+ }
62
+
63
+ .status-alert.alert-success {
64
+ background-image: asset-url('woople-theme/certification/green-icon.png');
65
+ }
66
+
67
+ @media (-webkit-min-device-pixel-ratio: 2) {
68
+ .status-alert {
69
+ background-size: @status-height @status-height;
70
+ background-image: asset-url('woople-theme/certification/yellow-icon2x.png');
71
+ }
72
+
73
+ .status-alert.alert-error {
74
+ background-image: asset-url('woople-theme/certification/red-icon2x.png');
75
+ }
76
+
77
+ .status-alert.alert-success {
78
+ background-image: asset-url('woople-theme/certification/green-icon2x.png');
79
+ }
80
+ }
81
+
82
+ .remind-column {
83
+ padding-top: 1px;
84
+ text-align: right;
85
+ }
86
+ }
87
+
88
+ @media (max-width: 480px) {
89
+ #organization-accounts {
90
+ .span8 {
91
+ padding-top: 0;
92
+ }
93
+
94
+ .span2 {
95
+ margin-top: 4px;
96
+ }
97
+
98
+ .status-alert {
99
+ span {
100
+ display: block;
101
+ margin: 0 4px 2px;
102
+ }
103
+ }
104
+
105
+ .remind-column {
106
+ padding-top: 0;
107
+ }
108
+
109
+ button {
110
+ width: 100%;
111
+ }
112
+ }
10
113
  }
@@ -0,0 +1,19 @@
1
+ @import 'twitter/bootstrap/mixins';
2
+ @import 'woople-theme/colours.css.less';
3
+
4
+ .status-popover {
5
+ &.top .arrow {
6
+ border-top-color: @primary;
7
+ }
8
+
9
+ .popover-inner {
10
+ width: 224px;
11
+ background-color: @primary;
12
+ }
13
+
14
+ .popover-content {
15
+ .border-radius(3px);
16
+ background-color: @contentBackground;
17
+ color: @secondaryTextColour;
18
+ }
19
+ }
@@ -14,13 +14,13 @@
14
14
  }
15
15
 
16
16
  .menu .red {
17
- background-image:url(/assets/woople-theme/certification/red-icon2x.png);
17
+ background-image: asset-url('woople-theme/certification/red-icon2x.png');
18
18
  }
19
19
 
20
20
  .menu .green {
21
- background-image:url(/assets/woople-theme/certification/red-icon2x.png);
21
+ background-image: asset-url('woople-theme/certification/green-icon2x.png');
22
22
  }
23
23
 
24
24
  .menu .yellow {
25
- background-image:url(/assets/woople-theme/certification/red-icon2x.png);
25
+ background-image: asset-url('woople-theme/certification/yellow-icon2x.png');
26
26
  }
@@ -0,0 +1,13 @@
1
+ require 'explicit_delegator'
2
+
3
+ module WoopleTheme
4
+ module Dashboard
5
+ class AccountUserPresenter < ExplicitDelegator
6
+ enforce_definitions :image, :name, :member_dashboard_path, :status_color, :status_description
7
+
8
+ def image
9
+ __getobj__.image == '/assets/retina_thumb/missing.png' ? 'woople-theme/missing-profile.png' : __getobj__.image
10
+ end
11
+ end
12
+ end
13
+ end
@@ -0,0 +1,12 @@
1
+ <div class="row-fluid">
2
+ <div class="span8">
3
+ <%= image_tag account_user.image, size: '25x25' %>
4
+ <%= link_to account_user.name, account_user.member_dashboard_path %>
5
+ </div>
6
+ <div class="span2">
7
+ <%= status_alert account_user.status_color, account_user.status_description %>
8
+ </div>
9
+ <div class="span2 remind-column">
10
+ <button class="btn btn-primary"><i class="icon-envelope-alt icon-white"></i> Remind</button>
11
+ </div>
12
+ </div>
@@ -6,7 +6,7 @@
6
6
  </div>
7
7
  <div id="<%= account_id %>" class="accordion-body collapse <%= 'in' if organization_account_counter == 0 %>">
8
8
  <div class="accordion-inner">
9
- <!-- Hi mom! -->
9
+ <%= render partial: 'woople-theme/dashboard/account_user', collection: ThemePresentation.wrap_collection(organization_account.users, WoopleTheme::Dashboard::AccountUserPresenter) %>
10
10
  </div>
11
11
  </div>
12
12
  </div>
@@ -1,4 +1,4 @@
1
- <div class="alert <%= status_alert.css_class %> status-alert">
1
+ <div class="alert <%= status_alert.css_class %> status-alert" data-content="<%= status_alert.description %>">
2
2
  <strong class="alert-heading"><%= status_alert.color %></strong>
3
3
  <span><%= status_alert.description %></span>
4
4
  </div>
@@ -1,3 +1,3 @@
1
1
  module WoopleTheme
2
- VERSION = '0.6.10'
2
+ VERSION = '0.6.11'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: woople-theme
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.10
4
+ version: 0.6.11
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-26 00:00:00.000000000 Z
12
+ date: 2012-10-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -163,6 +163,7 @@ files:
163
163
  - app/assets/images/woople-theme/video-js.png
164
164
  - app/assets/javascripts/woople-theme/assessment_form.js.erb
165
165
  - app/assets/javascripts/woople-theme/assessment_overview.js
166
+ - app/assets/javascripts/woople-theme/organization_dashboard.js
166
167
  - app/assets/javascripts/woople-theme/theme.js
167
168
  - app/assets/stylesheets/woople-theme/assessment.css.less
168
169
  - app/assets/stylesheets/woople-theme/base.css.less
@@ -175,6 +176,7 @@ files:
175
176
  - app/assets/stylesheets/woople-theme/dashboard/base.css.less
176
177
  - app/assets/stylesheets/woople-theme/dashboard/organization-accounts.css.less
177
178
  - app/assets/stylesheets/woople-theme/dashboard/status-alert.css.less
179
+ - app/assets/stylesheets/woople-theme/dashboard/status-popover.css.less
178
180
  - app/assets/stylesheets/woople-theme/framework/index.css.less
179
181
  - app/assets/stylesheets/woople-theme/framework/responsive.css.less
180
182
  - app/assets/stylesheets/woople-theme/framework.css
@@ -214,6 +216,7 @@ files:
214
216
  - app/presenters/theme_presentation.rb
215
217
  - app/presenters/woople_theme/answer_presenter.rb
216
218
  - app/presenters/woople_theme/content_item.rb
219
+ - app/presenters/woople_theme/dashboard/account_user_presenter.rb
217
220
  - app/presenters/woople_theme/dashboard/elective_exception_presenter.rb
218
221
  - app/presenters/woople_theme/dashboard/elective_history_presenter.rb
219
222
  - app/presenters/woople_theme/dashboard/electives_section_presenter.rb
@@ -250,6 +253,7 @@ files:
250
253
  - app/views/woople-theme/_profile.html.erb
251
254
  - app/views/woople-theme/_results_header.html.erb
252
255
  - app/views/woople-theme/_video_modal.html.erb
256
+ - app/views/woople-theme/dashboard/_account_user.html.erb
253
257
  - app/views/woople-theme/dashboard/_electives_section.html.erb
254
258
  - app/views/woople-theme/dashboard/_essentials_section.html.erb
255
259
  - app/views/woople-theme/dashboard/_exception.html.erb