Merge pull request #1759 from weseek/support/adjust-modal-about-page-management

Support/adjust modal about page management

src/client/styles/scss/_override-bootstrap.scss

@@ -44,7 +44,7 @@ h5 {
   .nav-item {
     margin-right: 0.15rem;
     a.active {
-      cursor: default
+      cursor: default;
     }
   }
 }

src/server/views/modal/delete.html

@@ -5,7 +5,6 @@
       <form role="form" id="delete-page-form" onsubmit="return false;">
 
         <div class="modal-header {% if page.isDeleted() %}bg-danger{% else %}bg-primary{% endif %}">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
           <div class="modal-title">
             {% if page.isDeleted() %}
             <i class="icon-fw icon-fire"></i> {{ t('modal_delete.delete_completely') }}
@@ -13,6 +12,7 @@
             <i class="icon-fw icon-trash"></i> {{ t('modal_delete.delete_page') }}
             {% endif %}
           </div>
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         </div>
         <div class="modal-body">
           <div class="form-group">

src/server/views/modal/duplicate.html

@@ -5,8 +5,8 @@
       <form role="form" id="duplicatePageForm" onsubmit="return false;">
 
         <div class="modal-header bg-primary">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
           <div class="modal-title">{{ t('modal_duplicate.label.Duplicate page') }}</div>
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         </div>
         <div class="modal-body">
             <div class="form-group">
@@ -16,7 +16,9 @@
             <div class="form-group">
               <label for="duplicatePageName">{{ t('modal_duplicate.label.New page name') }}</label><br>
               <div class="input-group">
-                <span class="input-group-addon">{{ baseUrl }}</span>
+              <div class="input-group-prepend">
+                <span class="input-group-text">{{ baseUrl }}</span>
+              </div>
                 {% if isSearchServiceConfigured() %}
                 <div id="duplicate-page-name-input" class="page-name-input"></div>
                 {% else %}

src/server/views/modal/rename.html

@@ -5,8 +5,8 @@
       <form role="form" id="renamePageForm" onsubmit="return false;">
 
         <div class="modal-header bg-primary">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
           <div class="modal-title">{{ t('modal_rename.label.Move/Rename page') }}</div>
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         </div>
         <div class="modal-body">
           <div class="form-group">
@@ -16,7 +16,9 @@
           <div class="form-group">
             <label for="newPageName">{{ t('modal_rename.label.New page name') }}</label><br>
             <div class="input-group">
-              <span class="input-group-addon">{{ baseUrl }}</span>
+              <div class="input-group-prepend">
+                <span class="input-group-text">{{ baseUrl }}</span>
+              </div>
               {% if isSearchServiceConfigured() %}
               <div id="rename-page-name-input" class="page-name-input"></div>
               {% else %}