themen interface cleanup1

Gemfile

@@ -91,6 +91,7 @@ gem 'bootstrap-addons-rails'
 gem "jquery-fileupload-rails"
 gem "jquery-ui-rails","~> 4.1.1" 
 gem "font-awesome-rails"
+gem "jquery-datetimepicker-rails"
 # gem "jquery-sortable-rails"
 gem "seed_dump", "~> 0.5.3"
 #gem "themes_for_rails" ,:git =>'git://github.com/tkriplean/themes_for_rails.git'

app/assets/stylesheets/themes/blue1/application.css.scss

@@ -12,6 +12,7 @@
  *= require_self
  * require_tree .
  *= require jquery.fileupload-ui
+*= require jquery.datetimepicker	
  * require 'bootstrap'
 
  * require 'neuigkeiten'

app/controllers/themen_controller.rb

@@ -3,24 +3,12 @@ class ThemenController < ApplicationController
   # GET /themen.json
   load_and_authorize_resource
 
-  def index
-    @themen = Thema.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @themen }
-    end
-  end
-
-  # GET /themen/1
-  # GET /themen/1.json
   def show
     @thema = Thema.find(params[:id])
-   
     @fragen=@thema.fragen
-    @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>"Verwalten", :path=>verwalten_thema_path(@thema)}]
 
-    @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('thema.edit'), :path=>edit_thema_path(@thema)}]
+    @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t("thema.manage"), :path=>verwalten_thema_path(@thema)}]
+    @toolbar_elements << [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('thema.edit'), :path=>edit_thema_path(@thema)}]
     @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('thema.remove'), :path=>thema_path(@thema), :method=>:delete, :confirm=>I18n.t('thema.sure')}
 
     respond_to do |format|
@@ -33,10 +21,7 @@ class ThemenController < ApplicationController
   def verwalten
     @thema = Thema.find(params[:id])
     @attachment=Attachment.new
-
- 
     @fragen=@thema.fragen
-    @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>"Verwalten", :path=>verwalten_thema_path(@thema)}]
 
     @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('thema.edit'), :path=>edit_thema_path(@thema)}]
     @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('thema.remove'), :path=>thema_path(@thema), :method=>:delete, :confirm=>I18n.t('thema.sure')}
@@ -73,11 +58,10 @@ class ThemenController < ApplicationController
   def create
     @thema = Thema.new(params[:thema])
        
-    
     respond_to do |format|
       if @thema.save
         @themen = @thema.themengruppe.themen.order(:priority).reverse
-        format.html { redirect_to @thema, notice: 'Thema was successfully created.' }
+        format.html { redirect_to @thema, notice: I18n.t("thema.created") }
         format.json { render json: @thema, status: :created, location: @thema }
         format.js   {render action: "update"}
       else
@@ -110,9 +94,10 @@ class ThemenController < ApplicationController
     @themen = @thema.themengruppe.themen.order(:priority).reverse
     @thema.assign_attributes(params[:thema])
     @thema.fix_links(request.host_with_port)
+   
     respond_to do |format|
       if @thema.save
-        format.html { redirect_to @thema, notice: 'Thema was successfully updated.' }
+        format.html { redirect_to @thema, notice: I18n.t("thema.updated") }
         format.json { head :no_content }
         format.js   
       else

app/controllers/themengruppen_controller.rb

@@ -5,7 +5,7 @@ class ThemengruppenController < ApplicationController
   def index
     @themengruppen = Themengruppe.where(:public=>true).order(:priority).reverse
     @toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()}]
-    @toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('common.verwalten'), :path=>verwalten_all_themengruppen_path()}]
+    @toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.manage_all'), :path=>verwalten_all_themengruppen_path()}]
 
     respond_to do |format|
       format.html # index.html.erb

app/views/fragen/_frage.html.erb

@@ -1,8 +1,8 @@
 <p>
-<b> <%= frage.title %> </b> <br/>
+<b> <%= frage.title %>? </b> <br/>
 <%= raw(frage.text) %>
 <br/>
 
