merb-words 0.4.1 → 0.4.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. data/Rakefile +1 -1
  2. data/app/controllers/categories.rb +6 -6
  3. data/app/controllers/pages.rb +7 -7
  4. data/app/controllers/passwords.rb +9 -9
  5. data/app/views/pages/_category.html.erb +10 -10
  6. data/app/views/pages/_form.html.erb +1 -1
  7. metadata +2 -2
data/Rakefile CHANGED
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
15
15
  s.name = 'merb-words'
16
16
  s.rubyforge_project = 'uipoet'
17
17
  s.summary = 'Word Management for Merb'
18
- s.version = '0.4.1'
18
+ s.version = '0.4.2'
19
19
  end
20
20
 
21
21
  Rake::GemPackageTask.new(spec) do |pkg|
data/app/controllers/categories.rb CHANGED
@@ -9,9 +9,9 @@ class MerbWords::Categories < MerbWords::Application
9
9
  def create_post
10
10
  category = Category.new(params[:category])
11
11
  if category.save
12
- session[:mui_message] = {:title => 'Category created', :tone => 'positive'}
12
+ session[:mui_message] = url(:merb_ui_message, :title => 'Category created', :tone => 'positive')
13
13
  else
14
- session[:mui_message] = {:title => 'Unable to create category', :body => mui_list(category.errors), :tone => 'negative'}
14
+ session[:mui_message] = url(:merb_ui_message, :title => 'Unable to create category', :body => mui_list(category.errors), :tone => 'negative')
15
15
  session[:mui_window] = slice_url(:category_create)
16
16
  end
17
17
  mui_window_redirect
@@ -24,9 +24,9 @@ class MerbWords::Categories < MerbWords::Application
24
24
  def update_put
25
25
  category = Category.get!(params[:category_id])
26
26
  if category.update_attributes(params[:category])
27
- session[:mui_message] = {:title => 'Category updated', :tone => 'positive'}
27
+ session[:mui_message] = url(:merb_ui_message, :title => 'Category updated', :tone => 'positive')
28
28
  else
29
- session[:mui_message] = {:title => 'Unable to update category', :body => mui_list(category.errors), :tone => 'negative'}
29
+ session[:mui_message] = url(:merb_ui_message, :title => 'Unable to update category', :body => mui_list(category.errors), :tone => 'negative')
30
30
  session[:mui_window] = slice_url(:category_update)
31
31
  end
32
32
  mui_window_redirect
@@ -41,9 +41,9 @@ class MerbWords::Categories < MerbWords::Application
41
41
  category.pages.clear
42
42
  category.save
43
43
  if category.destroy
44
- session[:mui_message] = {:title => 'Category deleted', :tone => 'positive'}
44
+ session[:mui_message] = url(:merb_ui_message, :title => 'Category deleted', :tone => 'positive')
45
45
  else
46
- session[:mui_message] = {:title => 'Unable to delete category', :body => mui_list(category.errors), :tone => 'negative'}
46
+ session[:mui_message] = url(:merb_ui_message, :title => 'Unable to delete category', :body => mui_list(category.errors), :tone => 'negative')
47
47
  session[:mui_window] = slice_url(:category_delete)
48
48
  end
49
49
  mui_window_redirect
data/app/controllers/pages.rb CHANGED
@@ -35,7 +35,7 @@ class MerbWords::Pages < MerbWords::Application
35
35
  @orders = Order.all
36
36
  display @pages
37
37
  else
38
- session[:mui_message] = {:title => 'Create the first page'} if merb_words_password?
38
+ session[:mui_message] = url(:merb_ui_message, :title => 'Create the first page') if merb_words_password?
39
39
  session[:mui_window] = slice_url(:create)
40
40
  render
41
41
  end
@@ -54,9 +54,9 @@ class MerbWords::Pages < MerbWords::Application
54
54
  params[:page][:categories].collect!{|c| Category[c]} if params[:page][:categories]
55
55
  page = Page.new(params[:page])
56
56
  if page.save
