Browse Source

fix before RMLL2018

AlexiCauvin 6 years ago
parent
commit
58b6b0f39e

+ 1 - 1
src/component/Header/MenuActionListItem/MenuProfil.jsx View File

1
-import React from 'react'
1
+  import React from 'react'
2
 import { Link } from 'react-router-dom'
2
 import { Link } from 'react-router-dom'
3
 import PropTypes from 'prop-types'
3
 import PropTypes from 'prop-types'
4
 import { PAGE } from '../../../helper.js'
4
 import { PAGE } from '../../../helper.js'

+ 1 - 0
src/component/Header/MenuActionListItem/Search.jsx View File

8
       <div className='header__menu__rightside__itemsearch__search input-group'>
8
       <div className='header__menu__rightside__itemsearch__search input-group'>
9
         <input
9
         <input
10
           type='text'
10
           type='text'
11
+          readonly
11
           className='search__input form-control'
12
           className='search__input form-control'
12
           placeholder={`${props.t('Header.Search')}...`}
13
           placeholder={`${props.t('Header.Search')}...`}
13
           aria-describedby='headerInputSearch'
14
           aria-describedby='headerInputSearch'

+ 2 - 2
src/component/Workspace/BtnExtandedAction.jsx View File

35
           </div>
35
           </div>
36
         </div>
36
         </div>
37
 
37
 
38
-        <div className='subdropdown__item dropdown-item d-flex align-items-center' onClick={props.onClickExtendedAction.download}>
38
+        {/* <div className='subdropdown__item dropdown-item d-flex align-items-center' onClick={props.onClickExtendedAction.download}>
39
           <div className='subdropdown__item__icon mr-3'>
39
           <div className='subdropdown__item__icon mr-3'>
40
             <i className='fa fa-fw fa-download' />
40
             <i className='fa fa-fw fa-download' />
41
           </div>
41
           </div>
42
           <div className='subdropdown__item__text'>
42
           <div className='subdropdown__item__text'>
43
             Télécharger
43
             Télécharger
44
           </div>
44
           </div>
45
-        </div>
45
+        </div> */ }
46
 
46
 
47
         <div className='subdropdown__item dropdown-item d-flex align-items-center' onClick={props.onClickExtendedAction.archive}>
47
         <div className='subdropdown__item dropdown-item d-flex align-items-center' onClick={props.onClickExtendedAction.archive}>
48
           <div className='subdropdown__item__icon mr-3'>
48
           <div className='subdropdown__item__icon mr-3'>

+ 2 - 1
src/component/common/layout/PageTitle.jsx View File

7
     <div className={classnames(props.parentClass, props.customClass, 'pageTitleGeneric')}>
7
     <div className={classnames(props.parentClass, props.customClass, 'pageTitleGeneric')}>
8
       <div className={classnames(`${props.parentClass}__title`, 'pageTitleGeneric__title d-flex align-items-center')}>
8
       <div className={classnames(`${props.parentClass}__title`, 'pageTitleGeneric__title d-flex align-items-center')}>
9
         <div className='pageTitleGeneric__title__icon mr-3'>
9
         <div className='pageTitleGeneric__title__icon mr-3'>
10
-          <i className='fa fa-fw fa-th' />
10
+          <i className='fa fa-fw fa-th mr-3' />
11
+          Liste des Contenus
11
         </div>
12
         </div>
12
         {props.title}
13
         {props.title}
13
       </div>
14
       </div>

+ 6 - 6
src/container/Dashboard.jsx View File

80
                 <div className='dashboard__header__acces' />
80
                 <div className='dashboard__header__acces' />
81
               </div>
81
               </div>
82
               <div className='dashboard__header__advancedmode mr-3'>
82
               <div className='dashboard__header__advancedmode mr-3'>
83
-                <button type='button' className='btn btn-primary'>Activer édition avancé</button>
83
+                <button type='button' className='btn btn-primary disabled'>Activer édition avancé</button>
84
               </div>
84
               </div>
85
             </div>
85
             </div>
86
 
86
 
129
                         Abonné(e)
129
                         Abonné(e)
130
                       </button>
130
                       </button>
131
                       <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
131
                       <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
132
-                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item'>Abonné(e)
132
+                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item disabled'>Abonné(e)
133
                         </div>
133
                         </div>
134
-                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item dropdown-item'>Non Abonné(e)
134
+                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item dropdown-item disabled'>Non Abonné(e)
135
                         </div>
135
                         </div>
136
                       </div>
136
                       </div>
137
                     </div>
137
                     </div>
512
                         </ul>
512
                         </ul>
513
                       </div>
513
                       </div>
514
                       <div className='dashboard__memberlist__form__submitbtn'>
514
                       <div className='dashboard__memberlist__form__submitbtn'>
515
-                        <button className='btn btn-outline-primary'>Valider</button>
515
+                        <button className='btn btn-outline-primary disabled'>Valider</button>
516
                       </div>
516
                       </div>
517
                     </form>
517
                     </form>
518
                   }
518
                   }
538
                   <div>
538
                   <div>
539
                     <div className='dashboard__moreinfo__webdav__information genericBtnInfoDashboard__info'>
539
                     <div className='dashboard__moreinfo__webdav__information genericBtnInfoDashboard__info'>
540
                       <div className='dashboard__moreinfo__webdav__information__text genericBtnInfoDashboard__info__text'>
540
                       <div className='dashboard__moreinfo__webdav__information__text genericBtnInfoDashboard__info__text'>
