From: Łukasz Rekucki Date: Tue, 25 Aug 2009 14:22:54 +0000 (+0200) Subject: Merge branch 'master' of git@stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/1fc8724242d7f5bbba51812a118d86aead57f32b?ds=sidebyside;hp=--cc Merge branch 'master' of git@stigma:platforma Conflicts: project/static/js/jquery.logging.js --- 1fc8724242d7f5bbba51812a118d86aead57f32b diff --cc apps/explorer/views.py index eeac7b65,eeac7b65..bb43ab4a --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@@ -5,7 -5,7 +5,7 @@@ from django.utils import simplejson as from django.views.generic.simple import direct_to_template from django.conf import settings --from django.http import HttpResponseRedirect ++from django.http import HttpResponseRedirect, HttpResponse from django.contrib.auth.decorators import login_required from explorer import forms, models @@@ -21,15 -21,15 +21,19 @@@ def file_xml(request, path) if request.method == 'POST': form = forms.BookForm(request.POST) if form.is_valid(): -- repo.add_file(path, form.cleaned_data['text']) ++ # save the changes to a local branch ++# repo.write_lock() ++ print request.user ++# repo.switch_to_branch(request.user.name) ++# repo.add_file(path, form.cleaned_data['text']) # add references to comment issues = _get_issues_for_file(path) commit_message = _add_references(form.cleaned_data['commit_message'], issues) print 'Commiting with: ' + commit_message -- repo.commit(message=commit_message, user=form.cleaned_data['user']) -- return HttpResponseRedirect(request.get_full_path()) ++# repo.commit(message=commit_message, user=form.cleaned_data['user']) ++ return HttpResponse( json.dumps({'message': commit_message}) ) else: form = forms.BookForm() form.fields['text'].initial = repo.get_file(path).data() diff --cc project/static/css/master.css index caeddda8,caeddda8..2e9e4331 --- a/project/static/css/master.css +++ b/project/static/css/master.css @@@ -1,26 -1,26 +1,31 @@@ body { margin: 0; -- font: 14px Helvetica, Verdana, sans-serif; ++ font: 10pt Helvetica, Verdana, sans-serif; overflow: hidden; } #header { position: relative; -- padding: 2px 0.5em; ++ padding: 0.2em 0.5em; background-color: #CDCDCD; border-bottom: 1px solid black; -- clear: both; ++ height: 1.8em; ++ line-height: 1.8em; ++ vertical-align: center; } #header #breadcrumbs { -- } --#header #login_info { ++#header-right-toolbar { position: absolute; right: 1em; } ++#header button { ++ vertical-align: center; ++} ++ ul { margin: 20px; padding: 0; @@@ -91,7 -91,7 +96,7 @@@ label #panels { position: absolute; -- bottom: 0px; left: 0px; right: 0px; top: 50px; ++ bottom: 0px; left: 0px; right: 0px; top: 1em; } .panel-wrap { diff --cc project/templates/base.html index 89ebe666,89ebe666..db77baad --- a/project/templates/base.html +++ b/project/templates/base.html @@@ -6,17 -6,17 +6,18 @@@ {% block title %}Platforma Redakcyjna{% block subtitle %}{% endblock subtitle %}{% endblock title%} -- ++ {% block extrahead %} {% endblock %} -- {% block maincontent %} -- -- {% endblock %} ++ {% block maincontent %} {% endblock %} diff --cc project/templates/explorer/file_xml.html index 7f910223,7f910223..58219def --- a/project/templates/explorer/file_xml.html +++ b/project/templates/explorer/file_xml.html @@@ -7,10 -7,10 +7,14 @@@ ++ {% endblock extrahead %} {% block breadcrumbs %}Platforma Redakcyjna ❯ plik {{ hash }}{% endblock breadcrumbs %} ++{% block header-toolbar %} ++ ++{% endblock %} {% block maincontent %}
@@@ -24,7 -24,7 +28,7 @@@
-- ++