Skip to content
This repository has been archived by the owner on Aug 26, 2022. It is now read-only.

Commit

Permalink
fix bug 1145580 - add info about what the slug rules are
Browse files Browse the repository at this point in the history
when moving pages.
  • Loading branch information
a2sheppy committed Apr 15, 2015
1 parent 62f9690 commit 53df412
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
16 changes: 11 additions & 5 deletions kuma/wiki/templates/wiki/move_document.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,25 @@
<div class="title">
<h1>{{ _('<span class="title-prefix">Moving</span> <em>{title}</em>')|fe(title=document.title) }}</h1>
</div>
<p>{{ _('Please provide a new slug for this page using the field below.') }}</p>

<p>{{ _('Please specify the new location for this page by filling out the fields below. Be sure your new destination follows these rules:') }}</p>
<ul class="move-page-rules">
<li>{{ _('Make sure the location you specify is located immediately under an existing page.') }}
<li>{{ _('Don\'t include the URL scheme ("https://").') }}</li>
<li>{{ _('Enter only the part of the URL following "/docs/".') }}</li>
<li>{{ _('Don\'t include a trailing slash (this will be removed for you if you include it, but you should leave it out).') }}</li>
</ul>

{% if conflicts: %}
<div class="warning">
<p>{{ _('Your requested move cannot be completed due to slug conflicts:') }}</p>
<p>{{ _('Your requested move cannot be completed due to the following slug conflicts:') }}</p>

<ul class="document-list">
{% for doc in descendants %}
<li>{{ doc }}</li>
{% endfor %}
</ul>

<p>{{ _('Please choose a different slug value.') }}</p>
<p>{{ _('Please try a different destination slug. <strong>Double check to be sure you\'re trying to move to the right place!</strong>') }}</p>
</div>
{% endif %}

Expand Down Expand Up @@ -69,7 +75,7 @@ <h1>{{ _('<span class="title-prefix">Moving</span> <em>{title}</em>')|fe(title=d
<input type="hidden" value="{{ document.locale }}" id="locale" name="locale"/>
</dd>
<dd class="parent-suggest-container">
<button class="transparent parent-suggest-link" type="button">{{ _('Lookup by Document Title') }}</button>
<button class="transparent parent-suggest-link" type="button">{{ _('Look up by Document Title') }}</button>

<div id="parent-suggest-input-container">
<input type="text" placeholder="{{ _('Parent Title') }}" id="parent-suggestion" disabled />
Expand Down
5 changes: 5 additions & 0 deletions media/stylus/components/wiki/edit/move-page-rules.styl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ul.move-page-rules {
padding-left: 40px;
margin-bottom: 24px;
list-style: outside none disc;
}
1 change: 1 addition & 0 deletions media/stylus/wiki-edit.styl
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Move page
====================================================================== */

@require 'components/wiki/edit/move-page.styl';
@require 'components/wiki/edit/move-page-rules.styl';


/*
Expand Down

0 comments on commit 53df412

Please sign in to comment.