From 12471fdc58a1d8dc94c3cd902f1c1c531a4bfd6e Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 12 Nov 2020 15:48:44 +0100 Subject: [PATCH] Tighter editor layout with icons. --- requirements/requirements.txt | 2 +- src/redakcja/static/css/html.css | 1 + src/redakcja/static/js/wiki/view_editor_wysiwyg.js | 11 ++++++++++- src/redakcja/templates/registration/head_login.html | 6 ++++-- src/wiki/templates/wiki/tabs/history_view_item.html | 5 ++++- src/wiki/templates/wiki/tabs/source_editor_item.html | 5 ++++- src/wiki/templates/wiki/tabs/summary_view_item.html | 5 ++++- src/wiki/templates/wiki/tabs/wysiwyg_editor_item.html | 5 ++++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 031670a1..54ac60fe 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -10,7 +10,7 @@ python-slugify python-docx==0.8.10 Wikidata==0.6.1 -librarian==1.8.1 +librarian==1.10 ## Django Django==3.0.4 diff --git a/src/redakcja/static/css/html.css b/src/redakcja/static/css/html.css index 98e41cd2..5a969fb8 100644 --- a/src/redakcja/static/css/html.css +++ b/src/redakcja/static/css/html.css @@ -608,6 +608,7 @@ div[x-node] > .uwaga { padding: 1px; z-index: 2000; position: absolute; + text-align: left; } .html-editarea textarea { diff --git a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js index 72e218aa..607fa3f2 100644 --- a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js +++ b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js @@ -421,7 +421,7 @@ var w = $box.outerWidth(); var h = $box.innerHeight(); - if ($origin.is(".annotation-inline-box") | $origin.is('.reference-inline-box')) { + if ($origin.is(".annotation-inline-box")) { w = Math.max(w, 400); h = Math.max(h, 60); if($('.htmlview div').offset().left + $('.htmlview div').width() > ($('.vsplitbar').offset().left - 480)){ @@ -430,6 +430,15 @@ x = 100; } } + if ($origin.is('.reference-inline-box')) { + w = 400; + h = 32; + y -= 32; + x = Math.min( + x, + $('.htmlview div').offset().left + $('.htmlview div').width() - 400 + ); + } // start edition on this node var $overlay = $('
').css({ diff --git a/src/redakcja/templates/registration/head_login.html b/src/redakcja/templates/registration/head_login.html index 1ae47fa9..26ccfb5e 100644 --- a/src/redakcja/templates/registration/head_login.html +++ b/src/redakcja/templates/registration/head_login.html @@ -1,11 +1,13 @@ {% load i18n %} +{% load gravatar %} {% if user.is_authenticated %}
-
+
{{ user.username }}
{% if user.is_staff %} {% trans "Admin" %} {% endif %} diff --git a/src/wiki/templates/wiki/tabs/history_view_item.html b/src/wiki/templates/wiki/tabs/history_view_item.html index 8e88451d..e3d00acd 100644 --- a/src/wiki/templates/wiki/tabs/history_view_item.html +++ b/src/wiki/templates/wiki/tabs/history_view_item.html @@ -1,4 +1,7 @@ {% load i18n %} diff --git a/src/wiki/templates/wiki/tabs/source_editor_item.html b/src/wiki/templates/wiki/tabs/source_editor_item.html index ba915c39..92dd4f03 100644 --- a/src/wiki/templates/wiki/tabs/source_editor_item.html +++ b/src/wiki/templates/wiki/tabs/source_editor_item.html @@ -2,5 +2,8 @@ diff --git a/src/wiki/templates/wiki/tabs/summary_view_item.html b/src/wiki/templates/wiki/tabs/summary_view_item.html index 1d205916..fa0335b0 100644 --- a/src/wiki/templates/wiki/tabs/summary_view_item.html +++ b/src/wiki/templates/wiki/tabs/summary_view_item.html @@ -1,4 +1,7 @@ {% load i18n %} diff --git a/src/wiki/templates/wiki/tabs/wysiwyg_editor_item.html b/src/wiki/templates/wiki/tabs/wysiwyg_editor_item.html index 79ad89be..a1231b28 100644 --- a/src/wiki/templates/wiki/tabs/wysiwyg_editor_item.html +++ b/src/wiki/templates/wiki/tabs/wysiwyg_editor_item.html @@ -1,4 +1,7 @@ {% load i18n %} -- 2.20.1