Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: melug/htmleditor
base: ef2040b1ae
...
head fork: melug/htmleditor
compare: 3703b70b82
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 17, 2012
@melug readable title in file editor 42a8b35
Commits on Apr 19, 2012
@melug little fixes 3703b70
Showing with 5 additions and 3 deletions.
  1. +1 −1  templates/editor.html
  2. +2 −2 templates/explorer.html
  3. +2 −0  views.py
View
2  templates/editor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Edit:{{ file }}</title>
+ <title>{{ file }}</title>
<link href="{{ STATIC_URL }}bootstrap/css/bootstrap.css" rel="stylesheet">
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript">
View
4 templates/explorer.html
@@ -102,10 +102,10 @@
<div class="control-group pull-right">
<label class="control-label" for="url">Eye:</label>
<div class="controls">
- <input type="text" class="input-xlarge" id="url">
+ <input type="text" class="input-xlarge" id="url" value="{% if eye %}{{ eye }}{% endif %}">
</div>
</div>
- <iframe id="eye" width="100%" height="100%"></iframe>
+ <iframe id="eye" width="100%" height="100%"{% if eye %} src="{{ eye }}"{% endif %}></iframe>
</div>
<div class="span3" id="explorer">
<h3>Directory:</h3>
View
2  views.py
@@ -33,6 +33,7 @@ def update(request):
def explorer(request):
return render_to_response('explorer.html', {
+ 'eye': request.GET.get('eye', ''),
}, context_instance=RequestContext(request))
def explorer_api(request):
@@ -44,5 +45,6 @@ def explorer_api(request):
else:
file_type = 'file'
files.append({ 'type': file_type, 'file': f })
+ files.sort(key=lambda x:(x['type'], x['file']))
return HttpResponse(json.dumps(files), content_type='application/json')

No commit comments for this range

Something went wrong with that request. Please try again.