Mercurial > kallithea
changeset 3198:c20adbaf16af beta
html: random indentation fixes
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 22 Jan 2013 23:44:38 +0100 |
| parents | b4f401524060 |
| children | 9f57b5624ec4 |
| files | docs/theme/nature/layout.html rhodecode/templates/admin/admin_log.html rhodecode/templates/admin/ldap/ldap.html rhodecode/templates/admin/repos_groups/repos_groups_edit.html rhodecode/templates/admin/settings/hooks.html rhodecode/templates/admin/settings/settings.html rhodecode/templates/admin/users/user_edit_my_account.html rhodecode/templates/base/base.html rhodecode/templates/base/root.html rhodecode/templates/bookmarks/bookmarks_data.html rhodecode/templates/files/files_add.html rhodecode/templates/files/files_browser.html rhodecode/templates/files/files_edit.html rhodecode/templates/forks/fork.html rhodecode/templates/forks/forks_data.html rhodecode/templates/register.html |
| diffstat | 16 files changed, 154 insertions(+), 154 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/theme/nature/layout.html Tue Jan 22 23:44:38 2013 +0100 +++ b/docs/theme/nature/layout.html Tue Jan 22 23:44:38 2013 +0100 @@ -4,15 +4,15 @@ <h3>Support RhodeCode development.</h3> <div style="text-align:center"> <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <input type="hidden" name="cmd" value="_s-xclick"> - <input type="hidden" name="hosted_button_id" value="8U2LLRPLBKWDU"> - <input style="border:0px !important" type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif" - border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> - <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"> + <input type="hidden" name="cmd" value="_s-xclick"> + <input type="hidden" name="hosted_button_id" value="8U2LLRPLBKWDU"> + <input style="border:0px !important" type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif" + border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"> </form> <div style="padding:5px"> <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank"> <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a> - </div> + </div> </div> {% endblock %}}
--- a/rhodecode/templates/admin/admin_log.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/admin_log.html Tue Jan 22 23:44:38 2013 +0100 @@ -19,16 +19,16 @@ %endif </td> <td>${h.action_parser(l)[0]()} - <div class="journal_action_params"> - ${h.literal(h.action_parser(l)[1]())} - </div> + <div class="journal_action_params"> + ${h.literal(h.action_parser(l)[1]())} + </div> </td> <td> - %if l.repository is not None: - ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))} - %else: - ${l.repository_name} - %endif + %if l.repository is not None: + ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))} + %else: + ${l.repository_name} + %endif </td> <td>${h.fmt_date(l.action_date)}</td>
--- a/rhodecode/templates/admin/ldap/ldap.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/ldap/ldap.html Tue Jan 22 23:44:38 2013 +0100 @@ -25,7 +25,7 @@ <div class="form"> <div class="fields"> - <h3>${_('Connection settings')}</h3> + <h3>${_('Connection settings')}</h3> <div class="field"> <div class="label label-checkbox"><label for="ldap_active">${_('Enable LDAP')}</label></div> <div class="checkboxes"><div class="checkbox">${h.checkbox('ldap_active',True,class_='small')}</div></div> @@ -54,7 +54,7 @@ <div class="label"><label for="ldap_tls_reqcert">${_('Certificate Checks')}</label></div> <div class="select">${h.select('ldap_tls_reqcert',c.tls_reqcert_cur,c.tls_reqcert_choices,class_='small')}</div> </div> - <h3>${_('Search settings')}</h3> + <h3>${_('Search settings')}</h3> <div class="field"> <div class="label"><label for="ldap_base_dn">${_('Base DN')}</label></div> <div class="input">${h.text('ldap_base_dn',class_='small')}</div> @@ -67,7 +67,7 @@ <div class="label"><label for="ldap_search_scope">${_('LDAP Search Scope')}</label></div> <div class="select">${h.select('ldap_search_scope',c.search_scope_cur,c.search_scope_choices,class_='small')}</div> </div> - <h3>${_('Attribute mappings')}</h3> + <h3>${_('Attribute mappings')}</h3> <div class="field"> <div class="label"><label for="ldap_attr_login">${_('Login Attribute')}</label></div> <div class="input">${h.text('ldap_attr_login',class_='small')}</div>
--- a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html Tue Jan 22 23:44:38 2013 +0100 @@ -32,14 +32,14 @@ <div class="form"> <!-- fields --> <div class="fields"> - <div class="field"> + <div class="field"> <div class="label"> <label for="group_name">${_('Group name')}:</label> </div> <div class="input"> ${h.text('group_name',class_='medium')} </div> - </div> + </div> <div class="field"> <div class="label label-textarea"> @@ -48,16 +48,16 @@ <div class="textarea text-area editor"> ${h.textarea('group_description',cols=23,rows=5,class_="medium")} </div> - </div> + </div> - <div class="field"> - <div class="label"> - <label for="group_parent_id">${_('Group parent')}:</label> - </div> - <div class="input"> - ${h.select('group_parent_id','',c.repo_groups,class_="medium")} - </div> - </div> + <div class="field"> + <div class="label"> + <label for="group_parent_id">${_('Group parent')}:</label> + </div> + <div class="input"> + ${h.select('group_parent_id','',c.repo_groups,class_="medium")} + </div> + </div> <div class="field"> <div class="label"> <label for="input">${_('Permissions')}:</label>
--- a/rhodecode/templates/admin/settings/hooks.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/settings/hooks.html Tue Jan 22 23:44:38 2013 +0100 @@ -25,14 +25,14 @@ <div class="form"> <div class="fields"> % for hook in c.hooks: - <div class="field"> - <div class="label label"> - <label for="${hook.ui_key}">${hook.ui_key}</label> + <div class="field"> + <div class="label label"> + <label for="${hook.ui_key}">${hook.ui_key}</label> + </div> + <div class="input" style="margin-left:280px"> + ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")} + </div> </div> - <div class="input" style="margin-left:280px"> - ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")} - </div> - </div> % endfor </div> </div>
--- a/rhodecode/templates/admin/settings/settings.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/settings/settings.html Tue Jan 22 23:44:38 2013 +0100 @@ -196,12 +196,12 @@ <label>${_('Web')}:</label> </div> <div class="checkboxes"> - <div class="checkbox"> - ${h.checkbox('web_push_ssl', 'True')} - <label for="web_push_ssl">${_('require ssl for vcs operations')}</label> - </div> + <div class="checkbox"> + ${h.checkbox('web_push_ssl', 'True')} + <label for="web_push_ssl">${_('require ssl for vcs operations')}</label> + </div> <span class="help-block">${_('RhodeCode will require SSL for pushing or pulling. If SSL is missing it will return HTTP Error 406: Not Acceptable')}</span> - </div> + </div> </div> <div class="field"> @@ -209,14 +209,14 @@ <label>${_('Hooks')}:</label> </div> <div class="checkboxes"> - <div class="checkbox"> - ${h.checkbox('hooks_changegroup_update','True')} - <label for="hooks_changegroup_update">${_('Update repository after push (hg update)')}</label> - </div> - <div class="checkbox"> - ${h.checkbox('hooks_changegroup_repo_size','True')} - <label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label> - </div> + <div class="checkbox"> + ${h.checkbox('hooks_changegroup_update','True')} + <label for="hooks_changegroup_update">${_('Update repository after push (hg update)')}</label> + </div> + <div class="checkbox"> + ${h.checkbox('hooks_changegroup_repo_size','True')} + <label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label> + </div> <div class="checkbox"> ${h.checkbox('hooks_changegroup_push_logger','True')} <label for="hooks_changegroup_push_logger">${_('Log user push commands')}</label> @@ -225,7 +225,7 @@ ${h.checkbox('hooks_outgoing_pull_logger','True')} <label for="hooks_outgoing_pull_logger">${_('Log user pull commands')}</label> </div> - </div> + </div> <div class="input" style="margin-top:10px"> ${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'),class_="ui-btn")} </div> @@ -257,9 +257,9 @@ </div> <div class="input"> ${h.text('paths_root_path',size=30,readonly="readonly")} - <span id="path_unlock" class="tooltip" - title="${h.tooltip(_('This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock.'))}"> - ${_('unlock')}</span> + <span id="path_unlock" class="tooltip" + title="${h.tooltip(_('This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock.'))}"> + ${_('unlock')}</span> <span class="help-block">${_('Location where repositories are stored. After changing this value a restart, and rescan is required')}</span> </div> </div> @@ -329,8 +329,8 @@ <script type="text/javascript"> YUE.on('expand_modules','click',function(e){ - YUD.setStyle('expand_modules_table','display',''); - YUD.setStyle('expand_modules','display','none'); + YUD.setStyle('expand_modules_table','display',''); + YUD.setStyle('expand_modules','display','none'); }) </script>
--- a/rhodecode/templates/admin/users/user_edit_my_account.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/users/user_edit_my_account.html Tue Jan 22 23:44:38 2013 +0100 @@ -173,37 +173,37 @@ } function table_renderer(data){ - var myDataSource = new YAHOO.util.DataSource(data); - myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; + var myDataSource = new YAHOO.util.DataSource(data); + myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; - myDataSource.responseSchema = { - resultsList: "records", - fields: [ - {key:"menu"}, - {key:"raw_name"}, - {key:"name"}, - {key:"last_changeset"}, - {key:"action"}, - ] - }; - myDataSource.doBeforeCallback = function(req,raw,res,cb) { - // This is the filter function - var data = res.results || [], - filtered = [], - i,l; + myDataSource.responseSchema = { + resultsList: "records", + fields: [ + {key:"menu"}, + {key:"raw_name"}, + {key:"name"}, + {key:"last_changeset"}, + {key:"action"}, + ] + }; + myDataSource.doBeforeCallback = function(req,raw,res,cb) { + // This is the filter function + var data = res.results || [], + filtered = [], + i,l; - if (req) { - req = req.toLowerCase(); - for (i = 0; i<data.length; i++) { - var pos = data[i].raw_name.toLowerCase().indexOf(req) - if (pos != -1) { - filtered.push(data[i]); - } - } - res.results = filtered; - } - return res; - } + if (req) { + req = req.toLowerCase(); + for (i = 0; i<data.length; i++) { + var pos = data[i].raw_name.toLowerCase().indexOf(req) + if (pos != -1) { + filtered.push(data[i]); + } + } + res.results = filtered; + } + return res; + } // main table sorting var myColumnDefs = [
--- a/rhodecode/templates/base/base.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/base/base.html Tue Jan 22 23:44:38 2013 +0100 @@ -137,7 +137,7 @@ return h.literal('class="current"') %> %if current not in ['home','admin']: - ##REGULAR MENU + ##REGULAR MENU <ul id="quick"> <!-- repo switcher --> <li> @@ -207,14 +207,14 @@ %endif %endif - <li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li> + <li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li> %if h.is_hg(c.rhodecode_repo): <li>${h.link_to(_('open new pull request'),h.url('pullrequest_home',repo_name=c.repo_name),class_='pull_request')}</li> %endif %if c.rhodecode_db_repo.fork: <li>${h.link_to(_('compare fork'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref=request.GET.get('branch') or 'default',other_ref_type='branch',other_ref='default',repo=c.rhodecode_db_repo.fork.repo_name),class_='compare_request')}</li> %endif - <li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li> + <li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li> %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking: %if c.rhodecode_db_repo.locked[0]:
--- a/rhodecode/templates/base/root.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/base/root.html Tue Jan 22 23:44:38 2013 +0100 @@ -21,17 +21,17 @@ %if c.ga_code: <!-- Analytics --> - <script type="text/javascript"> - var _gaq = _gaq || []; - _gaq.push(['_setAccount', '${c.ga_code}']); - _gaq.push(['_trackPageview']); + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', '${c.ga_code}']); + _gaq.push(['_trackPageview']); - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - </script> + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> %endif ## JAVASCRIPT ##
--- a/rhodecode/templates/bookmarks/bookmarks_data.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/bookmarks/bookmarks_data.html Tue Jan 22 23:44:38 2013 +0100 @@ -1,15 +1,15 @@ %if c.repo_bookmarks: <div id="table_wrap" class="yui-skin-sam"> <table id="bookmarks_data"> - <thead> + <thead> <tr> <th class="left">${_('Name')}</th> <th class="left">${_('Date')}</th> <th class="left">${_('Author')}</th> <th class="left">${_('Revision')}</th> </tr> - </thead> - %for cnt,book in enumerate(c.repo_bookmarks.items()): + </thead> + %for cnt,book in enumerate(c.repo_bookmarks.items()): <tr class="parity${cnt%2}"> <td> <span class="logbooks"> @@ -25,7 +25,7 @@ </div> </td> </tr> - %endfor + %endfor </table> </div> %else:
--- a/rhodecode/templates/files/files_add.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/files/files_add.html Tue Jan 22 23:44:38 2013 +0100 @@ -20,7 +20,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} </%def> <%def name="main()"> <div class="box">
--- a/rhodecode/templates/files/files_browser.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/files/files_browser.html Tue Jan 22 23:44:38 2013 +0100 @@ -42,30 +42,30 @@ <div class="browser-body"> <table class="code-browser"> - <thead> - <tr> - <th>${_('Name')}</th> - <th>${_('Size')}</th> - <th>${_('Mimetype')}</th> - <th>${_('Last Revision')}</th> - <th>${_('Last modified')}</th> - <th>${_('Last commiter')}</th> - </tr> - </thead> + <thead> + <tr> + <th>${_('Name')}</th> + <th>${_('Size')}</th> + <th>${_('Mimetype')}</th> + <th>${_('Last Revision')}</th> + <th>${_('Last modified')}</th> + <th>${_('Last commiter')}</th> + </tr> + </thead> - <tbody id="tbody"> - %if c.file.parent: - <tr class="parity0"> - <td> - ${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")} - </td> - <td></td> - <td></td> - <td></td> - <td></td> - <td></td> + <tbody id="tbody"> + %if c.file.parent: + <tr class="parity0"> + <td> + ${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")} + </td> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> </tr> - %endif + %endif %for cnt,node in enumerate(c.file): <tr class="parity${cnt%2}"> @@ -108,9 +108,9 @@ </td> </tr> %endfor - </tbody> - <tbody id="tbody_filtered" style="display:none"> - </tbody> + </tbody> + <tbody id="tbody_filtered" style="display:none"> + </tbody> </table> </div> </div>
--- a/rhodecode/templates/files/files_edit.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/files/files_edit.html Tue Jan 22 23:44:38 2013 +0100 @@ -20,7 +20,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} </%def> <%def name="main()"> <div class="box">
--- a/rhodecode/templates/forks/fork.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/forks/fork.html Tue Jan 22 23:44:38 2013 +0100 @@ -89,9 +89,9 @@ ${h.checkbox('update_after_clone',value="True")} <span class="help-block">${_('Checkout source after making a clone')}</span> </div> - </div> + </div> <div class="buttons"> - ${h.submit('',_('fork this repository'),class_="ui-btn large")} + ${h.submit('',_('fork this repository'),class_="ui-btn large")} </div> </div> </div>
--- a/rhodecode/templates/forks/forks_data.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/forks/forks_data.html Tue Jan 22 23:44:38 2013 +0100 @@ -10,16 +10,16 @@ <span style="font-size: 20px"> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname}) / ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))} - </span> - <div style="padding:5px 3px 3px 42px;">${f.description}</div> + </span> + <div style="padding:5px 3px 3px 42px;">${f.description}</div> </div> <div style="clear:both;padding-top: 10px"></div> <div class="follower_date">${_('forked')} - - <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span> - <a title="${_('compare fork with %s' % c.repo_name)}" - href="${h.url('compare_url',repo_name=f.repo_name,org_ref_type='branch',org_ref='default',other_ref_type='branch',other_ref='default', repo=c.repo_name)}" - class="ui-btn small">${_('Compare fork')}</a> - </div> + <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span> + <a title="${_('compare fork with %s' % c.repo_name)}" + href="${h.url('compare_url',repo_name=f.repo_name,org_ref_type='branch',org_ref='default',other_ref_type='branch',other_ref='default', repo=c.repo_name)}" + class="ui-btn small">${_('Compare fork')}</a> + </div> <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div> </div> % endfor
--- a/rhodecode/templates/register.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/register.html Tue Jan 22 23:44:38 2013 +0100 @@ -15,59 +15,59 @@ <div class="form"> <!-- fields --> <div class="fields"> - <div class="field"> + <div class="field"> <div class="label"> <label for="username">${_('Username')}:</label> </div> <div class="input"> ${h.text('username',class_="medium")} </div> - </div> + </div> - <div class="field"> + <div class="field"> <div class="label"> <label for="password">${_('Password')}:</label> </div> <div class="input"> ${h.password('password',class_="medium")} </div> - </div> + </div> - <div class="field"> - <div class="label"> - <label for="password">${_('Re-enter password')}:</label> - </div> - <div class="input"> - ${h.password('password_confirmation',class_="medium")} - </div> - </div> + <div class="field"> + <div class="label"> + <label for="password">${_('Re-enter password')}:</label> + </div> + <div class="input"> + ${h.password('password_confirmation',class_="medium")} + </div> + </div> - <div class="field"> + <div class="field"> <div class="label"> <label for="firstname">${_('First Name')}:</label> </div> <div class="input"> ${h.text('firstname',class_="medium")} </div> - </div> + </div> - <div class="field"> + <div class="field"> <div class="label"> <label for="lastname">${_('Last Name')}:</label> </div> <div class="input"> ${h.text('lastname',class_="medium")} </div> - </div> + </div> - <div class="field"> + <div class="field"> <div class="label"> <label for="email">${_('Email')}:</label> </div> <div class="input"> ${h.text('email',class_="medium")} </div> - </div> + </div> <div class="buttons"> <div class="nohighlight">