redo fixes before repo merge

frontend/dist/index.html

@@ -19,6 +19,7 @@
       .primaryColorFont { color: #7d4e24; }
       .primaryColorFontDarken { color: #572800; }
       .primaryColorFontLighten { color: #a3744a; }
+      .whiteFontColor {color: #fdfdfd;}
 
       .primaryColorFontHover:hover { color: #7d4e24; }
       .primaryColorFontDarkenHover:hover { color: #572800; }
@@ -35,10 +36,12 @@
       .primaryColorBorder { border-color: #7d4e24; }
       .primaryColorBorderDarken { border-color: #572800; }
       .primaryColorBorderLighten { border-color: #a3744a; }
+      .whiteColorBorder { border-color: #fdfdfd; }
 
       .primaryColorBorderHover:hover { border-color: #7d4e24; }
       .primaryColorBorderDarkenHover:hover { border-color: #572800; }
       .primaryColorBorderLightenHover:hover { border-color: #a3744a; }
+
     </style>
   </head>
 

frontend/src/component/Account/Notification.jsx

@@ -37,7 +37,7 @@ export const Notification = props => {
                 <td>
                   <div className='notification__table__role'>
                     <div className='notification__table__role__icon'>
-                      <i className={`fa ${getRole(ws.role).icon}`} />
+                      <i className={`fa fa-fw ${getRole(ws.role).icon}`} />
                     </div>
                     <div className='notification__table__role__text d-none d-sm-flex'>
                       {props.t(getRole(ws.role).translationKey)}

frontend/src/component/Account/Password.jsx

@@ -4,7 +4,7 @@ export const Password = props => {
   return (
     <div className='account__userpreference__setting__personaldata'>
       <div className='personaldata__sectiontitle subTitle ml-2 ml-sm-0'>
-        Information du compte
+        Changer de mot de passe
       </div>
 
       <div className='personaldata__text ml-2 ml-sm-0'>

frontend/src/component/Account/Timezone.jsx

@@ -6,20 +6,20 @@ export const Timezone = props => {
   const handleChangeTimezone = selectedTimezone => props.onChangeTimezone(props.timezone.find(t => t.place === selectedTimezone.place))
 
   return (
-    <div className='account__userpreference__setting__calendar'>
+    <div className='account__userpreference__setting__timezone'>
 
-      <div className='calendar__title ml-2 ml-sm-0'>
-        Changer de Fuseau Horaire :
+      <div className='timezone__title subTitle ml-2 ml-sm-0'>
+        Changer de Fuseau Horaire
       </div>
 
-      <div className='calendar__text ml-2 ml-sm-0'>
+      <div className='timezone__text ml-2 ml-sm-0'>
         NYI
       </div>
 
-      <div className='calendar__timezone ml-2 ml-sm-0 dropdown'>
+      <div className='timezone__time ml-2 ml-sm-0 dropdown'>
         <Select
           name='timezoneSelect'
-          className='calendar__timezone__select'
+          className='timezone__time__select'
           value={props.timezoneUser}
           labelKey='place'
           valueKey='place'

frontend/src/container/Account.jsx

@@ -7,7 +7,7 @@ import PageContent from '../component/common/layout/PageContent.jsx'
 import UserInfo from '../component/Account/UserInfo.jsx'
 import MenuSubComponent from '../component/Account/MenuSubComponent.jsx'
 import PersonalData from '../component/Account/PersonalData.jsx'
-import Calendar from '../component/Account/Calendar.jsx'
+// import Calendar from '../component/Account/Calendar.jsx'
 import Notification from '../component/Account/Notification.jsx'
 import Password from '../component/Account/Password.jsx'
 import Timezone from '../component/Account/Timezone.jsx'
@@ -42,12 +42,12 @@ class Account extends React.Component {
         name: 'timezone',
         menuLabel: 'Fuseau Horaire',
         active: false
-      },
-      {
-        name: 'calendar',
-        menuLabel: 'Calendrier personnel',
-        active: false
       }]
+      // {
+      //   name: 'calendar',
+      //   menuLabel: 'Calendrier personnel',
+      //   active: false
+      // }]
     }
   }
 
@@ -79,8 +79,10 @@ class Account extends React.Component {
         case 'personalData':
           return <PersonalData />
 
-        case 'calendar':
-          return <Calendar user={this.props.user} />
+        {/*
+          case 'calendar':
+            return <Calendar user={this.props.user} />
+        */}
 
         case 'notification':
           return <Notification

frontend/src/container/Dashboard.jsx

@@ -80,7 +80,7 @@ class Dashboard extends React.Component {
                 <div className='dashboard__header__acces' />
               </div>
               <div className='dashboard__header__advancedmode mr-3'>
-                <button type='button' className='btn btn-primary' disabled>Activer édition avancé</button>
+                <button type='button' className='btn btn-primary'>Activer édition avancé</button>
               </div>
             </div>
 
@@ -129,9 +129,9 @@ class Dashboard extends React.Component {
                         Abonné(e)
                       </button>
                       <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
-                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item' disabled>Abonné(e)
+                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item'>Abonné(e)
                         </div>
-                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item dropdown-item' disabled>Non Abonné(e)
+                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item dropdown-item'>Non Abonné(e)
                         </div>
                       </div>
                     </div>
@@ -140,8 +140,8 @@ class Dashboard extends React.Component {
               </div>
             </div>
 
-            <div className='dashboard__calltoaction'>
-              <div className='dashboard__calltoaction__button btnaction thread'>
+            <div className='dashboard__calltoaction justify-content-xl-center'>
+              <div className='dashboard__calltoaction__button btnaction btnthread'>
                 <div className='dashboard__calltoaction__button__text'>
                   <div className='dashboard__calltoaction__button__text__icon'>
                     <i className='fa fa-comments-o' />
@@ -174,27 +174,29 @@ class Dashboard extends React.Component {
                 </div>
               </div>
 
-              <div className='dashboard__calltoaction__button btnaction visioconf'>
-                <div className='dashboard__calltoaction__button__text'>
-                  <div className='dashboard__calltoaction__button__text__icon'>
-                    <i className='fa fa-video-camera' />
-                  </div>
-                  <div className='dashboard__calltoaction__button__text__title'>
-                    Débuter une visioconférence
+              {/*
+                <div className='dashboard__calltoaction__button btnaction visioconf'>
+                  <div className='dashboard__calltoaction__button__text'>
+                    <div className='dashboard__calltoaction__button__text__icon'>
+                      <i className='fa fa-video-camera' />
+                    </div>
+                    <div className='dashboard__calltoaction__button__text__title'>
+                      Débuter une visioconférence
+                    </div>
                   </div>
                 </div>
-              </div>
 
-              <div className='dashboard__calltoaction__button btnaction calendar'>
-                <div className='dashboard__calltoaction__button__text'>
-                  <div className='dashboard__calltoaction__button__text__icon'>
-                    <i className='fa fa-calendar' />
-                  </div>
-                  <div className='dashboard__calltoaction__button__text__title'>
-                    Voir le Calendrier
+                <div className='dashboard__calltoaction__button btnaction calendar'>
+                  <div className='dashboard__calltoaction__button__text'>
+                    <div className='dashboard__calltoaction__button__text__icon'>
+                      <i className='fa fa-calendar' />
+                    </div>
+                    <div className='dashboard__calltoaction__button__text__title'>
+                      Voir le Calendrier
+                    </div>
                   </div>
                 </div>
-              </div>
+              */ }
 
               <div className='dashboard__calltoaction__button btnaction explore'>
                 <div className='dashboard__calltoaction__button__text'>
@@ -511,7 +513,7 @@ class Dashboard extends React.Component {
                         </ul>
                       </div>
                       <div className='dashboard__memberlist__form__submitbtn'>
-                        <button className='btn btn-outline-primary' disabled>Valider</button>
+                        <button className='btn btn-outline-primary'>Valider</button>
                       </div>
                     </form>
                   }

frontend/src/container/Login.jsx

@@ -65,7 +65,7 @@ class Login extends React.Component {
     if (this.props.user.logged) return <Redirect to={{pathname: '/'}} />
     else {
       return (
-        <section className='loginpage'>
+        <section className='loginpage primaryColorBg'>
           <div className='container-fluid'>
 
             <LoginLogo customClass='loginpage__logo' logoSrc={LoginLogoImg} />
@@ -126,7 +126,7 @@ class Login extends React.Component {
                       <Button
                         htmlType='button'
                         bootstrapType='primary'
-                        customClass='connection__form__btnsubmit'
+                        customClass='connection__form__btnsubmit ml-auto'
                         label='Connexion'
                         onClick={this.handleClickSubmit}
                       />
@@ -138,6 +138,13 @@ class Login extends React.Component {
             </div>
 
           </div>
+
+          <footer className='loginpage__footer'>
+            <div className='loginpage__footer__text whiteFontColor'>
+              copyright © 2013 - 2018 tracim project.
+           </div>
+          </footer>
+
         </section>
       )
     }

frontend/src/container/Sidebar.jsx

@@ -59,7 +59,7 @@ class Sidebar extends React.Component {
     return (
       <div className={classnames('sidebar primaryColorBgDarken', {'sidebarclose': sidebarClose})}>
         <div className='sidebarSticky'>
-          <div className='sidebar__expand primaryColorBg.darken' onClick={this.handleClickToggleSidebar}>
+          <div className='sidebar__expand primaryColorBg whiteColorBorder' onClick={this.handleClickToggleSidebar}>
             <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
           </div>
 
@@ -83,13 +83,13 @@ class Sidebar extends React.Component {
           </nav>
 
           <div className='sidebar__btnnewworkspace'>
-            <button className='sidebar__btnnewworkspace__btn btn btn-primary mb-5' disabled>
+            <button className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'>
               {t('Sidebar.create_new_workspace')}
             </button>
           </div>
 
           <div className='sidebar__footer mb-2'>
-            <div className='sidebar__footer__text d-flex align-items-end justify-content-center'>
+            <div className='sidebar__footer__text whiteFontColor d-flex align-items-end justify-content-center'>
               Copyright - 2013 - 2018
               <div className='sidebar__footer__text__link'>
                 <a href='http://www.tracim.fr/' target='_blank' className='ml-3'>tracim.fr</a>

frontend/src/css/AccountPage.styl

@@ -56,7 +56,6 @@ settingText()
     justify-content center
     align-items center
     flex-wrap wrap
-    border 1px solid grey
     padding 25px
     font-size 18px
     &__wrapper
@@ -143,15 +142,15 @@ settingText()
       .calendar
         &__text
           settingText()
-        &__title
-          margin 15px 0
-          font-size 18px
         &__link
           display inline-block
           border 1px solid grey
           border-radius 5px
           padding 10px 25px
-        &__timezone
+      .timezone
+        &__text
+          settingText()
+        &__time
           margin 15px 0 30px 0
           &__select
             max-width 300px

frontend/src/css/Dashboard.styl

@@ -32,6 +32,7 @@ coloricon()
 
 .dashboard
   margin-left 20px
+  width 100%
   &__header
     flexwrap()
     align-items center
@@ -94,7 +95,7 @@ coloricon()
         &__title
           font-size 18px
           color white
-    .thread
+    .btnthread
       background-color threadColor
     .writefile
       background-color writefile

frontend/src/css/Login.styl

@@ -1,24 +1,26 @@
 .loginpage
   padding-top 85px // 85 = header height
-  min-height calc(100% - 50px)
-  background secondColor url('../img/tracimLogoAsBg.png') no-repeat 25% 3px
+  min-height 100%
+  background-image url('../img/tracimLogoAsBg.png')
+  background-repeat no-repeat
   background-size contain
+  background-position center
   width 100%
   &__logo
     margin 0 auto
     padding 50px 0
     width 170px
   &__connection
+    margin-bottom 50px
     border none
     box-shadow shadow-right
-    margin-bottom 50px
     .connection__header
       background-color thirdColor
       color #FFF
       font-size 25px
   .connection__form
-    width 70%
     margin 0 auto
+    width 70%
     &__rememberme
       &__label
         font-size 13px
@@ -34,56 +36,60 @@
     &__groupepw
       position relative
       &__icon
-        font-size 20px
-        width 20px
         position absolute
         top 5px
         left 8px
+        width 20px
+        font-size 20px
       &__input
         padding-left 45px
     &__btnsubmit
+      display block
+      margin 0 auto
+      border none
       width 150px
       background-color green
-      border none
       cursor pointer
-      display block
-      margin 0 auto
       &:hover
         background-color btnCallAction-hover
       &:focus
         box-shadow shadow-all-side-green
     &__pwforgot
+      margin-top 3px
       cursor pointer
       font-size 13px
-      margin-top 3px
       &:hover::after
-        content ' '
         position absolute
         top 20px
         right 15px
-        width 130px
-        padding-bottom 2px
         border-bottom 1px solid darkGrey
+        padding-bottom 2px
+        content ' '
+        width 130px
+  &__footer
+    text-align center
+    &__text
+      font-size 17px
 
 @media (min-width: min-lg) and (max-width: max-lg)
-  .loginpage__content
+  .loginpage
     .connection__form
       width 100%
 
 @media (min-width: min-md) and (max-width: max-md)
-  .loginpage__content
+  .loginpage
     .connection__form
       width 95%
 
 @media (min-width: min-sm) and (max-width: max-sm)
-  .loginpage__content
+  .loginpage
     padding-top 69px
     display block
     .connection__form
       width 90%
 
 @media (max-width: max-xs)
-  .loginpage__content
+  .loginpage
     padding-top 69px
     background-size cover
     display block

frontend/src/css/Sidebar.styl

@@ -27,11 +27,12 @@ leftside()
   &__expand
     position absolute
     top 0
-    right -42px
+    right -43px
     display flex
     justify-content center
     align-items center
-    border-left 1px solid off-white
+    border-left-width 1px
+    border-left-style solid
     border-bottom-right-radius 15px
     padding 8px 15px
     cursor pointer
@@ -44,11 +45,6 @@ leftside()
       display block
       margin 0 auto
       padding 15px 30px
-      background-color thirdColor
-      border-color thirdColor
-      &:hover, &:focus, &:active, &:visited
-        background-color fifthColor
-        border-color fifthColor
   &__navigation
     padding 0
     overflow hidden
@@ -111,7 +107,6 @@ leftside()
                 background-color rgba(253, 253, 253, 0.8)
   &__footer
     &__text
-      color off-white
       font-size 14px
       &__link
         & > a