Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts: app/views/themen/_form.html.erb
2014-07-09 20:18:07 +02:00
parent 6a730c7411 4bc7c4b001
commit 397721f89e
47 changed files with 1354 additions and 94 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/home/_search_results.html.erb
+++ b/app/views/home/_search_results.html.erb
@@ -27,12 +27,16 @@
 <h2>Themen</h2>
 <% end %>

-<% @themen.each do |thema| %>
 <ul class="unstyled content-list" style="max-width:70em">
+
+<% @themen.each do |thema| %>
+<% if can? :show, thema %>
  <li><%= link_to thema.title,thema %>
 <div class="contentbox">
      <%= render :partial=>"themen/small", :object=>thema %>
 </div>
  </li>
-</ul>
 <% end %>
+
+<% end %>
+</ul>
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -5,7 +5,7 @@
 	<li><%= render n if can?(:show, n) %> </li>
 	<% end %>
      </ul>
-<p>
+<p><i class="ffi1-bar1 ffi1"></i>
 <%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
 </p>
  <div class="alert">
--- a/app/views/home/intern.html.erb
+++ b/app/views/home/intern.html.erb
@@ -2,9 +2,12 @@
 <div class="container-fluid">
  <div class="row-fluid">
    <div class="span6">
-      <%= link_to "Adressliste", internlist_fetprofiles_path %>
-      <%= link_to "Admin" , admin_home_index_path if current_user.has_role?(:fetadmin) %>
-
+<ul class="linklist">
+<li>
+      <%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %></li>
+ <li>     <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
+</li>
+</ul>
      <ul class="unstyled linkbox-list">
 	<li>  
 	  <% @themengruppen.each do |themengruppe| %>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -12,16 +12,8 @@
  <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
  <% theme_stylesheet_link_tag "test", :media => "all" %>
  <% theme_stylesheet_link_tag "mod", :media=>"all" %>
- <!--   <link rel="stylesheet" href="css/bootstrap.css">
-<link rel="stylesheet" href="css/style.css">
-<link rel="stylesheet" href="css/bootstrap-responsive.css">
-<link rel="stylesheet" href="css/bootstrap-image-gallery.css">
-->
-<!--[if lt IE 7]><link rel="stylesheet" href="css/bootstrap-ie6.css"><![endif]-->
-
  <%= javascript_include_tag "application" %>
  <%= csrf_meta_tags %>
-
 </head>

 <body>
@@ -29,10 +21,13 @@
     <div class="row-fluid">
       <div class="span1 "></div>
       <div class="span10 ">
-	 <div class="header_wrap" style="background:7070a0">
+	 <div class="header_wrap">
 	   <div class="header">
-	     <%= link_to image_tag('/fetlogo90.png',{:style=>"float:left;height:50px",:height=>"50"}),home_index_path %>
-	     <h1 style="display:block"></h1>
+	     <% link_to image_tag('/fetlogo90.png',{:style=>"float:left;height:50px",:height=>"50"}),home_index_path %>
+	     <%= link_to home_index_path do %>
+	     <span class="feticon-fet_logo fa-4x color-1"> </span>
+	     <% end %>
+
 	   </div>
 	   
 	   <div id="menudiv" style="margin-top:12px">
--- a/app/views/layouts/menu.html.erb
+++ b/app/views/layouts/menu.html.erb
@@ -23,8 +23,7 @@
 	  <li>
 	    <%= link_to 'Intern' , intern_home_index_path  %>
 	  </li><% end %>
-	</ul>
-	<ul class="nav navbar-nav">
+
 	<li class="dropdown">
 	  <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>
 	<ul class="dropdown-menu">	 
--- 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/_attachment_list.html.erb
+++ b/app/views/themen/_attachment_list.html.erb
@@ -1,4 +1,4 @@
-<table>
+<table class="table-striped">
 <% attachment_list.each do |a| %>
 <tr>
 <td>
--- a/app/views/themen/_form.html.erb
+++ b/app/views/themen/_form.html.erb
@@ -57,8 +57,12 @@
  <% end %>
  <% end %>
  <%= tinymce %>
+
 </div>
+
+<%= tinymce_icon_choice %>
 <h2>Attachments:</h2>
 <%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %>


+
--- a/app/views/themen/_small.html.erb
+++ b/app/views/themen/_small.html.erb
@@ -15,7 +15,7 @@
 <br/>
 <% small.fragen.each do |frage| %>
 <p>
-  <b> <%= frage.title %> </b> <br/>
+<b> <%= frage.title %> </b> <br/>
  <%= raw(frage.text) %>
 </p>
 <% end %>
--- 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'} do %>
+<%= link_to themengruppe,{:class=>'linkbox color-4-dark'} do %>
 <div class="row-fluid">
-  <div class="span6">
+  <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/faqs.html.erb
+++ b/app/views/themengruppen/faqs.html.erb
@@ -1,4 +1,4 @@
-<h1><%= I18n.t("themengruppe.faqs") %>
+<h1><%= I18n.t("themengruppe.faqs") %></h1>
 <div class="content-wrap content-column">
  <% @themengruppen.each do |tg| %>
  <div class="contentbox">
@@ -10,7 +10,7 @@
 	<ul> <% t.fragen.each do |f| %>
 	  <li>
 	    <b> <%= f.title %>?</b>
-	    <p> <%= f.text %></p>
+	    <p> <%= raw(f.text) %></p>
 	  </li>
 	  
 	  <% end %>
--- a/app/views/themengruppen/index.html.erb
+++ b/app/views/themengruppen/index.html.erb
@@ -1,7 +1,10 @@
 <div class="content-wrap content-column">
  <%= render :partial=>'layouts/pretty_toolbar' %>
-  <p>  
-    <%= link_to I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :btn %>
+  <ul class="linklist">
+    <li>
+    <%= link_to fa_icon("question")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
+</li>
+</ul>
  </p>
  <ul class="unstyled linkbox-list">
    <li>  
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -1,9 +1,18 @@
 <div class="content-wrap content-column" >
-  <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("themengruppe.showall"), themengruppen_path, :class=>"linkbox" %>
-  <%= link_to fa_icon("question 2x")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
+  <ul class="linklist">
+<% if @themengruppe.public %>
+<li>  <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("themengruppe.showall"), themengruppen_path, :class=>"linkbox" %></li>
+<% else %>
+<li>  <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("common.intern"), intern_home_index_path, :class=>"linkbox" %></li>
+<% end %>
+  <li><%= link_to fa_icon("question 2x")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
+</li>
+</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,7 +6,7 @@
 
     
 <p>
-<%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
+<%= ffi1_icon "academic" %><%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
 </p>
  <div class="alert">
    <h2>Beta Test</h2>
@@ -15,6 +15,7 @@
      Fehlermeldungen auf GitHub melden.
    </p>
    <p>
+      
      <%= link_to "Issues", "http://www.github.com/fetsite/fetsite/issues" %>
    </p>
    <p>