Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

This commit is contained in:
Christophe Vilayphiou committed 2012-04-24 15:21:12 +08:00
commit c0abaa643c
3 files changed
+4 -3

No files matched your search

@@ -19,7 +19,7 @@
<div class="control-group">
<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
<div class="controls">
<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %>
<%= f.text_field locale, :id => "link-#{locale}" %>
</div>
</div>
<% end %>
@@ -43,7 +43,7 @@
<div class="control-group">
<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
<div class="controls">
<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %>
<%= f.text_field locale, :id => "link-#{locale}" %>
</div>
</div>
<% end %>