carrier 0.1.4 → 0.1.5

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 (13) hide show
  1. data/VERSION +1 -1
  2. data/app/assets/stylesheets/carrier/carrier.css +41 -41
  3. data/app/views/carrier/messages/_form.html.erb +3 -3
  4. data/app/views/carrier/messages/_index_message.html.erb +6 -6
  5. data/app/views/carrier/messages/_message_collapsed.html.erb +5 -5
  6. data/app/views/carrier/messages/_message_expanded.html.erb +5 -5
  7. data/app/views/carrier/messages/_reply.html.erb +1 -1
  8. data/app/views/carrier/messages/as_sent.html.erb +6 -6
  9. data/app/views/carrier/messages/new.html.erb +2 -1
  10. data/app/views/carrier/messages/show.html.erb +6 -6
  11. data/carrier.gemspec +1 -1
  12. data/lib/carrier/version.rb +1 -1
  13. metadata +2 -2
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.4
1
+ 0.1.5
data/app/assets/stylesheets/carrier/carrier.css CHANGED
@@ -113,7 +113,7 @@ a, a:link, a:visited {text-decoration:none;}
113
113
  margin: 0 auto;
114
114
  padding: 40px;
115
115
  }
116
- .message_ma_wrapper {
116
+ .carrier_message_wrapper {
117
117
  padding:12px;
118
118
  display:block;
119
119
  border-radius: 6px;
@@ -124,63 +124,63 @@ a, a:link, a:visited {text-decoration:none;}
124
124
  margin-bottom:4px;
125
125
  color:#000;
126
126
  }
127
- .message_ma_wrapper:link, .message_ma_wrapper:visited {
127
+ .carrier_message_wrapper:link, .carrier_message_wrapper:visited {
128
128
  background-color:#ddd;
129
129
  color:#000;
130
130
  }
131
- .message_ma_wrapper.ma_has_new {background-color:#eee; border:1px solid #ddd;}
132
- .message_ma_wrapper:hover,
133
- .message_ma_wrapper.ma_open {
131
+ .carrier_message_wrapper.carrier_has_new {background-color:#eee; border:1px solid #ddd;}
132
+ .carrier_message_wrapper:hover,
133
+ .carrier_message_wrapper.carrier_open {
134
134
  background-color:#fff;
135
135
  border:1px solid #ddd;
136
136
  color:#000;
137
137
  }
138
138
 
139
- .ma_wrapper {
139
+ .carrier_reply_wrapper {
140
140
  padding:10px 40px;
141
141
  border-radius: 6px;
142
142
  -moz-border-radius: 6px;
143
143
  -webkit-border-radius: 6px;
144
144
  background-color:#eee;
145
145
  color:#000;}
146
- .ma_wrapper a {
146
+ .carrier_reply_wrapper a {
147
147
  display:inline-block;
148
148
  padding:2px 6px;
149
149
  border-radius: 6px;
150
150
  -moz-border-radius: 6px;
151
151
  -webkit-border-radius: 6px;}
152
- .ma_wrapper a:link, .ma_wrapper a:visited {
152
+ .carrier_reply_wrapper a:link, .carrier_reply_wrapper a:visited {
153
153
  background-color:#ddd;
154
154
  color:#000;
155
155
  }
156
- .ma_wrapper a:hover {
156
+ .carrier_reply_wrapper a:hover {
157
157
  background-color:#fff;
158
158
  color:#000;
159
159
  }
160
160
 
161
161
 
162
- .message_ma_users ,
163
- .message_ma_branch ,
164
- .message_ma_body {display:inline-block; margin-right:12px;}
162
+ .carrier_message_users ,
163
+ .carrier_message_branch ,
164
+ .carrier_message_body {display:inline-block; margin-right:12px;}
165
165
 
166
- .message_ma_date {font-size:.7em; float:right;}
167
- .message_ma_users {}
168
- .message_ma_user { color:#008080; font-weight:bold;}
169
- .message_ma_branch {}
170
- .message_ma_body {}
166
+ .carrier_message_date {font-size:.7em; float:right;}
167
+ .carrier_message_users {}
168
+ .carrier_message_user { color:#008080; font-weight:bold;}
169
+ .carrier_message_branch {}
170
+ .carrier_message_body {}
171
171
 
172
- .message_ma_subj {}
172
+ .carrier_message_subj {}
173
173
 
174
- span.ma_has_new { font-weight:bold;}
174
+ span.carrier_has_new { font-weight:bold;}
175
175
 
176
- .message_ma_box_info {
176
+ .carrier_message_box_info {
177
177
  padding:20px;
178
178
  }
179
- .message_ma_archive_chain {
179
+ .carrier_message_archive_chain {
180
180
  float:right;
181
181
  margin: 0 0 10px 10px;
182
182
  }
183
- .message_ma_archive_chain a {
183
+ .carrier_message_archive_chain a {
184
184
  display:inline-block;
185
185
  padding:2px 6px;
186
186
  margin: 0 0 0 10px;
@@ -188,51 +188,51 @@ span.ma_has_new { font-weight:bold;}
188
188
  -moz-border-radius: 6px;
189
189
  -webkit-border-radius: 6px;
190
190
  }
191
- .message_ma_archive_chain a:link, .message_ma_archive_chain a:visited {
191
+ .carrier_message_archive_chain a:link, .carrier_message_archive_chain a:visited {
192
192
  color:#fff;
193
193
  background-color:#333;
194
194
  }
195
195
 
196
- .message_ma_archive_chain a:hover {
196
+ .carrier_message_archive_chain a:hover {
197
197
  color:#000;
198
198
  background-color:#ccc;
199
199
  }
200
200
 
201
- .message_ma_new_wrapper {}
201
+ .carrier_message_new_wrapper {}
202
202
 
203
- .message_ma_new_wrapper .message_ma_new_wrapper_1 select.chosen {
203
+ .carrier_message_new_wrapper .carrier_message_new_wrapper_1 select.chosen {
204
204
  width: 613px;
205
205
  }
206
206
 
207
- .message_ma_new_wrapper .message_ma_new_wrapper_1 .chzn-container .chzn-choices {
207
+ .carrier_message_new_wrapper .carrier_message_new_wrapper_1 .chzn-container .chzn-choices {
208
208
  border:1px solid #ccc;
209
209
  border-radius: 6px;
210
210
  -moz-border-radius: 6px;
211
211
  -webkit-border-radius: 6px;
212
212
  }
213
213
 
214
- .message_ma_new_wrapper .message_ma_new_wrapper_1 .chzn-container a {
214
+ .carrier_message_new_wrapper .carrier_message_new_wrapper_1 .chzn-container a {
215
215
  padding: 0;
216
216
  }
217
217
 
218
- .message_ma_new_wrapper .message_ma_new_wrapper_2 input[type="text"],
219
- .message_ma_new_wrapper .message_ma_new_wrapper_2 textarea {width:600px;}
218
+ .carrier_message_new_wrapper .carrier_message_new_wrapper_2 input[type="text"],
219
+ .carrier_message_new_wrapper .carrier_message_new_wrapper_2 textarea {width:600px;}
220
220
 
221
- .message_ma_new_wrapper .message_ma_new_wrapper_2 .actions {
221
+ .carrier_message_new_wrapper .carrier_message_new_wrapper_2 .actions {
222
222
  margin:12px 0;
223
223
  }
224
224
 
225
225
  .red {color:Red;}
226
226
  .carrier_wrapper * a:link, .carrier_wrapper * a:visited {}
227
227
 
228
- .message_ma_new_wrapper_1 {width:90%;}
229
- .message_ma_new_wrapper_2 {width:90%;}
228
+ .carrier_message_new_wrapper_1 {width:90%;}
229
+ .carrier_message_new_wrapper_2 {width:90%;}
230
230
 
231
- .message_ma_new_wrapper input[type="text"],
232
- .message_ma_new_wrapper textarea {width:600px;}
231
+ .carrier_message_new_wrapper input[type="text"],
232
+ .carrier_message_new_wrapper textarea {width:600px;}
233
233
 
234
- .message_ma_new_wrapper input[type="text"],
235
- .message_ma_new_wrapper textarea {
234
+ .carrier_message_new_wrapper input[type="text"],
235
+ .carrier_message_new_wrapper textarea {
236
236
  border:1px solid #ccc;
237
237
  border-radius: 6px;
238
238
  -moz-border-radius: 6px;
@@ -263,8 +263,8 @@ label {
263
263
 
264
264
  /* collapse */
265
265
 
266
- .ma_collapse .message_ma_user,
267
- .ma_collapse .message_ma_content {display:inline-block; vertical-align:top;}
268
- .ma_collapse .message_ma_user:after {content:' >'; display:inline-block; font-size:10px; margin:0 10px;}
266
+ .carrier_collapse .carrier_message_user,
267
+ .carrier_collapse .carrier_message_content {display:inline-block; vertical-align:top;}
268
+ .carrier_collapse .carrier_message_user:after {content:' >'; display:inline-block; font-size:10px; margin:0 10px;}
269
269
  p {margin:0;}
270
- .ma_open p, .ma_open .message_ma_content {margin:10px 0;}
270
+ .carrier_open p, .carrier_open .carrier_message_content {margin:10px 0;}
data/app/views/carrier/messages/_form.html.erb CHANGED
@@ -2,8 +2,8 @@
2
2
 
3
3
  <%= error_messages_for @message %>
4
4
 
5
- <div class="message_ma_new_wrapper">
6
- <div class="message_ma_new_wrapper_1">
5
+ <div class="carrier_message_new_wrapper">
6
+ <div class="carrier_message_new_wrapper_1">
7
7
  <div class="field">
8
8
  <div>
9
9
  <%= f.label :recipients, t('views.carrier.new_recipients') %>
@@ -13,7 +13,7 @@
13
13
  </div>
14
14
  </div>
15
15
  </div>
16
- <div class="message_ma_new_wrapper_2">
16
+ <div class="carrier_message_new_wrapper_2">
17
17
  <div class="field">
18
18
  <div>
19
19
  <%= f.label :subject, t('views.carrier.new_subject') %>
data/app/views/carrier/messages/_index_message.html.erb CHANGED
@@ -1,13 +1,13 @@
1
- <%= link_to (action_name == 'sent' ? carrier.as_sent_message_path(message) : carrier.message_path(message)), :class => "message_ma_wrapper #{'ma_has_new' if m > 0 }" do %>
2
- <div class="message_ma_date"><%= message.date_formatted %></div>
3
- <div class="message_ma_users">
1
+ <%= link_to (action_name == 'sent' ? carrier.as_sent_message_path(message) : carrier.message_path(message)), :class => "carrier_message_wrapper #{'carrier_has_new' if m > 0 }" do %>
2
+ <div class="carrier_message_date"><%= message.date_formatted %></div>
3
+ <div class="carrier_message_users">
4
4
  <%= truncate(message.sender_name + " + " + message.recipients_names, :length => 20) %>
5
- <span class="message_ma_branch">
5
+ <span class="carrier_message_branch">
6
6
  (<%= message.chain.messages_count %><% if m > 0 %>/<b class="red"><%= m %></b><% end %>)
7
7
  </span>
8
8
  </div>
9
- <div class="message_ma_body">
10
- <%= simple_format truncate(%| <span class="message_ma_subj %s">%s</span> &raquo; %s | % [('ma_has_new' if m > 0), message.subject, message.content], :length => 140) %>
9
+ <div class="carrier_message_body">
10
+ <%= simple_format truncate(%| <span class="carrier_message_subj %s">%s</span> &raquo; %s | % [('carrier_has_new' if m > 0), message.subject, message.content], :length => 140) %>
11
11
  </div>
12
12
  <% end %>
13
13
 
data/app/views/carrier/messages/_message_collapsed.html.erb CHANGED
@@ -1,8 +1,8 @@
1
- <%= link_to carrier.expanded_message_path(message), :remote => true, :class => "message_collapse", :id => "message-#{message.id}" do %>
2
- <div class="message_ma_wrapper ma_collapse">
3
- <div class="message_ma_date"><%= raw message.date_formatted %></div>
4
- <div class="message_ma_user"><%= message.sender_name %></div>
5
- <div class="message_ma_content">
1
+ <%= link_to carrier.expanded_message_path(message), :remote => true, :id => "message-#{message.id}" do %>
2
+ <div class="carrier_message_wrapper carrier_collapse">
3
+ <div class="carrier_message_date"><%= raw message.date_formatted %></div>
4
+ <div class="carrier_message_user"><%= message.sender_name %></div>
5
+ <div class="carrier_message_content">
6
6
  <% if unread_messages.include? message %>
7
7
  <b class='red'>unread</b>
8
8
  <% end %>
data/app/views/carrier/messages/_message_expanded.html.erb CHANGED
@@ -1,7 +1,7 @@
1
- <%= link_to carrier.collapsed_message_path(message), :remote => true, :class => "message_collapse", :id => "message-#{message.id}" do %>
2
- <div class="message_ma_wrapper ma_open">
3
- <div class="message_ma_date"><%= raw message.date_formatted %></div>
4
- <div class="message_ma_user"><%= message.sender_name %></div>
5
- <div class="message_ma_content"><%= simple_format message.content %></div>
1
+ <%= link_to carrier.collapsed_message_path(message), :remote => true, :id => "message-#{message.id}" do %>
2
+ <div class="carrier_message_wrapper carrier_open">
3
+ <div class="carrier_message_date"><%= raw message.date_formatted %></div>
4
+ <div class="carrier_message_user"><%= message.sender_name %></div>
5
+ <div class="carrier_message_content"><%= simple_format message.content %></div>
6
6
  </div>
7
7
  <% end %>
data/app/views/carrier/messages/_reply.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  <%= error_messages_for @message %>
4
4
 
5
- <div class="message_ma_new_wrapper replay_message_ma">
5
+ <div class="carrier_message_new_wrapper replay_carrier_message">
6
6
  <h4><span class=""><%= current_user.username %></span> &rArr; <span class="red"><%= @message.recipients_names %></span></h4>
7
7
  <div class="field">
8
8
  <%= f.label :content, t('views.carrier.reply_content') %><br />
data/app/views/carrier/messages/as_sent.html.erb CHANGED
@@ -2,8 +2,8 @@
2
2
  <div class="carrier_wr">
3
3
  <%= render :partial => 'head' %>
4
4
  <%= render :partial => 'nav_messages' %>
5
- <div class="message_ma_box_info">
6
- <div class="message_ma_archive_chain" id="archive_chain">
5
+ <div class="carrier_message_box_info">
6
+ <div class="carrier_message_archive_chain" id="archive_chain">
7
7
  <%= render :partial => 'archive_chain', :locals => {:chain => @message.chain} %>
8
8
  </div>
9
9
  <h2><%= @message.subject %></h2>
@@ -21,12 +21,12 @@
21
21
  <% end %>
22
22
  <% end %>
23
23
 
24
- <div class="message_ma_wrapper ma_open">
25
- <div class="message_ma_date">
24
+ <div class="carrier_message_wrapper carrier_open">
25
+ <div class="carrier_message_date">
26
26
  <%= @message.date_formatted %>
27
27
  </div>
28
28
 
29
- <div class="message_ma_user">
29
+ <div class="carrier_message_user">
30
30
  <%= @message.sender_name %>
31
31
  </div>
32
32
 
@@ -39,7 +39,7 @@
39
39
  </div>
40
40
  </div>
41
41
 
42
- <div class="ma_wrapper">
42
+ <div class="carrier_reply_wrapper">
43
43
  <%= link_to raw(t 'views.carrier.reply_link'), carrier.reply_message_path(@message), :remote => true %>
44
44
  <div id="reply_form"></div>
45
45
  </div>
data/app/views/carrier/messages/new.html.erb CHANGED
@@ -6,8 +6,9 @@
6
6
  <%= render :partial => 'nav_messages' %>
7
7
  <h2><%= t('views.carrier.new_header')%></h2>
8
8
 
9
- <div class="ma_wrapper">
9
+ <div class="carrier_reply_wrapper">
10
10
  <%= render 'form' %>
11
11
  </div>
12
+
12
13
  </div>
13
14
  </div>
data/app/views/carrier/messages/show.html.erb CHANGED
@@ -2,8 +2,8 @@
2
2
  <div class="carrier_wr">
3
3
  <%= render :partial => 'head' %>
4
4
  <%= render :partial => 'nav_messages' %>
5
- <div class="message_ma_box_info">
6
- <div class="message_ma_archive_chain" id="archive_chain">
5
+ <div class="carrier_message_box_info">
6
+ <div class="carrier_message_archive_chain" id="archive_chain">
7
7
  <%= render :partial => 'archive_chain', :locals => {:chain => @message.chain} %>
8
8
  </div>
9
9
  <h2><%= @message.subject %></h2>
@@ -16,11 +16,11 @@
16
16
  <%= render :partial => 'message_collapsed', :locals => { :message => message } %>
17
17
  <% end %>
18
18
 
19
- <div class="message_ma_wrapper ma_open">
20
- <div class="message_ma_date">
19
+ <div class="carrier_message_wrapper carrier_open">
20
+ <div class="carrier_message_date">
21
21
  <%= @message.date_formatted %>
22
22
  </div>
23
- <div class="message_ma_user">
23
+ <div class="carrier_message_user">
24
24
  <%= @message.sender_name %>
25
25
  </div>
26
26
  <div>
@@ -28,7 +28,7 @@
28
28
  </div>
29
29
  </div>
30
30
 
31
- <div class="ma_wrapper">
31
+ <div class="carrier_reply_wrapper">
32
32
  <%= link_to raw(t 'views.carrier.reply_link'), carrier.reply_message_path(@message), :remote => true %>
33
33
  <div id="reply_form"></div>
34
34
  </div>
data/carrier.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "carrier"
8
- s.version = "0.1.4"
8
+ s.version = "0.1.5"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["stanislaw"]
data/lib/carrier/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Carrier
2
- VERSION = "0.1.4"
2
+ VERSION = "0.1.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: carrier
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.1.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -395,7 +395,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
395
395
  version: '0'
396
396
  segments:
397
397
  - 0
398
- hash: 705404595
398
+ hash: 600932463
399
399
  required_rubygems_version: !ruby/object:Gem::Requirement
400
400
  none: false
401
401
  requirements: