# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2020-10-08 10:50:57
# Node ID c6ccda607429070d5fa632ac0a7296b492056049
# Parent  b532b1b74fc1f51b9fe400ad23a0bda7fbd90c81

tables: unified tables for main pages of rhodecode repo pages.

diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -2660,6 +2660,7 @@ h3.files_location{
   li {
     list-style-type: none
   }
+
 }
 
 .grid-filter-box-icon {
diff --git a/rhodecode/public/css/summary.less b/rhodecode/public/css/summary.less
--- a/rhodecode/public/css/summary.less
+++ b/rhodecode/public/css/summary.less
@@ -477,23 +477,3 @@
     }
 
 }
-
-.rctable.repo_summary {
-    border: 1px solid #eaeaea;
-    border-radius: 2px;
-    border-collapse: inherit;
-    border-bottom: 0;
-
-    th {
-        background: @grey7;
-        border-bottom: 0;
-    }
-
-    td {
-        border-color: #eaeaea;
-    }
-
-    td.td-status {
-        padding: 0 0 0 10px;
-    }
-}
diff --git a/rhodecode/public/css/tables.less b/rhodecode/public/css/tables.less
--- a/rhodecode/public/css/tables.less
+++ b/rhodecode/public/css/tables.less
@@ -4,6 +4,25 @@
 // see style guide documentation for guidelines.
 
 // TABLES
+table.rctable.table-bordered {
+    border: 1px solid #eaeaea;
+    border-radius: 2px;
+    border-collapse: inherit;
+    border-bottom: 0;
+
+    th {
+        background: @grey7;
+        border-bottom: 0;
+    }
+
+    td {
+        border-color: #eaeaea;
+    }
+
+    td.td-status {
+        padding: 0 0 0 10px;
+    }
+}
 
 .rctable,
 table.rctable,
@@ -306,12 +325,14 @@ table.dataTable {
         }
     }
 }
+
 .rctable.audit-log {
     td {
                 vertical-align: top;
     }
 }
 
+
 // TRUNCATING
 // TODO: lisaq: should this possibly be moved out of tables.less?
 // for truncated text
@@ -426,15 +447,6 @@ table.keyboard-mappings {
     }
 }
 
-// Pull Request List Table
-#pull_request_list_table.dataTable {
-
-    //TODO: lisa: This needs to be removed once the description is adjusted
-    //            for using an expand_commit button (see issue 765)
-     td {
-         vertical-align: middle;
-     }
-}
 
 // Settings (no border)
 table.rctable.dl-settings {
@@ -484,9 +496,6 @@ table.trending_language_tbl {
 
 // Changesets
 #changesets.rctable {
-    th {
-        padding: 0 1em 0.65em 0;
-    }
 
     // td must be fixed height for graph
     td {
diff --git a/rhodecode/public/css/type.less b/rhodecode/public/css/type.less
--- a/rhodecode/public/css/type.less
+++ b/rhodecode/public/css/type.less
@@ -344,6 +344,10 @@ mark,
       width: 200px;
     }
 
+    #obj_count {
+      line-height: 34px;
+    }
+
 }
 
 #readme .title {
diff --git a/rhodecode/public/js/src/rhodecode/changelog.js b/rhodecode/public/js/src/rhodecode/changelog.js
--- a/rhodecode/public/js/src/rhodecode/changelog.js
+++ b/rhodecode/public/js/src/rhodecode/changelog.js
@@ -75,8 +75,8 @@ var CommitsController = function () {
             height: height,
             x_step: x_step,
             y_step: 42,
-            dotRadius: 3.5,
-            lineWidth: 2.5
+            dotRadius: 3.8,
+            lineWidth: 2.8
         };
 
         var prevCommitsData = this.$graphCanvas.data('commits') || [];
