Oberfläche aufräumen...

This commit is contained in:
2014-06-24 13:53:38 +05:30
parent a87990c338
commit 3a8ccdd205
37 changed files with 320 additions and 300 deletions

View File

@@ -11,7 +11,7 @@
</div> </div>
<div class="row-fluid">
<div class="span12">
<%= f.input :desc %>
<%= f.input :desc , input_html: {style: "width:100%"}%>
</div>
</div>
<div class="row-fluid">
@@ -30,23 +30,30 @@
<div class="row-fluid">
<div class="span6">
Adresse:
<%= I18n.t("fetprofile.adresse") %>:
<%=f.input :street %>
<%=f.input :plz %>
<%=f.input :city %>
KOntakt:
<%=f.input :instant %>
<%=f.input :skype %>
<table><tr><td>
<%=f.input :plz, input_html: {style: "width:5em"} %></td>
<td><%=f.input :city, input_html: {style: "width:5em"} %></td></tr></table>
<%=f.input :telnr %>
<%=f.input :hdynr %>
</div>
<div class="span6">
Geburtstag:
<%=f.input :birth_day %>
<%=f.input :birth_month %>
<%=f.input :birth_year %>
<%= I18n.t("fetprofile.geburtstag") %>:
<table><tr>
<td><%=f.input :birth_day, input_html: {style: "width:3em"}%></td>
<td><%=f.input :birth_month, input_html: {style: "width:3em"} %></td>
<td><%=f.input :birth_year, input_html: {style: "width:5em"} %></td>
</tr></table>
<%=f.input :instant %>
<%=f.input :skype %>
</div>
</div>
@@ -60,7 +67,9 @@ Geburtstag:
<div class="row-fluid">
<div class="span12">
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<%= f.action :submit, :as => :input , :label=>I18n.t("common.save") %>
<%= f.action :submit, :as => :input, :button_html=>{value: "continue"} , :label=>I18n.t("common.savecont") %>
<%= f.action :cancel, :as=> :link , :label=>I18n.t("common.cancel") %>
<% end %>
</div>
</div>

View File

@@ -1,6 +1,7 @@
<h1>Editing fetprofile</h1>
<h1><%= I18n.t("fetprofile.edit")%></h1>
<%= render 'form' %>
<%= link_to 'Show', @fetprofile %> |
<%= link_to 'Back', fetprofiles_path %>

View File

@@ -6,9 +6,15 @@
<%= I18n.t 'profile.active_members' if params[:filter].nil? || params[:filter]== "active"
%>
</h1>
<div class="row-fluid">
<div class="span12">
<%= render 'layouts/pretty_toolbar' %>
<% link_to I18n.t('profile.new_profile'), new_fetprofile_path %>
</div>
</div>
<ul class="unstyled fetprofile_list linkbox-list" style="width:100%">
<% @fetprofiles.each do |fetprofile| %>
<li>
@@ -39,11 +45,7 @@
</ul>
<div class="row-fluid">
<div class="span12">
<%= link_to I18n.t('profile.new_profile'), new_fetprofile_path %>
</div>
</div></div>
</div>
</div>

View File

@@ -2,4 +2,4 @@
<%= render 'form' %>
<%= link_to I18n.t('common.back'), fetprofiles_path %>

View File

@@ -10,12 +10,7 @@
<p>
<%= @fetprofile.fetmail %>
</p>
respond_to do |format|
format.html # index.html.erb
format.json { render json: @fetprofiles }
end
<p>
<p>
<%= @fetprofile.desc %>
</p>
<%= render partial: "interninfo", object: @fetprofile if can?(:seeintern, @fetprofile) %>