kallithea Changeset - cc4251628675

Changeset - cc4251628675

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Marcin Kuzminski - 15 years ago 2011-04-12 20:10:47
marcin@python-works.com

merged latest fixes for stable

6 files changed with 42 insertions and 35 deletions:

docs/changelog.rst

rhodecode/controllers/shortlog.py

rhodecode/controllers/summary.py

rhodecode/lib/celerylib/tasks.py

rhodecode/public/css/style.css

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -20,24 +20,27 @@ fixes @@
 - fixes for issues #137,#116 and #116, problems with unicode and
   accented characters.
 - fixes crashes on gravatar, when passed in email as unicode
 - fixed tooltip flickering problems
 - fixed came_from redirection on windows
 - fixed logging modules,and sql formatters
 - windows fixes for os.kill #133
 - fixes path splitting for windows issues #148
 - fixed issue #143 wrong import on migration to 1.1.X
 - fixed problems with displaying binary files, thanks to Thomas Waldmann
 - removed name from archive files since it's breaking ui for long names
 - fixed issue witg archive headers sent to browser, thanks to Thomas Waldmann
 - fixed compatibility for 1024px displays, and larger dpi settings, thanks to
   Thomas Waldmann
 - fixed issue #166 summary pager was skipping 10 revisions on second page
 .1.7 (**2011-03-23**)
 ======================
 news
 ----
 fixes
 -----
 - fixed (again) #136 installation support for FreeBSD

rhodecode/controllers/shortlog.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.shortlog
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Shortlog controller for rhodecode
     :created_on: Apr 18, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 from pylons import tmpl_context as c, request
+from pylons import tmpl_context as c, request, url
 from webhelpers.paginate import Page
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.scm import ScmModel
 log = logging.getLogger(__name__)
 class ShortlogController(BaseController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(ShortlogController, self).__before__()
     def index(self):
+    def index(self, repo_name):
         p = int(request.params.get('page', 1))
         size = int(request.params.get('size', 20))
         print repo_name
         def url_generator(**kw):
             return url('shortlog_home', repo_name=repo_name, size=size, **kw)
         repo = ScmModel().get_repo(c.repo_name)
         c.repo_changesets = Page(repo, page=p, items_per_page=20)
         c.repo_changesets = Page(repo, page=p, items_per_page=size,
                                                 url=url_generator)
         c.shortlog_data = render('shortlog/shortlog_data.html')
         if request.params.get('partial'):
             return c.shortlog_data
         r = render('shortlog/shortlog.html')
         return r

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -51,34 +51,34 @@ except ImportError: @@
     #python 2.5 compatibility
     import simplejson as json
 log = logging.getLogger(__name__)
 class SummaryController(BaseController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(SummaryController, self).__before__()
     def index(self):
+    def index(self, repo_name):
         scm_model = ScmModel()
         c.repo_info = scm_model.get_repo(c.repo_name)
         c.following = scm_model.is_following_repo(c.repo_name,
                                              c.rhodecode_user.user_id)
         def url_generator(**kw):
-            return url('shortlog_home', repo_name=c.repo_name, **kw)
+            return url('shortlog_home', repo_name=repo_name, size=10, **kw)
         c.repo_changesets = Page(c.repo_info, page=1, items_per_page=10,
                                  url=url_generator)
         c.repo_changesets = Page(c.repo_info, page=1,
                                                 items_per_page=10, url=url_generator)
         e = request.environ
         if self.rhodecode_user.username == 'default':
             password = ':default'
         else:
             password = ''
         uri = u'%(protocol)s://%(user)s%(password)s@%(host)s%(prefix)s/%(repo_name)s' % {
                                         'protocol': e.get('wsgi.url_scheme'),
                                         'user':str(c.rhodecode_user.username),
                                         'password':password,

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -199,25 +199,25 @@ def get_commits_stats(repo_name, ts_min_ @@
     stats.commit_activity = json.dumps(commits_by_day_author_aggregate)
     stats.commit_activity_combined = json.dumps(overview_data)
     log.debug('last revison %s', last_rev)
     leftovers = len(repo.revisions[last_rev:])
     log.debug('revisions to parse %s', leftovers)
     if last_rev == 0 or leftovers < parse_limit:
         log.debug('getting code trending stats')
         stats.languages = json.dumps(__get_codes_stats(repo_name))
     stats.repository = dbrepo
     stats.stat_on_revision = last_cs.revision
+    stats.stat_on_revision = last_cs.revision if last_cs else 0
     try:
         sa.add(stats)
         sa.commit()
     except:
         log.error(traceback.format_exc())
         sa.rollback()
         return False
     if len(repo.revisions) > 1:
         run_task(get_commits_stats, repo_name, ts_min_y, ts_max_y)
     return True

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -178,25 +178,25 @@ border-bottom-left-radius: 8px; @@
+}
 .bottom-right-rounded-corner {
 -webkit-border-bottom-right-radius: 8px;
 -khtml-border-radius-bottomright: 8px;
 -moz-border-radius-bottomright: 8px;
 border-bottom-right-radius: 8px;
+}
 #header {
 margin:0;
-padding:0 30px;
+padding:0 10px;
+}
 #header ul#logged-user{
 margin-bottom:5px !important;
 -webkit-border-radius: 0px 0px 8px 8px;
 -khtml-border-radius: 0px 0px 8px 8px;
 -moz-border-radius: 0px 0px 8px 8px;
 border-radius: 0px 0px 8px 8px;
 height:37px;
 background:url("../images/header_inner.png") repeat-x scroll 0 0 #003367
+}
@@ @@ -1256,25 +1256,25 @@ border:none; @@
 padding:2px 3px 3px;
+}
 #content div.box div.traffic table td.legendLabel {
 padding:0 3px 2px;
