diff --git a/CHANGES b/CHANGES
index 1c4a5a7..ea0208c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,15 @@
## Changes
-#### Version 0.8.4
+#### 0.8.5 candidate
+
+ * servers view
+ * identity modification
+
+#### 0.8.4
* calendar view as separate gem
* adding bluecloth for rendering markdown text
-#### Version 0.8.3
+#### 0.8.3
* export, imports of contact
diff --git a/Gemfile b/Gemfile
index 449a132..8aa7193 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '~>3.0.7'
+gem 'rails', '~>3.0.9'
gem 'mysql2' , '~>0.2.7'
gem 'will_paginate', '~> 3.0.beta'
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6dbc0f6..957e311 100755
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -325,5 +325,8 @@ def content_for_sidebar
s
end
+def boolean_answer(answer)
+ answer == true ? t(:true_answer,:scope=>:common) : t(:false_answer,:scope=>:common)
+end
end
diff --git a/app/helpers/prefs_helper.rb b/app/helpers/prefs_helper.rb
index a28d430..1d01dcf 100755
--- a/app/helpers/prefs_helper.rb
+++ b/app/helpers/prefs_helper.rb
@@ -1,2 +1,16 @@
module PrefsHelper
+ def servers_table_header
+ html = ""
+ $defaults["servers_table_fields"].each do |f|
+ html << "
"
+ if params[:sort_field] == f
+ params[:sort_dir].nil? ? dir = 'desc' : dir = nil
+ end
+
+ html << link_to(Server.human_attribute_name(f), {:controller => 'prefs',:action => 'servers',:sort_field => f,:sort_dir => dir}, {:class=>"header"})
+ html << " | "
+ end
+ html
+ end
+
end
diff --git a/config/defaults.yml b/config/defaults.yml
index 526280e..0827102 100755
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -13,6 +13,8 @@ msg_image_thumbnail_size: [128x128, 128x96, 192x192, 192x144, 256x256, 256x192]
contacts_table_fields: [nick, first_name, last_name, email, info]
contacts_per_page: 25
+servers_table_fields: [name, port, use_ssl, use_tls, for_imap, for_smtp, auth]
+
msgs_per_page: 20
msgs_refresh_time: 300
msgs_send_type: html
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 1135ce8..20929ac 100755
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -17,6 +17,7 @@ pl:
record_invalid: Nieprawidłowy format danych
models:
contact: Kontakt
+ server: Serwer
attributes:
contact:
nick: Pseudonim
@@ -47,6 +48,12 @@ pl:
last_name: Nazwisko
server:
name: Nazwa serwera
+ port: Port
+ use_ssl: SSL?
+ use_tls: TLS?
+ for_imap: IMAP?
+ for_smtp: SMTP?
+ auth: Metoda autoryzacji
contact:
compose_to_selected: Napisz do wybranych
@@ -175,6 +182,8 @@ pl:
current_version: Aktualna wersja
common:
+ false_answer: Nie
+ true_answer: Tak
file_format_error: Błędny format pliku
no_tmp_dir: Brak katalogu tymczasowego
must_be_unique: musi być unikalny
diff --git a/themes/olive/views/prefs/_server.html.erb b/themes/olive/views/prefs/_server.html.erb
new file mode 100644
index 0000000..ca8b0f8
--- /dev/null
+++ b/themes/olive/views/prefs/_server.html.erb
@@ -0,0 +1,9 @@
+<%= check_box_tag "cids[]", server.id %> |
+<%= server.name %> |
+<%= server.port %> |
+<%= boolean_answer(server.use_ssl) %> |
+<%= boolean_answer(server.use_tls) %> |
+<%= boolean_answer(server.for_imap) %> |
+<%= boolean_answer(server.for_smtp) %> |
+<%= server.auth %> |
+ |
diff --git a/themes/olive/views/prefs/_servers_list.html.erb b/themes/olive/views/prefs/_servers_list.html.erb
new file mode 100644
index 0000000..10aec53
--- /dev/null
+++ b/themes/olive/views/prefs/_servers_list.html.erb
@@ -0,0 +1,16 @@
+
diff --git a/themes/olive/views/prefs/servers.html.erb b/themes/olive/views/prefs/servers.html.erb
index 273b073..154b8de 100755
--- a/themes/olive/views/prefs/servers.html.erb
+++ b/themes/olive/views/prefs/servers.html.erb
@@ -13,15 +13,10 @@
<%= raw prefs_navigation(:servers_tab) %>
-
<%= form_tag(prefs_update_servers_path,:name=>'prefs') %>
-
-
- <%= render :partial => 'prefs/servers_left' %>
-
-
- <%= render :partial => 'prefs/servers_right' %>
-
-
+
+ <%= form_tag(prefs_update_servers_path,:name=>'prefs') %>
+ <%= render :partial => 'prefs/servers_list' %>
+