-<%= link_to 'Edit', edit_frage_path(frage),:remote=>true %> |
-<%= link_to 'Destroy',frage, method: :delete, :remote=> true , data: { confirm: 'Are you sure?' } %>
+<%= link_to 'Edit', edit_frage_path(frage),:remote=>true %> 
+<%= link_to 'Destroy',frage, method: :delete, :remote=> true , data: { confirm: I18n.t("frage.sure") } %>
 </p>

app/views/neuigkeiten/_form.html.erb

@@ -33,5 +33,5 @@
   <% end %>
 <% end %>
 </div>
-<script>$('.datepicker').datepicker()</script>
+<script>$('.datetimepicker').datetimepicker({format: 'd.m.Y H:i'})</script>
 <%= tinymce %>

app/views/themen/_form.html.erb

@@ -1,33 +1,29 @@
 <%= tinymce_assets %>
 <div class="container-fluid">
-
-
-<%= semantic_form_for @thema, :remote=>remote do |f| %>
+  <%= semantic_form_for @thema, :remote=>remote do |f| %>
   <%= f.inputs do %>
-<div class="row-fluid">
-<div class="span6">
+  <div class="row-fluid">
+    <div class="span6">
       <%= f.input :title %>
-</div> 
-<div class="span6">
+    </div> 
+    <div class="span6">
       <%= f.input :themengruppe %>
-</div>
-<div class="row-fluid"> 
-<div class="span12"> 
+    </div>
+    <div class="row-fluid"> 
+      <div class="span12"> 
 	<%= f.input :text, :as=>:tinymce_text,:label=>false, :input_html=>{:rows=>20} %>
-</div> 
-</div> 
+      </div> 
+    </div> 
+  </div>
 
-
-</div>
-
-<%= f.actions do %>
-<%= f.action :submit, :as => :button %> 
-
-<%= f.action :cancel, :as => :link %>
-<% end %> 
-<% end %><% end %>
+  <%= f.actions do %>
+  <%= f.action :submit, :as => :button %> 
+  <%= f.action :submit, :as => :button, :label=> "&edit", :params=>{edit: true} %> 
+  <%= f.action :cancel, :as => :link %>
+  <% end %> 
+  <% end %><% end %>
   <%= tinymce %>
-<h2>Attachments:</h2>
-<%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %>
+  <h2>Attachments:</h2>
+  <%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %>
 
 

app/views/themengruppen/_themengruppe.html.erb

@@ -26,7 +26,7 @@
   <div class="span6">
     <!--<b><%= I18n.t("themengruppe.themen") %></b>
     --><ul>
-      <% themengruppe.themen.order(:title).each do |t| %>
+      <% themengruppe.themen.order(:priority).reverse.each do |t| %>
       <li>
 	<%= render t %>
       </li>

app/views/themengruppen/faqs.html.erb

@@ -1,3 +1,4 @@
+<h1><%= I18n.t("themengruppe.faqs") %>
 <div class="content-wrap content-column">
   <% @themengruppen.each do |tg| %>
   <div class="contentbox">
@@ -8,7 +9,7 @@
       <li> <%= t.title %>
 	<ul> <% t.fragen.each do |f| %>
 	  <li>
-						<b> <%= f.title %></b>
+	    <b> <%= f.title %>?</b>
 	    <p> <%= f.text %></p>
 	  </li>
 	  

app/views/themengruppen/index.html.erb

@@ -1,7 +1,7 @@
 <div class="content-wrap content-column">
   <%= render :partial=>'layouts/pretty_toolbar' %>
   <p>  
-    <%= link_to "FAQS", faqs_themengruppen_path,class: :btn %>
+    <%= link_to I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :btn %>
   </p>
   <ul class="unstyled linkbox-list">
     <li>  

app/views/themengruppen/show.html.erb

@@ -1,6 +1,6 @@
 <div class="content-wrap content-column" >
