Feature/documentation tab

.meteor/packages

@@ -90,3 +90,4 @@ peppelg:bootstrap-3-modal
 apinf:api-umbrella
 standard-minifier-css
 standard-minifier-js
+vsivsi:file-collection

.meteor/versions

@@ -92,7 +92,7 @@ iron:core@1.0.11
 iron:dynamic-template@1.0.12
 iron:layout@1.0.12
 iron:location@1.0.11
-iron:middleware-stack@1.0.11
+iron:middleware-stack@1.1.0
 iron:router@1.0.12
 iron:url@1.0.11
 jparker:crypto-core@0.1.0
@@ -186,6 +186,7 @@ url@1.0.9
 useraccounts:bootstrap@1.14.2
 useraccounts:core@1.14.2
 useraccounts:iron-routing@1.14.2
+vsivsi:file-collection@1.3.5
 webapp@1.2.8
 webapp-hashing@1.0.9
 yogiben:autoform-file@0.4.2

both/collections/backend.js

@@ -31,6 +31,10 @@ Schemas.ApiBackendsSchema = new SimpleSchema({
     type: String,
     optional: false
   },
+  documentationFileId: {
+    type: String,
+    optional: true
+  },
   documentation_link: {
     type: String,
     optional: true,

both/collections/settings.js

@@ -18,15 +18,7 @@ Schemas.SettingsSchema = new SimpleSchema({
     type: String,
     regEx: SimpleSchema.RegEx.Url,
     label: "Host",
-    optional: true, // Optional must be true for custom validation
-    custom: function () { // Custom validator logic
-      // get the value of apiDocumentationEditor.enabled field
-      let enabledFieldValue = this.field("apiDocumentationEditor.enabled").value;
-      // if enabled is true, host field is required
-      if (enabledFieldValue === true) {
-        return "required"; // host field is required
-      }
-    }
+    optional: false
   },
   apiUmbrella: {
     type: Object,

client/layouts/master_layout/sidebar/sidebar.html

@@ -34,22 +34,6 @@
           <a href="/catalogue"><i class="fa fa-list-alt"></i><span>{{_ "masterLayout_sidebar_Catalogue"}}</span></a>
         </li>
         {{# if currentUser }}
-          <li class="{{isActiveRoute 'documentation'}} {{isActiveRoute 'apiDocumentationEditor'}} treeview">
-            <a href="#">
-              <i class="fa fa-book"></i>
-              <span>{{_ "masterLayout_sidebar_Documentation"}}</span>
-            </a>
-            <ul class="treeview-menu">
-              {{# if apiDocumentationEditorIsEnabled}}
-              <li class="{{isActiveRoute 'apiDocumentationEditor'}}">
-                <a href="/documentation/editor"><i class="fa fa-circle-o"></i><span>{{_ "masterLayout_sidebar_DocumentationEditor"}}</span></a>
-              </li>
-              {{/ if }}
-              <li class="{{isActiveRoute 'documentation'}}">
-                <a href="/documentation"><i class="fa fa-circle-o"></i><span>{{_ "masterLayout_sidebar_DocumentationViewer"}}</span></a>
-              </li>
-            </ul>
-          </li>
           {{# if isInRole 'admin' }}
             <li class="{{isActiveRoute 'accountsAdmin'}}">
               <a href="{{pathFor route='accountsAdmin'}}"><i class="fa fa-users"></i><span>{{_ "masterLayout_sidebar_Users"}}</span></a>

client/views/api_backends/edit/form/editApiBackendForm.html

@@ -29,18 +29,6 @@ <h1>{{_ "apiBackends_Edit_API_Title"}}</h1>
     <span class="help-block">{{_ "apiBackends_Matching_Title_Help"}}</span>
     {{>showHelp 'url_matches'}}
     {{> afQuickField name='url_matches'}}
-    <legend data-toggle="collapse" data-target="#documentation-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_DocumentationTitle"}}</legend>
-    <div id="documentation-block" class="collapse in">
-      {{>showHelp 'documentation_link'}}
-      {{> afQuickField name='documentation_link'}}
-      <span class="help-block">{{_ "apiBackends_Documentation_Link"}}</span>
-      {{>showHelp 'importApiDocumentation'}}
-      {{> importApiDocumentation}}
-      <legend>Create new documentation</legend>
-      {{>showHelp 'apiDocumentationEditor'}}
-      <a href="{{ pathFor 'apiDocumentationEditor' }}" target="_blank" class="btn btn-success"><span class="fa fa-pencil"></span> Create API documentation</a>
-      <span class="help-block">Create a new API documentation file</span>
-    </div>
     <legend data-toggle="collapse" data-target="#global-request-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_GlobalRequestSettings_Title"}}</legend>
     <div id="global-request-block" class="collapse in">
       {{>showHelp 'append_query_string'}}

client/views/api_backends/form_hints/form_hints.js

@@ -41,24 +41,6 @@ var helpData = {
       placement: 'left'
     }
   },
-  'documentation_link': {
-    message: TAPi18n.__('editApi_hints_documentation_link'),
-    options: {
-      placement: 'left'
-    }
-  },
-  'apiDocumentationEditor': {
-    message: TAPi18n.__('editApi_hints_apiDocumentationEditor'),
-    options: {
-      placement: 'left'
-    }
-  },
-  'importApiDocumentation': {
-    message: TAPi18n.__('editApi_hints_importApiDocumentation'),
-    options: {
-      placement: 'left'
-    }
-  },
   'append_query_string': {
     message: TAPi18n.__('editApi_hints_append_query_string'),
     options: {

client/views/api_backends/import_documentation/import.html

@@ -1,9 +1,6 @@
 <template name="importApiDocumentation">
   <form id="apiDocumentationUploadForm" class="form" method="post">
     <fieldset>
-      <!-- Form Name -->
-      <legend>{{_ "import_ApiDocumentation_Title"}}</legend>
-
       <!-- File Button -->
       <div class="form-group">
         <label class="control-label" for="documentationCofigurationFile">{{_ "import_ApiDocumentation_File"}}</label>

client/views/api_backends/view_api_backend/details/details.html

@@ -12,7 +12,7 @@
         <a
            href="{{ pathFor 'editApiBackend' _id=apiBackend._id }}"
            class="btn btn-info">
-           <i class="fa fa-cog"></i>
+          <i class="fa fa-cog"></i>
           {{_ "view_ApiBackend_Details_editButtonText" }}
         </a>
       </div>
@@ -24,10 +24,10 @@ <h2 class="panel-title clearfix">
     </div>
     <div class="panel-body">
       <div class="row">
-        <div class="col-md-3">
+        <div class="col-md-6">
           {{> viewApiBackendStatus apiBackend=apiBackend }}
         </div>
-        <div class="col-md-4">
+        <div class="col-md-6">
           {{> viewApiBackendServers apiBackend=apiBackend }}
         </div>
       </div>

client/views/api_backends/view_api_backend/navigation/navigation.html

@@ -7,6 +7,12 @@
           Details
         </a>
       </li>
+      <li>
+        <a href="#api-backend-documentation" data-toggle="pill">
+          <i class="fa fa-file-text"></i>
+          Documentation
+        </a>
+      </li>
       <li>
         <a href="#api-backend-metadata" data-toggle="pill">
           <i class="fa fa-book"></i>

client/views/api_backends/view_api_backend/view_api_backend.html

@@ -1,33 +1,37 @@
 <template name="viewApiBackend">
   {{#if Template.subscriptionsReady }}
-    {{> viewApiBackendPageHeading apiBackend=apiBackend }}
-    <div class="row">
-      {{> viewApiBackendNavigationMenu apiBackend=apiBackend }}
-    </div>
+  {{> viewApiBackendPageHeading apiBackend=apiBackend }}
+  <div class="row">
+    {{> viewApiBackendNavigationMenu apiBackend=apiBackend }}
+  </div>
 
-    <div class="tab-content">
-      <div id="api-backend-details" class="tab-pane fade in active">
-        {{> viewApiBackendDetails apiBackend=apiBackend }}
-      </div> <!-- /api-backend-details -->
+  <div class="tab-content">
+    <div id="api-backend-details" class="tab-pane fade in active">
+      {{> viewApiBackendDetails apiBackend=apiBackend }}
+    </div> <!-- /api-backend-details -->
 
-      <div id="api-backend-metadata" class="tab-pane fade in">
-        {{> viewApiBackendMetadata apiBackend=apiBackend metadata=metadata }}
-      </div> <!-- /api-backend-metadata -->
+    <div id="api-backend-documentation" class="tab-pane fade in">
+      {{> documentation apiBackend=apiBackend }}
+    </div> <!-- /api-backend-Documentation -->
 
-      <div id="api-backend-feedback" class="tab-pane fade in">
-        {{> feedbackList apiBackend=apiBackend }}
-      </div> <!-- /api-backend-metadata -->
+    <div id="api-backend-metadata" class="tab-pane fade in">
+      {{> viewApiBackendMetadata apiBackend=apiBackend metadata=metadata }}
+    </div> <!-- /api-backend-metadata -->
 
-      <div id="api-backend-export" class="tab-pane fade in">
-        {{> viewApiBackendExport apiBackend=apiBackend }}
-      </div> <!-- /api-backend-export -->
+    <div id="api-backend-feedback" class="tab-pane fade in">
+      {{> feedbackList apiBackend=apiBackend }}
+    </div> <!-- /api-backend-metadata -->
 
-      <div id="api-backend-backlog" class="tab-pane fade in">
-        {{> apiBacklog apiBackend=apiBackend backlogItems=backlogItems }}
-      </div> <!-- /api-backend-export -->
+    <div id="api-backend-export" class="tab-pane fade in">
+      {{> viewApiBackendExport apiBackend=apiBackend }}
+    </div> <!-- /api-backend-export -->
 
-    </div> <!-- /tab-content -->
+    <div id="api-backend-backlog" class="tab-pane fade in">
+      {{> apiBacklog apiBackend=apiBackend backlogItems=backlogItems }}
+    </div> <!-- /api-backend-export -->
+
+  </div> <!-- /tab-content -->
   {{ else }}
-    {{> spinner }}
+  {{> spinner }}
   {{/ if }}
 </template>