From ab3931d08ba4d344b628c071323339c4ccb6c7e2 Mon Sep 17 00:00:00 2001 From: Wojciech Todryk Date: Thu, 21 Jul 2011 17:59:55 +0200 Subject: [PATCH] devel --- .gitignore | 0 AUTHORS | 0 README.markdown | 0 UNLICENSE | 0 app/controllers/application_controller.rb | 6 ++ app/controllers/webmail_controller.rb | 4 + app/helpers/navigation_helper.rb | 29 ++++-- app/helpers/webmail_helper.rb | 6 +- ...contents_moved_to_original_theme_directory | 0 arts/logo2.xcf | Bin arts/logo3.xcf | Bin config/database.yml.example | 0 config/locales/pl.yml | 7 +- public/images/logo3.png | Bin public/images/logo3_dark.png | Bin public/javascripts/.gitkeep | 0 public/javascripts/application.js | 0 public/javascripts/controls.js | 0 public/javascripts/dragdrop.js | 0 public/javascripts/effects.js | 0 public/javascripts/prototype.js | 0 public/javascripts/rails.js | 0 themes/olive/README.olive | 0 themes/olive/images/.gitkeep | 0 themes/olive/images/key.png | Bin themes/olive/images/logo_small.png | Bin themes/olive/javascripts/.gitkeep | 0 themes/olive/stylesheets/.gitkeep | 0 themes/olive/stylesheets/base.css | 24 ++--- themes/olive/stylesheets/style.css | 19 +++- themes/olive/views/layouts/.gitkeep | 0 themes/olive/views/login/index.html.erb | 0 themes/olive/views/shared/_folders.html.erb | 6 +- .../olive/views/webmail/_message_row.html.erb | 4 +- themes/olive/views/webmail/_search.html.erb | 20 ++--- themes/olive/views/webmail/messages.html.erb | 85 +++--------------- themes/original/images/.gitkeep | 0 themes/original/images/logo.png | Bin themes/original/javascripts/.gitkeep | 0 themes/original/views/layouts/.gitkeep | 0 themes/original/views/layouts/public.html.erb | 0 41 files changed, 100 insertions(+), 110 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 AUTHORS mode change 100644 => 100755 README.markdown mode change 100644 => 100755 UNLICENSE mode change 100644 => 100755 app/views/contents_moved_to_original_theme_directory mode change 100644 => 100755 arts/logo2.xcf mode change 100644 => 100755 arts/logo3.xcf mode change 100644 => 100755 config/database.yml.example mode change 100644 => 100755 public/images/logo3.png mode change 100644 => 100755 public/images/logo3_dark.png mode change 100644 => 100755 public/javascripts/.gitkeep mode change 100644 => 100755 public/javascripts/application.js mode change 100644 => 100755 public/javascripts/controls.js mode change 100644 => 100755 public/javascripts/dragdrop.js mode change 100644 => 100755 public/javascripts/effects.js mode change 100644 => 100755 public/javascripts/prototype.js mode change 100644 => 100755 public/javascripts/rails.js mode change 100644 => 100755 themes/olive/README.olive mode change 100644 => 100755 themes/olive/images/.gitkeep mode change 100644 => 100755 themes/olive/images/key.png mode change 100644 => 100755 themes/olive/images/logo_small.png mode change 100644 => 100755 themes/olive/javascripts/.gitkeep mode change 100644 => 100755 themes/olive/stylesheets/.gitkeep mode change 100644 => 100755 themes/olive/stylesheets/base.css mode change 100644 => 100755 themes/olive/stylesheets/style.css mode change 100644 => 100755 themes/olive/views/layouts/.gitkeep mode change 100644 => 100755 themes/olive/views/login/index.html.erb mode change 100644 => 100755 themes/original/images/.gitkeep mode change 100644 => 100755 themes/original/images/logo.png mode change 100644 => 100755 themes/original/javascripts/.gitkeep mode change 100644 => 100755 themes/original/views/layouts/.gitkeep mode change 100644 => 100755 themes/original/views/layouts/public.html.erb diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/AUTHORS b/AUTHORS old mode 100644 new mode 100755 diff --git a/README.markdown b/README.markdown old mode 100644 new mode 100755 diff --git a/UNLICENSE b/UNLICENSE old mode 100644 new mode 100755 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 279d8db..156c552 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,12 +7,18 @@ class ApplicationController < ActionController::Base before_filter :user_login_filter before_filter :add_scripts #before_filter :localize + before_filter :current_user #filter_parameter_logging :password #upgrade to Rails3 protected + def current_user + #@current_user ||= Customer.find(logged_user) + #logger.debug "Current User: #{@current_user.inspect}" + end + def theme_resolver CDF::CONFIG[:theme] || CDF::CONFIG[:default_theme] end diff --git a/app/controllers/webmail_controller.rb b/app/controllers/webmail_controller.rb index e780276..28b0792 100755 --- a/app/controllers/webmail_controller.rb +++ b/app/controllers/webmail_controller.rb @@ -43,6 +43,8 @@ class WebmailController < ApplicationController session["return_to"] = nil @search_field = params['search_field'] @search_value = params['search_value'] + @folder_name = params['folder_name'] + # handle sorting - tsort session field contains last reverse or no for field # and lsort - last sort field @@ -98,6 +100,8 @@ class WebmailController < ApplicationController else @pages = Paginator.new self, folder.total, get_mail_prefs.wm_rows, @page @messages = folder.messages(@pages.current.first_item - 1, get_mail_prefs.wm_rows, sort_query + (reverse_sort ? ' desc' : ' asc')) + #folder.synchronize_cache(@pages.current.first_item - 1, get_mail_prefs.wm_rows) + @messages = ImapMessage.getAll(@current_user.email,@folder_name,sort_query + (reverse_sort ? ' desc' : ' asc')) end end diff --git a/app/helpers/navigation_helper.rb b/app/helpers/navigation_helper.rb index 59ca17b..e12cc71 100755 --- a/app/helpers/navigation_helper.rb +++ b/app/helpers/navigation_helper.rb @@ -15,12 +15,16 @@ module NavigationHelper link_to( t(:filters), :controller=>"webmail", :action=>"filters") end + def link_contacts + link_to( t(:contacts), contacts_path) + end + def folder_manage_link(folder) if folder.name == CDF::CONFIG[:mail_trash] or folder.name == CDF::CONFIG[:mail_inbox] or folder.name == CDF::CONFIG[:mail_sent] short_fn(folder) else short_fn(folder) + ' ' + link_to(t(:delete), folder_path(folder.name), :method => :delete) - end + end end def link_import_preview() "/contacts/import_preview" end @@ -29,7 +33,7 @@ module NavigationHelper def link_contact_choose() url_for(:controller => :contacts, :action => :choose) end def link_contact_list - link_to(t(:list), :controller => :contacts, :action => :index) + link_to(t(:list), :controller => :contacts, :action => :index) end def link_contact_add_one @@ -37,17 +41,17 @@ module NavigationHelper end def link_contact_add_multiple - link_to(t(:add_multiple), :controller => :contacts, :action => "add_multiple") + link_to(t(:add_multiple), :controller => :contacts, :action => "add_multiple") end - - def link_contact_group_list - link_to(t(:groups), :controller => :contact_group, :action => :index) + + def link_contact_group_list + link_to(t(:groups), :controller => :contact_group, :action => :index) end def link_folders link_to( t(:folders), :controller=>:webmail, :action=>:messages) end - + private def short_fn(folder) @@ -57,4 +61,15 @@ module NavigationHelper folder.name end end + + def main_navigation(active) + s = "" + s += "" + end end diff --git a/app/helpers/webmail_helper.rb b/app/helpers/webmail_helper.rb index 4204fbe..09ba09d 100755 --- a/app/helpers/webmail_helper.rb +++ b/app/helpers/webmail_helper.rb @@ -149,11 +149,11 @@ module WebmailHelper def message_size(size) if size / (1024*1024) > 0 - return "#{(size / (1024*1024)).round} MB" + return "#{(size / (1024*1024)).round} MB" elsif size / 1024 > 0 - return "#{(size / (1024)).round} KB" + return "#{(size / (1024)).round} kB" else - return "#{size} B" + return "#{size} B" end end diff --git a/app/views/contents_moved_to_original_theme_directory b/app/views/contents_moved_to_original_theme_directory old mode 100644 new mode 100755 diff --git a/arts/logo2.xcf b/arts/logo2.xcf old mode 100644 new mode 100755 diff --git a/arts/logo3.xcf b/arts/logo3.xcf old mode 100644 new mode 100755 diff --git a/config/database.yml.example b/config/database.yml.example old mode 100644 new mode 100755 diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 857b72d..145ae75 100755 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -14,7 +14,7 @@ pl: filters: Filtry contacts: Kontakty search: Szukaj - search_txt: Szukaj w polu wiadomości + search_txt: ciąg znaków refresh: Odśwież operations: Akcje operations_txt: Akcje na zaznaczonych wiadomościach @@ -70,3 +70,8 @@ pl: add_to_contacts: Dodaj do kontaktów want_to_empty_trash_message: Czy chcesz opróznic kosz? site_link: https://github.com/lmanolov/mailr + marked_messages: zaznaczone wiadomości + to_folder: do folderu + message_field: Pole wiadomości + no_messages_found: Nie znaleziono żadnych wiadomości + diff --git a/public/images/logo3.png b/public/images/logo3.png old mode 100644 new mode 100755 diff --git a/public/images/logo3_dark.png b/public/images/logo3_dark.png old mode 100644 new mode 100755 diff --git a/public/javascripts/.gitkeep b/public/javascripts/.gitkeep old mode 100644 new mode 100755 diff --git a/public/javascripts/application.js b/public/javascripts/application.js old mode 100644 new mode 100755 diff --git a/public/javascripts/controls.js b/public/javascripts/controls.js old mode 100644 new mode 100755 diff --git a/public/javascripts/dragdrop.js b/public/javascripts/dragdrop.js old mode 100644 new mode 100755 diff --git a/public/javascripts/effects.js b/public/javascripts/effects.js old mode 100644 new mode 100755 diff --git a/public/javascripts/prototype.js b/public/javascripts/prototype.js old mode 100644 new mode 100755 diff --git a/public/javascripts/rails.js b/public/javascripts/rails.js old mode 100644 new mode 100755 diff --git a/themes/olive/README.olive b/themes/olive/README.olive old mode 100644 new mode 100755 diff --git a/themes/olive/images/.gitkeep b/themes/olive/images/.gitkeep old mode 100644 new mode 100755 diff --git a/themes/olive/images/key.png b/themes/olive/images/key.png old mode 100644 new mode 100755 diff --git a/themes/olive/images/logo_small.png b/themes/olive/images/logo_small.png old mode 100644 new mode 100755 diff --git a/themes/olive/javascripts/.gitkeep b/themes/olive/javascripts/.gitkeep old mode 100644 new mode 100755 diff --git a/themes/olive/stylesheets/.gitkeep b/themes/olive/stylesheets/.gitkeep old mode 100644 new mode 100755 diff --git a/themes/olive/stylesheets/base.css b/themes/olive/stylesheets/base.css old mode 100644 new mode 100755 index bb30d1f..1252312 --- a/themes/olive/stylesheets/base.css +++ b/themes/olive/stylesheets/base.css @@ -16,10 +16,10 @@ .wat-cf {display: block;} /* End hide from IE-mac */ -h1 { margin: 15px 0; font-size: 22px; font-weight: normal; } -h2 { font-size: 22px; margin: 15px 0; font-weight: normal;} -h3 { font-size: 18px; margin: 10px 0; font-weight: normal;} -h4 { font-size: 16px; margin: 10px 0; font-weight: normal;} +h1 { margin: 15px 0; font-size: 10px; font-weight: normal; } +h2 { font-size: 22px; margin: 7px 0; font-weight: normal;} +h3 { font-size: 18px; margin: 5px 0; font-weight: normal;} +h4 { font-size: 16px; margin: 5px 0; font-weight: normal;} hr {height: 1px; border: 0; } p { margin: 15px 0;} a img { border: none; } @@ -58,7 +58,7 @@ body { } .actions-bar { - padding: 10px 1px; + padding: 5px 1px; } .actions-bar .actions { @@ -85,15 +85,15 @@ body { #sidebar .block { margin-bottom: 20px; - padding-bottom: 10px; + padding-bottom: 1px; } #sidebar .block .content { - padding: 0 15px; + padding: 5px; } #sidebar ul.navigation li { - padding: 3px 10px; + padding: 3px; } #sidebar .block .sidebar-block, #sidebar .notice { @@ -200,7 +200,7 @@ body { } .table th { - padding: 10px; + padding: 5px; font-weight: bold; text-align: left; } @@ -218,7 +218,7 @@ body { } .table td { - padding: 10px; + padding: 5px; } .table td.last { @@ -395,3 +395,7 @@ button.button:hover, a.button:hover { button.button:active, a.button:active { background-color:#e5e5e5; } + +div.block h3 a { + color: white; +} diff --git a/themes/olive/stylesheets/style.css b/themes/olive/stylesheets/style.css old mode 100644 new mode 100755 index 8ef18d8..f0a3f49 --- a/themes/olive/stylesheets/style.css +++ b/themes/olive/stylesheets/style.css @@ -69,7 +69,7 @@ p { #main .block .content { background: #FFF; - padding-top: 1px; + padding: 10px; } #main .block .content h2 { @@ -344,3 +344,20 @@ ul.list li .item .avatar { height: 65; background-color: #EFF3E4; } + +div.block div.actions-bar { + margin: 5px; +} + +tr.notseen td.subject { + font-weight: bold; +} + +input,select { + background-color: #EFF3E4; + border: 1px solid #5E634E; + color: #black; + margin: 5px 0 0; +} + + diff --git a/themes/olive/views/layouts/.gitkeep b/themes/olive/views/layouts/.gitkeep old mode 100644 new mode 100755 diff --git a/themes/olive/views/login/index.html.erb b/themes/olive/views/login/index.html.erb old mode 100644 new mode 100755 diff --git a/themes/olive/views/shared/_folders.html.erb b/themes/olive/views/shared/_folders.html.erb index f06e12c..e041def 100755 --- a/themes/olive/views/shared/_folders.html.erb +++ b/themes/olive/views/shared/_folders.html.erb @@ -1,9 +1,13 @@
-

