last integration part, misses Admin css

app/views/decorators/_message.html.erb

@@ -11,8 +11,8 @@
     </div>
     <div class="actions">
         <%- unless defined?(dont_render_responses) -%>
-            <%= link_to 'Reply', new_group_topic_message_path(@group, @topic, :parent => message.indexes.join('-')) %>
+            <%= link_to 'Reply', new_group_topic_message_path(@group, @topic, :parent => message.indexes.join('-')), :class => 'button-link' %>
         <%- end -%>
     </div>
     <%= render 'decorators/child_nodes', :parent => message unless defined?(dont_render_responses) %>
-</div>
+</div>

app/views/messages/_form.html.erb

@@ -1,11 +1,4 @@
-<%= render 'shared/error_messages', :target => message %>
+  <%= render 'shared/error_messages', :target => message %>
 
-<div class="row">
-    <%= f.label :subject %>
-    <%= f.text_field :subject %>
-</div>
-
-<div class="row">
-    <%= f.label :body %>
-    <%= f.text_area :body %>
-</div>
+  <tr><td class="label"><%= f.label :subject %></td><td><%= f.text_field :subject %></td></tr>
+  <tr><td class="label"><%= f.label :body %></td><td><%= f.text_area :body, :cols => 90, :rows => 20 %></td></tr>

app/views/messages/new.html.erb

@@ -3,12 +3,13 @@
 </div>
 
 <div class="preview"></div>
+
 <div class="response">
     <%= form_for @message, :url => group_topic_messages_path(@group, @topic, params.slice(:parent)) do |f| %>
-        
+        <table class="form-table">
         <%= render 'messages/form', :message => @message, :f => f %>
 
-        <%= f.submit %>
-        
+        <tr><td class="button" colspan=2><%= f.submit %></td></tr>
+        </table>
     <%- end -%>
-</div>
+</div>

app/views/sessions/new.html.erb

@@ -1,12 +1,12 @@
+<% content_for :content_title do %>
+    <h2>Login</h2>
+<% end %>
+
 <%= form_tag "/session/" do %>
   <%= hidden_field_tag :redirect, params[:redirect] %>
-  <div class="row">
-    <%= label_tag "email:" %>
-    <%= text_field_tag "email" %>
-  </div>
-  <div class="row">
-    <%= label_tag "password:" %>
-    <%= password_field_tag "password" %>
-  </div>
-  <%= submit_tag 'Login' %> or <%= link_to 'Signup', new_user_path %>
+  <table class="form-table">
+    <tr><td class="label"><%= label_tag "email:" %></td><td><%= text_field_tag "email" %></td></tr>
+    <tr><td class="label"><%= label_tag "password:" %></td><td><%= password_field_tag "password" %></td></tr>
+    <tr><td class="button" colspan=2><%= submit_tag 'Login' %> or <%= link_to 'Signup', new_user_path %></td></tr>
+  </table>
 <% end %>

app/views/shared/_pagination.html.erb

@@ -1,6 +1,6 @@
 <p class="pagination">
-    <%= link_to 'previous', paginator.previous_page_url, :class => 'previous' unless paginator.first? %>
-    <%= link_to 'first', paginator.first_page_url, :class => 'first' %>
+    <%= link_to 'previous', paginator.previous_page_url, :class => 'previous button-link' unless paginator.first? %>
+    <%= link_to 'first', paginator.first_page_url, :class => 'first button-link' %>
     
     <%- start_index = [paginator.page - 4, 1].max -%>
     
@@ -20,6 +20,6 @@
     
     <%- if end_index < paginator.pages_count -%>...<%- end -%>
     
-    <%= link_to 'last', paginator.last_page_url, :class => 'last' %>
-    <%= link_to 'next', paginator.next_page_url, :class => 'next' unless paginator.last? %>
-</p>
+    <%= link_to 'last', paginator.last_page_url, :class => 'last button-link' %>
+    <%= link_to 'next', paginator.next_page_url, :class => 'next button-link' unless paginator.last? %>
+</p>

app/views/shared/_session_frame.html.erb

@@ -2,6 +2,6 @@
     <%- if current_user.activated? -%>
         Welcome <%= current_user.username %>. <%= link_to 'Logout', session_path, :method => :delete %>
     <%- else -%>
-        <%= link_to 'Login', new_session_path(:return => request.path) %> or <%= link_to 'Singup', new_user_path %>
+        <%= link_to 'Login', new_session_path(:return => request.path) %> or <%= link_to 'Sign Up', new_user_path %>
     <%- end -%>
 </div>