@@ -98,11 +98,12 @@ var CommitsController = function () {
 
         this.setLabelText(edgeData);
 
-        var padding = 90;
+        // main padding from top, aligns the first dot graph
+        var padding = 100;
         if (prev_link) {
             padding += 34;
+        }
 
-        }
         $('#graph_nodes').css({'padding-top': padding});
 
         $.each($('.message.truncate'), function(idx, value) {
diff --git a/rhodecode/templates/admin/my_account/my_account_pullrequests.mako b/rhodecode/templates/admin/my_account/my_account_pullrequests.mako
--- a/rhodecode/templates/admin/my_account/my_account_pullrequests.mako
+++ b/rhodecode/templates/admin/my_account/my_account_pullrequests.mako
@@ -33,7 +33,7 @@
         <h3 class="panel-title">${_('Pull Requests You Participate In')}</h3>
     </div>
     <div class="panel-body panel-body-min-height">
-        <table id="pull_request_list_table" class="display"></table>
+        <table id="pull_request_list_table" class="rctable table-bordered"></table>
     </div>
 </div>
 
diff --git a/rhodecode/templates/bookmarks/bookmarks.mako b/rhodecode/templates/bookmarks/bookmarks.mako
--- a/rhodecode/templates/bookmarks/bookmarks.mako
+++ b/rhodecode/templates/bookmarks/bookmarks.mako
@@ -30,11 +30,21 @@
           </ul>
         %endif
         %if c.has_references:
-            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-            <span id="obj_count">0</span> ${_('bookmarks')}
+            <div class="grid-quick-filter">
+                <ul class="grid-filter-box">
+                    <li class="grid-filter-box-icon">
+                        <i class="icon-search"></i>
+                    </li>
+                    <li class="grid-filter-box-input">
+                        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+                    </li>
+                </ul>
+            </div>
+            <div id="obj_count">0</div>
         %endif
       </div>
-      <table id="obj_list_table" class="display"></table>
+
+      <table id="obj_list_table" class="rctable table-bordered"></table>
     </div>
 
 
@@ -43,7 +53,9 @@
 
     var get_datatable_count = function(){
       var api = $('#obj_list_table').dataTable().api();
-      $('#obj_count').text(api.page.info().recordsDisplay);
+      var total = api.page.info().recordsDisplay
+      var _text = _ngettext('{0} bookmark', '{0} bookmarks', total).format(total);
+      $('#obj_count').text(_text);
     };
 
     // object list
diff --git a/rhodecode/templates/branches/branches.mako b/rhodecode/templates/branches/branches.mako
--- a/rhodecode/templates/branches/branches.mako
+++ b/rhodecode/templates/branches/branches.mako
@@ -30,11 +30,20 @@
           </ul>
         %endif
         %if c.has_references:
-            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-            <span id="obj_count">0</span> ${_('branches')}
+            <div class="grid-quick-filter">
+                <ul class="grid-filter-box">
+                    <li class="grid-filter-box-icon">
+                        <i class="icon-search"></i>
+                    </li>
+                    <li class="grid-filter-box-input">
+                        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+                    </li>
+                </ul>
+            </div>
+            <div id="obj_count">0</div>
         %endif
       </div>
-      <table id="obj_list_table" class="display"></table>
+      <table id="obj_list_table" class="rctable table-bordered"></table>
     </div>
 
 <script type="text/javascript">
@@ -42,7 +51,10 @@
 
     var get_datatable_count = function(){
       var api = $('#obj_list_table').dataTable().api();
-      $('#obj_count').text(api.page.info().recordsDisplay);
+      var total = api.page.info().recordsDisplay
+      var _text = _ngettext('{0} branch', '{0} branches', total).format(total);
+
+      $('#obj_count').text(_text);
     };
 
     // object list
diff --git a/rhodecode/templates/commits/changelog.mako b/rhodecode/templates/commits/changelog.mako
--- a/rhodecode/templates/commits/changelog.mako
+++ b/rhodecode/templates/commits/changelog.mako
@@ -99,7 +99,7 @@
             <div id="graph_content" class="graph_full_width">
 
               <div class="table">
-                <table id="changesets" class="rctable">
+                <table id="changesets" class="rctable table-bordered">
                     <tr>
                       ## checkbox
                       <th colspan="4">
diff --git a/rhodecode/templates/files/files_browser_tree.mako b/rhodecode/templates/files/files_browser_tree.mako
--- a/rhodecode/templates/files/files_browser_tree.mako
+++ b/rhodecode/templates/files/files_browser_tree.mako
@@ -10,7 +10,7 @@
         default_landing_ref = c.commit.raw_id
 %>
 <div id="file-tree-wrapper" class="browser-body ${('full-load' if c.full_load else '')}">
-    <table class="code-browser rctable repo_summary">
+    <table class="code-browser rctable table-bordered">
         <thead>
             <tr>
                 <th>${_('Name')}</th>
diff --git a/rhodecode/templates/pullrequests/pullrequests.mako b/rhodecode/templates/pullrequests/pullrequests.mako
--- a/rhodecode/templates/pullrequests/pullrequests.mako
+++ b/rhodecode/templates/pullrequests/pullrequests.mako
@@ -61,7 +61,7 @@
     </div>
 
     <div class="main-content-full-width">
-        <table id="pull_request_list_table" class="display"></table>
+        <table id="pull_request_list_table" class="rctable table-bordered"></table>
     </div>
 
 </div>
diff --git a/rhodecode/templates/summary/summary_commits.mako b/rhodecode/templates/summary/summary_commits.mako
--- a/rhodecode/templates/summary/summary_commits.mako
+++ b/rhodecode/templates/summary/summary_commits.mako
@@ -1,11 +1,11 @@
 ## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 %if c.repo_commits:
-<table class="rctable repo_summary table_disp">
+<table class="rctable table-bordered">
     <tr>
 
         <th class="status"></th>
-        <th>${_('Commit')}</th>
+        <th></th>
         <th>${_('Commit message')}</th>
         <th>${_('Age')}</th>
         <th>${_('Author')}</th>
diff --git a/rhodecode/templates/tags/tags.mako b/rhodecode/templates/tags/tags.mako
--- a/rhodecode/templates/tags/tags.mako
+++ b/rhodecode/templates/tags/tags.mako
@@ -30,11 +30,20 @@
           </ul>
         %endif
         %if c.has_references:
-            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-            <span id="obj_count">0</span> ${_('tags')}
+            <div class="grid-quick-filter">
+                <ul class="grid-filter-box">
+                    <li class="grid-filter-box-icon">
+                        <i class="icon-search"></i>
+                    </li>
+                    <li class="grid-filter-box-input">
+                        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+                    </li>
+                </ul>
+            </div>
+            <div id="obj_count">0</div>
         %endif
       </div>
-      <table id="obj_list_table" class="display"></table>
+      <table id="obj_list_table" class="rctable table-bordered"></table>
     </div>
 
 
@@ -43,7 +52,10 @@
 
     var get_datatable_count = function(){
       var api = $('#obj_list_table').dataTable().api();
-      $('#obj_count').text(api.page.info().recordsDisplay);
+      var total = api.page.info().recordsDisplay
+      var _text = _ngettext('{0} tag', '{0} tags', total).format(total);
+
+      $('#obj_count').text(_text);
     };
 
     // object list