57
- session[:mui_message] = {:title => 'Page created', :tone => 'positive'}
57
+ session[:mui_message] = url(:merb_ui_message, :title => 'Page created', :tone => 'positive')
58
58
  else
59
- session[:mui_message] = {:title => 'Unable to create page', :body => mui_list(page.errors), :tone => 'negative'}
59
+ session[:mui_message] = url(:merb_ui_message, :title => 'Unable to create page', :body => mui_list(page.errors), :tone => 'negative')
60
60
  session[:mui_window] = slice_url(:create)
61
61
  end
62
62
  mui_window_redirect
@@ -78,9 +78,9 @@ class MerbWords::Pages < MerbWords::Application
78
78
  page.save
79
79
  params[:page][:categories].collect!{|c| Category[c]} if params[:page][:categories]
80
80
  if page.update_attributes(params[:page])
81
- session[:mui_message] = {:title => 'Page updated', :tone => 'positive'}
81
+ session[:mui_message] = url(:merb_ui_message, :title => 'Page updated', :tone => 'positive')
82
82
  else
83
- session[:mui_message] = {:title => 'Unable to update page', :body => mui_list(page.errors), :tone => 'negative'}
83
+ session[:mui_message] = url(:merb_ui_message, :title => 'Unable to update page', :body => mui_list(page.errors), :tone => 'negative')
84
84
  session[:mui_window] = slice_url(:create)
85
85
  end
86
86
  mui_window_redirect
@@ -95,9 +95,9 @@ class MerbWords::Pages < MerbWords::Application
95
95
  page.categories.clear
96
96
  page.save
97
97
  if page.destroy
98
- session[:mui_message] = {:title => 'Page deleted', :tone => 'positive'}
98
+ session[:mui_message] = url(:merb_ui_message, :title => 'Page deleted', :tone => 'positive')
99
99
  else
100
- session[:mui_message] = {:title => 'Unable to delete page', :body => mui_list(page.errors), :tone => 'negative'}
100
+ session[:mui_message] = url(:merb_ui_message, :title => 'Unable to delete page', :body => mui_list(page.errors), :tone => 'negative')
101
101
  session[:mui_window] = slice_url(:delete)
102
102
  end
103
103
  redirect(slice_url(:index))
data/app/controllers/passwords.rb CHANGED
@@ -5,7 +5,7 @@ class MerbWords::Passwords < MerbWords::Application
5
5
 
6
6
  def exit
7
7
  session.delete(:mui_password_id)
8
- session[:mui_message] = {:title => 'Exited', :tone => 'positive'}
8
+ session[:mui_message] = url(:merb_ui_message, :title => 'Exited', :tone => 'positive')
9
9
  mui_window_redirect
10
10
  end
11
11
 
@@ -17,10 +17,10 @@ class MerbWords::Passwords < MerbWords::Application
17
17
  password = Password.new(params[:password])
18
18
  if password.save
19
19
  session[:mui_password_id] = password.id
20
- session[:mui_message] = {:title => 'Password created', :tone => 'positive'}
20
+ session[:mui_message] = url(:merb_ui_message, :title => 'Password created', :tone => 'positive')
21
21
  mui_window_redirect
22
22
  else
23
- session[:mui_message] = {:title => 'Unable to create password', :body => mui_list(password.errors), :tone => 'negative'}
23
+ session[:mui_message] = url(:merb_ui_message, :title => 'Unable to create password', :body => mui_list(password.errors), :tone => 'negative')
24
24
  session[:mui_window] = slice_url(:password_create)
25
25
  mui_window_redirect
26
26
  end
@@ -38,9 +38,9 @@ class MerbWords::Passwords < MerbWords::Application
38
38
  encrypted = encrypt(params[:password])
39
39
  if password_match = Password.first(:encrypted => encrypted)
40
40
  session[:mui_password_id] = password_match.id
41
- session[:mui_message] = {:title => 'Password correct', :tone => 'positive'}
41
+ session[:mui_message] = url(:merb_ui_message, :title => 'Password correct', :tone => 'positive')
42
42
  else
