Browse Source

modified integration of sidebarleft. Now use js instead of html for parameters

Skylsmoi 8 years ago
parent
commit
77807e4083

File diff suppressed because it is too large
+ 7 - 7
tracim/tracim/public/assets/js/sidebarleft.js


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

41
         <script src="${tg.url('/assets/js/trad.js')}"></script>
41
         <script src="${tg.url('/assets/js/trad.js')}"></script>
42
         <script src="${tg.url('/assets/js/main.js')}"></script>
42
         <script src="${tg.url('/assets/js/main.js')}"></script>
43
         ${CFG.TRACKER_JS_CONTENT|n}
43
         ${CFG.TRACKER_JS_CONTENT|n}
44
-        <script src="${tg.url('/assets/js/sidebarleft.js')}"></script>
45
     </body>
44
     </body>
46
 
45
 
47
 
46
 

+ 1 - 1
tracim/tracim/templates/master_authenticated_left_treeview.mak View File

4
 
4
 
5
 <%def name="SIDEBAR_LEFT_CONTENT()">
5
 <%def name="SIDEBAR_LEFT_CONTENT()">
6
     ## This is the default left sidebar implementation
6
     ## This is the default left sidebar implementation
7
-    ${LEFT_MENU.TREEVIEW('sidebar-left-menu', '__'))}
7
+    ${LEFT_MENU.TREEVIEW('sidebar-left-menu', '__')}
8
 </%def>
8
 </%def>
9
 
9
 
10
 <%def name="SIDEBAR_RIGHT_CONTENT()">
10
 <%def name="SIDEBAR_RIGHT_CONTENT()">

+ 7 - 1
tracim/tracim/templates/user_workspace_widgets.mak View File

148
 
148
 
149
 <%def name="TREEVIEW(dom_id, selected_id='', uniq_workspace='0')">
149
 <%def name="TREEVIEW(dom_id, selected_id='', uniq_workspace='0')">
150
     <% get_root_url = tg.url("/workspaces/treeview_root", dict(current_id=selected_id)) %>
150
     <% get_root_url = tg.url("/workspaces/treeview_root", dict(current_id=selected_id)) %>
151
-    <div id='sidebarleft_menu' apiPath='/' apiParameters='?current_id=${selected_id}'></div>
151
+    <div id='sidebarleft_menu'></div>
152
+    <script src="${tg.url('/assets/js/sidebarleft.js')}"></script>
153
+    <script>
154
+      (function () {
155
+        sidebarLeft(document.getElementById('sidebarleft_menu'), '/', '?current_id=${selected_id}')
156
+      })()
157
+    </script>
152
 </%def>
158
 </%def>
153
 
159
 
154
 <%def name="SECURED_SHOW_CHANGE_STATUS_FOR_FILE(user, workspace, item)">
160
 <%def name="SECURED_SHOW_CHANGE_STATUS_FOR_FILE(user, workspace, item)">

+ 7 - 1
tracim/tracim/templates/widgets/left_menu.mak View File

3
 
3
 
4
 <%def name="TREEVIEW(dom_id, selected_id='', uniq_workspace='0', css_classes='t-spacer-above')">
4
 <%def name="TREEVIEW(dom_id, selected_id='', uniq_workspace='0', css_classes='t-spacer-above')">
5
     <h4 class="t-less-visible t-spacer-above textMenuColor">${_('Workspaces')}</h4>
5
     <h4 class="t-less-visible t-spacer-above textMenuColor">${_('Workspaces')}</h4>
6
-    <div id="sidebarleft_menu" apiPath="/"></div>
6
+    <div id="sidebarleft_menu"></div>
7
+    <script src="${tg.url('/assets/js/sidebarleft.js')}"></script>
8
+    <script>
9
+      (function () {
10
+        sidebarLeft(document.getElementById('sidebarleft_menu'), '/')
11
+      })()
12
+    </script>
7
 </%def>
13
 </%def>
8
 
14