##// END OF EJS Templates
merged latest fixes for stable
marcink -
r1250:cc425162 default
parent child Browse files
Show More
@@ -29,6 +29,9 b' fixes'
29 - fixed problems with displaying binary files, thanks to Thomas Waldmann
29 - fixed problems with displaying binary files, thanks to Thomas Waldmann
30 - removed name from archive files since it's breaking ui for long names
30 - removed name from archive files since it's breaking ui for long names
31 - fixed issue witg archive headers sent to browser, thanks to Thomas Waldmann
31 - fixed issue witg archive headers sent to browser, thanks to Thomas Waldmann
32 - fixed compatibility for 1024px displays, and larger dpi settings, thanks to
33 Thomas Waldmann
34 - fixed issue #166 summary pager was skipping 10 revisions on second page
32
35
33 1.1.7 (**2011-03-23**)
36 1.1.7 (**2011-03-23**)
34 ======================
37 ======================
@@ -7,7 +7,7 b''
7
7
8 :created_on: Apr 18, 2010
8 :created_on: Apr 18, 2010
9 :author: marcink
9 :author: marcink
10 :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
10 :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
11 :license: GPLv3, see COPYING for more details.
11 :license: GPLv3, see COPYING for more details.
12 """
12 """
13 # This program is free software: you can redistribute it and/or modify
13 # This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 b''
25
25
26 import logging
26 import logging
27
27
28 from pylons import tmpl_context as c, request
28 from pylons import tmpl_context as c, request, url
29
29
30 from webhelpers.paginate import Page
30 from webhelpers.paginate import Page
31
31
@@ -43,10 +43,17 b' class ShortlogController(BaseController)'
43 def __before__(self):
43 def __before__(self):
44 super(ShortlogController, self).__before__()
44 super(ShortlogController, self).__before__()
45
45
46 def index(self):
46 def index(self, repo_name):
47 p = int(request.params.get('page', 1))
47 p = int(request.params.get('page', 1))
48 size = int(request.params.get('size', 20))
49
50 print repo_name
51 def url_generator(**kw):
52 return url('shortlog_home', repo_name=repo_name, size=size, **kw)
53
48 repo = ScmModel().get_repo(c.repo_name)
54 repo = ScmModel().get_repo(c.repo_name)
49 c.repo_changesets = Page(repo, page=p, items_per_page=20)
55 c.repo_changesets = Page(repo, page=p, items_per_page=size,
56 url=url_generator)
50 c.shortlog_data = render('shortlog/shortlog_data.html')
57 c.shortlog_data = render('shortlog/shortlog_data.html')
51 if request.params.get('partial'):
58 if request.params.get('partial'):
52 return c.shortlog_data
59 return c.shortlog_data
@@ -60,16 +60,16 b' class SummaryController(BaseController):'
60 def __before__(self):
60 def __before__(self):
61 super(SummaryController, self).__before__()
61 super(SummaryController, self).__before__()
62
62
63 def index(self):
63 def index(self, repo_name):
64 scm_model = ScmModel()
64 scm_model = ScmModel()
65 c.repo_info = scm_model.get_repo(c.repo_name)
65 c.repo_info = scm_model.get_repo(c.repo_name)
66 c.following = scm_model.is_following_repo(c.repo_name,
66 c.following = scm_model.is_following_repo(c.repo_name,
67 c.rhodecode_user.user_id)
67 c.rhodecode_user.user_id)
68 def url_generator(**kw):
68 def url_generator(**kw):
69 return url('shortlog_home', repo_name=c.repo_name, **kw)
69 return url('shortlog_home', repo_name=repo_name, size=10, **kw)
70
70
71 c.repo_changesets = Page(c.repo_info, page=1, items_per_page=10,
71 c.repo_changesets = Page(c.repo_info, page=1,
72 url=url_generator)
72 items_per_page=10, url=url_generator)
73
73
74 e = request.environ
74 e = request.environ
75
75
@@ -208,7 +208,7 b' def get_commits_stats(repo_name, ts_min_'
208 stats.languages = json.dumps(__get_codes_stats(repo_name))
208 stats.languages = json.dumps(__get_codes_stats(repo_name))
209
209
210 stats.repository = dbrepo
210 stats.repository = dbrepo
211 stats.stat_on_revision = last_cs.revision
211 stats.stat_on_revision = last_cs.revision if last_cs else 0
212
212
213 try:
213 try:
214 sa.add(stats)
214 sa.add(stats)
@@ -187,7 +187,7 b' border-bottom-right-radius: 8px;'
187
187
188 #header {
188 #header {
189 margin:0;
189 margin:0;
190 padding:0 30px;
190 padding:0 10px;
191 }
191 }
192
192
193
193
@@ -1265,7 +1265,7 b' clear:both;'
1265 overflow:hidden;
1265 overflow:hidden;
1266 text-align:right;
1266 text-align:right;
1267 margin:0;
1267 margin:0;
1268 padding:0 30px 4px;
1268 padding:0 10px 4px;
1269 margin:-10px 0 0;
1269 margin:-10px 0 0;
1270 }
1270 }
1271
1271
@@ -1916,6 +1916,7 b' background:#556CB5;'
1916 color:#FFF;
1916 color:#FFF;
1917 }
1917 }
1918
1918
1919
1919 .follow{
1920 .follow{
1920 background:url("../images/icons/heart_add.png") no-repeat scroll 3px;
1921 background:url("../images/icons/heart_add.png") no-repeat scroll 3px;
1921 height: 16px;
1922 height: 16px;
@@ -1943,80 +1944,72 b' padding-bottom:5px;'
1943
1944
1944 .add_icon {
1945 .add_icon {
1945 background:url("../images/icons/add.png") no-repeat scroll 3px;
1946 background:url("../images/icons/add.png") no-repeat scroll 3px;
1946 height:16px;
1947 padding-left:20px;
1947 padding-left:20px;
1948 padding-top:1px;
1948 padding-top:0px;
1949 text-align:left;
1949 text-align:left;
1950 }
1950 }
1951
1951
1952 .edit_icon {
1952 .edit_icon {
1953 background:url("../images/icons/folder_edit.png") no-repeat scroll 3px;
1953 background:url("../images/icons/folder_edit.png") no-repeat scroll 3px;
1954 height:16px;
1955 padding-left:20px;
1954 padding-left:20px;
1956 padding-top:1px;
1955 padding-top:0px;
1957 text-align:left;
1956 text-align:left;
1958 }
1957 }
1959
1958
1960 .delete_icon {
1959 .delete_icon {
1961 background:url("../images/icons/delete.png") no-repeat scroll 3px;
1960 background:url("../images/icons/delete.png") no-repeat scroll 3px;
1962 height:16px;
1963 padding-left:20px;
1961 padding-left:20px;
1964 padding-top:1px;
1962 padding-top:0px;
1965 text-align:left;
1963 text-align:left;
1966 }
1964 }
1967
1965
1968 .refresh_icon {
1966 .refresh_icon {
1969 background:url("../images/icons/arrow_refresh.png") no-repeat scroll 3px;
1967 background:url("../images/icons/arrow_refresh.png") no-repeat scroll 3px;
1970 height:16px;
1971 padding-left:20px;
1968 padding-left:20px;
1972 padding-top:1px;
1969 padding-top:0px;
1973 text-align:left;
1970 text-align:left;
1974 }
1971 }
1975
1972
1976 .pull_icon {
1973 .pull_icon {
1977 background:url("../images/icons/connect.png") no-repeat scroll 3px;
1974 background:url("../images/icons/connect.png") no-repeat scroll 3px;
1978 height:16px;
1979 padding-left:20px;
1975 padding-left:20px;
1980 padding-top:1px;
1976 padding-top:0px;
1981 text-align:left;
1977 text-align:left;
1982 }
1978 }
1983
1979
1984 .rss_icon {
1980 .rss_icon {
1985 background:url("../images/icons/rss_16.png") no-repeat scroll 3px;
1981 background:url("../images/icons/rss_16.png") no-repeat scroll 3px;
1986 height:16px;
1987 padding-left:20px;
1982 padding-left:20px;
1988 padding-top:1px;
1983 padding-top:0px;
1989 text-align:left;
1984 text-align:left;
1990 }
1985 }
1991
1986
1992 .atom_icon {
1987 .atom_icon {
1993 background:url("../images/icons/atom.png") no-repeat scroll 3px;
1988 background:url("../images/icons/atom.png") no-repeat scroll 3px;
1994 height:16px;
1995 padding-left:20px;
1989 padding-left:20px;
1996 padding-top:1px;
1990 padding-top:0px;
1997 text-align:left;
1991 text-align:left;
1998 }
1992 }
1999
1993
2000 .archive_icon {
1994 .archive_icon {
2001 background:url("../images/icons/compress.png") no-repeat scroll 3px;
1995 background:url("../images/icons/compress.png") no-repeat scroll 3px;
2002 height:16px;
2003 padding-left:20px;
1996 padding-left:20px;
2004 text-align:left;
1997 text-align:left;
2005 padding-top:1px;
1998 padding-top:1px;
2006 }
1999 }
2000
2007 .start_following_icon {
2001 .start_following_icon {
2008 background:url("../images/icons/heart_add.png") no-repeat scroll 3px;
2002 background:url("../images/icons/heart_add.png") no-repeat scroll 3px;
2009 height:16px;
2010 padding-left:20px;
2003 padding-left:20px;
2011 text-align:left;
2004 text-align:left;
2012 padding-top:1px;
2005 padding-top:0px;
2013 }
2006 }
2007
2014 .stop_following_icon {
2008 .stop_following_icon {
2015 background:url("../images/icons/heart_delete.png") no-repeat scroll 3px;
2009 background:url("../images/icons/heart_delete.png") no-repeat scroll 3px;
2016 height:16px;
2017 padding-left:20px;
2010 padding-left:20px;
2018 text-align:left;
2011 text-align:left;
2019 padding-top:1px;
2012 padding-top:0px;
2020 }
2013 }
2021
2014
2022 .action_button {
2015 .action_button {
@@ -2144,14 +2137,14 b' padding:2px 2px 0;'
2144 }
2137 }
2145
2138
2146 #header,#content,#footer {
2139 #header,#content,#footer {
2147 min-width:1024px;
2140 min-width:978px;
2148 }
2141 }
2149
2142
2150 #content {
2143 #content {
2151 min-height:100%;
2144 min-height:100%;
2152 clear:both;
2145 clear:both;
2153 overflow:hidden;
2146 overflow:hidden;
2154 padding:14px 30px;
2147 padding:14px 10px;
2155 }
2148 }
2156
2149
2157 #content div.box div.title div.search {
2150 #content div.box div.title div.search {
@@ -2225,6 +2218,10 b' display:none;'
2225 display:block;
2218 display:block;
2226 }
2219 }
2227
2220
2221 #content div.graph{
2222 padding:0 10px 10px;
2223 }
2224
2228 #content div.box div.title ul.links li a:hover,#content div.box div.title ul.links li.ui-tabs-selected a {
2225 #content div.box div.title ul.links li a:hover,#content div.box div.title ul.links li.ui-tabs-selected a {
2229 color:#bfe3ff;
2226 color:#bfe3ff;
2230 }
2227 }
@@ -247,14 +247,14 b''
247 <h5>${_('Commit activity by day / author')}</h5>
247 <h5>${_('Commit activity by day / author')}</h5>
248 </div>
248 </div>
249
249
250 <div class="table">
250 <div class="graph">
251
251
252 %if c.no_data:
252 %if c.no_data:
253 <div style="padding:0 10px 10px 15px;font-size: 1.2em;">${c.no_data_msg}</div>
253 <div style="padding:0 10px 10px 15px;font-size: 1.2em;">${c.no_data_msg}</div>
254 %endif:
254 %endif:
255 <div id="commit_history" style="width:460px;height:300px;float:left"></div>
255 <div id="commit_history" style="width:450px;height:300px;float:left"></div>
256 <div style="clear: both;height: 10px"></div>
256 <div style="clear: both;height: 10px"></div>
257 <div id="overview" style="width:460px;height:100px;float:left"></div>
257 <div id="overview" style="width:450px;height:100px;float:left"></div>
258
258
259 <div id="legend_data" style="clear:both;margin-top:10px;">
259 <div id="legend_data" style="clear:both;margin-top:10px;">
260 <div id="legend_container"></div>
260 <div id="legend_container"></div>
General Comments 0
You need to be logged in to leave comments. Login now