diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-01-30 15:06:01 +0000 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-01-30 15:06:01 +0000 |
| commit | b1b985873a6c24d5341a63941ac85034e8b132ae (patch) | |
| tree | 6dad8fc17c75ee81b28e3e268a3d8c6be626038b | |
| parent | 60e3aad7ac32ac826b93a707db9589237fd4948d (diff) | |
| parent | 33dd73ea100a23f746b0eeae840d3755c02e15ef (diff) | |
Merge branch 'csv-import-buttons' into rails-3-develop
| -rw-r--r-- | app/views/admin_public_body/import_csv.html.erb | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/app/views/admin_public_body/import_csv.html.erb b/app/views/admin_public_body/import_csv.html.erb index 4b14226d1..4b481e895 100644 --- a/app/views/admin_public_body/import_csv.html.erb +++ b/app/views/admin_public_body/import_csv.html.erb @@ -70,16 +70,25 @@ Another One,another@example.com,Otro organismo,a_tag "Add new tags to existing ones". </p> - <p><%= submit_tag 'Dry run' %> <%= submit_tag 'Upload' %></p> + <div class="form-actions"> + <p> + <%= submit_tag 'Dry run', :class => 'btn btn-success' %> + <%= submit_tag 'Upload', :class => 'btn btn-warning' %> + </p> + </div> <% end %> <hr> -<p>Standard tags: - <% for category, description in PublicBodyCategory.get().by_tag() %> - <% if category != "other" %> - <strong><%= category %></strong>=<%= description %>; - <% end %> +<div id="standard-tags"> + <h2>Standard tags:</h2> + + <ul> + <% PublicBodyCategory.get().by_tag().each do |category, description| %> + <% if category != "other" %> + <li><strong><%= category %></strong>=<%= description %></li> + <% end %> <% end %> - </p> + </ul> +</div> |