app/views/topics/index.html.erb

@@ -2,7 +2,7 @@
     <ul>
         <li><%= link_to "Discussion groups", groups_path %></li>
         <li>></li>
-        <li><%= link_to @group.name, groups_path %></li>
+        <li><%= @group.name %></li>
     </ul>
 <% end %>
 
@@ -23,7 +23,7 @@
 <%= render :partial => 'shared/pagination' if paginator.per_page > 20 %>
 <ul class="topics-list">
     <%- @topics.each do |topic| -%>
-        <li><%= link_to topic.subject, group_topic_path(@group, topic) %></li>
+        <li><%= link_to truncate(topic.subject, :length => 65), group_topic_path(@group, topic), :title => topic.subject %></li>
     <%- end -%>
 </ul>
 <%= render :partial => 'shared/pagination' %>

app/views/topics/show.html.erb

@@ -1 +1,11 @@
+<% content_for :header_menu do %>
+    <ul>
+        <li><%= link_to "Discussion groups", groups_path %></li>
+        <li>></li>
+        <li><%= link_to @group.name, group_topics_path(@group) %></li>
+        <li>></li>
+        <li><%= truncate(@topic.subject) %></li>
+    </ul>
+<% end %>
+
 <%= decorate(@topic) %>

app/views/users/_form.html.erb

@@ -1,19 +1,4 @@
-<div class="row">
-    <%= f.label :email %>
-    <%= f.text_field :email %>
-</div>
-
-<div class="row">
-    <%= f.label :username %>
-    <%= f.text_field :username %>
-</div>
-
-<div class="row">
-    <%= f.label :password %>
-    <%= f.password_field :password %>
-</div>
-
-<div class="row">
-    <%= f.label :password_confirmation %>
-    <%= f.password_field :password_confirmation %>
-</div>
+  <tr><td class="label"><%= f.label :email %></td><td><%= f.text_field :email %></td></tr>
+  <tr><td class="label"><%= f.label :username %></td><td><%= f.text_field :username %></td></tr>
+  <tr><td class="label"><%= f.label :password %></td><td><%= f.password_field :password %></td></tr>
+  <tr><td class="label"><%= f.label :password_confirmation %></td><td><%= f.password_field :password_confirmation %></td></tr>

app/views/users/new.html.erb

@@ -1,7 +1,13 @@
+<% content_for :content_title do %>
+    <h2>Sign Up</h2>
+<% end %>
+
 <%= form_for @user do |f| %>
+    <table class="form-table">
     <%= render 'shared/error_messages', :target => @user %>
     
     <%= render 'form', :f => f %>
 
-    <%= f.submit %>
+    <tr><td class="button" colspan=2><%= f.submit %></td></tr>
+    </table>
 <%- end -%>

public/stylesheets/application.css

@@ -2,13 +2,13 @@
 
 @font-face { font-family: 'Logobloqo2-ie'; src: url('../fonts/logobloqo2.eot'); font-weight: normal; font-style: normal; }
 @font-face { font-family: 'Logobloqo2'; src: url('../fonts/logobloqo2.ttf'); font-weight: normal; font-style: normal; }
-@font-face { font-family: 'Capsuula-ie'; src: url('../fonts/capsuula.eot'); font-weight: normal; font-style: normal; }
-@font-face { font-family: 'Capsuula'; src: url('../fonts/capsuula.ttf'); font-weight: normal; font-style: normal; }
 
 /* General */
 
