Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

Commit

Permalink
cleaning up the UI
Browse files Browse the repository at this point in the history
  • Loading branch information
kellishaver committed Oct 19, 2008
1 parent ef3780c commit d9a4cd7
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 49 deletions.
2 changes: 1 addition & 1 deletion app/views/sessions/new.html.erb
@@ -1,4 +1,4 @@
<% title "Log in" %>
<% title "Log In to My Idea Drawer" %>
<h1><%= yield(:title) %></h1>

<p>Don't have an account? <%= link_to "Sign up!", signup_path %></p>
Expand Down
85 changes: 45 additions & 40 deletions app/views/users/new.html.erb
@@ -1,41 +1,46 @@
<% title "Join My Idea Drawer" %>
<h1><%= yield(:title) %></h1>

<p>Already have an account? <%= link_to "Log in", login_path %>.</p>
<% form_for @user do |f| %>
<h3>Create A New Account:</h3>
<%= f.error_messages %><br />
<fieldset>
<%= f.label :username %>
<%= f.text_field :username %>
</fieldset>
<fieldset>
<%= f.label :email, "Email Address" %>
<%= f.text_field :email %>
</fieldset>

<% if @user.openid_url.blank? %>
<fieldset>
<%= f.label :password %>
<%= f.password_field :password %>
</fieldset>
<fieldset>
<%= f.label :password_confirmation, "Confirm Password" %>
<%= f.password_field :password_confirmation %>
</fieldset>
<% else %>
<%= f.hidden_field :openid_url %>
<% end %>

<p class="align_right"><%= f.submit "Sign Up" %></p>
<% end %>
<div id="login">
<% form_tag sessions_path do %>
<h3>Or use OpenID:</h3><br />
<fieldset>
<%= label_tag :openid_url, "OpenID URL" %>
<%= text_field_tag :openid_url, params[:openid_url] %>
</fieldset>
<p class="align_right"><%= submit_tag "Sign Up" %></p>
<% end %>
<div id="left_col">
<% title "Join My Idea Drawer" %>
<h1><%= yield(:title) %></h1>

<p>Already have an account? <%= link_to "Log in", login_path %>.</p>
<% form_for @user do |f| %>
<h3>Create A New Account:</h3>
<%= f.error_messages %><br />
<fieldset>
<%= f.label :username %>
<%= f.text_field :username %>
</fieldset>
<fieldset>
<%= f.label :email, "Email Address" %>
<%= f.text_field :email %>
</fieldset>

<% if @user.openid_url.blank? %>
<fieldset>
<%= f.label :password %>
<%= f.password_field :password %>
</fieldset>
<fieldset>
<%= f.label :password_confirmation, "Confirm Password" %>
<%= f.password_field :password_confirmation %>
</fieldset>
<% else %>
<%= f.hidden_field :openid_url %>
<% end %>

<p class="align_right"><%= f.submit "Sign Up" %></p>
<% end %>
<div id="login">
<% form_tag sessions_path do %>
<h3>Or use OpenID:</h3><br />
<fieldset>
<%= label_tag :openid_url, "OpenID URL" %>
<%= text_field_tag :openid_url, params[:openid_url] %>
</fieldset>
<p class="align_right"><%= submit_tag "Sign Up" %></p>
<% end %>
</div>
</div>
<div id="sidebar">
<%= image_tag "ad.png" %>
</div>
28 changes: 20 additions & 8 deletions app/views/welcome/about.html.erb
@@ -1,11 +1,23 @@
<% title "About My Idea Drawer" %>
<h1><%= yield(:title) %></h1>
<p class="big_desc"><strong>MyIdeaDrawer</strong> lets you organize everything you need for your next project, all in one place. Whether you're building a web site, redesigning a room, or putting togther a school report. Organize code, links, notes, palettes, photos, and screen shots all in one convenient location.
<div id="left_col">
<% title "About My Idea Drawer" %>
<h1><%= yield(:title) %></h1>
<p class="big_desc">
<%= image_tag "about.png", :align => "left" %>
<strong>MyIdeaDrawer</strong> lets you organize everything you need for your next project, all in one place. Whether you're building a web site, redesigning a room, or putting togther a school report. Organize code, links, notes, palettes, photos, and screen shots all in one convenient location.
<br /><br />
<strong>MyIdeaDrawer</strong> was built in just under 48 hours, during the 2-day <a href="http://railsrumble.com">Rails Rumble 2008</a> competition by Ryan Bates and Kelli Shaver. We'd like to thank many staff, sponsors, volunteers, and participants who made this competition possible and we invite each and every one of you to look around and explore oru application. Remeber, if you like <strong>MyIdeaDrawer</strong>, please don't forget to <a href="http://myideadrawer.vote.railsrumble.com">Vote For Us</a>!</p>

<p class="big_desc"><strong>About Kelli Shaver:</strong> <a href="http://kellishaver.com">Kelli</a> has been designing and developing web sites professionally for eight years. Although also a competent back-end programmer, Kelli chooses to specialize in front-end/user-interface design, HTML, CSS, javaScript, and icon design.</p>

<p class="big_desc"><strong>About Ryan Bates:</strong> Ryan Bates has been involved in web development since 1998. In 2005 he started working professionally with Ruby on Rails and is now best known for his work on <a href="http://railscasts.com">Railscasts</a>, the free Ruby on Rails screencast series.</p>

<p class="big_desc"><strong>About Kelli Shaver:</strong> <a href="http://kellishaver.com">Kelli</a> has been designing and developing web sites professionally for eight years. Although also a competent back-end programmer, Kelli chooses to specialize in front-end/user-interface design, HTML, CSS, javaScript, and icon design.</p>

<p class="big_desc"><strong>About Ryan Bates:</strong> Ryan Bates has been involved in web development since 1998. In 2005 he started working professionally with Ruby on Rails and is now best known for his work on <a href="http://railscasts.com">Railscasts</a>, the free Ruby on Rails screencast series.</p>

<p class="big_desc"><strong>More Rails Rumble goodness from our team:</strong> Can't get enough? Don't worry, soon you'll be able to download the source code for this project via <a href="http://githubs.com">GitHub</a>. You may also want to check out our 2007 Rails Rumble project, <a href="http://github.com/ryanb/admiteer/tree/master">Admiteer</a>.</p>
<p class="big_desc"><strong>More Rails Rumble goodness from our team:</strong> Can't get enough? Don't worry, soon you'll be able to download the source code for this project via <a href="http://githubs.com">GitHub</a>. You may also want to check out our 2007 Rails Rumble project, <a href="http://github.com/ryanb/admiteer/tree/master">Admiteer</a>.</p>
</div>
<div id="sidebar">
<br /><br />
<%= link_to image_tag("vote.png"), "http://myideadrawer.vote.railsrumble.com" %>
<br /><br />
<%= link_to image_tag("ryan.png"), "http://railscasts.com" %>
<br /><br />
<%= link_to image_tag("kelli.png"), "http://kellishaver.com" %>
</div>
Binary file added public/images/about.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ad.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/kelli.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ryan.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/vote.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d9a4cd7

Please sign in to comment.