Mercurial > kallithea
changeset 3197:b4f401524060 beta
html: don't use tabs
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 @@ -3,13 +3,13 @@ {% block sidebarlogo %} <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"> - </form> + <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"> + </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>
--- a/rhodecode/templates/admin/admin.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/admin.html Tue Jan 22 23:44:38 2013 +0100 @@ -16,39 +16,39 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> <div class="box"> - <!-- box / title --> - <div class="title"> - ${self.breadcrumbs()} - </div> - <!-- end box / title --> - <div class="table"> - <div id="user_log"> - ${c.log_data} - </div> - </div> + <!-- box / title --> + <div class="title"> + ${self.breadcrumbs()} + </div> + <!-- end box / title --> + <div class="table"> + <div id="user_log"> + ${c.log_data} + </div> + </div> </div> <script> YUE.on('j_filter','click',function(){ - var jfilter = YUD.get('j_filter'); - if(YUD.hasClass(jfilter, 'initial')){ - jfilter.value = ''; - } + var jfilter = YUD.get('j_filter'); + if(YUD.hasClass(jfilter, 'initial')){ + jfilter.value = ''; + } }); var fix_j_filter_width = function(len){ YUD.setStyle(YUD.get('j_filter'),'width',Math.max(80, len*6.50)+'px'); } YUE.on('j_filter','keyup',function(){ - fix_j_filter_width(YUD.get('j_filter').value.length); + fix_j_filter_width(YUD.get('j_filter').value.length); }); YUE.on('filter_form','submit',function(e){ - YUE.preventDefault(e) + YUE.preventDefault(e) var val = YUD.get('j_filter').value; - window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val); + window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val); }); fix_j_filter_width(YUD.get('j_filter').value.length); </script>
--- 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 @@ -1,40 +1,40 @@ ## -*- coding: utf-8 -*- %if c.users_log: <table> - <tr> - <th class="left">${_('Username')}</th> - <th class="left">${_('Action')}</th> - <th class="left">${_('Repository')}</th> - <th class="left">${_('Date')}</th> - <th class="left">${_('From IP')}</th> - </tr> + <tr> + <th class="left">${_('Username')}</th> + <th class="left">${_('Action')}</th> + <th class="left">${_('Repository')}</th> + <th class="left">${_('Date')}</th> + <th class="left">${_('From IP')}</th> + </tr> - %for cnt,l in enumerate(c.users_log): - <tr class="parity${cnt%2}"> - <td> + %for cnt,l in enumerate(c.users_log): + <tr class="parity${cnt%2}"> + <td> %if l.user is not None: ${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))} %else: ${l.username} %endif </td> - <td>${h.action_parser(l)[0]()} - <div class="journal_action_params"> + <td>${h.action_parser(l)[0]()} + <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 - </td> + </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 + </td> - <td>${h.fmt_date(l.action_date)}</td> - <td>${l.user_ip}</td> - </tr> - %endfor + <td>${h.fmt_date(l.action_date)}</td> + <td>${l.user_ip}</td> + </tr> + %endfor </table> <script type="text/javascript"> @@ -60,5 +60,5 @@ ${c.users_log.pager('$link_previous ~2~ $link_next')} </div> %else: - ${_('No actions yet')} + ${_('No actions yet')} %endif
--- a/rhodecode/templates/admin/defaults/defaults.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/defaults/defaults.html Tue Jan 22 23:44:38 2013 +0100 @@ -12,7 +12,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()">
--- 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/notifications/notifications.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/notifications/notifications.html Tue Jan 22 23:44:38 2013 +0100 @@ -10,7 +10,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> @@ -59,7 +59,7 @@ var current_filter = "${c.current_filter}"; if (YUD.get(current_filter)){ - YUD.addClass(current_filter, 'active'); + YUD.addClass(current_filter, 'active'); } </script> </%def>
--- a/rhodecode/templates/admin/permissions/permissions.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/permissions/permissions.html Tue Jan 22 23:44:38 2013 +0100 @@ -12,7 +12,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> @@ -36,49 +36,49 @@ </div> </div> </div> - <div class="field"> - <div class="label"> - <label for="default_repo_perm">${_('Repository')}:</label> - </div> - <div class="select"> - ${h.select('default_repo_perm','',c.repo_perms_choices)} + <div class="field"> + <div class="label"> + <label for="default_repo_perm">${_('Repository')}:</label> + </div> + <div class="select"> + ${h.select('default_repo_perm','',c.repo_perms_choices)} - ${h.checkbox('overwrite_default_repo','true')} - <label for="overwrite_default_repo"> - <span class="tooltip" - title="${h.tooltip(_('All default permissions on each repository will be reset to choosen permission, note that all custom default permission on repositories will be lost'))}"> - ${_('overwrite existing settings')}</span> </label> - </div> - </div> - <div class="field"> - <div class="label"> - <label for="default_group_perm">${_('Repository group')}:</label> - </div> - <div class="select"> - ${h.select('default_group_perm','',c.group_perms_choices)} + ${h.checkbox('overwrite_default_repo','true')} + <label for="overwrite_default_repo"> + <span class="tooltip" + title="${h.tooltip(_('All default permissions on each repository will be reset to choosen permission, note that all custom default permission on repositories will be lost'))}"> + ${_('overwrite existing settings')}</span> </label> + </div> + </div> + <div class="field"> + <div class="label"> + <label for="default_group_perm">${_('Repository group')}:</label> + </div> + <div class="select"> + ${h.select('default_group_perm','',c.group_perms_choices)} ${h.checkbox('overwrite_default_group','true')} <label for="overwrite_default_group"> <span class="tooltip" title="${h.tooltip(_('All default permissions on each repository group will be reset to choosen permission, note that all custom default permission on repositories group will be lost'))}"> ${_('overwrite existing settings')}</span> </label> - </div> - </div> - <div class="field"> - <div class="label"> - <label for="default_register">${_('Registration')}:</label> - </div> - <div class="select"> - ${h.select('default_register','',c.register_choices)} - </div> - </div> + </div> + </div> + <div class="field"> + <div class="label"> + <label for="default_register">${_('Registration')}:</label> + </div> + <div class="select"> + ${h.select('default_register','',c.register_choices)} + </div> + </div> <div class="field"> <div class="label"> <label for="default_create">${_('Repository creation')}:</label> </div> - <div class="select"> - ${h.select('default_create','',c.create_choices)} - </div> + <div class="select"> + ${h.select('default_create','',c.create_choices)} + </div> </div> <div class="field"> <div class="label"> @@ -88,10 +88,10 @@ ${h.select('default_fork','',c.fork_choices)} </div> </div> - <div class="buttons"> + <div class="buttons"> ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")} - </div> + </div> </div> </div> ${h.end_form()}
--- a/rhodecode/templates/admin/repos/repo_add.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/repos/repo_add.html Tue Jan 22 23:44:38 2013 +0100 @@ -14,15 +14,15 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> - <div class="box"> - <!-- box / title --> - <div class="title"> - ${self.breadcrumbs()} - </div> + <div class="box"> + <!-- box / title --> + <div class="title"> + ${self.breadcrumbs()} + </div> <%include file="repo_add_base.html"/> </div> </%def>
--- a/rhodecode/templates/admin/repos/repo_add_create_repository.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/repos/repo_add_create_repository.html Tue Jan 22 23:44:38 2013 +0100 @@ -6,11 +6,11 @@ </%def> <%def name="breadcrumbs_links()"> - ${_('add new repository')} + ${_('add new repository')} </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()">
--- a/rhodecode/templates/admin/repos/repo_edit.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/repos/repo_edit.html Tue Jan 22 23:44:38 2013 +0100 @@ -14,7 +14,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> @@ -35,24 +35,24 @@ ${h.text('repo_name',class_="medium")} </div> </div> - <div class="field"> - <div class="label"> - <label for="clone_uri">${_('Clone uri')}:</label> - </div> - <div class="input"> - ${h.text('clone_uri',class_="medium")} + <div class="field"> + <div class="label"> + <label for="clone_uri">${_('Clone uri')}:</label> + </div> + <div class="input"> + ${h.text('clone_uri',class_="medium")} <span class="help-block">${_('Optional http[s] url from which repository should be cloned.')}</span> - </div> - </div> - <div class="field"> - <div class="label"> - <label for="repo_group">${_('Repository group')}:</label> - </div> - <div class="input"> - ${h.select('repo_group','',c.repo_groups,class_="medium")} + </div> + </div> + <div class="field"> + <div class="label"> + <label for="repo_group">${_('Repository group')}:</label> + </div> + <div class="input"> + ${h.select('repo_group','',c.repo_groups,class_="medium")} <span class="help-block">${_('Optional select a group to put this repository into.')}</span> - </div> - </div> + </div> + </div> <div class="field"> <div class="label"> <label for="repo_type">${_('Type')}:</label>
--- a/rhodecode/templates/admin/repos/repo_edit_perms.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html Tue Jan 22 23:44:38 2013 +0100 @@ -104,10 +104,10 @@ function ajaxActionUsersGroup(users_group_id,field_id){ var sUrl = "${h.url('delete_repo_users_group',repo_name=c.repo_name)}"; var callback = { - success:function(o){ - var tr = YUD.get(String(field_id)); - tr.parentNode.removeChild(tr); - }, + success:function(o){ + var tr = YUD.get(String(field_id)); + tr.parentNode.removeChild(tr); + }, failure:function(o){ alert("${_('Failed to remove users group')}"); },
--- a/rhodecode/templates/admin/repos/repos.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/repos/repos.html Tue Jan 22 23:44:38 2013 +0100 @@ -9,7 +9,7 @@ <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="repo_count">0</span> ${_('repositories')} </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> <div class="box"> @@ -69,7 +69,7 @@ var myColumnDefs = [ {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"}, {key:"name",label:"${_('Name')}",sortable:true, - sortOptions: { sortFunction: nameSort }}, + sortOptions: { sortFunction: nameSort }}, {key:"desc",label:"${_('Description')}",sortable:true}, {key:"last_changeset",label:"${_('Tip')}",sortable:true, sortOptions: { sortFunction: revisionSort }}, @@ -126,11 +126,11 @@ }; YUE.on('q_filter','click',function(){ - if(!YUD.hasClass('q_filter', 'loaded')){ - YUD.get('q_filter').value = ''; - //TODO: load here full list later to do search within groups - YUD.addClass('q_filter', 'loaded'); - } + if(!YUD.hasClass('q_filter', 'loaded')){ + YUD.get('q_filter').value = ''; + //TODO: load here full list later to do search within groups + YUD.addClass('q_filter', 'loaded'); + } }); YUE.on('q_filter','keyup',function (e) {
--- a/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html Tue Jan 22 23:44:38 2013 +0100 @@ -113,7 +113,7 @@ YUD.setStyle('add_perm_input', 'display', 'none'); } YAHOO.util.Event.addListener('add_perm', 'click', function () { - addPermAction(${_tmpl}, ${c.users_array|n}, ${c.users_groups_array|n}); + addPermAction(${_tmpl}, ${c.users_array|n}, ${c.users_groups_array|n}); }); });
--- 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 @@ -41,23 +41,23 @@ </div> </div> - <div class="field"> - <div class="label label-textarea"> - <label for="group_description">${_('Description')}:</label> - </div> - <div class="textarea text-area editor"> - ${h.textarea('group_description',cols=23,rows=5,class_="medium")} - </div> - </div> + <div class="field"> + <div class="label label-textarea"> + <label for="group_description">${_('Description')}:</label> + </div> + <div class="textarea text-area editor"> + ${h.textarea('group_description',cols=23,rows=5,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="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 @@ -10,7 +10,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> @@ -26,15 +26,15 @@ <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> - <div class="input" style="margin-left:280px"> + <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> % endfor - </div> + </div> </div> <h3>${_('Custom hooks')}</h3>
--- 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 @@ -10,7 +10,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> @@ -27,20 +27,20 @@ <!-- fields --> <div class="fields"> - <div class="field"> - <div class="label label-checkbox"> - <label for="destroy">${_('rescan option')}:</label> - </div> - <div class="checkboxes"> - <div class="checkbox"> - ${h.checkbox('destroy',True)} - <label for="destroy"> - <span class="tooltip" title="${h.tooltip(_('In case a repository was deleted from filesystem and there are leftovers in the database check this option to scan obsolete data in database and remove it.'))}"> - ${_('destroy old data')}</span> </label> - </div> + <div class="field"> + <div class="label label-checkbox"> + <label for="destroy">${_('rescan option')}:</label> + </div> + <div class="checkboxes"> + <div class="checkbox"> + ${h.checkbox('destroy',True)} + <label for="destroy"> + <span class="tooltip" title="${h.tooltip(_('In case a repository was deleted from filesystem and there are leftovers in the database check this option to scan obsolete data in database and remove it.'))}"> + ${_('destroy old data')}</span> </label> + </div> <span class="help-block">${_('Rescan repositories location for new repositories. Also deletes obsolete if `destroy` flag is checked ')}</span> - </div> - </div> + </div> + </div> <div class="buttons"> ${h.submit('rescan',_('Rescan repositories'),class_="ui-btn large")} @@ -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_add.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/users/user_add.html Tue Jan 22 23:44:38 2013 +0100 @@ -13,7 +13,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> @@ -93,7 +93,7 @@ <div class="buttons"> ${h.submit('save',_('save'),class_="ui-btn large")} </div> - </div> + </div> </div> ${h.end_form()} </div>
--- a/rhodecode/templates/admin/users/user_edit.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/users/user_edit.html Tue Jan 22 23:44:38 2013 +0100 @@ -14,7 +14,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> @@ -137,7 +137,7 @@ ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")} </div> - </div> + </div> </div> ${h.end_form()} </div>
--- 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 @@ -10,7 +10,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> @@ -132,12 +132,12 @@ YUD.setStyle('my_container','display',''); YUD.setStyle('q_filter','display',''); if(!YUD.hasClass('show_my', 'loaded')){ - table_renderer(${c.data |n}); + table_renderer(${c.data |n}); YUD.addClass('show_my', 'loaded'); } } YUE.on('show_my','click',function(e){ - show_my(e); + show_my(e); }) var show_pullrequests = function(e){ @@ -154,7 +154,7 @@ ypjax(url, 'pullrequests_container'); } YUE.on('show_pullrequests','click',function(e){ - show_pullrequests(e) + show_pullrequests(e) }) var tabs = { @@ -173,19 +173,19 @@ } 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.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 || [], @@ -205,76 +205,76 @@ return res; } - // main table sorting - var myColumnDefs = [ - {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"}, - {key:"name",label:"${_('Name')}",sortable:true, - sortOptions: { sortFunction: nameSort }}, - {key:"last_changeset",label:"${_('Tip')}",sortable:true, - sortOptions: { sortFunction: revisionSort }}, - {key:"action",label:"${_('Action')}",sortable:false}, - ]; + // main table sorting + var myColumnDefs = [ + {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"}, + {key:"name",label:"${_('Name')}",sortable:true, + sortOptions: { sortFunction: nameSort }}, + {key:"last_changeset",label:"${_('Tip')}",sortable:true, + sortOptions: { sortFunction: revisionSort }}, + {key:"action",label:"${_('Action')}",sortable:false}, + ]; - var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{ - sortedBy:{key:"name",dir:"asc"}, - paginator: new YAHOO.widget.Paginator({ - rowsPerPage: 50, - alwaysVisible: false, - template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}", - pageLinks: 5, - containerClass: 'pagination-wh', - currentPageClass: 'pager_curpage', - pageLinkClass: 'pager_link', - nextPageLinkLabel: '>', - previousPageLinkLabel: '<', - firstPageLinkLabel: '<<', - lastPageLinkLabel: '>>', - containers:['user-paginator'] - }), + var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{ + sortedBy:{key:"name",dir:"asc"}, + paginator: new YAHOO.widget.Paginator({ + rowsPerPage: 50, + alwaysVisible: false, + template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}", + pageLinks: 5, + containerClass: 'pagination-wh', + currentPageClass: 'pager_curpage', + pageLinkClass: 'pager_link', + nextPageLinkLabel: '>', + previousPageLinkLabel: '<', + firstPageLinkLabel: '<<', + lastPageLinkLabel: '>>', + containers:['user-paginator'] + }), - MSG_SORTASC:"${_('Click to sort ascending')}", - MSG_SORTDESC:"${_('Click to sort descending')}", - MSG_EMPTY:"${_('No records found.')}", - MSG_ERROR:"${_('Data error.')}", - MSG_LOADING:"${_('Loading...')}", - } - ); - myDataTable.subscribe('postRenderEvent',function(oArgs) { - tooltip_activate(); - quick_repo_menu(); - }); + MSG_SORTASC:"${_('Click to sort ascending')}", + MSG_SORTDESC:"${_('Click to sort descending')}", + MSG_EMPTY:"${_('No records found.')}", + MSG_ERROR:"${_('Data error.')}", + MSG_LOADING:"${_('Loading...')}", + } + ); + myDataTable.subscribe('postRenderEvent',function(oArgs) { + tooltip_activate(); + quick_repo_menu(); + }); - var filterTimeout = null; + var filterTimeout = null; - updateFilter = function() { - // Reset timeout - filterTimeout = null; + updateFilter = function() { + // Reset timeout + filterTimeout = null; - // Reset sort - var state = myDataTable.getState(); - state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC}; + // Reset sort + var state = myDataTable.getState(); + state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC}; - // Get filtered data - myDataSource.sendRequest(YUD.get('q_filter').value,{ - success : myDataTable.onDataReturnInitializeTable, - failure : myDataTable.onDataReturnInitializeTable, - scope : myDataTable, - argument: state - }); + // Get filtered data + myDataSource.sendRequest(YUD.get('q_filter').value,{ + success : myDataTable.onDataReturnInitializeTable, + failure : myDataTable.onDataReturnInitializeTable, + scope : myDataTable, + argument: state + }); - }; - YUE.on('q_filter','click',function(){ - if(!YUD.hasClass('q_filter', 'loaded')){ - YUD.get('q_filter').value = ''; - //TODO: load here full list later to do search within groups - YUD.addClass('q_filter', 'loaded'); - } - }); + }; + YUE.on('q_filter','click',function(){ + if(!YUD.hasClass('q_filter', 'loaded')){ + YUD.get('q_filter').value = ''; + //TODO: load here full list later to do search within groups + YUD.addClass('q_filter', 'loaded'); + } + }); - YUE.on('q_filter','keyup',function (e) { - clearTimeout(filterTimeout); - filterTimeout = setTimeout(updateFilter,600); - }); - } + YUE.on('q_filter','keyup',function (e) { + clearTimeout(filterTimeout); + filterTimeout = setTimeout(updateFilter,600); + }); + } </script> </%def>
--- a/rhodecode/templates/admin/users/users.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/users/users.html Tue Jan 22 23:44:38 2013 +0100 @@ -10,7 +10,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} </%def> <%def name="main()"> @@ -36,7 +36,7 @@ myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; myDataSource.responseSchema = { - resultsList: "records", + resultsList: "records", fields: [ {key: "gravatar"}, {key: "raw_username"}, @@ -60,7 +60,7 @@ if (req) { req = req.toLowerCase(); for (i = 0; i<data.length; i++) { - var pos = data[i].raw_username.toLowerCase().indexOf(req) + var pos = data[i].raw_username.toLowerCase().indexOf(req) if (pos != -1) { filtered.push(data[i]); } @@ -75,12 +75,12 @@ var myColumnDefs = [ {key:"gravatar",label:"",sortable:false,}, {key:"username",label:"${_('username')}",sortable:true, - sortOptions: { sortFunction: linkSort } + sortOptions: { sortFunction: linkSort } }, {key:"firstname",label:"${_('firstname')}",sortable:true,}, {key:"lastname",label:"${_('lastname')}",sortable:true,}, {key:"last_login",label:"${_('last login')}",sortable:true, - sortOptions: { sortFunction: lastLoginSort }}, + sortOptions: { sortFunction: lastLoginSort }}, {key:"active",label:"${_('active')}",sortable:true,}, {key:"admin",label:"${_('admin')}",sortable:true,}, {key:"ldap",label:"${_('ldap')}",sortable:true,},
--- a/rhodecode/templates/admin/users_groups/users_group_edit.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html Tue Jan 22 23:44:38 2013 +0100 @@ -27,62 +27,62 @@ ${h.form(url('users_group', id=c.users_group.users_group_id),method='put', id='edit_users_group')} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> - <div class="label"> - <label for="users_group_name">${_('Group name')}:</label> - </div> - <div class="input"> - ${h.text('users_group_name',class_='small')} - </div> - </div> + <div class="fields"> + <div class="field"> + <div class="label"> + <label for="users_group_name">${_('Group name')}:</label> + </div> + <div class="input"> + ${h.text('users_group_name',class_='small')} + </div> + </div> - <div class="field"> - <div class="label label-checkbox"> - <label for="users_group_active">${_('Active')}:</label> - </div> - <div class="checkboxes"> - ${h.checkbox('users_group_active',value=True)} - </div> - </div> - <div class="field"> + <div class="field"> + <div class="label label-checkbox"> + <label for="users_group_active">${_('Active')}:</label> + </div> + <div class="checkboxes"> + ${h.checkbox('users_group_active',value=True)} + </div> + </div> + <div class="field"> <div class="label"> <label for="users_group_active">${_('Members')}:</label> </div> <div class="select"> - <table> - <tr> - <td> - <div> - <div style="float:left"> - <div class="text" style="padding: 0px 0px 6px;">${_('Choosen group members')}</div> - ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")} - <div id="remove_all_elements" style="cursor:pointer;text-align:center"> - ${_('Remove all elements')} - <img alt="remove" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_right.png')}"/> - </div> - </div> - <div style="float:left;width:20px;padding-top:50px"> - <img alt="add" id="add_element" - style="padding:2px;cursor:pointer" - src="${h.url('/images/icons/arrow_left.png')}"/> - <br /> - <img alt="remove" id="remove_element" - style="padding:2px;cursor:pointer" - src="${h.url('/images/icons/arrow_right.png')}"/> - </div> - <div style="float:left"> - <div class="text" style="padding: 0px 0px 6px;">${_('Available members')}</div> - ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")} - <div id="add_all_elements" style="cursor:pointer;text-align:center"> - <img alt="add" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_left.png')}"/> - ${_('Add all elements')} - </div> - </div> - </div> - </td> - </tr> - </table> + <table> + <tr> + <td> + <div> + <div style="float:left"> + <div class="text" style="padding: 0px 0px 6px;">${_('Choosen group members')}</div> + ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")} + <div id="remove_all_elements" style="cursor:pointer;text-align:center"> + ${_('Remove all elements')} + <img alt="remove" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_right.png')}"/> + </div> + </div> + <div style="float:left;width:20px;padding-top:50px"> + <img alt="add" id="add_element" + style="padding:2px;cursor:pointer" + src="${h.url('/images/icons/arrow_left.png')}"/> + <br /> + <img alt="remove" id="remove_element" + style="padding:2px;cursor:pointer" + src="${h.url('/images/icons/arrow_right.png')}"/> + </div> + <div style="float:left"> + <div class="text" style="padding: 0px 0px 6px;">${_('Available members')}</div> + ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")} + <div id="add_all_elements" style="cursor:pointer;text-align:center"> + <img alt="add" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_left.png')}"/> + ${_('Add all elements')} + </div> + </div> + </div> + </td> + </tr> + </table> </div> </div>
--- 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 @@ -40,10 +40,10 @@ <p class="footer-link"> <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a> </p> - <p class="footer-link-right"> - <a href="${h.url('rhodecode_official')}">RhodeCode${'-%s' % c.rhodecode_instanceid if c.rhodecode_instanceid else ''}</a> - ${c.rhodecode_version} © 2010-${h.datetime.today().year} by Marcin Kuzminski - </p> + <p class="footer-link-right"> + <a href="${h.url('rhodecode_official')}">RhodeCode${'-%s' % c.rhodecode_instanceid if c.rhodecode_instanceid else ''}</a> + ${c.rhodecode_version} © 2010-${h.datetime.today().year} by Marcin Kuzminski + </p> </div> </div> </div> @@ -131,37 +131,37 @@ </%def> <%def name="menu(current=None)"> - <% - def is_current(selected): - if selected == current: - return h.literal('class="current"') - %> - %if current not in ['home','admin']: - ##REGULAR MENU - <ul id="quick"> - <!-- repo switcher --> - <li> - <a class="menu_link" id="repo_switcher" title="${_('Switch repository')}" href="#"> + <% + def is_current(selected): + if selected == current: + return h.literal('class="current"') + %> + %if current not in ['home','admin']: + ##REGULAR MENU + <ul id="quick"> + <!-- repo switcher --> + <li> + <a class="menu_link" id="repo_switcher" title="${_('Switch repository')}" href="#"> <span class="icon"> <img src="${h.url('/images/icons/database.png')}" alt="${_('Products')}" /> </span> <span>↓</span> - </a> - <ul id="repo_switcher_list" class="repo_switcher"> + </a> + <ul id="repo_switcher_list" class="repo_switcher"> <li> <a href="#">${_('loading...')}</a> </li> - </ul> - </li> + </ul> + </li> - <li ${is_current('summary')}> - <a class="menu_link" title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}"> - <span class="icon"> - <img src="${h.url('/images/icons/clipboard_16.png')}" alt="${_('Summary')}" /> - </span> - <span>${_('Summary')}</span> - </a> - </li> + <li ${is_current('summary')}> + <a class="menu_link" title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}"> + <span class="icon"> + <img src="${h.url('/images/icons/clipboard_16.png')}" alt="${_('Summary')}" /> + </span> + <span>${_('Summary')}</span> + </a> + </li> <li ${is_current('changelog')}> <a class="menu_link" title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}"> <span class="icon"> @@ -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]: @@ -272,7 +272,7 @@ </a> </li> ${usermenu()} - </ul> + </ul> <script type="text/javascript"> YUE.on('repo_switcher','mouseover',function(){ function qfilter(){ @@ -306,8 +306,8 @@ return false; }); </script> - %else: - ##ROOT MENU + %else: + ##ROOT MENU <ul id="quick"> <li> <a class="menu_link" title="${_('Home')}" href="${h.url('home')}"> @@ -345,7 +345,7 @@ </a> </li> - %if h.HasPermissionAll('hg.admin')('access admin main page'): + %if h.HasPermissionAll('hg.admin')('access admin main page'): <li ${is_current('admin')}> <a class="menu_link" title="${_('Admin')}" href="${h.url('admin_home')}"> <span class="icon"> @@ -355,8 +355,8 @@ </a> ${admin_menu()} </li> - %endif + %endif ${usermenu()} - </ul> - %endif + </ul> + %endif </%def>
--- 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,18 +21,18 @@ %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> - %endif + (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 ## <%def name="js()"> @@ -94,7 +94,7 @@ YUD.addClass('quick_login_link','enabled'); var usr = YUD.get('username'); if(usr){ - usr.focus(); + usr.focus(); } } });
--- 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 @@ -2,15 +2,15 @@ <div id="table_wrap" class="yui-skin-sam"> <table id="bookmarks_data"> <thead> - <tr> + <tr> <th class="left">${_('Name')}</th> <th class="left">${_('Date')}</th> <th class="left">${_('Author')}</th> <th class="left">${_('Revision')}</th> - </tr> + </tr> </thead> - %for cnt,book in enumerate(c.repo_bookmarks.items()): - <tr class="parity${cnt%2}"> + %for cnt,book in enumerate(c.repo_bookmarks.items()): + <tr class="parity${cnt%2}"> <td> <span class="logbooks"> <span class="bookbook">${h.link_to(book[0], @@ -18,16 +18,16 @@ </span> </td> <td><span class="tooltip" title="${h.tooltip(h.age(book[1].date))}">${h.fmt_date(book[1].date)}</span></td> - <td title="${book[1].author}">${h.person(book[1].author)}</td> - <td> + <td title="${book[1].author}">${h.person(book[1].author)}</td> + <td> <div> <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id)}">r${book[1].revision}:${h.short_id(book[1].raw_id)}</a></pre> </div> </td> - </tr> - %endfor + </tr> + %endfor </table> </div> %else: - ${_('There are no bookmarks yet')} + ${_('There are no bookmarks yet')} %endif
--- a/rhodecode/templates/branches/branches.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/branches/branches.html Tue Jan 22 23:44:38 2013 +0100 @@ -34,16 +34,16 @@ </div> <script type="text/javascript"> YUE.on('compare_branches','click',function(e){ - YUE.preventDefault(e); - var org = YUQ('input[name=compare_org]:checked')[0]; - var other = YUQ('input[name=compare_other]:checked')[0]; + YUE.preventDefault(e); + var org = YUQ('input[name=compare_org]:checked')[0]; + var other = YUQ('input[name=compare_other]:checked')[0]; - if(org && other){ - var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref='__ORG__',other_ref_type='branch',other_ref='__OTHER__')}"; - var u = compare_url.replace('__ORG__',org.value) - .replace('__OTHER__',other.value); - window.location=u; - } + if(org && other){ + var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref='__ORG__',other_ref_type='branch',other_ref='__OTHER__')}"; + var u = compare_url.replace('__ORG__',org.value) + .replace('__OTHER__',other.value); + window.location=u; + } }); // main table sorting var myColumnDefs = [
--- a/rhodecode/templates/branches/branches_data.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/branches/branches_data.html Tue Jan 22 23:44:38 2013 +0100 @@ -10,8 +10,8 @@ <th class="left">${_('Compare')}</th> </tr> </thead> - %for cnt,branch in enumerate(c.repo_branches.items()): - <tr class="parity${cnt%2}"> + %for cnt,branch in enumerate(c.repo_branches.items()): + <tr class="parity${cnt%2}"> <td> <span class="logtags"> <span class="branchtag">${h.link_to(branch[0], @@ -29,8 +29,8 @@ <input class="branch-compare" type="radio" name="compare_org" value="${branch[0]}"/> <input class="branch-compare" type="radio" name="compare_other" value="${branch[0]}"/> </td> - </tr> - %endfor + </tr> + %endfor % if hasattr(c,'repo_closed_branches') and c.repo_closed_branches: %for cnt,branch in enumerate(c.repo_closed_branches.items()): <tr class="parity${cnt%2}">
--- a/rhodecode/templates/changelog/changelog.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/changelog/changelog.html Tue Jan 22 23:44:38 2013 +0100 @@ -16,7 +16,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('changelog')} + ${self.menu('changelog')} </%def> <%def name="main()"> @@ -26,12 +26,12 @@ ${self.breadcrumbs()} </div> <div class="table"> - % if c.pagination: - <div id="graph"> - <div id="graph_nodes"> - <canvas id="graph_canvas"></canvas> - </div> - <div id="graph_content"> + % if c.pagination: + <div id="graph"> + <div id="graph_nodes"> + <canvas id="graph_canvas"></canvas> + </div> + <div id="graph_content"> <div class="info_box" style="clear: both;padding: 10px 6px;vertical-align: right;text-align: right;"> <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a> <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> @@ -43,38 +43,38 @@ <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="ui-btn small">${_('open new pull request')}</a> %endif </div> - <div class="container_header"> - ${h.form(h.url.current(),method='get')} - <div class="info_box" style="float:left"> - ${h.submit('set',_('Show'),class_="ui-btn")} - ${h.text('size',size=1,value=c.size)} - ${_('revisions')} - </div> - ${h.end_form()} + <div class="container_header"> + ${h.form(h.url.current(),method='get')} + <div class="info_box" style="float:left"> + ${h.submit('set',_('Show'),class_="ui-btn")} + ${h.text('size',size=1,value=c.size)} + ${_('revisions')} + </div> + ${h.end_form()} <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div> - </div> + </div> - %for cnt,cs in enumerate(c.pagination): - <div id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}"> - <div class="left"> - <div> - ${h.checkbox(cs.raw_id,class_="changeset_range")} - <span class="tooltip" title="${h.tooltip(h.age(cs.date))}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span> - </div> - <div class="author"> - <div class="gravatar"> - <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/> - </div> - <div title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</div> - </div> + %for cnt,cs in enumerate(c.pagination): + <div id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}"> + <div class="left"> + <div> + ${h.checkbox(cs.raw_id,class_="changeset_range")} + <span class="tooltip" title="${h.tooltip(h.age(cs.date))}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span> + </div> + <div class="author"> + <div class="gravatar"> + <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/> + </div> + <div title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</div> + </div> <div class="date">${h.fmt_date(cs.date)}</div> - </div> - <div class="mid"> + </div> + <div class="mid"> <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div> <div class="expand"><span class="expandtext">↓ ${_('show more')} ↓</span></div> - </div> - <div class="right"> - <div class="changes"> + </div> + <div class="right"> + <div class="changes"> <div id="changed_total_${cs.raw_id}" style="float:right;" class="changed_total tooltip" title="${h.tooltip(_('Affected number of files, click to show more details'))}">${len(cs.affected_files)}</div> <div class="comments-container"> %if len(c.comments.get(cs.raw_id,[])) > 0: @@ -98,27 +98,27 @@ </div> %endif </div> - </div> - %if cs.parents: - %for p_cs in reversed(cs.parents): - <div class="parent">${_('Parent')} - <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id), - h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span> - </div> - %endfor - %else: + </div> + %if cs.parents: + %for p_cs in reversed(cs.parents): + <div class="parent">${_('Parent')} + <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id), + h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span> + </div> + %endfor + %else: <div class="parent">${_('No parents')}</div> %endif - <span class="logtags"> - %if len(cs.parents)>1: - <span class="merge">${_('merge')}</span> - %endif - %if cs.branch: - <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}"> - ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + <span class="logtags"> + %if len(cs.parents)>1: + <span class="merge">${_('merge')}</span> + %endif + %if cs.branch: + <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}"> + ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} </span> - %endif + %endif %if h.is_hg(c.rhodecode_repo): %for book in cs.bookmarks: <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}"> @@ -126,24 +126,24 @@ </span> %endfor %endif - %for tag in cs.tags: - <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> - ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span> - %endfor - </span> - </div> - </div> + %for tag in cs.tags: + <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> + ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span> + %endfor + </span> + </div> + </div> - %endfor - <div class="pagination-wh pagination-left"> - ${c.pagination.pager('$link_previous ~2~ $link_next')} - </div> - </div> - </div> + %endfor + <div class="pagination-wh pagination-left"> + ${c.pagination.pager('$link_previous ~2~ $link_next')} + </div> + </div> + </div> - <script type="text/javascript" src="${h.url('/js/graph.js')}"></script> - <script type="text/javascript"> - YAHOO.util.Event.onDOMReady(function(){ + <script type="text/javascript" src="${h.url('/js/graph.js')}"></script> + <script type="text/javascript"> + YAHOO.util.Event.onDOMReady(function(){ //Monitor range checkboxes and build a link to changesets //ranges @@ -151,7 +151,7 @@ var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}"; var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}"; YUE.on(checkboxes,'click',function(e){ - var clicked_cb = e.currentTarget; + var clicked_cb = e.currentTarget; var checked_checkboxes = []; for (pos in checkboxes){ if(checkboxes[pos].checked){ @@ -169,32 +169,32 @@ } if(checked_checkboxes.length>0){ - var rev_end = checked_checkboxes[0].name; - var rev_start = checked_checkboxes[checked_checkboxes.length-1].name; + var rev_end = checked_checkboxes[0].name; + var rev_start = checked_checkboxes[checked_checkboxes.length-1].name; - // now select all checkboxes in the middle. - var checked = false; - for (var i=0; i<checkboxes.length; i++){ - var cb = checkboxes[i]; - var rev = cb.name; + // now select all checkboxes in the middle. + var checked = false; + for (var i=0; i<checkboxes.length; i++){ + var cb = checkboxes[i]; + var rev = cb.name; - if (rev == rev_end){ - checked = true; - } + if (rev == rev_end){ + checked = true; + } if (checked){ cb.checked = true; } else{ cb.checked = false; } - if (rev == rev_start){ + if (rev == rev_start){ checked = false; } - } + } var url = url_tmpl.replace('__REVRANGE__', - rev_start+'...'+rev_end); + rev_start+'...'+rev_end); var link = _TM['Show selected changes __S -> __E']; link = link.replace('__S',rev_start.substr(0,6)); @@ -208,8 +208,8 @@ } else{ - YUD.setStyle('rev_range_container','display','none'); - YUD.setStyle('rev_range_clear','display','none'); + YUD.setStyle('rev_range_container','display','none'); + YUD.setStyle('rev_range_clear','display','none'); } }); YUE.on('rev_range_clear','click',function(e){ @@ -224,22 +224,22 @@ var el = YUQ('#graph_content .container')[0]; var row_h = el.clientHeight; for(var i=0;i<msgs.length;i++){ - var m = msgs[i]; + var m = msgs[i]; - var h = m.clientHeight; - var pad = YUD.getStyle(m,'padding'); - if(h > row_h){ - var offset = row_h - (h+12); - YUD.setStyle(m.nextElementSibling,'display','block'); - YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px'); - }; + var h = m.clientHeight; + var pad = YUD.getStyle(m,'padding'); + if(h > row_h){ + var offset = row_h - (h+12); + YUD.setStyle(m.nextElementSibling,'display','block'); + YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px'); + }; } YUE.on(YUQ('.expand'),'click',function(e){ - var elem = e.currentTarget.parentNode.parentNode; - YUD.setStyle(e.currentTarget,'display','none'); - YUD.setStyle(elem,'height','auto'); + var elem = e.currentTarget.parentNode.parentNode; + YUD.setStyle(e.currentTarget,'display','none'); + YUD.setStyle(elem,'height','auto'); - //redraw the graph, line_count and jsdata are global vars + //redraw the graph, line_count and jsdata are global vars set_canvas(100); var r = new BranchRenderer(); @@ -249,58 +249,58 @@ // Fetch changeset details YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){ - var id = e.currentTarget.id; - var url = "${h.url('changelog_details',repo_name=c.repo_name,cs='__CS__')}"; - var url = url.replace('__CS__',id.replace('changed_total_','')); - ypjax(url,id,function(){tooltip_activate()}); + var id = e.currentTarget.id; + var url = "${h.url('changelog_details',repo_name=c.repo_name,cs='__CS__')}"; + var url = url.replace('__CS__',id.replace('changed_total_','')); + ypjax(url,id,function(){tooltip_activate()}); }); // change branch filter YUE.on(YUD.get('branch_filter'),'change',function(e){ - var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value; - var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}"; - var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}"; - var url = url.replace('__BRANCH__',selected_branch); - if(selected_branch != ''){ - window.location = url; - }else{ - window.location = url_main; - } + var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value; + var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}"; + var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}"; + var url = url.replace('__BRANCH__',selected_branch); + if(selected_branch != ''){ + window.location = url; + }else{ + window.location = url_main; + } }); - function set_canvas(width) { - var c = document.getElementById('graph_nodes'); - var t = document.getElementById('graph_content'); - canvas = document.getElementById('graph_canvas'); - var div_h = t.clientHeight; - c.style.height=div_h+'px'; - canvas.setAttribute('height',div_h); - c.style.height=width+'px'; - canvas.setAttribute('width',width); - }; - var heads = 1; - var line_count = 0; - var jsdata = ${c.jsdata|n}; + function set_canvas(width) { + var c = document.getElementById('graph_nodes'); + var t = document.getElementById('graph_content'); + canvas = document.getElementById('graph_canvas'); + var div_h = t.clientHeight; + c.style.height=div_h+'px'; + canvas.setAttribute('height',div_h); + c.style.height=width+'px'; + canvas.setAttribute('width',width); + }; + var heads = 1; + var line_count = 0; + var jsdata = ${c.jsdata|n}; - for (var i=0;i<jsdata.length;i++) { + for (var i=0;i<jsdata.length;i++) { var in_l = jsdata[i][2]; for (var j in in_l) { var m = in_l[j][1]; if (m > line_count) line_count = m; } - } - set_canvas(100); + } + set_canvas(100); - var r = new BranchRenderer(); - r.render(jsdata,100,line_count); + var r = new BranchRenderer(); + r.render(jsdata,100,line_count); - }); - </script> - %else: - ${_('There are no changes yet')} - %endif + }); + </script> + %else: + ${_('There are no changes yet')} + %endif </div> </div> </%def>
--- a/rhodecode/templates/changeset/changeset.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/changeset/changeset.html Tue Jan 22 23:44:38 2013 +0100 @@ -31,7 +31,7 @@ AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}"; </script> <div class="table"> - <div class="diffblock"> + <div class="diffblock"> <div class="parents"> %if c.changeset.parents: %for n, p_cs in enumerate(reversed(c.changeset.parents)): @@ -52,7 +52,7 @@ <span>${_('No children')}</span> %endif </div> - <div class="code-header banner"> + <div class="code-header banner"> <div class="hash"> r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} @@ -75,56 +75,56 @@ </div> <div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div> </div> - </div> - <div id="changeset_content"> - <div class="container"> - <div class="left"> - <div class="author"> - <div class="gravatar"> - <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.changeset.author),20)}"/> - </div> - <span>${h.person(c.changeset.author)}</span><br/> - <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/> - </div> - <div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div> - </div> - <div class="right"> - <div class="changes"> + </div> + <div id="changeset_content"> + <div class="container"> + <div class="left"> + <div class="author"> + <div class="gravatar"> + <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.changeset.author),20)}"/> + </div> + <span>${h.person(c.changeset.author)}</span><br/> + <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/> + </div> + <div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div> + </div> + <div class="right"> + <div class="changes"> % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff: - <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span> - <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span> - <span class="added" title="${_('added')}">${len(c.changeset.added)}</span> - % else: + <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span> + <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span> + <span class="added" title="${_('added')}">${len(c.changeset.added)}</span> + % else: <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> <span class="added" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> - % endif - </div> + % endif + </div> - <span class="logtags"> + <span class="logtags"> %if len(c.changeset.parents)>1: <span class="merge">${_('merge')}</span> %endif - %if c.changeset.branch: + %if c.changeset.branch: <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}"> - ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} </span> %endif - %for tag in c.changeset.tags: - <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> - ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> - %endfor - </span> - </div> - </div> - <span> + %for tag in c.changeset.tags: + <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> + ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> + %endfor + </span> + </div> + </div> + <span> % if c.limited_diff: ${ungettext('%s file changed','%s files changed',len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}: % else: - ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}: - %endif + ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}: + %endif </span> - <div class="cs_files"> + <div class="cs_files"> %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems(): <div class="cs_${change}"> <div class="node"> @@ -136,8 +136,8 @@ % if c.limited_diff: <h5>${_('Changeset was too big and was cut off...')}</h5> % endif - </div> - </div> + </div> + </div> </div>
--- a/rhodecode/templates/changeset/changeset_file_comment.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/changeset/changeset_file_comment.html Tue Jan 22 23:44:38 2013 +0100 @@ -6,14 +6,14 @@ <%def name="comment_block(co)"> <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}"> <div class="comment-wrapp"> - <div class="meta"> + <div class="meta"> <div style="float:left"> <img src="${h.gravatar_url(co.author.email, 20)}" /> </div> - <div class="user"> - ${co.author.username} - </div> - <div class="date"> - ${h.age(co.modified_at)} <a class="permalink" href="#comment-${co.comment_id}">¶</a> - </div> + <div class="user"> + ${co.author.username} + </div> + <div class="date"> + ${h.age(co.modified_at)} <a class="permalink" href="#comment-${co.comment_id}">¶</a> + </div> %if co.status_change: <div style="float:left" class="changeset-status-container"> <div style="float:left;padding:0px 2px 0px 2px"><span style="font-size: 18px;">›</span></div> @@ -41,10 +41,10 @@ <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span> </div> %endif - </div> - <div class="text"> - ${h.rst_w_mentions(co.text)|n} - </div> + </div> + <div class="text"> + ${h.rst_w_mentions(co.text)|n} + </div> </div> </div> </%def> @@ -60,7 +60,7 @@ <div class="comment-help">${_('Commenting on line {1}.')} ${(_('Comments parsed using %s syntax with %s support.') % ( ('<a href="%s">RST</a>' % h.url('rst_help')), - ('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user')) + ('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user')) ) )|n } @@ -134,8 +134,8 @@ <div class="clearfix"> <div class="comment-help"> ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')), - '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % - _('Use @username inside this text to send notification to this RhodeCode user')))|n} + '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % + _('Use @username inside this text to send notification to this RhodeCode user')))|n} %if change_status: | <label for="show_changeset_status_box" class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}</label> <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" /> @@ -178,12 +178,12 @@ } }) YUE.on(YUQ('.status_change_radio'), 'change',function(e){ - var val = e.currentTarget.value; - if (val == 'approved' || val == 'rejected') { - YUD.removeClass('save_close', 'hidden'); - }else{ - YUD.addClass('save_close', 'hidden'); - } + var val = e.currentTarget.value; + if (val == 'approved' || val == 'rejected') { + YUD.removeClass('save_close', 'hidden'); + }else{ + YUD.addClass('save_close', 'hidden'); + } }) });
--- a/rhodecode/templates/changeset/changeset_range.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/changeset/changeset_range.html Tue Jan 22 23:44:38 2013 +0100 @@ -24,17 +24,17 @@ ${self.breadcrumbs()} </div> <div class="table"> - <div id="body" class="diffblock"> - <div class="code-header cv"> - <h3 class="code-header-title">${_('Compare View')} / ${h.link_to(_('Show combined compare'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id))}</h3> + <div id="body" class="diffblock"> + <div class="code-header cv"> + <h3 class="code-header-title">${_('Compare View')} / ${h.link_to(_('Show combined compare'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id))}</h3> <div> - ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} - </div> - </div> - </div> - <div id="changeset_compare_view_content"> - <div class="container"> - <table class="compare_view_commits noborder"> + ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} + </div> + </div> + </div> + <div id="changeset_compare_view_content"> + <div class="container"> + <table class="compare_view_commits noborder"> %for cnt,cs in enumerate(c.cs_ranges): <tr> <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td> @@ -50,17 +50,17 @@ </tr> %endfor </table> - </div> - <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> - <div class="cs_files"> - %for cs in c.cs_ranges: - <div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div> - %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): - <div class="cs_${change}">${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}</div> - %endfor - %endfor - </div> - </div> + </div> + <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> + <div class="cs_files"> + %for cs in c.cs_ranges: + <div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div> + %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): + <div class="cs_${change}">${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}</div> + %endfor + %endfor + </div> + </div> </div> <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
--- a/rhodecode/templates/errors/error_document.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/errors/error_document.html Tue Jan 22 23:44:38 2013 +0100 @@ -8,45 +8,45 @@ <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - %if c.redirect_time: - <meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/> - %endif + %if c.redirect_time: + <meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/> + %endif <!-- stylesheets --> <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" /> - <style type="text/css"> - #main_div{ - border: 0px solid #000; - width: 500px; - margin: auto; - text-align: center; - margin-top: 200px; - font-size: 1.6em; - } - .error_message{ - text-align: center; - color:#003367; - font-size: 1.6em; - margin:10px; - } - </style> + <style type="text/css"> + #main_div{ + border: 0px solid #000; + width: 500px; + margin: auto; + text-align: center; + margin-top: 200px; + font-size: 1.6em; + } + .error_message{ + text-align: center; + color:#003367; + font-size: 1.6em; + margin:10px; + } + </style> </head> <body> <div id="login"> <div class="table"> - <div id="main_div"> - <div style="font-size:2.0em;margin: 10px">${c.rhodecode_name}</div> - <h1 class="error_message">${c.error_message}</h1> + <div id="main_div"> + <div style="font-size:2.0em;margin: 10px">${c.rhodecode_name}</div> + <h1 class="error_message">${c.error_message}</h1> - <p>${c.error_explanation}</p> + <p>${c.error_explanation}</p> - %if c.redirect_time: - <p>${_('You will be redirected to %s in %s seconds') % (c.redirect_module,c.redirect_time)}</p> - %endif + %if c.redirect_time: + <p>${_('You will be redirected to %s in %s seconds') % (c.redirect_module,c.redirect_time)}</p> + %endif - </div> + </div> </div> <!-- end login --> </div>
--- a/rhodecode/templates/files/files.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/files/files.html Tue Jan 22 23:44:38 2013 +0100 @@ -24,16 +24,16 @@ <!-- box / title --> <div class="title"> ${self.breadcrumbs()} - <ul class="links"> - <li> - <span style="text-transform: uppercase;"><a href="#">${_('branch')}: ${c.changeset.branch}</a></span> - </li> - </ul> + <ul class="links"> + <li> + <span style="text-transform: uppercase;"><a href="#">${_('branch')}: ${c.changeset.branch}</a></span> + </li> + </ul> </div> <div class="table"> - <div id="files_data"> - <%include file='files_ypjax.html'/> - </div> + <div id="files_data"> + <%include file='files_ypjax.html'/> + </div> </div> </div> @@ -50,10 +50,10 @@ var ypjax_links = function(){ YUE.on(YUQ('.ypjax-link'), 'click',function(e){ - //don't do ypjax on middle click - if(e.which == 2 || !History.enabled){ - return true; - } + //don't do ypjax on middle click + if(e.which == 2 || !History.enabled){ + return true; + } var el = e.currentTarget; var url = el.href; @@ -64,12 +64,12 @@ //extract rev and the f_path from url. parts = url.split(_base_url) if(parts.length != 2){ - return false; + return false; } var parts2 = parts[1].split('/'); - var rev = parts2.shift(); // pop the first element which is the revision - var f_path = parts2.join('/'); + var rev = parts2.shift(); // pop the first element which is the revision + var f_path = parts2.join('/'); var title = "${_('%s files') % c.repo_name}" + " - " + f_path; @@ -93,7 +93,7 @@ fileBrowserListeners(State.url, State.data.node_list_url, State.data.url_base); if(YUD.get('hlcode')){ - YUE.on('hlcode', 'mouseup', getSelectionLink); + YUE.on('hlcode', 'mouseup', getSelectionLink); } //console.log(State); if(YUD.get('load_node_history')){ @@ -102,7 +102,7 @@ YUE.on('load_node_history', 'click', function(e){ var _url = node_history_url.replace('__REV__',State.data.rev).replace('__FPATH__', State.data.f_path); ypjax(_url, 'node_history', function(o){ - tooltip_activate(); + tooltip_activate(); }) }); } @@ -132,11 +132,11 @@ } else{ ypjax(State.url,container,function(o){ - //callbacks after ypjax call - callbacks(State); - if (o !== undefined){ - //store our request in cache - var _expire_on = new Date().getTime()+CACHE_EXPIRE; + //callbacks after ypjax call + callbacks(State); + if (o !== undefined){ + //store our request in cache + var _expire_on = new Date().getTime()+CACHE_EXPIRE; CACHE[cache_key] = [_expire_on, o.responseText]; } });
--- 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"> @@ -35,8 +35,8 @@ </ul> </div> <div class="table"> - <div id="files_data"> - ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data")} + <div id="files_data"> + ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data")} <h3>${_('Add new file')}</h3> <div class="form"> <div class="fields"> @@ -69,24 +69,24 @@ </div> </div> </div> - <div id="body" class="codeblock"> - <div id="editor_container"> + <div id="body" class="codeblock"> + <div id="editor_container"> <pre id="editor_pre"></pre> - <textarea id="editor" name="content" style="display:none"></textarea> + <textarea id="editor" name="content" style="display:none"></textarea> </div> - <div style="padding: 10px;color:#666666">${_('commit message')}</div> - <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px"></textarea> - </div> - <div style="text-align: l;padding-top: 5px"> + <div style="padding: 10px;color:#666666">${_('commit message')}</div> + <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px"></textarea> + </div> + <div style="text-align: l;padding-top: 5px"> ${h.submit('commit',_('Commit changes'),class_="ui-btn")} ${h.reset('reset',_('Reset'),class_="ui-btn")} - </div> - ${h.end_form()} - <script type="text/javascript"> - var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path)}"; - initCodeMirror('editor',reset_url); - </script> - </div> + </div> + ${h.end_form()} + <script type="text/javascript"> + var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path)}"; + initCodeMirror('editor',reset_url); + </script> + </div> </div> </div> </%def>
--- 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 @@ -1,27 +1,27 @@ <%def name="file_class(node)"> - %if node.is_file(): - <%return "browser-file" %> - %else: - <%return "browser-dir"%> - %endif + %if node.is_file(): + <%return "browser-file" %> + %else: + <%return "browser-dir"%> + %endif </%def> <div id="body" class="browserblock"> <div class="browser-header"> - <div class="browser-nav"> - ${h.form(h.url.current())} - <div class="info_box"> - <span class="rev">${_('view')}@rev</span> - <a class="ui-btn ypjax-link" href="${c.url_prev}" title="${_('previous revision')}">«</a> - ${h.text('at_rev',value=c.changeset.revision,size=5)} - <a class="ui-btn ypjax-link" href="${c.url_next}" title="${_('next revision')}">»</a> - ## ${h.submit('view',_('view'),class_="ui-btn")} - </div> - ${h.end_form()} - </div> - <div class="browser-branch"> - ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)} - <label>${_('follow current branch')}</label> - </div> + <div class="browser-nav"> + ${h.form(h.url.current())} + <div class="info_box"> + <span class="rev">${_('view')}@rev</span> + <a class="ui-btn ypjax-link" href="${c.url_prev}" title="${_('previous revision')}">«</a> + ${h.text('at_rev',value=c.changeset.revision,size=5)} + <a class="ui-btn ypjax-link" href="${c.url_next}" title="${_('next revision')}">»</a> + ## ${h.submit('view',_('view'),class_="ui-btn")} + </div> + ${h.end_form()} + </div> + <div class="browser-branch"> + ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)} + <label>${_('follow current branch')}</label> + </div> <div class="browser-search"> <div id="search_activate_id" class="search_activate"> <a class="ui-btn" id="filter_activate" href="#">${_('search file list')}</a> @@ -40,77 +40,77 @@ </div> </div> - <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> + <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> <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 + %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 - %for cnt,node in enumerate(c.file): - <tr class="parity${cnt%2}"> - <td> + %for cnt,node in enumerate(c.file): + <tr class="parity${cnt%2}"> + <td> %if node.is_submodule(): ${h.link_to(node.name,node.url or '#',class_="submodule-dir ypjax-link")} %else: ${h.link_to(node.name, h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=h.safe_unicode(node.path)),class_=file_class(node)+" ypjax-link")} %endif: - </td> - <td> - %if node.is_file(): - ${h.format_byte_size(node.size,binary=True)} - %endif - </td> - <td> - %if node.is_file(): - ${node.mimetype} - %endif - </td> - <td> - %if node.is_file(): - <div class="tooltip" title="${h.tooltip(node.last_changeset.message)}"> - <pre>${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}</pre> + </td> + <td> + %if node.is_file(): + ${h.format_byte_size(node.size,binary=True)} + %endif + </td> + <td> + %if node.is_file(): + ${node.mimetype} + %endif + </td> + <td> + %if node.is_file(): + <div class="tooltip" title="${h.tooltip(node.last_changeset.message)}"> + <pre>${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}</pre> </div> - %endif - </td> - <td> - %if node.is_file(): - <span class="tooltip" title="${h.tooltip(h.fmt_date(node.last_changeset.date))}"> + %endif + </td> + <td> + %if node.is_file(): + <span class="tooltip" title="${h.tooltip(h.fmt_date(node.last_changeset.date))}"> ${h.age(node.last_changeset.date)}</span> - %endif - </td> - <td> - %if node.is_file(): - <span title="${node.last_changeset.author}"> + %endif + </td> + <td> + %if node.is_file(): + <span title="${node.last_changeset.author}"> ${h.person(node.last_changeset.author)} </span> - %endif - </td> - </tr> - %endfor + %endif + </td> + </tr> + %endfor </tbody> <tbody id="tbody_filtered" style="display:none"> </tbody> - </table> - </div> + </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"> @@ -35,10 +35,10 @@ </ul> </div> <div class="table"> - <div id="files_data"> - <h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.revision,c.file.path)}</h3> - ${h.form(h.url.current(),method='post',id='eform')} - <div id="body" class="codeblock"> + <div id="files_data"> + <h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.revision,c.file.path)}</h3> + ${h.form(h.url.current(),method='post',id='eform')} + <div id="body" class="codeblock"> <div class="code-header"> <div class="stats"> <div class="left"><img src="${h.url('/images/icons/file.png')}"/></div> @@ -58,21 +58,21 @@ </div> <div class="commit">${_('Editing file')}: ${c.file.unicode_path}</div> </div> - <pre id="editor_pre"></pre> - <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea> - <div style="padding: 10px;color:#666666">${_('commit message')}</div> - <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px"></textarea> - </div> - <div style="text-align: left;padding-top: 5px"> + <pre id="editor_pre"></pre> + <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea> + <div style="padding: 10px;color:#666666">${_('commit message')}</div> + <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px"></textarea> + </div> + <div style="text-align: left;padding-top: 5px"> ${h.submit('commit',_('Commit changes'),class_="ui-btn")} ${h.reset('reset',_('Reset'),class_="ui-btn")} - </div> - ${h.end_form()} - <script type="text/javascript"> - var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.file.path)}"; - initCodeMirror('editor',reset_url); - </script> - </div> + </div> + ${h.end_form()} + <script type="text/javascript"> + var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.file.path)}"; + initCodeMirror('editor',reset_url); + </script> + </div> </div> </div> </%def>
--- a/rhodecode/templates/files/files_source.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/files/files_source.html Tue Jan 22 23:44:38 2013 +0100 @@ -10,7 +10,7 @@ <div id="body" class="codeblock"> - <div class="code-header"> + <div class="code-header"> <div class="stats"> <div class="left img"><img src="${h.url('/images/icons/file.png')}"/></div> <div class="left item"><pre class="tooltip" title="${h.tooltip(h.fmt_date(c.file_changeset.date))}">${h.link_to("r%s:%s" % (c.file_changeset.revision,h.short_id(c.file_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}</pre></div> @@ -37,24 +37,24 @@ </div> <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)}</div> </div> - <div class="commit">${h.urlify_commit(c.file_changeset.message,c.repo_name)}</div> - </div> - <div class="code-body"> - %if c.file.is_binary: - ${_('Binary file (%s)') % c.file.mimetype} - %else: - % if c.file.size < c.cut_off_limit: + <div class="commit">${h.urlify_commit(c.file_changeset.message,c.repo_name)}</div> + </div> + <div class="code-body"> + %if c.file.is_binary: + ${_('Binary file (%s)') % c.file.mimetype} + %else: + % if c.file.size < c.cut_off_limit: %if c.annotate: ${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")} %else: - ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")} + ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")} %endif - %else: - ${_('File is too big to display')} ${h.link_to(_('show as raw'), - h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path))} - %endif + %else: + ${_('File is too big to display')} ${h.link_to(_('show as raw'), + h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path))} + %endif %endif - </div> + </div> </div> <script type="text/javascript"> @@ -95,7 +95,7 @@ YUE.on('load_node_history', 'click', function(e){ var _url = node_history_url.replace('__REV__','${c.file_changeset.raw_id}').replace('__FPATH__', '${c.f_path}'); ypjax(_url, 'node_history', function(o){ - tooltip_activate(); + tooltip_activate(); }) });
--- a/rhodecode/templates/followers/followers_data.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/followers/followers_data.html Tue Jan 22 23:44:38 2013 +0100 @@ -20,9 +20,9 @@ YUE.onDOMReady(function(){ YUE.delegate("followers","click",function(e, matchedEl, container){ ypjax(e.target.href,"followers",function(){ - show_more_event(); - tooltip_activate(); - show_changeset_tooltip(); + show_more_event(); + tooltip_activate(); + show_changeset_tooltip(); }); YUE.preventDefault(e); },'.pager_link');
--- 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 @@ -14,7 +14,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('')} + ${self.menu('')} </%def> <%def name="main()"> <div class="box"> @@ -90,9 +90,9 @@ <span class="help-block">${_('Checkout source after making a clone')}</span> </div> </div> - <div class="buttons"> - ${h.submit('',_('fork this repository'),class_="ui-btn large")} - </div> + <div class="buttons"> + ${h.submit('',_('fork this repository'),class_="ui-btn large")} + </div> </div> </div> ${h.end_form()}
--- 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 @@ -1,36 +1,36 @@ ## -*- coding: utf-8 -*- % if c.forks_pager: - % for f in c.forks_pager: - <div> - <div class="fork_user"> - <div class="gravatar"> - <img alt="gravatar" src="${h.gravatar_url(f.user.email,24)}"/> - </div> - <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> - </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> + % for f in c.forks_pager: + <div> + <div class="fork_user"> + <div class="gravatar"> + <img alt="gravatar" src="${h.gravatar_url(f.user.email,24)}"/> + </div> + <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> + </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> - <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div> - </div> - % endfor + <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div> + </div> + % endfor <div class="pagination-wh pagination-left"> <script type="text/javascript"> YUE.onDOMReady(function(){ YUE.delegate("forks","click",function(e, matchedEl, container){ ypjax(e.target.href,"forks",function(){ - show_more_event(); - tooltip_activate(); - show_changeset_tooltip(); + show_more_event(); + tooltip_activate(); + show_changeset_tooltip(); }); YUE.preventDefault(e); },'.pager_link'); @@ -39,5 +39,5 @@ ${c.forks_pager.pager('$link_previous ~2~ $link_next')} </div> % else: - ${_('There are no forks yet')} + ${_('There are no forks yet')} % endif
--- a/rhodecode/templates/index_base.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/index_base.html Tue Jan 22 23:44:38 2013 +0100 @@ -174,7 +174,7 @@ {key:"last_change",label:"${_('Last Change')}",sortable:true, sortOptions: { sortFunction: ageSort }}, {key:"tip",label:"${_('Tip')}",sortable:true, - sortOptions: { sortFunction: revisionSort }}, + sortOptions: { sortFunction: revisionSort }}, {key:"owner",label:"${_('Owner')}",sortable:true}, {key:"rss",label:"",sortable:false}, {key:"atom",label:"",sortable:false}, @@ -200,7 +200,7 @@ var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource, { - sortedBy:{key:"name",dir:"asc"}, + sortedBy:{key:"name",dir:"asc"}, MSG_SORTASC:"${_('Click to sort ascending')}", MSG_SORTDESC:"${_('Click to sort descending')}", MSG_EMPTY:"${_('No records found.')}",
--- a/rhodecode/templates/journal/journal.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/journal/journal.html Tue Jan 22 23:44:38 2013 +0100 @@ -15,7 +15,7 @@ </h5> </%def> <%def name="page_nav()"> - ${self.menu('home')} + ${self.menu('home')} </%def> <%def name="head_extra()"> <link href="${h.url('journal_atom', api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" /> @@ -24,8 +24,8 @@ <%def name="main()"> <div class="box box-left"> - <!-- box / title --> - <div class="title"> + <!-- box / title --> + <div class="title"> ${self.breadcrumbs()} <ul class="links"> <li> @@ -38,8 +38,8 @@ <span><a href="${h.url('journal_atom', api_key=c.rhodecode_user.api_key)}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/atom.png')}"/></a></span> </li> </ul> - </div> - <div id="journal">${c.journal_data}</div> + </div> + <div id="journal">${c.journal_data}</div> </div> <div class="box box-right"> <!-- box / title --> @@ -124,7 +124,7 @@ show_my(e); }) var show_watched = function(e){ - YUD.setStyle('my_container','display','none'); + YUD.setStyle('my_container','display','none'); YUD.setStyle('watched_container','display',''); YUD.setStyle('q_filter_watched','display',''); YUD.setStyle('q_filter','display','none'); @@ -132,7 +132,7 @@ YUD.addClass('show_watched', 'current'); YUD.removeClass('show_my','current'); if(!YUD.hasClass('show_watched', 'loaded')){ - watched_renderer(${c.watched_data |n}); + watched_renderer(${c.watched_data |n}); YUD.addClass('show_watched', 'loaded'); } @@ -160,7 +160,7 @@ var tabHash = url[1]; var func = tabs[tabHash] if (func){ - func(); + func(); } } function watched_renderer(data){
--- a/rhodecode/templates/journal/journal_data.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/journal/journal_data.html Tue Jan 22 23:44:38 2013 +0100 @@ -4,34 +4,34 @@ %for day,items in c.journal_day_aggreagate: <div class="journal_day">${day}</div> % for user,entries in items: - <div class="journal_container"> - <div class="gravatar"> - <img alt="gravatar" src="${h.gravatar_url(user.email if user else 'anonymous@rhodecode.org',24)}"/> - </div> + <div class="journal_container"> + <div class="gravatar"> + <img alt="gravatar" src="${h.gravatar_url(user.email if user else 'anonymous@rhodecode.org',24)}"/> + </div> %if user: - <div class="journal_user">${user.name} ${user.lastname}</div> + <div class="journal_user">${user.name} ${user.lastname}</div> %else: <div class="journal_user deleted">${entries[0].username}</div> %endif - <div class="journal_action_container"> - % for entry in entries: - <div class="journal_icon"> ${h.action_parser(entry)[2]()}</div> - <div class="journal_action">${h.action_parser(entry)[0]()}</div> - <div class="journal_repo"> - <span class="journal_repo_name"> - %if entry.repository is not None: - ${h.link_to(entry.repository.repo_name, - h.url('summary_home',repo_name=entry.repository.repo_name))} - %else: - ${entry.repository_name} - %endif - </span> - </div> - <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div> - <div class="date"><span class="tooltip" title="${h.tooltip(h.fmt_date(entry.action_date))}">${h.age(entry.action_date)}</span></div> - %endfor - </div> - </div> + <div class="journal_action_container"> + % for entry in entries: + <div class="journal_icon"> ${h.action_parser(entry)[2]()}</div> + <div class="journal_action">${h.action_parser(entry)[0]()}</div> + <div class="journal_repo"> + <span class="journal_repo_name"> + %if entry.repository is not None: + ${h.link_to(entry.repository.repo_name, + h.url('summary_home',repo_name=entry.repository.repo_name))} + %else: + ${entry.repository_name} + %endif + </span> + </div> + <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div> + <div class="date"><span class="tooltip" title="${h.tooltip(h.fmt_date(entry.action_date))}">${h.age(entry.action_date)}</span></div> + %endfor + </div> + </div> %endfor %endfor @@ -39,11 +39,11 @@ <script type="text/javascript"> YUE.onDOMReady(function(){ YUE.delegate("journal","click",function(e, matchedEl, container){ - ypjax(e.target.href,"journal",function(){ - show_more_event(); - tooltip_activate(); - show_changeset_tooltip(); - }); + ypjax(e.target.href,"journal",function(){ + show_more_event(); + tooltip_activate(); + show_changeset_tooltip(); + }); YUE.preventDefault(e); },'.pager_link'); });
--- a/rhodecode/templates/journal/public_journal.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/journal/public_journal.html Tue Jan 22 23:44:38 2013 +0100 @@ -4,10 +4,10 @@ ${_('Journal')} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs()"> - ${c.rhodecode_name} + ${c.rhodecode_name} </%def> <%def name="page_nav()"> - ${self.menu('home')} + ${self.menu('home')} </%def> <%def name="head_extra()"> <link href="${h.url('public_journal_atom')}" rel="alternate" title="${_('ATOM public journal feed')}" type="application/atom+xml" />
--- a/rhodecode/templates/login.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/login.html Tue Jan 22 23:44:38 2013 +0100 @@ -69,7 +69,7 @@ ${h.end_form()} <script type="text/javascript"> YUE.onDOMReady(function(){ - YUD.get('username').focus(); + YUD.get('username').focus(); }) </script> </div>
--- a/rhodecode/templates/password_reset.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/password_reset.html Tue Jan 22 23:44:38 2013 +0100 @@ -7,37 +7,37 @@ <div id="register"> - <div class="title top-left-rounded-corner top-right-rounded-corner"> - <h5>${_('Reset your password to')} ${c.rhodecode_name}</h5> - </div> - <div class="inner"> - ${h.form(url('password_reset'))} - <div class="form"> - <!-- fields --> - <div class="fields"> + <div class="title top-left-rounded-corner top-right-rounded-corner"> + <h5>${_('Reset your password to')} ${c.rhodecode_name}</h5> + </div> + <div class="inner"> + ${h.form(url('password_reset'))} + <div class="form"> + <!-- fields --> + <div class="fields"> - <div class="field"> - <div class="label"> - <label for="email">${_('Email address')}:</label> - </div> - <div class="input"> - ${h.text('email')} - </div> - </div> + <div class="field"> + <div class="label"> + <label for="email">${_('Email address')}:</label> + </div> + <div class="input"> + ${h.text('email')} + </div> + </div> - <div class="buttons"> - <div class="nohighlight"> - ${h.submit('send',_('Reset my password'),class_="ui-btn large")} - <div class="activation_msg">${_('Password reset link will be send to matching email address')}</div> - </div> - </div> - </div> - </div> - ${h.end_form()} + <div class="buttons"> + <div class="nohighlight"> + ${h.submit('send',_('Reset my password'),class_="ui-btn large")} + <div class="activation_msg">${_('Password reset link will be send to matching email address')}</div> + </div> + </div> + </div> + </div> + ${h.end_form()} <script type="text/javascript"> YUE.onDOMReady(function(){ YUD.get('email').focus(); }) </script> - </div> + </div> </div>
--- a/rhodecode/templates/pullrequests/pullrequest.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/pullrequests/pullrequest.html Tue Jan 22 23:44:38 2013 +0100 @@ -137,10 +137,10 @@ var other_repos_info = ${c.other_repos_info|n}; var loadPreview = function(){ - YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none'); + YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none'); var url = "${h.url('compare_url', - repo_name='org_repo', - org_ref_type='org_ref_type', org_ref='org_ref', + repo_name='org_repo', + org_ref_type='org_ref_type', org_ref='org_ref', other_ref_type='other_ref_type', other_ref='other_ref', repo='other_repo', as_form=True, bundle=False, @@ -175,21 +175,21 @@ } YUE.on('other_repo', 'change', function(e){ - var repo_name = e.currentTarget.value; - // replace the <select> of changed repo - YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs']; + var repo_name = e.currentTarget.value; + // replace the <select> of changed repo + YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs']; }); ypjax(url,'pull_request_overview', function(data){ - var sel_box = YUQ('#pull_request_form #other_repo')[0]; - var repo_name = sel_box.options[sel_box.selectedIndex].value; - YUD.get('pull_request_overview_url').href = url; - YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display',''); - YUD.get('other_repo_gravatar').src = other_repos_info[repo_name]['gravatar']; - YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description']; - YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs']; - // select back the revision that was just compared - setSelectValue(YUD.get('other_ref'), rev_data['other_ref']); + var sel_box = YUQ('#pull_request_form #other_repo')[0]; + var repo_name = sel_box.options[sel_box.selectedIndex].value; + YUD.get('pull_request_overview_url').href = url; + YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display',''); + YUD.get('other_repo_gravatar').src = other_repos_info[repo_name]['gravatar']; + YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description']; + YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs']; + // select back the revision that was just compared + setSelectValue(YUD.get('other_ref'), rev_data['other_ref']); }) } YUE.on('refresh','click',function(e){
--- a/rhodecode/templates/pullrequests/pullrequest_show.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/pullrequests/pullrequest_show.html Tue Jan 22 23:44:38 2013 +0100 @@ -189,7 +189,7 @@ <script type="text/javascript"> YUE.onDOMReady(function(){ - PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA); + PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA); YUE.on(YUQ('.show-inline-comments'),'change',function(e){ var show = 'none'; @@ -218,7 +218,7 @@ renderInlineComments(file_comments); YUE.on(YUD.get('update_pull_request'),'click',function(e){ - updateReviewers(); + updateReviewers(); }) }) </script>
--- 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 @@ -7,31 +7,31 @@ <div id="register"> - <div class="title top-left-rounded-corner top-right-rounded-corner"> - <h5>${_('Sign Up to')} ${c.rhodecode_name}</h5> - </div> - <div class="inner"> - ${h.form(url('register'))} - <div class="form"> - <!-- fields --> - <div class="fields"> - <div class="field"> - <div class="label"> - <label for="username">${_('Username')}:</label> - </div> - <div class="input"> - ${h.text('username',class_="medium")} - </div> - </div> + <div class="title top-left-rounded-corner top-right-rounded-corner"> + <h5>${_('Sign Up to')} ${c.rhodecode_name}</h5> + </div> + <div class="inner"> + ${h.form(url('register'))} + <div class="form"> + <!-- fields --> + <div class="fields"> + <div class="field"> + <div class="label"> + <label for="username">${_('Username')}:</label> + </div> + <div class="input"> + ${h.text('username',class_="medium")} + </div> + </div> - <div class="field"> - <div class="label"> - <label for="password">${_('Password')}:</label> - </div> - <div class="input"> - ${h.password('password',class_="medium")} - </div> - </div> + <div class="field"> + <div class="label"> + <label for="password">${_('Password')}:</label> + </div> + <div class="input"> + ${h.password('password',class_="medium")} + </div> + </div> <div class="field"> <div class="label"> @@ -42,50 +42,50 @@ </div> </div> - <div class="field"> - <div class="label"> - <label for="firstname">${_('First Name')}:</label> - </div> - <div class="input"> - ${h.text('firstname',class_="medium")} - </div> - </div> + <div class="field"> + <div class="label"> + <label for="firstname">${_('First Name')}:</label> + </div> + <div class="input"> + ${h.text('firstname',class_="medium")} + </div> + </div> - <div class="field"> - <div class="label"> - <label for="lastname">${_('Last Name')}:</label> - </div> - <div class="input"> - ${h.text('lastname',class_="medium")} - </div> - </div> + <div class="field"> + <div class="label"> + <label for="lastname">${_('Last Name')}:</label> + </div> + <div class="input"> + ${h.text('lastname',class_="medium")} + </div> + </div> - <div class="field"> - <div class="label"> - <label for="email">${_('Email')}:</label> - </div> - <div class="input"> - ${h.text('email',class_="medium")} - </div> - </div> + <div class="field"> + <div class="label"> + <label for="email">${_('Email')}:</label> + </div> + <div class="input"> + ${h.text('email',class_="medium")} + </div> + </div> - <div class="buttons"> - <div class="nohighlight"> - ${h.submit('sign_up',_('Sign Up'),class_="ui-btn large")} - %if c.auto_active: - <div class="activation_msg">${_('Your account will be activated right after registration')}</div> - %else: - <div class="activation_msg">${_('Your account must wait for activation by administrator')}</div> - %endif - </div> - </div> - </div> - </div> - ${h.end_form()} + <div class="buttons"> + <div class="nohighlight"> + ${h.submit('sign_up',_('Sign Up'),class_="ui-btn large")} + %if c.auto_active: + <div class="activation_msg">${_('Your account will be activated right after registration')}</div> + %else: + <div class="activation_msg">${_('Your account must wait for activation by administrator')}</div> + %endif + </div> + </div> + </div> + </div> + ${h.end_form()} <script type="text/javascript"> YUE.onDOMReady(function(){ YUD.get('username').focus(); }) </script> - </div> + </div> </div>
--- a/rhodecode/templates/search/search.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/search/search.html Tue Jan 22 23:44:38 2013 +0100 @@ -2,63 +2,63 @@ <%inherit file="/base/base.html"/> <%def name="title()"> %if c.cur_query: - %if c.repo_name: - ${_('Search "%s" in repository: %s') % (c.cur_query, c.repo_name)} - %else: - ${_('Search "%s" in all repositories') % c.cur_query} - %endif + %if c.repo_name: + ${_('Search "%s" in repository: %s') % (c.cur_query, c.repo_name)} + %else: + ${_('Search "%s" in all repositories') % c.cur_query} + %endif %else: - %if c.repo_name: - ${_('Search in repository: %s') % c.repo_name} - %else: - ${_('Search in all repositories')} - %endif + %if c.repo_name: + ${_('Search in repository: %s') % c.repo_name} + %else: + ${_('Search in all repositories')} + %endif %endif - - ${c.rhodecode_name} + - ${c.rhodecode_name} </%def> <%def name="breadcrumbs()"> - ${c.rhodecode_name} + ${c.rhodecode_name} </%def> <%def name="page_nav()"> - ${self.menu('home')} + ${self.menu('home')} </%def> <%def name="main()"> <div class="box"> - <!-- box / title --> - <div class="title"> - <h5> - %if c.repo_name: - ${_('Search in repository: %s') % c.repo_name} - %else: - ${_('Search in all repositories')} - %endif - </h5> - </div> - <!-- end box / title --> - %if c.repo_name: - ${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')} - %else: - ${h.form(h.url('search'),method='get')} - %endif - <div class="form"> - <div class="fields"> - <div class="field field-first field-noborder"> + <!-- box / title --> + <div class="title"> + <h5> + %if c.repo_name: + ${_('Search in repository: %s') % c.repo_name} + %else: + ${_('Search in all repositories')} + %endif + </h5> + </div> + <!-- end box / title --> + %if c.repo_name: + ${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')} + %else: + ${h.form(h.url('search'),method='get')} + %endif + <div class="form"> + <div class="fields"> + <div class="field field-first field-noborder"> <div class="label"> <label for="q">${_('Search term')}</label> </div> - <div class="input">${h.text('q',c.cur_query,class_="small")} - <div class="button highlight"> - <input type="submit" value="${_('Search')}" class="ui-button"/> - </div> - </div> - <div style="font-weight: bold;clear:Both;margin-left:200px">${c.runtime}</div> - </div> + <div class="input">${h.text('q',c.cur_query,class_="small")} + <div class="button highlight"> + <input type="submit" value="${_('Search')}" class="ui-button"/> + </div> + </div> + <div style="font-weight: bold;clear:Both;margin-left:200px">${c.runtime}</div> + </div> - <div class="field"> - <div class="label"> - <label for="type">${_('Search in')}</label> - </div> + <div class="field"> + <div class="label"> + <label for="type">${_('Search in')}</label> + </div> <div class="select"> ${h.select('type',c.cur_type,[('content',_('File contents')), ('commit',_('Commit messages')), @@ -68,9 +68,9 @@ </div> </div> - </div> - </div> - ${h.end_form()} + </div> + </div> + ${h.end_form()} <div class="search"> %if c.cur_type == 'content': <%include file='search_content.html'/>
--- a/rhodecode/templates/search/search_path.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/search/search_path.html Tue Jan 22 23:44:38 2013 +0100 @@ -2,19 +2,19 @@ %for cnt,sr in enumerate(c.formated_results): %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(sr['repository'],'search results check'): - <div class="search_path"> - <div class="link"> - ${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['f_path'])), - h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))} - </div> - </div> + <div class="search_path"> + <div class="link"> + ${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['f_path'])), + h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))} + </div> + </div> %else: %if cnt == 0: - <div class="error"> - <div class="link"> - ${_('Permission denied')} - </div> - </div> + <div class="error"> + <div class="link"> + ${_('Permission denied')} + </div> + </div> %endif %endif
--- a/rhodecode/templates/settings/repo_settings.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/settings/repo_settings.html Tue Jan 22 23:44:38 2013 +0100 @@ -34,15 +34,15 @@ ${h.text('repo_name',class_="small")} </div> </div> - <div class="field"> - <div class="label"> - <label for="clone_uri">${_('Clone uri')}:</label> - </div> - <div class="input"> - ${h.text('clone_uri',class_="medium")} + <div class="field"> + <div class="label"> + <label for="clone_uri">${_('Clone uri')}:</label> + </div> + <div class="input"> + ${h.text('clone_uri',class_="medium")} <span class="help-block">${_('Optional http[s] url from which repository should be cloned.')}</span> - </div> - </div> + </div> + </div> <div class="field"> <div class="label"> <label for="repo_group">${_('Repository group')}:</label>
--- a/rhodecode/templates/shortlog/shortlog.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/shortlog/shortlog.html Tue Jan 22 23:44:38 2013 +0100 @@ -31,9 +31,9 @@ </div> <!-- end box / title --> <div class="table"> - <div id="shortlog_data"> - ${c.shortlog_data} - </div> + <div id="shortlog_data"> + ${c.shortlog_data} + </div> </div> </div> </%def>
--- a/rhodecode/templates/shortlog/shortlog_data.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/shortlog/shortlog_data.html Tue Jan 22 23:44:38 2013 +0100 @@ -1,16 +1,16 @@ ## -*- coding: utf-8 -*- %if c.repo_changesets: <table class="table_disp"> - <tr> - <th class="left">${_('revision')}</th> + <tr> + <th class="left">${_('revision')}</th> <th class="left">${_('commit message')}</th> - <th class="left">${_('age')}</th> - <th class="left">${_('author')}</th> - <th class="left">${_('branch')}</th> - <th class="left">${_('tags')}</th> - </tr> + <th class="left">${_('age')}</th> + <th class="left">${_('author')}</th> + <th class="left">${_('branch')}</th> + <th class="left">${_('tags')}</th> + </tr> %for cnt,cs in enumerate(c.repo_changesets): - <tr class="parity${cnt%2}"> + <tr class="parity${cnt%2}"> <td> <div> <div class="changeset-status-container"> @@ -35,24 +35,24 @@ <td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}"> ${h.age(cs.date)}</span> </td> - <td title="${cs.author}">${h.person(cs.author)}</td> - <td> - <span class="logtags"> + <td title="${cs.author}">${h.person(cs.author)}</td> + <td> + <span class="logtags"> %if cs.branch: - <span class="branchtag"> + <span class="branchtag"> ${cs.branch} </span> %endif - </span> - </td> - <td> - <span class="logtags"> - %for tag in cs.tags: - <span class="tagtag">${tag}</span> - %endfor - </span> - </td> - </tr> + </span> + </td> + <td> + <span class="logtags"> + %for tag in cs.tags: + <span class="tagtag">${tag}</span> + %endfor + </span> + </td> + </tr> %endfor </table>
--- a/rhodecode/templates/summary/summary.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/summary/summary.html Tue Jan 22 23:44:38 2013 +0100 @@ -13,7 +13,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('summary')} + ${self.menu('summary')} </%def> <%def name="head_extra()"> @@ -35,14 +35,14 @@ ${self.breadcrumbs()} </div> <!-- end box / title --> - <div class="form"> - <div id="summary" class="fields"> + <div class="form"> + <div id="summary" class="fields"> - <div class="field"> - <div class="label-summary"> - <label>${_('Name')}:</label> - </div> - <div class="input ${summary(c.show_stats)}"> + <div class="field"> + <div class="label-summary"> + <label>${_('Name')}:</label> + </div> + <div class="input ${summary(c.show_stats)}"> <div style="float:right;padding:5px 0px 0px 5px"> %if c.rhodecode_user.username != 'default': ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='rss_icon')} @@ -73,119 +73,119 @@ %endif %endif ##REPO TYPE - %if h.is_hg(c.dbrepo): - <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/> - %endif - %if h.is_git(c.dbrepo): - <img style="margin-bottom:2px" class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/> - %endif + %if h.is_hg(c.dbrepo): + <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/> + %endif + %if h.is_git(c.dbrepo): + <img style="margin-bottom:2px" class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/> + %endif ##PUBLIC/PRIVATE - %if c.dbrepo.private: - <img style="margin-bottom:2px" class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/> - %else: - <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/> - %endif + %if c.dbrepo.private: + <img style="margin-bottom:2px" class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/> + %else: + <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/> + %endif - ##REPO NAME - <span class="repo_name" title="${_('Non changable ID %s') % c.dbrepo.repo_id}">${h.repo_link(c.dbrepo.groups_and_repo)}</span> + ##REPO NAME + <span class="repo_name" title="${_('Non changable ID %s') % c.dbrepo.repo_id}">${h.repo_link(c.dbrepo.groups_and_repo)}</span> ##FORK - %if c.dbrepo.fork: - <div style="margin-top:5px;clear:both""> - <a href="${h.url('summary_home',repo_name=c.dbrepo.fork.repo_name)}"><img class="icon" alt="${_('public')}" title="${_('Fork of')} ${c.dbrepo.fork.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/> - ${_('Fork of')} ${c.dbrepo.fork.repo_name} - </a> - </div> - %endif - ##REMOTE - %if c.dbrepo.clone_uri: + %if c.dbrepo.fork: + <div style="margin-top:5px;clear:both""> + <a href="${h.url('summary_home',repo_name=c.dbrepo.fork.repo_name)}"><img class="icon" alt="${_('public')}" title="${_('Fork of')} ${c.dbrepo.fork.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/> + ${_('Fork of')} ${c.dbrepo.fork.repo_name} + </a> + </div> + %endif + ##REMOTE + %if c.dbrepo.clone_uri: <div style="margin-top:5px;clear:both"> <a href="${h.url(str(h.hide_credentials(c.dbrepo.clone_uri)))}"><img class="icon" alt="${_('remote clone')}" title="${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)}" src="${h.url('/images/icons/connect.png')}"/> ${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)} </a> </div> - %endif - </div> - </div> + %endif + </div> + </div> - <div class="field"> - <div class="label-summary"> - <label>${_('Description')}:</label> - </div> + <div class="field"> + <div class="label-summary"> + <label>${_('Description')}:</label> + </div> %if c.visual.stylify_metatags: <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.desc_stylize(c.dbrepo.description))}</div> %else: <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(c.dbrepo.description)}</div> %endif - </div> + </div> - <div class="field"> - <div class="label-summary"> - <label>${_('Contact')}:</label> - </div> - <div class="input ${summary(c.show_stats)}"> - <div class="gravatar"> - <img alt="gravatar" src="${h.gravatar_url(c.dbrepo.user.email)}"/> - </div> - ${_('Username')}: ${c.dbrepo.user.username}<br/> - ${_('Name')}: ${c.dbrepo.user.name} ${c.dbrepo.user.lastname}<br/> - ${_('Email')}: <a href="mailto:${c.dbrepo.user.email}">${c.dbrepo.user.email}</a> - </div> - </div> + <div class="field"> + <div class="label-summary"> + <label>${_('Contact')}:</label> + </div> + <div class="input ${summary(c.show_stats)}"> + <div class="gravatar"> + <img alt="gravatar" src="${h.gravatar_url(c.dbrepo.user.email)}"/> + </div> + ${_('Username')}: ${c.dbrepo.user.username}<br/> + ${_('Name')}: ${c.dbrepo.user.name} ${c.dbrepo.user.lastname}<br/> + ${_('Email')}: <a href="mailto:${c.dbrepo.user.email}">${c.dbrepo.user.email}</a> + </div> + </div> - <div class="field"> - <div class="label-summary"> - <label>${_('Clone url')}:</label> - </div> - <div class="input ${summary(c.show_stats)}"> + <div class="field"> + <div class="label-summary"> + <label>${_('Clone url')}:</label> + </div> + <div class="input ${summary(c.show_stats)}"> <div style="display:none" id="clone_by_name" class="ui-btn clone">${_('Show by Name')}</div> <div id="clone_by_id" class="ui-btn clone">${_('Show by ID')}</div> - <input style="width:80%;margin-left:105px" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/> + <input style="width:80%;margin-left:105px" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/> <input style="display:none;width:80%;margin-left:105px" type="text" id="clone_url_id" readonly="readonly" value="${c.clone_repo_url_id}"/> - </div> - </div> + </div> + </div> - <div class="field"> - <div class="label-summary"> - <label>${_('Trending files')}:</label> - </div> - <div class="input ${summary(c.show_stats)}"> + <div class="field"> + <div class="label-summary"> + <label>${_('Trending files')}:</label> + </div> + <div class="input ${summary(c.show_stats)}"> %if c.show_stats: - <div id="lang_stats"></div> + <div id="lang_stats"></div> %else: ${_('Statistics are disabled for this repository')} %if h.HasPermissionAll('hg.admin')('enable stats on from summary'): ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")} %endif %endif - </div> - </div> + </div> + </div> - <div class="field"> - <div class="label-summary"> - <label>${_('Download')}:</label> - </div> - <div class="input ${summary(c.show_stats)}"> - %if len(c.rhodecode_repo.revisions) == 0: - ${_('There are no downloads yet')} - %elif c.enable_downloads is False: - ${_('Downloads are disabled for this repository')} + <div class="field"> + <div class="label-summary"> + <label>${_('Download')}:</label> + </div> + <div class="input ${summary(c.show_stats)}"> + %if len(c.rhodecode_repo.revisions) == 0: + ${_('There are no downloads yet')} + %elif c.enable_downloads is False: + ${_('Downloads are disabled for this repository')} %if h.HasPermissionAll('hg.admin')('enable downloads on from summary'): ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")} %endif - %else: - ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)} - <span id="${'zip_link'}">${h.link_to(_('Download as zip'), h.url('files_archive_home',repo_name=c.dbrepo.repo_name,fname='tip.zip'),class_="archive_icon ui-btn")}</span> + %else: + ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)} + <span id="${'zip_link'}">${h.link_to(_('Download as zip'), h.url('files_archive_home',repo_name=c.dbrepo.repo_name,fname='tip.zip'),class_="archive_icon ui-btn")}</span> <span style="vertical-align: bottom"> <input id="archive_subrepos" type="checkbox" name="subrepos" /> <label for="archive_subrepos" class="tooltip" title="${h.tooltip(_('Check this to download archive with subrepos'))}" >${_('with subrepos')}</label> </span> - %endif - </div> - </div> - </div> - </div> + %endif + </div> + </div> + </div> + </div> </div> %if c.show_stats: @@ -210,12 +210,12 @@ <div style="clear: both;height: 10px"></div> <div id="overview" style="width:450px;height:100px;float:left"></div> - <div id="legend_data" style="clear:both;margin-top:10px;"> - <div id="legend_container"></div> - <div id="legend_choices"> - <table id="legend_choices_tables" class="noborder" style="font-size:smaller;color:#545454"></table> - </div> - </div> + <div id="legend_data" style="clear:both;margin-top:10px;"> + <div id="legend_container"></div> + <div id="legend_choices"> + <table id="legend_choices_tables" class="noborder" style="font-size:smaller;color:#545454"></table> + </div> + </div> </div> </div> %endif @@ -279,13 +279,13 @@ }) YUE.on('clone_by_id','click',function(e){ - // show url by id and hide id button - YUD.setStyle('clone_by_id','display','none'); + // show url by id and hide id button + YUD.setStyle('clone_by_id','display','none'); YUD.setStyle('clone_url_id','display',''); // hide url by name and show id button - YUD.setStyle('clone_by_name','display',''); - YUD.setStyle('clone_url','display','none'); + YUD.setStyle('clone_by_name','display',''); + YUD.setStyle('clone_url','display','none'); }) @@ -323,7 +323,7 @@ tbl.setAttribute('class','trending_language_tbl'); var cnt = 0; for (var i=0;i<data.length;i++){ - total+= data[i][1].count; + total+= data[i][1].count; } for (var i=0;i<data.length;i++){ cnt += 1;
--- a/rhodecode/templates/tags/tags_data.html Tue Jan 22 23:44:38 2013 +0100 +++ b/rhodecode/templates/tags/tags_data.html Tue Jan 22 23:44:38 2013 +0100 @@ -2,16 +2,16 @@ <div id="table_wrap" class="yui-skin-sam"> <table id="tags_data"> <thead> - <tr> + <tr> <th class="left">${_('Name')}</th> <th class="left">${_('Date')}</th> <th class="left">${_('Author')}</th> <th class="left">${_('Revision')}</th> <th class="left">${_('Compare')}</th> - </tr> + </tr> </thead> - %for cnt,tag in enumerate(c.repo_tags.items()): - <tr class="parity${cnt%2}"> + %for cnt,tag in enumerate(c.repo_tags.items()): + <tr class="parity${cnt%2}"> <td> <span class="logtags"> <span class="tagtag">${h.link_to(tag[0], @@ -20,8 +20,8 @@ </span> </td> <td><span class="tooltip" title="${h.tooltip(h.age(tag[1].date))}">${h.fmt_date(tag[1].date)}</span></td> - <td title="${tag[1].author}">${h.person(tag[1].author)}</td> - <td> + <td title="${tag[1].author}">${h.person(tag[1].author)}</td> + <td> <div> <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id)}">r${tag[1].revision}:${h.short_id(tag[1].raw_id)}</a></pre> </div> @@ -30,10 +30,10 @@ <input class="branch-compare" type="radio" name="compare_org" value="${tag[0]}"/> <input class="branch-compare" type="radio" name="compare_other" value="${tag[0]}"/> </td> - </tr> - %endfor + </tr> + %endfor </table> </div> %else: - ${_('There are no tags yet')} + ${_('There are no tags yet')} %endif