Interface fixes icons,colors

This commit is contained in:
2014-07-09 22:44:42 +05:30
parent 9bd786d053
commit 4bc7c4b001
27 changed files with 179 additions and 48 deletions

View File

@@ -5,7 +5,8 @@
<%= f.input :public %>
<%= f.input :picture, :as => :file %>
<%= f.input :text %>
<%= f.input :icon , :input_html=>{:id=>"iconfield"}%>
<i id="icon"></i>
<% end %>
<%= f.actions do %>
@@ -13,3 +14,13 @@
<%= f.action :cancel,:label => I18n.t("common.back"), :as => :link %>
<% end %>
<% end %>
<script>
$(document).ready(function(){
$('#iconfield').on('change', function(){$('#icon').attr("class",$(this).val())})});
</script>
<% ffi1_list.each do |i| %>
<a onclick="$('#iconfield').val('ffi1-<%= i %>');$('#icon').attr('class','ffi1-<%= i %>')" href="#"><%=ffi1_icon(i)%>
</a>
<% end %>

View File

@@ -1,13 +1,21 @@
<%= link_to themengruppe,{:class=>'linkbox color-4'} do %>
<%= link_to themengruppe,{:class=>'linkbox color-4-dark'} do %>
<div class="row-fluid">
<div class="span12">
<div class="media">
<span class="pull-left">
<% if themengruppe.icon.nil? or themengruppe.icon.empty? %>
<%= image_tag themengruppe.picture.thumb.url,{:class=>"img-rounded"} %>
<% end %>
</span>
<div class="media-body">
<h3><%=themengruppe.title%> </h3>
<h3>
<% unless themengruppe.icon.nil? or themengruppe.icon.empty? %> <i class="<%= themengruppe.icon %>" style="font-size:1.5em;margin:0"></i>
<% end %>
<%=themengruppe.title%> </h3>
</div>
</div>
</div>
</div>

View File

@@ -10,7 +10,9 @@
</ul>
<%= render :partial=>'layouts/pretty_toolbar' %>
<h1><%= @themengruppe.title %></h1>
<h1> <% unless @themengruppe.icon.nil? or @themengruppe.icon.empty? %> <i class="<%= @themengruppe.icon %>" style="font-size:1.5em;margin:0"></i>
<% end %>
<%= @themengruppe.title %></h1>
<p>
<%= @themengruppe.text %>