From: Ɓukasz Rekucki Date: Mon, 28 Sep 2009 14:25:43 +0000 (+0200) Subject: Merge branch 'zuber-view-refactor' X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/b348abeb083671e831f711d3d41949a9b3f3a7b4?ds=inline;hp=-c Merge branch 'zuber-view-refactor' Conflicts: apps/api/handlers/library_handlers.py --- b348abeb083671e831f711d3d41949a9b3f3a7b4 diff --combined apps/api/handlers/library_handlers.py index 64b95c2d,b30f2e78..7db7b795 --- a/apps/api/handlers/library_handlers.py +++ b/apps/api/handlers/library_handlers.py @@@ -268,8 -268,6 +268,8 @@@ class DocumentTextHandler(BaseHandler) f.write(json.dumps(includes)) f.close() + lib._fileadd(resolve('parts')) + # update the parts cache PartCache.update_cache(docid, current.owner,\ stored_includes, includes) @@@ -278,17 -276,19 +278,19 @@@ f = lib._fileopen(resolve('xml'), 'w+') f.write(data) f.close() - + + ndoc = None ndoc = current.invoke_and_commit(\ xml_update_action, lambda d: (msg, current.owner) ) try: # return the new revision number - return response.SuccessAllOk.django_response({ + return response.SuccessAllOk().django_response({ "document": ndoc.id, "subview": "xml", "previous_revision": current.revision, - "updated_revision": ndoc.revision + "updated_revision": ndoc.revision, + "url": reverse("doctext_view", args=[ndoc.id, ndoc.revision]) }) except Exception, e: if ndoc: lib._rollback() @@@ -438,4 -438,4 +440,4 @@@ class MergeHandler(BaseHandler) "parent_user_resivion": udoc.revision, "parent_revision": doc.revision, "revision": udoc.revision, - }) + }) diff --combined project/static/css/master.css index 44bd62ec,dbf5c77f..7caa732f --- a/project/static/css/master.css +++ b/project/static/css/master.css @@@ -1,6 -1,6 +1,6 @@@ body { margin: 0; - font: 10pt Helvetica, Verdana, sans-serif; + font: 12px Helvetica, Verdana, sans-serif; overflow: hidden; background: #AAA; } @@@ -35,10 -35,8 +35,9 @@@ top: 2.4em; left: 0px; right: 0px; bottom: 0px; overflow: auto; background-color: white; - padding: 0.2em 1em; } +/* ul { margin: 20px; padding: 0; @@@ -48,7 -46,7 +47,7 @@@ li margin: 0; padding: 0; list-style: none; -} +} */ a { text-decoration: none; @@@ -108,8 -106,8 +107,8 @@@ label /* ========== */ #panels { - position: absolute; - bottom: 0px; left: 0px; right: 0px; top: 0px; + height: 100%; + width: 100%; } .panel-wrap { @@@ -344,13 -342,71 +343,71 @@@ text#commit-dialog-message margin: 0.5em; } - .CodeMirror-line-numbers - { - text-align: right; - padding-top: 0.4em; - padding-right: 2px; - width: 28px; - font-size: 10pt; - background: black; - color: white; - } + /* ======= */ + /* = New = */ + /* ======= */ + #splitview { + width: 100%; + height: 100%; + padding: 0; + margin: 0; + } + + .splitview-splitbar { + width: 5px; + border-left: 1px solid #999; + border-right: 1px solid #999; + height: 100%; + background-color: #CCC; + z-index: 100; + } + + .splitview-overlay { + z-index: 90; + background: #FFF; + opacity: 0.5; + } + + .panel-container { + height: 100%; + position: relative; + } + + .content-view { + position: absolute; + top: 20px; + right: 0; + bottom: 0; + left: 0; + overflow: none; + } + + .xmlview { + height: 100%; + } + + .view-overlay { + z-index: 1000; + background: #FFF; + opacity: 0.8; + text-align: center; + text-valign: center; + } + + .view-overlay p { + display: block; + position: relative; + top: auto; + bottom: auto; + height: 40px; + } + + .buttontoolbarview { + display: block; + background-color: #CCC; + } + + .buttontoolbarview a { + color: #000; + text-decoration: none; + }