diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/wagtailadmin/forms.py index f3634faf0..e9b10f63c 100644 --- a/wagtail/wagtailadmin/forms.py +++ b/wagtail/wagtailadmin/forms.py @@ -78,9 +78,9 @@ class PasswordResetForm(PasswordResetForm): class PageViewRestrictionForm(forms.Form): - restriction_type = forms.ChoiceField(choices=[ - ('none', ugettext_lazy("This page is viewable by all visitors")), - ('password', ugettext_lazy("This page is only viewable to users who enter this password:")), + restriction_type = forms.ChoiceField(label="Visibility", choices=[ + ('none', ugettext_lazy("Public")), + ('password', ugettext_lazy("Private, accessible with the following password")), ], widget=forms.RadioSelect) password = forms.CharField(required=False) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js new file mode 100644 index 000000000..eb280f00e --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js @@ -0,0 +1,18 @@ +$(function() { + /* Interface to set permissions from the explorer / editor */ + $('a.action-set-privacy').click(function() { + ModalWorkflow({ + 'url': this.href, + 'responses': { + 'setPermission': function(isPublic) { + if (isPublic) { + $('.privacy-indicator').removeClass('private').addClass('public'); + } else { + $('.privacy-indicator').removeClass('public').addClass('private'); + } + } + } + }); + return false; + }); +}); diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js deleted file mode 100644 index 5e84e0840..000000000 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js +++ /dev/null @@ -1,18 +0,0 @@ -$(function() { - /* Interface to set view permissions from the explorer / editor */ - $('a.action-set-view-permissions').click(function() { - ModalWorkflow({ - 'url': this.href, - 'responses': { - 'setPermission': function(isPublic) { - if (isPublic) { - $('.view-permission-indicator').removeClass('private').addClass('public'); - } else { - $('.view-permission-indicator').removeClass('public').addClass('private'); - } - } - } - }); - return false; - }); -}); diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss index 97e915f36..b88c4fd60 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss @@ -121,8 +121,8 @@ color:lighten($color-grey-2,30%); -webkit-font-smoothing: auto; font-size:0.80em; - margin:0 0.5em; - background:white url("#{$static-root}bg-dark-diag.svg"); + margin:0 0.5em 0.5em; + background:white url( "#{$static-root}bg-dark-diag.svg"); &.primary{ color:$color-grey-2; @@ -136,6 +136,20 @@ a.status-tag.primary:hover{ color:$color-teal; } +.privacy-indicator { + &.public { + .label-private { + display: none; + } + } + &.private { + .label-public { + display: none; + } + } +} + + /* free tagging tags from taggit */ .tag{ background-color:$color-teal; @@ -174,6 +188,7 @@ a.tag:hover{ } } + /* make a block-level element inline */ .inline{ display:inline; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 3a8f67ba2..d71ff66da 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -69,6 +69,10 @@ input, textarea, select, .richtext, .tagit{ outline:none; background-color:$color-input-focus; } + &:disabled, &[disabled], &:disabled:hover, &[disabled]:hover{ + background-color:inherit; + cursor:not-allowed; + } } /* select boxes */ @@ -135,6 +139,7 @@ input[type=radio]:before{ display:block; content:"K"; width: 1em; + height:1em; line-height: 1.1em; padding: 4px; background-color: white; @@ -741,6 +746,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ .choice_field &, .model_multiple_choice_field &, .boolean_field &, + .choice_field &, .model_choice_field &, .image_field &, .file_field &{ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss index 3f079897f..1e9905d27 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss @@ -5,6 +5,10 @@ header{ margin-bottom:2em; color:white; + a{ + color:white; + } + h1, h2{ margin:0; color:white; @@ -97,12 +101,6 @@ header{ } } -.page-explorer header{ - margin-bottom:0; - padding-bottom:0em; -} - - @media screen and (min-width: $breakpoint-mobile){ header{ padding-top:1.5em; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss index 9d940362a..8a5baa8d3 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss @@ -379,6 +379,11 @@ table.listing{ } } + .privacy-indicator{ + font-size:0.9em; + opacity:0.7; + } + .table-headers{ .ord{ padding-right:0; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss deleted file mode 100644 index 8e26eaf74..000000000 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss +++ /dev/null @@ -1,8 +0,0 @@ -.view-permission-indicator { - &.public { - .label-private { display: none; } - } - &.private { - .label-public { display: none; } - } -} diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css index 8d57e3c96..8d945b3ec 100755 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css @@ -452,15 +452,6 @@ input[type="submit"] { *overflow: visible; /* 4 */ } -/** - * Re-set default cursor for disabled elements. - */ - -button[disabled], -html input[disabled] { - cursor: default; -} - /** * 1. Address box sizing set to content-box in IE 8/9. * 2. Remove excess padding in IE 8/9. diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html new file mode 100644 index 000000000..b1471ba25 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html @@ -0,0 +1,8 @@ +{% load i18n %} +{% trans "Page privacy" as title_str %} +{% include "wagtailadmin/shared/header.html" with title=title_str icon="locked" %} + +
+

{% trans "This page has been made private by a parent page." %}

+

{% trans "You can edit the privacy settings on:" %} {{ page_with_restriction.title }} +

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html new file mode 100644 index 000000000..6298d6f5f --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html @@ -0,0 +1,16 @@ +{% load i18n %} +{% trans "Page privacy" as title_str %} +{% include "wagtailadmin/shared/header.html" with title=title_str icon="locked" %} + +
+

{% trans "Note: privacy changes apply to all children of this page too." %}

+
+ {% csrf_token %} + + +
+ +
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.js rename to wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js rename to wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html deleted file mode 100644 index d8b652f32..000000000 --- a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html +++ /dev/null @@ -1,8 +0,0 @@ -{% load i18n %} -{% trans "Access restricted" as title_str %} -{% include "wagtailadmin/shared/header.html" with title=title_str %} - -
- {% trans "Access to this page is restricted because it is within the section:" %} - {{ page_with_restriction.title }} -
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html deleted file mode 100644 index 632c34f1b..000000000 --- a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html +++ /dev/null @@ -1,31 +0,0 @@ -{% load i18n %} -{% trans "Set access restrictions" as title_str %} -{% include "wagtailadmin/shared/header.html" with title=title_str %} - -
-
- {% csrf_token %} - - -
-

{% trans "Access restrictions will take effect on this page and all child pages." %}

-
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html index 58d7d5f17..2e140c89c 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html @@ -7,7 +7,6 @@ {% compress css %} - {# we'll want tag-it included, for the benefit of any modals that use it, like images. #} {# TODO: a method of injecting these sorts of things on demand when the modal is spawned #} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html index f494f75ec..a3185e096 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html @@ -21,7 +21,7 @@ - + {% hook_output 'insert_editor_js' %} {% endcompress %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html new file mode 100644 index 000000000..53aa44800 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html @@ -0,0 +1,23 @@ +{% load i18n wagtailadmin_tags %} + +{% test_page_is_public page as is_public %} +{% if not page_perms %} + {% page_permissions page as page_perms %} +{% endif %} + +
+ {% trans "Privacy" %} + {% if page_perms.can_set_view_restrictions %} + + {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #} + {% trans 'Public' %} + {% trans 'Private' %} + + {% else %} + {% if is_public %} + {% trans 'Public' %} + {% else %} + {% trans 'Private' %} + {% endif %} + {% endif %} +
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html deleted file mode 100644 index 5bb8853e0..000000000 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html +++ /dev/null @@ -1,23 +0,0 @@ -{% load i18n wagtailadmin_tags %} - -{% test_page_is_public page as is_public %} -{% if not page_perms %} - {% page_permissions page as page_perms %} -{% endif %} - -{% if page_perms.can_set_view_restrictions %} -
- - {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #} - {% trans 'Public' %} - {% trans 'Private' %} - -
-{% else %} - {# Read-only display, for users who don't have permission to set view restrictions #} - {% if is_public %} -
{% trans 'Public' %}
- {% else %} -
{% trans 'Private' %}
- {% endif %} -{% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html index a1b108933..c15efbd59 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html @@ -15,11 +15,15 @@

{% blocktrans with title=page.title %}Editing {{ title }}{% endblocktrans %}

- {% trans "Status:" %} {% if page.live %}{{ page.status_string }}{% else %}{{ page.status_string }}{% endif %} + {% trans "Status" %} + {% if page.live %} + {{ page.status_string }} + {% else %} + {{ page.status_string }} + {% endif %} + + {% include "wagtailadmin/pages/_privacy_indicator.html" with page=page page_perms=page_perms only %}
- - {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=page page_perms=page_perms only %} - diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html index e9e4847dd..3a3aa49a7 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html @@ -16,19 +16,12 @@ {% page_permissions parent_page as parent_page_perms %} {% include "wagtailadmin/pages/list.html" with sortable=1 allow_navigation=1 full_width=1 parent_page=parent_page orderable=parent_page_perms.can_reorder_children %} - -{% endblock %} - -{% block extra_css %} - {% compress css %} - - {% endcompress %} {% endblock %} {% block extra_js %} {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %} - +