Mercurial > kallithea

changeset 6812:fa4e94ad3dd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates: use span elements instead of left floating div <span> have a more natural (inline) flow, i.e. they already have proper spacing between the elements without additional styling. On files browser page, since the form element does not flow inline, it needs to include every element that should be in the first line.
author domruf <dominikruf@gmail.com>
date Wed, 28 Jun 2017 22:30:24 +0200
parents 3fca87aa2b15
children bff18f1f93d4
files kallithea/templates/files/files_browser.html kallithea/templates/files/files_edit.html kallithea/templates/files/files_history_box.html kallithea/templates/files/files_source.html
diffstat 4 files changed, 28 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/templates/files/files_browser.html	Tue Jun 27 21:49:33 2017 +0200
+++ b/kallithea/templates/files/files_browser.html	Wed Jun 28 22:30:24 2017 +0200
@@ -26,26 +26,26 @@
 </%def>
 <div id="body" class="panel panel-default">
     <div class="panel-heading clearfix">
-        <div class="browser-nav form-inline pull-left">
-            ${h.form(h.url.current())}
-            <div class="info_box">
+        ${h.form(h.url.current())}
+        <span class="browser-nav form-inline">
+            <span class="info_box">
               <span class="info_box_elem rev">${_('Revision')}</span>
               <span class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}"><i class="icon-left-open"></i></a></span>
               <span class="info_box_elem">${h.text('at_rev',value=c.changeset.revision,size=5,class_='form-control input-sm')}</span>
               <span class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_next}" title="${_('Next revision')}"><i class="icon-right-open"></i></a></span>
-            </div>
-            ${h.end_form()}
-        </div>
-        <div class="browser-branch form-inline pull-left">
+            </span>
+        </span>
+        <span class="browser-branch form-inline">
             <label>
                 ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch,class_="form-control")}
                 ${_('Follow current branch')}
             </label>
-        </div>
-        <div id="search_activate_id" class="search_activate pull-left">
+        </span>
+        <span id="search_activate_id" class="search_activate">
             <a class="btn btn-default btn-xs" id="filter_activate" href="#">${_('Search File List')}</a>
-        </div>
-        <div class="browser-search form-inline pull-left">
+        </span>
+        ${h.end_form()}
+        <div class="browser-search form-inline">
             <div>
                 <div id="node_filter_box_loading" style="display:none">${_('Loading file list...')}</div>
                 <div id="node_filter_box" style="display:none">
--- a/kallithea/templates/files/files_edit.html	Tue Jun 27 21:49:33 2017 +0200
+++ b/kallithea/templates/files/files_edit.html	Wed Jun 28 22:30:24 2017 +0200
@@ -40,14 +40,14 @@
             </h3>
             <div id="body" class="panel panel-default">
               <div class="panel-heading clearfix">
-                    <div class="pull-left">
-                        <div class="pull-left"><i class="icon-doc-inv"></i></div>
-                        <div class="pull-left">${h.link_to(h.show_id(c.file.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div>
-                        <div class="pull-left">${h.format_byte_size(c.file.size,binary=True)}</div>
-                        <div class="pull-left">${c.file.mimetype}</div>
+                    <span>
+                        <span><i class="icon-doc-inv"></i></span>
+                        <span>${h.link_to(h.show_id(c.file.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</span>
+                        <span>${h.format_byte_size(c.file.size,binary=True)}</span>
+                        <span>${c.file.mimetype}</span>
                         <select class="form-control" id="mimetype" name="mimetype"></select>
-                    </div>
-                    <div class="pull-right buttons">
+                    </span>
+                    <span class="pull-right buttons">
                       ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
@@ -56,7 +56,7 @@
                         ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                        % endif
                       % endif
-                    </div>
+                    </span>
               </div>
               <div class="panel-body no-padding">
                 <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
--- a/kallithea/templates/files/files_history_box.html	Tue Jun 27 21:49:33 2017 +0200
+++ b/kallithea/templates/files/files_history_box.html	Wed Jun 28 22:30:24 2017 +0200
@@ -1,5 +1,5 @@
 <div class="form-group">
-    <div class="item">${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }</div>
+    <span>${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }</span>
     %for email, user in c.authors:
       <span data-toggle="tooltip" title="${user}">
         ${h.gravatar_div(email, size=20)}
--- a/kallithea/templates/files/files_source.html	Tue Jun 27 21:49:33 2017 +0200
+++ b/kallithea/templates/files/files_source.html	Wed Jun 28 22:30:24 2017 +0200
@@ -15,13 +15,13 @@
 
 <div id="body" class="panel panel-default">
     <div class="panel-heading clearfix">
-        <div class="pull-left">
-            <div class="pull-left img"><i class="icon-doc-inv"></i></div>
-            <div class="pull-left"><pre data-toggle="tooltip" title="${h.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</pre></div>
-            <div class="pull-left"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>
-            <div class="pull-left"><pre>${c.file.mimetype}</pre></div>
-        </div>
-        <div class="pull-right buttons">
+        <span>
+            <span class="img"><i class="icon-doc-inv"></i></span>
+            <span><pre data-toggle="tooltip" title="${h.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</pre></span>
+            <span><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></span>
+            <span><pre>${c.file.mimetype}</pre></span>
+        </span>
+        <span class="pull-right buttons">
               %if c.annotate:
                 ${h.link_to(_('Show Source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
               %else:
@@ -41,7 +41,7 @@
                 ${h.link_to(_('Delete'), '#', class_="btn btn-danger btn-xs disabled", title=_('Deleting files allowed only when on branch head revision'),**{'data-toggle':'tooltip'})}
                %endif
               %endif
-        </div>
+        </span>
     </div>
     <div class="panel-body">
       <div class="author">