Added twitter bootstrap layout. Adapt home page.
This commit is contained in:
benni
parent
31735f35ab
commit
f20ae890dd
18 changed files with 334 additions and 264 deletions
|
|
@ -1,14 +1,10 @@
|
|||
Engagement Deiner Bestellgruppe
|
||||
.stats-bar{style: "width:#{apple_bar.length_of_group_bar}px; background-color:#{apple_bar.group_bar_color}"}
|
||||
= apple_bar.apples
|
||||
= " Äpfel" if apple_bar.length_of_group_bar > 50
|
||||
|
||||
Durchschnittsengagement
|
||||
.stats-bar{style: "width:#{apple_bar.length_of_global_bar}px"}
|
||||
100 Birnen
|
||||
Deine aktueller Äpfelpunktestand: #{apple_bar.apples}
|
||||
.progress
|
||||
%div{class: "bar bar-#{apple_bar.group_bar_state}", style: "width: #{apple_bar.group_bar_width}%"}
|
||||
|
||||
%span.description
|
||||
Abgebildet ist das Verhältnis von erledigten Aufgaben zu dem Bestellvolumen Deiner Bestellgruppe im Vergleich zum Durchschnitt in der Foodcoop.
|
||||
Konkret: Pro #{number_to_currency(apple_bar.mean_order_amount_per_job, :precision => 0 )} Bestellsumme solltest Du eine Aufgabe machen!
|
||||
- if FoodsoftConfig[:stop_ordering_under].present?
|
||||
Achtung, hast Du weniger als #{FoodsoftConfig[:stop_ordering_under]} Äpfel, darfst Du nicht mehr bestellen!
|
||||
%strong Achtung,
|
||||
hast Du weniger als #{FoodsoftConfig[:stop_ordering_under]} Äpfel, darfst Du nicht mehr bestellen!
|
||||
|
|
@ -1,44 +1,34 @@
|
|||
%h2 Direkt zu ...
|
||||
%ul
|
||||
%li
|
||||
Foodcoop
|
||||
%ul
|
||||
%li= link_to "Mitglieder", foodcoop_users_path
|
||||
%li= link_to "Meine Aufgaben", user_tasks_path
|
||||
%li= link_to "Nachricht schreiben", :controller => "messages", :action => "new"
|
||||
|
||||
// Orders
|
||||
- has_ordergroup = !@current_user.ordergroup.nil?
|
||||
- has_orders_role = @current_user.role_orders?
|
||||
- if has_ordergroup || has_orders_role
|
||||
%li
|
||||
Bestellungen
|
||||
%ul
|
||||
- if has_ordergroup
|
||||
%li= link_to "Bestellübersicht", group_orders_path
|
||||
- if has_orders_role
|
||||
%li= link_to "Bestellungen beenden", :controller => 'orders'
|
||||
// Articles
|
||||
- if @current_user.role_article_meta? || @current_user.role_suppliers?
|
||||
%li
|
||||
Artikelverwaltung
|
||||
%ul
|
||||
%li= link_to "Artikel aktualisieren", suppliers_path
|
||||
%li= link_to "Lagerverwaltung", :controller => 'stockit'
|
||||
%li= link_to "Lieferanten verwalten", suppliers_path
|
||||
|
||||
// Finance
|
||||
- if @current_user.role_finance?
|
||||
%li
|
||||
Finanzbereich
|
||||
%ul
|
||||
%li= link_to "Konten aktualisieren", finance_new_transaction_collection_path
|
||||
%li= link_to "Bestellungen abrechnen", finance_root_path
|
||||
|
||||
// Administration
|
||||
- if @current_user.role_admin?
|
||||
%li
|
||||
Administration
|
||||
%ul
|
||||
%li= link_to "Neue Bestellgruppe", new_admin_ordergroup_path
|
||||
%li= link_to "Neues Mitglied", new_admin_user_path
|
||||
.well.well-small
|
||||
%h3 Direkt zu ...
|
||||
%ul.nav.nav-list
|
||||
%li.nav-header Foodcoop
|
||||
%li= link_to "Mitglieder", foodcoop_users_path
|
||||
%li= link_to "Meine Aufgaben", user_tasks_path
|
||||
%li= link_to "Nachricht schreiben", :controller => "messages", :action => "new"
|
||||
|
||||
- has_ordergroup = !@current_user.ordergroup.nil?
|
||||
- has_orders_role = @current_user.role_orders?
|
||||
- if has_ordergroup || has_orders_role
|
||||
%li.nav-header Bestellungen
|
||||
- if has_ordergroup
|
||||
%li= link_to "Bestellübersicht", group_orders_path
|
||||
- if has_orders_role
|
||||
%li= link_to "Bestellungen beenden", :controller => 'orders'
|
||||
// Articles
|
||||
- if @current_user.role_article_meta? || @current_user.role_suppliers?
|
||||
%li.nav-header Artikelverwaltung
|
||||
%li= link_to "Artikel aktualisieren", suppliers_path
|
||||
%li= link_to "Lagerverwaltung", :controller => 'stockit'
|
||||
%li= link_to "Lieferanten verwalten", suppliers_path
|
||||
|
||||
// Finance
|
||||
- if @current_user.role_finance?
|
||||
%li.nav-header Finanzbereich
|
||||
%li= link_to "Konten aktualisieren", finance_new_transaction_collection_path
|
||||
%li= link_to "Bestellungen abrechnen", finance_root_path
|
||||
|
||||
// Administration
|
||||
- if @current_user.role_admin?
|
||||
%li.nav-header Administration
|
||||
%li= link_to "Neue Bestellgruppe", new_admin_ordergroup_path
|
||||
%li= link_to "Neues Mitglied", new_admin_user_path
|
||||
|
|
@ -1,78 +1,68 @@
|
|||
- title t('.title')
|
||||
- title t('.title'), false
|
||||
|
||||
#start_nav
|
||||
- content_for(:sidebar) do
|
||||
= render :partial => 'start_nav'
|
||||
|
||||
.right_column{:style => "width:70%"}
|
||||
- unless @unaccepted_tasks.empty? && @next_tasks.empty? && @unassigned_tasks_number == 0
|
||||
.box_title
|
||||
%h2 Aufgaben
|
||||
.column_content
|
||||
-unless @next_tasks.empty?
|
||||
%div{:style => "float:left, margin-bottom:2em"}
|
||||
%h3 Deine Aufgaben für die nächste Woche:
|
||||
%table{:style => "width:25em"}
|
||||
-for task in @next_tasks
|
||||
%tr
|
||||
%td= format_date task.due_date
|
||||
%td
|
||||
%b= task.name
|
||||
- unless @unaccepted_tasks.empty? && @next_tasks.empty? && @unassigned_tasks_number == 0
|
||||
%section.well
|
||||
%h2 Aufgaben
|
||||
-unless @next_tasks.empty?
|
||||
%div{:style => "float:left, margin-bottom:2em"}
|
||||
%strong Deine Aufgaben für die nächste Woche:
|
||||
%table.table(style="width:25em")
|
||||
-for task in @next_tasks
|
||||
%tr
|
||||
%td= format_date task.due_date
|
||||
%td
|
||||
%b= task.name
|
||||
|
||||
- unless @unaccepted_tasks.empty?
|
||||
%h3 Aufgaben übernehmen
|
||||
Du bis für Aufgaben verantwortlich.
|
||||
= link_to "Aufgaben übernehmen/ablehnen", user_tasks_path
|
||||
- unless @unassigned_tasks_number == 0
|
||||
%h3 Offene Aufgaben
|
||||
= "Es gibt #{@unassigned_tasks_number} #{link_to 'offene Aufgabe(n)', :controller => 'tasks'}".html_safe
|
||||
%p{:style => "clear:both"}= link_to "Meine Aufgaben", user_tasks_path
|
||||
- unless @unaccepted_tasks.empty?
|
||||
%h3 Aufgaben übernehmen
|
||||
Du bis für Aufgaben verantwortlich.
|
||||
= link_to "Aufgaben übernehmen/ablehnen", user_tasks_path
|
||||
- unless @unassigned_tasks_number == 0
|
||||
%h3 Offene Aufgaben
|
||||
= "Es gibt #{@unassigned_tasks_number} #{link_to 'offene Aufgabe(n)', :controller => 'tasks'}".html_safe
|
||||
%p= link_to "Meine Aufgaben", user_tasks_path
|
||||
|
||||
- if current_user.ordergroup
|
||||
// Current orders
|
||||
= render :partial => 'shared/open_orders', :locals => {:ordergroup => current_user.ordergroup}
|
||||
- if current_user.ordergroup
|
||||
= render :partial => 'shared/open_orders', :locals => {:ordergroup => current_user.ordergroup}
|
||||
|
||||
// Stats
|
||||
- if current_user.ordergroup
|
||||
.box_title
|
||||
%h2 Engagement Deiner Bestellgruppe
|
||||
.column_content
|
||||
= render :partial => "apple_bar", :locals => {:apple_bar => AppleBar.new(current_user.ordergroup)}
|
||||
// Stats
|
||||
- if current_user.ordergroup
|
||||
%section
|
||||
%h2 Engagement Deiner Bestellgruppe
|
||||
= render :partial => "apple_bar", :locals => {:apple_bar => AppleBar.new(current_user.ordergroup)}
|
||||
|
||||
- unless Message.public.empty?
|
||||
.box_title
|
||||
%h2 Neuste Nachrichten
|
||||
.column_content
|
||||
= render :partial => 'messages/messages',
|
||||
:locals => {:messages => Message.public.order('created_at DESC').limit(5), :subject_length => 70}
|
||||
%br/
|
||||
= link_to "Alle Nachrichten einsehen", messages_path
|
||||
- unless Message.public.empty?
|
||||
%section
|
||||
%h2 Neuste Nachrichten
|
||||
= render :partial => 'messages/messages',
|
||||
:locals => {:messages => Message.public.order('created_at DESC').limit(5), :subject_length => 70}
|
||||
%p= link_to "Alle Nachrichten einsehen", messages_path
|
||||
|
||||
- if current_user.ordergroup
|
||||
// Ordergroup overview
|
||||
.box_title
|
||||
%h2 Meine Bestellgruppe
|
||||
.column_content
|
||||
%p
|
||||
%b= current_user.ordergroup.name
|
||||
|
|
||||
Verfügbares Guthaben:
|
||||
= number_to_currency(current_user.ordergroup.get_available_funds)
|
||||
%span.description
|
||||
(Letzte Aktualisierung ist
|
||||
= distance_of_time_in_words(Time.now, current_user.ordergroup.account_updated) + " her)"
|
||||
%h3 Letzte Transaktionen
|
||||
%table
|
||||
- if current_user.ordergroup
|
||||
// Ordergroup overview
|
||||
%section
|
||||
%h2 Meine Bestellgruppe
|
||||
%p
|
||||
%b= current_user.ordergroup.name
|
||||
| Verfügbares Guthaben:
|
||||
= number_to_currency(current_user.ordergroup.get_available_funds)
|
||||
%small (Letzte Aktualisierung ist #{distance_of_time_in_words(Time.now, current_user.ordergroup.account_updated)} her)
|
||||
%h3 Letzte Transaktionen
|
||||
%table.table.table-striped
|
||||
%tr
|
||||
%th Wann
|
||||
%th Wer
|
||||
%th Notiz
|
||||
%th Betrag
|
||||
- for ft in current_user.ordergroup.financial_transactions.limit(5)
|
||||
%tr
|
||||
%th Wann
|
||||
%th Wer
|
||||
%th Notiz
|
||||
%th Betrag
|
||||
- for ft in current_user.ordergroup.financial_transactions.limit(5)
|
||||
%tr{:class => cycle('even','odd')}
|
||||
%td= format_time(ft.created_on)
|
||||
%td= h(ft.user.nil? ? '?' : ft.user.nick)
|
||||
%td= h(ft.note)
|
||||
- color = ft.amount < 0 ? 'red' : 'black'
|
||||
%td{:style => "color:#{color}; width:5em", :class => "currency"}= number_to_currency(ft.amount)
|
||||
%br/
|
||||
= link_to "mehr ...", my_ordergroup_path
|
||||
%td= format_time(ft.created_on)
|
||||
%td= h(ft.user.nil? ? '?' : ft.user.nick)
|
||||
%td= h(ft.note)
|
||||
- color = ft.amount < 0 ? 'red' : 'black'
|
||||
%td{:style => "color:#{color}; width:5em", :class => "currency"}= number_to_currency(ft.amount)
|
||||
%br/
|
||||
%p= link_to "Kontoauszug anzeigen", my_ordergroup_path
|
||||
Loading…
Add table
Add a link
Reference in a new issue