Merge pull request #5436 from ehelms/fixes-11448

Fixes #11448: Removes haml in favor of ERB.
Katello · Aug 25, 2015 · c0d6834 · c0d6834
2 parents 93d1757 + 70f91b2
commit c0d6834
Show file tree

Hide file tree

Showing 93 changed files with 417 additions and 1,687 deletions.
diff --git a/app/assets/javascripts/katello/sync_management/sync_management.js b/app/assets/javascripts/katello/sync_management/sync_management.js
@@ -95,7 +95,7 @@ KT.content_actions = (function(){
 
             $.ajax({
               type: 'DELETE',
-              url: KT.routes.sync_management_path(repo_id),
+              url: '/katello/sync_management/' + repo_id,
               dataType: 'json',
               success: function(data) {
               },
@@ -109,7 +109,7 @@ KT.content_actions = (function(){
         if (syncing.length ===0){
             return;
         }
-        updater = $.PeriodicalUpdater(KT.routes.sync_management_sync_status_path(), {
+        updater = $.PeriodicalUpdater('/katello/sync_management/sync_status', {
               data: function(){return {repoids:getSyncing()}},
               method: 'get',
               type: 'json',

diff --git a/app/views/katello/api/v2/layouts/collection.json.erb b/app/views/katello/api/v2/layouts/collection.json.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/app/views/katello/api/v2/layouts/collection.json.haml b/app/views/katello/api/v2/layouts/collection.json.haml
diff --git a/app/views/katello/api/v2/layouts/resource.json.erb b/app/views/katello/api/v2/layouts/resource.json.erb
@@ -0,0 +1,5 @@
+<% if object_name %>
+  {<%= object_name %>: <%= yield %>}
+<% else %>
+  <%= yield %>
+<% end %>
diff --git a/app/views/katello/api/v2/layouts/resource.json.haml b/app/views/katello/api/v2/layouts/resource.json.haml
diff --git a/app/views/katello/common/400.html.haml b/app/views/katello/common/400.html.haml
diff --git a/app/views/katello/common/403.html.haml b/app/views/katello/common/403.html.haml
diff --git a/app/views/katello/common/404.html.haml b/app/views/katello/common/404.html.haml
diff --git a/app/views/katello/common/500.html.haml b/app/views/katello/common/500.html.haml
diff --git a/app/views/katello/common/_common_i18n.html.haml b/app/views/katello/common/_common_i18n.html.haml
diff --git a/app/views/katello/common/_common_product_repo_selector.html.haml b/app/views/katello/common/_common_product_repo_selector.html.haml
diff --git a/app/views/katello/common/_common_products.html.haml b/app/views/katello/common/_common_products.html.haml
diff --git a/app/views/katello/common/_config.html.haml b/app/views/katello/common/_config.html.haml
diff --git a/app/views/katello/common/_edit_i18n.html.haml b/app/views/katello/common/_edit_i18n.html.haml
diff --git a/app/views/katello/common/_env_select.html.haml b/app/views/katello/common/_env_select.html.haml
diff --git a/app/views/katello/common/_filter_table.html.haml b/app/views/katello/common/_filter_table.html.haml
diff --git a/app/views/katello/common/_footer.haml b/app/views/katello/common/_footer.haml
diff --git a/app/views/katello/common/_list_item.html.haml b/app/views/katello/common/_list_item.html.haml
diff --git a/app/views/katello/common/_list_items.html.haml b/app/views/katello/common/_list_items.html.haml
diff --git a/app/views/katello/common/_list_remove.js.haml b/app/views/katello/common/_list_remove.js.haml
diff --git a/app/views/katello/common/_list_update.html.haml b/app/views/katello/common/_list_update.html.haml
diff --git a/app/views/katello/common/_one_panel.html.haml b/app/views/katello/common/_one_panel.html.haml
diff --git a/app/views/katello/common/_one_panel_list_item.haml b/app/views/katello/common/_one_panel_list_item.haml
diff --git a/app/views/katello/common/_package_actions_i18n.html.haml b/app/views/katello/common/_package_actions_i18n.html.haml