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 | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
index 416e699..31969c0 100644
--- a/interface/web/admin/templates/software_package_list.htm
+++ b/interface/web/admin/templates/software_package_list.htm
@@ -4,38 +4,36 @@
<p><tmpl_var name="list_desc_txt"></p>
- <p>{tmpl_var name="toolsarea_head_txt"}</p>
+ <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
- <button class="button iconstxt icoAdd" type="button" data-load-content="admin/software_package_list.php?action=repoupdate">
- <span>{tmpl_var name="repoupdate_txt"}</span>
- </button>
+ <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>
- <p><tmpl_var name="list_head_txt"></p>
+ <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
- <th><tmpl_var name="installed_txt"></th>
- <th><tmpl_var name="package_title_txt"></th>
- <th><tmpl_var name="package_description_txt"></th>
- <th><tmpl_var name="package_id_txt"></th>
- <th>{tmpl_var name='search_limit'}</th>
+ <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">
<tmpl_if name="has_packages">
- <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <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>
- <a class="button icons16 icoEdit" data-load-content="admin/software_package_edit.php?id={tmpl_var name='package_id'}"><span>{tmpl_var name='edit_txt'}</span></a>
- <a class="btn btn-default formbutton-delete" 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'}');">{tmpl_var name='delete_txt'}</button>
+ <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>
--
Gitblit v1.9.1