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

initial editor cleanup and html fix

Browse Source
This commit is contained in:
ilvalle
2013-10-17 15:25:12 +02:00
parent 13c6c1ad37
commit c91e6160fe
5 changed files with 21 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/models/0.py
-20
View File
@@ -8,26 +8,6 @@ WEB2PY_VERSION_URL = WEB2PY_URL + '/examples/default/version'
# the user-interface feature that allows you to edit files in your web
# browser.
## Default editor (to change editor you need web2py.admin.editors.zip)
## old editors like 'ace' or 'edit_area' or 'amy' are no longer supported
TEXT_EDITOR = 'codemirror'
## Editor Color scheme (only for ace)
TEXT_EDITOR_THEME = (
"chrome", "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn",
"dreamweaver", "eclipse", "idle_fingers", "kr_theme", "merbivore",
"merbivore_soft", "monokai", "mono_industrial", "pastel_on_dark",
"solarized_dark", "solarized_light", "textmate", "tomorrow",
"tomorrow_night", "tomorrow_night_blue", "tomorrow_night_bright",
"tomorrow_night_eighties", "twilight", "vibrant_ink")[0]
## Editor Keyboard bindings (only for ace and codemirror)
TEXT_EDITOR_KEYBINDING = '' # 'emacs' or 'vi'
### edit_area only
# The default font size, measured in 'points'. The value must be an integer > 0
FONT_SIZE = 10
# Displays the editor in full screen mode. The value must be 'true' or 'false'
FULL_SCREEN = 'false'
applications/admin/views/default.mobile/edit.html
+2 -9
View File
@@ -5,11 +5,8 @@
return XML('<li><tt>%s</tt> %s</li>' % (combo, description))
}}
{{if TEXT_EDITOR == 'amy':}}
{{include 'default/amy_ajax.html'}}
{{else:}}
<script language="Javascript" type="text/javascript" src="{{=URL(r=request,c='static',f='edit_area/edit_area_full.js')}}"></script><script language="Javascript" type="text/javascript">
editAreaLoader.init({id: "body",start_highlight: true,allow_resize: "both",allow_toggle: {{=editarea_preferences['ALLOW_TOGGLE']}},language: "en",syntax: "{{=filetype}}",replace_tab_by_spaces: {{=editarea_preferences['REPLACE_TAB_BY_SPACES']}}, font_size: {{=editarea_preferences['FONT_SIZE']}}, fullscreen: {{=editarea_preferences['FULL_SCREEN']}}, display: "{{=editarea_preferences['DISPLAY']}}", show_line_colors: true, word_wrap: true, save_callback: "doClickSave" {{if filetype=='html':}},plugins: "zencoding"{{pass}} });
editAreaLoader.init({id: "body",start_highlight: true,allow_resize: "both",allow_toggle: {{=editarea_preferences['ALLOW_TOGGLE']}},language: "en",syntax: "{{=filetype}}",replace_tab_by_spaces: {{=editarea_preferences['REPLACE_TAB_BY_SPACES']}}, fullscreen: {{=editarea_preferences['FULL_SCREEN']}}, display: "{{=editarea_preferences['DISPLAY']}}", show_line_colors: true, word_wrap: true, save_callback: "doClickSave" {{if filetype=='html':}},plugins: "zencoding"{{pass}} });
</script>
<script language="Javascript" type="text/javascript" src="{{=URL('static','js/ajax_editor.js')}}"></script>
<script language="Javascript" type="text/javascript">
@@ -17,7 +14,7 @@ jQuery(document).ready(function(){
setTimeout("keepalive('{{=URL('keepalive')}}')",10000);
});
</script>
{{pass}}
{{block sectionclass}}edit {{filename}}{{end}}
@@ -41,11 +38,7 @@ jQuery(document).ready(function(){
{{=T('Saved file hash:')}}
<input type="input" name="file_hash" value="{{=file_hash}}" readonly="readonly"/>
{{=T('Last saved on:')}} <input type="input" name="saved_on" value="{{=saved_on}}" readonly="readonly"/>
{{if TEXT_EDITOR=='amy':}}
<textarea style="width: auto; height:400px;direction:ltr;" rows="58" cols="100" -amy-enabled="true" id="body" name="data">{{=data}}</textarea>
{{else:}}
<textarea cols="80" rows="25" id="body" style="direction:ltr;" name="data">{{=data}}</textarea>
{{pass}}
<button onclick="window.location.reload(); return false">{{=T('restore')}}</button>
<button type="submit" name="revert">{{=T('revert')}}</button>
<br/>
applications/admin/views/default/amy_ajax.html
-77
View File
@@ -1,77 +0,0 @@
<style>
.acw-chap pre, .acw-chap pre span, span.acw-char-check, .acw-chap .selection-area div
{
font:11px 'Courier', monospaced;
line-height:11px;
margin:0;
padding:0;
border:0;
}
.acw-chap .wrapped-row
{
background-image:url('{{=URL(r=request,c='static',f='eamy')}}/chap-wrapped-row.gif');
background-repeat:no-repeat;
background-position:25px 4px;
}
.acw-chap .sidebar
{
background-image:url('{{=URL(r=request,c='static',f='eamy')}}/chap-bg-sidebar.gif');
line-height:11px;
}
.acw-chap .sidebar .row-number
{
text-align:right;
font-size:9px;
font-family:'Lucida Grande', Verdana, Arial, Helvetica, sans-serif;
color:#999;
}
.acw-chap .folding-expand-inner
{
width:14px;
height:10px;
margin-left:2px;
display:inline;
background-image:url('{{=URL(r=request,c='static',f='eamy')}}/chap-folding-expand-inner.gif');
}
.acw-chap .folding-expand
{
background-image:url('{{=URL(r=request,c='static',f='eamy')}}/chap-folding-expand.gif');
}
.acw-chap .folding-start
{
background-image:url('{{=URL(r=request,c='static',f='eamy')}}/chap-folding-start.gif');
}
.acw-chap .folding-stop
{
background-image:url('{{=URL(r=request,c='static',f='eamy')}}/chap-folding-stop.gif');
}
.acw-chap .bookmark-default
{
background-image:url('{{=URL(r=request,c='static',f='eamy')}}/chap-bookmark-default.gif');
}
.acw-chap .void
{
background-image:url('{{=URL(r=request,c='static',f='eamy')}}/void.gif');
}
</style>
<script src="{{=URL(r=request,c='static',f='eamy/eamy.js')}}" type="text/javascript"></script>
<script src="{{=URL(r=request,c='static',f='js/jquery.hotkeys.js')}}" type="text/javascript" charset="utf-8"></script>
{{if request.args[1]=="views":}}
<script src="{{=URL(r=request,c='static',f='eamy/bundle_markup.js')}}" type="text/javascript"></script>
{{else:}}
<script src="{{=URL(r=request,c='static',f='eamy/bundle_python.js')}}" type="text/javascript"></script>
{{pass}}
<script language="Javascript" type="text/javascript" src="/{{=request.application}}/static/js/ajax_editor.js"></script>
<script language="Javascript" type="text/javascript">
jQuery(document).ready(function(){
setTimeout("keepalive('{{=URL('keepalive')}}')",10000);
});
jQuery(document).bind('keydown', 'alt+f1',function (evt){
doClickSave();
});
</script>
applications/admin/views/default/edit_js.html
+4 -4
View File
@@ -137,7 +137,7 @@
<div class="row-fluid">
<div class="help alert alert-block alert-info">
{{if TEXT_EDITOR == 'codemirror' and filetype=='html':}}
{{if filetype=='html':}}
<h3>{{=T('Key bindings for ZenCoding Plugin')}}</h3>
<ul class="keybindings unstyled">
{{=shortcut('Ctrl+S', T('Save via Ajax'))}}
@@ -150,15 +150,15 @@
{{=shortcut('Shift-Ctrl-R / Shift-Cmd-Option-F', T('Replace All'))}}
{{=shortcut('Tab', T('Expand Abbreviation'))}}
</ul>
{{elif TEXT_EDITOR == 'codemirror':}}
{{else:}}
<h3>{{=T("Key bindings")}}</h3>
<ul class="keybindings unstyled">
{{=shortcut('Ctrl+S', T('Save via Ajax'))}}
{{=shortcut('Ctrl+F11', T('Toggle Fullscreen'))}}
{{=shortcut('Shift+Esc', T('Exit Fullscreen'))}}
{{if filetype=='python':}}
{{=shortcut('Ctrl-Space', T('Autocomplete Python Code'))}}
{{pass}}
{{=shortcut('Ctrl-Space', T('Autocomplete Python Code'))}}
{{pass}}
{{=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'))}}
applications/admin/views/default/editor_settings.html
+15 -12
View File
@@ -9,18 +9,21 @@
{{editors = ['default', 'vim', 'emacs']}}
{{closetag = ['true', 'false']}}
<form id="editor_settings_form" class="form-horizontal">
<div class="control-group">
<label class="control-label" for="selectTheme">{{=T('Theme')}}</label>
<div class="controls">{{=SELECT(themes, value=editor_settings['theme'], _name="theme" )}}</div>
<label class="control-label" for="selectEditor">{{=T('Editor')}}</label>
<div class="controls">{{=SELECT(editors, value=editor_settings['editor'], _name="editor" )}}</div>
<label class="control-label" for="closeTag">{{=T('Enable Close-Tag')}}</label>
<div class="controls">{{=SELECT(closetag, value=editor_settings['closetag'], _name="closetag" )}}</div>
</div>
<div class="control-group">
<div class="controls"><button type="submit" class="disabled btn btn-primary">{{=T('Save')}}</button></div>
</div>
<div class="control-group">
<label class="control-label" for="selectTheme">{{=T('Theme')}}</label>
<div class="controls">{{=SELECT(themes, value=editor_settings['theme'], _name="theme" )}}</div>
</div>
<div class="control-group">
<label class="control-label" for="selectEditor">{{=T('Editor')}}</label>
<div class="controls">{{=SELECT(editors, value=editor_settings['editor'], _name="editor" )}}</div>
</div>
<div class="control-group">
<label class="control-label" for="closeTag">{{=T('Enable Close-Tag')}}</label>
<div class="controls">{{=SELECT(closetag, value=editor_settings['closetag'], _name="closetag" )}}</div>
</div>
<div class="control-group">
<div class="controls"><button type="submit" class="disabled btn btn-primary">{{=T('Save')}}</button></div>
</div>
</form>
<script>
web2py_trap_form("{{=URL('default', 'edit', args=request.args, vars={'settings':True})}}", "editor_settings");