Interface fixes icons,colors

2014-07-09 22:44:42 +05:30
parent 9bd786d053
commit 4bc7c4b001
27 changed files with 179 additions and 48 deletions
--- a/app/views/fetprofiles/_form.html.erb
+++ b/app/views/fetprofiles/_form.html.erb
@@ -67,8 +67,8 @@
    <div class="row-fluid">
      <div class="span12">
 	<%= f.actions do %>
-	<%= f.action :submit, :as => :input , :label=>I18n.t("common.save") %>
-	<%= f.action :submit, :as => :input , :label=>I18n.t("common.savecont"), :button_html=>{value: "continue"} %>
+	<%= f.action :submit, :as => :button, :label=>I18n.t("common.save") %>
+	<%= f.action :submit, :as => :button, :label=>I18n.t("common.savecont"), :button_html=>{value: "continue"} %>
 	<%= f.action :cancel, :as=> :link , :label=>I18n.t("common.cancel") %>
 	<% end %>
      </div>
--- a/app/views/gremien/_form.html.erb
+++ b/app/views/gremien/_form.html.erb
@@ -5,9 +5,6 @@
    <%= f.input :typ, :as => :select, :collection => Gremium::TYPEN.invert %>
    <%= f.input :geschlecht, :as => :select, :collection => Gremium::GESCHLECHT.invert %>
    <%= f.input :thema, :as=> :select, :collection => Thema.all %>
- 
-
-
    <% @memberships.each do |m| %>
    <%= f.semantic_fields_for :memberships, m do |memberships_attributes| %> 
    <div class="row-fluid">
@@ -33,6 +30,9 @@

  <%= f.actions do %>
    <%= f.action :submit, :as => :input %>
+	<%= f.action :submit, :as => :button, :label=>I18n.t("common.savecont"), :button_html=>{value: "continue"} %>
+	<%= f.action :cancel, :as=> :link , :label=>I18n.t("common.cancel") %>
+
  <% end %>
 <% end %>
  <script>$('.datepicker').datepicker()</script>
--- a/app/views/gremien/verwalten.html.erb
+++ b/app/views/gremien/verwalten.html.erb
@@ -4,11 +4,10 @@
 <% @gremien.each do |gremium| %>
  <div class="row-fluid">
    <div class="span2">
-      <%= gremium.typ %>
+      <%= Gremium::TYPEN[gremium.typ.to_i] %>
    </div>
    <div class="span8">
      <b><%= gremium.name %></b>
-      <%= gremium.desc %>
    </div>
    <div class="span2">
 <div class="btn-group">   
@@ -18,10 +17,9 @@
 <span class="caret"></span>
 </button>
  <ul class="dropdown-menu">
-<li>
-      <%= link_to 'Show', gremium %></li>
-     <li> <%= link_to 'Edit', edit_gremium_path(gremium) %></li>
-    <li>  <%= link_to 'Destroy', gremium, method: :delete, data: { confirm: 'Are you sure?' }, class:"btn-danger" %>
+    <li><%= link_to 'Show', gremium %></li>
+    <li><%= link_to 'Edit', edit_gremium_path(gremium) %></li>
+    <li><%= link_to 'Destroy', gremium, method: :delete, data: { confirm: 'Are you sure?' }, class:"btn-danger" %>
 </li>      </ul>
    </div>
 </div>
--- a/app/views/neuigkeiten/_compact.html.erb
+++ b/app/views/neuigkeiten/_compact.html.erb
@@ -6,7 +6,7 @@
  </div>
  <div class="media-body">
    <div>
-      <small><%= neuigkeit.rubrik.name %></small> 
+      <small><%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %>&nbsp;<%= neuigkeit.rubrik.name %></small> 
      <small class="pull-right"> <%= I18n.t("neuigkeit.am")+" "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil?  %></small> 
    </div>
    <h1> 
--- a/app/views/neuigkeiten/_neuigkeit.html.erb
+++ b/app/views/neuigkeiten/_neuigkeit.html.erb
@@ -1,4 +1,5 @@
-
-<%= link_to [neuigkeit.rubrik,neuigkeit], {class: :linkbox} do %>
+<% c =[:linkbox] %>
+<% c << "color-"+neuigkeit.rubrik.color.to_s+"-dark" unless neuigkeit.rubrik.color.nil? %>
+<%= link_to [neuigkeit.rubrik,neuigkeit], {class: c} do %>
 <%= render :partial=>"neuigkeiten/compact",:locals=> {:neuigkeit=> neuigkeit} %>
 <% end %>
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -3,7 +3,7 @@
 <p id="notice"><%= notice %></p>
 <div class="contentbox">
 <span>
-  <%= @neuigkeit.rubrik.name %>
+  <%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %>&nbsp;<%= @neuigkeit.rubrik.name %>
 </span>
 <span class="pull-right">
  <%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> 
--- a/app/views/rubriken/_form.html.erb
+++ b/app/views/rubriken/_form.html.erb
@@ -3,8 +3,10 @@
    <%= f.input :name %>
    <%= f.input :desc %>
    <%= f.input :prio %>
+    <%= f.input :color ,:as=>:radio,:collection=>{raw('<a class="color-1-dark">color1</a>')=>1, raw('<a class="color-2-dark">color2</a>')=>2, raw('<a class="color-3-dark">color3</a>')=>3, raw('<a class="color-4-dark">color4</a>')=>4, raw('<a class="color-5-dark">color5</a>')=>5} %>
    <%= f.input :public %>    
-  
+        <%= f.input :icon , :input_html=>{:id=>"iconfield"}%>
+    <i id="icon"></i>

  <% end %>

@@ -12,3 +14,13 @@
    <%= f.action :submit, :as => :input %>
  <% 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 %> 
--- a/app/views/themen/_form.html.erb
+++ b/app/views/themen/_form.html.erb
@@ -44,6 +44,7 @@
  <% end %> 
  <% end %><% end %>
  <%= tinymce %>
+  <%= tinymce_icon_choice %>
  <h2>Attachments:</h2>
  <%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %>

--- a/app/views/themengruppen/_form.html.erb
+++ b/app/views/themengruppen/_form.html.erb
@@ -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 %> 
--- a/app/views/themengruppen/_themengruppe.html.erb
+++ b/app/views/themengruppen/_themengruppe.html.erb
@@ -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>
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -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 %>
--- a/app/views/themes/blue1/home/index.html.erb
+++ b/app/views/themes/blue1/home/index.html.erb
@@ -6,9 +6,6 @@
 
     
 <p>
-<% ffi1_list.each do |i| %>
-<%= ffi1_icon i %>
-<% end %>
 <%= ffi1_icon "academic" %><%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
 </p>
  <div class="alert">