UI minor changes

borderx · Nov 1, 2016 · cc14ce4 · cc14ce4
1 parent b4960c7
commit cc14ce4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,4 @@ node_modules/
 /frontend/npm-debug.log
 /_README.md
 /frontend/config/config.json
+/backend/api/services/remote/credentials/google-spreadsheets/
diff --git a/backend/api/services/remote/credentials/google-spreadsheet/konga-84413cd1c5f8.json b/backend/api/services/remote/credentials/google-spreadsheet/konga-84413cd1c5f8.json
diff --git a/backend/package.json b/backend/package.json
@@ -24,6 +24,7 @@
     "include-all": "0.1.6",
     "jsonwebtoken": "5.4.1",
     "lodash": "3.10.1",
+    "mkdirp": "^0.5.1",
     "moment-timezone": "0.4.1",
     "mongodb": "^2.2.11",
     "mysql": "^2.11.1",

diff --git a/...consumers/import/modal-define-fields.html → ...onsumers/import/_modal-define-fields.html b/...consumers/import/modal-define-fields.html → ...onsumers/import/_modal-define-fields.html
diff --git a/frontend/src/app/admin/consumers/import/modal-connection-options.html b/frontend/src/app/admin/consumers/import/modal-connection-options.html
@@ -8,9 +8,11 @@ <h4 class="modal-title" id="modal-title">
 </div>
 <div class="col-md-12 bg-light-grey padding">
     <h5 class="no-margin capitalize">{{adapter.name}}</h5>
-    <p class="help-block">Define options to the consumer storage.</p>
+    <p data-ng-show="!adapter.info" class="help-block">Define options to the consumer storage.</p>
+    <p data-ng-show="adapter.info" class="help-block" data-ng-bind-html="adapter.info"></p>
 </div>
 <div class="modal-body">
+
     <form name="connOptionsForm" ng-submit="loadConsumers()">
         <div class="row">
             <div class="col-md-12">
@@ -19,12 +21,14 @@ <h5>Adapter Options</h5>
                      data-ng-repeat="(key,field) in adapter.form_fields.connection">
                     <div ng-switch on="field.type">
                         <div ng-switch-when="file">
+                            <label>{{field.name}}</label>
                             <input type="file"
                                    ng-required="field.required"
                                    ngf-select ng-model="connOptions[key]" name="field.name"
                             />
                         </div>
                         <div ng-switch-when="boolean">
+                            <label>{{field.name}}</label><br>
                             <input
                                     bs-switch
                                     ng-model="connOptions[key]"

diff --git a/frontend/src/app/admin/consumers/import/modal-select-storage.html b/frontend/src/app/admin/consumers/import/modal-select-storage.html
@@ -7,8 +7,8 @@ <h4 class="modal-title" id="modal-title">
     </h4>
 </div>
 <div class="col-md-12 bg-light-grey padding">
-    <h5>Select medium</h5>
-    <p class="help-block no-margin">Select the medium from which to import the consumers</p>
+    <h5>Select storage</h5>
+    <p class="help-block no-margin">Select the storage from which to import the consumers</p>
 </div>
 <div class="row">
     <div class="col-md-12">

diff --git a/frontend/src/app/core/services/ListConfigService.js b/frontend/src/app/core/services/ListConfigService.js
@@ -275,7 +275,7 @@
               itemCount: 0,
               items: [],
               itemsPerPage: 25,
-              itemsPerPageOptions: [10, 25, 50, 100, 250,500],
+              itemsPerPageOptions: [10, 25, 50, 100, 200],
               currentPage: 1,
               where: {},
               loading: true,