<%=t :folders %> <%= link_to t(:add_edit_folder), folders_path %>

+

<%=t :folders %> <%= link_to t(:add_edit_folder), folders_path %> <%= link_refresh %>

+
    <% @folders.each do |folder| -%>
  • <%= raw folder_link(folder) %>
    • <% end -%>
+ +
+ diff --git a/themes/olive/views/webmail/_message_row.html.erb b/themes/olive/views/webmail/_message_row.html.erb index 9509d13..6b0a11d 100755 --- a/themes/olive/views/webmail/_message_row.html.erb +++ b/themes/olive/views/webmail/_message_row.html.erb @@ -6,9 +6,9 @@ <%= short_address(message_row.from_addr) %> <% end %>
- <%= link_to(parse_subject(message_row.subject) << " " , :controller=>'webmail', :action=>'message', :msg_id=>message_row.uid)%> + <%= link_to(parse_subject(message_row.subject) << " " , :controller=>'webmail', :action=>'message', :msg_id=>message_row.uid)%> <%= message_date(message_row.date) %> <%= message_size(message_row.size) %> - <%= message_row.content_type == 'multipart' ? image_tag(current_theme_image_path('attachment.png')) : ' ' %> + <%= message_row.content_type == 'multipart' ? image_tag(current_theme_image_path('attachment.png')) : ' ' %> diff --git a/themes/olive/views/webmail/_search.html.erb b/themes/olive/views/webmail/_search.html.erb index e967c1d..bcbd6f4 100755 --- a/themes/olive/views/webmail/_search.html.erb +++ b/themes/olive/views/webmail/_search.html.erb @@ -1,13 +1,7 @@ - - <%= t :search%>open - - +

