diff --git a/app/controllers/webmail_controller.rb b/app/controllers/webmail_controller.rb index cb6954b..4e10da9 100644 --- a/app/controllers/webmail_controller.rb +++ b/app/controllers/webmail_controller.rb @@ -350,7 +350,7 @@ class WebmailController < ApplicationController end def load_imap_session - return if ['compose', 'prefs', 'error_connection'].include?(action_name) + return if ['error_connection'].include?(action_name) get_imap_session end @@ -375,7 +375,7 @@ class WebmailController < ApplicationController def have_to_load_folders? return true if ['messages', 'delete', 'reply', 'forward', 'empty', 'message', 'download', - 'filter', 'filter_add', 'view_source'].include?(action_name) + 'filter', 'filter_add', 'view_source', 'compose', 'prefs', 'filters'].include?(action_name) return false end diff --git a/app/views/layouts/public.rhtml b/app/views/layouts/public.rhtml index a7bf860..1c0957e 100644 --- a/app/views/layouts/public.rhtml +++ b/app/views/layouts/public.rhtml @@ -15,9 +15,9 @@
-
<%= @content_for_layout %>
+
<%= yield %>

diff --git a/app/views/shared/_folders.html.erb b/app/views/shared/_folders.html.erb new file mode 100644 index 0000000..000a1ac --- /dev/null +++ b/app/views/shared/_folders.html.erb @@ -0,0 +1,10 @@ +
+

<%=_('Folders')%>
<%=link_manage_folders%>

+
+ +
+
+ +
diff --git a/app/views/webmail/compose.rhtml b/app/views/webmail/compose.rhtml index 4f23c75..a850c16 100644 --- a/app/views/webmail/compose.rhtml +++ b/app/views/webmail/compose.rhtml @@ -1,3 +1,7 @@ +<% content_for('sidebar') { %> + <%= render :partial => 'shared/folders' %> +<% } %> +

<%=_('Mailbox')%>