Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'master' into allow-no-nickname

Browse source 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
This commit is contained in:
wvengen 2013-11-18 11:42:49 +01:00
commit 66ac3be81f
63 changed files with 428 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/articles/_destroy_active_article.haml
View file

@ -1,3 +1,3 @@
%tr.edit_inline{:id=> "edit_"+@article.id.to_s}
%td{:colspan=>"10"}
= t('.note', article: h(@article.name), drop_link: link_to(t('.drop'), :controller => 'orders', :action => 'edit', :id => @order)).html_safe
= t('.note', article: h(@article.name), drop_link: link_to(t('.drop'), edit_order_path(@order))).html_safe

9
app/views/group_orders/_form.html.haml
View file

@ -9,7 +9,14 @@
// create List for search-feature (using list.js, http://listjs.com)
var listjsResetPlugin = ['reset', {highlightClass: 'btn-primary'}];
var listjsDelayPlugin = ['delay', {delayedSearchTime: 500}];
new List(document.body, { valueNames: ['name'], engine: 'unlist', plugins: [listjsResetPlugin, listjsDelayPlugin] });
new List(document.body, {
valueNames: ['name'],
engine: 'unlist',
plugins: [listjsResetPlugin, listjsDelayPlugin],
// make large pages work too (as we don't have paging - articles may disappear!)
page: 10000,
indexAsync: true
});
});
- title t('.title'), false

2
app/views/home/_start_nav.haml
View file

@ -4,7 +4,7 @@
%li.nav-header= t '.foodcoop'
%li= link_to t('.members'), foodcoop_users_path
%li= link_to t('.tasks'), user_tasks_path
%li= link_to t('.write_message'), :controller => "messages", :action => "new"
%li= link_to t('.write_message'), new_message_path
- has_ordergroup = !@current_user.ordergroup.nil?
- has_orders_role = @current_user.role_orders?

14
app/views/home/ordergroup.html.haml
View file

@ -4,16 +4,14 @@
.span4
%h2= @ordergroup.name
.well
- unless @ordergroup.description.blank?
%p= @ordergroup.description
%p
%b= t '.description'
= @ordergroup.description
%p
%b= t '.funds'
%b= Ordergroup.human_attribute_name(:available_funds) + ':'
= number_to_currency(@ordergroup.get_available_funds())
%h2= t '.people'
%ul
- for membership in @ordergroup.memberships
%li= show_user membership.user
%p
%b= Ordergroup.human_attribute_name(:user_tokens) + ':'
= @ordergroup.memberships.map{|m| show_user m.user}.join(', ')
= link_to t('.invite'), new_invite_path(:id => @ordergroup), :remote => true, class: 'btn btn-primary'
.span8
%h2= t('.account_summary')

2
app/views/home/profile.html.haml
View file

@ -5,7 +5,7 @@
%h3
= h(t('.user.title', user: show_user))
%small= t '.user.since', when: distance_of_time_in_words(Time.now, @current_user.created_on)
= simple_form_for(@current_user, :url => { :action => 'update_profile'}) do |f|
= simple_form_for(@current_user, :url => update_profile_path) do |f|
= render :partial => 'shared/user_form_fields', :locals => {:f => f}
.form-actions
= submit_tag t('ui.save'), class: 'btn'

32
app/views/layouts/application1.html.haml
View file

@ -1,32 +0,0 @@
!!!
%html
%head
%meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
%title= t '.title', title: (yield(:title) or controller.controller_name)
= stylesheet_link_tag 'application'
= stylesheet_link_tag "print", :media => "print"
<!--[if lte IE 7]>
= stylesheet_link_tag 'ie_hacks'
<![endif]-->
= javascript_include_tag 'application'
= csrf_meta_tags
= yield(:head)
%body
#logininfo= render :partial => 'shared/loginInfo'
#header
#logo
= link_to root_path do
= t('layouts.logo').html_safe
%span{:style => "color:white; font-size:45%; letter-spacing: -1px;"}= FoodsoftConfig[:name]
#nav= render :partial => 'layouts/main_tabnav'
#main
#content
- flash.each do |name, msg|
= content_tag :h3, msg, :id => "flash#{name.to_s.camelize}", :class => "flash #{name}"
#loader{:style => "display:none;"}= image_tag("loader.gif", :border => 0)
- if show_title?
%h1= yield(:title)
= yield
#ajax_box(style="display:none")

2
app/views/login/forgot_password.html.haml
View file

