Merge pull request #1374 from weseek/Detail-correction-for-master-merge

Detail correction for master merge

resource/locales/ja/translation.json

@@ -708,7 +708,6 @@
     "deactivate_user_success": "{{username}}を無効化しました",
     "remove_user_success": "{{username}}を削除しました",
     "remove_external_user_success": "{{accountId}}を削除しました "
-
   },
 
   "user_group_management": {

src/client/js/components/Admin/MarkdownSetting/MarkDownSetting.jsx

@@ -17,22 +17,22 @@ class MarkdownSetting extends React.Component {
     return (
       <React.Fragment>
         {/* Line Break Setting */}
-        <div className="row my-3">
-          <h2>{ t('markdown_setting.line_break_setting') }</h2>
+        <div className="row mb-5">
+          <h2 className="border-bottom">{ t('markdown_setting.line_break_setting') }</h2>
           <p className="well">{ t('markdown_setting.line_break_setting_desc') }</p>
           <LineBreakForm />
         </div>
 
         {/* Presentation Setting */}
-        <div className="row my-3">
-          <h2>{ t('markdown_setting.presentation_setting') }</h2>
+        <div className="row mb-5">
+          <h2 className="border-bottom">{ t('markdown_setting.presentation_setting') }</h2>
           <p className="well">{ t('markdown_setting.presentation_setting_desc') }</p>
           <PresentationForm />
         </div>
 
         {/* XSS Setting */}
-        <div className="row my-3">
-          <h2>{ t('markdown_setting.XSS_setting') }</h2>
+        <div className="row mb-5">
+          <h2 className="border-bottom">{ t('markdown_setting.XSS_setting') }</h2>
           <p className="well">{ t('markdown_setting.XSS_setting_desc') }</p>
           <XssForm />
         </div>

src/client/js/components/Admin/MarkdownSetting/PresentationForm.jsx

@@ -20,9 +20,11 @@ class PresentationForm extends React.Component {
   }
 
   async onClickSubmit() {
+    const { t } = this.props;
+
     try {
       await this.props.markDownSettingContainer.updatePresentationSetting();
-      toastSuccess('Success update Presentation setting');
+      toastSuccess(t('markdown_setting.updated_presentation'));
     }
     catch (err) {
       toastError(err);

src/server/routes/index.js

@@ -91,8 +91,7 @@ module.exports = function(crowi, app) {
   app.post('/passport/saml/callback'              , loginPassport.loginPassportSamlCallback);
 
   // markdown admin
-  app.get('/admin/markdown'                   , loginRequiredStrictly , adminRequired , admin.markdown.index); // TODO delete
-  app.post('/admin/markdown/presentationSetting', loginRequiredStrictly , adminRequired , csrf, form.admin.markdownPresentation, admin.markdown.presentationSetting);
+  app.get('/admin/markdown'                   , loginRequiredStrictly , adminRequired , admin.markdown.index);
 
   // markdown admin
   app.get('/admin/customize'                , loginRequiredStrictly , adminRequired , admin.customize.index);