folders devel ended

themes/olive/stylesheets/style.css

@@ -365,4 +365,3 @@ input,select {
 	color: grey;
 	}
 
-

themes/olive/views/folders/_list.html.erb

@@ -1,11 +1,19 @@
 <div class="block">
 	<h3><%=t (:folders) %> <%= link_to t(:refresh), {:controller => 'messages', :action => 'refresh'}, :class=>'minor' %></h3>
 	<div class="content">
+	<% if @folders_shown.size.zero? %>
+	<p><%= t(:no_folders_shown) %></p>
+	<% else %>
 	<ul class="navigation">
-		<% @folders.each do |folder| -%>
+		<% @folders_shown.each do |folder| -%>
+		<% if folder == @current_folder %>
+		<li><b><%= raw folder_link(folder) %></b></li>
+		<% else %>
 		<li><%= raw folder_link(folder) %></li>
+		<% end %>
 		<% end -%>
 	</ul>
+	<% end %>
 	<br/>
 	<%= raw form_button_value(t(:logout),'tick.png',url_for(:controller => :user, :action => :logout)) %>
 	</div>

themes/olive/views/folders/index.html.erb

@@ -25,9 +25,12 @@
             </form>
         </div>
         <div class="column right">
-            <%= form_tag({:controller=>'folders',:action=>'sub_un_scribe'},:class=>'form') %>
-            <%= raw multi_select("", 'folders_to_subscribe[]', @folders, @folders,t(:folders_subscribed),:id,"",{:text => [:parent,:delim,:name]}) %>
-            <%= raw form_button(t(:subscribe_unsubscribe),'tick.png') %>
+			<%= form_tag({:controller=>'folders',:action=>'refresh'},:class=>'form') %>
+				<%= raw form_button(t(:refresh_folders),'tick.png') %>
+			</form>
+            <%= form_tag({:controller=>'folders',:action=>'show_hide'},:class=>'form') %>
+            <%= raw multi_select("", 'folders_to_show[]', @folders, @folders_shown,t(:folders_shown),:id,"",{:text => [:parent,:delim,:name]}) %>
+            <%= raw form_button(t(:show_hide),'tick.png') %>
             </form>
         </div>
     </div>

themes/olive/views/messages/index.html.erb

@@ -14,10 +14,21 @@
         <%= form_tag({:controller=>'messages', :action=>'ops'})%>
 
         </form>
-    </div>
-</div>
+
+
+<% if @current_folder.nil? %>
+<%= t(:no_folder_selected) %>
+<% else %>
 
 <h1>Current: <%= pretty_folder_name(@current_folder) %></h1>
 
 <%= @current_folder.inspect %>
 <%= Time.now - @current_folder.msgs_updated_at %>
+
+<% end %>
+
+
+    </div>
+</div>
+
+