You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2018/09/04 16:27:56 UTC
[1/2] allura git commit: Remove some grid classes causing the audit
log table not to fit completely
Repository: allura
Updated Branches:
refs/heads/master e06a0c917 -> 280dab086
Remove some grid classes causing the audit log table not to fit completely
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/680862e9
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/680862e9
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/680862e9
Branch: refs/heads/master
Commit: 680862e9dc772a7414d3d09d738c919f3c87600c
Parents: ea27fd5
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Aug 31 11:02:02 2018 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Aug 31 11:02:02 2018 -0400
----------------------------------------------------------------------
Allura/allura/ext/admin/templates/audit.html | 2 --
Allura/allura/ext/admin/templates/widgets/audit.html | 4 ++--
Allura/allura/templates/site_admin_user_details.html | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/680862e9/Allura/allura/ext/admin/templates/audit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/audit.html b/Allura/allura/ext/admin/templates/audit.html
index 4de58b8..829f4ca 100644
--- a/Allura/allura/ext/admin/templates/audit.html
+++ b/Allura/allura/ext/admin/templates/audit.html
@@ -23,11 +23,9 @@
{% block header %}Project Audit{% endblock %}
{% block content %}
-<div class="grid-19">
{% if not entries %}
<p>There are no entries in the audit log to display.</p>
{% else %}
{{ c.widget.display(entries=entries, limit=limit, page=page, count=count) }}
{% endif %}
-</div>
{% endblock %}
http://git-wip-us.apache.org/repos/asf/allura/blob/680862e9/Allura/allura/ext/admin/templates/widgets/audit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/widgets/audit.html b/Allura/allura/ext/admin/templates/widgets/audit.html
index 5c9dc68..1e52df7 100644
--- a/Allura/allura/ext/admin/templates/widgets/audit.html
+++ b/Allura/allura/ext/admin/templates/widgets/audit.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-<div class="grid-{{ grid if grid else '19' }}">
+<div class="{{ class }}">
<div style="overflow:auto">
<table>
<thead>
@@ -44,7 +44,7 @@
</table>
</div>
</div>
-<div class="grid-{{ grid if grid else '19' }}" style="clear:both">
+<div class="{{ class }}" style="clear:both">
{{widget.fields.page_list.display(limit=limit, page=page, count=count)}}
{{widget.fields.page_size.display(limit=limit, count=count)}}
</div>
http://git-wip-us.apache.org/repos/asf/allura/blob/680862e9/Allura/allura/templates/site_admin_user_details.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_user_details.html b/Allura/allura/templates/site_admin_user_details.html
index efcdd42..3f97e99 100644
--- a/Allura/allura/templates/site_admin_user_details.html
+++ b/Allura/allura/templates/site_admin_user_details.html
@@ -121,7 +121,7 @@
</div>
</form>
{% if al['entries'] %}
- {{ c.audit_log_widget.display(entries=al['entries'], limit=al['limit'], page=al['page'], count=al['count'], grid='22') }}
+ {{ c.audit_log_widget.display(entries=al['entries'], limit=al['limit'], page=al['page'], count=al['count'], class='grid-22') }}
{% endif %}
</fieldset>
</div>
[2/2] allura git commit: Merge commit
'680862e9dc772a7414d3d09d738c919f3c87600c'
Posted by ke...@apache.org.
Merge commit '680862e9dc772a7414d3d09d738c919f3c87600c'
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/280dab08
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/280dab08
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/280dab08
Branch: refs/heads/master
Commit: 280dab08607d9e77004b26d508542db5122e25b5
Parents: e06a0c9 680862e
Author: Kenton Taylor <kt...@slashdotmedia.com>
Authored: Tue Sep 4 14:06:34 2018 +0000
Committer: Kenton Taylor <kt...@slashdotmedia.com>
Committed: Tue Sep 4 14:06:34 2018 +0000
----------------------------------------------------------------------
Allura/allura/ext/admin/templates/audit.html | 2 --
Allura/allura/ext/admin/templates/widgets/audit.html | 4 ++--
Allura/allura/templates/site_admin_user_details.html | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------