sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

FogBugz #123: Switch to Twitter's Bootstrap.

Browse source
This commit is contained in:
Roland Jesse 2012-05-05 22:15:57 +02:00
parent e31e943ef5
commit 9d8361ca66
4 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/contacts/_email_fields.html.erb
View file

@ -1,11 +1,11 @@
<div class="row">
<div class="twocol"><%= f.label :address, "Mail" %></div>
<div class="threecol"><%= f.text_field :desc, :placeholder => "Bezeichnung" %></div>
<div class="threecol"><%= f.text_field :address, :placeholder => "Mailadresse" %></div>
<div class="span2"><%= f.label :address, "Mail" %></div>
<div class="span3"><%= f.text_field :desc, :placeholder => "Bezeichnung" %></div>
<div class="span3"><%= f.text_field :address, :placeholder => "Mailadresse" %></div>
</div>
<% unless f.object.new_record? %>
<div class="row">
<div class="twocol"><%= f.label :_delete, "Remove Mail" %></div>
<div class="threecol"><%= f.check_box :_delete %></div>
<div class="span2"><%= f.label :_delete, "Remove Mail" %></div>
<div class="span3"><%= f.check_box :_delete %></div>
</div>
<% end %>

48
app/views/contacts/_form.html.erb
View file

@ -3,21 +3,21 @@
<fieldset>
<%# <legend>Contact details</legend> %>
<div class="row">
<div class="twocol"><%= label_tag(:firstname, "First name") %></div>
<div class="threecol"><%= f.text_field :firstname, :placeholder => "Vorname", :value => @contact.firstname %></div>
<div class="span2"><%= label_tag(:firstname, "First name") %></div>
<div class="span3"><%= f.text_field :firstname, :placeholder => "Vorname", :value => @contact.firstname %></div>
</div>
<div class="row">
<div class="twocol"><%= label_tag(:lastname, "Last name") %></div>
<div class="threecol"><%= f.text_field :lastname, :placeholder => "Nachname" %></div>
<div class="span2"><%= label_tag(:lastname, "Last name") %></div>
<div class="span3"><%= f.text_field :lastname, :placeholder => "Nachname" %></div>
</div>
<div class="row">
<div class="twocol">Buddies?</div>
<div class="threecol">
<div class="span2">Buddies?</div>
<div class="span3">
<%= check_box_tag(:has_buddy) %>
<%= label_tag(:has_buddy, "wohnt zusammen mit") %>
</div>
<div class="sixcol">
<div class="span6">
<%= text_field_tag(:buddy_firstname, nil, :placeholder => "first name") %>
<%= text_field_tag(:buddy_lastname, nil, :placeholder => "last name") %>
</div>
@ -25,18 +25,18 @@
<%= f.fields_for :address do |address_f| %>
<div class="row">
<div class="twocol"><%= address_f.label :street, "Street &middot; no.".html_safe %></div>
<div class="threecol"><%= address_f.text_field :street, :placeholder => "Straße" %></div>
<div class="twocol"><%= address_f.text_field :housenr, :placeholder => "No." %></div>
<div class="span2"><%= address_f.label :street, "Street &middot; no.".html_safe %></div>
<div class="span3"><%= address_f.text_field :street, :placeholder => "Straße" %></div>
<div class="span2"><%= address_f.text_field :housenr, :placeholder => "No." %></div>
</div>
<div class="row">
<div class="twocol"><%= label_tag(:zipcode, "ZIP &middot; Place".html_safe) %></div>
<div class="threecol"><%= address_f.text_field :zipcode, :placeholder => "PLZ" %></div>
<div class="fivecol"><%= address_f.text_field :place, :placeholder => "Ort" %></div>
<div class="span2"><%= label_tag(:zipcode, "ZIP &middot; Place".html_safe) %></div>
<div class="span3"><%= address_f.text_field :zipcode, :placeholder => "PLZ" %></div>
<div class="span5"><%= address_f.text_field :place, :placeholder => "Ort" %></div>
</div>
<div class="row">
<div class="twocol"><%= label_tag(:country, "Country") %></div>
<div class="sevencol"><%= address_f.text_field :country, :placeholder => "Land" %></div>
<div class="span2"><%= label_tag(:country, "Country") %></div>
<div class="span7"><%= address_f.text_field :country, :placeholder => "Land" %></div>
</div>
<% end %> <%# fields_for :adress %>
@ -44,8 +44,8 @@
<%= render "email_fields", :f => emails_f %>
<% end %> <%# fields_for :emails %>
<div class="row">
<div class="twocol">&nbsp;</div>
<div class="threecol">
<div class="span2">&nbsp;</div>
<div class="span3">
<%= link_to 'Add an email', '#emails', :class => "add_nested_item", :rel => "emails" %>
</div>
</div>
@ -53,23 +53,23 @@
<%= render "phone_fields", :f => phones_f %>
<% end %> <%# fields_for :phones %>
<div class="row">
<div class="twocol">&nbsp;</div>
<div class="threecol">
<div class="span2">&nbsp;</div>
<div class="span3">
<%= link_to 'Add a phone', '#phones', :class => "add_nested_item", :rel => "phones" %>
</div>
</div>
<div class="row">
<div class="twocol"><%= label_tag(:birth_date, "Birthday") %></div>
<div class="threecol">
<div class="span2"><%= label_tag(:birth_date, "Birthday") %></div>
<div class="span3">
<%= select_tag(:birth_day, options_for_select(@days, @contact.birth_day)) %>
<%= select_tag(:birth_month, options_for_select(@months, @contact.birth_month)) %>
<%= text_field(:contact, :birth_year, :placeholder => "Jahr") %>
</div>
</div>
<div class="row">
<div class="twocol">&nbsp;</div>
<div class="threecol">&nbsp;</div>
<div class="sixcol"><%= f.submit("Save contact") %></div>
<div class="span2">&nbsp;</div>
<div class="span3">&nbsp;</div>
<div class="span6"><%= f.submit("Save contact") %></div>
</div>
</fieldset>
<% end %>

10
app/views/contacts/_phone_fields.html.erb
View file

@ -1,11 +1,11 @@
<div class="row">
<div class="twocol"><%= f.label :address, "Phone" %></div>
<div class="threecol"><%= f.text_field :desc, :placeholder => "Bezeichnung" %></div>
<div class="threecol"><%= f.text_field :nr, :placeholder => "Nr." %></div>
<div class="span2"><%= f.label :address, "Phone" %></div>
<div class="span3"><%= f.text_field :desc, :placeholder => "Bezeichnung" %></div>
<div class="span3"><%= f.text_field :nr, :placeholder => "Nr." %></div>
</div>
<% unless f.object.new_record? %>
<div class="row">
<div class="twocol"><%= f.label :_delete, "Remove Phone" %></div>
<div class="threecol"><%= f.check_box :_delete %></div>
<div class="span2"><%= f.label :_delete, "Remove Phone" %></div>
<div class="span3"><%= f.check_box :_delete %></div>
</div>
<% end %>

2
app/views/contacts/new.html.erb
View file

@ -1,6 +1,6 @@
<% title t("titles.contacts.new") %>
<div class="row">
<div class="twelvecol">
<div class="span12">
<h1><%= t("contacts.new_contact") %></h1>
</div>
</div>