diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-01-12 06:32:40 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-01-12 06:32:40 +0200 |
| commit | d99abc09bf9d8eac6d37487273a1f04540d0dbea (patch) | |
| tree | 1c2b43cdedfb22c165b1480129e6bd7b94742690 /rhodecode | |
| parent | a43b372cceb7343a5321159674a262869ad84722 (diff) | |
White-space cleanup
--HG--
branch : beta
Diffstat (limited to 'rhodecode')
78 files changed, 1050 insertions, 1072 deletions
diff --git a/rhodecode/templates/_data_table/_dt_elements.html b/rhodecode/templates/_data_table/_dt_elements.html index e8405b08..f58cc0b8 100644 --- a/rhodecode/templates/_data_table/_dt_elements.html +++ b/rhodecode/templates/_data_table/_dt_elements.html @@ -10,33 +10,33 @@ <span class="icon"> <img src="${h.url('/images/icons/clipboard_16.png')}" alt="${_('Summary')}" /> </span> - <span>${_('Summary')}</span> - </a> + <span>${_('Summary')}</span> + </a> </li> <li> <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=repo_name)}"> <span class="icon"> <img src="${h.url('/images/icons/time.png')}" alt="${_('Changelog')}" /> </span> - <span>${_('Changelog')}</span> - </a> + <span>${_('Changelog')}</span> + </a> </li> <li> <a title="${_('Files')}" href="${h.url('files_home',repo_name=repo_name)}"> <span class="icon"> <img src="${h.url('/images/icons/file.png')}" alt="${_('Files')}" /> </span> - <span>${_('Files')}</span> - </a> + <span>${_('Files')}</span> + </a> </li> <li> <a title="${_('Fork')}" href="${h.url('repo_fork_home',repo_name=repo_name)}"> <span class="icon"> <img src="${h.url('/images/icons/arrow_divide.png')}" alt="${_('Fork')}" /> </span> - <span>${_('Fork')}</span> - </a> - </li> + <span>${_('Fork')}</span> + </a> + </li> </ul> </%def> @@ -47,16 +47,16 @@ <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/> %elif rtype =='git': <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/> - %endif - + %endif + ##PRIVATE/PUBLIC %if private: <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/> %else: <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/> %endif - - ##NAME + + ##NAME ${h.link_to(name,h.url('summary_home',repo_name=name),class_="repo_name")} %if fork_of: <a href="${h.url('summary_home',repo_name=fork_of)}"> diff --git a/rhodecode/templates/admin/admin.html b/rhodecode/templates/admin/admin.html index 324d45d8..a7bb16b1 100644 --- a/rhodecode/templates/admin/admin.html +++ b/rhodecode/templates/admin/admin.html @@ -24,5 +24,5 @@ ${c.log_data} </div> </div> -</div> -</%def>
\ No newline at end of file +</div> +</%def> diff --git a/rhodecode/templates/admin/admin_log.html b/rhodecode/templates/admin/admin_log.html index a1d28c18..cf1f1312 100644 --- a/rhodecode/templates/admin/admin_log.html +++ b/rhodecode/templates/admin/admin_log.html @@ -23,7 +23,7 @@ ${l.repository_name} %endif </td> - + <td>${l.action_date}</td> <td>${l.user_ip}</td> </tr> @@ -36,7 +36,7 @@ ypjax(e.target.href,"user_log",function(){show_more_event();tooltip_activate();}); YUE.preventDefault(e); },'.pager_link'); - + YUE.delegate("user_log","click",function(e,matchedEl,container){ var el = e.target; YUD.setStyle(YUD.get(el.id.substring(1)),'display',''); @@ -48,6 +48,6 @@ <div class="pagination-wh pagination-left"> ${c.users_log.pager('$link_previous ~2~ $link_next')} </div> -%else: - ${_('No actions yet')} -%endif
\ No newline at end of file +%else: + ${_('No actions yet')} +%endif diff --git a/rhodecode/templates/admin/ldap/ldap.html b/rhodecode/templates/admin/ldap/ldap.html index 2472c7ea..2e9da4c6 100644 --- a/rhodecode/templates/admin/ldap/ldap.html +++ b/rhodecode/templates/admin/ldap/ldap.html @@ -6,9 +6,9 @@ </%def> <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${_('Ldap')} + ${_('Ldap')} </%def> <%def name="page_nav()"> @@ -19,7 +19,7 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> ${h.form(url('ldap_settings'))} <div class="form"> @@ -84,20 +84,12 @@ <div class="label"><label for="ldap_attr_email">${_('E-mail Attribute')}</label></div> <div class="input">${h.text('ldap_attr_email',class_='small')}</div> </div> - + <div class="buttons"> ${h.submit('save',_('Save'),class_="ui-button")} - </div> + </div> </div> - </div> - ${h.end_form()} + </div> + ${h.end_form()} </div> -</%def> - - - - - - - - +</%def> diff --git a/rhodecode/templates/admin/notifications/notifications.html b/rhodecode/templates/admin/notifications/notifications.html index abff13f7..eb113f52 100644 --- a/rhodecode/templates/admin/notifications/notifications.html +++ b/rhodecode/templates/admin/notifications/notifications.html @@ -17,12 +17,12 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} <ul class="links"> <li> <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span> - </li> - </ul> + </li> + </ul> </div> %if c.notifications: <div style="padding:10px 15px;text-align: right"> @@ -46,8 +46,8 @@ YUE.on(YUQ('.delete-notification'),'click',function(e){ YUE.on(YUQ('.delete-notification'),'click',function(e){ var notification_id = e.currentTarget.id; deleteNotification(url_del,notification_id) - }) + }) }); }) </script> -</%def> +</%def> diff --git a/rhodecode/templates/admin/notifications/notifications_data.html b/rhodecode/templates/admin/notifications/notifications_data.html index d1a715c6..1dadd174 100644 --- a/rhodecode/templates/admin/notifications/notifications_data.html +++ b/rhodecode/templates/admin/notifications/notifications_data.html @@ -25,4 +25,4 @@ unread = lambda n:{False:'unread'}.get(n) </div> %else: <div class="table">${_('No notifications here yet')}</div> -%endif
\ No newline at end of file +%endif diff --git a/rhodecode/templates/admin/notifications/show_notification.html b/rhodecode/templates/admin/notifications/show_notification.html index 8d48929c..0b09562a 100644 --- a/rhodecode/templates/admin/notifications/show_notification.html +++ b/rhodecode/templates/admin/notifications/show_notification.html @@ -7,7 +7,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(_('Notifications'),h.url('notifications'))} - » + » ${_('Show notification')} </%def> @@ -19,12 +19,12 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} <ul class="links"> <li> <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span> - </li> - </ul> + </li> + </ul> </div> <div class="table"> <div id="notification_${c.notification.notification_id}"> @@ -51,4 +51,4 @@ var main = "${url('notifications')}"; deleteNotification(url,notification_id,[function(){window.location=main}]) }) </script> -</%def> +</%def> diff --git a/rhodecode/templates/admin/permissions/permissions.html b/rhodecode/templates/admin/permissions/permissions.html index 96a04f41..93dbf441 100644 --- a/rhodecode/templates/admin/permissions/permissions.html +++ b/rhodecode/templates/admin/permissions/permissions.html @@ -6,9 +6,9 @@ </%def> <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${_('Permissions')} + ${_('Permissions')} </%def> <%def name="page_nav()"> @@ -19,7 +19,7 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <h3>${_('Default permissions')}</h3> ${h.form(url('permission', id='default'),method='put')} @@ -35,21 +35,21 @@ ${h.checkbox('anonymous',True)} </div> </div> - </div> + </div> <div class="field"> <div class="label label-select"> <label for="default_perm">${_('Repository permission')}:</label> </div> <div class="select"> ${h.select('default_perm','',c.perms_choices)} - + ${h.checkbox('overwrite_default','true')} <label for="overwrite_default"> - <span class="tooltip" + <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> + </div> <div class="field"> <div class="label"> <label for="default_register">${_('Registration')}:</label> @@ -57,7 +57,7 @@ <div class="select"> ${h.select('default_register','',c.register_choices)} </div> - </div> + </div> <div class="field"> <div class="label"> <label for="default_create">${_('Repository creation')}:</label> @@ -65,20 +65,13 @@ <div class="select"> ${h.select('default_create','',c.create_choices)} </div> - </div> - + </div> + <div class="buttons"> ${h.submit('set',_('set'),class_="ui-button")} - </div> + </div> </div> - </div> + </div> ${h.end_form()} </div> -</%def> - - - - - - - +</%def> diff --git a/rhodecode/templates/admin/repos/repo_add.html b/rhodecode/templates/admin/repos/repo_add.html index 434a55b1..81853a0c 100644 --- a/rhodecode/templates/admin/repos/repo_add.html +++ b/rhodecode/templates/admin/repos/repo_add.html @@ -6,9 +6,9 @@ </%def> <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Repositories'),h.url('repos'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Repositories'),h.url('repos'))} » ${_('add new')} </%def> @@ -21,8 +21,8 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <%include file="repo_add_base.html"/> - </div> -</%def>
\ No newline at end of file + </div> +</%def> diff --git a/rhodecode/templates/admin/repos/repo_add_base.html b/rhodecode/templates/admin/repos/repo_add_base.html index 4f69dbc6..3dfab5b8 100644 --- a/rhodecode/templates/admin/repos/repo_add_base.html +++ b/rhodecode/templates/admin/repos/repo_add_base.html @@ -22,7 +22,7 @@ ${h.form(url('repos'))} <div class="input"> ${h.text('clone_uri',class_="small")} </div> - </div> + </div> <div class="field"> <div class="label"> <label for="repo_group">${_('Repository group')}:</label> @@ -30,7 +30,7 @@ ${h.form(url('repos'))} <div class="input"> ${h.select('repo_group','',c.repo_groups,class_="medium")} </div> - </div> + </div> <div class="field"> <div class="label"> <label for="repo_type">${_('Type')}:</label> @@ -38,7 +38,7 @@ ${h.form(url('repos'))} <div class="input"> ${h.select('repo_type','hg',c.backends,class_="small")} </div> - </div> + </div> <div class="field"> <div class="label label-textarea"> <label for="description">${_('Description')}:</label> @@ -57,7 +57,7 @@ ${h.form(url('repos'))} </div> <div class="buttons"> ${h.submit('add',_('add'),class_="ui-button")} - </div> + </div> </div> -</div> -${h.end_form()} +</div> +${h.end_form()} diff --git a/rhodecode/templates/admin/repos/repo_add_create_repository.html b/rhodecode/templates/admin/repos/repo_add_create_repository.html index 79bf403f..7029768d 100644 --- a/rhodecode/templates/admin/repos/repo_add_create_repository.html +++ b/rhodecode/templates/admin/repos/repo_add_create_repository.html @@ -17,8 +17,8 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <%include file="repo_add_base.html"/> - </div> -</%def>
\ No newline at end of file + </div> +</%def> diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html index b95c9f37..22f00f8a 100644 --- a/rhodecode/templates/admin/repos/repo_edit.html +++ b/rhodecode/templates/admin/repos/repo_edit.html @@ -6,9 +6,9 @@ </%def> <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Repositories'),h.url('repos'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Repositories'),h.url('repos'))} » ${_('edit')} » ${h.link_to(c.repo_info.just_name,h.url('summary_home',repo_name=c.repo_name))} </%def> @@ -21,7 +21,7 @@ <div class="box box-left"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='put')} <div class="form"> @@ -42,7 +42,7 @@ <div class="input"> ${h.text('clone_uri',class_="medium")} </div> - </div> + </div> <div class="field"> <div class="label"> <label for="repo_group">${_('Repository group')}:</label> @@ -50,7 +50,7 @@ <div class="input"> ${h.select('repo_group','',c.repo_groups,class_="medium")} </div> - </div> + </div> <div class="field"> <div class="label"> <label for="repo_type">${_('Type')}:</label> @@ -58,7 +58,7 @@ <div class="input"> ${h.select('repo_type','hg',c.backends,class_="medium")} </div> - </div> + </div> <div class="field"> <div class="label label-textarea"> <label for="description">${_('Description')}:</label> @@ -67,7 +67,7 @@ ${h.textarea('description',cols=23,rows=5)} </div> </div> - + <div class="field"> <div class="label label-checkbox"> <label for="private">${_('Private')}:</label> @@ -83,7 +83,7 @@ <div class="checkboxes"> ${h.checkbox('enable_statistics',value="True")} </div> - </div> + </div> <div class="field"> <div class="label label-checkbox"> <label for="enable_downloads">${_('Enable downloads')}:</label> @@ -91,7 +91,7 @@ <div class="checkboxes"> ${h.checkbox('enable_downloads',value="True")} </div> - </div> + </div> <div class="field"> <div class="label"> <label for="user">${_('Owner')}:</label> @@ -102,8 +102,8 @@ <div id="owner_container"></div> </div> </div> - </div> - + </div> + <div class="field"> <div class="label"> <label for="input">${_('Permissions')}:</label> @@ -111,22 +111,22 @@ <div class="input"> <%include file="repo_edit_perms.html"/> </div> - + <div class="buttons"> ${h.submit('save','Save',class_="ui-button")} ${h.reset('reset','Reset',class_="ui-button")} - </div> + </div> </div> </div> - </div> + </div> ${h.end_form()} </div> <div class="box box-right"> <div class="title"> - <h5>${_('Administration')}</h5> + <h5>${_('Administration')}</h5> </div> - + <h3>${_('Statistics')}</h3> ${h.form(url('repo_stats', repo_name=c.repo_info.repo_name),method='delete')} <div class="form"> @@ -139,9 +139,9 @@ </ul> </div> </div> - </div> + </div> ${h.end_form()} - + %if c.repo_info.clone_uri: <h3>${_('Remote')}</h3> ${h.form(url('repo_pull', repo_name=c.repo_info.repo_name),method='put')} @@ -151,22 +151,22 @@ <div class="field" style="border:none"> <ul> <li><a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri}</a></li> - </ul> - </div> + </ul> + </div> </div> - </div> + </div> ${h.end_form()} %endif - + <h3>${_('Cache')}</h3> ${h.form(url('repo_cache', repo_name=c.repo_info.repo_name),method='delete')} <div class="form"> <div class="fields"> ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate repository cache'),class_="ui-btn",onclick="return confirm('"+_('Confirm to invalidate repository cache')+"');")} </div> - </div> + </div> ${h.end_form()} - + <h3>${_('Public journal')}</h3> ${h.form(url('repo_public_journal', repo_name=c.repo_info.repo_name),method='put')} <div class="form"> @@ -183,10 +183,10 @@ <li>${_('''All actions made on this repository will be accessible to everyone in public journal''')} </li> </ul> - </div> + </div> </div> ${h.end_form()} - + <h3>${_('Delete')}</h3> ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='delete')} <div class="form"> @@ -195,12 +195,12 @@ </div> <div class="field" style="border:none;color:#888"> <ul> - <li>${_('''This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. + <li>${_('''This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need fully delete it from filesystem please do it manually''')} </li> </ul> - </div> - </div> + </div> + </div> ${h.end_form()} <h3>${_('Set as fork')}</h3> @@ -214,11 +214,11 @@ <ul> <li>${_('''Manually set this repository as a fork of another''')}</li> </ul> - </div> - </div> + </div> + </div> ${h.end_form()} - + </div> -</%def> +</%def> diff --git a/rhodecode/templates/admin/repos/repo_edit_perms.html b/rhodecode/templates/admin/repos/repo_edit_perms.html index dcd24fb1..d9374dde 100644 --- a/rhodecode/templates/admin/repos/repo_edit_perms.html +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html @@ -7,7 +7,7 @@ <td>${_('member')}</td> <td></td> </tr> - ## USERS + ## USERS %for r2p in c.repo_info.repo_to_perm: %if r2p.user.username =='default' and c.repo_info.private: <tr> @@ -32,13 +32,13 @@ <span class="delete_icon action_button" onclick="ajaxActionUser(${r2p.user.user_id},'${'id%s'%id(r2p.user.username)}')"> ${_('revoke')} </span> - %endif + %endif </td> </tr> %endif %endfor - - ## USERS GROUPS + + ## USERS GROUPS %for g2p in c.repo_info.users_group_to_perm: <tr id="id${id(g2p.users_group.users_group_name)}"> <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.none')}</td> @@ -92,10 +92,10 @@ function ajaxActionUser(user_id, field_id) { var postData = '_method=delete&user_id=' + user_id; var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData); }; - + function ajaxActionUsersGroup(users_group_id,field_id){ var sUrl = "${h.url('delete_repo_users_group',repo_name=c.repo_name)}"; - var callback = { + var callback = { success:function(o){ var tr = YUD.get(String(field_id)); tr.parentNode.removeChild(tr); @@ -104,7 +104,7 @@ function ajaxActionUsersGroup(users_group_id,field_id){ alert("${_('Failed to remove users group')}"); }, }; - var postData = '_method=delete&users_group_id='+users_group_id; + var postData = '_method=delete&users_group_id='+users_group_id; var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData); }; @@ -267,7 +267,7 @@ YAHOO.example.FnMultipleFields = function () { membersAC.itemSelectEvent.subscribe(myHandler); if(ownerAC.itemSelectEvent){ - ownerAC.itemSelectEvent.subscribe(myHandler); + ownerAC.itemSelectEvent.subscribe(myHandler); } return { @@ -277,5 +277,5 @@ YAHOO.example.FnMultipleFields = function () { ownerAC: ownerAC, }; }(); - -</script>
\ No newline at end of file + +</script> diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html index 4de0c0e5..ed97e148 100644 --- a/rhodecode/templates/admin/repos/repos.html +++ b/rhodecode/templates/admin/repos/repos.html @@ -20,15 +20,15 @@ <ul class="links"> <li> <span>${h.link_to(_(u'ADD REPOSITORY'),h.url('new_repo'))}</span> - </li> - </ul> + </li> + </ul> </div> <div class="table"> <div id='repos_list_wrap' class="yui-skin-sam"> <%cnt=0%> <%namespace name="dt" file="/_data_table/_dt_elements.html"/> - + <table id="repos_list"> <thead> <tr> @@ -41,7 +41,7 @@ <th class="left">${_('Action')}</th> </tr> </thead> - + %for cnt,repo in enumerate(c.repos_list,1): <tr class="parity${cnt%2}"> <td class="quick_repo_menu"> @@ -60,7 +60,7 @@ </td> ##LAST REVISION <td> - ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} + ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} </td> <td title="${repo['contact']}">${h.person(repo['contact'])}</td> <td> @@ -73,9 +73,9 @@ </table> </div> </div> -</div> +</div> <script> - + // main table sorting var myColumnDefs = [ {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"}, @@ -91,9 +91,9 @@ ]; var myDataSource = new YAHOO.util.DataSource(YUD.get("repos_list")); - + myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE; - + myDataSource.responseSchema = { fields: [ {key:"menu"}, @@ -113,12 +113,12 @@ MSG_SORTDESC:"${_('Click to sort descending')}", MSG_EMPTY:"${_('No records found.')}", MSG_ERROR:"${_('Data error.')}", - MSG_LOADING:"${_('Loading...')}", + MSG_LOADING:"${_('Loading...')}", } ); myDataTable.subscribe('postRenderEvent',function(oArgs) { tooltip_activate(); quick_repo_menu(); - }); -</script> -</%def> + }); +</script> +</%def> diff --git a/rhodecode/templates/admin/repos_groups/repos_groups.html b/rhodecode/templates/admin/repos_groups/repos_groups.html index 011e89a8..cae3dd74 100644 --- a/rhodecode/templates/admin/repos_groups/repos_groups.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups.html @@ -5,12 +5,12 @@ </%def> <%def name="breadcrumbs()"> - <span class="groups_breadcrumbs"> ${_('Groups')} + <span class="groups_breadcrumbs"> ${_('Groups')} %if c.group.parent_group: » ${h.link_to(c.group.parent_group.name,h.url('repos_group_home',group_name=c.group.parent_group.group_name))} %endif » "${c.group.name}" ${_('with')} - </span> + </span> </%def> <%def name="page_nav()"> @@ -18,4 +18,4 @@ </%def> <%def name="main()"> <%include file="/index_base.html" args="parent=self"/> -</%def> +</%def> diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_add.html b/rhodecode/templates/admin/repos_groups/repos_groups_add.html index 615d3a2a..05906093 100644 --- a/rhodecode/templates/admin/repos_groups/repos_groups_add.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_add.html @@ -5,9 +5,9 @@ ${_('Add repos group')} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Repos groups'),h.url('repos_groups'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Repos groups'),h.url('repos_groups'))} » ${_('add new repos group')} </%def> @@ -20,7 +20,7 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <!-- end box / title --> ${h.form(url('repos_groups'))} @@ -35,7 +35,7 @@ ${h.text('group_name',class_='medium')} </div> </div> - + <div class="field"> <div class="label label-textarea"> <label for="group_description">${_('Description')}:</label> @@ -44,7 +44,7 @@ ${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> @@ -52,13 +52,13 @@ <div class="input"> ${h.select('group_parent_id','',c.repo_groups,class_="medium")} </div> - </div> - + </div> + <div class="buttons"> ${h.submit('save',_('save'),class_="ui-button")} - </div> + </div> </div> </div> ${h.end_form()} -</div> -</%def> +</div> +</%def> diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html index 14bb0459..89bca5f7 100644 --- a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html @@ -5,9 +5,9 @@ ${_('Edit repos group')} ${c.repos_group.name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Repos groups'),h.url('repos_groups'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Repos groups'),h.url('repos_groups'))} » ${_('edit repos group')} "${c.repos_group.name}" </%def> @@ -20,7 +20,7 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <!-- end box / title --> ${h.form(url('repos_group',id=c.repos_group.group_id),method='put')} @@ -35,7 +35,7 @@ ${h.text('group_name',class_='medium')} </div> </div> - + <div class="field"> <div class="label label-textarea"> <label for="group_description">${_('Description')}:</label> @@ -44,7 +44,7 @@ ${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> @@ -52,13 +52,13 @@ <div class="input"> ${h.select('group_parent_id','',c.repo_groups,class_="medium")} </div> - </div> - + </div> + <div class="buttons"> ${h.submit('save',_('save'),class_="ui-button")} - </div> + </div> </div> </div> ${h.end_form()} -</div> -</%def> +</div> +</%def> diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_show.html b/rhodecode/templates/admin/repos_groups/repos_groups_show.html index 331146fa..b70d2235 100644 --- a/rhodecode/templates/admin/repos_groups/repos_groups_show.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_show.html @@ -20,14 +20,14 @@ <ul class="links"> <li> <span>${h.link_to(_(u'ADD NEW GROUP'),h.url('new_repos_group'))}</span> - </li> - </ul> + </li> + </ul> </div> <!-- end box / title --> <div class="table"> % if c.groups: <table class="table_disp"> - + <thead> <tr> <th class="left"><a href="#">${_('Group name')}</a></th> @@ -36,9 +36,9 @@ <th class="left">${_('action')}</th> </tr> </thead> - + ## REPO GROUPS - + % for gr in c.groups: <tr> <td> @@ -53,16 +53,16 @@ ${h.form(url('repos_group', id=gr.group_id),method='delete')} ${h.submit('remove_%s' % gr.name,'delete',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this group: %s') % gr.name+"');")} ${h.end_form()} - </td> + </td> </tr> % endfor - + </table> % else: ${_('There are no repositories groups yet')} % endif - + </div> -</div> - -</%def> +</div> + +</%def> diff --git a/rhodecode/templates/admin/settings/hooks.html b/rhodecode/templates/admin/settings/hooks.html index 9f3d94e4..30040065 100644 --- a/rhodecode/templates/admin/settings/hooks.html +++ b/rhodecode/templates/admin/settings/hooks.html @@ -17,10 +17,10 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <!-- end box / title --> - + <h3>${_('Built in hooks - read only')}</h3> <div class="form"> <div class="fields"> @@ -36,29 +36,29 @@ % endfor </div> </div> - + <h3>${_('Custom hooks')}</h3> ${h.form(url('admin_setting', setting_id='hooks'),method='put')} <div class="form"> <div class="fields"> - + % for hook in c.custom_hooks: <div class="field" id="${'id%s' % hook.ui_id }"> <div class="label label"> <label for="${hook.ui_key}">${hook.ui_key}</label> </div> - <div class="input" style="margin-left:280px"> + <div class="input" style="margin-left:280px"> ${h.hidden('hook_ui_key',hook.ui_key)} ${h.hidden('hook_ui_value',hook.ui_value)} ${h.text('hook_ui_value_new',hook.ui_value,size=60)} - <span class="delete_icon action_button" + <span class="delete_icon action_button" onclick="ajaxActionHook(${hook.ui_id},'${'id%s' % hook.ui_id }')"> ${_('remove')} </span> </div> </div> - % endfor - + % endfor + <div class="field"> <div class="input" style="margin-left:-180px;position: absolute;"> <div class="input"> @@ -71,7 +71,7 @@ </div> <div class="buttons" style="margin-left:280px"> ${h.submit('save',_('Save'),class_="ui-button")} - </div> + </div> </div> </div> ${h.end_form()} @@ -92,5 +92,5 @@ function ajaxActionHook(hook_id,field_id) { var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData); }; </script> - -</%def> + +</%def> diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html index 3a6bb319..925ce766 100644 --- a/rhodecode/templates/admin/settings/settings.html +++ b/rhodecode/templates/admin/settings/settings.html @@ -17,15 +17,15 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <!-- end box / title --> - + <h3>${_('Remap and rescan repositories')}</h3> ${h.form(url('admin_setting', setting_id='mapping'),method='put')} <div class="form"> <!-- fields --> - + <div class="fields"> <div class="field"> <div class="label label-checkbox"> @@ -40,19 +40,19 @@ </div> </div> </div> - + <div class="buttons"> ${h.submit('rescan',_('Rescan repositories'),class_="ui-button")} - </div> + </div> </div> - </div> + </div> ${h.end_form()} - + <h3>${_('Whoosh indexing')}</h3> ${h.form(url('admin_setting', setting_id='whoosh'),method='put')} <div class="form"> <!-- fields --> - + <div class="fields"> <div class="field"> <div class="label label-checkbox"> @@ -65,21 +65,21 @@ </div> </div> </div> - + <div class="buttons"> ${h.submit('reindex',_('Reindex'),class_="ui-button")} - </div> + </div> </div> - </div> + </div> ${h.end_form()} - - <h3>${_('Global application settings')}</h3> + + <h3>${_('Global application settings')}</h3> ${h.form(url('admin_setting', setting_id='global'),method='put')} <div class="form"> <!-- fields --> - + <div class="fields"> - + <div class="field"> <div class="label"> <label for="rhodecode_title">${_('Application name')}:</label> @@ -88,7 +88,7 @@ ${h.text('rhodecode_title',size=30)} </div> </div> - + <div class="field"> <div class="label"> <label for="rhodecode_realm">${_('Realm text')}:</label> @@ -97,7 +97,7 @@ ${h.text('rhodecode_realm',size=30)} </div> </div> - + <div class="field"> <div class="label"> <label for="rhodecode_ga_code">${_('GA code')}:</label> @@ -106,22 +106,22 @@ ${h.text('rhodecode_ga_code',size=30)} </div> </div> - + <div class="buttons"> ${h.submit('save',_('Save settings'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} - </div> + </div> </div> - </div> + </div> ${h.end_form()} - <h3>${_('Mercurial settings')}</h3> + <h3>${_('Mercurial settings')}</h3> ${h.form(url('admin_setting', setting_id='mercurial'),method='put')} <div class="form"> <!-- fields --> - + <div class="fields"> - + <div class="field"> <div class="label label-checkbox"> <label>${_('Web')}:</label> @@ -132,7 +132,7 @@ <label for="web_push_ssl">${_('require ssl for pushing')}</label> </div> </div> - </div> + </div> <div class="field"> <div class="label label-checkbox"> @@ -154,32 +154,32 @@ <div class="checkbox"> ${h.checkbox('hooks_preoutgoing_pull_logger','True')} <label for="hooks_preoutgoing_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> - </div> + </div> + </div> <div class="field"> <div class="label"> <label for="paths_root_path">${_('Repositories location')}:</label> </div> <div class="input"> - ${h.text('paths_root_path',size=30,readonly="readonly")} - <span id="path_unlock" class="tooltip" + ${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> </div> </div> - + <div class="buttons"> ${h.submit('save',_('Save settings'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} - </div> + </div> </div> - </div> + </div> ${h.end_form()} - + <script type="text/javascript"> YAHOO.util.Event.onDOMReady(function(){ YAHOO.util.Event.addListener('path_unlock','click',function(){ @@ -187,12 +187,12 @@ }); }); </script> - + <h3>${_('Test Email')}</h3> ${h.form(url('admin_setting', setting_id='email'),method='put')} <div class="form"> <!-- fields --> - + <div class="fields"> <div class="field"> <div class="label"> @@ -202,13 +202,13 @@ ${h.text('test_email',size=30)} </div> </div> - + <div class="buttons"> ${h.submit('send',_('Send'),class_="ui-button")} - </div> + </div> </div> - </div> - ${h.end_form()} - + </div> + ${h.end_form()} + </div> -</%def> +</%def> diff --git a/rhodecode/templates/admin/users/user_add.html b/rhodecode/templates/admin/users/user_add.html index 02d03606..7ba989fb 100644 --- a/rhodecode/templates/admin/users/user_add.html +++ b/rhodecode/templates/admin/users/user_add.html @@ -5,9 +5,9 @@ ${_('Add user')} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Users'),h.url('users'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Users'),h.url('users'))} » ${_('add new user')} </%def> @@ -20,7 +20,7 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <!-- end box / title --> ${h.form(url('users'))} @@ -35,7 +35,7 @@ ${h.text('username',class_='small')} </div> </div> - + <div class="field"> <div class="label"> <label for="password">${_('Password')}:</label> @@ -44,7 +44,7 @@ ${h.password('password',class_='small')} </div> </div> - + <div class="field"> <div class="label"> <label for="password_confirmation">${_('Password confirmation')}:</label> @@ -52,8 +52,8 @@ <div class="input"> ${h.password('password_confirmation',class_="small",autocomplete="off")} </div> - </div> - + </div> + <div class="field"> <div class="label"> <label for="name">${_('First Name')}:</label> @@ -62,7 +62,7 @@ ${h.text('name',class_='small')} </div> </div> - + <div class="field"> <div class="label"> <label for="lastname">${_('Last Name')}:</label> @@ -71,7 +71,7 @@ ${h.text('lastname',class_='small')} </div> </div> - + <div class="field"> <div class="label"> <label for="email">${_('Email')}:</label> @@ -80,7 +80,7 @@ ${h.text('email',class_='small')} </div> </div> - + <div class="field"> <div class="label label-checkbox"> <label for="active">${_('Active')}:</label> @@ -89,12 +89,12 @@ ${h.checkbox('active',value=True)} </div> </div> - + <div class="buttons"> ${h.submit('save',_('save'),class_="ui-button")} - </div> + </div> </div> </div> ${h.end_form()} -</div> -</%def> +</div> +</%def> diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html index 25c0e31b..7f9026e0 100644 --- a/rhodecode/templates/admin/users/user_edit.html +++ b/rhodecode/templates/admin/users/user_edit.html @@ -6,9 +6,9 @@ </%def> <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Users'),h.url('users'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Users'),h.url('users'))} » ${_('edit')} "${c.user.username}" </%def> @@ -21,7 +21,7 @@ <div class="box box-left"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <!-- end box / title --> ${h.form(url('update_user', id=c.user.user_id),method='put')} @@ -35,7 +35,7 @@ <br/>${_('Using')} ${c.user.email} %else: <br/>${c.user.email} - %endif + %endif </div> </div> <div class="field"> @@ -43,7 +43,7 @@ <label>${_('API key')}</label> ${c.user.api_key} </div> </div> - + <div class="fields"> <div class="field"> <div class="label"> @@ -53,7 +53,7 @@ ${h.text('username',class_='medium')} </div> </div> - + <div class="field"> <div class="label"> <label for="ldap_dn">${_('LDAP DN')}:</label> @@ -62,7 +62,7 @@ ${h.text('ldap_dn',class_='medium')} </div> </div> - + <div class="field"> <div class="label"> <label for="new_password">${_('New password')}:</label> @@ -71,7 +71,7 @@ ${h.password('new_password',class_='medium',autocomplete="off")} </div> </div> - + <div class="field"> <div class="label"> <label for="password_confirmation">${_('New password confirmation')}:</label> @@ -80,7 +80,7 @@ ${h.password('password_confirmation',class_="medium",autocomplete="off")} </div> </div> - + <div class="field"> <div class="label"> <label for="name">${_('First Name')}:</label> @@ -89,7 +89,7 @@ ${h.text('name',class_='medium')} </div> </div> - + <div class="field"> <div class="label"> <label for="lastname">${_('Last Name')}:</label> @@ -98,7 +98,7 @@ ${h.text('lastname',class_='medium')} </div> </div> - + <div class="field"> <div class="label"> <label for="email">${_('Email')}:</label> @@ -107,7 +107,7 @@ ${h.text('email',class_='medium')} </div> </div> - + <div class="field"> <div class="label label-checkbox"> <label for="active">${_('Active')}:</label> @@ -116,7 +116,7 @@ ${h.checkbox('active',value=True)} </div> </div> - + <div class="field"> <div class="label label-checkbox"> <label for="admin">${_('Admin')}:</label> @@ -124,19 +124,19 @@ <div class="checkboxes"> ${h.checkbox('admin',value=True)} </div> - </div> + </div> <div class="buttons"> ${h.submit('save',_('Save'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} - </div> - </div> + </div> + </div> </div> ${h.end_form()} </div> <div class="box box-right"> <!-- box / title --> <div class="title"> - <h5>${_('Permissions')}</h5> + <h5>${_('Permissions')}</h5> </div> ${h.form(url('user_perm', id=c.user.user_id),method='put')} <div class="form"> @@ -153,9 +153,9 @@ <div class="buttons"> ${h.submit('save',_('Save'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} - </div> - </div> + </div> + </div> </div> - ${h.end_form()} + ${h.end_form()} </div> </%def> diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html index 4fdabbd3..f414711e 100644 --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -18,13 +18,13 @@ <div class="box box-left"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <!-- end box / title --> <div> ${h.form(url('admin_settings_my_account_update'),method='put')} <div class="form"> - + <div class="field"> <div class="gravatar_box"> <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div> @@ -34,15 +34,15 @@ <br/>${_('Using')} ${c.user.email} %else: <br/>${c.user.email} - %endif + %endif </p> </div> - </div> + </div> <div class="field"> <div class="label"> <label>${_('API key')}</label> ${c.user.api_key} </div> - </div> + </div> <div class="fields"> <div class="field"> <div class="label"> @@ -52,7 +52,7 @@ ${h.text('username',class_="medium")} </div> </div> - + <div class="field"> <div class="label"> <label for="new_password">${_('New password')}:</label> @@ -61,7 +61,7 @@ ${h.password('new_password',class_="medium",autocomplete="off")} </div> </div> - + <div class="field"> <div class="label"> <label for="password_confirmation">${_('New password confirmation')}:</label> @@ -70,7 +70,7 @@ ${h.password('password_confirmation',class_="medium",autocomplete="off")} </div> </div> - + <div class="field"> <div class="label"> <label for="name">${_('First Name')}:</label> @@ -79,7 +79,7 @@ ${h.text('name',class_="medium")} </div> </div> - + <div class="field"> <div class="label"> <label for="lastname">${_('Last Name')}:</label> @@ -88,7 +88,7 @@ ${h.text('lastname',class_="medium")} </div> </div> - + <div class="field"> <div class="label"> <label for="email">${_('Email')}:</label> @@ -97,31 +97,31 @@ ${h.text('email',class_="medium")} </div> </div> - + <div class="buttons"> ${h.submit('save',_('Save'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} - </div> + </div> </div> - </div> + </div> ${h.end_form()} </div> -</div> +</div> <div class="box box-right"> <!-- box / title --> <div class="title"> - <h5> - <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> + <h5> + <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${_('My repositories')} </h5> %if h.HasPermissionAny('hg.admin','hg.create.repository')(): <ul class="links"> <li> <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))}</span> - </li> - </ul> - %endif + </li> + </ul> + %endif </div> <!-- end box / title --> <div class="table"> @@ -130,7 +130,7 @@ <tr> <th class="left">${_('Name')}</th> <th class="left">${_('revision')}</th> - <th colspan="2" class="left">${_('action')}</th> + <th colspan="2" class="left">${_('action')}</th> </thead> <tbody> %if c.user_repos: @@ -142,34 +142,34 @@ %elif repo['dbrepo']['repo_type'] =='git': <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/> %else: - - %endif + + %endif %if repo['dbrepo']['private']: <img class="icon" alt="${_('private')}" src="${h.url('/images/icons/lock.png')}"/> %else: <img class="icon" alt="${_('public')}" src="${h.url('/images/icons/lock_open.png')}"/> %endif - + ${h.link_to(repo['name'], h.url('summary_home',repo_name=repo['name']),class_="repo_name")} %if repo['dbrepo_fork']: <a href="${h.url('summary_home',repo_name=repo['dbrepo_fork']['repo_name'])}"> <img class="icon" alt="${_('public')}" - title="${_('Fork of')} ${repo['dbrepo_fork']['repo_name']}" + title="${_('Fork of')} ${repo['dbrepo_fork']['repo_name']}" src="${h.url('/images/icons/arrow_divide.png')}"/></a> - %endif - </td> + %endif + </td> <td><span class="tooltip" title="${repo['last_change']}">${("r%s:%s") % (repo['rev'],h.short_id(repo['tip']))}</span></td> <td><a href="${h.url('repo_settings_home',repo_name=repo['name'])}" title="${_('edit')}"><img class="icon" alt="${_('private')}" src="${h.url('/images/icons/application_form_edit.png')}"/></a></td> <td> ${h.form(url('repo_settings_delete', repo_name=repo['name']),method='delete')} ${h.submit('remove_%s' % repo['name'],'',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo['name']+"');")} - ${h.end_form()} + ${h.end_form()} </td> </tr> %endfor %else: <div style="padding:5px 0px 10px 0px;"> - ${_('No repositories yet')} + ${_('No repositories yet')} %if h.HasPermissionAny('hg.admin','hg.create.repository')(): ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-btn")} %endif @@ -187,4 +187,4 @@ var func = function(node){ } q_filter(target,nodes,func); </script> -</%def> +</%def> diff --git a/rhodecode/templates/admin/users/users.html b/rhodecode/templates/admin/users/users.html index b2d619f8..36d8e29d 100644 --- a/rhodecode/templates/admin/users/users.html +++ b/rhodecode/templates/admin/users/users.html @@ -22,8 +22,8 @@ <li> <span>${h.link_to(_(u'ADD NEW USER'),h.url('new_user'))}</span> </li> - - </ul> + + </ul> </div> <!-- end box / title --> <div class="table"> diff --git a/rhodecode/templates/admin/users_groups/users_group_add.html b/rhodecode/templates/admin/users_groups/users_group_add.html index 17848193..af030902 100644 --- a/rhodecode/templates/admin/users_groups/users_group_add.html +++ b/rhodecode/templates/admin/users_groups/users_group_add.html @@ -5,9 +5,9 @@ ${_('Add users group')} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Users groups'),h.url('users_groups'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Users groups'),h.url('users_groups'))} » ${_('add new users group')} </%def> @@ -20,7 +20,7 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <!-- end box / title --> ${h.form(url('users_groups'))} @@ -35,7 +35,7 @@ ${h.text('users_group_name',class_='small')} </div> </div> - + <div class="field"> <div class="label label-checkbox"> <label for="users_group_active">${_('Active')}:</label> @@ -44,12 +44,12 @@ ${h.checkbox('users_group_active',value=True)} </div> </div> - + <div class="buttons"> ${h.submit('save',_('save'),class_="ui-button")} - </div> + </div> </div> </div> ${h.end_form()} -</div> -</%def> +</div> +</%def> diff --git a/rhodecode/templates/admin/users_groups/users_group_edit.html b/rhodecode/templates/admin/users_groups/users_group_edit.html index 1686adab..c9bc21ac 100644 --- a/rhodecode/templates/admin/users_groups/users_group_edit.html +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html @@ -6,9 +6,9 @@ </%def> <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('UsersGroups'),h.url('users_groups'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('UsersGroups'),h.url('users_groups'))} » ${_('edit')} "${c.users_group.users_group_name}" </%def> @@ -21,7 +21,7 @@ <div class="box box-left"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> <!-- end box / title --> ${h.form(url('users_group', id=c.users_group.users_group_id),method='put', id='edit_users_group')} @@ -36,7 +36,7 @@ ${h.text('users_group_name',class_='small')} </div> </div> - + <div class="field"> <div class="label label-checkbox"> <label for="users_group_active">${_('Active')}:</label> @@ -50,7 +50,7 @@ <label for="users_group_active">${_('Members')}:</label> </div> <div class="select"> - <table> + <table> <tr> <td> <div> @@ -63,12 +63,12 @@ </div> </div> <div style="float:left;width:20px;padding-top:50px"> - <img alt="add" id="add_element" - style="padding:2px;cursor:pointer" + <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" + <img alt="remove" id="remove_element" + style="padding:2px;cursor:pointer" src="${h.url('/images/icons/arrow_right.png')}"/> </div> <div style="float:left"> @@ -77,41 +77,41 @@ <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> </div> - </td> - </tr> - </table> - </div> + </td> + </tr> + </table> + </div> - </div> + </div> <div class="buttons"> ${h.submit('save',_('save'),class_="ui-button")} - </div> - </div> - </div> -${h.end_form()} + </div> + </div> + </div> +${h.end_form()} </div> - + <script type="text/javascript"> YAHOO.util.Event.onDOMReady(function(){ var D = YAHOO.util.Dom; var E = YAHOO.util.Event; - + //definition of containers ID's var available_container = 'available_members'; var selected_container = 'users_group_members'; - + //form containing containers id var form_id = 'edit_users_group'; - + //temp container for selected storage. var cache = new Array(); var av_cache = new Array(); var c = D.get(selected_container); var ac = D.get(available_container); - + //get only selected options for further fullfilment for(var i = 0;node =c.options[i];i++){ if(node.selected){ @@ -119,7 +119,7 @@ ${h.end_form()} cache.push(node); } } - + //clear 'selected' select //c.options.length = 0; @@ -127,18 +127,18 @@ ${h.end_form()} //for(var i = 0;node = cache[i];i++){ // c.options[i]=new Option(node.text, node.value, false, false); //} - - + + //get all available options to cache for(var i = 0;node =ac.options[i];i++){ //push selected to my temp storage left overs :) av_cache.push(node); - } - + } + //fill available only with those not in choosen ac.options.length=0; tmp_cache = new Array(); - + for(var i = 0;node = av_cache[i];i++){ var add = true; for(var i2 = 0;node_2 = cache[i2];i2++){ @@ -150,23 +150,23 @@ ${h.end_form()} if(add){ tmp_cache.push(new Option(node.text, node.value, false, false)); } - } - + } + for(var i = 0;node = tmp_cache[i];i++){ ac.options[i] = node; } - + function prompts_action_callback(e){ - - var choosen = D.get(selected_container); + + var choosen = D.get(selected_container); var available = D.get(available_container); - + //get checked and unchecked options from field function get_checked(from_field){ //temp container for storage. var sel_cache = new Array(); var oth_cache = new Array(); - + for(var i = 0;node = from_field.options[i];i++){ if(node.selected){ //push selected fields :) @@ -175,29 +175,29 @@ ${h.end_form()} else{ oth_cache.push(node) } - } - + } + return [sel_cache,oth_cache] } - + //fill the field with given options function fill_with(field,options){ //clear firtst field.options.length=0; for(var i = 0;node = options[i];i++){ - field.options[i]=new Option(node.text, node.value, + field.options[i]=new Option(node.text, node.value, false, false); } - + } //adds to current field function add_to(field,options){ for(var i = 0;node = options[i];i++){ - field.appendChild(new Option(node.text, node.value, + field.appendChild(new Option(node.text, node.value, false, false)); } } - + // add action if (this.id=='add_element'){ var c = get_checked(available); @@ -208,12 +208,12 @@ ${h.end_form()} if (this.id=='remove_element'){ var c = get_checked(choosen); add_to(available,c[0]); - fill_with(choosen,c[1]); - } + fill_with(choosen,c[1]); + } // add all elements if(this.id=='add_all_elements'){ for(var i=0; node = available.options[i];i++){ - choosen.appendChild(new Option(node.text, + choosen.appendChild(new Option(node.text, node.value, false, false)); } available.options.length = 0; @@ -221,15 +221,15 @@ ${h.end_form()} //remove all elements if(this.id=='remove_all_elements'){ for(var i=0; node = choosen.options[i];i++){ - available.appendChild(new Option(node.text, + available.appendChild(new Option(node.text, node.value, false, false)); } - choosen.options.length = 0; + choosen.options.length = 0; } - + } - - + + E.addListener(['add_element','remove_element', 'add_all_elements','remove_all_elements'],'click', prompts_action_callback) @@ -239,13 +239,13 @@ ${h.end_form()} for (var i = 0; i < choosen.options.length; i++) { choosen.options[i].selected = 'selected'; } - }) + }) }); -</script> +</script> <div class="box box-right"> <!-- box / title --> <div class="title"> - <h5>${_('Permissions')}</h5> + <h5>${_('Permissions')}</h5> </div> ${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')} <div class="form"> @@ -262,9 +262,9 @@ ${h.end_form()} <div class="buttons"> ${h.submit('save',_('Save'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} - </div> - </div> + </div> + </div> </div> - ${h.end_form()} + ${h.end_form()} </div> -</%def> +</%def> diff --git a/rhodecode/templates/admin/users_groups/users_groups.html b/rhodecode/templates/admin/users_groups/users_groups.html index b942a0fc..958935dd 100644 --- a/rhodecode/templates/admin/users_groups/users_groups.html +++ b/rhodecode/templates/admin/users_groups/users_groups.html @@ -22,8 +22,8 @@ <li> <span>${h.link_to(_(u'ADD NEW USER GROUP'),h.url('new_users_group'))}</span> </li> - - </ul> + + </ul> </div> <!-- end box / title --> <div class="table"> diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html index ebd4b10f..7d29c3bf 100644 --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -17,8 +17,8 @@ <div class="input"> ${h.text('username',class_='focus',size=40)} </div> - - </div> + + </div> <div class="field"> <div class="label"> <label for="password">${_('Password')}:</label> @@ -26,29 +26,29 @@ <div class="input"> ${h.password('password',class_='focus',size=40)} </div> - + </div> <div class="buttons"> <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div> <div class="register"> %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')(): ${h.link_to(_("Don't have an account ?"),h.url('register'))} - %endif + %endif </div> ${h.submit('sign_in',_('Sign In'),class_="ui-button")} </div> </div> </div> ${h.end_form()} - </div> - + </div> + <div class="gravatar"> <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,20)}" /> </div> <div class="account"> %if c.rhodecode_user.username == 'default': - <a href="${h.url('public_journal')}">${_('Public journal')}</a> - %else: + <a href="${h.url('public_journal')}">${_('Public journal')}</a> + %else: <div style="float: left"> ${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))} </div> @@ -56,7 +56,7 @@ <a id="notification_counter" href="${h.url('notifications')}">${c.unread_notifications}</a> </div> %endif - </div> + </div> </li> <li> <a href="${h.url('home')}">${_('Home')}</a> @@ -82,11 +82,11 @@ <!-- END MENU --> ${self.body()} </div> -</div> +</div> <!-- END HEADER --> - + <!-- CONTENT --> -<div id="content"> +<div id="content"> <div class="flash_msg"> <% messages = h.flash.pop_messages() %> % if messages: @@ -96,11 +96,11 @@ % endfor </ul> % endif - </div> - <div id="main"> + </div> + <div id="main"> ${next.main()} </div> -</div> +</div> <!-- END CONTENT --> <!-- FOOTER --> @@ -111,7 +111,7 @@ <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a> </p> <p class="footer-link-right"> - <a href="${h.url('rhodecode_official')}">RhodeCode</a> + <a href="${h.url('rhodecode_official')}">RhodeCode</a> ${c.rhodecode_version} © 2010-${h.datetime.today().year} by Marcin Kuzminski </p> </div> @@ -132,13 +132,13 @@ <%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 + %if current not in ['home','admin']: + ##REGULAR MENU <ul id="quick"> <!-- repo switcher --> <li> @@ -146,7 +146,7 @@ <span class="icon"> <img src="${h.url('/images/icons/database.png')}" alt="${_('Products')}" /> </span> - <span>↓</span> + <span>↓</span> </a> <ul id="repo_switcher_list" class="repo_switcher"> <li> @@ -154,58 +154,58 @@ </li> </ul> </li> - + <li ${is_current('summary')}> <a 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> + <span>${_('Summary')}</span> + </a> </li> ##<li ${is_current('shortlog')}> ## <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}"> ## <span class="icon"> ## <img src="${h.url('/images/icons/application_view_list.png')}" alt="${_('Shortlog')}" /> ## </span> - ## <span>${_('Shortlog')}</span> - ## </a> - ##</li> + ## <span>${_('Shortlog')}</span> + ## </a> + ##</li> <li ${is_current('changelog')}> <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}"> <span class="icon"> <img src="${h.url('/images/icons/time.png')}" alt="${_('Changelog')}" /> </span> - <span>${_('Changelog')}</span> - </a> - </li> - + <span>${_('Changelog')}</span> + </a> + </li> + <li ${is_current('switch_to')}> <a id="branch_tag_switcher" title="${_('Switch to')}" href="#"> <span class="icon"> <img src="${h.url('/images/icons/arrow_switch.png')}" alt="${_('Switch to')}" /> </span> - <span>${_('Switch to')}</span> - </a> + <span>${_('Switch to')}</span> + </a> <ul id="switch_to_list" class="switch_to"> <li><a href="#">${_('loading...')}</a></li> - </ul> + </ul> </li> <li ${is_current('files')}> <a title="${_('Files')}" href="${h.url('files_home',repo_name=c.repo_name)}"> <span class="icon"> <img src="${h.url('/images/icons/file.png')}" alt="${_('Files')}" /> </span> - <span>${_('Files')}</span> - </a> - </li> - + <span>${_('Files')}</span> + </a> + </li> + <li ${is_current('options')}> <a title="${_('Options')}" href="#"> <span class="icon"> <img src="${h.url('/images/icons/table_gear.png')}" alt="${_('Admin')}" /> </span> - <span>${_('Options')}</span> + <span>${_('Options')}</span> </a> <ul> %if h.HasRepoPermissionAll('repository.admin')(c.repo_name): @@ -217,10 +217,10 @@ %endif <li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li> <li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li> - + % if h.HasPermissionAll('hg.admin')('access admin main page'): <li> - ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')} + ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')} <%def name="admin_menu()"> <ul> <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li> @@ -230,16 +230,16 @@ <li>${h.link_to(_('users groups'),h.url('users_groups'),class_='groups')}</li> <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li> <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li> - <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li> + <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li> </ul> </%def> - + ${admin_menu()} </li> % endif - </ul> + </ul> </li> - + <li> <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}"> <span class="icon_short"> @@ -255,7 +255,7 @@ </span> <span class="short">${c.repository_forks}</span> </a> - </li> + </li> </ul> <script type="text/javascript"> YUE.on('repo_switcher','mouseover',function(){ @@ -264,8 +264,8 @@ var target = 'q_filter_rs'; var func = function(node){ return node.parentNode; - } - q_filter(target,nodes,func); + } + q_filter(target,nodes,func); } var loaded = YUD.hasClass('repo_switcher','loaded'); if(!loaded){ @@ -289,7 +289,7 @@ } return false; }); - </script> + </script> %else: ##ROOT MENU <ul id="quick"> @@ -298,8 +298,8 @@ <span class="icon"> <img src="${h.url('/images/icons/home_16.png')}" alt="${_('Home')}" /> </span> - <span>${_('Home')}</span> - </a> + <span>${_('Home')}</span> + </a> </li> % if c.rhodecode_user.username != 'default': <li> @@ -307,8 +307,8 @@ <span class="icon"> <img src="${h.url('/images/icons/book.png')}" alt="${_('Journal')}" /> </span> - <span>${_('Journal')}</span> - </a> + <span>${_('Journal')}</span> + </a> </li> % endif <li> @@ -316,17 +316,17 @@ <span class="icon"> <img src="${h.url('/images/icons/search_16.png')}" alt="${_('Search')}" /> </span> - <span>${_('Search')}</span> - </a> + <span>${_('Search')}</span> + </a> </li> - + %if h.HasPermissionAll('hg.admin')('access admin main page'): <li ${is_current('admin')}> <a title="${_('Admin')}" href="${h.url('admin_home')}"> <span class="icon"> <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" /> </span> - <span>${_('Admin')}</span> + <span>${_('Admin')}</span> </a> ${admin_menu()} </li> diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html index 19d63d5e..85f7f7b9 100644 --- a/rhodecode/templates/base/root.html +++ b/rhodecode/templates/base/root.html @@ -16,16 +16,16 @@ </%def> <%def name="css_extra()"> </%def> - + ${self.css()} - + %if c.ga_code: <!-- Analytics --> <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'; @@ -33,7 +33,7 @@ })(); </script> %endif - + ## JAVASCRIPT ## <%def name="js()"> <script type="text/javascript" src="${h.url('/js/yui.2.9.js')}"></script> @@ -44,21 +44,21 @@ <script type="text/javascript" src="${h.url('/js/rhodecode.js')}"></script> ## EXTRA FOR JS ${self.js_extra()} - + <script type="text/javascript"> var follow_base_url = "${h.url('toggle_following')}"; var stop_follow_text = "${_('Stop following this repository')}"; - var start_follow_text = "${_('Start following this repository')}"; - - + var start_follow_text = "${_('Start following this repository')}"; + + var onSuccessFollow = function(target){ var f = YUD.get(target.id); var f_cnt = YUD.get('current_followers_count'); - + if(f.getAttribute('class')=='follow'){ f.setAttribute('class','following'); f.setAttribute('title',stop_follow_text); - + if(f_cnt){ var cnt = Number(f_cnt.innerHTML)+1; f_cnt.innerHTML = cnt; @@ -70,10 +70,10 @@ if(f_cnt){ var cnt = Number(f_cnt.innerHTML)+1; f_cnt.innerHTML = cnt; - } + } } } - + var toggleFollowingUser = function(target,fallows_user_id,token,user_id){ args = 'follows_user_id='+fallows_user_id; args+= '&auth_token='+token; @@ -87,29 +87,29 @@ },args); return false; } - + var toggleFollowingRepo = function(target,fallows_repo_id,token,user_id){ - + args = 'follows_repo_id='+fallows_repo_id; args+= '&auth_token='+token; if(user_id != undefined){ args+="&user_id="+user_id; - } + } YUC.asyncRequest('POST',follow_base_url,{ success:function(o){ onSuccessFollow(target); } - },args); + },args); return false; } YUE.onDOMReady(function(){ tooltip_activate(); - show_more_event(); - + show_more_event(); + YUE.on('quick_login_link','click',function(e){ - // make sure we don't redirect + // make sure we don't redirect YUE.preventDefault(e); - + if(YUD.hasClass('quick_login_link','enabled')){ YUD.setStyle('quick_login','display','none'); YUD.removeClass('quick_login_link','enabled'); @@ -120,8 +120,8 @@ YUD.get('username').focus(); } }); - - // hover menu + + // hover menu YUE.on(window,'scroll',function(){ if(YUD.getDocumentScrollTop() > 45){ YUD.addClass('header-inner','hover'); @@ -130,7 +130,7 @@ YUD.removeClass('header-inner','hover'); } }) - }) + }) </script> </%def> <%def name="js_extra()"></%def> @@ -139,4 +139,4 @@ <body id="body"> ${next.body()} </body> -</html>
\ No newline at end of file +</html> diff --git a/rhodecode/templates/bookmarks/bookmarks.html b/rhodecode/templates/bookmarks/bookmarks.html index a76e8d59..8d512297 100644 --- a/rhodecode/templates/bookmarks/bookmarks.html +++ b/rhodecode/templates/bookmarks/bookmarks.html @@ -9,7 +9,7 @@ <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter_bookmarks" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('bookmarks')} @@ -61,7 +61,7 @@ var myDataTable = new YAHOO.widget.DataTable("table_wrap", myColumnDefs, myDataS MSG_SORTDESC:"${_('Click to sort descending')}", MSG_EMPTY:"${_('No records found.')}", MSG_ERROR:"${_('Data error.')}", - MSG_LOADING:"${_('Loading...')}", + MSG_LOADING:"${_('Loading...')}", } ); myDataTable.subscribe('postRenderEvent',function(oArgs) { @@ -69,10 +69,10 @@ myDataTable.subscribe('postRenderEvent',function(oArgs) { var func = function(node){ return node.parentNode.parentNode.parentNode.parentNode.parentNode; } - q_filter('q_filter_bookmarks',YUQ('div.table tr td .logbooks .bookbook a'),func); -}); + q_filter('q_filter_bookmarks',YUQ('div.table tr td .logbooks .bookbook a'),func); +}); </script> -</%def>
\ No newline at end of file +</%def> diff --git a/rhodecode/templates/bookmarks/bookmarks_data.html b/rhodecode/templates/bookmarks/bookmarks_data.html index f68e0ad6..f6cb448f 100644 --- a/rhodecode/templates/bookmarks/bookmarks_data.html +++ b/rhodecode/templates/bookmarks/bookmarks_data.html @@ -1,5 +1,5 @@ %if c.repo_bookmarks: - <div id="table_wrap" class="yui-skin-sam"> + <div id="table_wrap" class="yui-skin-sam"> <table id="bookmarks_data"> <thead> <tr> @@ -10,24 +10,24 @@ </tr> </thead> %for cnt,book in enumerate(c.repo_bookmarks.items()): - <tr class="parity${cnt%2}"> + <tr class="parity${cnt%2}"> <td> <span class="logbooks"> <span class="bookbook">${h.link_to(book[0], h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))}</span> </span> </td> - <td><span class="tooltip" title="${h.age(book[1].date)}">${book[1].date}</span></td> + <td><span class="tooltip" title="${h.age(book[1].date)}">${book[1].date}</span></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> + </td> </tr> %endfor </table> </div> %else: ${_('There are no bookmarks yet')} -%endif
\ No newline at end of file +%endif diff --git a/rhodecode/templates/branches/branches.html b/rhodecode/templates/branches/branches.html index 02276c05..b9333ed5 100644 --- a/rhodecode/templates/branches/branches.html +++ b/rhodecode/templates/branches/branches.html @@ -8,14 +8,14 @@ <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter_branches" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('branches')} </%def> <%def name="page_nav()"> - ${self.menu('branches')} + ${self.menu('branches')} </%def> <%def name="main()"> @@ -61,7 +61,7 @@ var myDataTable = new YAHOO.widget.DataTable("table_wrap", myColumnDefs, myDataS MSG_SORTDESC:"${_('Click to sort descending')}", MSG_EMPTY:"${_('No records found.')}", MSG_ERROR:"${_('Data error.')}", - MSG_LOADING:"${_('Loading...')}", + MSG_LOADING:"${_('Loading...')}", } ); myDataTable.subscribe('postRenderEvent',function(oArgs) { @@ -69,9 +69,9 @@ myDataTable.subscribe('postRenderEvent',function(oArgs) { var func = function(node){ return node.parentNode.parentNode.parentNode.parentNode.parentNode; } - q_filter('q_filter_branches',YUQ('div.table tr td .logtags .branchtag a'),func); -}); + q_filter('q_filter_branches',YUQ('div.table tr td .logtags .branchtag a'),func); +}); </script> -</%def>
\ No newline at end of file +</%def> diff --git a/rhodecode/templates/branches/branches_data.html b/rhodecode/templates/branches/branches_data.html index 9434280a..6a44a9b7 100644 --- a/rhodecode/templates/branches/branches_data.html +++ b/rhodecode/templates/branches/branches_data.html @@ -1,5 +1,5 @@ %if c.repo_branches: - <div id="table_wrap" class="yui-skin-sam"> + <div id="table_wrap" class="yui-skin-sam"> <table id="branches_data"> <thead> <tr> @@ -15,14 +15,14 @@ <span class="logtags"> <span class="branchtag">${h.link_to(branch[0], h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span> - </span> + </span> </td> - <td><span class="tooltip" title="${h.age(branch[1].date)}">${branch[1].date}</span></td> + <td><span class="tooltip" title="${h.age(branch[1].date)}">${branch[1].date}</span></td> <td title="${branch[1].author}">${h.person(branch[1].author)}</td> <td> <div> <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</a></pre> - </div> + </div> </td> </tr> %endfor @@ -33,9 +33,9 @@ <span class="logtags"> <span class="branchtag">${h.link_to(branch[0]+' [closed]', h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span> - </span> + </span> </td> - <td><span class="tooltip" title="${h.age(branch[1].date)}">${branch[1].date}</span></td> + <td><span class="tooltip" title="${h.age(branch[1].date)}">${branch[1].date}</span></td> <td title="${branch[1].author}">${h.person(branch[1].author)}</td> <td> <div> @@ -49,4 +49,4 @@ </div> %else: ${_('There are no branches yet')} -%endif
\ No newline at end of file +%endif diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html index 51de0409..fb7c6a9a 100644 --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -11,11 +11,11 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » - ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')} + ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')} </%def> <%def name="page_nav()"> - ${self.menu('changelog')} + ${self.menu('changelog')} </%def> <%def name="main()"> @@ -42,7 +42,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} <div id="rev_range_container" style="display:none"></div> <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div> </div> - + %for cnt,cs in enumerate(c.pagination): <div id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}"> <div class="left"> @@ -61,7 +61,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} <div class="mid"> <div class="message">${h.urlify_commit(h.wrap_paragraphs(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> <div class="right"> <div id="${cs.raw_id}_changes_info" class="changes"> <div id="${cs.raw_id}" style="float:right;" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</div> @@ -73,7 +73,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} <img src="${h.url('/images/icons/comments.png')}"> </a> </div> - %endif + %endif </div> </div> %if cs.parents: @@ -83,10 +83,10 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} 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 - + %else: + <div class="parent">${_('No parents')}</div> + %endif + <span class="logtags"> %if len(cs.parents)>1: <span class="merge">${_('merge')}</span> @@ -99,26 +99,26 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span> %endfor - </span> - </div> + </span> + </div> </div> - + %endfor <div class="pagination-wh pagination-left"> ${c.pagination.pager('$link_previous ~2~ $link_next')} - </div> + </div> </div> </div> - + <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 + //ranges var checkboxes = YUD.getElementsByClassName('changeset_range'); var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}"; - YUE.on(checkboxes,'click',function(e){ + YUE.on(checkboxes,'click',function(e){ var checked_checkboxes = []; for (pos in checkboxes){ if(checkboxes[pos].checked){ @@ -128,10 +128,10 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} if(checked_checkboxes.length>1){ var rev_end = checked_checkboxes[0].name; var rev_start = checked_checkboxes[checked_checkboxes.length-1].name; - + var url = url_tmpl.replace('__REVRANGE__', rev_start+'...'+rev_end); - + var link = "<a href="+url+">${_('Show selected changes __S -> __E')}</a>" link = link.replace('__S',rev_start); link = link.replace('__E',rev_end); @@ -140,10 +140,10 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} } else{ YUD.setStyle('rev_range_container','display','none'); - + } - }); - + }); + var msgs = YUQ('.message'); // get first element height var el = YUQ('.container')[0]; @@ -162,23 +162,23 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} var elem = e.currentTarget.parentNode.parentNode; YUD.setStyle(e.currentTarget,'display','none'); YUD.setStyle(elem,'height','auto'); - + //redraw the graph, max_w and jsdata are global vars set_canvas(max_w); - + var r = new BranchRenderer(); - r.render(jsdata,max_w); - + r.render(jsdata,max_w); + }) - - // Fetch changeset details + + // 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); ypjax(url,id+'_changes_info',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; @@ -190,9 +190,9 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} }else{ window.location = url_main; } - + }); - + function set_canvas(heads) { var c = document.getElementById('graph_nodes'); var t = document.getElementById('graph_content'); @@ -206,7 +206,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} var heads = 1; var max_heads = 0; var jsdata = ${c.jsdata|n}; - + for( var i=0;i<jsdata.length;i++){ var m = Math.max.apply(Math, jsdata[i][1]); if (m>max_heads){ @@ -215,15 +215,15 @@ ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name} } var max_w = Math.max(100,max_heads*25); set_canvas(max_w); - + var r = new BranchRenderer(); r.render(jsdata,max_w); - + }); </script> %else: ${_('There are no changes yet')} - %endif + %endif </div> -</div> +</div> </%def> diff --git a/rhodecode/templates/changelog/changelog_details.html b/rhodecode/templates/changelog/changelog_details.html index 2ade58d8..c90f9025 100644 --- a/rhodecode/templates/changelog/changelog_details.html +++ b/rhodecode/templates/changelog/changelog_details.html @@ -1,9 +1,9 @@ -% if len(c.cs.affected_files) <= c.affected_files_cut_off: +% if len(c.cs.affected_files) <= c.affected_files_cut_off: <span class="removed tooltip" title="<b>${_('removed')}</b>${h.changed_tooltip(c.cs.removed)}">${len(c.cs.removed)}</span> <span class="changed tooltip" title="<b>${_('changed')}</b>${h.changed_tooltip(c.cs.changed)}">${len(c.cs.changed)}</span> <span class="added tooltip" title="<b>${_('added')}</b>${h.changed_tooltip(c.cs.added)}">${len(c.cs.added)}</span> % else: <span class="removed tooltip" title="${_('affected %s files') % len(c.cs.affected_files)}">!</span> <span class="changed tooltip" title="${_('affected %s files') % len(c.cs.affected_files)}">!</span> - <span class="added tooltip" title="${_('affected %s files') % len(c.cs.affected_files)}">!</span> -% endif
\ No newline at end of file + <span class="added tooltip" title="${_('affected %s files') % len(c.cs.affected_files)}">!</span> +% endif diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html index c51952b3..4ba5240d 100644 --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -15,7 +15,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('changelog')} + ${self.menu('changelog')} </%def> <%def name="main()"> @@ -53,17 +53,17 @@ </div> <div class="right"> <div class="changes"> - % if len(c.changeset.affected_files) <= c.affected_files_cut_off: + % if len(c.changeset.affected_files) <= c.affected_files_cut_off: <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> - + <span class="added" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> + % endif + </div> + %if c.changeset.parents: %for p_cs in reversed(c.changeset.parents): <div class="parent">${_('Parent')} @@ -71,9 +71,9 @@ 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 + %else: + <div class="parent">${_('No parents')}</div> + %endif <span class="logtags"> %if len(c.changeset.parents)>1: <span class="merge">${_('merge')}</span> @@ -84,8 +84,8 @@ <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> + </span> + </div> </div> <span> ${_('%s files affected with %s additions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)} @@ -106,21 +106,21 @@ % if c.cut_off: ${_('Changeset was too big and was cut off...')} % endif - </div> + </div> </div> - + </div> - - ## diff block + + ## diff block <%namespace name="diff_block" file="/changeset/diff_block.html"/> ${diff_block.diff_block(c.changes)} - + ## template for inline comment form <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> ${comment.comment_inline_form(c.changeset)} - + ${comment.comments(c.changeset)} - + <script type="text/javascript"> var deleteComment = function(comment_id){ @@ -134,7 +134,7 @@ } YUE.onDOMReady(function(){ - + YUE.on(YUQ('.show-inline-comments'),'change',function(e){ var show = 'none'; var target = e.currentTarget; @@ -143,23 +143,23 @@ } var boxid = YUD.getAttribute(target,'id_for'); var comments = YUQ('#{0} .inline-comments'.format(boxid)); - for(c in comments){ + for(c in comments){ YUD.setStyle(comments[c],'display',show); } var btns = YUQ('#{0} .inline-comments-button'.format(boxid)); - for(c in btns){ + for(c in btns){ YUD.setStyle(btns[c],'display',show); - } + } }) - + YUE.on(YUQ('.line'),'click',function(e){ var tr = e.currentTarget; injectInlineForm(tr); }); - + // inject comments into they proper positions var file_comments = YUQ('.inline-comment-placeholder'); - + for (f in file_comments){ var box = file_comments[f]; var inlines = box.children; @@ -170,10 +170,10 @@ var lineno = YUD.getAttribute(inlines[i],'line'); var lineid = "{0}_{1}".format(YUD.getAttribute(inline,'target_id'),lineno); var target_line = YUD.get(lineid); - + var add = createInlineAddButton(target_line.parentNode,'${_("add another comment")}'); YUD.insertAfter(add,target_line.parentNode); - + var comment = new YAHOO.util.Element(tableTr('inline-comments',inline.innerHTML)) YUD.insertAfter(comment,target_line.parentNode); }catch(e){ @@ -182,8 +182,8 @@ } } }) - - </script> - + + </script> + </div> </%def> diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html index ee999191..9af22f5c 100644 --- a/rhodecode/templates/changeset/changeset_file_comment.html +++ b/rhodecode/templates/changeset/changeset_file_comment.html @@ -1,105 +1,105 @@ -## -*- coding: utf-8 -*-
-## usage:
-## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
-## ${comment.comment_block(co)}
-##
-<%def name="comment_block(co)">
- <div class="comment" id="comment-${co.comment_id}">
- <div class="comment-wrapp">
- <div class="meta">
- <span class="user">
- <img src="${h.gravatar_url(co.author.email, 20)}" />
- ${co.author.username}
- </span>
- <span class="date">
- ${h.age(co.modified_at)}
- </span>
- %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
- <span class="buttons">
- <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
- </span>
- %endif
- </div>
- <div class="text">
- ${h.rst_w_mentions(co.text)|n}
- </div>
- </div>
- </div>
-</%def>
-
-
-<%def name="comment_inline_form(changeset)">
-<div id='comment-inline-form-template' style="display:none">
- <div class="comment-inline-form">
- %if c.rhodecode_user.username != 'default':
- ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))}
- <div class="clearfix">
- <div class="comment-help">${_('Commenting on line')} {1}. ${_('Comments parsed using')}
- <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} ${_('with')}
- <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
- </div>
- <textarea id="text_{1}" name="text"></textarea>
- </div>
- <div class="comment-button">
- <input type="hidden" name="f_path" value="{0}">
- <input type="hidden" name="line" value="{1}">
- ${h.submit('save', _('Comment'), class_='ui-btn')}
- ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
- </div>
- ${h.end_form()}
- %else:
- ${h.form('')}
- <div class="clearfix">
- <div class="comment-help">
- ${'You need to be logged in to comment.'} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>
- </div>
- </div>
- <div class="comment-button">
- ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
- </div>
- ${h.end_form()}
- %endif
- </div>
-</div>
-</%def>
-
-
-<%def name="comments(changeset)">
-
-<div class="comments">
- <div class="comments-number">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
-
- %for path, lines in c.inline_comments:
- <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.FID(changeset.raw_id,path)}">
- % for line,comments in lines.iteritems():
- <div class="inline-comment-placeholder-line" line="${line}" target_id="${h.safeid(h.safe_unicode(path))}">
- %for co in comments:
- ${comment_block(co)}
- %endfor
- </div>
- %endfor
- </div>
- %endfor
-
- %for co in c.comments:
- ${comment_block(co)}
- %endfor
- %if c.rhodecode_user.username != 'default':
- <div class="comment-form">
- ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))}
- <strong>${_('Leave a comment')}</strong>
- <div class="clearfix">
- <div class="comment-help">
- ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}
- ${_('with')} <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
- </div>
- ${h.textarea('text')}
- </div>
- <div class="comment-button">
- ${h.submit('save', _('Comment'), class_='ui-button')}
- </div>
- ${h.end_form()}
- </div>
- %endif
-</div>
-</%def>
+## -*- coding: utf-8 -*- +## usage: +## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> +## ${comment.comment_block(co)} +## +<%def name="comment_block(co)"> + <div class="comment" id="comment-${co.comment_id}"> + <div class="comment-wrapp"> + <div class="meta"> + <span class="user"> + <img src="${h.gravatar_url(co.author.email, 20)}" /> + ${co.author.username} + </span> + <span class="date"> + ${h.age(co.modified_at)} + </span> + %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id: + <span class="buttons"> + <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span> + </span> + %endif + </div> + <div class="text"> + ${h.rst_w_mentions(co.text)|n} + </div> + </div> + </div> +</%def> + + +<%def name="comment_inline_form(changeset)"> +<div id='comment-inline-form-template' style="display:none"> + <div class="comment-inline-form"> + %if c.rhodecode_user.username != 'default': + ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))} + <div class="clearfix"> + <div class="comment-help">${_('Commenting on line')} {1}. ${_('Comments parsed using')} + <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} ${_('with')} + <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')} + </div> + <textarea id="text_{1}" name="text"></textarea> + </div> + <div class="comment-button"> + <input type="hidden" name="f_path" value="{0}"> + <input type="hidden" name="line" value="{1}"> + ${h.submit('save', _('Comment'), class_='ui-btn')} + ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')} + </div> + ${h.end_form()} + %else: + ${h.form('')} + <div class="clearfix"> + <div class="comment-help"> + ${'You need to be logged in to comment.'} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a> + </div> + </div> + <div class="comment-button"> + ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')} + </div> + ${h.end_form()} + %endif + </div> +</div> +</%def> + + +<%def name="comments(changeset)"> + +<div class="comments"> + <div class="comments-number">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div> + + %for path, lines in c.inline_comments: + <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.FID(changeset.raw_id,path)}"> + % for line,comments in lines.iteritems(): + <div class="inline-comment-placeholder-line" line="${line}" target_id="${h.safeid(h.safe_unicode(path))}"> + %for co in comments: + ${comment_block(co)} + %endfor + </div> + %endfor + </div> + %endfor + + %for co in c.comments: + ${comment_block(co)} + %endfor + %if c.rhodecode_user.username != 'default': + <div class="comment-form"> + ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))} + <strong>${_('Leave a comment')}</strong> + <div class="clearfix"> + <div class="comment-help"> + ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} + ${_('with')} <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')} + </div> + ${h.textarea('text')} + </div> + <div class="comment-button"> + ${h.submit('save', _('Comment'), class_='ui-button')} + </div> + ${h.end_form()} + </div> + %endif +</div> +</%def> diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html index d054e8a6..28fe45da 100644 --- a/rhodecode/templates/changeset/changeset_range.html +++ b/rhodecode/templates/changeset/changeset_range.html @@ -14,7 +14,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('changelog')} + ${self.menu('changelog')} </%def> <%def name="main()"> @@ -26,7 +26,7 @@ <div class="table"> <div id="body" class="diffblock"> <div class="code-header cv"> - <h3 class="code-header-title">${_('Compare View')}</h3> + <h3 class="code-header-title">${_('Compare View')}</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> @@ -53,28 +53,28 @@ %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]: <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID(cs.raw_id,filenode.path)))}</div> %endfor - %endfor - </div> + %endfor + </div> </div> - + </div> <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> <%namespace name="diff_block" file="/changeset/diff_block.html"/> %for cs in c.cs_ranges: - ##${comment.comment_inline_form(cs)} + ##${comment.comment_inline_form(cs)} ## diff block <h3 style="border:none;padding-top:8px;">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</h3> ${diff_block.diff_block(c.changes[cs.raw_id])} ##${comment.comments(cs)} - %endfor + %endfor <script type="text/javascript"> YUE.onDOMReady(function(){ - + YUE.on(YUQ('.diff-menu-activate'),'click',function(e){ var act = e.currentTarget.nextElementSibling; - + if(YUD.hasClass(act,'active')){ YUD.removeClass(act,'active'); YUD.setStyle(act,'display','none'); @@ -84,6 +84,6 @@ } }); }) - </script> + </script> </div> -</%def>
\ No newline at end of file +</%def> diff --git a/rhodecode/templates/changeset/diff_block.html b/rhodecode/templates/changeset/diff_block.html index 178fb8ec..c7202b3d 100644 --- a/rhodecode/templates/changeset/diff_block.html +++ b/rhodecode/templates/changeset/diff_block.html @@ -31,11 +31,11 @@ </div> </div> <div class="code-body"> - <div class="full_f_path" path="${h.safe_unicode(filenode.path)}"></div> + <div class="full_f_path" path="${h.safe_unicode(filenode.path)}"></div> ${diff|n} </div> </div> %endif %endfor -</%def>
\ No newline at end of file +</%def> diff --git a/rhodecode/templates/changeset/raw_changeset.html b/rhodecode/templates/changeset/raw_changeset.html index 689e0962..933b93f4 100644 --- a/rhodecode/templates/changeset/raw_changeset.html +++ b/rhodecode/templates/changeset/raw_changeset.html @@ -5,4 +5,4 @@ ${c.parent_tmpl} ${c.changeset.message} -${c.diffs|n}
\ No newline at end of file +${c.diffs|n} diff --git a/rhodecode/templates/email_templates/changeset_comment.html b/rhodecode/templates/email_templates/changeset_comment.html index c9d92a92..3bb99130 100644 --- a/rhodecode/templates/email_templates/changeset_comment.html +++ b/rhodecode/templates/email_templates/changeset_comment.html @@ -3,4 +3,4 @@ <h4>${subject}</h4> -${body}
\ No newline at end of file +${body} diff --git a/rhodecode/templates/email_templates/default.html b/rhodecode/templates/email_templates/default.html index c4a7cfd8..95c8fdd8 100644 --- a/rhodecode/templates/email_templates/default.html +++ b/rhodecode/templates/email_templates/default.html @@ -1,4 +1,4 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -${body}
\ No newline at end of file +${body} diff --git a/rhodecode/templates/email_templates/main.html b/rhodecode/templates/email_templates/main.html index 27de320f..f5db35bd 100644 --- a/rhodecode/templates/email_templates/main.html +++ b/rhodecode/templates/email_templates/main.html @@ -6,4 +6,4 @@ ${self.body()} <br/> <br/> <b>${_('This is an notification from RhodeCode.')}</b> -</div>
\ No newline at end of file +</div> diff --git a/rhodecode/templates/email_templates/password_reset.html b/rhodecode/templates/email_templates/password_reset.html index 04b4c627..f3f6101f 100644 --- a/rhodecode/templates/email_templates/password_reset.html +++ b/rhodecode/templates/email_templates/password_reset.html @@ -9,4 +9,4 @@ You can generate it by clicking following URL: ${reset_url} -If you didn't request new password please ignore this email.
\ No newline at end of file +If you didn't request new password please ignore this email. diff --git a/rhodecode/templates/email_templates/registration.html b/rhodecode/templates/email_templates/registration.html index a0c4a591..831a5349 100644 --- a/rhodecode/templates/email_templates/registration.html +++ b/rhodecode/templates/email_templates/registration.html @@ -6,4 +6,4 @@ A new user have registered in RhodeCode ${body} -View this user here :${registered_user_url}
\ No newline at end of file +View this user here :${registered_user_url} diff --git a/rhodecode/templates/errors/error_document.html b/rhodecode/templates/errors/error_document.html index 24fb4510..d376d9dc 100755 --- a/rhodecode/templates/errors/error_document.html +++ b/rhodecode/templates/errors/error_document.html @@ -6,10 +6,10 @@ <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 + %endif <link rel="icon" href="${h.url("/images/hgicon.png")}" type="image/png" /> <meta name="robots" content="index, nofollow"/> - + <!-- stylesheets --> <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" /> <style type="text/css"> @@ -28,27 +28,26 @@ margin:10px; } </style> - + </head> <body> <div id="login"> - <div class="table"> + <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> - + <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 - + %endif + </div> </div> <!-- end login --> </div> </body> - -</html> +</html> diff --git a/rhodecode/templates/files/file_diff.html b/rhodecode/templates/files/file_diff.html index 399b4a0e..5324255d 100644 --- a/rhodecode/templates/files/file_diff.html +++ b/rhodecode/templates/files/file_diff.html @@ -13,7 +13,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} </%def> <%def name="main()"> <div class="box"> @@ -22,17 +22,17 @@ ${self.breadcrumbs()} </div> <div> - ## diff block + ## diff block <%namespace name="diff_block" file="/changeset/diff_block.html"/> - ${diff_block.diff_block(c.changes)} + ${diff_block.diff_block(c.changes)} </div> -</div> +</div> <script> YUE.onDOMReady(function(){ - + YUE.on(YUQ('.diff-menu-activate'),'click',function(e){ var act = e.currentTarget.nextElementSibling; - + if(YUD.hasClass(act,'active')){ YUD.removeClass(act,'active'); YUD.setStyle(act,'display','none'); @@ -44,6 +44,4 @@ YUE.onDOMReady(function(){ }) </script> -</%def> - -
\ No newline at end of file +</%def> diff --git a/rhodecode/templates/files/files.html b/rhodecode/templates/files/files.html index 61565c45..9221fe7e 100644 --- a/rhodecode/templates/files/files.html +++ b/rhodecode/templates/files/files.html @@ -12,11 +12,11 @@ ${_('files')} %if c.file: @ r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - %endif + %endif </%def> <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} </%def> <%def name="main()"> @@ -27,15 +27,15 @@ <ul class="links"> <li> <span style="text-transform: uppercase;"><a href="#">${_('branch')}: ${c.changeset.branch}</a></span> - </li> - </ul> + </li> + </ul> </div> <div class="table"> <div id="files_data"> <%include file='files_ypjax.html'/> - </div> + </div> </div> -</div> +</div> <script type="text/javascript"> var YPJAX_TITLE = "${c.repo_name} ${_('Files')} - ${c.rhodecode_name}"; var current_url = "${h.url.current()}"; @@ -45,4 +45,4 @@ var truncated_lbl = "${_('search truncated')}"; var nomatch_lbl = "${_('no matching files')}"; fileBrowserListeners(current_url, node_list_url, url_base, truncated_lbl, nomatch_lbl); </script> -</%def>
\ No newline at end of file +</%def> diff --git a/rhodecode/templates/files/files_add.html b/rhodecode/templates/files/files_add.html index 81752a20..30f601fa 100644 --- a/rhodecode/templates/files/files_add.html +++ b/rhodecode/templates/files/files_add.html @@ -20,7 +20,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} </%def> <%def name="main()"> <div class="box"> @@ -31,8 +31,8 @@ <li> <span style="text-transform: uppercase;"> <a href="#">${_('branch')}: ${c.cs.branch}</a></span> - </li> - </ul> + </li> + </ul> </div> <div class="table"> <div id="files_data"> @@ -48,14 +48,14 @@ <input type="text" value="" size="30" name="filename" id="filename"> ${_('or')} <span class="ui-btn" id="upload_file_enable">${_('Upload file')}</span> </div> - </div> + </div> <div id="upload_file_container" class="field" style="display:none"> <div class="label"> <label for="location">${_('Upload file')}</label> </div> <div class="file"> <input type="file" size="30" name="upload_file" id="upload_file"> - ${_('or')} <span class="ui-btn" id="file_enable">${_('Create new file')}</span> + ${_('or')} <span class="ui-btn" id="file_enable">${_('Create new file')}</span> </div> </div> <div class="field"> @@ -66,11 +66,11 @@ <input type="text" value="${c.f_path}" size="30" name="location" id="location"> ${_('use / to separate directories')} </div> - </div> + </div> </div> - </div> + </div> <div id="body" class="codeblock"> - <div id="editor_container"> + <div id="editor_container"> <pre id="editor_pre"></pre> <textarea id="editor" name="content" style="display:none"></textarea> </div> @@ -84,9 +84,9 @@ ${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); + initCodeMirror('editor',reset_url); </script> - </div> + </div> </div> -</div> -</%def>
\ No newline at end of file +</div> +</%def> diff --git a/rhodecode/templates/files/files_annotate.html b/rhodecode/templates/files/files_annotate.html index 17e7708b..7683a1ad 100644 --- a/rhodecode/templates/files/files_annotate.html +++ b/rhodecode/templates/files/files_annotate.html @@ -13,7 +13,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} </%def> <%def name="main()"> <div class="box"> @@ -23,8 +23,8 @@ <ul class="links"> <li> <span style="text-transform: uppercase;"><a href="#">${_('branch')}: ${c.cs.branch}</a></span> - </li> - </ul> + </li> + </ul> </div> <div class="table"> <div id="files_data"> @@ -40,24 +40,24 @@ ${h.submit('show_rev','show at revision',class_="ui-btn")} ${h.end_form()} </div> - </dd> + </dd> </dl> <div id="body" class="codeblock"> <div class="code-header"> <div class="stats"> <div class="left"><img src="${h.url('/images/icons/file.png')}"/></div> - <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div> + <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div> <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div> <div class="left item last">${c.file.mimetype}</div> <div class="buttons"> ${h.link_to(_('show source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} - ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} + ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} - % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): + % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): % if not c.file.is_binary: ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} % endif - % endif + % endif </div> </div> <div class="author"> @@ -71,7 +71,7 @@ <div class="code-body"> %if c.file.is_binary: ${_('Binary file (%s)') % c.file.mimetype} - %else: + %else: % if c.file.size < c.cut_off_limit: ${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")} %else: @@ -81,13 +81,13 @@ <script type="text/javascript"> function highlight_lines(lines){ for(pos in lines){ - YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE'); + YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE'); } - } + } page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L'); if (page_highlights.length == 2){ highlight_ranges = page_highlights[1].split(","); - + var h_lines = []; for (pos in highlight_ranges){ var _range = highlight_ranges[pos].split('-'); @@ -98,26 +98,26 @@ for(var i=start;i<=end;i++){ h_lines.push(i); } - } + } } else{ h_lines.push(parseInt(highlight_ranges[pos])); } } highlight_lines(h_lines); - - //remember original location + + //remember original location var old_hash = location.href.substring(location.href.indexOf('#')); - - // this makes a jump to anchor moved by 3 posstions for padding + + // this makes a jump to anchor moved by 3 posstions for padding window.location.hash = '#L'+Math.max(parseInt(h_lines[0])-3,1); - - //sets old anchor + + //sets old anchor window.location.hash = old_hash; - + } - </script> - %endif + </script> + %endif </div> </div> <script type="text/javascript"> @@ -129,8 +129,8 @@ window.location = url; }); }); - </script> - </div> + </script> + </div> </div> -</div> -</%def> +</div> +</%def> diff --git a/rhodecode/templates/files/files_browser.html b/rhodecode/templates/files/files_browser.html index e8bb12dd..d95f017d 100644 --- a/rhodecode/templates/files/files_browser.html +++ b/rhodecode/templates/files/files_browser.html @@ -10,12 +10,12 @@ <div class="browser-nav"> ${h.form(h.url.current())} <div class="info_box"> - <span class="rev">${_('view')}@rev</span> + <span class="rev">${_('view')}@rev</span> <a class="ui-btn" href="${c.url_prev}" title="${_('previous revision')}">«</a> ${h.text('at_rev',value=c.changeset.revision,size=5)} <a class="ui-btn" href="${c.url_next}" title="${_('next revision')}">»</a> ## ${h.submit('view',_('view'),class_="ui-btn")} - </div> + </div> ${h.end_form()} </div> <div class="browser-branch"> @@ -26,20 +26,20 @@ <div id="search_activate_id" class="search_activate"> <a class="ui-btn" id="filter_activate" href="#">${_('search file list')}</a> </div> - % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): + % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): <div id="add_node_id" class="add_node"> <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}">${_('add new file')}</a> </div> - % endif + % endif <div> <div id="node_filter_box_loading" style="display:none">${_('Loading file list...')}</div> <div id="node_filter_box" style="display:none"> ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}/<input class="init" type="text" value="type to search..." name="filter" size="25" id="node_filter" autocomplete="off"> - </div> + </div> + </div> </div> - </div> </div> - + <div class="browser-body"> <table class="code-browser"> <thead> @@ -52,11 +52,11 @@ <th>${_('Last commiter')}</th> </tr> </thead> - + <tbody id="tbody"> %if c.file.parent: <tr class="parity0"> - <td> + <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> @@ -66,7 +66,7 @@ <td></td> </tr> %endif - + %for cnt,node in enumerate(c.file): <tr class="parity${cnt%2}"> <td> @@ -75,7 +75,7 @@ <td> %if node.is_file(): ${h.format_byte_size(node.size,binary=True)} - %endif + %endif </td> <td> %if node.is_file(): @@ -100,13 +100,13 @@ <span title="${node.last_changeset.author}"> ${h.person(node.last_changeset.author)} </span> - %endif + %endif </td> </tr> %endfor </tbody> <tbody id="tbody_filtered" style="display:none"> - </tbody> + </tbody> </table> </div> -</div>
\ No newline at end of file +</div> diff --git a/rhodecode/templates/files/files_edit.html b/rhodecode/templates/files/files_edit.html index 3dfa4178..f76d5bfb 100644 --- a/rhodecode/templates/files/files_edit.html +++ b/rhodecode/templates/files/files_edit.html @@ -20,7 +20,7 @@ </%def> <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} </%def> <%def name="main()"> <div class="box"> @@ -31,8 +31,8 @@ <li> <span style="text-transform: uppercase;"> <a href="#">${_('branch')}: ${c.cs.branch}</a></span> - </li> - </ul> + </li> + </ul> </div> <div class="table"> <div id="files_data"> @@ -42,22 +42,22 @@ <div class="code-header"> <div class="stats"> <div class="left"><img src="${h.url('/images/icons/file.png')}"/></div> - <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div> + <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div> <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div> <div class="left item last">${c.file.mimetype}</div> <div class="buttons"> ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} - ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} + ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} - % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): + % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): % if not c.file.is_binary: ${h.link_to(_('source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} % endif - % endif + % endif </div> </div> <div class="commit">${_('Editing file')}: ${c.file.path}</div> - </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> @@ -72,7 +72,7 @@ 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> -</div> -</%def>
\ No newline at end of file +</div> +</%def> diff --git a/rhodecode/templates/files/files_source.html b/rhodecode/templates/files/files_source.html index d6fc7ab6..c0e71e54 100644 --- a/rhodecode/templates/files/files_source.html +++ b/rhodecode/templates/files/files_source.html @@ -11,23 +11,23 @@ </div> </dd> </dl> - + <div id="body" class="codeblock"> <div class="code-header"> <div class="stats"> <div class="left"><img src="${h.url('/images/icons/file.png')}"/></div> - <div class="left item"><pre>${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</pre></div> + <div class="left item"><pre>${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</pre></div> <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div> <div class="left item last">${c.file.mimetype}</div> <div class="buttons"> ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} - ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} + ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} - % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): + % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): % if not c.file.is_binary: ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} % endif - % endif + % endif </div> </div> <div class="author"> @@ -51,9 +51,9 @@ <script type="text/javascript"> function highlight_lines(lines){ for(pos in lines){ - YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE'); + YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE'); } - } + } page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L'); if (page_highlights.length == 2){ highlight_ranges = page_highlights[1].split(","); @@ -68,26 +68,26 @@ for(var i=start;i<=end;i++){ h_lines.push(i); } - } + } } else{ h_lines.push(parseInt(highlight_ranges[pos])); } } highlight_lines(h_lines); - - //remember original location + + //remember original location var old_hash = location.href.substring(location.href.indexOf('#')); - - // this makes a jump to anchor moved by 3 posstions for padding + + // this makes a jump to anchor moved by 3 posstions for padding window.location.hash = '#L'+Math.max(parseInt(h_lines[0])-3,1); - - //sets old anchor + + //sets old anchor window.location.hash = old_hash; - + } </script> - %endif + %endif </div> </div> diff --git a/rhodecode/templates/files/files_ypjax.html b/rhodecode/templates/files/files_ypjax.html index b7a08154..a458d16a 100644 --- a/rhodecode/templates/files/files_ypjax.html +++ b/rhodecode/templates/files/files_ypjax.html @@ -5,11 +5,11 @@ %if c.file.is_dir(): <%include file='files_browser.html'/> %else: - <%include file='files_source.html'/> - %endif + <%include file='files_source.html'/> + %endif %else: <h2> - <a href="#" onClick="javascript:parent.history.back();" target="main">${_('Go back')}</a> - ${_('No files at given path')}: "${c.f_path or "/"}" + <a href="#" onClick="javascript:parent.history.back();" target="main">${_('Go back')}</a> + ${_('No files at given path')}: "${c.f_path or "/"}" </h2> %endif diff --git a/rhodecode/templates/followers/followers.html b/rhodecode/templates/followers/followers.html index f8827fe9..bb9ff837 100644 --- a/rhodecode/templates/followers/followers.html +++ b/rhodecode/templates/followers/followers.html @@ -7,7 +7,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('followers')} @@ -26,7 +26,7 @@ <div class="table"> <div id="followers"> ${c.followers_data} - </div> + </div> </div> -</div> -</%def>
\ No newline at end of file +</div> +</%def> diff --git a/rhodecode/templates/followers/followers_data.html b/rhodecode/templates/followers/followers_data.html index cc8fa424..a1a6cdee 100644 --- a/rhodecode/templates/followers/followers_data.html +++ b/rhodecode/templates/followers/followers_data.html @@ -9,11 +9,11 @@ <span style="font-size: 20px"> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span> </div> <div style="clear:both;padding-top: 10px"></div> - <div class="follower_date">${_('Started following')} - + <div class="follower_date">${_('Started following')} - <span class="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span></div> <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div> - </div> -% endfor + </div> +% endfor <div class="pagination-wh pagination-left"> <script type="text/javascript"> @@ -25,4 +25,4 @@ YUE.onDOMReady(function(){ }); </script> ${c.followers_pager.pager('$link_previous ~2~ $link_next')} -</div>
\ No newline at end of file +</div> diff --git a/rhodecode/templates/forks/fork.html b/rhodecode/templates/forks/fork.html index 9dd05653..fa7f2543 100644 --- a/rhodecode/templates/forks/fork.html +++ b/rhodecode/templates/forks/fork.html @@ -8,7 +8,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} » - ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))} + ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))} » ${_('fork')} </%def> @@ -20,7 +20,7 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))} <div class="form"> @@ -43,7 +43,7 @@ <div class="input"> ${h.select('repo_group','',c.repo_groups,class_="medium")} </div> - </div> + </div> <div class="field"> <div class="label label-textarea"> <label for="description">${_('Description')}:</label> @@ -67,7 +67,7 @@ <div class="checkboxes"> ${h.checkbox('copy_permissions',value="True")} </div> - </div> + </div> <div class="field"> <div class="label label-checkbox"> <label for="private">${_('Update after clone')}:</label> @@ -75,12 +75,12 @@ <div class="checkboxes"> ${h.checkbox('update_after_clone',value="True")} </div> - </div> + </div> <div class="buttons"> ${h.submit('',_('fork this repository'),class_="ui-button")} - </div> + </div> </div> - </div> - ${h.end_form()} + </div> + ${h.end_form()} </div> -</%def> +</%def> diff --git a/rhodecode/templates/forks/forks.html b/rhodecode/templates/forks/forks.html index 801ed0e9..fb8f85f4 100644 --- a/rhodecode/templates/forks/forks.html +++ b/rhodecode/templates/forks/forks.html @@ -7,7 +7,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('forks')} @@ -26,7 +26,7 @@ <div class="table"> <div id="forks"> ${c.forks_data} - </div> + </div> </div> -</div> -</%def>
\ No newline at end of file +</div> +</%def> diff --git a/rhodecode/templates/forks/forks_data.html b/rhodecode/templates/forks/forks_data.html index fcacb6c6..a89a9ae0 100644 --- a/rhodecode/templates/forks/forks_data.html +++ b/rhodecode/templates/forks/forks_data.html @@ -8,15 +8,15 @@ <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}) / + <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')} - + <div class="follower_date">${_('forked')} - <span class="tooltip" title="${f.created_on}"> ${h.age(f.created_on)}</span></div> - <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div> + <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div> </div> % endfor <div class="pagination-wh pagination-left"> @@ -29,7 +29,7 @@ }); </script> ${c.forks_pager.pager('$link_previous ~2~ $link_next')} - </div> + </div> % else: - ${_('There are no forks yet')} -% endif
\ No newline at end of file + ${_('There are no forks yet')} +% endif diff --git a/rhodecode/templates/index.html b/rhodecode/templates/index.html index 91735b8f..e1afee47 100644 --- a/rhodecode/templates/index.html +++ b/rhodecode/templates/index.html @@ -5,4 +5,4 @@ <%def name="page_nav()">${self.menu('home')}</%def> <%def name="main()"> <%include file="index_base.html" args="parent=self"/> -</%def> +</%def> diff --git a/rhodecode/templates/index_base.html b/rhodecode/templates/index_base.html index 61d85a0b..e5684dbb 100644 --- a/rhodecode/templates/index_base.html +++ b/rhodecode/templates/index_base.html @@ -1,17 +1,17 @@ -<%page args="parent" /> +<%page args="parent" /> <div class="box"> <!-- box / title --> <div class="title"> <h5> - <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${parent.breadcrumbs()} <span id="repo_count">0</span> ${_('repositories')} + <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${parent.breadcrumbs()} <span id="repo_count">0</span> ${_('repositories')} </h5> %if c.rhodecode_user.username != 'default': %if h.HasPermissionAny('hg.admin','hg.create.repository')(): <ul class="links"> <li> <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))}</span> - </li> - </ul> + </li> + </ul> %endif %endif </div> @@ -27,7 +27,7 @@ ##<th class="left"><a href="#">${_('Number of repositories')}</a></th> </tr> </thead> - + ## REPO GROUPS % for gr in c.groups: <tr> @@ -41,7 +41,7 @@ ##<td><b>${gr.repositories.count()}</b></td> </tr> % endfor - + </table> </div> <div style="height: 20px"></div> @@ -52,7 +52,7 @@ <div id='repos_list_wrap' class="yui-skin-sam"> <%cnt=0%> <%namespace name="dt" file="/_data_table/_dt_elements.html"/> - + <table id="repos_list"> <thead> <tr> @@ -87,7 +87,7 @@ </td> ##LAST REVISION <td> - ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} + ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} </td> ## <td title="${repo['contact']}">${h.person(repo['contact'])}</td> @@ -96,8 +96,8 @@ <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon" href="${h.url('rss_feed_home',repo_name=repo['name'],api_key=c.rhodecode_user.api_key)}"></a> %else: <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon" href="${h.url('rss_feed_home',repo_name=repo['name'])}"></a> - %endif: - </td> + %endif: + </td> <td> %if c.rhodecode_user.username != 'default': <a title="${_('Subscribe to %s atom feed')%repo['name']}" class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'],api_key=c.rhodecode_user.api_key)}"></a> @@ -113,7 +113,7 @@ </div> </div> <script> - YUD.get('repo_count').innerHTML = ${cnt}; + YUD.get('repo_count').innerHTML = ${cnt}; var func = function(node){ return node.parentNode.parentNode.parentNode.parentNode; } @@ -127,7 +127,7 @@ ]; var myDataSource = new YAHOO.util.DataSource(YUD.get("groups_list")); - + myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE; myDataSource.responseSchema = { fields: [ @@ -143,7 +143,7 @@ MSG_SORTDESC:"${_('Click to sort descending')}" } ); - + // main table sorting var myColumnDefs = [ {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"}, @@ -160,9 +160,9 @@ ]; var myDataSource = new YAHOO.util.DataSource(YUD.get("repos_list")); - + myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE; - + myDataSource.responseSchema = { fields: [ {key:"menu"}, @@ -183,13 +183,13 @@ MSG_SORTDESC:"${_('Click to sort descending')}", MSG_EMPTY:"${_('No records found.')}", MSG_ERROR:"${_('Data error.')}", - MSG_LOADING:"${_('Loading...')}", + MSG_LOADING:"${_('Loading...')}", } ); myDataTable.subscribe('postRenderEvent',function(oArgs) { tooltip_activate(); quick_repo_menu(); - q_filter('q_filter',YUQ('div.table tr td a.repo_name'),func); - }); - - </script>
\ No newline at end of file + q_filter('q_filter',YUQ('div.table tr td a.repo_name'),func); + }); + + </script> diff --git a/rhodecode/templates/journal/journal.html b/rhodecode/templates/journal/journal.html index 3a324537..ae33fb0a 100644 --- a/rhodecode/templates/journal/journal.html +++ b/rhodecode/templates/journal/journal.html @@ -10,7 +10,7 @@ ${self.menu('home')} </%def> <%def name="main()"> - + <div class="box box-left"> <!-- box / title --> <div class="title"> @@ -19,25 +19,25 @@ <li> <span><a id="refresh" href="${h.url('journal')}"><img class="icon" title="${_('Refresh')}" alt="${_('Refresh')}" src="${h.url('/images/icons/arrow_refresh.png')}"/> </a></span> - </li> - </ul> - </div> + </li> + </ul> + </div> <div id="journal">${c.journal_data}</div> </div> <div class="box box-right"> <!-- box / title --> <div class="title"> - <h5> - <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> + <h5> + <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> <a id="show_my" class="link-white" href="#my">${_('My repos')}</a> / <a id="show_watched" class="link-white" href="#watched">${_('Watched')}</a> </h5> %if h.HasPermissionAny('hg.admin','hg.create.repository')(): <ul class="links"> <li> <span>${h.link_to(_('ADD'),h.url('admin_settings_create_repository'))}</span> - </li> - </ul> - %endif + </li> + </ul> + %endif </div> <!-- end box / title --> <div id="my" class="table"> @@ -50,7 +50,7 @@ <th class="left">${_('Name')}</th> <th class="left">${_('Tip')}</th> <th class="left">${_('Action')}</th> - <th class="left">${_('Action')}</th> + <th class="left">${_('Action')}</th> </thead> <tbody> <%namespace name="dt" file="/_data_table/_dt_elements.html"/> @@ -66,14 +66,14 @@ </td> ##LAST REVISION <td> - ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} + ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} </td> ## <td><a href="${h.url('repo_settings_home',repo_name=repo['name'])}" title="${_('edit')}"><img class="icon" alt="${_('private')}" src="${h.url('/images/icons/application_form_edit.png')}"/></a></td> <td> ${h.form(url('repo_settings_delete', repo_name=repo['name']),method='delete')} ${h.submit('remove_%s' % repo['name'],'',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")} - ${h.end_form()} + ${h.end_form()} </td> </tr> %endfor @@ -82,14 +82,14 @@ </div> %else: <div style="padding:5px 0px 10px 0px;"> - ${_('No repositories yet')} + ${_('No repositories yet')} %if h.HasPermissionAny('hg.admin','hg.create.repository')(): ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-btn")} %endif </div> - %endif + %endif </div> - + <div id="watched" class="table" style="display:none"> %if c.following: <table> @@ -105,20 +105,20 @@ <img title="${_('following user')}" alt="${_('user')}" src="${h.url('/images/icons/user.png')}"/> ${entry.follows_user.full_contact} %endif - + %if entry.follows_repo_id: <div style="float:right;padding-right:5px"> <span id="follow_toggle_${entry.follows_repository.repo_id}" class="following" title="${_('Stop following this repository')}" onclick="javascript:toggleFollowingRepo(this,${entry.follows_repository.repo_id},'${str(h.get_token())}')"> - </span> + </span> </div> - + %if entry.follows_repository.repo_type == 'hg': <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/> %elif entry.follows_repository.repo_type == 'git': <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/> - %endif - + %endif + %if entry.follows_repository.private: <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/> %else: @@ -137,12 +137,12 @@ <div style="padding:5px 0px 10px 0px;"> ${_('You are not following any users or repositories')} </div> - %endif - </div> + %endif + </div> </div> - + <script type="text/javascript"> - + YUE.on('show_my','click',function(e){ YUD.setStyle('watched','display','none'); YUD.setStyle('my','display',''); @@ -150,8 +150,8 @@ var target = 'q_filter'; var func = function(node){ return node.parentNode.parentNode.parentNode.parentNode; - } - q_filter(target,nodes,func); + } + q_filter(target,nodes,func); YUE.preventDefault(e); }) YUE.on('show_watched','click',function(e){ @@ -162,14 +162,14 @@ var func = function(node){ return node.parentNode.parentNode; } - q_filter(target,nodes,func); - YUE.preventDefault(e); + q_filter(target,nodes,func); + YUE.preventDefault(e); }) YUE.on('refresh','click',function(e){ ypjax(e.currentTarget.href,"journal",function(){show_more_event();tooltip_activate();}); YUE.preventDefault(e); }); - + // main table sorting var myColumnDefs = [ @@ -183,9 +183,9 @@ ]; var myDataSource = new YAHOO.util.DataSource(YUD.get("repos_list")); - + myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE; - + myDataSource.responseSchema = { fields: [ {key:"menu"}, @@ -203,7 +203,7 @@ MSG_SORTDESC:"${_('Click to sort descending')}", MSG_EMPTY:"${_('No records found.')}", MSG_ERROR:"${_('Data error.')}", - MSG_LOADING:"${_('Loading...')}", + MSG_LOADING:"${_('Loading...')}", } ); myDataTable.subscribe('postRenderEvent',function(oArgs) { @@ -211,10 +211,10 @@ quick_repo_menu(); var func = function(node){ return node.parentNode.parentNode.parentNode.parentNode; - } + } q_filter('q_filter',YUQ('#my tr td a.repo_name'),func); - }); - - - </script> -</%def> + }); + + + </script> +</%def> diff --git a/rhodecode/templates/journal/journal_data.html b/rhodecode/templates/journal/journal_data.html index 78a10a5f..637a8e99 100644 --- a/rhodecode/templates/journal/journal_data.html +++ b/rhodecode/templates/journal/journal_data.html @@ -20,7 +20,7 @@ h.url('summary_home',repo_name=entry.repository.repo_name))} %else: ${entry.repository_name} - %endif + %endif </span> </div> <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div> @@ -30,7 +30,7 @@ </div> %endfor %endfor - + <div class="pagination-wh pagination-left"> <script type="text/javascript"> YUE.onDOMReady(function(){ @@ -45,5 +45,5 @@ %else: <div style="padding:5px 0px 10px 10px;"> ${_('No entries yet')} - </div> -%endif
\ No newline at end of file + </div> +%endif diff --git a/rhodecode/templates/journal/public_journal.html b/rhodecode/templates/journal/public_journal.html index 64bf9fce..71466adc 100644 --- a/rhodecode/templates/journal/public_journal.html +++ b/rhodecode/templates/journal/public_journal.html @@ -10,7 +10,7 @@ ${self.menu('home')} </%def> <%def name="main()"> - + <div class="box"> <!-- box / title --> <div class="title"> @@ -21,10 +21,10 @@ </li> <li> <span>${h.link_to(_('Atom'),h.url('public_journal_atom'),class_='atom_icon')}</span> - </li> - - </ul> - + </li> + + </ul> + </div> <script type="text/javascript"> function show_more_event(){ @@ -34,8 +34,8 @@ YUD.setStyle(el.parentNode,'display','none'); }); } - </script> + </script> <div id="journal">${c.journal_data}</div> </div> - -</%def> + +</%def> diff --git a/rhodecode/templates/login.html b/rhodecode/templates/login.html index a7f5b059..a2c1142e 100644 --- a/rhodecode/templates/login.html +++ b/rhodecode/templates/login.html @@ -15,12 +15,12 @@ % endfor </ul> % endif -</div> +</div> <!-- login --> <div class="title top-left-rounded-corner top-right-rounded-corner"> <h5>${_('Sign In to')} ${c.rhodecode_name}</h5> </div> - <div class="inner"> + <div class="inner"> ${h.form(h.url.current(came_from=c.came_from))} <div class="form"> <!-- fields --> @@ -33,8 +33,8 @@ <div class="input"> ${h.text('username',class_='focus',size=40)} </div> - - </div> + + </div> <div class="field"> <div class="label"> <label for="password">${_('Password')}:</label> @@ -42,7 +42,7 @@ <div class="input"> ${h.password('password',class_='focus',size=40)} </div> - + </div> <div class="field"> <div class="checkbox"> @@ -59,7 +59,7 @@ <div class="links"> ${h.link_to(_('Forgot your password ?'),h.url('reset_password'))} %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')(): - / + / ${h.link_to(_("Don't have an account ?"),h.url('register'))} %endif </div> diff --git a/rhodecode/templates/password_reset.html b/rhodecode/templates/password_reset.html index 271c51d7..5480f719 100644 --- a/rhodecode/templates/password_reset.html +++ b/rhodecode/templates/password_reset.html @@ -6,7 +6,7 @@ </%def> <div id="register"> - + <div class="title top-left-rounded-corner top-right-rounded-corner"> <h5>${_('Reset your password to')} ${c.rhodecode_name}</h5> </div> @@ -15,7 +15,7 @@ <div class="form"> <!-- fields --> <div class="fields"> - + <div class="field"> <div class="label"> <label for="email">${_('Email address')}:</label> @@ -24,13 +24,13 @@ ${h.text('email')} </div> </div> - + <div class="buttons"> <div class="nohighlight"> ${h.submit('send',_('Reset my password'),class_="ui-button")} <div class="activation_msg">${_('Password reset link will be send to matching email address')}</div> </div> - </div> + </div> </div> </div> ${h.end_form()} @@ -38,7 +38,6 @@ YUE.onDOMReady(function(){ YUD.get('email').focus(); }) - </script> - </div> + </script> + </div> </div> - diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html index 1926c530..43ec79c0 100644 --- a/rhodecode/templates/register.html +++ b/rhodecode/templates/register.html @@ -4,9 +4,9 @@ <%def name="title()"> ${_('Sign Up')} - ${c.rhodecode_name} </%def> - + <div id="register"> - + <div class="title top-left-rounded-corner top-right-rounded-corner"> <h5>${_('Sign Up to')} ${c.rhodecode_name}</h5> </div> @@ -23,7 +23,7 @@ ${h.text('username',class_="medium")} </div> </div> - + <div class="field"> <div class="label"> <label for="password">${_('Password')}:</label> @@ -32,7 +32,7 @@ ${h.password('password',class_="medium")} </div> </div> - + <div class="field"> <div class="label"> <label for="password">${_('Re-enter password')}:</label> @@ -41,7 +41,7 @@ ${h.password('password_confirmation',class_="medium")} </div> </div> - + <div class="field"> <div class="label"> <label for="name">${_('First Name')}:</label> @@ -50,7 +50,7 @@ ${h.text('name',class_="medium")} </div> </div> - + <div class="field"> <div class="label"> <label for="lastname">${_('Last Name')}:</label> @@ -59,7 +59,7 @@ ${h.text('lastname',class_="medium")} </div> </div> - + <div class="field"> <div class="label"> <label for="email">${_('Email')}:</label> @@ -68,7 +68,7 @@ ${h.text('email',class_="medium")} </div> </div> - + <div class="buttons"> <div class="nohighlight"> ${h.submit('sign_up',_('Sign Up'),class_="ui-button")} @@ -78,7 +78,7 @@ <div class="activation_msg">${_('Your account must wait for activation by administrator')}</div> %endif </div> - </div> + </div> </div> </div> ${h.end_form()} @@ -86,7 +86,6 @@ YUE.onDOMReady(function(){ YUD.get('username').focus(); }) - </script> - </div> + </script> + </div> </div> - diff --git a/rhodecode/templates/repo_switcher_list.html b/rhodecode/templates/repo_switcher_list.html index 261b5440..5ae92d81 100644 --- a/rhodecode/templates/repo_switcher_list.html +++ b/rhodecode/templates/repo_switcher_list.html @@ -3,9 +3,9 @@ <li class="qfilter_rs"> <input type="text" style="border:0" value="quick filter..." name="filter" size="15" id="q_filter_rs" /> </li> - + %for repo in c.repos_list: - + %if repo['dbrepo']['private']: <li> <img src="${h.url('/images/icons/lock.png')}" alt="${_('Private repository')}" class="repo_switcher_type"/> @@ -16,5 +16,5 @@ <img src="${h.url('/images/icons/lock_open.png')}" alt="${_('Public repository')}" class="repo_switcher_type" /> ${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']),class_="repo_name %s" % repo['dbrepo']['repo_type'])} </li> - %endif -%endfor
\ No newline at end of file + %endif +%endfor diff --git a/rhodecode/templates/search/search.html b/rhodecode/templates/search/search.html index 6bb1389a..3d52b347 100644 --- a/rhodecode/templates/search/search.html +++ b/rhodecode/templates/search/search.html @@ -2,11 +2,11 @@ <%inherit file="/base/base.html"/> <%def name="title()"> ${_('Search')} - ${'"%s"' % c.cur_query if c.cur_query else None} + ${'"%s"' % c.cur_query if c.cur_query else None} %if c.repo_name: ${_('in repository: ') + c.repo_name} %else: - ${_('in all repositories')} + ${_('in all repositories')} %endif - ${c.rhodecode_name} </%def> @@ -26,12 +26,12 @@ ${_('in repository: ') + c.repo_name} %else: ${_('in all repositories')} - %endif + %endif </h5> </div> <!-- end box / title --> %if c.repo_name: - ${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')} + ${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')} %else: ${h.form(h.url('search'),method='get')} %endif @@ -40,13 +40,13 @@ <div class="field field-first field-noborder"> <div class="label"> <label for="q">${_('Search term')}</label> - </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 style="font-weight: bold;clear:Both;margin-left:200px">${c.runtime}</div> </div> <div class="field"> @@ -58,14 +58,14 @@ ##('commit',_('Commit messages')), ('path',_('File names')), ##('repository',_('Repository names')), - ])} + ])} </div> </div> - + </div> </div> ${h.end_form()} - + %if c.cur_search == 'content': <%include file='search_content.html'/> %elif c.cur_search == 'path': @@ -74,7 +74,7 @@ <%include file='search_commit.html'/> %elif c.cur_search == 'repository': <%include file='search_repository.html'/> - %endif + %endif </div> -</%def> +</%def> diff --git a/rhodecode/templates/search/search_content.html b/rhodecode/templates/search/search_content.html index 09628dd6..0ed5920f 100644 --- a/rhodecode/templates/search/search_content.html +++ b/rhodecode/templates/search/search_content.html @@ -19,13 +19,13 @@ <div id="body${cnt}" class="codeblock"> <div class="error">${_('Permission denied')}</div> </div> - </div> + </div> %endif - - %endif + + %endif %endfor %if c.cur_query and c.formated_results: <div class="pagination-wh pagination-left"> ${c.formated_results.pager('$link_previous ~2~ $link_next')} -</div> -%endif
\ No newline at end of file +</div> +%endif diff --git a/rhodecode/templates/search/search_path.html b/rhodecode/templates/search/search_path.html index 64cddcec..e11ee181 100644 --- a/rhodecode/templates/search/search_path.html +++ b/rhodecode/templates/search/search_path.html @@ -5,22 +5,22 @@ <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']))} + 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')} + ${_('Permission denied')} </div> - </div> + </div> %endif - - %endif + + %endif %endfor %if c.cur_query and c.formated_results: <div class="pagination-wh pagination-left"> ${c.formated_results.pager('$link_previous ~2~ $link_next')} -</div> +</div> %endif diff --git a/rhodecode/templates/settings/repo_settings.html b/rhodecode/templates/settings/repo_settings.html index 7d646ef0..53f6dbd3 100644 --- a/rhodecode/templates/settings/repo_settings.html +++ b/rhodecode/templates/settings/repo_settings.html @@ -8,9 +8,9 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} » - ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))} - » - ${_('Settings')} + ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))} + » + ${_('Settings')} </%def> <%def name="page_nav()"> @@ -20,7 +20,7 @@ <div class="box"> <!-- box / title --> <div class="title"> - ${self.breadcrumbs()} + ${self.breadcrumbs()} </div> ${h.form(url('repo_settings_update', repo_name=c.repo_info.repo_name),method='put')} <div class="form"> @@ -41,7 +41,7 @@ <div class="input"> ${h.select('repo_group','',c.repo_groups,class_="medium")} </div> - </div> + </div> <div class="field"> <div class="label label-textarea"> <label for="description">${_('Description')}:</label> @@ -50,7 +50,7 @@ ${h.textarea('description',cols=23,rows=5)} </div> </div> - + <div class="field"> <div class="label label-checkbox"> <label for="private">${_('Private')}:</label> @@ -59,7 +59,7 @@ ${h.checkbox('private',value="True")} </div> </div> - + <div class="field"> <div class="label"> <label for="">${_('Permissions')}:</label> @@ -67,16 +67,14 @@ <div class="input"> <%include file="../admin/repos/repo_edit_perms.html"/> </div> - + <div class="buttons"> ${h.submit('save','Save',class_="ui-button")} ${h.reset('reset','Reset',class_="ui-button")} - </div> + </div> </div> - </div> + </div> ${h.end_form()} </div> </div> -</%def> - - +</%def> diff --git a/rhodecode/templates/shortlog/shortlog.html b/rhodecode/templates/shortlog/shortlog.html index 961601af..43d5fd2f 100644 --- a/rhodecode/templates/shortlog/shortlog.html +++ b/rhodecode/templates/shortlog/shortlog.html @@ -8,7 +8,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('shortlog')} @@ -29,5 +29,5 @@ ${c.shortlog_data} </div> </div> -</div> -</%def>
\ No newline at end of file +</div> +</%def> diff --git a/rhodecode/templates/shortlog/shortlog_data.html b/rhodecode/templates/shortlog/shortlog_data.html index aaf67bd6..2756714c 100644 --- a/rhodecode/templates/shortlog/shortlog_data.html +++ b/rhodecode/templates/shortlog/shortlog_data.html @@ -2,7 +2,7 @@ %if c.repo_changesets: <table class="table_disp"> <tr> - <th class="left">${_('revision')}</th> + <th class="left">${_('revision')}</th> <th class="left">${_('commit message')}</th> <th class="left">${_('age')}</th> <th class="left">${_('author')}</th> @@ -13,7 +13,7 @@ <tr class="parity${cnt%2}"> <td> <div><pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">r${cs.revision}:${h.short_id(cs.raw_id)}</a></pre></div> - </td> + </td> <td> ${h.link_to(h.truncate(cs.message,50), h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), @@ -21,7 +21,7 @@ </td> <td><span class="tooltip" title="${cs.date}"> ${h.age(cs.date)}</span> - </td> + </td> <td title="${cs.author}">${h.person(cs.author)}</td> <td> <span class="logtags"> @@ -45,7 +45,7 @@ YUE.delegate("shortlog_data","click",function(e, matchedEl, container){ ypjax(e.target.href,"shortlog_data",function(){tooltip_activate();}); YUE.preventDefault(e); - },'.pager_link'); + },'.pager_link'); }); </script> @@ -62,18 +62,18 @@ ${c.repo_changesets.pager('$link_previous ~2~ $link_next')} </div> </div> %endif - -<h4>${_('Push new repo')}</h4> + +<h4>${_('Push new repo')}</h4> <pre> ${c.rhodecode_repo.alias} clone ${c.clone_repo_url} ${c.rhodecode_repo.alias} add README # add first file ${c.rhodecode_repo.alias} commit -m "Initial" # commit with message ${c.rhodecode_repo.alias} push # push changes back </pre> - + <h4>${_('Existing repository?')}</h4> <pre> ${c.rhodecode_repo.alias} push ${c.clone_repo_url} -</pre> +</pre> %endif diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html index 8faf3524..ea623a5f 100644 --- a/rhodecode/templates/summary/summary.html +++ b/rhodecode/templates/summary/summary.html @@ -6,14 +6,14 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.dbrepo.just_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('summary')} </%def> <%def name="page_nav()"> - ${self.menu('summary')} + ${self.menu('summary')} </%def> <%def name="main()"> @@ -32,50 +32,50 @@ <!-- end box / title --> <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 style="float:right;padding:5px 0px 0px 5px"> + <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')} ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='atom_icon')} %else: ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name),class_='rss_icon')} - ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name),class_='atom_icon')} - %endif + ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name),class_='atom_icon')} + %endif </div> %if c.rhodecode_user.username != 'default': %if c.following: <span id="follow_toggle" class="following" title="${_('Stop following this repository')}" onclick="javascript:toggleFollowingRepo(this,${c.dbrepo.repo_id},'${str(h.get_token())}')"> - </span> + </span> %else: <span id="follow_toggle" class="follow" title="${_('Start following this repository')}" onclick="javascript:toggleFollowingRepo(this,${c.dbrepo.repo_id},'${str(h.get_token())}')"> </span> %endif - %endif: + %endif: ##REPO TYPE %if c.dbrepo.repo_type =='hg': <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/> %endif %if c.dbrepo.repo_type =='git': <img style="margin-bottom:2px" class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/> - %endif - - ##PUBLIC/PRIVATE + %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 - + ##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""> @@ -90,18 +90,18 @@ <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> + %endif </div> </div> - + <div class="field"> <div class="label-summary"> <label>${_('Description')}:</label> </div> <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(c.dbrepo.description)}</div> </div> - + <div class="field"> <div class="label-summary"> <label>${_('Contact')}:</label> @@ -115,7 +115,7 @@ ${_('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> @@ -127,7 +127,7 @@ <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 class="field"> <div class="label-summary"> <label>${_('Trending files')}:</label> @@ -136,14 +136,14 @@ %if c.show_stats: <div id="lang_stats"></div> %else: - ${_('Statistics are disabled for this repository')} + ${_('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 + %endif </div> </div> - + <div class="field"> <div class="label-summary"> <label>${_('Download')}:</label> @@ -155,7 +155,7 @@ ${_('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 + %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> @@ -164,33 +164,33 @@ </span> %endif </div> - </div> - </div> + </div> + </div> </div> </div> -%if c.show_stats: +%if c.show_stats: <div class="box box-right" style="min-height:455px"> <!-- box / title --> <div class="title"> <h5>${_('Commit activity by day / author')}</h5> </div> - + <div class="graph"> <div style="padding:0 10px 10px 15px;font-size: 1.2em;"> %if c.no_data: ${c.no_data_msg} %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 %else: ${_('Loaded in')} ${c.stats_percentage} % %endif - </div> + </div> <div id="commit_history" style="width:450px;height:300px;float:left"></div> <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"> @@ -198,10 +198,10 @@ </div> </div> </div> -</div> +</div> %endif -<div class="box"> +<div class="box"> <div class="title"> <div class="breadcrumbs"> %if c.repo_changesets: @@ -210,7 +210,7 @@ ${_('Quick start')} %endif </div> - </div> + </div> <div class="table"> <div id="shortlog_data"> <%include file='../shortlog/shortlog_data.html'/> @@ -219,10 +219,10 @@ </div> %if c.readme_data: -<div class="box" style="background-color: #FAFAFA"> +<div class="box" style="background-color: #FAFAFA"> <div class="title"> <div class="breadcrumbs"><a href="${h.url('files_home',repo_name=c.repo_name,revision='tip',f_path=c.readme_file)}">${c.readme_file}</a></div> - </div> + </div> <div class="readme"> <div class="readme_box"> ${c.readme_data|n} @@ -239,7 +239,7 @@ YUE.on(clone_url,'click',function(e){ } else{ YUD.addClass(clone_url,'selected'); - YUD.get(clone_url).select(); + YUD.get(clone_url).select(); } }) @@ -247,18 +247,18 @@ YUE.on('clone_by_name','click',function(e){ // show url by name and hide name button YUD.setStyle('clone_url','display',''); YUD.setStyle('clone_by_name','display','none'); - + // hide url by id and show name button YUD.setStyle('clone_by_id','display',''); - YUD.setStyle('clone_url_id','display','none'); - + YUD.setStyle('clone_url_id','display','none'); + }) YUE.on('clone_by_id','click',function(e){ - + // 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'); @@ -273,14 +273,14 @@ var tmpl_links = {}; YUE.on(['download_options','archive_subrepos'],'change',function(e){ var sm = YUD.get('download_options'); var new_cs = sm.options[sm.selectedIndex]; - + for(k in tmpl_links){ var s = YUD.get(k+'_link'); if(s){ var title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}"; title_tmpl= title_tmpl.replace('__CS_NAME__',new_cs.text); title_tmpl = title_tmpl.replace('__CS_EXT__',k); - + var url = tmpl_links[k].replace('__CS__',new_cs.value); var subrepos = YUD.get('archive_subrepos').checked; url = url.replace('__SUB__',subrepos); @@ -298,7 +298,7 @@ var no_data = true; for (k in data){ total += data[k].count; no_data = false; -} +} var tbl = document.createElement('table'); tbl.setAttribute('class','trending_language_tbl'); var cnt = 0; @@ -322,20 +322,20 @@ for (k in data){ td2.setAttribute('style','padding-right:14px !important'); var trending_language = document.createElement('div'); var nr_files = value+" ${_('files')}"; - + trending_language.title = k+" "+nr_files; - + if (percentage>22){ - trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"% "+nr_files+ "</b>"; + trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"% "+nr_files+ "</b>"; } else{ trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"%</b>"; } - + trending_language.setAttribute("class", 'trending_language top-right-rounded-corner bottom-right-rounded-corner'); trending_language.style.width=percentage+"%"; td2.appendChild(trending_language); - + tr.appendChild(td1); tr.appendChild(td2); tbl.appendChild(tr); @@ -343,17 +343,17 @@ for (k in data){ var show_more = document.createElement('tr'); var td = document.createElement('td'); lnk = document.createElement('a'); - + lnk.href='#'; lnk.innerHTML = "${_('show more')}"; lnk.id='code_stats_show_more'; td.appendChild(lnk); - + show_more.appendChild(td); show_more.appendChild(document.createElement('td')); tbl.appendChild(show_more); } - + } YUD.get('lang_stats').appendChild(tbl); @@ -365,7 +365,7 @@ YUE.on('code_stats_show_more','click',function(){ YUD.setStyle(YUD.get('code_stats_show_more'), 'display','none'); }); -</script> +</script> <script type="text/javascript"> /** * Plots summary graph @@ -389,20 +389,20 @@ function SummaryPlot(from,to,dataset,overview_dataset) { var choiceContainerTable = YUD.get("legend_choices_tables"); var plotContainer = YUD.get('commit_history'); var overviewContainer = YUD.get('overview'); - + var plot_options = { bars: {show:true,align:'center',lineWidth:4}, legend: {show:true, container:"legend_container"}, points: {show:true,radius:0,fill:false}, yaxis: {tickDecimals:0,}, xaxis: { - mode: "time", + mode: "time", timeformat: "%d/%m", min:from, - max:to, - }, + max:to, + }, grid: { - hoverable: true, + hoverable: true, clickable: true, autoHighlight:true, color: "#999" @@ -434,7 +434,7 @@ function SummaryPlot(from,to,dataset,overview_dataset) { "color":'#ffffff', } } - + /** * generate checkboxes accordindly to data * @param keys @@ -445,7 +445,7 @@ function SummaryPlot(from,to,dataset,overview_dataset) { var i = 0; choiceContainerTable.innerHTML = ''; for(var pos in data) { - + data[pos].color = i; i++; if(data[pos].label != ''){ @@ -454,9 +454,9 @@ function SummaryPlot(from,to,dataset,overview_dataset) { +data[pos].label+ '</td></tr>'; } - } + } } - + /** * ToolTip show */ @@ -479,74 +479,74 @@ function SummaryPlot(from,to,dataset,overview_dataset) { var anim = new YAHOO.util.Anim(div, {opacity: {to: 0.8}}, 0.2); anim.animate(); } - + /** - * This function will detect if selected period has some changesets + * This function will detect if selected period has some changesets for this user if it does this data is then pushed for displaying Additionally it will only display users that are selected by the checkbox */ function getDataAccordingToRanges(ranges) { - + var data = []; var new_dataset = {}; var keys = []; var max_commits = 0; for(var key in dataset){ - + for(var ds in dataset[key].data){ commit_data = dataset[key].data[ds]; if (commit_data.time >= ranges.xaxis.from && commit_data.time <= ranges.xaxis.to){ if(new_dataset[key] === undefined){ - new_dataset[key] = {data:[],schema:["commits"],label:key}; + new_dataset[key] = {data:[],schema:["commits"],label:key}; } new_dataset[key].data.push(commit_data); } } if (new_dataset[key] !== undefined){ - data.push(new_dataset[key]); + data.push(new_dataset[key]); } } if (data.length > 0){ - return data; + return data; } else{ //just return dummy data for graph to plot itself - return [getDummyData('')]; + return [getDummyData('')]; } } - + /** * redraw using new checkbox data */ function plotchoiced(e,args){ var cur_data = args[0]; var cur_ranges = args[1]; - + var new_data = []; var inputs = choiceContainer.getElementsByTagName("input"); //show only checked labels for(var i=0; i<inputs.length; i++) { var checkbox_key = inputs[i].name; - + if(inputs[i].checked){ for(var d in cur_data){ if(cur_data[d].label == checkbox_key){ new_data.push(cur_data[d]); } - } + } } else{ //push dummy data to not hide the label new_data.push(getDummyData(checkbox_key)); } } - + var new_options = YAHOO.lang.merge(plot_options, { - xaxis: { - min: cur_ranges.xaxis.from, + xaxis: { + min: cur_ranges.xaxis.from, max: cur_ranges.xaxis.to, mode:"time", timeformat: "%d/%m", @@ -557,17 +557,17 @@ function SummaryPlot(from,to,dataset,overview_dataset) { } // do the zooming plot = YAHOO.widget.Flot(plotContainer, new_data, new_options); - + plot.subscribe("plotselected", plotselected); //resubscribe plothover plot.subscribe("plothover", plothover); - - // don't fire event on the overview to prevent eternal loop + + // don't fire event on the overview to prevent eternal loop overview.setSelection(cur_ranges, true); } - + /** * plot only selected items from overview * @param ranges @@ -577,72 +577,72 @@ function SummaryPlot(from,to,dataset,overview_dataset) { //updates the data for new plot var data = getDataAccordingToRanges(ranges); generateCheckboxes(data); - + var new_options = YAHOO.lang.merge(plot_options, { - xaxis: { - min: ranges.xaxis.from, + xaxis: { + min: ranges.xaxis.from, max: ranges.xaxis.to, mode:"time", timeformat: "%d/%m", }, }); - // do the zooming + // do the zooming plot = YAHOO.widget.Flot(plotContainer, data, new_options); plot.subscribe("plotselected", plotselected); //resubscribe plothover plot.subscribe("plothover", plothover); - + // don't fire event on the overview to prevent eternal loop overview.setSelection(ranges, true); - //resubscribe choiced + //resubscribe choiced YUE.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, ranges]); } - + var previousPoint = null; function plothover(o) { var pos = o.pos; var item = o.item; - + //YUD.get("x").innerHTML = pos.x.toFixed(2); //YUD.get("y").innerHTML = pos.y.toFixed(2); if (item) { if (previousPoint != item.datapoint) { previousPoint = item.datapoint; - + var tooltip = YUD.get("tooltip"); if(tooltip) { tooltip.parentNode.removeChild(tooltip); } var x = item.datapoint.x.toFixed(2); var y = item.datapoint.y.toFixed(2); - + if (!item.series.label){ item.series.label = 'commits'; } var d = new Date(x*1000); var fd = d.toDateString() var nr_commits = parseInt(y); - + var cur_data = dataset[item.series.label].data[item.dataIndex]; var added = cur_data.added; var changed = cur_data.changed; var removed = cur_data.removed; - + var nr_commits_suffix = " ${_('commits')} "; var added_suffix = " ${_('files added')} "; var changed_suffix = " ${_('files changed')} "; var removed_suffix = " ${_('files removed')} "; - + if(nr_commits == 1){nr_commits_suffix = " ${_('commit')} ";} if(added==1){added_suffix=" ${_('file added')} ";} if(changed==1){changed_suffix=" ${_('file changed')} ";} if(removed==1){removed_suffix=" ${_('file removed')} ";} - + showTooltip(item.pageX, item.pageY, item.series.label + " on " + fd +'<br/>'+ nr_commits + nr_commits_suffix+'<br/>'+ @@ -653,43 +653,43 @@ function SummaryPlot(from,to,dataset,overview_dataset) { } else { var tooltip = YUD.get("tooltip"); - + if(tooltip) { tooltip.parentNode.removeChild(tooltip); } previousPoint = null; } } - + /** * MAIN EXECUTION */ - - var data = getDataAccordingToRanges(initial_ranges); + + var data = getDataAccordingToRanges(initial_ranges); generateCheckboxes(data); - - //main plot + + //main plot var plot = YAHOO.widget.Flot(plotContainer,data,plot_options); - - //overview - var overview = YAHOO.widget.Flot(overviewContainer, + + //overview + var overview = YAHOO.widget.Flot(overviewContainer, overview_dataset, overview_options); - - //show initial selection on overview - overview.setSelection(initial_ranges); - + + //show initial selection on overview + overview.setSelection(initial_ranges); + plot.subscribe("plotselected", plotselected); plot.subscribe("plothover", plothover) - + overview.subscribe("plotselected", function (ranges) { plot.setSelection(ranges); - }); + }); // user choices on overview YUE.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, initial_ranges]); } - SummaryPlot(${c.ts_min},${c.ts_max},${c.commit_data|n},${c.overview_data|n}); + SummaryPlot(${c.ts_min},${c.ts_max},${c.commit_data|n},${c.overview_data|n}); </script> %endif -</%def> +</%def> diff --git a/rhodecode/templates/switch_to_list.html b/rhodecode/templates/switch_to_list.html index c35a7049..5b415831 100644 --- a/rhodecode/templates/switch_to_list.html +++ b/rhodecode/templates/switch_to_list.html @@ -1,4 +1,4 @@ -## -*- coding: utf-8 -*- +## -*- coding: utf-8 -*- <li> ${h.link_to('%s (%s)' % (_('branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')} <ul> @@ -9,7 +9,7 @@ %else: <li>${h.link_to(_('There are no branches yet'),'#')}</li> %endif - </ul> + </ul> </li> <li> ${h.link_to('%s (%s)' % (_('tags'),len(c.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')} @@ -21,9 +21,9 @@ %else: <li>${h.link_to(_('There are no tags yet'),'#')}</li> %endif - </ul> + </ul> </li> -%if c.rhodecode_repo.alias == 'hg': +%if c.rhodecode_repo.alias == 'hg': <li> ${h.link_to('%s (%s)' % (_('bookmarks'),len(c.rhodecode_repo.bookmarks.values()),),h.url('bookmarks_home',repo_name=c.repo_name),class_='bookmarks childs')} <ul> @@ -34,6 +34,6 @@ %else: <li>${h.link_to(_('There are no bookmarks yet'),'#')}</li> %endif - </ul> -</li> -%endif
\ No newline at end of file + </ul> +</li> +%endif diff --git a/rhodecode/templates/tags/tags.html b/rhodecode/templates/tags/tags.html index f1982222..1594556d 100644 --- a/rhodecode/templates/tags/tags.html +++ b/rhodecode/templates/tags/tags.html @@ -9,7 +9,7 @@ <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter_tags" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('tags')} @@ -61,7 +61,7 @@ var myDataTable = new YAHOO.widget.DataTable("table_wrap", myColumnDefs, myDataS MSG_SORTDESC:"${_('Click to sort descending')}", MSG_EMPTY:"${_('No records found.')}", MSG_ERROR:"${_('Data error.')}", - MSG_LOADING:"${_('Loading...')}", + MSG_LOADING:"${_('Loading...')}", } ); myDataTable.subscribe('postRenderEvent',function(oArgs) { @@ -69,8 +69,8 @@ myDataTable.subscribe('postRenderEvent',function(oArgs) { var func = function(node){ return node.parentNode.parentNode.parentNode.parentNode.parentNode; } - q_filter('q_filter_tags',YUQ('div.table tr td .logtags .tagtag a'),func); -}); + q_filter('q_filter_tags',YUQ('div.table tr td .logtags .tagtag a'),func); +}); </script> -</%def>
\ No newline at end of file +</%def> diff --git a/rhodecode/templates/tags/tags_data.html b/rhodecode/templates/tags/tags_data.html index 5476c11a..82a5e6d5 100644 --- a/rhodecode/templates/tags/tags_data.html +++ b/rhodecode/templates/tags/tags_data.html @@ -1,5 +1,5 @@ %if c.repo_tags: - <div id="table_wrap" class="yui-skin-sam"> + <div id="table_wrap" class="yui-skin-sam"> <table id="tags_data"> <thead> <tr> @@ -10,7 +10,7 @@ </tr> </thead> %for cnt,tag in enumerate(c.repo_tags.items()): - <tr class="parity${cnt%2}"> + <tr class="parity${cnt%2}"> <td> <span class="logtags"> <span class="tagtag">${h.link_to(tag[0], @@ -18,7 +18,7 @@ </span> </span> </td> - <td><span class="tooltip" title="${h.age(tag[1].date)}">${tag[1].date}</span></td> + <td><span class="tooltip" title="${h.age(tag[1].date)}">${tag[1].date}</span></td> <td title="${tag[1].author}">${h.person(tag[1].author)}</td> <td> <div> @@ -31,4 +31,4 @@ </div> %else: ${_('There are no tags yet')} -%endif
\ No newline at end of file +%endif |