kallithea Changeset - 9846e4d1f9cd

Changeset - 9846e4d1f9cd

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich - 8 years ago 2017-06-25 18:27:28
mads@kiilerich.com

style: drop some redundant and empty divs

6 files changed with 12 insertions and 14 deletions:

kallithea/templates/admin/repos/repo_creating.html

kallithea/templates/admin/user_groups/user_group_edit_settings.html

kallithea/templates/base/root.html

kallithea/templates/files/diff_2way.html

kallithea/templates/followers/followers_data.html

kallithea/templates/forks/forks_data.html

0 comments (0 inline, 0 general)

kallithea/templates/admin/repos/repo_creating.html

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ @@
             <h4 class="text-center">
                 ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
             </h4>
         <div id="progress">
             <div class="progress progress-striped active">
-                <div class="progress-bar progress-bar" role="progressbar"
                 <div class="progress-bar" role="progressbar"
                     aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">
                 </div>
             </div>
         </div>
         <div id="progress_error" style="display: none;">
             <div class="alert alert-danger">

kallithea/templates/admin/user_groups/user_group_edit_settings.html

➞

Show inline comments

@@ @@ -20,24 +20,28 @@ ${h.form(url('update_users_group', id=c. @@
                         ${h.checkbox('users_group_active',value=True)}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label">${_('Members')}:</label>
                     <div>
                         <div>
+                        <div class="pull-left">
                             <div class="text">${_('Chosen group members')}</div>
-                            ${h.select('users_group_members',[],c.group_members,multiple=True,size=8,style="min-width:210px",class_='form-control')}
                             ${h.select('users_group_members',[],c.group_members,multiple=True,size=8,style="width:210px",class_='form-control')}
                         </div>
                         <div class="pull-left">
                           <div class="text">&nbsp;</div>
                         <div>
                             <i id="add_element" class="icon-left-open" title="Choose selected available"></i>
                             <div></div>
                           </div>
                           <div>
                             <i id="remove_element" class="icon-right-open" title="Remove selected chosen"></i>
                         </div>
                         <div>
                         </div>
                         <div class="pull-left">
                             <div class="text">${_('Available members')}</div>
-                            ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px",class_='form-control')}
                             ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="width:210px",class_='form-control')}
                         </div>
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="buttons">
                         ${h.submit('Save',_('Save'),class_="btn btn-default")}

kallithea/templates/base/root.html

➞

Show inline comments

@@ @@ -104,13 +104,12 @@ @@
         </script>
         <%block name="head_extra"/>
     </head>
     <body>
       <nav class="navbar navbar-inverse">
         <div>
           <div class="navbar-header" id="logo">
             <a class="navbar-brand" href="${h.url('home')}">
                 <img class="pull-left" src="${h.url('/images/kallithea-logo.svg')}" alt="Kallithea"/>
                   %if c.site_name:
                     <span class="branding">${c.site_name}</span>
                   %endif
@@ @@ -122,13 +121,12 @@ @@
               <span class="icon-bar"></span>
             </button>
           </div>
           <div id="navbar" class="navbar-collapse collapse">
             <%block name="header_menu"/>
           </div>
         </div>
       </nav>
       ${next.body()}
       %if c.ga_code:
       ${h.literal(c.ga_code)}

kallithea/templates/files/diff_2way.html

➞

Show inline comments

@@ @@ -30,13 +30,12 @@ ${self.repo_context_bar('changelog')} @@
         ${self.breadcrumbs()}
     </div>
     <div class="no-padding panel-body">
         <div class="panel panel-default">
             <div class="panel-heading clearfix">
                 <div class="changeset_header">
                     <div class="pull-left">
                         ${h.link_to(h.safe_unicode(c.node1.path),h.url('files_home',repo_name=c.repo_name,
                         revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}
                     </div>
                     <div class="pull-left diff-actions">
                       <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full diff for this file')}">
@@ @@ -52,13 +51,12 @@ ${self.repo_context_bar('changelog')} @@
                           <i class="icon-floppy"></i>
                       </a>
                       ${h.checkbox('ignorews', label=_('Ignore whitespace'))}
                       ${h.checkbox('edit_mode', label=_('Edit'))}
                     </div>
                 </div>
             </div>
             <div id="compare"></div>
         </div>
     </div>
 <script>
 var orig1_url = ${h.jshtml(h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),revision=c.cs1.raw_id))};

kallithea/templates/followers/followers_data.html

➞

Show inline comments

@@ @@ -3,16 +3,15 @@ @@
 % for f in c.followers_pager:
     <div>
         <div class="follower_user">
             ${h.gravatar_div(f.user.email, size=24)}
             <span> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>
         </div>
         <div></div>
         <div class="follower_date">${_('Started following -')}
         <span data-toggle="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span></div>
         <div></div>
           <span data-toggle="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span>
         </div>
     </div>
 % endfor
 <ul class="pagination">
     ${c.followers_pager.pager()}
 </ul>

kallithea/templates/forks/forks_data.html

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
                 <span>
                  <b>${f.owner.username}</b> (${f.owner.name} ${f.owner.lastname}) /
                   ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}
                 </span>
                 <div>${f.description}</div>
             </div>
             <div></div>
             <div class="follower_date">${_('Forked')} -
                 <span data-toggle="tooltip" title="${h.fmt_date(f.created_on)}"> ${h.age(f.created_on)}</span>
                 <a title="${_('Compare fork with %s') % c.repo_name}"
                    href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}"
                    class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a>
             </div>

0 comments (0 inline, 0 general)