@ -1,6 +1,6 @@
- title t('.title')
= t('.body').html_safe
= simple_form_for User.new, url: {action: 'reset_password'} do |form|
= simple_form_for User.new, url: reset_password_path do |form|
= form.input :email
.form-actions
= form.submit t('.submit'), class: 'btn'

2
app/views/login/new_password.html.haml
View file

@ -1,6 +1,6 @@
- title t('.title')
= raw t('.body', user: h(show_user(@user)))
= simple_form_for @user, :url => {:action => 'update_password', :id => @user.id, :token => @user.reset_password_token} do |form|
= simple_form_for @user, :url => update_password_path(@user.id, :token => @user.reset_password_token) do |form|
= form.input :password
= form.input :password_confirmation
.form-actions

2
app/views/orders/show.html.haml
View file

@ -50,7 +50,7 @@
%li= order_pdf(@order, :articles, t('.download.article_pdf'))
%li= order_pdf(@order, :matrix, t('.download.matrix_pdf'))
%li= order_pdf(@order, :fax, t('.download.fax_pdf'))
%li= link_to t('.download.fax_txt'), {action: 'text_fax_template', id: @order }, {title: t('.download.download_file')}
%li= link_to t('.download.fax_txt'), order_path(@order, format: :txt), {title: t('.download.download_file')}
%section#articles_table
= render 'articles', order: @order

9
app/views/pages/_body.html.haml
View file

@ -1,9 +0,0 @@
- content = wikified_body @page.body, @page.title
- toc = generate_toc @page.body
- unless toc.blank? or params[:preview]
- content_for :sidebar do
#wikitoc.well.well-small
%h3= t '.title_toc'
= toc
= content

85
app/views/pages/_form.html.haml
View file