43
- session[:mui_message] = {:title => 'Password incorrect', :tone => 'negative'}
43
+ session[:mui_message] = url(:merb_ui_message, :title => 'Password incorrect', :tone => 'negative')
44
44
  session[:mui_window] = slice_url(:password_read)
45
45
  end
46
46
  mui_window_redirect
@@ -53,9 +53,9 @@ class MerbWords::Passwords < MerbWords::Application
53
53
  def update_post
54
54
  password = Password.get!(session[:mui_password_id])
55
55
  if password.update_attributes(params[:password])
56
- session[:mui_message] = {:title => 'Password updated', :tone => 'positive'}
56
+ session[:mui_message] = url(:merb_ui_message, :title => 'Password updated', :tone => 'positive')
57
57
  else
58
- session[:mui_message] = {:title => 'Unable to update password', :body => mui_list(password.errors), :tone => 'negative'}
58
+ session[:mui_message] = url(:merb_ui_message, :title => 'Unable to update password', :body => mui_list(password.errors), :tone => 'negative')
59
59
  session[:mui_window] = slice_url(:password_update)
60
60
  end
61
61
  mui_window_redirect
@@ -69,10 +69,10 @@ class MerbWords::Passwords < MerbWords::Application
69
69
  password = Password.get!(session[:mui_password_id])
70
70
  if password.destroy
71
71
  session.delete(:mui_password_id)
72
- session[:mui_message] = {:title => 'Password deleted', :tone => 'positive'}
72
+ session[:mui_message] = url(:merb_ui_message, :title => 'Password deleted', :tone => 'positive')
73
73
  mui_window_redirect
74
74
  else
75
- session[:mui_message] = {:title => 'Unable to delete password', :body => mui_list(password.errors), :tone => 'negative'}
75
+ session[:mui_message] = url(:merb_ui_message, :title => 'Unable to delete password', :body => mui_list(password.errors), :tone => 'negative')
76
76
  session[:mui_window] = slice_url(:password_delete)
77
77
  mui_window_redirect
78
78
  end
data/app/views/pages/_category.html.erb CHANGED
@@ -3,17 +3,17 @@
3
3
  attributes[:order_property] = params[:order_property]
4
4
  %>
5
5
  <%= mui_divider %>
6
- <%= mui_grid(:columns => 2) do %>
7
- <%= mui_cell(:width => '100%') do %>
8
- <%= mui_block(:title => 'Categories', :title_size => '1em') %>
9
- <% end =%>
10
- <% if merb_words_password? %>
11
- <%= mui_cell(:align => 'right', :valign => 'bottom') do %>
12
- <%= mui_button(:title => 'Create', :title_size => '0.75em', :url => slice_url(:category_create), :window => 'open') %>
13
- <% end =%>
14
- <% end %>
15
- <% end =%>
16
6
  <%= mui_block do %>
7
+ <%= mui_grid(:columns => 2) do %>
8
+ <%= mui_cell(:width => '100%') do %>
9
+ <div class="mui_title" style="font-size:1em">Categories</div>
10
+ <% end =%>
11
+ <% if merb_words_password? %>
12
+ <%= mui_cell(:align => 'right', :valign => 'bottom') do %>
13
+ <%= mui_button(:title => 'Create', :title_size => '0.75em', :url => slice_url(:category_create), :window => 'open') %>
14
+ <% end =%>
15
+ <% end %>
16
+ <% end =%>
17
17
  <% if category_id %>
18
18
  <%= mui_link(:title => 'All', :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
19
19
  <% else %>
data/app/views/pages/_form.html.erb CHANGED
@@ -13,7 +13,7 @@
13
13
  <%= mui_grid(:columns => 2) do %>
14
14
  <%= mui_cell do %>
15
15
  <%= mui_block do %>
16
- <%= mui_hyper_text(:body, :title => 'Body') %>
16
+ <%= mui_textarea(:body, :title => 'Body') %>
17
17
  <% end =%>
18
18
  <% end =%>
19
19
  <% if Category.first %>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb-words
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - UiPoet
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-12-16 00:00:00 -08:00
12
+ date: 2008-12-22 00:00:00 -08:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency