kallithea Changeset - 71acaf87e5a2

Changeset - 71acaf87e5a2

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

domruf - 9 years ago 2016-09-21 19:58:44
dominikruf@gmail.com

templates: use bootstrap for progress bars

Based on work form Andrew Shadura <andrew@shadura.me>.

Further modified by Mads Kiilerich.

3 files changed with 23 insertions and 34 deletions:

kallithea/lib/helpers.py

kallithea/public/css/style.css

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -880,32 +880,12 @@ def fancy_file_stats(stats): @@
     :param stats: two element list of added/deleted lines of code
     """
     from kallithea.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
         MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE
     def cgen(l_type, a_v, d_v):
         mapping = {'tr': 'top-right-rounded-corner-mid',
                    'tl': 'top-left-rounded-corner-mid',
                    'br': 'bottom-right-rounded-corner-mid',
                    'bl': 'bottom-left-rounded-corner-mid'}
         map_getter = lambda x: mapping[x]
         if l_type == 'a' and d_v:
             #case when added and deleted are present
             return ' '.join(map(map_getter, ['tl', 'bl']))
         if l_type == 'a' and not d_v:
             return ' '.join(map(map_getter, ['tr', 'br', 'tl', 'bl']))
         if l_type == 'd' and a_v:
             return ' '.join(map(map_getter, ['tr', 'br']))
         if l_type == 'd' and not a_v:
             return ' '.join(map(map_getter, ['tr', 'br', 'tl', 'bl']))
     a, d = stats['added'], stats['deleted']
     width = 100
     if stats['binary']:
         #binary mode
         lbl = ''
@@ @@ -930,15 +910,15 @@ def fancy_file_stats(stats): @@
         #chmod can go with other operations
         if CHMOD_FILENODE in stats['ops']:
             _org_lbl = _('chmod')
             lbl += _org_lbl if lbl.endswith('+') else '+%s' % _org_lbl
         #import ipdb;ipdb.set_trace()
-        b_d = '<div class="bin bin%s %s" style="width:100%%">%s</div>' % (bin_op, cgen('a', a_v='', d_v=0), lbl)
+        b_d = '<div class="bin bin%s progress-bar" style="width:100%%">%s</div>' % (bin_op, lbl)
         b_a = '<div class="bin bin1" style="width:0%"></div>'
         return literal('<div style="width:%spx">%s%s</div>' % (width, b_a, b_d))
+        return literal('<div style="width:%spx" class="progress">%s%s</div>' % (width, b_a, b_d))
     t = stats['added'] + stats['deleted']
     unit = float(width) / (t or 1)
     # needs > 9% of width to be visible or 0 to be hidden
     a_p = max(9, unit * a) if a > 0 else 0
@@ @@ -952,19 +932,19 @@ def fancy_file_stats(stats): @@
         else:
             d_p = d_p - (p_sum - width)
     a_v = a if a > 0 else ''
     d_v = d if d > 0 else ''
     d_a = '<div class="added %s" style="width:%s%%">%s</div>' % (
         cgen('a', a_v, d_v), a_p, a_v
     d_a = '<div class="added progress-bar" style="width:%s%%">%s</div>' % (
         a_p, a_v
+    )
     d_d = '<div class="deleted %s" style="width:%s%%">%s</div>' % (
         cgen('d', a_v, d_v), d_p, d_v
     d_d = '<div class="deleted progress-bar" style="width:%s%%">%s</div>' % (
         d_p, d_v
+    )
     return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
+    return literal('<div class="pull-right progress" style="width:%spx">%s%s</div>' % (width, d_a, d_d))
 _URLIFY_RE = re.compile(r'''
 # URL markup
 (?P<url>%s) |
 # @mention markup

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1696,23 +1696,30 @@ a.metatag[data-tag="license"]:hover { @@
+}
 .trending_language_tbl, .trending_language_tbl tr {
     border-spacing: 1px;
+}
-.trending_language {
+#lang_stats .progress-bar {
     background-color: #577632;
     color: #FFF;
     display: block;
     min-width: 20px;
     text-decoration: none;
     height: 12px;
     margin-bottom: 0px;
     margin-left: 5px;
     white-space: pre;
     padding: 3px;
     border-top-right-radius: 8px;
     border-bottom-right-radius: 8px;
+}
 #lang_stats table td {
     border-bottom: none !important;
     padding: 1px 0 !important;
+}
 h3.files_location {
     font-size: 1.8em;
     font-weight: 700;
     border-bottom: none !important;

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -305,13 +305,13 @@ $(document).ready(function(){ @@
 <script type="text/javascript">
 $(document).ready(function(){
     var data = ${c.trending_languages|n};
     var total = 0;
     var no_data = true;
     var tbl = document.createElement('table');
-    tbl.setAttribute('class','trending_language_tbl');
+    tbl.setAttribute('class','table');
     var cnt = 0;
     for (var i=0;i<data.length;i++){
         total+= data[i][1].count;
+    }
     for (var i=0;i<data.length;i++){
         cnt += 1;
@@ @@ -325,33 +325,35 @@ $(document).ready(function(){ @@
+        }
         var k = data[i][0];
         var obj = data[i][1];
         var percentage = Math.round((obj.count/total*100),2);
         var td1 = document.createElement('td');
-        td1.width = 150;
+        td1.width = 250;
         var trending_language_label = document.createElement('div');
         trending_language_label.innerHTML = obj.desc+" ("+k+")";
         td1.appendChild(trending_language_label);
         var td2 = document.createElement('td');
         td2.setAttribute('style','padding-right:14px !important');
         var trending_language = document.createElement('div');
         var nr_files = obj.count+" ${_('files')}";
         trending_language.title = k+" "+nr_files;
         if (percentage>22){
             trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"% "+nr_files+ "</b>";
             trending_language.innerHTML = "<b class='progress-bar' role='progressbar'"
                 + "aria-valuemin='0' aria-valuemax='100' aria-valuenow='" + percentage
                 + "' style='width: " + percentage + "%;'>" + percentage + "%, " + nr_files + "</b>";
+        }
         else{
             trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"%</b>";
             trending_language.innerHTML = "<b class='progress-bar' role='progressbar'"
                 + "aria-valuemin='0' aria-valuemax='100' aria-valuenow='" + percentage
                 + "' style='width: " + percentage + "%;'>" + percentage + "%</b>";
+        }
         trending_language.setAttribute("class", 'trending_language top-right-rounded-corner bottom-right-rounded-corner');
         trending_language.style.width=percentage+"%";
         td2.appendChild(trending_language);
         tr.appendChild(td1);
         tr.appendChild(td2);
         tbl.appendChild(tr);
         if(cnt == 3){

0 comments (0 inline, 0 general)