From: Łukasz Rekucki <lrekucki@gmail.com>
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?hp=a130412e611a2a29bf0cc9bbbfdefea0b1d0061f

Merge branch 'master' of git@stigma:platforma

Conflicts:

	project/static/js/jquery.logging.js
---

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index eeac7b65..bb43ab4a 100644
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -5,7 +5,7 @@ from django.utils import simplejson as json
 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,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 --git a/project/static/css/master.css b/project/static/css/master.css
index caeddda8..2e9e4331 100644
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -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 +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 --git a/project/static/js/jquery.logging.js b/project/static/js/jquery.logging.js
index 1afd8bec..9a7fbe02 100644
--- a/project/static/js/jquery.logging.js
+++ b/project/static/js/jquery.logging.js
@@ -5,23 +5,18 @@
 
 	const LOG_LEVEL = LEVEL_DEBUG;
 
-	var mozillaLog = function(msg) {
-		if (window.console) console.log(msg);
+	var mozillaLog = function() {
+		if (window.console) console.log.apply(this, arguments);
 	};
 
-	var operaLog = function(msg) {
-		opera.postError(msg);
+	var operaLog = function() {
+		opera.postError.(arguments.join(' '));
 	};
 
-	var defaultLog = function(msg) { return false; };
+	var defaultLog = function() { return false; };
 
-	$.log = function(message, level) {
-		if (level == null) level = LEVEL_INFO;
-		if (message == null) message = 'TRACE';
-		if (level < LOG_LEVEL)
-			return false;
-
-		return $.log.browserLog(message);
+	$.log = function( ) {
+		return $.log.browserLog.apply(this, arguments);
 	};
 
 	if ($.browser.mozilla || $.browser.safari)
diff --git a/project/templates/base.html b/project/templates/base.html
index 89ebe666..db77baad 100644
--- a/project/templates/base.html
+++ b/project/templates/base.html
@@ -6,17 +6,18 @@
         <title>{% block title %}Platforma Redakcyjna{% block subtitle %}{% endblock subtitle %}{% endblock title%}</title>
         <link rel="stylesheet" href="/static/css/master.css" type="text/css" />
         <script src="/static/js/jquery.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/js/jquery.logging.js" type="text/javascript" charset="utf-8"></script> 
+		<script src="/static/js/jquery.logging.js" type="text/javascript" charset="utf-8"></script> 
         {% block extrahead %}
         {% endblock %}
     </head>
     <body id="{% block bodyid %}base{% endblock %}">
 	<div id="header">
-          <span id="breadcrumbs">{% block breadcrumbs %}Platforma Redakcyjna{% endblock breadcrumbs %}</span>
-          <span id="login_info">{% include "registration/head_login.html" %}</span>
+		<span id="breadcrumbs">{% block breadcrumbs %}Platforma Redakcyjna{% endblock breadcrumbs %}</span>
+		<span id="header-right-toolbar">
+			{% block header-toolbar %}{% endblock %}
+	  		<span id="login_info">{% include "registration/head_login.html" %}</span>
+		</span>
 	</div>
-        {% block maincontent %}
-            
-        {% endblock %}
+    {% block maincontent %} {% endblock %}  
     </body>
 </html>
diff --git a/project/templates/explorer/file_xml.html b/project/templates/explorer/file_xml.html
index 7f910223..58219def 100644
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -7,10 +7,14 @@
     <script src="/static/js/jquery.wtooltip.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/jquery.hpanel.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/panels.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/static/js/save-commit.js" type="text/javascript" charset="utf-8"></script>
 {% endblock extrahead %}
 
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> ❯ plik {{ hash }}{% endblock breadcrumbs %}
 
+{% block header-toolbar %}
+	<button type="button" class="toolbar-button" id="toolbar-button-save">Zapisz</button>
+{% endblock %}
 {% block maincontent %}
         <div id="panels">
             <div id="left-panel-wrap" class="panel-wrap">
@@ -24,7 +28,7 @@
                     <strong class="change-notification" style="display: none">Zmieniono!</strong>
                </div>
                <div id="left-panel-content" class="panel-content"></div>
-               <button class="panel-slider" id="slider01">&nbsp;</button>
+               <button type="button" class="panel-slider" id="slider01">&nbsp;</button>
             </div>
             <div id="right-panel-wrap" class="panel-wrap last-panel">
                 <div id="right-panel-toolbar" class="panel-toolbar">