zamis 5 лет назад
Родитель
Сommit
a6380a7bc1

+ 2 - 1
src/client/js/components/Page/DisplaySwitcher.jsx

@@ -8,6 +8,7 @@ import PageContainer from '../../services/PageContainer';
 import PageAccessoriesContainer from '../../services/PageAccessoriesContainer';
 import Editor from '../PageEditor';
 import Page from '../Page';
+import UserInfo from '../User/UserInfo';
 import TableOfContents from '../TableOfContents';
 import UserContentsLinks from '../UserContentsLinks';
 import PageAccessoriesModalControl from '../PageAccessoriesModalControl';
@@ -33,7 +34,6 @@ const DisplaySwitcher = (props) => {
 
           {isDeviceSmallerThanMd && (
             <div className="row d-flex justify-content-end d-lg-none border-bottom">
-
               <PageAccessoriesModalControl
                 isGuestUser={isGuestUser}
                 isSharedUser={isSharedUser}
@@ -42,6 +42,7 @@ const DisplaySwitcher = (props) => {
             )}
           <div className="row">
             <div className="flex-grow-1">
+              {pageUser && <UserInfo pageUser={pageUser} />}
               <Page />
             </div>
             {!isDeviceSmallerThanMd && (

+ 1 - 17
src/server/views/widget/page_content.html

@@ -43,29 +43,13 @@
 <div class="flex-grow-1">
   {% include 'page_alerts.html' %}
 
-  {% if pageUser %}
-    <div class="user-info" id="user-info"></div>
-  {% endif %}
-
   <div id="display-switcher">
+
     <script type="text/template" id="raw-text-original">{{ revision.body.toString() | encodeHTML }}</script>
   </div>
   <div id="page-editor-navbar-bottom-container" class="d-none d-edit-block"></div>
 </div>
 
-<!-- {% if revision %}
-<div class="d-none d-lg-block d-edit-none grw-side-contents-container">
-  <div class="grw-side-contents-sticky-container">
-    <div id="page-accessories" class="page-accessories"></div>
-    <div id="revision-toc" class="revision-toc sps sps--abv" data-sps-offset="123"></div>
-    {% if pageUser %}
-      <div id="grw-user-contents-links"></div>
-    {% endif %}
-  </div>
-</div>
-{% endif %} -->
-
-
 <div id="grw-page-status-alert-container"></div>
 
 </div>