You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/11/18 17:06:13 UTC
[14/16] allura git commit: [#7999] ticket:861 Small UI tweaks
[#7999] ticket:861 Small UI tweaks
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d9091df7
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d9091df7
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d9091df7
Branch: refs/heads/ib/7999a
Commit: d9091df79035355efa52e9a313997e0d5fd50fde
Parents: 751891b
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Nov 18 16:12:50 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Nov 18 16:17:18 2015 +0200
----------------------------------------------------------------------
Allura/allura/templates/site_admin_delete_projects.html | 5 ++++-
Allura/allura/templates/site_admin_delete_projects_confirm.html | 3 ++-
Allura/allura/templates/site_admin_delete_projects_form.html | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d9091df7/Allura/allura/templates/site_admin_delete_projects.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_delete_projects.html b/Allura/allura/templates/site_admin_delete_projects.html
index 1b1db94..daeca09 100644
--- a/Allura/allura/templates/site_admin_delete_projects.html
+++ b/Allura/allura/templates/site_admin_delete_projects.html
@@ -26,7 +26,10 @@
{% block content %}
<div class="grid-19">
- <p>Put project URLs separated by newline (anything after "#" is considered comment and ignored)</p>
+ <p>
+ Put project URLs separated by newline (anything after "#" is considered comment and ignored).
+ <a href="https://forge-allura.apache.org/docs/getting_started/administration.html#deleting-projects" target="_blank">Detailed docs</a>
+ </p>
{% set form_step = 'delete' %}
{% include 'allura:templates/site_admin_delete_projects_form.html' %}
</div>
http://git-wip-us.apache.org/repos/asf/allura/blob/d9091df7/Allura/allura/templates/site_admin_delete_projects_confirm.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_delete_projects_confirm.html b/Allura/allura/templates/site_admin_delete_projects_confirm.html
index 628028e..ab99ee6 100644
--- a/Allura/allura/templates/site_admin_delete_projects_confirm.html
+++ b/Allura/allura/templates/site_admin_delete_projects_confirm.html
@@ -23,7 +23,7 @@
<div class="grid-19">
<p class="warning">Be careful. This will delete all projects data!</p>
<p>You're trying to delete the following projects {% if disable_users %} and <strong>disable all projects' users</strong>{% endif %}</p>
- <p>Because of: {{ reason }}</p>
+ <p>Because of: {{ reason or ''|nl2br }}</p>
<p><a href="{{ edit_link }}">Edit</a></p>
<table>
<thead>
@@ -45,6 +45,7 @@
</tr>
{% endfor %}
</table>
+ <p><a href="{{ edit_link }}">Edit</a></p>
{% set form_step = 'confirm' %}
{% include 'allura:templates/site_admin_delete_projects_form.html' %}
</div>
http://git-wip-us.apache.org/repos/asf/allura/blob/d9091df7/Allura/allura/templates/site_admin_delete_projects_form.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_delete_projects_form.html b/Allura/allura/templates/site_admin_delete_projects_form.html
index 40dbd92..52f4803 100644
--- a/Allura/allura/templates/site_admin_delete_projects_form.html
+++ b/Allura/allura/templates/site_admin_delete_projects_form.html
@@ -33,11 +33,11 @@
<div class="{{ '' if fields_visible else 'hidden' }}">
<div class="grid-18">
<label for="projects">Projects:</label><br>
- <textarea name="projects">{{ projects or '' }}</textarea>
+ <textarea name="projects" placeholder="http://localhost:8080/p/test/wiki/">{{ projects or '' }}</textarea>
</div>
<div class="grid-18">
<label for="reason">Reason:</label><br>
- <textarea name="reason">{{ reason or '' }}</textarea>
+ <textarea name="reason" placeholder="The Reason">{{ reason or '' }}</textarea>
</div>
<div class="grid-18">
<input id="disable_users" name="disable_users" type="checkbox" {% if disable_users %}checked{% endif %}>