Home Explore Help
Sign In
bux
/
tracim
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Closes #73: Déplacer menu admin en haut

Bastien Sevajol (Algoo) 8 years ago
parent
3b11ba1f46
commit
9082f3b91d
9 changed files with 18 additions and 21 deletions
Split View Show Diff Stats
  1. 0 1
      tracim/tracim/templates/admin/user_getall.mak
  2. 0 1
      tracim/tracim/templates/admin/user_getone.mak
  3. 0 1
      tracim/tracim/templates/admin/workspace_getall.mak
  4. 0 1
      tracim/tracim/templates/admin/workspace_getone.mak
  5. 0 3
      tracim/tracim/templates/home.mak
  6. 4 0
      tracim/tracim/templates/master_authenticated.mak
  7. 0 3
      tracim/tracim/templates/master_authenticated_left_treeview.mak
  8. 0 11
      tracim/tracim/templates/widgets/left_menu.mak
  9. 14 0
      tracim/tracim/templates/widgets/navbar_menu.mak

+ 0 - 1
tracim/tracim/templates/admin/user_getall.mak View File 

@@ -11,7 +11,6 @@
11 11 
 <%def name="title()">${_('Users')}</%def>
12 12
13 13 
 <%def name="SIDEBAR_LEFT_CONTENT()">
14 
-    ${LEFT_MENU.ADMIN('')}
15 14 
     ${LEFT_MENU.TREEVIEW('sidebar-left-menu', '__')}
16 15 
 </%def>
17 16

+ 0 - 1
tracim/tracim/templates/admin/user_getone.mak View File 

@@ -13,7 +13,6 @@
13 13
14 14 
 <%def name="SIDEBAR_LEFT_CONTENT()">
15 15 
     ## This is the default left sidebar implementation
16 
-    ${LEFT_MENU.ADMIN('')}
17 16 
     ${LEFT_MENU.TREEVIEW('sidebar-left-menu', '__')}
18 17 
 </%def>
19 18

+ 0 - 1
tracim/tracim/templates/admin/workspace_getall.mak View File 

@@ -10,7 +10,6 @@
10 10 
 <%def name="title()">${_('Workspaces')}</%def>
11 11
12 12 
 <%def name="SIDEBAR_LEFT_CONTENT()">
13 
-    ${LEFT_MENU.ADMIN('')}
14 13 
     ${LEFT_MENU.TREEVIEW('sidebar-left-menu', '__')}
15 14 
 </%def>
16 15

+ 0 - 1
tracim/tracim/templates/admin/workspace_getone.mak View File 

@@ -14,7 +14,6 @@
14 14
15 15 
 <%def name="SIDEBAR_LEFT_CONTENT()">
16 16 
     ## This is the default left sidebar implementation
17 
-    ${LEFT_MENU.ADMIN('')}
18 17 
     ${LEFT_MENU.TREEVIEW('sidebar-left-menu', '__')}
19 18 
 </%def>
20 19

+ 0 - 3
tracim/tracim/templates/home.mak View File 

@@ -25,9 +25,6 @@
25 25
26 26 
 <%def name="SIDEBAR_LEFT_CONTENT()">
27 27 
     ## This is the default left sidebar implementation
28 
-    % if fake_api.current_user.profile.id>2:
29 
-        ${LEFT_MENU.ADMIN('')}
30 
-    % endif
31 28 
     ${LEFT_MENU.TREEVIEW('sidebar-left-menu', '__')}
32 29 
 </%def>
33 30

+ 4 - 0
tracim/tracim/templates/master_authenticated.mak View File 

@@ -1,4 +1,5 @@
1 1 
 <%namespace name="TIM" file="tracim.templates.pod"/>
2 
+<%namespace name="NAVBAR_MENU" file="tracim.templates.widgets.navbar_menu"/>
2 3 
 <!DOCTYPE html>
3 4 
 <html>
4 5 
     <head>

@@ -107,6 +108,9 @@
107 108 
                 % if request.identity:
108 109 
                     <ul class="nav navbar-nav navbar-left">
109 110 
                         <li class="active"><a href="${tg.url('/home')}">${TIM.FA('fa-home fa-lg')} ${_('My Home')}</a></li>
111 
+                        % if fake_api.current_user.profile.id>2:
112 
+                            ${NAVBAR_MENU.ADMIN_ITEMS()}
113 
+                        % endif
110 114 
                     </ul>
111 115 
                 % endif
112 116

+ 0 - 3
tracim/tracim/templates/master_authenticated_left_treeview.mak View File 

@@ -4,9 +4,6 @@
4 4
5 5 
 <%def name="SIDEBAR_LEFT_CONTENT()">
6 6 
     ## This is the default left sidebar implementation
7 
-    % if fake_api.current_user.profile.id>2:
8 
-        ${LEFT_MENU.ADMIN('')}
9 
-    % endif
10 7 
     ${LEFT_MENU.TREEVIEW('sidebar-left-menu', '__')}
11 8 
 </%def>
12 9

+ 0 - 11
tracim/tracim/templates/widgets/left_menu.mak View File 

@@ -1,17 +1,6 @@
1 1 
 <%namespace name="OLD_WIDGETS" file="tracim.templates.user_workspace_widgets"/>
2 2 
 <%namespace name="ICON" file="tracim.templates.widgets.icon"/>
3 3
4 
-<%def name="ADMIN(css_classes='t-spacer-above')">
5 
-    <div class="${css_classes}">
6 
-        <h4 class="t-less-visible">${_('Admin')}</h4>
7 
-        <ul class="list-unstyled">
8 
-            <li><a href="${tg.url('/admin/users')}" >${ICON.FA('fa-user fa-fw')} ${_('Users')}</a></li>
9 
-            <li><a href="${tg.url('/admin/workspaces')}" >${ICON.FA('fa-bank fa-fw')} ${_('Workspaces')}</a></li>
10 
-        </ul>
11 
-    </div>
12 
-
13 
-</%def>
14 
-
15 4 
 <%def name="TREEVIEW(dom_id, selected_id='', uniq_workspace='0', css_classes='t-spacer-above')">
16 5 
     <div class="${css_classes}">
17 6 
         <h4 class="t-less-visible t-spacer-above">${_('Workspaces')}</h4>

+ 14 - 0
tracim/tracim/templates/widgets/navbar_menu.mak View File 

@@ -0,0 +1,14 @@
1 
+<%namespace name="ICON" file="tracim.templates.widgets.icon"/>
2 
+
3 
+<%def name="ADMIN_ITEMS()">
4 
+    <li class="">
5 
+        <a href="${tg.url('/admin/users')}">
6 
+            ${ICON.FA('fa-user fa-fw')} ${_('Users')}
7 
+        </a>
8 
+    </li>
9 
+    <li class="">
10 
+        <a href="${tg.url('/admin/workspaces')}">
11 
+            ${ICON.FA('fa-bank fa-fw')} ${_('Workspaces')}
12 
+        </a>
13 
+    </li>
14 
+</%def>