Added a dialog_box() helper, for login and confirmation type views

8 files changed, 75 insertions, 44 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c9af233..5b145fb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -42,6 +42,16 @@ module ApplicationHelper
     concat(out)
   end
   
+  def dialog_box(title, options = {}, &block)
+    css_class = options.delete(:class)
+    out = %Q{<div class="dialog-box #{css_class}">}
+    out << %Q{<h3 class="round-top-5 dialog-box-header">#{title}</h3>} if title
+    out << %Q{<div class="dialog-box-content">}
+    out << capture(&block)
+    out << "</div></div>"
+    concat(out)
+  end
+  
   def markdown(text, options = [:smart])
     rd = RDiscount.new(text.to_s, *options)
     rd.to_html
diff --git a/app/views/repositories/confirm_delete.html.erb b/app/views/repositories/confirm_delete.html.erb
index 761a2e1..bfcef2f 100644
--- a/app/views/repositories/confirm_delete.html.erb
+++ b/app/views/repositories/confirm_delete.html.erb
@@ -17,8 +17,7 @@
 #++
 %>
 
-<h1><%= t("views.repos.confirm_delete", :repo => @repository.name, :title => h(@owner.title)) %></h1>
-
+<% dialog_box(t("views.repos.confirm_delete", :repo => @repository.name, :title => h(@owner.title))) do %>
 <p class="important_message">
   <%= t("views.repos.message_delete") %>
   
@@ -26,6 +25,7 @@
     <%= f.submit(t("views.repos.btn_delete")) -%>
   <% end -%>
 </p>
+<% end -%>
 
 <% content_for :sidebar do -%>
   <ul class="links">
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 60ef0ac..c8ee523 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -18,39 +18,38 @@
 #++
 %>
 
-<h1><%= t("views.sessions.login") %></h1>
-<%= login_method %>
+<% dialog_box(t("views.sessions.login")) do  -%>
+  <%= login_method %>
+  <% form_tag sessions_path  do -%>
+    <div id="regular_login_fields">
+      <p>
+        <label for="login"><%= t("views.sessions.label").call(self) %></label><br/>
+        <%= text_field_tag 'email', params[:email], :class => "text" %>
+      </p>
 
-<% form_tag sessions_path  do -%>
-  <div id="regular_login_fields">
-    <% # login_method %>
+      <p>
+        <label for="password"><%= t("views.sessions.passwd") %></label><br/>
+        <%= password_field_tag 'password', '', :class => "text" %>
+      </p>
+    </div>
+    <div id="openid_login_fields" style="display:none;">
+      <p>
+        <label for="openid"><%= t("views.sessions.openid").call(self) %></label><br/>
+        <%= text_field_tag 'openid_url', params[:openid_url], :class => "text" -%>
+      </p>
+    </div>
     <p>
-  <label for="login"><%= t("views.sessions.label").call(self) %></label><br/>
-    <%= text_field_tag 'email', params[:email], :class => "text" %>
-  </p>
-
-  <p>
-    <label for="password"><%= t("views.sessions.passwd") %></label><br/>
-    <%= password_field_tag 'password', '', :class => "text" %>
-  </p>
-  </div>
-  <div id="openid_login_fields" style="display:none;">
-    <p>
-      <label for="openid"><%= t("views.sessions.openid").call(self) %></label><br/>
-      <%= text_field_tag 'openid_url', params[:openid_url], :class => "text" -%>
+      <label for="remember_me"><%= t("views.sessions.remember") %>:</label>
+      <%= check_box_tag 'remember_me' %>
     </p>
-  </div>
-  <p>
-    <label for="remember_me"><%= t("views.sessions.remember") %>:</label>
-    <%= check_box_tag 'remember_me' %>
-  </p>
 
-  <p><%= submit_tag t("views.sessions.submit") %></p>
-<% end -%>
+    <p><%= submit_tag t("views.sessions.submit") %></p>
+  <% end -%>
 
-<p>
-  <small>
-    <%= link_to t("views.sessions.register"), new_user_path -%> 
-    | <%= link_to t("views.sessions.forgot"), forgot_password_users_path -%>
-  </small>
-</p>
+  <p>
+    <small>
+      <%= link_to t("views.sessions.register"), new_user_path -%> 
+      | <%= link_to t("views.sessions.forgot"), forgot_password_users_path -%>
+    </small>
+  </p>
+<% end -%>
\ No newline at end of file
diff --git a/app/views/users/forgot_password.html.erb b/app/views/users/forgot_password.html.erb
index 219a65a..4fc2309 100644
--- a/app/views/users/forgot_password.html.erb
+++ b/app/views/users/forgot_password.html.erb
@@ -17,14 +17,13 @@
 #++
 %>
 
-<h1><%= t("views.users.forgot_title") %></h1>
+<% dialog_box(t("views.users.forgot_title")) do %>
+  <% form_for :user, :url => reset_password_users_path do |f| -%>
+    <p>
+      <%= f.label :email, t(:email, :scope => "activerecord.attributes.user") -%><br/>
+      <%= f.text_field :email, :class => "text" -%>
+    </p>
 
-
-<% form_for :user, :url => reset_password_users_path do |f| -%>
-  <p>
-    <%= f.label :email, t(:email, :scope => "activerecord.attributes.user") -%><br/>
-    <%= f.text_field :email, :class => "text" -%>
-  </p>
-
-  <p><%= f.submit t("views.users.send_new_passwd") %></p>
-<% end -%>
+    <p><%= f.submit t("views.users.send_new_passwd") %></p>
+  <% end -%>
+<% end -%>
\ No newline at end of file
diff --git a/public/images/dialog_bg_bottom.png b/public/images/dialog_bg_bottom.png
new file mode 100644
index 0000000..cb94b71
--- /dev/null
+++ b/public/images/dialog_bg_bottom.png
diff --git a/public/images/dialog_bg_top.png b/public/images/dialog_bg_top.png
new file mode 100644
index 0000000..e3dc739
--- /dev/null
+++ b/public/images/dialog_bg_top.png
diff --git a/public/images/dialog_header_bg.png b/public/images/dialog_header_bg.png
new file mode 100644
index 0000000..e499197
--- /dev/null
+++ b/public/images/dialog_header_bg.png
diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css
index 3273912..61d66b1 100644
--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -216,7 +216,7 @@ abbr {
 
 #container #content {
   padding: 20px;
-  min-height: 300px;
+  min-height: 500px;
 }
 
 #container #content.with_sidebar {
@@ -2153,3 +2153,26 @@ div.archive-download-box p {
 
 .pull-box.expose p, .pull-box.expose li { font-size: 16px; }
 .pull-box.expose li                     { margin-bottom: 10px; }
+
+/* Dialog boxes */
+
+.dialog-box {
+  padding: 0;
+  margin: 20px auto 150px auto;
+  width: 500px;
+  background: transparent url("/images/dialog_bg_bottom.png") repeat-x left bottom;
+}
+
+.dialog-box .dialog-box-content {
+  padding: 20px;
+  border: 2px solid #4e4e4e;
+  background: transparent url("/images/dialog_bg_top.png") repeat-x left top;
+}
+
+.dialog-box .dialog-box-header {
+  background: #4e4e4e url("/images/dialog_header_bg.png") repeat-x;
+  color: #fff;
+  text-align: center;
+  padding: 10px 0 5px 0;
+  margin: 0;
+}
\ No newline at end of file