Explorar o código

refactor d-none-on-edit -> d-edit-none

Yuki Takei %!s(int64=6) %!d(string=hai) anos
pai
achega
c262b72643

+ 1 - 1
src/client/js/components/BookmarkButton.jsx

@@ -64,7 +64,7 @@ class BookmarkButton extends React.Component {
         href="#"
         title="Bookmark"
         onClick={this.handleClick}
-        className={`btn rounded-circle btn-outline-warning btn-bookmark border-0 d-none-on-edit ${`btn-${this.props.size}`} ${this.state.isBookmarked && 'active'}`}
+        className={`btn rounded-circle btn-outline-warning btn-bookmark border-0 d-edit-none ${`btn-${this.props.size}`} ${this.state.isBookmarked && 'active'}`}
       >
         <i className="icon-star"></i>
       </button>

+ 1 - 1
src/client/js/components/LikeButton.jsx

@@ -43,7 +43,7 @@ class LikeButton extends React.Component {
       <button
         type="button"
         onClick={this.handleClick}
-        className={`btn rounded-circle btn-outline-info btn-like border-0 d-none-on-edit ${this.state.isLiked ? 'active' : ''}`}
+        className={`btn rounded-circle btn-outline-info btn-like border-0 d-edit-none ${this.state.isLiked ? 'active' : ''}`}
       >
         <i className="icon-like"></i>
       </button>

+ 1 - 1
src/client/js/components/Navbar/GrowiSubNavigation.jsx

@@ -74,7 +74,7 @@ const GrowiSubNavigation = (props) => {
         </div>
 
         {/* Page Authors */}
-        <ul className="authors text-nowrap d-none d-lg-block d-none-on-edit">
+        <ul className="authors text-nowrap d-none d-lg-block d-edit-none">
           { creator != null && (
             <li>
               <PageCreator creator={creator} createdAt={createdAt} isCompactMode={isSubnavCompact} />

+ 1 - 1
src/client/js/components/Navbar/GrowiSubNavigationForUserPage.jsx

@@ -34,7 +34,7 @@ const GrowiSubNavigationForUserPage = (props) => {
 
       <div className="d-flex align-items-center justify-content-between">
 
-        <div className="users-info d-flex align-items-center d-none-on-edit">
+        <div className="users-info d-flex align-items-center d-edit-none">
           <UserPicture user={pageUser} />
 
           <div className="users-meta">

+ 1 - 1
src/client/js/components/Page/RevisionPath.jsx

@@ -153,7 +153,7 @@ class RevisionPath extends React.Component {
         <CopyDropdown t={this.props.t} pagePath={this.props.pagePath} pageId={this.props.pageId} buttonStyle={buttonStyle}></CopyDropdown>
 
         { !isPageInTrash && !isPageForbidden && (
-          <a href="#edit" className="d-block d-none-on-edit text-muted btn btn-secondary bg-transparent btn-edit border-0" style={buttonStyle}>
+          <a href="#edit" className="d-block d-edit-none text-muted btn btn-secondary bg-transparent btn-edit border-0" style={buttonStyle}>
             <i className="icon-note" />
           </a>
         ) }

+ 1 - 1
src/client/styles/scss/_on-edit.scss

@@ -27,7 +27,7 @@ body.on-edit {
   // hide unnecessary elements
   header,
   footer,
-  .d-none-on-edit {
+  .d-edit-none {
     display: none !important;
   }
 

+ 1 - 1
src/server/views/layout-crowi/base/layout.html

@@ -30,7 +30,7 @@
     {% include '../../widget/system-version.html' %}
   </aside>
 
-  <div class="row grw-subnav d-none-on-edit">
+  <div class="row grw-subnav d-edit-none">
     <div class="col-md-9">
       {% block content_header %}
       {% endblock %}

+ 1 - 1
src/server/views/layout-crowi/page_list.html

@@ -46,7 +46,7 @@
     {% include '../widget/page_content.html' %}
   </div>
 
-  <div class="row page-list d-none-on-edit d-print-none {% if page.isPortal() %}mt-5{% endif %}">
+  <div class="row page-list d-edit-none d-print-none {% if page.isPortal() %}mt-5{% endif %}">
     <div class="col-md-12">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 1 - 1
src/server/views/layout-crowi/user_page.html

@@ -13,7 +13,7 @@
 
 
 {% block content_main_before %}
-  <div class="m-b-30 user-page-content-container d-none-on-edit hidden-print">
+  <div class="m-b-30 user-page-content-container d-edit-none hidden-print">
     {% include '../widget/user_page_content.html' %}
   </div>
 {% endblock %}

+ 1 - 1
src/server/views/layout-growi/page.html

@@ -35,7 +35,7 @@
   </div>
 
   {% if 'growi' === getConfig('crowi', 'customize:behavior') || 'crowi-plus' === getConfig('crowi', 'customize:behavior') %}
-  <div class="row page-list d-none-on-edit d-print-none mt-5">
+  <div class="row page-list d-edit-none d-print-none mt-5">
     <div class="col-md-10">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 1 - 1
src/server/views/layout-growi/page_list.html

@@ -34,7 +34,7 @@
 
   </div>
 
-  <div class="row page-list d-none-on-edit d-print-none {% if page.isPortal() %}mt-5{% endif %}">
+  <div class="row page-list d-edit-none d-print-none {% if page.isPortal() %}mt-5{% endif %}">
     <div class="col-md-10">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 2 - 2
src/server/views/layout-growi/user_page.html

@@ -27,7 +27,7 @@
         #   Because this block has content like 'Bookmarks' or 'Recent Created' whose height changes dynamically,
         #   setting of 'revision-toc' (affix) is hindered.
         #}
-      <div class="m-b-30 user-page-content-container d-none-on-edit hidden-print">
+      <div class="m-b-30 user-page-content-container d-edit-none hidden-print">
         {% include '../widget/user_page_content.html' %}
       </div>
 
@@ -61,7 +61,7 @@
   </div>
 
   {% if 'growi' === getConfig('crowi', 'customize:behavior') || 'crowi-plus' === getConfig('crowi', 'customize:behavior') %}
-  <div class="row page-list d-none-on-edit d-print-none mt-5">
+  <div class="row page-list d-edit-none d-print-none mt-5">
     <div class="col-md-10">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 1 - 1
src/server/views/layout-growi/widget/comments.html

@@ -1,4 +1,4 @@
-<div class="page-comments-row row d-none-on-edit d-print-none">
+<div class="page-comments-row row d-edit-none d-print-none">
 
   <div class="page-comments col-xl-7 col-lg-9">
 

+ 1 - 1
src/server/views/layout-growi/widget/header.html

@@ -1,4 +1,4 @@
-<div id="grw-subnav" class="grw-subnav d-none-on-edit" data-is-forbidden-page="{{ forbidden }}"></div>
+<div id="grw-subnav" class="grw-subnav d-edit-none" data-is-forbidden-page="{{ forbidden }}"></div>
 
 {% if not page and not forbidden and ('/' === path or 'crowi' === getConfig('crowi', 'customize:behavior')) and not isUserPageList(path) and !isTrashPage() %}
   {% if '/' === path.slice(-1) %}

+ 1 - 1
src/server/views/layout-kibela/base/layout.html

@@ -12,7 +12,7 @@
   <div class="row body m-0 p-0">
 
     <div id="main" class="main col-12 kibela-block bg-white round-corner {% if page %}{{ css.grant(page) }}{% endif %}{% block main_css_class %}{% endblock %}">
-      <div class="row grw-subnav d-none-on-edit">
+      <div class="row grw-subnav d-edit-none">
         <div class="col-12">
           {% block content_header %} {% endblock %}
         </div>

+ 1 - 1
src/server/views/layout-kibela/page.html

@@ -33,7 +33,7 @@
 </div>
 
   {% if 'growi' === getConfig('crowi', 'customize:behavior') || 'crowi-plus' === getConfig('crowi', 'customize:behavior') %}
-  <div class="row page-list grw-pt-10px my-5 round-corner d-none-on-edit">
+  <div class="row page-list grw-pt-10px my-5 round-corner d-edit-none">
     <div class="col-md-10">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 1 - 1
src/server/views/layout-kibela/page_list.html

@@ -32,7 +32,7 @@
 
 </div>
 
-  <div class="row page-list bg-white round-corner grw-pt-10px mb-5 d-none-on-edit {% if page.isPortal() %}mt-5{% endif %}">
+  <div class="row page-list bg-white round-corner grw-pt-10px mb-5 d-edit-none {% if page.isPortal() %}mt-5{% endif %}">
     <div class="col">
       {% include '../widget/page_list_and_timeline_kibela.html' %}
     </div>

+ 2 - 2
src/server/views/layout-kibela/user_page.html

@@ -25,7 +25,7 @@
         #   Because this block has content like 'Bookmarks' or 'Recent Created' whose height changes dynamically,
         #   setting of 'revision-toc' (affix) is hindered.
         #}
-      <div class="m-b-30 user-page-content-container d-none-on-edit">
+      <div class="m-b-30 user-page-content-container d-edit-none">
         {% include '../widget/user_page_content.html' %}
       </div>
 
@@ -52,7 +52,7 @@
   </div>
 
   {% if 'growi' === getConfig('crowi', 'customize:behavior') || 'crowi-plus' === getConfig('crowi', 'customize:behavior') %}
-  <div class="row page-list mt-5 d-none-on-edit">
+  <div class="row page-list mt-5 d-edit-none">
     <div class="col-xs-12">
       {% include '../widget/page_list_and_timeline_kibela.html' %}
     </div>

+ 1 - 1
src/server/views/layout-kibela/widget/comments.html

@@ -1,4 +1,4 @@
-<div class="page-comments-row row d-none-on-edit">
+<div class="page-comments-row row d-edit-none">
 
     <div class="page-comments">
 

+ 1 - 1
src/server/views/layout/layout.html

@@ -146,7 +146,7 @@
 
 </div><!-- /#wrapper -->
 
-<div class="grw-fixed-controls-container d-md-none d-none-on-edit animated fadeInUp faster">
+<div class="grw-fixed-controls-container d-md-none d-edit-none animated fadeInUp faster">
   <div class="grw-fixed-controls-button-container rounded-circle">
     <button class="btn btn-lg btn-primary rounded-circle waves-effect waves-light" type="button" data-target="#create-page" data-toggle="modal">
       <i class="icon-pencil"></i>

+ 1 - 1
src/server/views/widget/create_portal.html

@@ -1,4 +1,4 @@
-<div class="portal-form-button d-none-on-edit">
+<div class="portal-form-button d-edit-none">
   <a class="btn btn-primary" id="create-portal-button" href="#edit" data-toggle="tab" {% if not user %}disabled{% endif %}>Create Portal</a>
   <p class="form-text text-muted"><a href="#" data-target="#help-portal" data-toggle="modal"><i class="icon-question"></i> What is Portal?</a></p>
 </div>

+ 1 - 1
src/server/views/widget/forbidden_content.html

@@ -12,7 +12,7 @@
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   >
 
-  <div class="row row-alerts d-none-on-edit">
+  <div class="row row-alerts d-edit-none">
     <div class="col-sm-12">
         <p class="alert alert-primary py-3 px-4">
           <i class="icon-fw icon-lock" aria-hidden="true"></i> Browsing of this page is restricted

+ 1 - 1
src/server/views/widget/not_found_content.html

@@ -1,4 +1,4 @@
-<div class="row not-found-message-row mb-4 d-none-on-edit">
+<div class="row not-found-message-row mb-4 d-edit-none">
   <div class="col-md-12">
     <h2 class="text-muted">
       <i class="icon-info" aria-hidden="true"></i>

+ 3 - 3
src/server/views/widget/page_alerts.html

@@ -1,4 +1,4 @@
-<div class="row row-alerts d-none-on-edit">
+<div class="row row-alerts d-edit-none">
   <div class="col-sm-12">
     {% if page && page.grant && page.grant > 1 %}
 
@@ -29,7 +29,7 @@
     {% endif %}
 
     {% if redirectFrom or req.query.renamed or req.query.redirectFrom %}
-    <div class="alert alert-info d-none-on-edit py-3 px-4 d-flex align-items-center justify-content-between">
+    <div class="alert alert-info d-edit-none py-3 px-4 d-flex align-items-center justify-content-between">
       <span>
         {% set fromPath = req.query.renamed or req.query.redirectFrom %}
         {% if redirectFrom or req.query.redirectFrom %}
@@ -61,7 +61,7 @@
     {% endif %}
 
     {% if req.query.unlinked %}
-    <div class="alert alert-info d-none-on-edit py-3 px-4">
+    <div class="alert alert-info d-edit-none py-3 px-4">
       <strong>{{ t('Unlinked') }}: </strong> {{ t('page_page.notice.unlinked') }}
     </div>
     {% endif %}

+ 1 - 1
src/server/views/widget/page_attachments.html

@@ -1,4 +1,4 @@
-<div class="row page-attachments-row d-none-on-edit d-print-none">
+<div class="row page-attachments-row d-edit-none d-print-none">
   <div class="col-12">
     <div class="mt-4 mb-4">
       <div class="page-attachments" id="page-attachment"></div>