+ <%= t :message_field %> + <%= submit_tag(t(:search), :name=>'op')%> <%= submit_tag(t(:show_all), :name=>'op')%> +

diff --git a/themes/olive/views/webmail/messages.html.erb b/themes/olive/views/webmail/messages.html.erb index b1652e5..6f80e0e 100755 --- a/themes/olive/views/webmail/messages.html.erb +++ b/themes/olive/views/webmail/messages.html.erb @@ -1,80 +1,21 @@ -

<%= t :mailbox %>

- -
-
+<% content_for :logo do %> +<%= render :partial => 'shared/logo' %> +<% end %> <% content_for :sidebar do %> <%= render :partial => 'shared/folders' %> <% end %> -
-
-

<%= @folder_name %>

- <%= form_tag({:controller=>'webmail', :action=>'messages'})%> -
- - - <%=t :operations%>open - - -
-

<%= t :operations_txt %>

- - <%= submit_tag(t(:delete), :name=>'op')%> - <%= submit_tag(t(:copy), :name=> 'op')%> - <%= submit_tag(t(:move), :name=>'op')%> - <%= submit_tag(t(:mark_read), :name=>'op')%> - <%= submit_tag(t(:mark_unread), :name=>'op')%> -
- - <%= t :destination_txt %>  - - +
+
+ <%= raw main_navigation(:folders) %> +
+
+ <%= form_tag({:controller=>'webmail', :action=>'messages'})%> + <%= render :partial => 'shared/msg_ops' %> + <%= render :partial => "search" %> + <%= render :partial => 'shared/messages' %> +
- <%= render :partial => "search" %> - <%= page_navigation_webmail @pages if @pages.page_count > 1 %> - - - - - <% if @folder_name == CDF::CONFIG[:mail_sent] %> - - <% else %> - - <% end%> - - - - - - - - <% for message in @messages %> - <%= render :partial => 'message_row', :object => message %> - <% end %> - -
<%= link_to(t(:to), :controller=>:webmail, :action=>:messages, :op=>'SORT', :page=>@page, :scc=>'to_flat')%><%= link_to(t(:from), :controller=>:webmail, :action=>:messages, :op=>'SORT', :page=>@page, :scc=>'from_flat')%><%= link_to(t(:subject), :controller=>:webmail, :action=>:messages, :op=>'SORT', :page=>@page, :scc=>'subject')%><%= link_to(t(:date), :controller=>:webmail, :action=>:messages, :op=>'SORT', :page=>@page, :scc=>'date')%><%= link_to(t(:size), :controller=>:webmail, :action=>:messages, :op=>'SORT', :page=>@page, :scc=>'size')%> 
- <%= page_navigation_webmail @pages if @pages.page_count > 1 %> - -
-
- -
diff --git a/themes/original/images/.gitkeep b/themes/original/images/.gitkeep old mode 100644 new mode 100755 diff --git a/themes/original/images/logo.png b/themes/original/images/logo.png old mode 100644 new mode 100755 diff --git a/themes/original/javascripts/.gitkeep b/themes/original/javascripts/.gitkeep old mode 100644 new mode 100755 diff --git a/themes/original/views/layouts/.gitkeep b/themes/original/views/layouts/.gitkeep old mode 100644 new mode 100755 diff --git a/themes/original/views/layouts/public.html.erb b/themes/original/views/layouts/public.html.erb old mode 100644 new mode 100755