From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/admin/templates/software_package_list.htm | 73 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
index f9e1a25..31969c0 100644
--- a/interface/web/admin/templates/software_package_list.htm
+++ b/interface/web/admin/templates/software_package_list.htm
@@ -1,50 +1,55 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_package">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/software_package_list.php?action=repoupdate');">
- <span>{tmpl_var name="repoupdate_txt"}</span>
- </button>
- </div>
- </fieldset>
- </div>
+ <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="btn btn-default formbutton-success" type="button" data-load-content="admin/software_package_list.php?action=repoupdate">{tmpl_var name="repoupdate_txt"}</button>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
- <th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
- <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
- <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_id_txt"></th>
- <th class="tbl_col_buttons" scope="col"> </th>
+
+ <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark form-group-sm">
+ <tr>
+ <th data-column="installed"><tmpl_var name="installed_txt"></th>
+ <th data-column="package_title"><tmpl_var name="package_title_txt"></th>
+ <th data-column="package_description"><tmpl_var name="package_description_txt"></th>
+ <th data-column="package_id"><tmpl_var name="package_id_txt"></th>
+ <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
</tr>
</thead>
<tbody>
- <tmpl_loop name="records">
- <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
- <td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
- <td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
- <td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name="software_update_inst_id"}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <tmpl_loop name="records">
+ <tmpl_if name="has_packages">
+ <tr>
+ <td>{tmpl_var name="installed"}</td>
+ <td>{tmpl_var name="package_title"}</td>
+ <td>{tmpl_var name="package_description"}</td>
+ <td>ispapp{tmpl_var name="package_id"}</td>
+ <td class="text-right">
+ <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="admin/software_package_edit.php?id={tmpl_var name='package_id'}"><span class="icon icon-edit"></span></a>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/software_package_del.php?software_update_inst_id={tmpl_var name='software_update_inst_id'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
</td>
</tr>
+ </tmpl_if>
</tmpl_loop>
+ <tmpl_unless name="records">
+ <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <td colspan="5">{tmpl_var name='no_packages_txt'}</td>
+ </tr>
+ </tmpl_unless>
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"></td>
+ <td colspan="5"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
--
Gitblit v1.9.1