moved Catalyst builder to Advanced, added nav links, routes, and such #…

…78
TransparencyToolkit · Jun 28, 2019 · 4d057c4 · 4d057c4
1 parent 6b5cc22
commit 4d057c4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/app/controllers/catalyst_controller.rb b/app/controllers/catalyst_controller.rb
@@ -1,8 +1,12 @@
 class CatalystController < ApplicationController
   include CatalystApi
 
-  def builder
-    render 'catalyst/builder'
+  def basic
+    render 'catalyst/basic'
+  end
+
+  def advanced
+    render 'catalyst/advanced'
   end
 
   def index

diff --git a/app/views/catalyst/_tabs.html.erb b/app/views/catalyst/_tabs.html.erb
@@ -5,10 +5,16 @@
             Mining Jobs
         </a>
     </li>
-    <li <% if params["action"] == "builder" %> class="active"<% end %>>
-        <a href="<%= ENV['RAILS_RELATIVE_URL_ROOT'] %>catalyst/builder/">
+    <li <% if params["action"] == "basic" %> class="active"<% end %>>
+        <a href="<%= ENV['RAILS_RELATIVE_URL_ROOT'] %>catalyst/basic/">
             <i class="icon-plus"></i>
-            Create New Job
+            New Basic Job
+        </a>
+    </li>
+    <li <% if params["action"] == "advanced" %> class="active"<% end %>>
+        <a href="<%= ENV['RAILS_RELATIVE_URL_ROOT'] %>catalyst/advanced/">
+            <i class="icon-plus"></i>
+            New Avanced Job
         </a>
     </li>
 </ul>
diff --git a/app/views/catalyst/builder.html.erb → app/views/catalyst/advanced.html.erb b/app/views/catalyst/builder.html.erb → app/views/catalyst/advanced.html.erb
@@ -6,23 +6,20 @@
     <div class="tab-content">
 
         <div class="alert alert-info alert-dismissible hide" id="alert-catalyst-builder" role="alert">
-            <h4 class="pull-left">Getting Started</h4>
+            <h4 class="pull-left">Creating Advanced Jobs</h4>
             <button type="button" class="close pull-right close-alert" data-dismiss="alert" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
             </button>
             <div class="clearfix"></div>
-            <p>In order for Catalyst to do its magic analysing your Looking Glass data,
-            you need to give it some guidance and help with <em>how</em> and <em>what</em>
-            aspects of your data you want Catalyst to analyze.
-            </p>
+            <p>This form is refine and customize a Catalyst job to get more accuracy and precision (helpful with larger datasets). If you are new to Catalyst we suggest using the <strong>Basic Job</strong> to start with.</p>
         </div>
 
         <section id="step-1">
-            <h3>1. Narrow Your Search</h3>
+            <h3>Narrow Your Job</h3>
             <p>You can run Catalyst text miners on all your documents or only a specific subset of narrowed down documents.</p>
             <div class="row">
                 <div class="col-md-4 form-group">
-                    <label for="">Search Name</label>
+                    <label>Mining Job Name</label>
                     <input type="text" name="filter_name" class="form-control" value="" placeholder="Interesting People">
                 </div>
                 <div class="col-md-4 form-group">

diff --git a/config/routes.rb b/config/routes.rb
@@ -5,7 +5,8 @@
   delete 'delete_documents', to: 'docs#delete_documents'
 
   get 'catalyst', to: 'catalyst#index'
-  get 'catalyst/builder', to: 'catalyst#builder'
+  get 'catalyst/basic', to: 'catalyst#basic'
+  get 'catalyst/advanced', to: 'catalyst#advanced'
   get 'entities', to: 'entities#index'
   get 'entities_create/*entity', to: 'entities#create'
   post 'entities/save', to: 'entities#save'
@@ -23,6 +24,7 @@
   post 'api/recipe_search', to: 'api#recipe_search'
   post 'api/create_job', to: 'api#create_job'
   get 'api/facets', to: 'api#facets'
+  get 'api/delete_recipe', to: 'api#delete_recipe'
 
   root to: 'docs#index'
   resources :docs