Merge pull request #635 from hoboman313/437

Cannot add annotations to AnnotationCategories
MarkUsProject · Feb 2, 2012 · ad12215 · ad12215
2 parents e1ab659 + b157b9e
commit ad12215
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 36 deletions.
diff --git a/app/views/annotation_categories/_annotation_category_edit.html.erb b/app/views/annotation_categories/_annotation_category_edit.html.erb
@@ -33,7 +33,7 @@
    <h2><%=h(annotation_category.annotation_category_name)%></h2>
 
 <fieldset>
-   <%= form_for annotation_category,
+   <%= form_for :annotation_category,
 		            :as => :annotation_category,
 		            :url => {:action => 'update_annotation_category',
 			                   :id => annotation_category.id},

diff --git a/app/views/annotation_categories/_boot.js.erb b/app/views/annotation_categories/_boot.js.erb
@@ -1,5 +1,34 @@
 <script type="text/javascript">
 //<![CDATA[
 
+   var modalUpload = null;
+   var modalDownload = null;
+
+   function upload_annotation_categories(){
+     modalUpload.open();
+     return false;
+   }
+
+   function download_annotation_categories(){
+      modalDownload.open();
+      return false;
+   }
+
+   document.observe("dom:loaded", function(){
+     modalUpload = new Control.Modal($('upload_dialog'),
+     {
+       overlayOpacity: 0.75,
+       className: 'modalUpload',
+       fade: false
+     });
+
+     modalDownload = new Control.Modal($('download_dialog'),
+     {
+       overlayOpacity: 0.75,
+       className: 'modalDownload',
+       fade: false
+
+     });
+   });
 //]]>
 </script>
diff --git a/app/views/annotation_categories/index.html.erb b/app/views/annotation_categories/index.html.erb
@@ -7,41 +7,6 @@
                            "livepipe/window.js",
                            "livepipe/tabs.js" %>
 
-<script type="text/javascript">
-//<![CDATA[
-
-   var modalUpload = null;
-   var modalDownload = null;
-
-   function upload_annotation_categories(){
-     modalUpload.open();
-     return false;
-   }
-
-   function download_annotation_categories(){
-      modalDownload.open();
-      return false;
-   }
-
-   document.observe("dom:loaded", function(){
-     modalUpload = new Control.Modal($('upload_dialog'),
-     {
-       overlayOpacity: 0.75,
-       className: 'modalUpload',
-       fade: false
-     });
-
-     modalDownload = new Control.Modal($('download_dialog'),
-     {
-       overlayOpacity: 0.75,
-       className: 'modalDownload',
-       fade: false
-
-     });
-   });
-//]]>
-</script>
-
 
 <%if @assignment.past_due_date?%>
  <div class="notice">

diff --git a/config/routes.rb b/config/routes.rb
@@ -196,6 +196,7 @@
         get 'delete_annotation_category'
         get 'download'
         get 'yml_upload'
+        post 'add_annotation_category'
         post 'update_annotation_category'
       end
     end