Merge pull request #2842 from weseek/imprv/clean-form-html

Imprv/clean form html

src/server/form/admin/importerEsa.js

@@ -1,8 +0,0 @@
-const form = require('express-form');
-
-const field = form.field;
-
-module.exports = form(
-  field('settingForm[importer:esa:access_token]').required(),
-  field('settingForm[importer:esa:team_name]').required(),
-);

src/server/form/admin/importerQiita.js

@@ -1,8 +0,0 @@
-const form = require('express-form');
-
-const field = form.field;
-
-module.exports = form(
-  field('settingForm[importer:qiita:access_token]').required(),
-  field('settingForm[importer:qiita:team_name]').required(),
-);

src/server/form/comment.js

@@ -1,15 +0,0 @@
-const form = require('express-form');
-
-const field = form.field;
-
-module.exports = form(
-  field('commentForm.page_id').trim().required(),
-  field('commentForm.revision_id').trim().required(),
-  field('commentForm.comment').trim().required(),
-  field('commentForm.comment_position').trim().toInt(),
-  field('commentForm.is_markdown').trim().toBooleanStrict(),
-  field('commentForm.replyTo').trim(),
-
-  field('slackNotificationForm.isSlackEnabled').trim().toBooleanStrict().required(),
-  field('slackNotificationForm.slackChannels').trim(),
-);

src/server/form/index.js

@@ -2,8 +2,6 @@ module.exports = {
   login: require('./login'),
   register: require('./register'),
   invited: require('./invited'),
-  revision: require('./revision'),
-  comment: require('./comment'),
   admin: {
     userGroupCreate: require('./admin/userGroupCreate'),
   },

src/server/form/revision.js

@@ -1,15 +0,0 @@
-const form = require('express-form');
-
-const field = form.field;
-
-module.exports = form(
-  field('pageForm.path').required(),
-  field('pageForm.body').required().custom((value) => {
-    // see https://github.com/weseek/growi/issues/463
-    return value.replace(/\r\n?/g, '\n');
-  }),
-  field('pageForm.currentRevision'),
-  field('pageForm.grant').toInt().required(),
-  field('pageForm.grantUserGroupId'),
-  field('pageForm.notify'),
-);

src/server/views/_form.html

@@ -1,14 +0,0 @@
-{% if req.form.errors %}
-<div class="alert alert-danger">
-  <ul>
-  {% for error in req.form.errors %}
-    <li>{{ t(error) }}</li>
-  {% endfor %}
-
-  </ul>
-</div>
-{% endif %}
-
-<div id="page-editor-navbar-bottom-container" class="d-none d-edit-block"></div>
-
-<div class="file-module hidden"></div>

src/server/views/widget/not_found_content.html

@@ -53,7 +53,8 @@
     <div class="tab-pane" id="edit">
       <div id="page-editor">{% if pageForm.body %}{{ pageForm.body }}{% endif %}</div>
     </div>
-    {% include '../_form.html' %}
+
+    <div id="page-editor-navbar-bottom-container" class="d-none d-edit-block"></div>
 
   </div>
 

src/server/views/widget/page_content.html

@@ -43,8 +43,9 @@
 
 <div id="display-switcher">
   <script type="text/template" id="raw-text-original">{{ revision.body.toString() | encodeHTML }}</script>
-  {% include '../_form.html' %}
 </div>
-  <div id="grw-page-status-alert-container"></div>
+<div id="page-editor-navbar-bottom-container" class="d-none d-edit-block"></div>
+<div id="grw-page-status-alert-container"></div>
+
 </div>