Mercurial > kallithea
changeset 6672:f70a268bac41
style: replace file browse browserblock with Bootstrap panel
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 11 Jun 2017 15:02:09 +0200 |
parents | 5e3adb20839d |
children | 9d34bea3059d |
files | kallithea/public/css/style.css kallithea/templates/files/files.html kallithea/templates/files/files_browser.html |
diffstat | 3 files changed, 11 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/public/css/style.css Sun Jun 11 15:02:09 2017 +0200 @@ -2409,68 +2409,6 @@ text-decoration: none; color: inherit; } -div.browserblock { - overflow: hidden; - border: 1px solid #ccc; - background: #f8f8f8; - font-size: 100%; - line-height: 125%; - padding: 0; - border-radius: 6px 6px 0px 0px; -} - -div.browserblock .browser-header { - background: #FFF; - padding: 10px 0px 15px 0px; - width: 100%; -} - -div.browserblock .browser-nav { - float: left -} - -div.browserblock .browser-branch { - float: left; -} - -div.browserblock .browser-branch label { - color: #4A4A4A; - vertical-align: text-top; - padding-right: 2px; -} - -div.browserblock .browser-header span { - margin-left: 5px; - font-weight: 700; -} - -div.browserblock .browser-search { - clear: both; - padding: 8px 8px 0px 5px; - height: 20px; -} - -div.browserblock #node_filter_box { -} - -div.browserblock .search_activate { - float: left -} - -div.browserblock .add_node { - float: left; - padding-left: 5px; -} - -div.browserblock .search_activate a:hover, -div.browserblock .add_node a:hover { - text-decoration: none !important; -} - -div.browserblock .browser-body { - background: #EEE; - border-top: 1px solid #CCC; -} table.code-browser { border-collapse: collapse;
--- a/kallithea/templates/files/files.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/files/files.html Sun Jun 11 15:02:09 2017 +0200 @@ -246,7 +246,7 @@ var selected = e.currentTarget.options[e.currentTarget.selectedIndex].value; if(selected && selected != ${h.js(c.changeset.raw_id)}){ window.location = pyroutes.url('files_home', {'repo_name': ${h.js(h.safe_unicode(c.repo_name))}, 'revision': selected, 'f_path': ${h.js(h.safe_unicode(c.file.path))}}); - $("#body.browserblock").hide(); + $("#body").hide(); } else { $("#branch_selector").val(${h.js(c.changeset.raw_id)}); }
--- a/kallithea/templates/files/files_browser.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/files/files_browser.html Sun Jun 11 15:02:09 2017 +0200 @@ -24,38 +24,38 @@ %> <%return h.literal('<i class="%s"></i><span>%s</span>' % (c, h.escape(node.name)))%> </%def> -<div id="body" class="browserblock"> - <div class="browser-header"> - <div class="browser-nav"> +<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"> <div class="info_box_elem rev">${_('Revision')}</div> <div 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></div> - <div class="info_box_elem">${h.text('at_rev',value=c.changeset.revision,size=5)}</div> + <div class="info_box_elem">${h.text('at_rev',value=c.changeset.revision,size=5,class_='form-control input-sm')}</div> <div 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></div> </div> ${h.end_form()} </div> - <div class="browser-branch"> + <div class="browser-branch form-inline pull-left"> <label> - ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)} + ${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"> + <div id="search_activate_id" class="search_activate pull-left"> <a class="btn btn-default btn-xs" id="filter_activate" href="#">${_('Search File List')}</a> </div> - <div class="browser-search"> + <div class="browser-search form-inline pull-left"> <div> <div id="node_filter_box_loading" style="display:none">${_('Loading file list...')}</div> <div id="node_filter_box" style="display:none"> - ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}/<input class="init" type="text" value="type to search..." name="filter" size="25" id="node_filter"> + ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}/<input class="init form-control" type="text" value="type to search..." name="filter" size="25" id="node_filter"> </div> </div> </div> </div> - <div> + <div class="panel-body"> <table class="table code-browser"> <thead> <tr>