Skip to content

Commit 0fecd89

Browse files
rewrittenrewritten
committed
Templates: rewrite some templates in eRB
1 parent e48734e commit 0fecd89

17 files changed

+294
-209
lines changed

‎app/assets/javascripts/app/app.js.coffee

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ angular.module('timeoverflow').controller 'UserListCtrl', ["$scope", "$modal", "
3939
# override this in a view where the organizations are needed
4040
angular.module('timeoverflow').value 'Organizations', []
4141

42-
angular.module('timeoverflow').controller 'OrganizationListCtrl', ["$scope", "Organizations", ($scope, Organizations) ->
43-
$scope.organizations = Organizations
44-
]
45-
4642
angular.module('timeoverflow').filter 'timeBalance', ->
4743
(seconds) ->
4844
if seconds isnt 0

‎app/views/admin/csv/upload_csv.html.erb

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<%= form_for :dump, url: { action: "import_csv" }, html: { multipart: true, class: "formtastic user" } do |f| %>
2+
<fieldset class="inputs">
3+
<ol>
4+
<li class="string input optional stringish">
5+
<%= label_tag I18n.t("active_admin.users.upload_csv") %>
6+
<%= f.file_field :file %>
7+
</li>
8+
</ol>
9+
<ol>
10+
<li class="string input optional stringish">
11+
<%= label_tag I18n.t("active_admin.users.organization") %>
12+
<%= f.select :organization_id, options_for_select(Organization.all.map{ |org| [org.name, org.id] }), include_blank: true %>
13+
</li>
14+
</ol>
15+
</fieldset>
16+
<fieldset class="actions">
17+
<ol>
18+
<li class="action input_action">
19+
<%= f.submit I18n.t("global.save") %>
20+
</li>
21+
</ol>
22+
</fieldset>
23+
<% end %>

‎app/views/admin/csv/upload_csv.html.haml

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎app/views/application/_navbar.html.erb

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<nav class="navbar navbar-static-top navbar-inverse" role="navigation">
2+
<container>
3+
<div class="navbar-header">
4+
<a class="navbar-brand" href="/">TimeOverflow</a>
5+
</div>
6+
7+
<ul class="nav navbar-nav">
8+
<% if current_user && current_organization %>
9+
<%= render 'application/menus/user_list_link' %>
10+
<%= render 'application/menus/offers_dashboard_link' %>
11+
<%= render 'application/menus/inquiries_list_link' %>
12+
13+
<% if current_user.manages? current_organization %>
14+
<%= render 'application/menus/organization_reports_menu' %>
15+
<%= render 'application/menus/organization_statistics_menu' %>
16+
<%= render 'application/menus/organization_listings_menu' %>
17+
<% else %>
18+
<%= render 'application/menus/offers_by_tag_link' %>
19+
<% end %>
20+
<% end %>
21+
</ul>
22+
23+
<ul class="nav navbar-nav navbar-right">
24+
<% if current_user %>
25+
<%= render 'application/menus/user_admin_menu' %>
26+
<% else %>
27+
<li>
28+
<%= link_to t("layouts.application.about"), page_path("about") %>
29+
</li>
30+
<li>
31+
<%= link_to t("layouts.application.login"), new_user_session_path %>
32+
</li>
33+
<% end %>
34+
<li class="divider" role="presentation"></li>
35+
36+
<%= render 'application/menus/language_switcher' %>
37+
</ul>
38+
</container>
39+
</nav>

‎app/views/application/_navbar.html.haml

Lines changed: 0 additions & 157 deletions
This file was deleted.

‎app/views/application/_organization_list.html.erb

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<div class="jumbotron">
2+
<p class="lead">
3+
<%= t("application.organization_list.welcome", user: current_user.to_s) %>
4+
<br/>
5+
<%= t("application.organization_list.not_member") %>
6+
</p>
7+
<table class="table">
8+
<thead>
9+
<tr>
10+
<th><%= t("application.organization_list.time_bank") %></th>
11+
<th><%= t("application.organization_list.email") %></th>
12+
<th><%= t("application.organization_list.phone") %></th>
13+
<th><%= t("application.organization_list.public_opening_times") %></th>
14+
<th><%= t("application.organization_list.city") %></th>
15+
<th><%= t("application.organization_list.neighborhood") %></th>
16+
</tr>
17+
</thead>
18+
<tbody>
19+
<% Organization.find_each do |org| %>
20+
<tr>
21+
<td>{{ org.name }}</td>
22+
<td>{{ org.email }}</td>
23+
<td>{{ org.phone }}</td>
24+
<td>{{ org.public_opening_times }}</td>
25+
<td>{{ org.city }}</td>
26+
<td>{{ org.neighborhood }}</td>
27+
</tr>
28+
<% end %>
29+
</tbody>
30+
</table>
31+
</div>

‎app/views/application/_organization_list.html.haml

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎app/views/application/menus/_inquiries_list_link.html.erb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<li class="<%= "active" if current_page?(inquiries_path) %>">
2+
<a href="<%= inquiries_path %>">
3+
<%= glyph :inquiry %>
4+
<%= item.model_name.human(count: :many) %>
5+
</a>
6+
</li>

‎app/views/application/menus/_language_switcher.html.erb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<li class="dropdown">
2+
<a class="dropdown-toggle" href="#">
3+
<%= glyph :globe %>
4+
<b class="caret"></b>
5+
</a>
6+
<ul class="dropdown-menu" role="menu">
7+
<li class="disabled">
8+
<%= link_to t("global.locales_header"), "#" %>
9+
</li>
10+
<li class="divider"></li>
11+
<% I18n.available_locales.each do |locale| %>
12+
<li class="<%= "disabled" if I18n.locale == locale %>">
13+
<%= link_to locale_menu_item(locale), switch_lang_path(locale: locale) %>
14+
</li>
15+
<% end %>
16+
</ul>
17+
</li>

‎app/views/application/menus/_offers_by_tag_link.html.erb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<li class="<%= "active" if current_page?(path) %>">
2+
<a href="<%= alpha_grouped_index_tags_path(post_type: "offer") %>">
3+
<%= glyph :tags %>
4+
<%= t ".tags" %>
5+
</a>
6+
</li>

‎app/views/application/menus/_offers_dashboard_link.html.erb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<li class="<%= "active" if current_page?(dashboard_offers_path) %>">
2+
<a href="<%= dashboard_offers_path %>">
3+
<%= glyph :offer %>
4+
<%= item.model_name.human(count: :many) %>
5+
</a>
6+
</li>

‎app/views/application/menus/_organization_listings_menu.html.erb

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<li class="dropdown">
2+
<a class="dropdown-toggle" href="#">
3+
<%= glyph :wrench %>
4+
<%= t "application.navbar.admin" %>
5+
<b class="caret"></b>
6+
</a>
7+
<ul class="dropdown-menu" role="menu">
8+
<li>
9+
<a href="<%= alpha_grouped_index_tags_path(post_type: "offer") %>">
10+
<%= glyph :tags %>
11+
<%= t "application.navbar.tags" %>
12+
</a>
13+
</li>
14+
<li>
15+
<a href="<%= offers_path(org: current_organization) %>">
16+
<%= glyph :link %>
17+
<%= glyph :eye_open %>
18+
<%= t "application.navbar.offer_public_link" %>
19+
</a>
20+
</li>
21+
<li>
22+
<a href="<%= inquiries_path(org: current_organization) %>">
23+
<%= glyph :link %>
24+
<%= glyph :eye_open %>
25+
<%= t "application.navbar.inquiry_public_link" %>
26+
</a>
27+
</li>
28+
</ul>
29+
</li>

0 commit comments

Comments
 (0)