-body { margin: 0; padding: 0; font-family: 'Capsuula', 'Capsuula-ie', Verdana, Arial; font-size: 12pt; color: #000000; background: transparent url('../images/background_stripes.png') repeat scroll 0% 0% }
+body { margin: 0; padding: 0; font-family: Arial, Verdana; font-size: 11pt; color: #000000; background: transparent url('../images/background_stripes.png') repeat scroll 0% 0% }
 img { border: none; }
+a { color: #0088FF; text-decoration: none; }
+a:hover { text-decoration: underline; }
 .bold { font-weight: bold; }
 .notice { color: #FF6600; }
 .error { color: #A60000; }
@@ -18,7 +18,7 @@ img { border: none; }
 .shadow-right-bottom { filter:progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=135, Strength=4); zoom: 1; }  
 .shadow-left-right-bottom { -moz-box-shadow: -10px 0px 10px #AAAAAA, 10px 0px 10px #AAAAAA, 0px 10px 10px #AAAAAA; -webkit-box-shadow: -10px 0px 10px #AAAAAA, 10px 0px 10px #AAAAAA, 0px 10px 10px #AAAAAA; box-shadow: -10px 0px 10px #AAAAAA, 10px 0px 10px #AAAAAA, 0px 10px 10px #AAAAAA; }
 .shadow-left-right-bottom { filter:progid:DXImageTransform.Microsoft.Shadow(color='#AAAAAA', Direction=270, Strength=10) progid:DXImageTransform.Microsoft.Shadow(color='#AAAAAA', Direction=90, Strength=10) progid:DXImageTransform.Microsoft.Shadow(color='#AAAAAA', Direction=180, Strength=10); zoom: 1; }
-.button-link:link, .button-link:visited { color: #000000; background-color: #DFDFDF; border: 1px #CCCCCC solid; padding: 0.5em 1em; text-decoration: none; margin: 5px; -moz-border-radius-bottomright: 1em 1em; border-bottom-right-radius: 1em 1em; }
+.button-link:link, .button-link:visited { color: #0088FF; background-color: #EBF5F7; padding: 0.5em 1em; text-decoration: none; margin: 5px; -moz-border-radius-bottomright: 1em 1em; border-bottom-right-radius: 1em 1em; }
 .button-link:hover { background-color: #0088FF; color: #FFFFFF; }
 
 /* Header */
@@ -34,8 +34,8 @@ img { border: none; }
 #sub-header-menu { width: 100%; min-height: 20px; background-color: #0088FF; color: #FFFFFF; padding-top: 2px; padding-bottom: 2px; font-size: 0.9em; }
 #sub-header-menu ul { list-style: none; margin: 0; padding: 0; position: absolute; left: 50%; margin-left: -395px; }
 #sub-header-menu ul li { float: left; margin-right: 5px; }
-#sub-header-menu a:link, #sub-header-menu a:visited { color: #FFFFFF; text-decoration: none; }
-#sub-header-menu a:hover { text-decoration: underline; }
+#sub-header-menu a:link, #sub-header-menu a:visited { color: #FFFFFF; text-decoration: underline; }
+#sub-header-menu a:hover { color: #000000; }
 
 /* Session frame */
 
@@ -46,11 +46,11 @@ img { border: none; }
 /* Wrapper & Content */
 
 #wrapper { margin: 0; padding: 0; }
-#main-content { width: 850px; min-height: 650px; background-color: #FFFFFF; margin: 0 auto; padding: 30px 25px 70px 25px; }
+#main-content { width: 850px; min-height: 400px; background-color: #FFFFFF; margin: 0 auto; padding: 30px 25px 70px 25px; }
 
 /* Notifications */
 
-.notifications { width: 350px; min-height: 20px; background-color: #EDF7FF; margin: 0 auto 25px; padding: 20px; }
+.notifications { width: 350px; background-color: #EBF5F7; color: #0088FF; margin: 0 auto 25px; padding: 2px 20px; }
 
 /* Actions List */
 
@@ -64,12 +64,30 @@ img { border: none; }
 .groups-list li { margin-bottom: 20px; }
 .groups-list li a { display: block; }
 
+/* Topics List */
+
+.topics-list { list-style: inside url('../images/topic_icon.png'); padding: 0; }
+.topics-list li { margin-bottom: 10px; }
+.topics-list li a { color: #000000; }
+
+/* Pagination */
+
+.pagination { margin-top: 35px; }
+.pagination a { padding: 0.5em 0.5em; }
+
+/* Form */
+
+.form-table { width: 80%; margin: 0 auto; }
+.form-table td { padding: 0.5em 1em; }
+.form-table .label { text-align: right; margin-right: 10px; }
+.form-table .button { text-align: center; padding-top: 15px; }
+
 /* Messages */
 
-.message { border: 1px solid grey ; padding-left: 10px; padding-right: 10px; margin-bottom: 5px; }
+.message { border-left: 1px solid #0088FF; border-bottom: 1px solid #0088FF; padding-left: 10px; padding-right: 10px; margin-bottom: 5px; }
 .message .header { margin-top: -10px; }
 .message .body { margin-left: 10px; }
-.message .body blockquote { border: solid 1px black; background-color: grey; padding: 10px; margin-left: 10px; }
+.message .body blockquote { background-color: #EBF5F7; padding: 10px; margin-left: 10px; }
 .message .responses .response { list-style-type: none; }
 
 /* Footer */