+}
 #footer {
 clear:both;
 overflow:hidden;
 text-align:right;
 margin:0;
-padding:0 30px 4px;
+padding:0 10px 4px;
 margin:-10px 0 0;
+}
 #footer div#footer-inner {
 background:url("../images/header_inner.png") repeat-x scroll 0 0 #003367;
 border-top:2px solid #FFFFFF;
+}
 #footer div#footer-inner p {
 padding:15px 25px 15px 0;
 color:#FFF;
 font-weight:700;
@@ @@ -1907,24 +1907,25 @@ margin:0; @@
 padding:2px 5px;
+}
 .ac .yui-ac-content li.yui-ac-prehighlight {
 background:#B3D4FF;
+}
 .ac .yui-ac-content li.yui-ac-highlight {
 background:#556CB5;
 color:#FFF;
+}
 .follow{
 background:url("../images/icons/heart_add.png") no-repeat scroll 3px;
 height: 16px;
 width: 20px;
 cursor: pointer;
 display: block;
 float: right;
 margin-top: 2px;
+}
 .following{
 background:url("../images/icons/heart_delete.png") no-repeat scroll 3px;
@@ @@ -1934,98 +1935,90 @@ cursor: pointer; @@
 display: block;
 float: right;
 margin-top: 2px;
+}
 .currently_following{
 padding-left: 10px;
 padding-bottom:5px;
+}
 .add_icon {
 background:url("../images/icons/add.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
-padding-top:1px;
+padding-top:0px;
 text-align:left;
+}
 .edit_icon {
 background:url("../images/icons/folder_edit.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
-padding-top:1px;
+padding-top:0px;
 text-align:left;
+}
 .delete_icon {
 background:url("../images/icons/delete.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
-padding-top:1px;
+padding-top:0px;
 text-align:left;
+}
 .refresh_icon {
 background:url("../images/icons/arrow_refresh.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
-padding-top:1px;
+padding-top:0px;
 text-align:left;
+}
 .pull_icon {
 background:url("../images/icons/connect.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
-padding-top:1px;
+padding-top:0px;
 text-align:left;
+}
 .rss_icon {
 background:url("../images/icons/rss_16.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
-padding-top:1px;
+padding-top:0px;
 text-align:left;
+}
 .atom_icon {
 background:url("../images/icons/atom.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
-padding-top:1px;
+padding-top:0px;
 text-align:left;
+}
 .archive_icon {
 background:url("../images/icons/compress.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 text-align:left;
 padding-top:1px;
+}
 .start_following_icon {
 background:url("../images/icons/heart_add.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 text-align:left;
-padding-top:1px;
+padding-top:0px;
+}
 .stop_following_icon {
 background:url("../images/icons/heart_delete.png") no-repeat scroll 3px;
 height:16px;
 padding-left:20px;
 text-align:left;
-padding-top:1px;
+padding-top:0px;
+}
 .action_button {
 border:0;
 display:block;
+}
 .action_button:hover {
 border:0;
 text-decoration:underline;
 cursor:pointer;
+}
@@ @@ -2135,32 +2128,32 @@ table#permissions_manage tr#add_perm_inp @@
 vertical-align:middle;
+}
 div.gravatar {
 background-color:#FFF;
 border:1px solid #D0D0D0;
 float:left;
 margin-right:0.7em;
 padding:2px 2px 0;
+}
 #header,#content,#footer {
-min-width:1024px;
+min-width:978px;
+}
 #content {
 min-height:100%;
 clear:both;
 overflow:hidden;
-padding:14px 30px;
+padding:14px 10px;
+}
 #content div.box div.title div.search {
 background:url("../images/title_link.png") no-repeat top left;
 border-left:1px solid #316293;
+}
 #content div.box div.title div.search div.input input {
 border:1px solid #316293;
+}
 #content div.box div.title div.search div.button input.ui-button {
@@ @@ -2216,24 +2209,28 @@ padding:0; @@
 #header #header-inner #home,#header #header-inner #logo,#content div.box ul.left,#content div.box ol.left,#content div.box div.pagination-left,div#commit_history,div#legend_data,div#legend_container,div#legend_choices {
 float:left;
+}
 #header #header-inner #quick li:hover ul ul,#header #header-inner #quick li:hover ul ul ul,#header #header-inner #quick li:hover ul ul ul ul,#content #left #menu ul.closed,#content #left #menu li ul.collapsed,.yui-tt-shadow {
 display:none;
+}
 #header #header-inner #quick li:hover ul,#header #header-inner #quick li li:hover ul,#header #header-inner #quick li li li:hover ul,#header #header-inner #quick li li li li:hover ul,#content #left #menu ul.opened,#content #left #menu li ul.expanded {
 display:block;
+}
 #content div.graph{
 padding:0 10px 10px;
+}
 #content div.box div.title ul.links li a:hover,#content div.box div.title ul.links li.ui-tabs-selected a {
 color:#bfe3ff;
+}
 #content div.box ol.lower-roman,#content div.box ol.upper-roman,#content div.box ol.lower-alpha,#content div.box ol.upper-alpha,#content div.box ol.decimal {
 margin:10px 24px 10px 44px;
+}
 #content div.box div.form,#content div.box div.table,#content div.box div.traffic {
 clear:both;
 overflow:hidden;
 margin:0;

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -238,32 +238,32 @@ @@
 			  </div>
 			 </div>
 	  </div>
 	</div>
 </div>
 <div class="box box-right"  style="min-height:455px">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Commit activity by day / author')}</h5>
     </div>
-    <div class="table">
+    <div class="graph">
          %if c.no_data:
            <div style="padding:0 10px 10px 15px;font-size: 1.2em;">${c.no_data_msg}</div>
         %endif:
-        <div id="commit_history" style="width:460px;height:300px;float:left"></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:460px;height:100px;float:left"></div>
+        <div id="overview" style="width:450px;height:100px;float:left"></div>
     	<div id="legend_data" style="clear:both;margin-top:10px;">
 	    	<div id="legend_container"></div>
 	    	<div id="legend_choices">
 				<table id="legend_choices_tables" style="font-size:smaller;color:#545454"></table>
 	    	</div>
     	</div>
 		<script type="text/javascript">
 		/**
 		 * Plots summary graph
+		 *
 		 * @class SummaryPlot

0 comments (0 inline, 0 general)