0
@@ -1,2 +1,3 @@
0
 module Admin::BaseHelper
0
+
0
 end

0
@@ -21,5 +21,9 @@ module ApplicationHelper
0
   def filter_options
0
     [['Plain HTML', ''], ['Textile', 'textile_filter'], ['Markdown', 'markdown_filter'], ['Markdown with Smarty Pants', 'smartypants']]
0
   end
0
+  
0
+  def title(text)
0
+    @title = text || " "
0
+  end
0
 
0
 end

0
@@ -1,16 +1,24 @@
0
-<%= error_messages_for :article %>
0
-
0
-<% if @article.draft -%>
0
-<p><%= link_to 'Draft!', :action => :draft, :id => @article.draft %></p>
0
-<% end -%>
0
-
0
-<% form_for :article, @version, :url => { :action => 'update', :id => @article } do |f| -%>
0
-<%= render :partial => 'form', :object => f %>
0
-<p class="btns">
0
-  <%= save_button_tag %> 
0
-  <%= draft_button_tag %> or 
0
-  <%= link_to "cancel", :controller => "articles" %></p>
0
-<% end -%>
0
+<% content_for :action_nav do %>
0
+<!-- begin action nav -->
0
+<div id="page-nav">
0
+  <ul id="act-nav" class="clear">
0
+    <li id="select">
0
+      <a class="trigger" id="cog" href="#">&nbsp;</a>
0
+      <div id="optgroup" style="display: none">
0
+        <ul id="options">
0
+          <% if @article.draft -%>
0
+          <li><%= link_to 'View draft', :action => :draft, :id => @article.draft %></li>
0
+          <% end -%>
0
+          <% if @article.comments.any? -%>
0
+          <li><%= link_to "View comments", :controller => 'articles', :action => 'comments', :id => @article %></li>
0
+          <% end %>
0
+        </ul>
0
+      </div>
0
+    </li>
0
+  </ul>
0
+</div>
0
+<!-- /end action nav -->
0
+<% end %>
0
 
0
 
0
 <% content_for :sidebar do %>
0
@@ -34,4 +42,18 @@
0
     </ul>
0
   </div>
0
   <% end -%>
0
-<% end %>
0
\ No newline at end of file
0
+<% end %>
0
+
0
+<%= error_messages_for :article %>
0
+
0
+
0
+
0
+<% form_for :article, @version, :url => { :action => 'update', :id => @article } do |f| -%>
0
+<%= render :partial => 'form', :object => f %>
0
+<p class="btns">
0
+  <%= save_button_tag %> 
0
+  <%= draft_button_tag %> or 
0
+  <%= link_to "cancel", :controller => "articles" %></p>
0
+<% end -%>
0
+
0
+

0
@@ -9,8 +9,9 @@
0
       <a class="trigger" id="cog" href="#">&nbsp;</a>
0
       <div id="optgroup" style="display: none">
0
         <ul id="options">
0
-          <li><%= check_box_tag 'show_todays_comments' %> Show only todays comments</li>
0
-          <li><a href="#" title="title">Other option</a></li>
0
+          <li class="endgroup"><%= check_box_tag 'show_todays_comments' %> Show only todays comments</li>
0
+          <li><a href="#" title="title">Mephisto help</a></li>
0
+          <li><a href="#" title="title">Mephisto website</a></li>
0
         </ul>
0
       </div>
0
     </li>

0
@@ -1,3 +1,25 @@
0
+<% content_for :action_nav do %>
0
+<!-- TODO:  Move settings to different screens or maybe to tabs? -->
0
+<!-- begin action nav -->
0
+<div id="page-nav">
0
+  <ul id="act-nav" class="clear">
0
+    <li><%= link_to "General", :controller => 'settings' %></li>
0
+    <li><%= link_to "Publishing", :controller => 'settings' %></li>
0
+    <li><%= link_to "Comments", :controller => 'settings' %></li>
0
+    <li><%= link_to "Feeds", :controller => 'settings' %></li>
0
+    <li id="select">
0
+      <a class="trigger" id="cog" href="#">&nbsp;</a>
0
+      <div id="optgroup" style="display: none">
0
+        <ul id="options">
0
+        </ul>
0
+      </div>
0
+    </li>
0
+  </ul>
0
+</div>
0
+<!-- /end action nav -->
0
+<% end %>
0
+
0
+
0
 <%= form_tag :action => "update" %>
0
 <div id="general" class="setgroup">
0
   <h3>General site settings</h3>

0
@@ -1,4 +1,4 @@
0
-<h2>Hola, <%=h @user.login %>!</h2>
0
+<% title "Hola, #{h(@user.login)}!" %>
0
 <% form_for :user, @user, :url => { :action => 'update', :id => @user }, :html => { :multipart => true } do |f| -%>
0
 <%= render :partial => 'form', :locals => { :f => f, :create => false } %>
0
 <% end -%>

0
@@ -12,7 +12,9 @@ DropMenu.prototype = {
0
     Event.observe(this.menu, 'mouseout', this.onMenuBlur.bindAsEventListener(this));
0
   },
0
   
0
-  onTriggerClick: function() {
0
+  onTriggerClick: function(event) {
0
+    Event.stop(event);
0
+    Event.element(event).onclick = function() { return false; } //For Safari
0
     clearTimeout(this.timeout);
0
     this.options.setStyle({opacity: 1});
0
     Element.toggle(this.options);

0
@@ -10,7 +10,7 @@ body {
0
   font: normal 12px/1.5em "Lucida Grande", Lucida, Helvetica, sans-serif;
0
   background: #99D3D5;
0
   color: #333;
0
-  min-width: 950px;
0
+  min-width: 900px;
0
 }
0
 
0
 ul, li, form, dt, dl, dd, ol, div, p, 
0
@@ -267,6 +267,7 @@ input[type='text']:focus, textarea:focus {
0
   color: #fff;
0
   border-top: 1px solid #6fb4b6;
0
   border-bottom: 1px solid #6fb4b6;
0
+  min-height: 40px;
0
 }
0
 
0
 #act-nav {
0
@@ -326,11 +327,19 @@ input[type='text']:focus, textarea:focus {
0
 #select #options li {
0
   display: block;
0
   margin: 0;
0
-  padding: 5px;
0
-  border-bottom: 1px dotted #ccc;
0
+  padding: 5px 5px 5px 10px;
0
+  border-bottom: 2px solid #fff;
0
   color: #333;
0
 }
0
 
0
+#select #options:last-child {
0
+  border-bottom: 3px solid #fff;
0
+}
0
+
0
+#select #options li:hover {
0
+  background-color: #ddd;
0
+}
0
+
0
 #select #options a {
0
   float: none !important;
0
   margin: 0;
0
@@ -339,7 +348,9 @@ input[type='text']:focus, textarea:focus {
0
   padding: 0;
0
 }
0
 
0
-
0
+#options .endgroup {
0
+  border-bottom: 2px solid #999 !important;
0
+}
0
 
0
 /*
0
  *=MAIN
0
@@ -347,7 +358,9 @@ input[type='text']:focus, textarea:focus {
0
 
0
 #flashes {
0
   background: #fff9d0;
0
-  min-height: 30px;
0
+  min-height: 38px;
0
+  text-align: center;
0
+  font-weight: bold;
0
 }
0
 
0
 #main-content {