Browse Source

merge alexicauvin into plugin_external

Skylsmoi 7 years ago
parent
commit
eacf270398

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

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

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

@@ -13,6 +13,10 @@ const PopinFixedHeader = props => {
13 13
         {props.name}
14 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 20
       <div className={classnames('wsFileGeneric__header__edittitle', `${props.customClass}__header__changetitle`)}>
17 21
         <i className='fa fa-pencil' />
18 22
       </div>

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

@@ -69,33 +69,33 @@ class AccountPage extends Component {
69 69
             <div className='account__userpreference__setting'>
70 70
 
71 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 73
                   Mes informations personnelles
74 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 77
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
78 78
                   Ut consectetur dolor et sunt nisi officia ut magna.
79 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 83
                     Changer le mot de passe :
84 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 88
                     Envoyer
89 89
                   </div>
90 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 94
                     Changer d'adresse mail :
95 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 99
                     Envoyer
100 100
                   </div>
101 101
                 </div>
@@ -103,34 +103,34 @@ class AccountPage extends Component {
103 103
 
104 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 107
                   Calendrier
108 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 111
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
112 112
                   Ut consectetur dolor et sunt nisi officia ut magna.
113 113
                 </div>
114 114
 
115
-                <div className='account__userpreference__setting__calendar__infotitle'>
115
+                <div className='calendar__title ml-2 ml-sm-0'>
116 116
                   Accèder à votre Calendrier personnel
117 117
                 </div>
118
-                <div className='account__userpreference__setting__calendar__link'>
118
+                <div className='calendar__link ml-2 ml-sm-0'>
119 119
                   http://algoo.trac.im/caldav/user/262.ics/
120 120
                 </div>
121 121
 
122
-                <div className='account__userpreference__setting__calendar__infotitle'>
122
+                <div className='calendar__title ml-2 ml-sm-0'>
123 123
                   Changer de Fuseau Horaire :
124 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 128
                     Fuseau Horaire
129 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 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 134
                     </div>
135 135
                   </div>
136 136
                 </div>
@@ -138,16 +138,16 @@ class AccountPage extends Component {
138 138
 
139 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 142
                   Mes Espaces de Travail
143 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 146
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
147 147
                   Ut consectetur dolor et sunt nisi officia ut magna.
148 148
                 </div>
149 149
 
150
-                <div className='account__userpreference__setting__notification__tableau'>
150
+                <div className='notification__table'>
151 151
                   <table className='table'>
152 152
                     <thead>
153 153
                       <tr>
@@ -159,154 +159,154 @@ class AccountPage extends Component {
159 159
                     <tbody>
160 160
                       <tr>
161 161
                         <td>
162
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
162
+                          <div className='notification__table__wksname'>
163 163
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
164 164
                           </div>
165 165
                         </td>
166 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 169
                               <i className='fa fa-graduation-cap' />
170 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 172
                               Gestionnaire de Contenu
173 173
                             </div>
174 174
                           </div>
175 175
                         </td>
176 176
                         <td>
177
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
177
+                          <div className='notification__table__btnswitch'>
178 178
                             <BtnSwitch />
179 179
                           </div>
180 180
                         </td>
181 181
                       </tr>
182 182
                       <tr>
183 183
                         <td>
184
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
184
+                          <div className='notification__table__wksname'>
185 185
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
186 186
                           </div>
187 187
                         </td>
188 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 191
                               <i className='fa fa-eye' />
192 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 194
                               Lecteur
195 195
                             </div>
196 196
                           </div>
197 197
                         </td>
198 198
                         <td>
199
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
199
+                          <div className='notification__table__btnswitch'>
200 200
                             <BtnSwitch />
201 201
                           </div>
202 202
                         </td>
203 203
                       </tr>
204 204
                       <tr>
205 205
                         <td>
206
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
206
+                          <div className='notification__table__wksname'>
207 207
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
208 208
                           </div>
209 209
                         </td>
210 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 213
                               <i className='fa fa-pencil' />
214 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 216
                               Contributeur
217 217
                             </div>
218 218
                           </div>
219 219
                         </td>
220 220
                         <td>
221
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
221
+                          <div className='notification__table__btnswitch'>
222 222
                             <BtnSwitch />
223 223
                           </div>
224 224
                         </td>
225 225
                       </tr>
226 226
                       <tr>
227 227
                         <td>
228
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
228
+                          <div className='notification__table__wksname'>
229 229
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
230 230
                           </div>
231 231
                         </td>
232 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 235
                               <i className='fa fa-gavel' />
236 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 238
                               Responsable
239 239
                             </div>
240 240
                           </div>
241 241
                         </td>
242 242
                         <td>
243
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
243
+                          <div className='notification__table__btnswitch'>
244 244
                             <BtnSwitch />
245 245
                           </div>
246 246
                         </td>
247 247
                       </tr>
248 248
                       <tr>
249 249
                         <td>
250
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
250
+                          <div className='notification__table__wksname'>
251 251
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
252 252
                           </div>
253 253
                         </td>
254 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 257
                               <i className='fa fa-graduation-cap' />
258 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 260
                               Gestionnaire de Contenu
261 261
                             </div>
262 262
                           </div>
263 263
                         </td>
264 264
                         <td>
265
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
265
+                          <div className='notification__table__btnswitch'>
266 266
                             <BtnSwitch />
267 267
                           </div>
268 268
                         </td>
269 269
                       </tr>
270 270
                       <tr>
271 271
                         <td>
272
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
272
+                          <div className='notification__table__wksname'>
273 273
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
274 274
                           </div>
275 275
                         </td>
276 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 279
                               <i className='fa fa-graduation-cap' />
280 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 282
                               Gestionnaire de Contenu
283 283
                             </div>
284 284
                           </div>
285 285
                         </td>
286 286
                         <td>
287
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
287
+                          <div className='notification__table__btnswitch'>
288 288
                             <BtnSwitch />
289 289
                           </div>
290 290
                         </td>
291 291
                       </tr>
292 292
                       <tr>
293 293
                         <td>
294
-                          <div className='account__userpreference__setting__notification__tableau__wksname'>
294
+                          <div className='notification__table__wksname'>
295 295
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
296 296
                           </div>
297 297
                         </td>
298 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 301
                               <i className='fa fa-graduation-cap' />
302 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 304
                               Gestionnaire de Contenu
305 305
                             </div>
306 306
                           </div>
307 307
                         </td>
308 308
                         <td>
309
-                          <div className='account__userpreference__setting__notification__tableau__btnswitch'>
309
+                          <div className='notification__table__btnswitch'>
310 310
                             <BtnSwitch />
311 311
                           </div>
312 312
                         </td>

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

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

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

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

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

@@ -161,3 +161,29 @@
161 161
       border 1px solid grey
162 162
       border-radius 10px
163 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,277 +0,0 @@
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,5 +25,6 @@ html, body, #content, #content > div
25 25
 @import 'AccountPage.styl'
26 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,6 +6,8 @@
6 6
   overflow-Y auto
7 7
   &__header
8 8
     background-color htmlColor
9
+    &__editionmode
10
+      display none
9 11
     &__icon
10 12
       .fa-file-word-o
11 13
         color white
@@ -21,6 +23,8 @@
21 23
         opacity 0.7
22 24
       &__text
23 25
         font-size 14px
26
+      &__edition
27
+        display none
24 28
     &__messagelist
25 29
       min-height 300px
26 30
       &__item
@@ -72,7 +76,22 @@
72 76
 
73 77
 .received
74 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 96
 @media (min-width: max-xs) and (max-width: max-lg)
78 97
   .wsFilePageHtml

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

@@ -5,6 +5,11 @@ const PageHtml = props => {
5 5
     <div className='wsFilePageHtml__contentpage__textnote'>
6 6
       <div className='wsFilePageHtml__contentpage__textnote__latestversion' dangerouslySetInnerHTML={{__html: props.version}} />
7 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 13
     </div>
9 14
   )
10 15
 }

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

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