Merge pull request #442 from yhua123/patch-1

Fixed Table Title
This commit is contained in:
kun wang 2016-06-29 13:49:34 +08:00 committed by GitHub
commit 0f0bcfa484
3 changed files with 81 additions and 55 deletions

View File

@ -1,8 +1,16 @@
<div class="col-xs-4 col-md-12 down-table-pane">
<table class="table">
<div class="table-head-container">
<table class="table table-pane table-header">
<thead>
<th>// 'task_name' | tr //</th><th>// 'details' | tr //</th><th>// 'user' | tr //</th><th>// 'creation_time' | tr //</th>
<th>// 'task_name' | tr //</th>
<th>// 'details' | tr //</th>
<th>// 'user' | tr //</th>
<th>// 'creation_time' | tr //</th>
</thead>
</table>
</div>
<div class="table-body-container">
<table class="table table-pane">
<tbody>
<tr>
<td colspan="5" height="120px" class="empty-hint" ng-if="vm.integratedLogs.length === 0"><h3 class="text-muted">// 'no_user_logs' | tr //</h3></td>
@ -12,4 +20,5 @@
</tr>
</tbody>
</table>
</div>
</div>

View File

@ -11,14 +11,20 @@
<modal-dialog modal-title="// 'confirm_to_delete_user_title' | tr //" modal-message="// 'confirm_to_delete_user' | tr //" action="vm.deleteUser()"></modal-dialog>
<div class="pane">
<div class="sub-pane">
<table class="table table-pane">
<div class="table-head-container">
<table class="table table-pane table-header">
<thead>
<th>// 'username' | tr //</th>
<th>// 'email' | tr //</th>
<th>// 'registration_time' | tr //</th>
<th>// 'administrator' | tr //</th>
<th>// 'operation' | tr //</th>
<th width="15%">// 'username' | tr //</th>
<th width="20%">// 'email' | tr //</th>
<th width="35%">// 'registration_time' | tr //</th>
<th width="15%">// 'administrator' | tr //</th>
<th width="20%">// 'operation' | tr //</th>
</thead>
</table>
</div>
<div class="table-body-container">
<table class="table table-pane">
<tbody>
<tr ng-repeat="u in vm.users">
<td>//u.username//</td>
@ -34,6 +40,7 @@
</tbody>
</table>
</div>
</div>
<div class="col-xs-4 col-md-12 well well-sm well-custom">
<div class="col-md-offset-10">//vm.users ? vm.users.length : 0// items</div>
</div>

View File

@ -24,10 +24,19 @@
</div>
<add-project ng-show="vm.isOpen" is-open="vm.isOpen"></add-project>
<div class="sub-pane">
<table class="table">
<div class="table-head-container">
<table class="table table-pane table-header">
<thead>
<th>// 'project_name' | tr //</th><th>// 'repositories' | tr //</th><th ng-if="!vm.publicity">// 'role' | tr //</th><th>// 'creation_time' | tr //</th><th>// 'publicity' | tr //</th>
<th width="15%">// 'project_name' | tr //</th>
<th width="10%">// 'repositories' | tr //</th>
<th width="25%" ng-if="!vm.publicity">// 'role' | tr //</th>
<th width="30%">// 'creation_time' | tr //</th>
<th width="15%">// 'publicity' | tr //</th>
</thead>
</table>
</div>
<div class="table-body-container">
<table class="table table-pane">
<tbody>
<tr>
<td colspan="5" height="320px" class="empty-hint" ng-if="vm.projects.length === 0"><h3 class="text-muted">// 'no_projects_add_new_project' | tr //</h3></td>
@ -42,6 +51,7 @@
</tbody>
</table>
</div>
</div>
<div class="col-xs-4 col-md-12 well well-sm well-custom"><div class="col-md-offset-10">//vm.projects ? vm.projects.length : 0// // 'items' | tr //</div></div>
</div>
</div>