kallithea Changeset - acfe79f23961

Changeset - acfe79f23961

Parent rev.

Child rev.

[Not reviewed]

default

0 11 0

Mads Kiilerich - 9 years ago 2016-12-04 22:53:37
mads@kiilerich.com

style: introduce Bootstrap compatible form-inline markup

Based on work by Dominik Ruf.

11 files changed with 25 insertions and 13 deletions:

kallithea/public/css/style.css

kallithea/templates/admin/admin.html

kallithea/templates/admin/my_account/my_account_api_keys.html

kallithea/templates/admin/permissions/permissions_globals.html

kallithea/templates/admin/settings/settings_hooks.html

kallithea/templates/admin/users/user_edit_api_keys.html

kallithea/templates/changelog/changelog.html

kallithea/templates/files/files_add.html

kallithea/templates/files/files_edit.html

kallithea/templates/journal/journal.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -897,19 +897,31 @@ div.header img { @@
 input[readonly],
 input.disabled {
     background-color: #F5F5F5 !important;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div.form-inline,
 #content div.panel div.form div.form-horizontal div.form-group > div.form-inline,
 #content div.panel div.form div.form-horizontal div.form-group > div.form-inline {
     display: inline;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div select.form-control,
 #content div.panel div.form div.form-horizontal div.form-group > div div.form-control.select2-container,
 #content div.panel div.form div.form-horizontal div.form-group > div input.form-control {
     width: 100%;
     margin: 5px 0 10px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div.form-inline select.form-control,
 #content div.panel div.form div.form-horizontal div.form-group > div.form-inline div.form-control.select2-container,
 #content div.panel div.form div.form-horizontal div.form-group > div.form-inline input.form-control {
     width: inherit;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div input.date {
     width: 177px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div input.button {
     background: #D4D0C8;

kallithea/templates/admin/admin.html

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ @@
 <%block name="title">
     ${_('Admin Journal')}
 </%block>
 <%def name="breadcrumbs_links()">
     <form id="filter_form">
+    <form id="filter_form" class="form-inline">
     <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/>
     <span data-toggle="tooltip" title="${h.journal_filter_help()}">?</span>
     <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/>
     ${_('Admin Journal')} - ${ungettext('%s Entry', '%s Entries', c.users_log.item_count) % (c.users_log.item_count)}
     </form>
     ${h.end_form()}

kallithea/templates/admin/my_account/my_account_api_keys.html

➞

Show inline comments

@@ @@ -55,13 +55,13 @@ @@
     ${h.form(url('my_account_api_keys'), method='post')}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label for="description">${_('New API key')}:</label>
                 <div>
+                <div class="form-inline">
                     ${h.text('description', class_='form-control', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">

kallithea/templates/admin/permissions/permissions_globals.html

➞

Show inline comments

@@ @@ -10,37 +10,37 @@ ${h.form(url('admin_permissions'), metho @@
                     </div>
                      <span class="help-block">${h.literal(_('Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions.' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_repo_perm">${_('Repository')}:</label>
                 <div>
+                <div class="form-inline">
                     ${h.select('default_repo_perm','',c.repo_perms_choices)}
                     ${h.checkbox('overwrite_default_repo','true')}
                     <label for="overwrite_default_repo">
                     <span data-toggle="tooltip"
                         title="${_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost')}">
                     ${_('Apply to all existing repositories')}</span> </label>
                     <span class="help-block">${_('Permissions for the Default user on new repositories.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_group_perm">${_('Repository group')}:</label>
                 <div>
+                <div class="form-inline">
                     ${h.select('default_group_perm','',c.group_perms_choices)}
                     ${h.checkbox('overwrite_default_group','true')}
                     <label for="overwrite_default_group">
                     <span data-toggle="tooltip"
                         title="${_('All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost')}">
                     ${_('Apply to all existing repository groups')}</span> </label>
                     <span class="help-block">${_('Permissions for the Default user on new repository groups.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_user_group_perm">${_('User group')}:</label>
                 <div>
+                <div class="form-inline">
                     ${h.select('default_user_group_perm','',c.user_group_perms_choices)}
                     ${h.checkbox('overwrite_default_user_group','true')}
                     <label for="overwrite_default_user_group">
                     <span data-toggle="tooltip"
                         title="${_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost')}">
                     ${_('Apply to all existing user groups')}</span></label>

kallithea/templates/admin/settings/settings_hooks.html

➞

Show inline comments

@@ @@ -17,13 +17,13 @@ @@
 <h4>${_('Custom Hooks')}</h4>
 ${h.form(url('admin_settings_hooks'), method='post')}
 <div class="form">
     <div class="form-horizontal">
         %for hook in c.custom_hooks:
             <div class="form-group" id="${'id%s' % hook.ui_id }">
+            <div class="form-group form-inline" id="${'id%s' % hook.ui_id }">
                 <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label>
                 <div style="margin-left:280px">
                     ${h.hidden('hook_ui_key',hook.ui_key)}
                     ${h.hidden('hook_ui_value',hook.ui_value)}
                     ${h.text('hook_ui_value_new',hook.ui_value,size=60)}
                     <span class="btn btn-default btn-xs"
@@ @@ -32,13 +32,13 @@ ${h.form(url('admin_settings_hooks'), me @@
                         ${_('Delete')}
                     </span>
                 </div>
             </div>
         %endfor
         <div class="form-group">
+        <div class="form-group form-inline">
             <label>
                 ${h.text('new_hook_ui_key',size=20)}
             </label>
             <div style="margin-left:280px">
                 ${h.text('new_hook_ui_value',size=60)}
             </div>

kallithea/templates/admin/users/user_edit_api_keys.html

➞

Show inline comments

@@ @@ -55,13 +55,13 @@ @@
     ${h.form(url('edit_user_api_keys_update', id=c.user.user_id))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="description">${_('New API key')}:</label>
                 <div>
+                <div class="form-inline">
                     ${h.text('description', class_='form-control', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
             </div>
             <div class="form-group">

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -35,13 +35,13 @@ ${self.repo_context_bar('changelog', c.f @@
     <div class="table">
         %if c.pagination:
             <div>
                 <div style="overflow:auto; ${'display:none' if c.changelog_for_path else ''}">
                     <div class="container_header">
                         <div style="float:left; margin-left:20px;">
-                            ${h.form(h.url.current(),method='get',style="display:inline")}
+                            ${h.form(h.url.current(),method='get',class_="form-inline")}
                                 ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")}
                                 ${h.text('size',size=3,value=c.size)}
                                 ${_('revisions')}
                                 %if c.branch_name:
                                     ${h.hidden('branch', c.branch_name)}
                                 %endif

kallithea/templates/files/files_add.html

➞

Show inline comments

@@ @@ -32,13 +32,13 @@ ${self.repo_context_bar('files')} @@
               <span><a href="#">${_('Branch')}: ${c.cs.branch}</a></span>
             </li>
         </ul>
     </div>
     <div class="table" id="edit">
         <div id="files_data">
           ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal")}
+          ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal form-inline")}
           <h3 class="files_location">
             ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.f_path)} /
               <span id="filename_container" class="file reviewer_ac">
                   <input class="input-small" type="text" value="" size="30" name="filename" id="filename" placeholder="${_('Enter filename...')}">
                   <input type="hidden" value="${c.f_path}" size="30" name="location" id="location">
                   ${_('or')} <div class="btn btn-default btn-sm" id="upload_file_enable">${_('Upload File')}</div>

kallithea/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -33,13 +33,13 @@ ${self.repo_context_bar('files')} @@
             </li>
         </ul>
     </div>
     <div class="table" id="edit">
         <div id="files_data">
             <h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.file.path)}</h3>
             ${h.form(h.url.current(),method='post',id='eform')}
+            ${h.form(h.url.current(),method='post',id='eform',class_='form-inline')}
             <div id="body" class="codeblock">
             <div class="code-header">
                 <div class="stats">
                     <div class="left"><i class="icon-doc-inv"></i></div>
                     <div class="left item">${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="left item">${h.format_byte_size(c.file.size,binary=True)}</div>

kallithea/templates/journal/journal.html

➞

Show inline comments

@@ @@ -2,13 +2,13 @@ @@
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('Journal')}
 </%block>
 <%def name="breadcrumbs()">
     <h5>
     <form id="filter_form">
+    <form id="filter_form" class="form-inline">
     <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>
     <span data-toggle="tooltip" title="${h.journal_filter_help()}">?</span>
     <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/>
     ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}
     </form>
     ${h.end_form()}

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -64,13 +64,13 @@ summary = lambda n:{False:'summary-short @@
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="form">
         <div id="summary" class="form-horizontal">
             <div class="form-group clearfix">
+            <div class="form-group form-inline clearfix">
               <label>${_('Clone URL')}:</label>
                 <div class="${summary(c.show_stats)}">
                   ${self.repotag(c.db_repo)}
                   <input style="width:80%" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/>
                   <input style="display:none;width:80%" type="text" id="clone_url_id" readonly="readonly" value="${c.clone_repo_url_id}"/>
                   <div style="display:none" id="clone_by_name" class="btn btn-default btn-sm">${_('Show by Name')}</div>

0 comments (0 inline, 0 general)