Browse Source

ux - improve user experience in case of empty database

Damien ACCORSI 10 years ago
parent
commit
901a98ad0f

+ 17 - 2
tracim/tracim/templates/dashboard.mak View File

@@ -9,10 +9,10 @@
9 9
     <div class="row-fluid">
10 10
         <div>
11 11
             <div class="row">
12
-                <h1 class="col-sm-6 col-sm-offset-3 text-center">${TIM.ICO(32, 'status/dialog-information')} ${_("Welcome to your dashboard")}</h1>
12
+                <h1 class="col-sm-6 col-sm-offset-3">${TIM.ICO(32, 'status/dialog-information')} ${_("Dashboard")}</h1>
13 13
             </div>
14 14
             <div class="row">
15
-                <div class="col-sm-5 col-sm-offset-4">
15
+                <div class="col-sm-5 col-sm-offset-3">
16 16
                     <div class="well">
17 17
                         <h2 style="margin-top: 0;">${_('What to do ?')}</h2>
18 18
                         <h3>
@@ -24,6 +24,21 @@
24 24
                     </div>
25 25
                 </div>
26 26
             </div>
27
+            % if fake_api.current_user.profile.id >= 2:
28
+                <div class="row">
29
+                    <div class="col-sm-5 col-sm-offset-3">
30
+                        <div class="well">
31
+                            <h2 style="margin-top: 0;">${_('You can also manage...')}</h2>
32
+                            <h3>
33
+                                ${TIM.ICO(32, 'apps/system-users')} <a href="${tg.url('/admin/users')}">${_('Users')}</a>
34
+                            </h3>
35
+                            <h3>
36
+                                ${TIM.ICO(32, 'places/folder-remote')} <a href="${tg.url('/admin/workspaces')}">${_('Workspaces')}</a>
37
+                            </h3>
38
+                        </div>
39
+                    </div>
40
+                </div>
41
+            % endif
27 42
         </div>
28 43
     </div>
29 44
 </div>

+ 8 - 1
tracim/tracim/templates/user_workspace_get_one.mak View File

@@ -60,5 +60,12 @@
60 60
 <p>
61 61
     ${WIDGETS.FOLDER_LIST('subfolder-list', result.workspace.id, fake_api.current_workspace_folders)}
62 62
 </p>
63
-
63
+% if len(fake_api.current_workspace_folders)<=0 and fake_api.current_user:
64
+    % if h.user_role(fake_api.current_user, result.workspace)>2: # User must be a content manager to be allowed to create folders
65
+        <p>
66
+            ${_('You need folders to organize your content.')}
67
+            <a class="btn btn-small btn-primary" data-toggle="collapse" data-target="#folder-new"><i class="fa fa-check"></i> <b>${_('Create a folder now')}</b></a>
68
+        </p>
69
+    % endif
70
+% endif
64 71
 

+ 8 - 8
tracim/tracim/templates/user_workspace_widgets.mak View File

@@ -168,11 +168,6 @@
168 168
                             },
169 169
                             'success': function (new_data) {
170 170
                                 console.log('loaded new menu data' + new_data)
171
-                                console.log(new_data);
172
-
173
-                                for (var i = new_data['d'].length; i--;) {
174
-                                    // prepareOrRemoveTreeNode(null, new_data['d'][i], new_data['d'], shouldRemoveNodeDoneCallBack);
175
-                                }
176 171
                                 return new_data;
177 172
                             },
178 173
                         },
@@ -201,11 +196,16 @@
201 196
                 % endif
202 197
                 
203 198
                 $('#${dom_id}-treeview').on("loaded.jstree", function () {
204
-                    nodes = $('#left-sidebar-treeview .jstree-node');
199
+                    nodes = $('#${dom_id}-treeview .jstree-node');
205 200
                     console.log("nodes = "+nodes.length);
206 201
                     if (nodes.length<=0) {
207
-                        $("#left-sidebar-treeview").append( "<p class='pod-grey'>${_('There is no content yet.')|n}" );
208
-                        $("#left-sidebar-treeview").append( "<p><a class=\"btn btn-success\" data-toggle=\"modal\" role=\"button\" href=\"#add-document-modal-form\"><i class=\"fa fa-plus\"></i> ${_('Create a topic')}</a></p>" );
202
+                        ## TODO - D.A. - 2014-11-06 - Parameterize the fake_api.current_user access
203
+                        $("#${dom_id}-treeview").append( "<p class='pod-grey'>${_('You have no workspace.')|n}" );
204
+                        % if fake_api.current_user.profile.id >= 2:
205
+                            $("#${dom_id}-treeview").append( "<p><a class=\"btn btn-success\" href=\"${tg.url('/admin/workspaces')}\" ><i class=\"fa fa-plus\"></i> ${_('Create a workspace')}</a></p>" );
206
+                        % else:
207
+                            $("#${dom_id}-treeview").append( "<p class=\"alert alert-info\"><b>${_('Contact the administrator.')}</b></p>" );
208
+                        % endif
209 209
                     }
210 210
                 });
211 211
             });