Changeset - d27572fa323c
[Not reviewed]
default
0 34 0
Mads Kiilerich - 9 years ago 2016-10-24 22:38:25
madski@unity3d.com
style: put all admin form buttons in a form-group, as our future Bootstrap likes it

Based on work by Dominik Ruf.
32 files changed with 76 insertions and 3 deletions:
0 comments (0 inline, 0 general)
kallithea/templates/admin/auth/auth_settings.html
Show inline comments
 
@@ -37,7 +37,9 @@
 
                    <li>
 
                      <div style="padding:3px 0px 3px 0px">
 
                          <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugins else ''}">
 
                          ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')}</span>${plugin_path}
 
                            ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')}
 
                        </span>
 
                        ${plugin_path}
 
                      </div>
 
                    </li>
 
               %endfor
 
@@ -97,11 +99,13 @@
 
        </div>
 
    %endfor
 
        <div class="form-horizontal">
 
            <div class="form-group">
 
            <div class="buttons">
 
                ${h.submit('save',_('Save'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
 

	
kallithea/templates/admin/defaults/defaults.html
Show inline comments
 
@@ -78,11 +78,13 @@
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
            ${h.submit('save',_('Save'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 

	
 
    ##<h3>${_('Groups defaults')}</h3>
kallithea/templates/admin/my_account/my_account_api_keys.html
Show inline comments
 
@@ -65,12 +65,14 @@
 
                    ${h.select('lifetime', '', c.lifetime_options)}
 
                </div>
 
             </div>
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Add'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
 

	
kallithea/templates/admin/my_account/my_account_emails.html
Show inline comments
 
@@ -45,11 +45,13 @@
 
                    ${h.text('new_email', class_='medium')}
 
                </div>
 
             </div>
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Add'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
kallithea/templates/admin/my_account/my_account_password.html
Show inline comments
 
@@ -32,12 +32,14 @@ ${h.form(url('my_account_password'), met
 
        </div>
 
     </div>
 

	
 
    <div class="form-group">
 
        <div class="buttons">
 
          ${h.submit('save',_('Save'),class_="btn btn-default")}
 
          ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
        </div>
 
    </div>
 
</div>
 
</div>
 
${h.end_form()}
 

	
 
%else:
kallithea/templates/admin/my_account/my_account_profile.html
Show inline comments
 
@@ -54,10 +54,12 @@ ${h.form(url('my_account'), method='post
 
                </div>
 
             </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Save'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
${h.end_form()}
kallithea/templates/admin/permissions/permissions_globals.html
Show inline comments
 
@@ -108,10 +108,12 @@ ${h.form(url('admin_permissions'), metho
 
                    ${h.select('default_extern_activate','',c.extern_activate_choices)}
 
                </div>
 
             </div>
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Save'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
${h.end_form()}
kallithea/templates/admin/permissions/permissions_ips.html
Show inline comments
 
@@ -34,10 +34,12 @@ ${h.form(url('edit_user_ips_update', id=
 
                    ${h.text('new_ip', class_='medium')}
 
                </div>
 
             </div>
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Add'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
${h.end_form()}
kallithea/templates/admin/repo_groups/repo_group_add.html
Show inline comments
 
@@ -65,11 +65,13 @@
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Save'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
 
<script>
kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
Show inline comments
 
@@ -29,6 +29,7 @@ ${h.form(url('update_repos_group',group_
 
                ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
 
            </div>
 
        </div>
 

	
 
        <div class="form-group">
 
            <div class="label label-checkbox">
 
                <label class="control-label" for="enable_locking">${_('Enable locking')}:</label>
 
@@ -38,22 +39,27 @@ ${h.form(url('update_repos_group',group_
 
                <span class="help-block">${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}</span>
 
            </div>
 
        </div>
 

	
 
        <div class="form-group">
 
        <div class="buttons">
 
          ${h.submit('save',_('Save'),class_="btn btn-default")}
 
          ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
        </div>
 
    </div>
 
</div>
 
</div>
 
${h.end_form()}
 

	
 
${h.form(url('delete_repo_group', group_name=c.repo_group.group_name))}
 
<div class="form">
 
    <div class="form-horizontal">
 
        <div class="form-group">
 
        <div class="buttons">
 
            ${h.submit('remove_%s' % c.repo_group.group_name,_('Remove this group'),class_="btn btn-danger",onclick="return confirm('"+_('Confirm to delete this group')+"');")}
 
        </div>
 
    </div>
 
</div>
 
</div>
 
${h.end_form()}
 

	
 
<script>
kallithea/templates/admin/repos/repo_add_base.html
Show inline comments
 
@@ -77,11 +77,13 @@ ${h.form(url('repos'))}
 
                <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
 
            </div>
 
        </div>
 
        <div class="form-group">
 
        <div class="buttons">
 
          ${h.submit('add',_('Add'),class_="btn btn-default")}
 
        </div>
 
    </div>
 
</div>
 
</div>
 
<script>
 
    $(document).ready(function(){
 
        var setCopyPermsOption = function(group_val){
kallithea/templates/admin/repos/repo_edit_fields.html
Show inline comments
 
@@ -54,12 +54,14 @@
 
                </div>
 
             </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Add'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
%else:
 
  <div style="font-size: 20px">
kallithea/templates/admin/repos/repo_edit_permissions.html
Show inline comments
 
@@ -97,7 +97,7 @@ ${h.form(url('edit_repo_perms_update', r
 
                </tr>
 
            </table>
 
        </div>
 
        <div class="buttons">
 
        <div class="form-group">
 
          ${h.submit('save',_('Save'),class_="btn btn-default")}
 
          ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
        </div>
kallithea/templates/admin/repos/repo_edit_settings.html
Show inline comments
 
@@ -123,12 +123,14 @@ ${h.form(url('update_repo', repo_name=c.
 
                 </div>
 
              %endfor
 
            %endif
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Save'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 

	
 
<script>
kallithea/templates/admin/settings/settings_email.html
Show inline comments
 
@@ -11,9 +11,11 @@ ${h.form(url('admin_settings_email'), me
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
            ${h.submit('send',_('Send'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
${h.end_form()}
kallithea/templates/admin/settings/settings_global.html
Show inline comments
 
@@ -57,10 +57,12 @@ ${h.form(url('admin_settings_global'), m
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
                ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
 
                ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
           </div>
 
        </div>
 
    </div>
 
    </div>
 
${h.end_form()}
kallithea/templates/admin/settings/settings_hooks.html
Show inline comments
 
@@ -49,11 +49,13 @@ ${h.form(url('admin_settings_hooks'), me
 
            ${h.text('new_hook_ui_value',size=60)}
 
        </div>
 
      </div>
 
      <div class="form-group">
 
      <div class="buttons" style="margin-left:280px">
 
         ${h.submit('save',_('Save'),class_="btn btn-default")}
 
      </div>
 
    </div>
 
</div>
 
</div>
 
${h.end_form()}
 
% endif
 

	
kallithea/templates/admin/settings/settings_mapping.html
Show inline comments
 
@@ -31,9 +31,11 @@ ${h.form(url('admin_settings_mapping'), 
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
            ${h.submit('rescan',_('Rescan Repositories'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
${h.end_form()}
kallithea/templates/admin/settings/settings_search.html
Show inline comments
 
@@ -16,9 +16,11 @@ ${h.form(url('admin_settings_search'), m
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
            ${h.submit('reindex',_('Reindex'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
${h.end_form()}
kallithea/templates/admin/settings/settings_vcs.html
Show inline comments
 
@@ -63,12 +63,14 @@ ${h.form(url('admin_settings'), method='
 
            ## form still requires this but we cannot internally change it anyway
 
            ${h.hidden('paths_root_path',size=30,readonly="readonly")}
 
            %endif
 
            <div class="form-group">
 
            <div class="buttons">
 
                ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
 
                ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
           </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 

	
 
    <script type="text/javascript">
kallithea/templates/admin/settings/settings_visual.html
Show inline comments
 
@@ -115,10 +115,12 @@ ${h.form(url('admin_settings_visual'), m
 
                 </div>
 
             </div>
 

	
 
            <div class="form-group">
 
             <div class="buttons">
 
                 ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
 
                 ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
             </div>
 
            </div>
 

	
 
        </div>
 
    </div>
kallithea/templates/admin/user_groups/user_group_add.html
Show inline comments
 
@@ -53,11 +53,13 @@
 
                </div>
 
             </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Save'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
 

	
kallithea/templates/admin/user_groups/user_group_edit_perms.html
Show inline comments
 
@@ -93,7 +93,7 @@ ${h.form(url('edit_user_group_perms_upda
 
                <tr class="new_members last_new_member" id="add_perm_input"></tr>
 
                <tr>
 
                    <td colspan="6">
 
                        <span id="add_perm" style="cursor: pointer;">
 
                        <span id="add_perm" class="btn">
 
                            <i class="icon-plus"></i> ${_('Add new')}
 
                        </span>
 
                    </td>
kallithea/templates/admin/user_groups/user_group_edit_settings.html
Show inline comments
 
@@ -56,11 +56,13 @@ ${h.form(url('update_users_group', id=c.
 
                    </div>
 

	
 
                </div>
 
                <div class="form-group">
 
                <div class="buttons">
 
                  ${h.submit('Save',_('Save'),class_="btn btn-default")}
 
                </div>
 
            </div>
 
    </div>
 
    </div>
 
${h.end_form()}
 
<script type="text/javascript">
 
  MultiSelectWidget('users_group_members','available_members','edit_users_group');
kallithea/templates/admin/users/user_add.html
Show inline comments
 
@@ -92,11 +92,14 @@
 

	
 
            ${h.hidden('extern_type', c.default_extern_type)}
 
            ${h.hidden('extern_name', c.default_extern_name)}
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Save'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
 

	
kallithea/templates/admin/users/user_edit_api_keys.html
Show inline comments
 
@@ -65,12 +65,15 @@
 
                    ${h.select('lifetime', '', c.lifetime_options)}
 
                </div>
 
             </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Add'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
 

	
kallithea/templates/admin/users/user_edit_emails.html
Show inline comments
 
@@ -45,11 +45,13 @@
 
                    ${h.text('new_email', class_='medium')}
 
                </div>
 
             </div>
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Add'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
kallithea/templates/admin/users/user_edit_ips.html
Show inline comments
 
@@ -45,11 +45,13 @@
 
                    ${h.text('new_ip', class_='medium')}
 
                </div>
 
             </div>
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Add'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
kallithea/templates/admin/users/user_edit_profile.html
Show inline comments
 
@@ -109,10 +109,12 @@ ${h.form(url('update_user', id=c.user.us
 
                </div>
 
             </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Save'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
</div>
 
</div>
 
${h.end_form()}
kallithea/templates/base/default_perms_box.html
Show inline comments
 
@@ -60,12 +60,15 @@ ${h.form(form_url)}
 
             </div>
 

	
 
            </div>
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
              ${h.submit('save',_('Save'),class_="btn btn-default")}
 
              ${h.reset('reset',_('Reset'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
${h.end_form()}
 

	
 
## JS
kallithea/templates/forks/fork.html
Show inline comments
 
@@ -72,6 +72,7 @@ ${self.repo_context_bar('createfork')}
 
                    <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
 
                </div>
 
            </div>
 

	
 
            <div class="form-group">
 
                <div class="label label-checkbox">
 
                    <label class="control-label" for="private">${_('Copy permissions')}:</label>
 
@@ -81,6 +82,7 @@ ${self.repo_context_bar('createfork')}
 
                    <span class="help-block">${_('Copy permissions from forked repository')}</span>
 
                </div>
 
            </div>
 

	
 
            %if c.can_update:
 
            <div class="form-group">
 
                <div class="label label-checkbox">
 
@@ -92,11 +94,14 @@ ${self.repo_context_bar('createfork')}
 
                </div>
 
            </div>
 
            %endif
 

	
 
            <div class="form-group">
 
            <div class="buttons">
 
                ${h.submit('',_('Fork this Repository'),class_="btn btn-default")}
 
            </div>
 
        </div>
 
    </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
 
<script>
kallithea/templates/password_reset_confirmation.html
Show inline comments
 
@@ -51,6 +51,8 @@
 
                        ${h.password('password_confirm',class_='focus')}
 
                    </div>
 
                 </div>
 

	
 
                <div class="form-group">
 
                <div class="buttons">
 
                    <div class="nohighlight">
 
                      ${h.submit('send',_('Confirm'),class_="btn btn-default")}
 
@@ -58,6 +60,7 @@
 
                </div>
 
            </div>
 
        </div>
 
        </div>
 
        ${h.end_form()}
 
    </div>
 
   </div>
0 comments (0 inline, 0 general)