-  <%= link_to fa_icon("arrow-circle-left 2x")+" Alle Themengruppen", themengruppen_path, :class=>"linkbox" %>
-  <%= link_to fa_icon("question 2x")+" Häufige Fragen", faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
+  <%= 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" %>
   <%= render :partial=>'layouts/pretty_toolbar' %>
 
   <h1><%= @themengruppe.title %></h1>
@@ -13,11 +13,8 @@
     <li>
       <div class="contentbox">	
 	<%= render :partial => 'themen/small', :object => thema %>
-
-
 	<ul class="unstyled">
 	  <% unless thema.gremium.nil? %>
-	  
 	  <li>
 	    <%= link_to fa_icon("users 2x")+thema.gremium.name , thema.gremium,:class=>"linkbox" %>
 	  </li>
@@ -26,9 +23,7 @@
 	  <% thema.nlinks.each do |l| %> 
 	  <li><%= render l.neuigkeit %></li>
 	  <% end %>
-	  <% thema.nlinks.each do |l| %> 
-	  <li><%= render l.neuigkeit %></li>
-	  <% end %>
+
 	</ul>
       </div>
     </li>

config/locales/de.yml

@@ -9,7 +9,6 @@ de:
     actions: "Aktionen"
     delete: "Löschen"    
     verwalten: "Verwalten"
-    back: "Zurück"
     sure_del: "Sicher endgültig löschen?"
   home:
     sprache: "Deutsch"

config/locales/en.yml

@@ -6,13 +6,21 @@ en:
   common:
     back: "Back"
     edit: "Edit"
+    actions: "Actions"
+    delete: "Delete"    
+    verwalten: "Manage"
+    sure_del: "Are you sure you want to delete this?"
 
   home:
     sprache: "English"
+    kontakt: "Contact"
     mtitle: "Menu"
     hallobeiderfet: "This is the page of Fachschaft Elektrotechnik at TU Wien"
     home: "Home"
     studien: "Studies"
     news: "News"
     info: "Information"
+    mitarbeiter: "Members"
+    fotos: "Fotos"
+    search: "Search"
     willkommen: "Welcome at Fachschaft Elektrotechnik" 

config/locales/themen.de.yml

@@ -6,10 +6,16 @@ de:
     remove: "Themengruppe löschen"
     sure: "Sicher, dass Sie diese Themengruppe löschen möchten?"
     manage: "Themengruppe verwalten"
+    manage_all: "Alle Themengruppen verwalten"
+    showall: "Alle Themengruppen anzeigen"
+    faqs: "Häufig gestellte Fragen"
   thema:
     add: "Thema hinzufügen"
     edit: "Thema bearbeiten"
     remove: "Thema löschen"
+    manage: "Thema verwalten"
+    created: "Thema erfolgreich erstellt"
+    updated: "Thema erfolgreich gespeichert"
     sure: "Sicher, dass Sie dieses Thema löschen möchten?"
   frage:
     add: "Frage hinzufügen"
@@ -22,8 +28,19 @@ de:
   formtastic:
     labels:
       thema:
-        title: "Themen Name"
+        title: "Themen Überschrift"
+        text: "Text"
         themengruppe: "Gruppe"
+      themengruppe:
+        title: "Überschrift"
+        priority: "Sortierung"
+        public: "öffentlich"
+        picture: "Icon"
+        text: "Beschreibung"
+      frage:
+        title: "Frage"
+        text: "Antwort"
+        thema: "Thema"
     hints:
       thema:
         title: "Überschrift"
@@ -34,3 +51,5 @@ de:
           attributes:
             title:
               blank: "Der Themen Name darf nicht leer sein!"
+            text:
+              blank: "Bitte Text hinzufügen"

db/migrate/20140621060036_add_draft_to_themen.rb

@@ -0,0 +1,6 @@
+class AddDraftToThemen < ActiveRecord::Migration
+  def change
+    add_column :themen, :hideattachment, :boolean
+    add_column :themen, :isdraft, :boolean
+  end
+end