@ -1,85 +0,0 @@
- if params[:preview]
%section#wikiContent
= render 'body'
.row-fluid
.span8
= simple_form_for @page do |f|
= f.hidden_field :lock_version
= f.input :title, input_html: {class: 'input-xxlarge'}
= f.input :body, input_html: {class: 'input-xxlarge'}
= f.input :parent_id, as: :select, collection: parent_pages_to_select(@page)
.form-actions
= button_tag :name => 'preview', class: 'btn' do
%i.icon-search= t '.preview'
= button_tag class: 'btn' do
%i.icon-save= t 'ui.save'
= link_to t('ui.or_cancel'), @page
.span4
%h3= t '.help.title'
%table.table
%tbody
%tr
%td(colspan=2)
%b= t '.help.section_character'
%tr
%td
%i= t '.help.italic'
%td
%pre
''#{t '.help.italic'}''<br />
%tr
%td
%b= t '.help.bold'
%td
%pre '''#{t '.help.bold'}'''<br />
%tr
%td= t '.help.noformat'
%td
%pre &lt;nowiki&gt;#{t '.help.text'}&lt;/nowiki&gt;
%tr
%td(colspan=2)
%b= t '.help.section_block'
%tr
%td= t '.help.headings'
%td
%pre
\== #{t '.help.heading', level: 1} ==
%pre
\=== #{t '.help.heading', level: 2} ===
%pre
\==== #{t '.help.heading', level: 3} ====
%tr
%td= t '.help.unordered_list'
%td
%pre
* #{t '.help.list_item_1'}
%pre
** #{t '.help.list_item_2'}
%tr
%td= t '.help.ordered_list'
%td
%pre
\# #{t '.help.list_item_1'}
%pre
\# #{t '.help.list_item_2'}
%tr
%td(colspan=2)
%b= t '.help.section_link'
%tr
%td= t '.help.wiki_links'
%td
%pre
[[#{t '.help.wiki_link_ex'}]]
%tr
%td= t '.help.external_links'
%td
%pre
[http://example.net #{t '.help.external_link_ex'}]
%tr
%td(colspan=2)
%b= t '.help.section_table'
%tr
%td!= t '.help.see_tables', tables_link: link_to(t('.help.tables_link'), "http://www.mediawiki.org/wiki/Help:Tables", :target => '_blank')

8
app/views/pages/_page_list_item.html.haml
View file

@ -1,8 +0,0 @@
-ident = 20 * level
%tr
%td{:style => "padding-left: #{ident}px"}
= link_to page.title, wiki_page_path(page.permalink)
%td #{show_user page.user} (#{format_datetime_timespec(page.updated_at, t('.date_format'))})
-if siteMap == 1
-for child in page.children.all
= render :partial => 'page_list_item', :locals => {:page => child, :level => level+1, :siteMap => 1}

8
app/views/pages/_recent_changes.html.haml
View file

@ -1,8 +0,0 @@
%table.table.table-striped
%thead
%tr
%th= t 'pages.title'
%th= t 'pages.last_updated'
%tbody
- for page in @pages
= render :partial => "page_list_item", :locals => {:page => page, :level => 0, :siteMap => 0}

12
app/views/pages/_site_map.html.haml
View file

@ -1,12 +0,0 @@
%table.table.table-striped
%thead
%tr
%th= t 'pages.title'
%th= t 'pages.last_updated'
- homepage = Page.find_by_permalink('Home')
- unless homepage.nil?
= render :partial => 'page_list_item', :locals => {:page => homepage, :level => 0, :siteMap => 1}
%tbody
- for page in @pages
- if page.id != homepage.try(:id)
= render :partial => 'page_list_item', :locals => {:page => page, :level => 0, :siteMap => 1}

8
app/views/pages/_title_list.html.haml
View file

@ -1,8 +0,0 @@
%table.table.table-striped
%thead
%tr
%th= t 'pages.title'
%th= t 'pages.last_updated'
%tbody
- for page in @pages
= render :partial => "page_list_item", :locals => {:page => page, :level => 0, :siteMap => 0}

17
app/views/pages/all.html.haml
View file

@ -1,17 +0,0 @@
- title t('.title'), false
- content_for :sidebar do
= link_to t('.new_page'), new_page_path, class: 'btn btn-primary'
.navbar
.navbar-inner
%ul.nav
%li= link_to t('.recent_changes'), all_pages_path(:view => 'recent_changes')
%li= link_to t('.title_list'), all_pages_path(:view => 'title_list')
%li= link_to t('.site_map'), all_pages_path(:view => 'site_map')
= form_tag all_pages_path, method: :get, class: 'form-search pull-right' do
= text_field_tag :name, params[:name], class: 'input-medium search-query',
placeholder: t('.search.placeholder')
= submit_tag t('.search.action'), class: 'btn'
= render @partial

3
app/views/pages/edit.html.haml
View file

@ -1,3 +0,0 @@
- title t('.title')
= render 'form'

3
app/views/pages/new.html.haml
View file

@ -1,3 +0,0 @@
- title t('.title')
= render 'form'

51
app/views/pages/show.html.haml
View file

@ -1,51 +0,0 @@
- title @page.title, false
- content_for :sidebar do
%p
= link_to edit_page_path(@page), class: 'btn btn-primary' do
%i.icon-edit= t '.edit'
.well.well-small
%ul.nav.nav-list
%li
%li= link_to t('.versions', count: @page.versions.count), "#versions", 'data-toggle-this' => '#versions'
- unless @page.children.empty?
%li= link_to t('.subpages'), "#subpages", 'data-toggle-this' => '#subpages'
#versions.well.well-small{:style => "display:none"}
%h3= t '.title_versions'
%ul.unstyled
- @page.versions.reverse.each do |version|
%li
= link_to I18n.l(version.updated_at, :format => t('.date_format')), version_page_path(@page, :version => version.lock_version)
= "(#{show_user(User.find_by_id(version.updated_by))})"
- unless @page.children.empty?
#subpages.well.well-small{:style => "display:none"}
%h3= t '.subpages'
%ul.unstyled
- @page.children.each do |page|
%li= link_to_wikipage(page)
%ul.breadcrumb
%li
= link_to_wikipage_by_permalink("Home", "Foodcoop-Wiki")
%span.divider /
- for page in @page.ancestors.reverse
%li
= link_to_wikipage(page)
%span.divider /
%li.active= @page.title
#wikiContent
.page-header
%h1= @page.title
= render :partial => 'body'
%hr.clear/
%p
= link_to edit_page_path(@page), class: 'btn btn-primary' do
%i.icon-edit= t '.edit'
= link_to t('.delete'), @page, class: 'btn btn-danger', :method => :delete,
:confirm => t('.delete_confirm')
!= '| ' + t('.last_updated', user: show_user(@page.user), when: format_datetime(@page.updated_at))

11
app/views/pages/version.html.haml
View file

@ -1,11 +0,0 @@
- title t('.title', title: @page.title, version: @version.lock_version)
- content_for :sidebar do
%h3= t '.title_version'
%b= "#{format_datetime_timespec(@version.updated_at, t('.date_format'))}"
%ul
%li= t '.author', user: show_user(User.find(@version.updated_by))
%li= link_to t('.view_current'), wiki_page_path(:permalink => @page.permalink)
%li= link_to t('.revert'), revert_page_path(@page, :version => @version.lock_version)
= wikified_body @version.body

4
app/views/shared/_auto_complete_articles.html.haml
View file

@ -1,4 +0,0 @@
%ul.autocomplete
- for article in @articles
- supplier = @supplier ? "" : " - #{truncate(article.supplier.name)}"
%li{:id => article.id.to_s}= "#{article.name} (#{article.unit_quantity} * #{article.unit} | #{number_to_currency(article.price)}#{supplier})"

5
app/views/shared/_auto_complete_users.rhtml
View file

@ -1,5 +0,0 @@
<ul class="autocomplete">
<% for user in @users do -%>
<li><span class="nick"><%= show_user(user) %></span><span class="informal"> (<%= user.ordergroup.try(:name) %>)</span></li>
<% end -%>
</ul>

9
app/views/shared/_loginInfo.haml
View file

@ -1,9 +0,0 @@
%ul
%li
= image_tag 'b_user.png' , :size => '7x10', :border => 0, :alt => t('.profile')
= link_to h(@current_user.nick), my_profile_path, { :title => t('.edit_profile') }
- if FoodsoftConfig[:homepage]
%li= link_to FoodsoftConfig[:name], FoodsoftConfig[:homepage], { :title => t('.homepage_title') }
%li= link_to t('.help'), FoodsoftConfig[:help_url]
%li= link_to t('.feedback.title'), new_feedback_path, :title => t('.feedback.desc')
%li= link_to t('.logout'), logout_path

21
app/views/shared/memberships/_current_members.rhtml
View file

@ -1,21 +0,0 @@
<% if flash[:error] %>
<h3 class="error" id="flashError" ><%= flash[:error] %></h3>
<%= javascript_tag("new Effect.Highlight('flashError', {delay:0.8, duration:1});") -%>
<% end %>
<% memberships = @group.memberships
if memberships.size != 0 %>
<ul style="">
<% for membership in memberships %>
<li style="margin-left:-15px">
<%= show_user membership.user, full: true, markup: true %>
| <%= link_to_remote t('.drop'),
:url => { :controller => '/memberships', :action => 'drop_member', :id => @group, :membership_id => membership },
:before => "Element.show('loader')",
:success => "Element.hide('loader')" %>
</li>
<% end %>
</ul>
<% else %>
<p><i><%= t('.no_members', group: @group.name) %></i></p>
<% end %>

23
app/views/shared/memberships/_members.rhtml
View file

@ -1,23 +0,0 @@
<h1><%=h t('.title', group: @group.name) %></h1>
<p>
<i><%= t('.desc', link: remote_link_to(t('.invite'), :url => new_invite_path(:id => @group))).html_safe %></i>
</p>
<div class="left_column" style="width:48%">
<div class="box_title">
<h2><%= t('.already_members') %></h2>
</div>
<div class="column_content" id="members">
<%=render :partial => 'shared/memberships/current_members' %>
</div>
</div>
<div class="right_column" style="width:48%">
<div class="box_title">
<h2><%= t('.no_members_yet') %></h2>
</div>
<div class="column_content" id="non_members">
<%= render :partial => 'shared/memberships/non_members' %>
<%= remote_link_to(t('.invite_someone'), :url => new_invite_path(:id => @group)) %>
</div>
</div>
<div id="edit_box" style="display:none"></div>

11
app/views/shared/memberships/_non_members.rhtml
View file

@ -1,11 +0,0 @@
<ul>
<% for user in @group.non_members %>
<li>
<%= show_user user, full: true, markup: true %>
| <%= link_to_remote t('.add'),
:url => { :controller => '/memberships', :action => 'add_member', :id => @group, :user_id => user },
:before => "Element.show('loader')",
:success => "Element.hide('loader')" %>
</li>
<% end %>
</ul>

2
app/views/tasks/_archive_tasks.html.haml
View file

@ -13,5 +13,5 @@
- @tasks.each do |task|
%tr
%td= task.due_date unless task.due_date.nil?
%td= link_to t('.task_format', name: task.name, duration: task.duration), :controller => "tasks", :action => "show", :id => task
%td= link_to t('.task_format', name: task.name, duration: task.duration), task_path(task)
%td= task_assignments task