Download as
Browse Code »

Commit cab7d7686f6c11bd77564eb73abd85fb9f61c58e

Authored by Dmitriy Zaporozhets
1 parent 304baaf8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Help#permissions improved

Showing 3 changed files with 82 additions and 75 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @cab7d76
... ... @@ -361,3 +361,10 @@ img.emoji {
361 361 font-size: 14px;
362 362 line-height: 24px;
363 363 }
  364 +
  365 +table {
  366 + td.permission-x {
  367 + background: #D9EDF7 !important;
  368 + text-align: center;
  369 + }
  370 +}
... ...
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @cab7d76
1 1 /** COLORS **/
2   -.cgray { color:gray }
3   -.cred { color:#D12F19 }
4   -.cgreen { color:#4a2 }
5   -.cblue { color:#29A }
6   -.cblack { color:#111 }
7   -.cdark { color:#444 }
8   -.cwhite { color:#fff!important }
9   -.bgred { background:#F2DEDE!important }
  2 +.cgray { color: gray }
  3 +.cred { color: #D12F19 }
  4 +.cgreen { color: #4a2 }
  5 +.cblue { color: #29A }
  6 +.cblack { color: #111 }
  7 +.cdark { color: #444 }
  8 +.cwhite { color: #fff!important }
  9 +.bgred { background: #F2DEDE!important }
10 10  
11 11 /** COMMON CLASSES **/
12 12 .left { float:left }
... ...
app/views/help/permissions.html.haml
  Diff comments   View file @cab7d76
1 1 = render layout: 'help/layout' do
2 2 %h3.page-title Permissions
3 3  
4   - %table
  4 + %table.table
5 5 %thead
6 6 %tr
7   - %td
8   - %td Guest
9   - %td Reporter
10   - %td Developer
11   - %td Master
12   - %td Owner
  7 + %th Action
  8 + %th Guest
  9 + %th Reporter
  10 + %th Developer
  11 + %th Master
  12 + %th Owner
13 13 %tbody
14 14 %tr
15 15 %td Create new issue
16   - %td X
17   - %td X
18   - %td X
19   - %td X
20   - %td
  16 + %td.permission-x ✓
  17 + %td.permission-x ✓
  18 + %td.permission-x ✓
  19 + %td.permission-x ✓
  20 + %td.permission-x ✓
21 21 %tr
22 22 %td Leave comments
23   - %td X
24   - %td X
25   - %td X
26   - %td X
27   - %td
  23 + %td.permission-x ✓
  24 + %td.permission-x ✓
  25 + %td.permission-x ✓
  26 + %td.permission-x ✓
  27 + %td.permission-x ✓
28 28 %tr
29 29 %td Write on project wall
30   - %td X
31   - %td X
32   - %td X
33   - %td X
34   - %td
  30 + %td.permission-x ✓
  31 + %td.permission-x ✓
  32 + %td.permission-x ✓
  33 + %td.permission-x ✓
  34 + %td.permission-x ✓
35 35 %tr
36 36 %td Pull project code
37 37 %td
38   - %td X
39   - %td X
40   - %td X
41   - %td
  38 + %td.permission-x ✓
  39 + %td.permission-x ✓
  40 + %td.permission-x ✓
  41 + %td.permission-x ✓
42 42 %tr
43 43 %td Download project
44 44 %td
45   - %td X
46   - %td X
47   - %td X
48   - %td
  45 + %td.permission-x ✓
  46 + %td.permission-x ✓
  47 + %td.permission-x ✓
  48 + %td.permission-x ✓
49 49 %tr
50 50 %td Create code snippets
51 51 %td
52   - %td X
53   - %td X
54   - %td X
55   - %td
  52 + %td.permission-x ✓
  53 + %td.permission-x ✓
  54 + %td.permission-x ✓
  55 + %td.permission-x ✓
56 56 %tr
57 57 %td Create new merge request
58 58 %td
59 59 %td
60   - %td X
61   - %td X
62   - %td
  60 + %td.permission-x ✓
  61 + %td.permission-x ✓
  62 + %td.permission-x ✓
63 63 %tr
64 64 %td Create new branches
65 65 %td
66 66 %td
67   - %td X
68   - %td X
69   - %td
  67 + %td.permission-x ✓
  68 + %td.permission-x ✓
  69 + %td.permission-x ✓
70 70 %tr
71 71 %td Push to non-protected branches
72 72 %td
73 73 %td
74   - %td X
75   - %td X
76   - %td
  74 + %td.permission-x ✓
  75 + %td.permission-x ✓
  76 + %td.permission-x ✓
77 77 %tr
78 78 %td Remove non-protected branches
79 79 %td
80 80 %td
81   - %td X
82   - %td X
83   - %td
  81 + %td.permission-x ✓
  82 + %td.permission-x ✓
  83 + %td.permission-x ✓
84 84 %tr
85 85 %td Add tags
86 86 %td
87 87 %td
88   - %td X
89   - %td X
90   - %td
  88 + %td.permission-x ✓
  89 + %td.permission-x ✓
  90 + %td.permission-x ✓
91 91 %tr
92 92 %td Write a wiki
93 93 %td
94 94 %td
95   - %td X
96   - %td X
97   - %td
  95 + %td.permission-x ✓
  96 + %td.permission-x ✓
  97 + %td.permission-x ✓
98 98 %tr
99 99 %td Add new team members
100 100 %td
101 101 %td
102 102 %td
103   - %td X
104   - %td
  103 + %td.permission-x ✓
  104 + %td.permission-x ✓
105 105 %tr
106 106 %td Push to protected branches
107 107 %td
108 108 %td
109 109 %td
110   - %td X
111   - %td
  110 + %td.permission-x ✓
  111 + %td.permission-x ✓
112 112 %tr
113 113 %td Remove protected branches
114 114 %td
115 115 %td
116 116 %td
117   - %td X
118   - %td
  117 + %td.permission-x ✓
  118 + %td.permission-x ✓
119 119 %tr
120 120 %td Edit project
121 121 %td
122 122 %td
123 123 %td
124   - %td X
125   - %td
  124 + %td.permission-x ✓
  125 + %td.permission-x ✓
126 126 %tr
127 127 %td Add Deploy Keys to project
128 128 %td
129 129 %td
130 130 %td
131   - %td X
132   - %td
  131 + %td.permission-x ✓
  132 + %td.permission-x ✓
133 133 %tr
134 134 %td Configure Project Hooks
135 135 %td
136 136 %td
137 137 %td
138   - %td X
139   - %td
  138 + %td.permission-x ✓
  139 + %td.permission-x ✓
140 140 %tr
141 141 %td Switch public mode
142 142 %td
143 143 %td
144 144 %td
145 145 %td
146   - %td X
  146 + %td.permission-x ✓
147 147 %tr
148 148 %td Transfer project to another namespace
149 149 %td
150 150 %td
151 151 %td
152 152 %td
153   - %td X
  153 + %td.permission-x ✓
154 154 %tr
155 155 %td Remove project
156 156 %td
157 157 %td
158 158 %td
159 159 %td
160   - %td X
  160 + %td.permission-x ✓
... ...