541
-                        Retrouvez tous vos documents déposés en ligne directement sur votre ordinateur. Chaque fois qu'un document est déposé, celui-ci sera copié sur votre ordinateur. Consulter tous les documents d'un espace de travail sans passer par le logiciel.
541
+                        Retrouvez tous vos documents déposés en ligne directement sur votre ordinateur via le poste de travail, sans passer par le logiciel.
542
                       </div>
542
                       </div>
543
 
543
 
544
                       <div className='dashboard__moreinfo__webdav__information__link genericBtnInfoDashboard__info__link'>
544
                       <div className='dashboard__moreinfo__webdav__information__link genericBtnInfoDashboard__info__link'>
568
                     <div>
568
                     <div>
569
                       <div className='dashboard__moreinfo__calendar__information genericBtnInfoDashboard__info'>
569
                       <div className='dashboard__moreinfo__calendar__information genericBtnInfoDashboard__info'>
570
                         <div className='dashboard__moreinfo__calendar__information__text genericBtnInfoDashboard__info__text'>
570
                         <div className='dashboard__moreinfo__calendar__information__text genericBtnInfoDashboard__info__text'>
571
-                          Chaque espace de travail possède son propre calendrier indépendant des autres. Les groupes peuvent s’organiser avec ses propres deadlines, l’information est simplifiée et centralisée dans chaque espace de travail.
571
+                          Chaque espace de travail possède son propre calendrier.
572
                         </div>
572
                         </div>
573
 
573
 
574
                         <div className='dashboard__moreinfo__calendar__information__link genericBtnInfoDashboard__info__link'>
574
                         <div className='dashboard__moreinfo__calendar__information__link genericBtnInfoDashboard__info__link'>

+ 1 - 1
src/container/Sidebar.jsx View File

78
           </nav>
78
           </nav>
79
 
79
 
80
           <div className='sidebar__btnnewworkspace'>
80
           <div className='sidebar__btnnewworkspace'>
81
-            <button className='sidebar__btnnewworkspace__btn btn btn-primary mb-5'>
81
+            <button className='sidebar__btnnewworkspace__btn btn btn-primary mb-5 disabled'>
82
               {t('Sidebar.create_new_workspace')}
82
               {t('Sidebar.create_new_workspace')}
83
             </button>
83
             </button>
84
           </div>
84
           </div>

+ 3 - 0
src/css/ContentItem.styl View File

36
     &__text
36
     &__text
37
       margin-right 10px
37
       margin-right 10px
38
       font-size 17px
38
       font-size 17px
39
+      white-space nowrap
40
+      overflow hidden
41
+      text-overflow ellipsis
39
   &__status
42
   &__status
40
     width 180px
43
     width 180px
41
     padding 0 15px
44
     padding 0 15px

+ 9 - 1
src/css/Generic.styl View File

47
     box-shadow none
47
     box-shadow none
48
     outline none
48
     outline none
49
 
49
 
50
+.btn-primary.disabled, .btn-primary:disabled
51
+  background-color thirdColor
52
+  border-color transparent
53
+  color off-white
54
+
55
+.btn-outline-primary.disabled, .btn-outline-primary:disabled
56
+  color fontColor
57
+
50
 .btn.disabled, .btn:disabled
58
 .btn.disabled, .btn:disabled
51
   cursor not-allowed
59
   cursor not-allowed
52
 
60
 
56
   min-height calc(100% - 50px)
64
   min-height calc(100% - 50px)
57
 
65
 
58
 .pageWrapperGeneric
66
 .pageWrapperGeneric
59
-  width calc(100% - 300px) // 300px => width of the sidebar
67
+  width calc(100% - 300px) // 300px => width of the sidebar + margin
60
   &__header
68
   &__header
61
     display flex
69
     display flex
62
   &__content
70
   &__content

+ 4 - 1
src/css/Header.styl View File

40
         background-color transparent
40
         background-color transparent
41
         cursor pointer
41
         cursor pointer
42
       &__itemlanguage
42
       &__itemlanguage
43
+        display none
43
         &__languagedropdown
44
         &__languagedropdown
44
           .languagedropdown
45
           .languagedropdown
45
             &__btnlanguage
46
             &__btnlanguage
63
                   width 25px
64
                   width 25px
64
                   height 18px
65
                   height 18px
65
       &__itemquestion
66
       &__itemquestion
67
+        display none
66
         &__btnquestion
68
         &__btnquestion
67
           margin-right 30px
69
           margin-right 30px
68
           .btnquestion__icon
70
           .btnquestion__icon
100
             cursor pointer
102
             cursor pointer
101
             .setting__link
103
             .setting__link
102
               padding 10px
104
               padding 10px
103
-          //     // color fontColor
105
+              // color fontColor
104
       &__itemnotification
106
       &__itemnotification
107
+        display none
105
         &__timeline
108
         &__timeline
106
           margin-right 30px
109
           margin-right 30px
107
           .timeline
110
           .timeline

+ 1 - 1
src/css/Sidebar.styl View File

21
   background-repeat repeat
21
   background-repeat repeat
22
   z-index 1
22
   z-index 1
23
 
23
 
24
-sidebar-width = 300px
24
+sidebar-width = 280px
25
 sidebar-animate-speed = 0.5s
25
 sidebar-animate-speed = 0.5s
26
 
26
 
27
 .sidebarSticky
27
 .sidebarSticky