dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #539 from ilvalle/master

Browse Source 
table callbacks panel in admin editor
This commit is contained in:
mdipierro
2014-11-16 23:14:11 -06:00
parent e315db5cd8 63d8785918
commit a22d5a4685
5 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/controllers/appadmin.py
+1 -1
View File
@@ -693,6 +693,6 @@ def hooks():
ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
for op in t['method_hooks']:
ul_t.append(LI (op['name']))
ul_t.append(UL([LI(A(f['funcname'], _href=f['url']if 'url' in f else None)) for f in op['functions']]))
ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
ul_main.append(ul_t)
return ul_main
applications/admin/views/default/edit.html
+11 -6
View File
@@ -258,12 +258,16 @@ $(document).on('click', 'a.font_button', function (e) {
</div>
</div>
<section id="windows_divs" class="tab-content ">
<div id="window_todo" class="tab-pane container-fluid">
{{=LOAD('default', 'todolist.load', vars={'app':app}, ajax=True, timeout=60000, times="infinity")}}
</div>
<div id="window_shortcuts" class="tab-pane container-fluid">
{{include 'default/editor_shortcuts.html'}}
</div>
<div id="window_todo" class="tab-pane container-fluid">
{{=LOAD('default', 'todolist.load', vars={'app':app}, ajax=True, timeout=60000, times="infinity")}}
</div>
<div id="window_shortcuts" class="tab-pane container-fluid">
{{include 'default/editor_shortcuts.html'}}
</div>
<div id="window_dbhooks" class="tab-pane container-fluid">
<h4>Tables hooks</h4>
<div>{{=LOAD(url="/%s/appadmin/hooks" % app, ajax=True, timeout=60000, times="infinity")}}</div>
</div>
</section>
</div>
{{block footer}}
@@ -272,6 +276,7 @@ $(document).on('click', 'a.font_button', function (e) {
<ul id="windows_hooks" class="nav">
<li class=""><a href="#window_todo">TODO</a></li>
<li class=""><a href="#window_shortcuts">Shortcuts</a></li>
<li class=""><a href="#window_dbhooks">Hooks</a></li>
</ul>
</div>
</div>
applications/admin/views/default/editor_shortcuts.html
+14 -15
View File
@@ -1,18 +1,17 @@
<div>
<h4>{{=T("Keyboard shortcuts")}}</h4>
<ul class="keybindings unstyled">
<li></li>
{{=shortcut('Ctrl+S', T('Save via Ajax'))}}
{{=shortcut('Ctrl+F11', T('Toggle Fullscreen'))}}
{{=shortcut('Shift+Esc', T('Exit Fullscreen'))}}
{{=shortcut('Ctrl-F / Cmd-F', T('Start searching'))}}
{{=shortcut('Ctrl-G / Cmd-G', T('Find Next'))}}
{{=shortcut('Shift-Ctrl-G / Shift-Cmd-G', T('Find Previous'))}}
{{=shortcut('Shift-Ctrl-F / Cmd-Option-F', T('Replace'))}}
{{=shortcut('Shift-Ctrl-R / Shift-Cmd-Option-F', T('Replace All'))}}
{{=shortcut('Ctrl-/ ', T('Toggle comment'))}}
{{=shortcut('Tab', T('Expand Abbreviation (html files only)'))}}
{{=shortcut('Ctrl-Space', T('Autocomplete Python Code'))}}
</ul>
</div>
<ul class="keybindings unstyled">
<li></li>
{{=shortcut('Ctrl+S', T('Save via Ajax'))}}
{{=shortcut('Ctrl+F11', T('Toggle Fullscreen'))}}
{{=shortcut('Shift+Esc', T('Exit Fullscreen'))}}
{{=shortcut('Ctrl-F / Cmd-F', T('Start searching'))}}
{{=shortcut('Ctrl-G / Cmd-G', T('Find Next'))}}
{{=shortcut('Shift-Ctrl-G / Shift-Cmd-G', T('Find Previous'))}}
{{=shortcut('Shift-Ctrl-F / Cmd-Option-F', T('Replace'))}}
{{=shortcut('Shift-Ctrl-R / Shift-Cmd-Option-F', T('Replace All'))}}
{{=shortcut('Ctrl-/ ', T('Toggle comment'))}}
{{=shortcut('Tab', T('Expand Abbreviation (html files only)'))}}
{{=shortcut('Ctrl-Space', T('Autocomplete Python Code'))}}
</ul>
</div>