diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index d6e42b73..8b0393c4 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -246,6 +246,14 @@ +${next.headerIncludes()} + +
+ ${next.body()} +
+ +${next.modalIncludes()} + % if _session['user_group'] != 'admin': + + +<%def name="modalIncludes()"> + % if _session['user_group'] == 'admin' and config['update_show_changelog']: % endif + <%def name="javascriptIncludes()"> diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index f1825441..09d2ffe8 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -410,28 +410,6 @@ DOCUMENTATION :: END - - - @@ -440,6 +418,31 @@ DOCUMENTATION :: END % endif +<%def name="modalIncludes()"> + + + + + <%def name="javascriptIncludes()"> diff --git a/data/interfaces/default/js/tables/history_table_modal.js b/data/interfaces/default/js/tables/history_table_modal.js index 8ba5ba8f..1d0a6b61 100644 --- a/data/interfaces/default/js/tables/history_table_modal.js +++ b/data/interfaces/default/js/tables/history_table_modal.js @@ -27,7 +27,6 @@ history_table_modal_options = { "pageLength": 10, "lengthChange": false, "autoWidth": false, - "scrollX": true, "order": [0, 'desc'], "columnDefs": [ { diff --git a/data/interfaces/default/libraries.html b/data/interfaces/default/libraries.html index 53588362..ef4dd613 100644 --- a/data/interfaces/default/libraries.html +++ b/data/interfaces/default/libraries.html @@ -64,28 +64,31 @@ - + + + +<%def name="modalIncludes()"> + - <%def name="javascriptIncludes()"> diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html index fd745e57..5e2b362a 100644 --- a/data/interfaces/default/library.html +++ b/data/interfaces/default/library.html @@ -82,9 +82,6 @@ DOCUMENTATION :: END -
@@ -284,28 +281,6 @@ DOCUMENTATION :: END
- - - @@ -335,6 +310,34 @@ DOCUMENTATION :: END % endif +<%def name="modalIncludes()"> + + + + + + <%def name="javascriptIncludes()"> diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html index 96a17f40..497884de 100644 --- a/data/interfaces/default/logs.html +++ b/data/interfaces/default/logs.html @@ -130,8 +130,6 @@ - @@ -152,6 +150,11 @@ +<%def name="modalIncludes()"> + + + <%def name="javascriptIncludes()"> diff --git a/data/interfaces/default/search.html b/data/interfaces/default/search.html index 5588025b..416202c9 100644 --- a/data/interfaces/default/search.html +++ b/data/interfaces/default/search.html @@ -23,6 +23,9 @@ +<%def name="modalIncludes()"> + + <%def name="javascriptIncludes()"> diff --git a/data/interfaces/default/update_metadata.html b/data/interfaces/default/update_metadata.html index bf851e71..c177b6d1 100644 --- a/data/interfaces/default/update_metadata.html +++ b/data/interfaces/default/update_metadata.html @@ -98,46 +98,6 @@ DOCUMENTATION :: END
  Loading search results...
- @@ -166,6 +126,51 @@ DOCUMENTATION :: END % endif +<%def name="modalIncludes()"> + + + <%def name="javascriptIncludes()"> % if query: diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html index 79cacc58..3bf26bd4 100644 --- a/data/interfaces/default/user.html +++ b/data/interfaces/default/user.html @@ -72,8 +72,6 @@ DOCUMENTATION :: END -
@@ -306,28 +304,6 @@ DOCUMENTATION :: END
- - - @@ -357,6 +333,33 @@ DOCUMENTATION :: END % endif +<%def name="modalIncludes()"> + + + + + + <%def name="javascriptIncludes()"> diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html index 9765b8da..25087e10 100644 --- a/data/interfaces/default/users.html +++ b/data/interfaces/default/users.html @@ -46,32 +46,35 @@ - - - + + + +<%def name="modalIncludes()"> + + + - <%def name="javascriptIncludes()">