Browse Source

merge alexicauvin into plugin_external

Skylsmoi 7 years ago
parent
commit
eacf270398

+ 2 - 3
src/component/Timeline.jsx View File

1
 import React from 'react'
1
 import React from 'react'
2
 import classnames from 'classnames'
2
 import classnames from 'classnames'
3
 import imgProfil from '../img/imgProfil.png'
3
 import imgProfil from '../img/imgProfil.png'
4
-import imgProfilReverse from '../img/imgProfil-reverse.png'
5
 
4
 
6
 const Timeline = props => {
5
 const Timeline = props => {
7
   return (
6
   return (
28
 
27
 
29
         <li className={classnames(`${props.customClass}__messagelist__item`, 'timeline__messagelist__item received')}>
28
         <li className={classnames(`${props.customClass}__messagelist__item`, 'timeline__messagelist__item received')}>
30
           <div className={classnames(`${props.customClass}__messagelist__item__avatar`, 'timeline__messagelist__item__avatar')}>
29
           <div className={classnames(`${props.customClass}__messagelist__item__avatar`, 'timeline__messagelist__item__avatar')}>
31
-            <img src={imgProfilReverse} alt='avatar' />
30
+            <img src={imgProfil} alt='avatar' />
32
           </div>
31
           </div>
33
           <div
32
           <div
34
             className={classnames(`${props.customClass}__messagelist__item__createhour`, 'timeline__messagelist__item__createhour')}>
33
             className={classnames(`${props.customClass}__messagelist__item__createhour`, 'timeline__messagelist__item__createhour')}>
70
 
69
 
71
         <li className={classnames(`${props.customClass}__messagelist__item`, 'timeline__messagelist__item received')}>
70
         <li className={classnames(`${props.customClass}__messagelist__item`, 'timeline__messagelist__item received')}>
72
           <div className={classnames(`${props.customClass}__messagelist__item__avatar`, 'timeline__messagelist__item__avatar')}>
71
           <div className={classnames(`${props.customClass}__messagelist__item__avatar`, 'timeline__messagelist__item__avatar')}>
73
-            <img src={imgProfilReverse} alt='avatar' />
72
+            <img src={imgProfil} alt='avatar' />
74
           </div>
73
           </div>
75
           <div
74
           <div
76
             className={classnames(`${props.customClass}__messagelist__item__createhour`, 'timeline__messagelist__item__createhour')}>
75
             className={classnames(`${props.customClass}__messagelist__item__createhour`, 'timeline__messagelist__item__createhour')}>

+ 4 - 0
src/component/common/PopinFixed/PopinFixedHeader.jsx View File

13
         {props.name}
13
         {props.name}
14
       </div>
14
       </div>
15
 
15
 
16
+      <div className={classnames('editiontitle mr-auto', `${props.customClass}__header__editionmode`)}>
17
+        <input className='editiontitle__input form-control' placeholder='Titre du fichier' />
18
+      </div>
19
+
16
       <div className={classnames('wsFileGeneric__header__edittitle', `${props.customClass}__header__changetitle`)}>
20
       <div className={classnames('wsFileGeneric__header__edittitle', `${props.customClass}__header__changetitle`)}>
17
         <i className='fa fa-pencil' />
21
         <i className='fa fa-pencil' />
18
       </div>
22
       </div>

+ 60 - 60
src/container/AccountPage.jsx View File

69
             <div className='account__userpreference__setting'>
69
             <div className='account__userpreference__setting'>
70
 
70
 
71
               <div className='account__userpreference__setting__personaldata d-none'>
71
               <div className='account__userpreference__setting__personaldata d-none'>
72
-                <div className='account__userpreference__setting__personaldata__title subTitle ml-2 ml-sm-0'>
72
+                <div className='personaldata__title subTitle ml-2 ml-sm-0'>
73
                   Mes informations personnelles
73
                   Mes informations personnelles
74
                 </div>
74
                 </div>
75
 
75
 
76
-                <div className='account__userpreference__setting__personaldata__text ml-2 ml-sm-0'>
76
+                <div className='personaldata__text ml-2 ml-sm-0'>
77
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
77
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
78
                   Ut consectetur dolor et sunt nisi officia ut magna.
78
                   Ut consectetur dolor et sunt nisi officia ut magna.
79
                 </div>
79
                 </div>
80
 
80
 
81
-                <div className='account__userpreference__setting__personaldata__changeinfo'>
82
-                  <div className='account__userpreference__setting__personaldata__changeinfo__infotitle'>
81
+                <div className='personaldata__form'>
82
+                  <div className='personaldata__form__title'>
83
                     Changer le mot de passe :
83
                     Changer le mot de passe :
84
                   </div>
84
                   </div>
85
-                  <input className='account__userpreference__setting__personaldata__changeinfo__txtinput form-control' type='password' placeholder='Ancien mot de passe' />
86
-                  <input className='account__userpreference__setting__personaldata__changeinfo__txtinput form-control' type='password' placeholder='Nouveau mot de passe' />
87
-                  <div className='account__userpreference__setting__personaldata__changeinfo__button btn btn-primary'>
85
+                  <input className='personaldata__form__txtinput form-control' type='password' placeholder='Ancien mot de passe' />
86
+                  <input className='personaldata__form__txtinput form-control' type='password' placeholder='Nouveau mot de passe' />
87
+                  <div className='personaldata__form__button btn btn-primary'>
88
                     Envoyer
88
                     Envoyer
89
                   </div>
89
                   </div>
90
                 </div>
90
                 </div>
91
 
91
 
92
-                <div className='account__userpreference__setting__personaldata__changeinfo'>
93
-                  <div className='account__userpreference__setting__personaldata__changeinfo__infotitle'>
92
+                <div className='personaldata__form'>
93
+                  <div className='personaldata__form__title'>
94
                     Changer d'adresse mail :
94
                     Changer d'adresse mail :
95
                   </div>
95
                   </div>
96
-                  <input className='account__userpreference__setting__personaldata__changeinfo__txtinput form-control' type='email' placeholder='Ancienne adresse mail' />
97
-                  <input className='account__userpreference__setting__personaldata__changeinfo__txtinput form-control' type='email' placeholder='Nouvelle adresse mail' />
98
-                  <div className='account__userpreference__setting__personaldata__changeinfo__button btn btn-primary'>
96
+                  <input className='personaldata__form__txtinput form-control' type='email' placeholder='Ancienne adresse mail' />
97
+                  <input className='personaldata__form__txtinput form-control' type='email' placeholder='Nouvelle adresse mail' />
98
+                  <div className='personaldata__form__button btn btn-primary'>
99
                     Envoyer
99
                     Envoyer
100
                   </div>
100
                   </div>
101
                 </div>
101
                 </div>
103
 
103
 
104
               <div className='account__userpreference__setting__calendar d-none'>
104
               <div className='account__userpreference__setting__calendar d-none'>
105
 
105
 
106
-                <div className='account__userpreference__setting__calendar__title subTitle ml-2 ml-sm-0'>
106
+                <div className='calendar__title subTitle ml-2 ml-sm-0'>
107
                   Calendrier
107
                   Calendrier
108
                 </div>
108
                 </div>
109
 
109
 
110
-                <div className='account__userpreference__setting__calendar__text ml-2 ml-sm-0'>
110
+                <div className='calendar__text ml-2 ml-sm-0'>
111
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
111
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
112
                   Ut consectetur dolor et sunt nisi officia ut magna.
112
                   Ut consectetur dolor et sunt nisi officia ut magna.
113
                 </div>
113
                 </div>
114
 
114
 
115
-                <div className='account__userpreference__setting__calendar__infotitle'>
115
+                <div className='calendar__title ml-2 ml-sm-0'>
116
                   Accèder à votre Calendrier personnel
116
                   Accèder à votre Calendrier personnel
117
                 </div>
117
                 </div>
118
-                <div className='account__userpreference__setting__calendar__link'>
118
+                <div className='calendar__link ml-2 ml-sm-0'>
119
                   http://algoo.trac.im/caldav/user/262.ics/
119
                   http://algoo.trac.im/caldav/user/262.ics/
120
                 </div>
120
                 </div>
121
 
121
 
122
-                <div className='account__userpreference__setting__calendar__infotitle'>
122
+                <div className='calendar__title ml-2 ml-sm-0'>
123
                   Changer de Fuseau Horaire :
123
                   Changer de Fuseau Horaire :
124
                 </div>
124
                 </div>
125
 
125
 
126
-                <div className='account__userpreference__setting__calendar__timezone dropdown'>
127
-                  <button className='account__userpreference__setting__calendar__timezone__btn btn dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
126
+                <div className='calendar__timezone ml-2 ml-sm-0 dropdown'>
127
+                  <button className='calendar__timezone__btn btn dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
128
                     Fuseau Horaire
128
                     Fuseau Horaire
129
                   </button>
129
                   </button>
130
-                  <div className='account__userpreference__setting__calendar__timezone__submenu dropdown-menu'>
131
-                    <div className='account__userpreference__setting__calendar__timezone__submenu__item dropdown-item'> Paris GMT +1
130
+                  <div className='calendar__timezone__submenu dropdown-menu'>
131
+                    <div className='calendar__timezone__submenu__item dropdown-item'> Paris GMT +1
132
                     </div>
132
                     </div>
133
-                    <div className='account__userpreference__setting__calendar__timezone__submenu__item dropdown-item dropdown-item'> Londres GMT +0
133
+                    <div className='calendar__timezone__submenu__item dropdown-item dropdown-item'> Londres GMT +0
134
                     </div>
134
                     </div>
135
                   </div>
135
                   </div>
136
                 </div>
136
                 </div>
138
 
138
 
139
               <div className='account__userpreference__setting__notification'>
139
               <div className='account__userpreference__setting__notification'>
140
 
140
 
141
-                <div className='account__userpreference__setting__notification__title subTitle ml-2 ml-sm-0'>
141
+                <div className='notification__title subTitle ml-2 ml-sm-0'>
142
                   Mes Espaces de Travail
142
                   Mes Espaces de Travail
143
                 </div>
143
                 </div>
144
 
144
 
145
-                <div className='account__userpreference__setting__notification__text ml-2 ml-sm-0'>
145
+                <div className='notification__text ml-2 ml-sm-0'>
146
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
146
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
147
                   Ut consectetur dolor et sunt nisi officia ut magna.
147
                   Ut consectetur dolor et sunt nisi officia ut magna.
148
                 </div>
148
                 </div>
149
 
149
 
150
-                <div className='account__userpreference__setting__notification__tableau'>
150
+                <div className='notification__table'>
151
                   <table className='table'>
151
                   <table className='table'>
152
                     <thead>
152
                     <thead>
153
                       <tr>
153
                       <tr>
159
                     <tbody>
159
                     <tbody>
160
                       <tr>
160
                       <tr>
161
                         <td>
161
                         <td>
162
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
162
+                          <div className='notification__table__wksname'>
163
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
163
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
164
                           </div>
164
                           </div>
165
                         </td>
165
                         </td>
166
                         <td>
166
                         <td>
167
-                          <div className='account__userpreference__setting__notification__tableau__role'>
168
-                            <div className='account__userpreference__setting__notification__tableau__role__icon'>
167
+                          <div className='notification__table__role'>
168
+                            <div className='notification__table__role__icon'>
169
                               <i className='fa fa-graduation-cap' />
169
                               <i className='fa fa-graduation-cap' />
170
                             </div>
170
                             </div>
171
-                            <div className='account__userpreference__setting__notification__tableau__role__text'>
171
+                            <div className='notification__table__role__text d-none d-sm-flex'>
172
                               Gestionnaire de Contenu
172
                               Gestionnaire de Contenu
173
                             </div>
173
                             </div>
174
                           </div>
174
                           </div>
175
                         </td>
175
                         </td>
176
                         <td>
176
                         <td>
177
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
177
+                          <div className='notification__table__btnswitch'>
178
                             <BtnSwitch />
178
                             <BtnSwitch />
179
                           </div>
179
                           </div>
180
                         </td>
180
                         </td>
181
                       </tr>
181
                       </tr>
182
                       <tr>
182
                       <tr>
183
                         <td>
183
                         <td>
184
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
184
+                          <div className='notification__table__wksname'>
185
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
185
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
186
                           </div>
186
                           </div>
187
                         </td>
187
                         </td>
188
                         <td>
188
                         <td>
189
-                          <div className='account__userpreference__setting__notification__tableau__role'>
190
-                            <div className='account__userpreference__setting__notification__tableau__role__icon'>
189
+                          <div className='notification__table__role'>
190
+                            <div className='notification__table__role__icon'>
191
                               <i className='fa fa-eye' />
191
                               <i className='fa fa-eye' />
192
                             </div>
192
                             </div>
193
-                            <div className='account__userpreference__setting__notification__tableau__role__text'>
193
+                            <div className='notification__table__role__text d-none d-sm-flex'>
194
                               Lecteur
194
                               Lecteur
195
                             </div>
195
                             </div>
196
                           </div>
196
                           </div>
197
                         </td>
197
                         </td>
198
                         <td>
198
                         <td>
199
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
199
+                          <div className='notification__table__btnswitch'>
200
                             <BtnSwitch />
200
                             <BtnSwitch />
201
                           </div>
201
                           </div>
202
                         </td>
202
                         </td>
203
                       </tr>
203
                       </tr>
204
                       <tr>
204
                       <tr>
205
                         <td>
205
                         <td>
206
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
206
+                          <div className='notification__table__wksname'>
207
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
207
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
208
                           </div>
208
                           </div>
209
                         </td>
209
                         </td>
210
                         <td>
210
                         <td>
211
-                          <div className='account__userpreference__setting__notification__tableau__role'>
212
-                            <div className='account__userpreference__setting__notification__tableau__role__icon'>
211
+                          <div className='notification__table__role'>
212
+                            <div className='notification__table__role__icon'>
213
                               <i className='fa fa-pencil' />
213
                               <i className='fa fa-pencil' />
214
                             </div>
214
                             </div>
215
-                            <div className='account__userpreference__setting__notification__tableau__role__text'>
215
+                            <div className='notification__table__role__text d-none d-sm-flex'>
216
                               Contributeur
216
                               Contributeur
217
                             </div>
217
                             </div>
218
                           </div>
218
                           </div>
219
                         </td>
219
                         </td>
220
                         <td>
220
                         <td>
221
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
221
+                          <div className='notification__table__btnswitch'>
222
                             <BtnSwitch />
222
                             <BtnSwitch />
223
                           </div>
223
                           </div>
224
                         </td>
224
                         </td>
225
                       </tr>
225
                       </tr>
226
                       <tr>
226
                       <tr>
227
                         <td>
227
                         <td>
228
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
228
+                          <div className='notification__table__wksname'>
229
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
229
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
230
                           </div>
230
                           </div>
231
                         </td>
231
                         </td>
232
                         <td>
232
                         <td>
233
-                          <div className='account__userpreference__setting__notification__tableau__role'>
234
-                            <div className='account__userpreference__setting__notification__tableau__role__icon'>
233
+                          <div className='notification__table__role'>
234
+                            <div className='notification__table__role__icon'>
235
                               <i className='fa fa-gavel' />
235
                               <i className='fa fa-gavel' />
236
                             </div>
236
                             </div>
237
-                            <div className='account__userpreference__setting__notification__tableau__role__text'>
237
+                            <div className='notification__table__role__text d-none d-sm-flex'>
238
                               Responsable
238
                               Responsable
239
                             </div>
239
                             </div>
240
                           </div>
240
                           </div>
241
                         </td>
241
                         </td>
242
                         <td>
242
                         <td>
243
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
243
+                          <div className='notification__table__btnswitch'>
244
                             <BtnSwitch />
244
                             <BtnSwitch />
245
                           </div>
245
                           </div>
246
                         </td>
246
                         </td>
247
                       </tr>
247
                       </tr>
248
                       <tr>
248
                       <tr>
249
                         <td>
249
                         <td>
250
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
250
+                          <div className='notification__table__wksname'>
251
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
251
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
252
                           </div>
252
                           </div>
253
                         </td>
253
                         </td>
254
                         <td>
254
                         <td>
255
-                          <div className='account__userpreference__setting__notification__tableau__role'>
256
-                            <div className='account__userpreference__setting__notification__tableau__role__icon'>
255
+                          <div className='notification__table__role'>
256
+                            <div className='notification__table__role__icon'>
257
                               <i className='fa fa-graduation-cap' />
257
                               <i className='fa fa-graduation-cap' />
258
                             </div>
258
                             </div>
259
-                            <div className='account__userpreference__setting__notification__tableau__role__text'>
259
+                            <div className='notification__table__role__text d-none d-sm-flex'>
260
                               Gestionnaire de Contenu
260
                               Gestionnaire de Contenu
261
                             </div>
261
                             </div>
262
                           </div>
262
                           </div>
263
                         </td>
263
                         </td>
264
                         <td>
264
                         <td>
265
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
265
+                          <div className='notification__table__btnswitch'>
266
                             <BtnSwitch />
266
                             <BtnSwitch />
267
                           </div>
267
                           </div>
268
                         </td>
268
                         </td>
269
                       </tr>
269
                       </tr>
270
                       <tr>
270
                       <tr>
271
                         <td>
271
                         <td>
272
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
272
+                          <div className='notification__table__wksname'>
273
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
273
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
274
                           </div>
274
                           </div>
275
                         </td>
275
                         </td>
276
                         <td>
276
                         <td>
277
-                          <div className='account__userpreference__setting__notification__tableau__role'>
278
-                            <div className='account__userpreference__setting__notification__tableau__role__icon'>
277
+                          <div className='notification__table__role'>
278
+                            <div className='notification__table__role__icon'>
279
                               <i className='fa fa-graduation-cap' />
279
                               <i className='fa fa-graduation-cap' />
280
                             </div>
280
                             </div>
281
-                            <div className='account__userpreference__setting__notification__tableau__role__text'>
281
+                            <div className='notification__table__role__text d-none d-sm-flex'>
282
                               Gestionnaire de Contenu
282
                               Gestionnaire de Contenu
283
                             </div>
283
                             </div>
284
                           </div>
284
                           </div>
285
                         </td>
285
                         </td>
286
                         <td>
286
                         <td>
287
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
287
+                          <div className='notification__table__btnswitch'>
288
                             <BtnSwitch />
288
                             <BtnSwitch />
289
                           </div>
289
                           </div>
290
                         </td>
290
                         </td>
291
                       </tr>
291
                       </tr>
292
                       <tr>
292
                       <tr>
293
                         <td>
293
                         <td>
294
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
294
+                          <div className='notification__table__wksname'>
295
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
295
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
296
                           </div>
296
                           </div>
297
                         </td>
297
                         </td>
298
                         <td>
298
                         <td>
299
-                          <div className='account__userpreference__setting__notification__tableau__role'>
300
-                            <div className='account__userpreference__setting__notification__tableau__role__icon'>
299
+                          <div className='notification__table__role'>
300
+                            <div className='notification__table__role__icon'>
301
                               <i className='fa fa-graduation-cap' />
301
                               <i className='fa fa-graduation-cap' />
302
                             </div>
302
                             </div>
303
-                            <div className='account__userpreference__setting__notification__tableau__role__text'>
303
+                            <div className='notification__table__role__text d-none d-sm-flex'>
304
                               Gestionnaire de Contenu
304
                               Gestionnaire de Contenu
305
                             </div>
305
                             </div>
306
                           </div>
306
                           </div>
307
                         </td>
307
                         </td>
308
                         <td>
308
                         <td>
309
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
309
+                          <div className='notification__table__btnswitch'>
310
                             <BtnSwitch />
310
                             <BtnSwitch />
311
                           </div>
311
                           </div>
312
                         </td>
312
                         </td>

+ 26 - 32
src/css/AccountPage.styl View File

5
   margin 15px 0
5
   margin 15px 0
6
   font-size 18px
6
   font-size 18px
7
 
7
 
8
+.table td
9
+  vertical-align middle
10
+
11
+.table tr:nth-child(even)
12
+  background-color grey-hover
13
+
8
 .account
14
 .account
15
+  width 100%
9
   &__userinformation
16
   &__userinformation
10
     display flex
17
     display flex
11
     justify-content center
18
     justify-content center
56
           font-size 20px
63
           font-size 20px
57
           cursor pointer
64
           cursor pointer
58
         &__disabled
65
         &__disabled
59
-          padding 25px 20px 20px 20px
66
+          padding 25px 20px 20px 16px
60
           color grey
67
           color grey
61
           font-size 18px
68
           font-size 18px
62
         &__item
69
         &__item
63
           margin-top 10px
70
           margin-top 10px
64
-          padding-left 5px
65
           font-weight 500
71
           font-weight 500
66
           font-size 18px
72
           font-size 18px
67
           cursor pointer
73
           cursor pointer
73
       padding 20px
79
       padding 20px
74
       width 80%
80
       width 80%
75
       background-color off-white
81
       background-color off-white
76
-      &__personaldata
82
+      .personaldata
77
         &__text
83
         &__text
78
           settingText()
84
           settingText()
79
-        &__changeinfo
85
+        &__form
80
           margin 25px 0
86
           margin 25px 0
81
-          &__infotitle
87
+          &__title
82
             margin-bottom 15px
88
             margin-bottom 15px
83
             font-size 18px
89
             font-size 18px
84
           &__txtinput
90
           &__txtinput
85
             display inline-flex
91
             display inline-flex
86
-            display ms-inline-flex
87
             width auto
92
             width auto
88
             margin 0 15px 15px 0
93
             margin 0 15px 15px 0
89
             border 1px solid blue
94
             border 1px solid blue
90
-            border-radius 10px
95
+            border-radius 5px
91
             padding 8px 15px
96
             padding 8px 15px
92
           &__button
97
           &__button
93
             vertical-align top
98
             vertical-align top
94
             border 1px solid blue
99
             border 1px solid blue
95
-            border-radius 10px
100
+            border-radius 5px
96
             padding 8px 25px
101
             padding 8px 25px
97
-            background-color transparent
98
-            color blue
99
             cursor pointer
102
             cursor pointer
100
-            &:hover, &:focus
101
-              background-color blue
102
-              color white
103
-      &__calendar
104
-        &__title
105
-          settingTitle()
103
+      .calendar
106
         &__text
104
         &__text
107
           settingText()
105
           settingText()
108
-        &__infotitle
106
+        &__title
109
           margin 15px 0
107
           margin 15px 0
110
           font-size 18px
108
           font-size 18px
111
         &__link
109
         &__link
112
           display inline-block
110
           display inline-block
113
           border 1px solid grey
111
           border 1px solid grey
114
-          border-radius 10px
112
+          border-radius 5px
115
           padding 10px 25px
113
           padding 10px 25px
116
         &__timezone
114
         &__timezone
117
           margin 15px 0 30px 0
115
           margin 15px 0 30px 0
118
           &__btn
116
           &__btn
119
             border 1px solid blue
117
             border 1px solid blue
120
-            border-radius 10px
118
+            border-radius 5px
121
             padding 10px 35px
119
             padding 10px 35px
122
             color blue
120
             color blue
123
             background-color transparent
121
             background-color transparent
134
               &:hover, &:focus
132
               &:hover, &:focus
135
                 background-color blue
133
                 background-color blue
136
                 color white
134
                 color white
137
-      &__notification
138
-        &__title
139
-          settingTitle()
135
+      .notification
140
         &__text
136
         &__text
141
           settingText()
137
           settingText()
142
           margin-bottom 30px
138
           margin-bottom 30px
143
-        &__tableau
139
+        &__table
144
           border 1px solid lightGrey
140
           border 1px solid lightGrey
145
           &__role
141
           &__role
146
             display flex
142
             display flex
148
             &__icon
144
             &__icon
149
               margin-right 10px
145
               margin-right 10px
150
 
146
 
151
-.account__userpreference__setting__notification__table__line:nth-last-child(1)
152
-  border-bottom 0
153
-
154
-
155
 /***** MEDIAQUERIES *****/
147
 /***** MEDIAQUERIES *****/
156
 
148
 
157
-
158
 /**** MEDIA 576px & 1199px ****/
149
 /**** MEDIA 576px & 1199px ****/
159
 
150
 
160
 // Regroup the common rules
151
 // Regroup the common rules
260
         border-radius 0
251
         border-radius 0
261
         padding 10px 0
252
         padding 10px 0
262
         width 100%
253
         width 100%
263
-        &__calendar
254
+        .personaldata
255
+          &__form
256
+            margin-left 10px
257
+        .calendar
264
           &__link
258
           &__link
265
             padding 10px 15px
259
             padding 10px 15px
266
-        &__notification
267
-          &__tableau
260
+        .notification
261
+          &__table
268
             &__wksname
262
             &__wksname
269
               text-overflow ellipsis
263
               text-overflow ellipsis
270
               white-space nowrap
264
               white-space nowrap
271
               overflow hidden
265
               overflow hidden
272
-              width 100px
266
+              width 310px
273
               &:focus
267
               &:focus
274
                 overflow visible
268
                 overflow visible
275
                 width auto
269
                 width auto

+ 2 - 2
src/css/Folder.styl View File

53
     &:hover
53
     &:hover
54
       background-color folder-hover
54
       background-color folder-hover
55
       .folder__header__triangleborder__triangle
55
       .folder__header__triangleborder__triangle
56
-        border-color hover-folder transparent transparent transparent
56
+        border-color folder-hover transparent transparent transparent
57
     &__triangleborder
57
     &__triangleborder
58
       display none
58
       display none
59
       position absolute
59
       position absolute
60
-      top 62px
60
+      top 61px
61
       left -1px
61
       left -1px
62
       border-style solid
62
       border-style solid
63
       border-width 25px 30px 0 30px
63
       border-width 25px 30px 0 30px

+ 26 - 0
src/css/Generic.styl View File

161
       border 1px solid grey
161
       border 1px solid grey
162
       border-radius 10px
162
       border-radius 10px
163
       padding 15px 25px
163
       padding 15px 25px
164
+
165
+
166
+/***** EDITION MODE  ******/
167
+
168
+.editiontitle
169
+  width 60%
170
+
171
+.editionmode
172
+  display flex
173
+  flex-direction column
174
+  align-items center
175
+  &__text
176
+    margin-bottom 25px
177
+    width 100%
178
+    height 400px
179
+  &__submit
180
+    border 1px solid blue
181
+    box-shadow none
182
+    border-radius 10px
183
+    padding 8px 45px
184
+    background-color transparent
185
+    color blue
186
+    &:hover, &:focus
187
+      background-color blue
188
+      color off-white
189
+

+ 0 - 277
src/css/PagePreview.styl View File

1
-.wsFilePreview
2
-  width 1200px
3
-  height calc(100% - 85px)
4
-  &__header
5
-    background-color previewColor
6
-    .fa-file-image-o
7
-      color white
8
-  &__option
9
-    &__menu
10
-      display flex
11
-      &__addversion
12
-        padding 8px 15px
13
-        border 1px solid previewColor
14
-        border-radius 5px
15
-        background-color transparent
16
-        color previewColor
17
-        cursor pointer
18
-        & > i
19
-          margin-left 10px
20
-        &:hover
21
-          background-color previewColor
22
-          border none
23
-          color white
24
-  &__contentpage
25
-    display flex
26
-    height 100%
27
-    &__visualizer
28
-      position relative
29
-      margin 10px
30
-      border-radius 10px
31
-      width 70%
32
-      height calc(100% - 150px)
33
-      background-color off-white
34
-      &__sidebar
35
-        position absolute
36
-        top 0
37
-        right 0
38
-        width 50px
39
-        height 100%
40
-        transition width 1s ease
41
-        &__visiblepart
42
-          display flex
43
-          flex-direction column
44
-          align-items center
45
-          border-top-right-radius 10px
46
-          border-bottom-right-radius 10px
47
-          width 50px
48
-          height 100%
49
-          background-color grey
50
-          cursor pointer
51
-          &:hover
52
-            background-color previewColor
53
-          &__icon
54
-            justify-content flex-start
55
-            font-size 30px
56
-            color white
57
-          &__title
58
-            margin-top 45px
59
-            color white
60
-            transform rotate(-90deg)
61
-        &__propertydetail
62
-          display none
63
-      &__dloption
64
-        display flex
65
-        margin-left calc(50% - 50px) // 50px => width/2 of the div
66
-        padding-top 10px
67
-        width 100px
68
-        &__icon
69
-          margin-right 20px
70
-          font-size 20px
71
-          cursor pointer
72
-      &__slidecontainer
73
-        display flex
74
-        align-items center
75
-        width calc(100% - 50px) // 50px => width of sidebar
76
-        height calc(100% - 40px) // 40px => height of dloption
77
-        &__fileimg
78
-          display flex
79
-          padding 30px
80
-          width 100%
81
-          height 100%
82
-          & > img
83
-            max-height 100%
84
-            max-width 100%
85
-        &__chevron
86
-          margin 0 5px
87
-          font-size 20px
88
-          cursor pointer
89
-    .timeline
90
-      margin 10px
91
-      border-radius 10px
92
-      width 45%
93
-      height calc(100% - 150px)
94
-      background-color off-white
95
-      overflow scroll
96
-      &__header
97
-        border-top-left-radius 10px
98
-        border-top-right-radius 10px
99
-        padding 10px 0
100
-        text-align center
101
-        font-size 20px
102
-        color darkGrey
103
-        background-color grey-hover
104
-      &__messagelist
105
-        min-height 300px
106
-        &__item
107
-          &__content
108
-            color darkGrey
109
-        &__version
110
-          margin-top 40px
111
-          background-color grey-hover
112
-          &__btn
113
-            padding 5px 25px
114
-            border-radius 5px
115
-            width 145px
116
-            color white
117
-            font-size 17px
118
-            background-color previewColor
119
-            & > i
120
-              margin-right 10px
121
-              color darkGrey
122
-              font-size 22px
123
-            &:hover
124
-              background-color lightPreviewColor
125
-            &:focus
126
-              background-color lightPreviewColor
127
-          &__date
128
-            color fontColor
129
-            font-size 17px
130
-      &__texteditor
131
-        &__simpletext
132
-          &__input
133
-            &:focus
134
-              color htmlColor
135
-              border-color htmlColor
136
-        &__submit
137
-          &__btn
138
-            border-color htmlColor
139
-            background-color htmlColor
140
-            color white
141
-            &:hover
142
-              border-color htmlColor
143
-              background-color htmlColor
144
-            &:focus
145
-              border-color htmlColor
146
-              background-color htmlColor
147
-
148
-/***** SENDER RECEIVER *****/
149
-
150
-.received
151
-  .wsFilePreview__contentpage__messagelist__item__content
152
-      background-color previewColor
153
-
154
-/***** ACTIVE SIDEBAR *****/
155
-
156
-.activesidebar
157
-  .wsFilePreview__contentpage__visualizer
158
-    &__sidebar
159
-      display flex
160
-      border-top-right-radius 10px
161
-      border-bottom-right-radius 10px
162
-      width 500px
163
-      background-color off-white
164
-      &__visiblepart
165
-        order 1
166
-        border-top-left-radius 10px
167
-        border-bottom-left-radius 10px
168
-        border-top-right-radius 0
169
-        border-bottom-right-radius 0
170
-        background-color previewColor
171
-      &__propertydetail
172
-        display flex
173
-        order 2
174
-        padding 20px
175
-        overflow-Y auto
176
-        color previewColor
177
-
178
-/****** MEDIA QUERIES ********/
179
-
180
-@media (min-width: max-xs) and (max-width: max-lg)
181
-
182
-  .wsFilePreview
183
-    overflow-Y auto
184
-    &__contentpage
185
-      display block
186
-      &__visualizer
187
-        display flex
188
-        flex-direction column
189
-        width calc(100% - 30px) // 20px => margin
190
-      .timeline
191
-        width calc(100% - 30px) // 20px => margin
192
-        &__texteditor
193
-          &__simpletext
194
-            display inline-flex
195
-            display ms-inline-flex
196
-            width 60%
197
-          &__submit
198
-            display inline-flex
199
-            display ms-inline-flex
200
-            margin 10px 0
201
-            &__btn
202
-              display flex
203
-              margin-left 35px
204
-              &__icon
205
-                margin-left 15px
206
-
207
-/**** MEDIA 992px & 1199px ****/
208
-
209
-@media (min-width: min-lg) and (max-width: max-lg)
210
-
211
-  .wsFilePreview
212
-    width 900px
213
-    overflow-Y auto
214
-
215
-/******************************/
216
-
217
-/**** MEDIA 768px & 991px ****/
218
-
219
-@media (min-width: min-md) and (max-width: max-md)
220
-
221
-  .wsFilePreview
222
-    width 100%
223
-
224
-/******************************/
225
-
226
-/**** MEDIA 576px & 767px ****/
227
-
228
-@media (min-width: min-sm) and (max-width: max-sm)
229
-
230
-  .wsFilePreview
231
-    top 69px
232
-    width 100%
233
-    height calc(100% - 69px)
234
-    overflow-Y scroll
235
-
236
-/******************************/
237
-
238
-/**** MEDIA 575px ****/
239
-
240
-@media (max-width: max-xs)
241
-
242
-  .activesidebar
243
-    .wsFilePreview__contentpage__visualizer
244
-      &__sidebar
245
-        width 350px
246
-
247
-  .wsFilePreview
248
-    top 69px
249
-    width 100%
250
-    height calc(100% - 69px)
251
-    overflow-Y scroll
252
-    &__option__menu__addversion
253
-        padding 8px 5px
254
-        & > i
255
-          display none
256
-    &__contentpage
257
-      display block
258
-      &__visualizer
259
-        display flex
260
-        flex-direction column
261
-        width calc(100% - 30px) // 20px => margin
262
-      .timeline
263
-        width calc(100% - 30px) // 20px => margin
264
-        &__texteditor
265
-          &__simpletext
266
-            display inline-flex
267
-            display ms-inline-flex
268
-            width 60%
269
-          &__submit
270
-            display inline-flex
271
-            display ms-inline-flex
272
-            margin 10px 0
273
-            &__btn
274
-              display flex
275
-              margin-left 35px
276
-              &__icon
277
-                margin-left 15px

+ 3 - 2
src/css/index.styl View File

25
 @import 'AccountPage.styl'
25
 @import 'AccountPage.styl'
26
 @import 'btnSwtich.styl'
26
 @import 'btnSwtich.styl'
27
 
27
 
28
-// @import 'UploadPopup'
29
-// @import 'ProgressBar'
28
+@import 'UploadPopup'
29
+@import 'ProgressBar'
30
+

+ 20 - 1
src/plugin/ContentType/PageHtml/PageHtml.styl View File

6
   overflow-Y auto
6
   overflow-Y auto
7
   &__header
7
   &__header
8
     background-color htmlColor
8
     background-color htmlColor
9
+    &__editionmode
10
+      display none
9
     &__icon
11
     &__icon
10
       .fa-file-word-o
12
       .fa-file-word-o
11
         color white
13
         color white
21
         opacity 0.7
23
         opacity 0.7
22
       &__text
24
       &__text
23
         font-size 14px
25
         font-size 14px
26
+      &__edition
27
+        display none
24
     &__messagelist
28
     &__messagelist
25
       min-height 300px
29
       min-height 300px
26
       &__item
30
       &__item
72
 
76
 
73
 .received
77
 .received
74
   .wsFilePageHtml__contentpage__messagelist__item__content
78
   .wsFilePageHtml__contentpage__messagelist__item__content
75
-      background-color htmlColor
79
+    background-color htmlColor
80
+
81
+.activeEditionTitle
82
+  .wsFilePageHtml
83
+    &__header
84
+      &__editionmode
85
+        display block
86
+      &__title
87
+        display none
88
+
89
+.activeEditionText
90
+  .wsFilePageHtml__contentpage__textnote
91
+    &__edition
92
+      display flex
93
+    &__text
94
+      display none
76
 
95
 
77
 @media (min-width: max-xs) and (max-width: max-lg)
96
 @media (min-width: max-xs) and (max-width: max-lg)
78
   .wsFilePageHtml
97
   .wsFilePageHtml

+ 5 - 0
src/plugin/ContentType/PageHtml/PageHtmlComponent.jsx View File

5
     <div className='wsFilePageHtml__contentpage__textnote'>
5
     <div className='wsFilePageHtml__contentpage__textnote'>
6
       <div className='wsFilePageHtml__contentpage__textnote__latestversion' dangerouslySetInnerHTML={{__html: props.version}} />
6
       <div className='wsFilePageHtml__contentpage__textnote__latestversion' dangerouslySetInnerHTML={{__html: props.version}} />
7
       <div className='wsFilePageHtml__contentpage__textnote__text' dangerouslySetInnerHTML={{__html: props.text}} />
7
       <div className='wsFilePageHtml__contentpage__textnote__text' dangerouslySetInnerHTML={{__html: props.text}} />
8
+
9
+      <form className='wsFilePageHtml__contentpage__textnote__edition editionmode'>
10
+        <textarea className='wsFilePageHtml__contentpage__textnote__edition__text editionmode__text' />
11
+        <input type='submit' className='wsFilePageHtml__contentpage__textnote__edition__submit editionmode__submit' value='Valider' />
12
+      </form>
8
     </div>
13
     </div>
9
   )
14
   )
10
 }
15
 }

+ 13 - 0
src/plugin/ContentType/Thread/Thread.styl View File

3
   &__header
3
   &__header
4
     color white
4
     color white
5
     background-color threadColor
5
     background-color threadColor
6
+    &__editionmode
7
+      display none
8
+    &__icon
9
+      .fa-comments-o
10
+        color white
6
   &__wrapper
11
   &__wrapper
7
     height calc(100% - 209px) /* height of chat__header + height of option + top of chat */
12
     height calc(100% - 209px) /* height of chat__header + height of option + top of chat */
8
   &__messagelist
13
   &__messagelist
25
       background-color darkBlue
30
       background-color darkBlue
26
       color white
31
       color white
27
 
32
 
33
+.activeEditionTitle
34
+  .wsFileThread
35
+    &__header
36
+      &__editionmode
37
+        display block
38
+      &__title
39
+        display none
40
+
28
 @media (min-width: max-xs) and (max-width: max-lg)
41
 @media (min-width: max-xs) and (max-width: max-lg)
29
   .wsContentThread
42
   .wsContentThread
30
     &__texteditor
43
     &__texteditor