Retire "Upload to Aggregate" form

public/javascripts/data-ui.js

@@ -25,11 +25,11 @@ var dataNS = odkmaker.namespace.load('odkmaker.data');
             error: function(request, status, error)
             {
                 console.log("Could not open the form, error: " + error);
-                
-                if (error == "Not Found") 
+
+                if (error == "Not Found")
                 {
                     var msg = '<p>Error: No form selected.</p>'
-                } else  
+                } else
                 {
                     var msg = '<p>Could not open the form. See browser console log for a detailed error message.</p>';
                 }
@@ -52,7 +52,7 @@ var dataNS = odkmaker.namespace.load('odkmaker.data');
                 odkmaker.application.newForm();
             else
                 odkmaker.application.confirm('Are you sure? You will lose unsaved changes to the current form.', odkmaker.application.newForm);
-                
+
         });
         $('.menu .saveLink').click(function(event)
         {
@@ -270,6 +270,7 @@ var dataNS = odkmaker.namespace.load('odkmaker.data');
             $form.submit();
         });
 
+        /* #322 remove aggregate */
         $('.aggregateDialog .aggregateExportButton').click(function(event)
         {
             event.preventDefault();

public/javascripts/modals.js

@@ -72,6 +72,7 @@ var modalsNS = odkmaker.namespace.load('odkmaker.modals');
         },
         aggregateDialog: function($dialog)
         {
+            /* #322 remove aggregate */
             $dialog.removeClass('exporting');
         },
         formPropertiesDialog: function($dialog)

public/stylesheets/styles.css

@@ -1438,6 +1438,7 @@ body > .control.last .controlFlowArrow,
     float: right;
 }
 
+/* #322 remove aggregate */
 .aggregateDialog .aggregateInstanceName
 {
     width: calc(100% - 7.6em);
@@ -1475,7 +1476,7 @@ body > .control.last .controlFlowArrow,
     padding-left: 15em;
 }
 
-.hidden 
+.hidden
 {
     display: none;
 }

server/odkbuild_server.rb

@@ -231,8 +231,8 @@ class OdkBuild < Sinatra::Application
 
   # bounce a payload through to a local build2xlsform instance for dev env. in prod, this ought
   # to be done at the apache/nginx/etc level via proxypass.
-  # The host and port for the build2xlsform service are parameterised to allow 
-  # both a source install (localhost:8686) and docker-compose install (build2xls:8686).
+  # The host and port for the build2xlsform service are parameterised to allow
+  # both a source install (localhost:8686) and docker compose install (build2xls:8686).
   post '/convert' do
     srv = ENV['B2X_HOST'] || 'localhost'
     prt = ENV['B2X_PORT'] || '8686'
@@ -247,6 +247,7 @@ class OdkBuild < Sinatra::Application
     return res.body
   end
 
+  # #322 remove aggregate
   # bounce a payload through the server to aggregate
   post '/aggregate/post' do
     # make sure we're good to go

server/views/index.erb

@@ -67,7 +67,11 @@
             <li><a href="#saveLocally" class="saveLocallyLink">Save Form to File...</a></li>
             <li><a href="#loadLocallyDialog" rel="modal" class="destructive">Load Form from File...</a></li>
             <li class="divider"></li>
+            <!-- #322 remove aggregate -->
             <li><a href="#aggregateDialog" id="aggregateLink" rel="modal">Upload Form to Aggregate...</a></li>
+            <!-- #227 upload to central
+            <li><a href="#centralDialog" id="centralLink" rel="modal">Upload Form to Central...</a></li>
+            -->
             <li><a href="#exportDialog" id="exportLink" rel="modal">Export to XML...</a></li>
             <li><a href="#xlsformExport" id="xlsformLink">Export to XLSForm</a></li>
           </ul>
@@ -453,6 +457,7 @@
       </div>
     </div>
 
+    <!-- #322 remove aggregate -->
     <div class="modal narrowModal aggregateDialog">
       <h3>Upload Form to Aggregate</h3>
       <div class="modalContents">