kallithea Changeset - 9d34bea3059d

Changeset - 9d34bea3059d

Parent rev.

Child rev.

[Not reviewed]

default

0 16 0

Mads Kiilerich - 8 years ago 2017-06-11 15:02:09
mads@kiilerich.com

style: various minor-ish markup changes, preparing for Bootstrap

16 files changed with 60 insertions and 34 deletions:

kallithea/public/css/style.css

kallithea/templates/admin/admin.html

kallithea/templates/admin/auth/auth_settings.html

kallithea/templates/admin/gists/new.html

kallithea/templates/admin/settings/settings_hooks.html

kallithea/templates/admin/settings/settings_system.html

kallithea/templates/admin/settings/settings_visual.html

kallithea/templates/base/base.html

kallithea/templates/changelog/changelog.html

kallithea/templates/changeset/changeset_file_comment.html

kallithea/templates/compare/compare_cs.html

kallithea/templates/files/diff_2way.html

kallithea/templates/files/files_add.html

kallithea/templates/pullrequests/pullrequest_data.html

kallithea/templates/pullrequests/pullrequest_show.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1977,13 +1977,13 @@ tr.out-of-range > td.mid > .message > a @@
     white-space: nowrap;
     height: 31px;
     border-color: #cdcdcd;
     text-align: left;
+}
 #graph_content .container .checkbox {
+#graph_content .container .checkbox-column {
     width: 14px;
     font-size: 0.85em;
+}
 #graph_content .container .status {
     width: 14px;
@@ @@ -2948,12 +2948,16 @@ input[disabled].btn, @@
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #fbb450, #f89406);
     border-color: #f89406 #f89406 #ad6704;
     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;
+}
 .btn.active {
     font-weight: bold;
@@ @@ -3737,12 +3741,13 @@ form.comment-inline-form { @@
 .inline-comments .comments-number {
     padding: 0px 0px 10px 0px;
     color: #666;
+}
 input.status_change_checkbox,
 input.status_change_radio {
     margin: 2px 0 5px 15px;
     vertical-align: middle;
+}
 .badge {
@@ @@ -3848,12 +3853,21 @@ span.pr-closed-tag { @@
+}
 #pr-summary .msg-div {
     margin: 5px 0;
+}
 #pr-summary > .pr-not-edit {
     min-height: 50px !important;
+}
 #pr-edit-btn {
     margin: 20px 0 0 !important;
     position: absolute;
+}
 /****
   PERMS
 *****/
 #perms .perms_section_head {
     padding: 10px 10px 10px 0px;
     font-size: 16px;
@@ @@ -4242,12 +4256,23 @@ div.codeblock div.code-header div.author @@
+}
 ul.user_group_member li {
     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;
     display: block;
     font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
     font-size: 12px;

kallithea/templates/admin/admin.html

➞

Show inline comments

@@ @@ -19,18 +19,16 @@ @@
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <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>
 <script>
 $(document).ready(function() {
   $('#j_filter').click(function(){
     var $jfilter = $('#j_filter');
     if($jfilter.hasClass('initial')){

kallithea/templates/admin/auth/auth_settings.html

➞

Show inline comments

@@ @@ -31,13 +31,13 @@ @@
             <div>
                 ${h.text("auth_plugins", class_='form-control')}
                 <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span>
             </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:
                     <li class="list-group-item">
                         <span data-plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugin_names else ''}">
                             ${_('Enabled') if plugin_path in c.enabled_plugin_names else _('Disabled')}

kallithea/templates/admin/gists/new.html

➞

Show inline comments

@@ @@ -39,14 +39,16 @@ @@
                         ${h.select('lifetime', '', c.lifetime_options)}
                     </label>
                 </div>
             </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>
                 </div>
             </div>
             <div>

kallithea/templates/admin/settings/settings_hooks.html

➞

Show inline comments

 <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>
       % 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>
       % endfor
     </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)}
                     ${h.hidden('hook_ui_value',hook.ui_value,id='hook_ui_value_'+input_id)}
                     ${h.text('hook_ui_value_new',hook.ui_value,id=input_id,size=60,class_='form-control')}
                     <span class="btn btn-default btn-xs"
                         onclick="delete_hook(${hook.ui_id},'${'id%s' % hook.ui_id }')">
                         <i class="icon-minus-circled" style="color:#FF4444"></i>
                         ${_('Delete')}
                     </span>
                 </div>
         %endfor
             </div>
         %endfor
         <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')}
             </div>
         </div>
         <div class="form-group">

kallithea/templates/admin/settings/settings_system.html

➞

Show inline comments

 <div id="update_notice" style="display: none">
     <div style="padding: 5px 0px 5px 0px; color: #000000; font-weight: bold">${_('Checking for updates...')}</div>
 </div>
 <%
  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, ''),
     (_('Git version'), c.git_version, ''),
     (_('Git path'), c.ini.get('git_path'), ''),
     (_('Upgrade info endpoint'), h.literal('%s <br/><span class="text-muted">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this URL'))), ''),

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

