Merge branch 'develop' of github.com:tracim/app_PageHtml into develop

src/component/HtmlDocument.jsx

@@ -7,9 +7,14 @@ const HtmlDocument = props => {
     <div className='wsContentHtmlDocument__contentpage__textnote html-documents__contentpage__textnote'>
       {(props.mode === MODE.VIEW || props.mode === MODE.REVISION) &&
         <div>
-          <div className='html-documents__contentpage__textnote__latestversion'>
+          <div className='html-documents__contentpage__textnote__version'>
             version n°
-            <div dangerouslySetInnerHTML={{__html: props.version}} />
+            <div dangerouslySetInnerHTML={{__html: props.mode === MODE.VIEW ? props.lastVersion : props.version}} />
+            {props.mode === MODE.REVISION &&
+              <div className='html-documents__contentpage__textnote__lastversion'>
+                (dernière version : {props.lastVersion})
+              </div>
+            }
           </div>
           <div className='html-documents__contentpage__textnote__text' dangerouslySetInnerHTML={{__html: props.text}} />
         </div>

src/container/HtmlDocument.jsx

@@ -230,12 +230,18 @@ class HtmlDocument extends React.Component {
         ...prev.content,
         label: revision.label,
         raw_content: revision.raw_content,
-        number: revision.number
+        number: revision.number,
+        status: revision.status
       },
       mode: MODE.REVISION
     }))
   }
 
+  handleClickLastVersion = () => {
+    this.loadContent()
+    this.setState({mode: MODE.VIEW})
+  }
+
   render () {
     const { isVisible, loggedUser, content, timeline, newComment, timelineWysiwyg, config, mode } = this.state
 
@@ -252,21 +258,36 @@ class HtmlDocument extends React.Component {
         />
 
         <PopinFixedOption customClass={`${config.slug}`} i18n={i18n}>
-          <div>
-            <NewVersionBtn onClickNewVersionBtn={this.handleClickNewVersion} disabled={mode === MODE.REVISION} />
-
-            <SelectStatus
-              selectedStatus={config.availableStatuses.find(s => s.slug === content.status)}
-              availableStatus={config.availableStatuses}
-              onChangeStatus={this.handleChangeStatus}
-              disabled={mode === MODE.REVISION}
-            />
-
-            <ArchiveDeleteContent
-              onClickArchiveBtn={this.handleClickArchive}
-              onClickDeleteBtn={this.handleClickDelete}
-              disabled={mode === MODE.REVISION}
-            />
+          <div /* this div in display flex, justify-content space-between */>
+            <div className='d-flex'>
+              <NewVersionBtn onClickNewVersionBtn={this.handleClickNewVersion} disabled={mode === MODE.REVISION} />
+
+              {mode === MODE.REVISION &&
+                <button
+                  className='wsContentGeneric__option__menu__lastversion html-documents__lastversionbtn btn btn-default'
+                  onClick={this.handleClickLastVersion}
+                  style={{backgroundColor: config.hexcolor, color: '#fdfdfd'}}
+                >
+                  <i className='fa fa-code-fork' />
+                  Dernière version
+                </button>
+              }
+            </div>
+
+            <div className='d-flex'>
+              <SelectStatus
+                selectedStatus={config.availableStatuses.find(s => s.slug === content.status)}
+                availableStatus={config.availableStatuses}
+                onChangeStatus={this.handleChangeStatus}
+                disabled={mode === MODE.REVISION}
+              />
+
+              <ArchiveDeleteContent
+                onClickArchiveBtn={this.handleClickArchive}
+                onClickDeleteBtn={this.handleClickDelete}
+                disabled={mode === MODE.REVISION}
+              />
+            </div>
           </div>
         </PopinFixedOption>
 
@@ -276,11 +297,8 @@ class HtmlDocument extends React.Component {
             wysiwygNewVersion={'wysiwygNewVersion'}
             onClickCloseEditMode={this.handleCloseNewVersion}
             onClickValidateBtn={this.handleSaveHtmlDocument}
-            version={
-              mode === MODE.REVISION
-                ? content.number
-                : timeline.filter(t => t.timelineType === 'revision').length
-            }
+            version={content.number}
+            lastVersion={timeline.filter(t => t.timelineType === 'revision').length}
             text={content.raw_content}
             onChangeText={this.handleChangeText}
             key={'html-documents'}
@@ -297,6 +315,7 @@ class HtmlDocument extends React.Component {
             onClickValidateNewCommentBtn={this.handleClickValidateNewCommentBtn}
             onClickWysiwygBtn={this.handleToggleWysiwyg}
             onClickRevisionBtn={this.handleClickShowRevision}
+            shouldScrollToBottom={mode !== MODE.REVISION}
           />
         </PopinFixedContent>
       </PopinFixed>

src/css/index.styl

@@ -29,6 +29,7 @@ btnState()
     &:hover, &:focus, &:active
       color htmlColor
   .selectStatus
+    margin-right 15px
     .dropdown-item
       &:hover, &:focus, &:active, &visited, &:focus-within
         background-color htmlColor
@@ -54,12 +55,15 @@ btnState()
       height 100%
       overflow-y auto
       background-color off-white
-      &__latestversion
+      &__version
         display flex
         justify-content flex-end
         align-items center
         text-align right
         opacity 0.7
+      &__lastversion
+        margin-left 15px
+        font-weight bold
       &__text
         font-size 14px
       &__edition
@@ -85,7 +89,7 @@ btnState()
           & > i
             margin-right 10px
             color darkGrey
-            font-size 22px
+            font-size 20px
           &:hover, &:focus
             btnState()
         &__date