Просмотр исходного кода

https://github.com/tracim/tracim/issues/726, removing createworkspace button, removing calendar column, improvement the text

AlexiCauvin 6 лет назад
Родитель
Сommit
4712bb1ec3
2 измененных файлов: 80 добавлений и 64 удалений
  1. 75 62
      frontend/src/container/AdminWorkspacePage.jsx
  2. 5 2
      frontend/src/css/AdminWorkspacePage.styl

+ 75 - 62
frontend/src/container/AdminWorkspacePage.jsx Просмотреть файл

@@ -1,5 +1,4 @@
1 1
 import React from 'react'
2
-import PropTypes from 'prop-types'
3 2
 import Sidebar from './Sidebar.jsx'
4 3
 import {
5 4
   Delimiter,
@@ -27,98 +26,116 @@ class AdminWorkspacePage extends React.Component {
27 26
               This page informs all workspaces of the instances
28 27
             </div>
29 28
 
30
-            <div className='adminWorkspacePage__createworkspace'>
31
-              <button className='adminWorkspacePage__createworkspace__btncreate btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover'>
32
-                {this.props.t('Create a workspace')}
33
-              </button>
34
-            </div>
29
+            { /*
30
+              Alexi Cauvin 08/08/2018 => desactivate create workspace button due to redundancy
31
+
32
+              <div className='adminWorkspacePage__createworkspace'>
33
+                <button className='adminWorkspacePage__createworkspace__btncreate btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover'>
34
+                  {this.props.t('Create a workspace')}
35
+                </button>
36
+              </div>
37
+            */ }
35 38
 
36 39
             <Delimiter customClass={'adminWorkspacePage__delimiter'} />
37 40
 
38 41
             <div className='adminWorkspacePage__workspaceTable'>
39 42
 
40
-              <table class='table'>
43
+              <table className='table'>
41 44
                 <thead>
42 45
                   <tr>
43
-                    <th scope='col'># ID</th>
46
+                    <th scope='col'>ID</th>
44 47
                     <th scope='col'>Workspace</th>
45 48
                     <th scope='col'>Description</th>
46
-                    <th scope='col'>Users</th>
47
-                    <th scope='col'>Calendar</th>
49
+                    <th scope='col'>Member's number</th>
50
+                    { /*
51
+                      <th scope='col'>Calendar</th>
52
+                    */ }
48 53
                   </tr>
49 54
                 </thead>
50 55
                 <tbody>
51 56
                   <tr>
52
-                    <th>#1</th>
57
+                    <th>1</th>
53 58
                     <td>Design v_2</td>
54 59
                     <td>Workspace about tracim v2 design</td>
55
-                    <td>8 users</td>
56
-                    <td className='d-flex align-items-center flex-wrap'>
57
-                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
58
-                        <i className='fa fa-fw fa-check-square-o' />
59
-                      </div>
60
-                      Enable
61
-                    </td>
60
+                    <td>8 members</td>
61
+                    { /*
62
+                      <td className='d-flex align-items-center flex-wrap'>
63
+                        <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
64
+                          <i className='fa fa-fw fa-check-square-o' />
65
+                        </div>
66
+                        Enable
67
+                      </td>
68
+                    */ }
62 69
                   </tr>
63 70
                   <tr>
64
-                    <th>#2</th>
71
+                    <th>2</th>
65 72
                     <td>New features</td>
66 73
                     <td>Add a new features : Annotated files</td>
67
-                    <td>5 users</td>
68
-                    <td className='d-flex align-items-center flex-wrap'>
69
-                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
70
-                        <i className='fa fa-fw fa-square-o' />
71
-                      </div>
72
-                      Disable
73
-                    </td>
74
+                    <td>5 members</td>
75
+                    { /*
76
+                      <td className='d-flex align-items-center flex-wrap'>
77
+                        <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
78
+                          <i className='fa fa-fw fa-square-o' />
79
+                        </div>
80
+                        Disable
81
+                      </td>
82
+                    */ }
74 83
                   </tr>
75 84
                   <tr>
76
-                    <th>#3</th>
85
+                    <th>3</th>
77 86
                     <td>Fix Backend</td>
78 87
                     <td>workspace referring to multiple issues on the backend </td>
79
-                    <td>3 users</td>
80
-                    <td className='d-flex align-items-center flex-wrap'>
81
-                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
82
-                        <i className='fa fa-fw fa-check-square-o' />
83
-                      </div>
84
-                      Enable
85
-                    </td>
88
+                    <td>3 members</td>
89
+                    { /*
90
+                      <td className='d-flex align-items-center flex-wrap'>
91
+                        <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
92
+                          <i className='fa fa-fw fa-check-square-o' />
93
+                        </div>
94
+                        Enable
95
+                      </td>
96
+                    */ }
86 97
                   </tr>
87 98
                   <tr>
88
-                    <th>#4</th>
99
+                    <th>4</th>
89 100
                     <td>Design v_2</td>
90 101
                     <td>Workspace about tracim v2 design</td>
91
-                    <td>8 users</td>
92
-                    <td className='d-flex align-items-center flex-wrap'>
93
-                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
94
-                        <i className='fa fa-fw fa-square-o' />
95
-                      </div>
96
-                      Disable
97
-                    </td>
102
+                    <td>8 members</td>
103
+                    { /*
104
+                      <td className='d-flex align-items-center flex-wrap'>
105
+                        <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
106
+                          <i className='fa fa-fw fa-square-o' />
107
+                        </div>
108
+                        Disable
109
+                      </td>
110
+                    */ }
98 111
                   </tr>
99 112
                   <tr>
100
-                    <th>#5</th>
113
+                    <th>5</th>
101 114
                     <td>New features</td>
102 115
                     <td>Add a new features : Annotated files</td>
103
-                    <td>5 users</td>
104
-                    <td className='d-flex align-items-center flex-wrap'>
105
-                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
106
-                        <i className='fa fa-fw fa-square-o' />
107
-                      </div>
108
-                      Disable
109
-                    </td>
116
+                    <td>5 members</td>
117
+                    { /*
118
+                      <td className='d-flex align-items-center flex-wrap'>
119
+                        <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
120
+                          <i className='fa fa-fw fa-square-o' />
121
+                        </div>
122
+                        Disable
123
+                      </td>
124
+                    */ }
110 125
                   </tr>
111 126
                   <tr>
112
-                    <th>#6</th>
127
+                    <th>6</th>
113 128
                     <td>Fix Backend</td>
114 129
                     <td>workspace referring to multiple issues on the backend </td>
115
-                    <td>3 users</td>
116
-                    <td className='d-flex align-items-center flex-wrap'>
117
-                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
118
-                        <i className='fa fa-fw fa-check-square-o' />
119
-                      </div>
120
-                      Enable
121
-                    </td>
130
+                    <td>3 members</td>
131
+                    { /*
132
+                      <td className='d-flex align-items-center flex-wrap'>
133
+                        <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
134
+                          <i className='fa fa-fw fa-check-square-o' />
135
+                        </div>
136
+                        Enable
137
+                      </td>
138
+                    */ }
122 139
                   </tr>
123 140
                 </tbody>
124 141
               </table>
@@ -131,8 +148,4 @@ class AdminWorkspacePage extends React.Component {
131 148
   }
132 149
 }
133 150
 
134
-AdminWorkspacePage.propTypes = {
135
-  availableApp: PropTypes.array.isRequired
136
-}
137
-
138 151
 export default translate()(AdminWorkspacePage)

+ 5 - 2
frontend/src/css/AdminWorkspacePage.styl Просмотреть файл

@@ -1,11 +1,14 @@
1
+.table th
2
+  vertical-align middle
3
+
1 4
 .adminWorkspacePage
2 5
   &__createworkspace
3 6
     &__btncreate
4 7
       margin 25px 15px
5 8
   &__description
6
-    margin 25px 15px
9
+    margin 25px 0
7 10
     font-size 20px
8 11
   &__delimiter
9
-    margin 25px auto 65px auto
12
+    margin 65px auto
10 13
   &__workspaceTable
11 14
     margin 25px 15px