@@ @@ -89,16 +89,18 @@ ${h.form(url('admin_settings_visual'), m @@
             </div>
             <div class="form-group">
                 <label class="control-label" for="stylify_metatags">${_('Meta Tagging')}:</label>
                 <div>
                     <div class="checkbox">
                         <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>
                             <li>[stale] <span class="metatag" data-tag="stale">stale</span></li>
                             <li>[dead] <span class="metatag" data-tag="dead">dead</span></li>
                             <li>[lang =&gt; lang] <span class="metatag" data-tag="lang">lang</span></li>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -118,13 +118,13 @@ @@
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <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>
         %else:
         <li class="${'active' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_home', repo_name=c.repo_name)}"><i class="icon-clock"></i> ${_('Changelog')}</a></li>
         %endif
@@ @@ -182,13 +182,13 @@ @@
   </nav>
   <script type="text/javascript">
     $(document).ready(function() {
       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) {
               return obj.text;
           },
           formatSelection: function(obj) {
@@ @@ -196,13 +196,13 @@ @@
           },
           formatNoMatches: function(term) {
               return ${h.jshtml(_('No matches found'))};
           },
           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;
+              }
               return Select2.util.escapeMarkup(m);
           },
           containerCssClass: "branch-switcher",
@@ @@ -446,25 +446,25 @@ @@
+                }
                 tmpl += state.text;
                 return tmpl;
+            }
             $("#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,
                 formatSelection: format,
                 formatNoMatches: function(term){
                     return ${h.jshtml(_('No matches found'))};
                 },
                 containerCssClass: "repo-switcher",
                 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;
+                    }
                     return Select2.util.escapeMarkup(m);
                 },
                 query: function(query){

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -70,13 +70,13 @@ ${self.repo_context_bar('changelog', c.f @@
                 <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">
                 <table class="table" id="changesets">
                 <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:
                                 ${h.checkbox(cs.raw_id,class_="changeset_range")}
                             %endif
                         <td class="status">

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -82,17 +82,17 @@ @@
                 %if c.pull_request is not None and ( \
                     h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionLevel('admin')(c.repo_name) \
                     or c.pull_request.owner_id == request.authuser.user_id):
                 <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>
                 %endif
         </div>

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

 ## Changesets table !
-<div class="container">
 <div>
   %if not c.cs_ranges:
     <span class="empty_data">${_('No changesets')}</span>
   %else:
     %if c.ancestors:
       <div class="ancestor">

kallithea/templates/files/diff_2way.html

➞

Show inline comments

@@ @@ -29,13 +29,13 @@ ${self.repo_context_bar('changelog')} @@
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <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,
                         revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}
                     </div>
                     <div class="pull-left diff-actions">

kallithea/templates/files/files_add.html

➞

Show inline comments

@@ @@ -45,13 +45,13 @@ ${self.repo_context_bar('files')} @@
               <span id="upload_file_container" class="reviewer_ac" style="display:none">
                   <input class="form-control" type="file" size="20" name="upload_file" id="upload_file">
                   ${_('or')} <span class="btn btn-default btn-sm" id="file_enable">${_('Create New File')}</span>
               </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>
                     </label>
                   </div>
               </div>

kallithea/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ @@
         <th class="left">${_('Vote')}</th>
         <th class="left">${_('Title')}</th>
         <th class="left">${_('Owner')}</th>
         <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:
     <tr class="${'pr-closed' if pr.is_closed() else ''}">
       <td width="80px">
         <% status = pr.user_review_status(request.authuser.user_id) %>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -34,18 +34,18 @@ ${self.repo_context_bar('showpullrequest @@
       </div>
       <div id="pr-summary" class="form-horizontal">
         <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>
         %if editable:
         <div class="pr-do-edit form-group" style="display:none">
               <label for="pullrequest_title">${_('Title')}:</label>

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -142,13 +142,13 @@ ${self.repo_context_bar('summary')} @@
               </a>
             </li>
             %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>
             %endif
             <li class="list-group-item">

0 comments (0 inline, 0 general)