Fixed admin, orders, wiki views. Converted all erb to haml.
This commit is contained in:
benni
parent
699fb9b233
commit
552c553b77
169 changed files with 1158 additions and 1307 deletions
5
app/views/admin/users/_form.html.haml
Normal file
5
app/views/admin/users/_form.html.haml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
= simple_form_for([:admin, @user]) do |f|
|
||||
= render :partial => 'shared/user_form_fields', :locals => {:f => f}
|
||||
.form-actions
|
||||
= f.submit
|
||||
= link_to 'oder abbrechen', :back
|
||||
|
|
@ -1,12 +1,7 @@
|
|||
%p
|
||||
%table{:style => "width:100%"}
|
||||
%tr
|
||||
%td
|
||||
= pagination_links_remote @users
|
||||
%td{:style => "text-align:right"}
|
||||
- if @users.size > 20
|
||||
= items_per_page
|
||||
%table.list
|
||||
- if User.count > 20
|
||||
= items_per_page
|
||||
= pagination_links_remote @users
|
||||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%th Login
|
||||
|
|
@ -14,17 +9,16 @@
|
|||
%th Email
|
||||
%th Zugriff auf
|
||||
%th Letzter login
|
||||
%th{:style => "width:3em"}
|
||||
%th Aktionen
|
||||
%tbody
|
||||
- for user in @users
|
||||
|
||||
%tr{:class => cycle('even','odd', :name => 'users')}
|
||||
%tr
|
||||
%td= link_to user.nick, [:admin, user]
|
||||
%td=h user.name
|
||||
%td=h user.email
|
||||
%td=h format_roles(user)
|
||||
%td=h format_time(user.last_login)
|
||||
%td
|
||||
= link_to icon(:edit), edit_admin_user_path(user)
|
||||
= link_to icon(:delete), [:admin, user], :confirm => "Willst du #{user.name} wirklich löschen?",
|
||||
:method => :delete
|
||||
= link_to 'Bearbeiten', edit_admin_user_path(user), class: 'btn btn-mini'
|
||||
= link_to 'Löschen', [:admin, user], :confirm => "Willst du #{user.name} wirklich löschen?",
|
||||
:method => :delete, class: 'btn btn-danger btn-mini'
|
||||
|
|
|
|||
|
|
@ -1,9 +1,3 @@
|
|||
%h1 Benutzerin bearbeiten
|
||||
#newUser{:style => "width:65em"}
|
||||
.box_title
|
||||
%h2 Benutzerin bearbeiten
|
||||
#userForm.column_content
|
||||
- simple_form_for([:admin, @user]) do |f|
|
||||
= render :partial => 'shared/user_form_fields', :locals => {:f => f}
|
||||
= f.submit
|
||||
= link_to 'oder abbrechen', admin_users_path
|
||||
- title "Benutzerin bearbeiten"
|
||||
|
||||
= render 'form'
|
||||
|
|
|
|||
|
|
@ -1,18 +1,16 @@
|
|||
- title "Admin/Benutzerinnen"
|
||||
%p
|
||||
%i
|
||||
Hier kannst du Benutzer_innen
|
||||
= link_to 'neu Anlegen', new_admin_user_path
|
||||
, bearbeiten und natürlich auch löschen.
|
||||
.left_column{:style => "width:100%"}
|
||||
.box_title
|
||||
%h2 Benutzerinnenübersicht
|
||||
.column_content
|
||||
#user_filter{:style => "float:left; margin-right:2em;"}
|
||||
= form_tag admin_users_path, :method => :get, :style=>"display:inline;", :id => 'user_search',
|
||||
:remote => true, 'data-submit-onchange' => true do
|
||||
%label{:for => 'article_name'} Suche nach Name:
|
||||
= text_field_tag :query, params[:query], :size => 10
|
||||
#users
|
||||
= render :partial => "users"
|
||||
%p= link_to 'Neue Benutzerin', new_admin_user_path
|
||||
|
||||
- content_for :sidebar do
|
||||
%p= link_to 'Neue Benutzerin anlegen', new_admin_user_path, class: 'btn btn-primary'
|
||||
%p
|
||||
Hier kannst du Benutzer_innen #{link_to 'neu Anlegen', new_admin_user_path},
|
||||
bearbeiten und natürlich auch löschen.
|
||||
|
||||
.well.well-small
|
||||
= form_tag admin_users_path, :method => :get, :remote => true,
|
||||
'data-submit-onchange' => true, class: 'form-search' do
|
||||
= text_field_tag :user_name, params[:user_name], class: 'input-medium search-query',
|
||||
placeholder: 'Name ...'
|
||||
|
||||
#users
|
||||
= render "users"
|
||||
|
|
@ -1 +0,0 @@
|
|||
$('#users').html('<%= escape_javascript(render("users")) %>');
|
||||
1
app/views/admin/users/index.js.haml
Normal file
1
app/views/admin/users/index.js.haml
Normal file
|
|
@ -0,0 +1 @@
|
|||
$('#users').html('#{escape_javascript(render("users"))}');
|
||||
|
|
@ -1,11 +1,3 @@
|
|||
- title "Neue Benutzerin"
|
||||
- title "Neue Benutzerin anlegen"
|
||||
|
||||
#newUser
|
||||
.box_title
|
||||
%h2 Neue Benutzerin
|
||||
.column_content#userForm
|
||||
= simple_form_for([:admin, @user]) do |f|
|
||||
= render :partial => 'shared/user_form_fields', :locals => {:f => f}
|
||||
= f.submit
|
||||
= link_to 'oder abbrechen', admin_users_path
|
||||
%p= link_to 'Benutzerinnenübersicht', admin_users_path
|
||||
= render 'form'
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
<h1><%=h @user.nick %></h1>
|
||||
<div class="left_column" style="width:100%">
|
||||
<div class="box_title">
|
||||
<h2>Übersicht</h2>
|
||||
</div>
|
||||
<div class="column_content">
|
||||
<p>
|
||||
Mitglied seit <%= distance_of_time_in_words(Time.now, @user.created_on) -%>
|
||||
</p>
|
||||
<div style="float:left;margin:5px; margin-right:10px;" class="box">
|
||||
<p><b>Person</b></p>
|
||||
<p><b>Nick:</b> <%=h @user.nick %></p>
|
||||
<p><b>Name:</b> <%=h @user.name %></p>
|
||||
<p><b>Email:</b> <%=h @user.email %></p>
|
||||
<p><b>Telefon:</b> <%=h @user.phone %></p>
|
||||
</div>
|
||||
<div style="float:left; margin:5px;" class="box">
|
||||
<p>
|
||||
<b>Einstellungen</b>
|
||||
</p>
|
||||
<table style="width:26em">
|
||||
<tbody>
|
||||
<% for setting in User::setting_keys.keys -%>
|
||||
<tr>
|
||||
<td><%= User::setting_keys[setting] %></td>
|
||||
<td><%= @user.settings[setting] == '1' ? 'ja' : 'nein' %></td>
|
||||
</tr>
|
||||
<% end -%>
|
||||
</tbody>
|
||||
</table>
|
||||
<p>
|
||||
<b>Benutzer_in hat Zugriff auf:</b>
|
||||
</p>
|
||||
<p>
|
||||
<%=h format_roles(@user) %>
|
||||
</p>
|
||||
</div>
|
||||
<p style="clear:both">
|
||||
<%= link_to 'Bearbeiten', edit_admin_user_path(@user) %>
|
||||
| <%= link_to 'Löschen', [:admin, @user], :confirm => "Willst du #{@user.first_name} wirklich rausschmeißen?", :method => :delete %>
|
||||
| <%= link_to "Nachricht senden", new_message_path(:message => {:mail_to => @user.id}) %>
|
||||
</p>
|
||||
</div>
|
||||
<div class="box_title"><h2>Gruppenabos</h2></div>
|
||||
<div class="column_content">
|
||||
<% for membership in Membership.find_all_by_user_id(@user.id) -%>
|
||||
<p>
|
||||
<%= link_to(membership.group.name, [:admin, membership.group]) %>
|
||||
</p>
|
||||
<% end -%>
|
||||
</div>
|
||||
</div>
|
||||
39
app/views/admin/users/show.html.haml
Normal file
39
app/views/admin/users/show.html.haml
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
- title @user.nick
|
||||
|
||||
.row-fluid
|
||||
.span3
|
||||
.well
|
||||
%h4 Person
|
||||
%p Mitglied seit #{distance_of_time_in_words(Time.now, @user.created_on)}
|
||||
%dl
|
||||
%dt Nick
|
||||
%dd= @user.nick
|
||||
%dt Name
|
||||
%dd= h @user.name
|
||||
%dt Email
|
||||
%dd= @user.email
|
||||
%dt Telefon
|
||||
%dd= @user.phone
|
||||
%dt Zugriff auf
|
||||
%dd= format_roles(@user)
|
||||
.span5
|
||||
.well
|
||||
%h4 Einstellungen
|
||||
%table.table
|
||||
- for setting in User::setting_keys.keys
|
||||
%tr
|
||||
%td= User::setting_keys[setting]
|
||||
%td= @user.settings[setting] == '1' ? 'ja' : 'nein'
|
||||
.span3
|
||||
.well
|
||||
%h4 Gruppenabos
|
||||
%ul.unstyled
|
||||
- for membership in Membership.find_all_by_user_id(@user.id)
|
||||
%li= link_to(membership.group.name, [:admin, membership.group])
|
||||
|
||||
%hr/
|
||||
%p
|
||||
= link_to 'Bearbeiten', edit_admin_user_path(@user), class: 'btn'
|
||||
= link_to 'Löschen', [:admin, @user], :confirm => "Willst du #{@user.first_name} wirklich rausschmeißen?",
|
||||
:method => :delete, class: 'btn btn-danger'
|
||||
= link_to "Nachricht senden", new_message_path(:message => {:mail_to => @user.id}), class: 'btn'
|
||||
Loading…
Add table
Add a link
Reference in a new issue