Mercurial > kallithea
changeset 6673:9d34bea3059d
style: various minor-ish markup changes, preparing for Bootstrap
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 @@ -1980,7 +1980,7 @@ text-align: left; } -#graph_content .container .checkbox { +#graph_content .container .checkbox-column { width: 14px; font-size: 0.85em; } @@ -2951,6 +2951,10 @@ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } +.text-danger { + color: #a94442; +} + label.disabled { color: #aaa !important; } @@ -3740,6 +3744,7 @@ color: #666; } +input.status_change_checkbox, input.status_change_radio { margin: 2px 0 5px 15px; vertical-align: middle; @@ -3851,6 +3856,15 @@ margin: 5px 0; } +#pr-summary > .pr-not-edit { + min-height: 50px !important; +} + +#pr-edit-btn { + margin: 20px 0 0 !important; + position: absolute; +} + /**** PERMS *****/ @@ -4245,6 +4259,17 @@ clear: both; } +select.pull-right-auto-width { + float: right; + width: auto; +} + +span.expand-available { + display: block; + overflow: hidden; + padding-right: 15px; +} + .tooltip { position: absolute; z-index: 1070;
--- a/kallithea/templates/admin/admin.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/admin/admin.html Sun Jun 11 15:02:09 2017 +0200 @@ -22,10 +22,8 @@ <div class="panel-heading clearfix"> ${self.breadcrumbs()} </div> - <div class="panel-body"> - <div id="user_log"> + <div id="user_log" class="panel-body"> <%include file='admin_log.html'/> - </div> </div> </div>
--- a/kallithea/templates/admin/auth/auth_settings.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/admin/auth/auth_settings.html Sun Jun 11 15:02:09 2017 +0200 @@ -34,7 +34,7 @@ </div> </div> <div class="form-group"> - <label>${_('Available built-in plugins')}</label> + <label class="control-label">${_('Available built-in plugins')}</label> <div> <ul class="list-group"> %for plugin_path in c.available_plugins:
--- a/kallithea/templates/admin/gists/new.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/admin/gists/new.html Sun Jun 11 15:02:09 2017 +0200 @@ -42,8 +42,10 @@ </div> <div id="body" class="panel panel-default"> <div class="panel-heading"> - ${h.text('filename', size=30, placeholder=_('Name this gist ...'), class_='form-control')} - <select class="form-control" id="mimetype" name="mimetype"></select> + <select class="form-control pull-right-auto-width" id="mimetype" name="mimetype"></select> + <span class="expand-available"> + ${h.text('filename', size=30, placeholder=_('Name this gist ...'), class_='form-control auto-width')} + </span> </div> <div class="panel-body no-padding"> <textarea id="editor" name="content"></textarea>
--- a/kallithea/templates/admin/settings/settings_hooks.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/admin/settings/settings_hooks.html Sun Jun 11 15:02:09 2017 +0200 @@ -1,28 +1,27 @@ -<h4>${_('Built-in Mercurial Hooks (Read-Only)')}</h4> <div class="form"> <div class="form-horizontal"> + <div class="form-group"> + <h4>${_('Built-in Mercurial Hooks (Read-Only)')}</h4> % for hook in c.hooks: <% input_id = hook.ui_key.replace('.', '_') %> - <div class="form-group"> <label class="control-label" for="${input_id}">${hook.ui_key}</label> <div style="margin-left:280px"> ${h.text(hook.ui_key,hook.ui_value,id=input_id,size=60,readonly="readonly",class_='form-control')} </div> - </div> % endfor + <span class="help-block">${_('Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications.')}</span> + </div> </div> - <span class="help-block">${_('Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications.')}</span> </div> % if c.visual.allow_custom_hooks_settings: -<h4>${_('Custom Hooks')}</h4> ${h.form(url('admin_settings_hooks'), method='post')} <div class="form"> <div class="form-horizontal"> - + <div class="form-group form-inline" id="${'id%s' % hook.ui_id }"> + <h4>${_('Custom Hooks')}</h4> %for hook in c.custom_hooks: <% input_id = hook.ui_key.replace('.', '_') %> - <div class="form-group form-inline" id="${'id%s' % hook.ui_id }"> <label class="control-label" for="${input_id}">${hook.ui_key}</label> <div style="margin-left:280px"> ${h.hidden('hook_ui_key',hook.ui_key,id='hook_ui_key_'+input_id)} @@ -34,12 +33,12 @@ ${_('Delete')} </span> </div> - </div> %endfor + </div> <div class="form-group form-inline"> <label> - ${h.text('new_hook_ui_key',size=20,class_='form-control')} + ${h.text('new_hook_ui_key',size=15,class_='form-control')} </label> <div style="margin-left:280px"> ${h.text('new_hook_ui_value',size=60,class_='form-control')}
--- a/kallithea/templates/admin/settings/settings_system.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/admin/settings/settings_system.html Sun Jun 11 15:02:09 2017 +0200 @@ -4,7 +4,7 @@ <% elems = [ - (_('Kallithea version'), h.literal('%s <b><span style="color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('Check for updates'))), ''), + (_('Kallithea version'), h.literal('%s <b><span style="display:none; color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('Check for updates'))), ''), (_('Kallithea configuration file'), c.ini['__file__'], ''), (_('Python version'), c.py_version, ''), (_('Platform'), c.platform, ''),
--- a/kallithea/templates/admin/settings/settings_visual.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/admin/settings/settings_visual.html Sun Jun 11 15:02:09 2017 +0200 @@ -92,10 +92,12 @@ <label class="control-label" for="stylify_metatags">${_('Meta Tagging')}:</label> <div> <div class="checkbox"> - ${h.checkbox('stylify_metatags','True')} + <label> + ${h.checkbox('stylify_metatags','True')} + ${_('Parses meta tags from the repository description field and turns them into colored tags.')} + </label> </div> - <span class="help-block">${_('Parses meta tags from the repository description field and turns them into colored tags.')}</span> - <div> + <div class="help-block"> ${_('Stylify recognised meta tags:')} <ul class="list-unstyled"> <!-- Fix style here --> <li>[featured] <span class="metatag" data-tag="featured">featured</span></li>
--- a/kallithea/templates/base/base.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/base/base.html Sun Jun 11 15:02:09 2017 +0200 @@ -121,7 +121,7 @@ <span class="icon-bar"></span> </button> </div> - <ul id="context-pages" class="nav navbar-nav navbar-right navbar-collapse collapse"> + <ul id="context-pages" class="nav navbar-nav navbar-right"> <li class="${'active' if current == 'summary' else ''}" data-context="summary"><a href="${h.url('summary_home', repo_name=c.repo_name)}"><i class="icon-doc-text"></i> ${_('Summary')}</a></li> %if rev: <li class="${'active' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_file_home', repo_name=c.repo_name, revision=rev, f_path='')}"><i class="icon-clock"></i> ${_('Changelog')}</a></li> @@ -185,7 +185,7 @@ var bcache = {}; $("#branch_switcher").select2({ - placeholder: '<span class="navbar-text"> <i class="icon-exchange"></i> ' + ${h.jshtml(_('Switch To'))} + ' <span class="navbar-caret"></span></span>', + placeholder: '<i class="icon-exchange"></i> ' + ${h.jshtml(_('Switch To'))} + ' <span class="navbar-caret"></span>', dropdownAutoWidth: true, sortResults: prefixFirstSort, formatResult: function(obj) { @@ -199,7 +199,7 @@ }, escapeMarkup: function(m) { // don't escape our custom placeholder - if (m.substr(0, 25) == '<span class="navbar-text"') { + if (m.substr(0, 25) == '<i class="icon-exchange">') { return m; } @@ -449,7 +449,7 @@ } $("#repo_switcher").select2({ - placeholder: '<span class="navbar-text"><i class="icon-database"></i> ' + ${h.jshtml(_('Repositories'))} + ' <span class="navbar-caret"></span></span>', + placeholder: '<i class="icon-database"></i> ' + ${h.jshtml(_('Repositories'))} + ' <span class="navbar-caret"></span>', dropdownAutoWidth: true, sortResults: prefixFirstSort, formatResult: format, @@ -461,7 +461,7 @@ dropdownCssClass: "repo-switcher-dropdown", escapeMarkup: function(m){ // don't escape our custom placeholder - if(m.substr(0,55) == '<span class="navbar-text"><i class="icon-database"></i>'){ + if(m.substr(0,29) == '<i class="icon-database"></i>'){ return m; }
--- a/kallithea/templates/changelog/changelog.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/changelog/changelog.html Sun Jun 11 15:02:09 2017 +0200 @@ -73,7 +73,7 @@ <tbody> %for cnt,cs in enumerate(c.pagination): <tr id="chg_${cnt+1}" class="container ${'mergerow' if len(cs.parents) > 1 else ''}"> - <td class="checkbox"> + <td class="checkbox-column"> %if c.changelog_for_path: ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")} %else:
--- a/kallithea/templates/changeset/changeset_file_comment.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/changeset/changeset_file_comment.html Sun Jun 11 15:02:09 2017 +0200 @@ -85,11 +85,11 @@ <div> ${_('Finish pull request')}: <label class="checkbox-inline"> - <input id="save_close" type="checkbox" name="save_close"> + <input id="save_close" type="checkbox" name="save_close" class="status_change_checkbox"> ${_("Close")} </label> <label class="checkbox-inline"> - <input id="save_delete" type="checkbox" name="save_delete" value="delete"> + <input id="save_delete" type="checkbox" name="save_delete" value="delete" class="status_change_checkbox"> ${_("Delete")} </label> </div>
--- a/kallithea/templates/compare/compare_cs.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/compare/compare_cs.html Sun Jun 11 15:02:09 2017 +0200 @@ -1,5 +1,5 @@ ## Changesets table ! -<div class="container"> +<div> %if not c.cs_ranges: <span class="empty_data">${_('No changesets')}</span> %else:
--- a/kallithea/templates/files/diff_2way.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/files/diff_2way.html Sun Jun 11 15:02:09 2017 +0200 @@ -32,7 +32,7 @@ <div class="no-padding panel-body"> <div class="panel panel-default"> - <div class="panel-heading"> + <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,
--- a/kallithea/templates/files/files_add.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/files/files_add.html Sun Jun 11 15:02:09 2017 +0200 @@ -48,7 +48,7 @@ </span> </h3> <div id="body" class="panel panel-default"> - <div class="panel-heading"> + <div class="panel-heading clearfix"> <div class="pull-left"> <label>${_('New file type')} <select class="form-control" id="mimetype" name="mimetype"></select>
--- a/kallithea/templates/pullrequests/pullrequest_data.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Sun Jun 11 15:02:09 2017 +0200 @@ -17,7 +17,7 @@ <th class="left">${_('Age')}</th> <th class="left">${_('From')}</th> <th class="left">${_('To')}</th> - <th class="right" style="padding-right:5px">${_('Delete')}</th> + <th class="left">${_('Delete')}</th> </tr> </thead> % for pr in pullrequests:
--- a/kallithea/templates/pullrequests/pullrequest_show.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Sun Jun 11 15:02:09 2017 +0200 @@ -37,12 +37,12 @@ <div class="pr-not-edit form-group" style="min-height:47px"> <label>${_('Description')}:</label> %if editable: - <div style="margin: 20px 0; position: absolute"> + <div id="pr-edit-btn"> <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a> </div> %endif <div> - <div class="form-control formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div> + <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div> </div> </div>
--- a/kallithea/templates/summary/summary.html Sun Jun 11 15:02:09 2017 +0200 +++ b/kallithea/templates/summary/summary.html Sun Jun 11 15:02:09 2017 +0200 @@ -145,7 +145,7 @@ %if request.authuser.username != 'default': <li class="list-group-item clearfix"> <a href="#" onclick="javascript:showRepoSize('repo_size_2','${c.db_repo.repo_name}')"> - <i class="icon-ruler"></i> ${_('Repository Size')} + <i class="icon-ruler"></i> ${_('Size')} <span class="badge pull-right" id="repo_size_2"></span> </a> </li>