##// END OF EJS Templates
white space cleanup
marcink -
r2673:d5e42c00 beta
parent child Browse files
Show More
@@ -140,4 +140,3 b' class CleanupCommand(BasePasterCommand):'
140 140 action='store_true',
141 141 dest='dont_ask',
142 142 help=("Don't ask to remove repos"))
143 No newline at end of file
@@ -238,7 +238,7 b' class WhooshResultWrapper(object):'
238 238 :param size:
239 239 """
240 240 memory = [(0, 0)]
241 if self.matcher.supports('positions'):
241 if self.matcher.supports('positions'):
242 242 for span in self.matcher.spans():
243 243 start = span.startchar or 0
244 244 end = span.endchar or 0
@@ -73,7 +73,7 b' class SimpleHg(BaseVCSController):'
73 73 return HTTPNotAcceptable('SSL REQUIRED !')(environ, start_response)
74 74
75 75 ipaddr = self._get_ip_addr(environ)
76 username = None
76 username = None
77 77 # skip passing error to error controller
78 78 environ['pylons.status_code_redirect'] = True
79 79
@@ -16,4 +16,4 b' class CachedDnsName(object):'
16 16 self._fqdn = socket.getfqdn()
17 17 return self._fqdn
18 18
19 DNS_NAME = CachedDnsName() No newline at end of file
19 DNS_NAME = CachedDnsName()
@@ -24,7 +24,7 b''
24 24 ## </li>
25 25 ##</ul>
26 26 </div>
27
27
28 28 <div style="padding:14px 18px;text-align: right;float:left">
29 29 <span id='all' class="ui-btn"><a href="${h.url.current()}">${_('All')}</a></span>
30 30 <span id='comment' class="ui-btn"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>
@@ -21,7 +21,7 b" unread = lambda n:{False:'unread'}.get(n"
21 21 %if not notification.read:
22 22 <div class="read-notifications">
23 23 <span id="${notification.notification.notification_id}" class="read-notification accept_icon action"></span>
24 </div>
24 </div>
25 25 %endif
26 26 </div>
27 27 <div class="notification-subject">${h.literal(notification.notification.subject)}</div>
@@ -24,7 +24,7 b''
24 24 </div>
25 25 <div class="table yui-skin-sam" id="repos_list_wrap"></div>
26 26 <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
27
27
28 28
29 29 </div>
30 30 <script>
@@ -49,7 +49,7 b''
49 49 var data = res.results || [],
50 50 filtered = [],
51 51 i,l;
52
52
53 53 if (req) {
54 54 req = req.toLowerCase();
55 55 for (i = 0; i<data.length; i++) {
@@ -102,7 +102,7 b''
102 102 tooltip_activate();
103 103 quick_repo_menu();
104 104 });
105
105
106 106 var filterTimeout = null;
107 107
108 108 updateFilter = function () {
@@ -121,7 +121,7 b''
121 121 argument: state
122 122 });
123 123
124 };
124 };
125 125 YUE.on('q_filter','click',function(){
126 126 YUD.get('q_filter').value = '';
127 127 });
@@ -129,7 +129,7 b''
129 129 YUE.on('q_filter','keyup',function (e) {
130 130 clearTimeout(filterTimeout);
131 131 filterTimeout = setTimeout(updateFilter,600);
132 });
132 });
133 133 </script>
134 134
135 135 </%def>
@@ -206,7 +206,7 b''
206 206 <a href="${h.url('edit_repos_group',id=k,anchor='permissions_manage')}">${_('edit')}</a>
207 207 %else:
208 208 --
209 %endif
209 %endif
210 210 </td>
211 211 </tr>
212 212 %endfor
@@ -95,7 +95,7 b''
95 95 %endfor
96 96 </div>
97 97 <div id="my" class="table" style="display:none">
98 </div>
98 </div>
99 99 <div id="pullrequests" class="table" style="display:none">
100 100 </div>
101 101 <script type="text/javascript">
@@ -110,7 +110,7 b" YUE.on('show_perms','click',function(e){"
110 110 YUD.addClass('show_perms', 'current');
111 111 YUD.removeClass('show_my','current');
112 112 YUD.removeClass('show_pullrequests','current');
113
113
114 114 YUD.setStyle('my','display','none');
115 115 YUD.setStyle('pullrequests','display','none');
116 116 YUD.setStyle('perms','display','');
@@ -121,12 +121,12 b" YUE.on('show_my','click',function(e){"
121 121 YUD.addClass('show_my', 'current');
122 122 YUD.removeClass('show_perms','current');
123 123 YUD.removeClass('show_pullrequests','current');
124
124
125 125 YUD.setStyle('perms','display','none');
126 126 YUD.setStyle('pullrequests','display','none');
127 127 YUD.setStyle('my','display','');
128 128 YUD.setStyle('q_filter','display','');
129
129
130 130 YUE.preventDefault(e);
131 131 var url = "${h.url('admin_settings_my_repos')}";
132 132 ypjax(url, 'my', function(){
@@ -43,4 +43,4 b''
43 43 %endif
44 44 </tbody>
45 45 </table>
46 </div> No newline at end of file
46 </div>
@@ -17,7 +17,7 b''
17 17 <div class="box">
18 18 <!-- box / title -->
19 19 <div class="title">
20 ${self.breadcrumbs()}
20 ${self.breadcrumbs()}
21 21 <ul class="links">
22 22 <li>
23 23 <span>${h.link_to(_(u'ADD NEW USER'),h.url('new_user'))}</span>
@@ -55,7 +55,7 b''
55 55 var data = res.results || [],
56 56 filtered = [],
57 57 i,l;
58
58
59 59 if (req) {
60 60 req = req.toLowerCase();
61 61 for (i = 0; i<data.length; i++) {
@@ -72,7 +72,7 b''
72 72
73 73 // main table sorting
74 74 var myColumnDefs = [
75 {key:"gravatar",label:"",sortable:false,},
75 {key:"gravatar",label:"",sortable:false,},
76 76 {key:"username",label:"${_('username')}",sortable:true,
77 77 sortOptions: { sortFunction: linkSort }
78 78 },
@@ -112,7 +112,7 b''
112 112 myDataTable.subscribe('postRenderEvent',function(oArgs) {
113 113
114 114 });
115
115
116 116 var filterTimeout = null;
117 117
118 118 updateFilter = function () {
@@ -131,7 +131,7 b''
131 131 argument: state
132 132 });
133 133
134 };
134 };
135 135 YUE.on('q_filter','click',function(){
136 136 YUD.get('q_filter').value = '';
137 137 });
@@ -139,7 +139,7 b''
139 139 YUE.on('q_filter','keyup',function (e) {
140 140 clearTimeout(filterTimeout);
141 141 filterTimeout = setTimeout(updateFilter,600);
142 });
142 });
143 143 </script>
144 144
145 145 </%def>
@@ -126,7 +126,7 b''
126 126 var _USERS_AC_DATA = ${c.users_array|n};
127 127 var _GROUPS_AC_DATA = ${c.users_groups_array|n};
128 128 AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}";
129 AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
129 AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
130 130 </script>
131 131 ## diff block
132 132 <%namespace name="diff_block" file="/changeset/diff_block.html"/>
@@ -105,7 +105,7 b''
105 105 ${comment_block(co)}
106 106 </div>
107 107 %endfor
108 </div>
108 </div>
109 109 </%def>
110 110
111 111 ## MAIN COMMENT FORM
@@ -72,7 +72,7 b''
72 72 <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a>
73 73 <div class="gravatar">
74 74 <img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/>
75 </div>
75 </div>
76 76 </h3>
77 77 ${diff_block.diff_block(c.changes[cs.raw_id])}
78 78 ##${comment.comments(cs)}
@@ -6,7 +6,7 b''
6 6 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7 7 <meta name="robots" content="index, nofollow"/>
8 8 <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
9
9
10 10 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
11 11 %if c.redirect_time:
12 12 <meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/>
@@ -44,7 +44,7 b''
44 44 ${h.select('landing_rev','',c.landing_revs,class_="medium")}
45 45 <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span>
46 46 </div>
47 </div>
47 </div>
48 48 <div class="field">
49 49 <div class="label">
50 50 <label for="repo_group">${_('Repository group')}:</label>
@@ -16,8 +16,8 b''
16 16 <div style="clear:both;padding-top: 10px"></div>
17 17 <div class="follower_date">${_('forked')} -
18 18 <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
19 <a title="${_('compare fork with %s' % c.repo_name)}"
20 href="${h.url('compare_url',repo_name=f.repo_name,org_ref_type='branch',org_ref='default',other_ref_type='branch',other_ref='default', repo=c.repo_name)}"
19 <a title="${_('compare fork with %s' % c.repo_name)}"
20 href="${h.url('compare_url',repo_name=f.repo_name,org_ref_type='branch',org_ref='default',other_ref_type='branch',other_ref='default', repo=c.repo_name)}"
21 21 class="ui-btn small">${_('Compare fork')}</a>
22 22 </div>
23 23 <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
@@ -83,13 +83,13 b''
83 83 </li>
84 84 %endfor
85 85 </ul>
86 </div>
87
86 </div>
87
88 88 <div class='ac'>
89 89 <div class="reviewer_ac">
90 90 ${h.text('user', class_='yui-ac-input')}
91 91 <span class="help-block">${_('Add reviewer to this pull request.')}</span>
92 <div id="reviewers_container"></div>
92 <div id="reviewers_container"></div>
93 93 </div>
94 94 </div>
95 95 </div>
@@ -21,12 +21,12 b''
21 21 </div>
22 22 %if c.pull_request.is_closed():
23 23 <div style="padding:10px; font-size:22px;width:100%;text-align: center; color:#88D882">${_('Closed %s') % (h.age(c.pull_request.updated_on))}</div>
24 %endif
25 <h3>${_('Title')}: ${c.pull_request.title}
24 %endif
25 <h3>${_('Title')}: ${c.pull_request.title}
26 26 <div class="changeset-status-container" style="float:none">
27 27 %if c.current_changeset_status:
28 28 <div title="${_('Pull request status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
29 <div class="changeset-status-ico" style="padding:4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
29 <div class="changeset-status-ico" style="padding:4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
30 30 %endif
31 31 </div>
32 32 </h3>
@@ -45,7 +45,7 b''
45 45 ##CS
46 46 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Incoming changesets')}</div>
47 47 <%include file="/compare/compare_cs.html" />
48
48
49 49 ## FILES
50 50 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
51 51 <div class="cs_files">
@@ -70,7 +70,7 b''
70 70 <div class="reviewers_member">
71 71 <div style="float:left;padding:0px 3px 0px 0px" class="tooltip" title="${h.tooltip(h.changeset_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
72 72 <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>
73 </div>
73 </div>
74 74 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>
75 75 <div style="float:left">${member.full_name} (${_('owner')})</div>
76 76 <input type="hidden" value="${member.user_id}" name="review_members" />
@@ -81,21 +81,21 b''
81 81 </li>
82 82 %endfor
83 83 </ul>
84 </div>
84 </div>
85 85 %if not c.pull_request.is_closed():
86 86 <div class='ac'>
87 87 <div class="reviewer_ac">
88 88 ${h.text('user', class_='yui-ac-input')}
89 89 <span class="help-block">${_('Add reviewer to this pull request.')}</span>
90 <div id="reviewers_container"></div>
90 <div id="reviewers_container"></div>
91 91 </div>
92 92 <div style="padding:0px 10px">
93 93 <span id="update_pull_request" class="ui-btn xsmall">${_('save')}</span>
94 94 </div>
95 95 </div>
96 96 %endif
97 </div>
98 </div>
97 </div>
98 </div>
99 99 </div>
100 100 <script>
101 101 var _USERS_AC_DATA = ${c.users_array|n};
@@ -114,10 +114,10 b''
114 114 ## template for inline comment form
115 115 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
116 116 ${comment.comment_inline_form()}
117
117
118 118 ## render comments and inlines
119 119 ${comment.generate_comments()}
120
120
121 121 % if not c.pull_request.is_closed():
122 122 ## main comment form and it status
123 123 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
@@ -155,9 +155,9 b''
155 155 // inject comments into they proper positions
156 156 var file_comments = YUQ('.inline-comment-placeholder');
157 157 renderInlineComments(file_comments);
158
158
159 159 YUE.on(YUD.get('update_pull_request'),'click',function(e){
160
160
161 161 var reviewers_ids = [];
162 162 var ids = YUQ('#review_members input');
163 163 for(var i=0; i<ids.length;i++){
@@ -25,7 +25,7 b''
25 25 <h4>
26 26 %if pr.is_closed():
27 27 <img src="${h.url('/images/icons/tick.png')}" alt="${_('Closed')}" />
28 %endif
28 %endif
29 29 <a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}">
30 30 ${_('Pull request #%s opened by %s on %s') % (pr.pull_request_id, pr.author.full_name, h.fmt_date(pr.created_on))}
31 31 </a>
@@ -60,7 +60,7 b''
60 60 ${h.select('landing_rev','',c.landing_revs,class_="medium")}
61 61 <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span>
62 62 </div>
63 </div>
63 </div>
64 64 <div class="field">
65 65 <div class="label label-textarea">
66 66 <label for="description">${_('Description')}:</label>
@@ -83,6 +83,6 b''
83 83 git push -u origin master
84 84 %else:
85 85 hg push ${c.clone_repo_url}
86 %endif
86 %endif
87 87 </pre>
88 88 %endif
@@ -988,4 +988,3 b' class BaseTestApi(object):'
988 988 TEST_USERS_GROUP, self.REPO
989 989 )
990 990 self._compare_error(id_, expected, given=response.body)
991
@@ -4,4 +4,4 b' from rhodecode.tests.api.api_base import'
4 4
5 5 class TestHgApi(BaseTestApi, TestController):
6 6 REPO = HG_REPO
7 REPO_TYPE = 'hg' No newline at end of file
7 REPO_TYPE = 'hg'
@@ -263,4 +263,4 b' class TestAdminSettingsController(TestCo'
263 263 id_fork_of=repo.repo_id
264 264 ))
265 265 self.checkSessionFlash(response,
266 'An error occurred during this operation') No newline at end of file
266 'An error occurred during this operation')
@@ -185,7 +185,3 b' class TestNotifications(unittest.TestCas'
185 185 .get_unread_cnt_for_user(self.u2), 1)
186 186 self.assertEqual(NotificationModel()
187 187 .get_unread_cnt_for_user(self.u3), 2)
188
189
190
191
@@ -167,4 +167,4 b' class TestReposGroups(unittest.TestCase)'
167 167 # we moved out group from t1 to '' so it's full path should be 'g2'
168 168 self.assertEqual(g2.full_path, 'g22')
169 169 self.assertFalse(self.__check_path('t11', 't22'))
170 self.assertTrue(self.__check_path('g22')) No newline at end of file
170 self.assertTrue(self.__check_path('g22'))
General Comments 0
You need to be logged in to leave comments. Login now