kallithea Changeset - 32318ec7bfc1

Changeset - 32318ec7bfc1

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-01-13 23:35:46
marcin@python-works.com

added branch/tag options to download links in summary

3 files changed with 75 insertions and 40 deletions:

rhodecode/controllers/files.py

rhodecode/controllers/summary.py

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -128,57 +128,65 @@ class FilesController(BaseController): @@
         c.repo = hg_model.get_repo(c.repo_name)
         file_node = c.repo.get_changeset(revision).get_node(f_path)
         response.content_type = 'text/plain'
         return file_node.content
     def annotate(self, repo_name, revision, f_path):
         hg_model = ScmModel()
         c.repo = hg_model.get_repo(c.repo_name)
         try:
             c.cs = c.repo.get_changeset(revision)
             c.file = c.cs.get_node(f_path)
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name, revision=revision))
         c.file_history = self._get_history(c.repo, c.file, f_path)
         c.f_path = f_path
         return render('files/files_annotate.html')
     def archivefile(self, repo_name, fname):
         info = fname.split('.')
         revision, fileformat = info[0], '.' + '.'.join(info[1:])
         archive_specs = {
           '.tar.bz2': ('application/x-tar', 'tbz2'),
           '.tar.gz': ('application/x-tar', 'tgz'),
           '.zip': ('application/zip', 'zip'),
+        }
         fileformat = None
         revision = None
         for ext in archive_specs.keys():
             archive_spec = fname.split(ext)
             if len(archive_spec) == 2:
                 fileformat = archive_spec[1] or ext
                 revision = archive_spec[0]
         if not archive_specs.has_key(fileformat):
-            return _('Unknown archive type %s') % fileformat
             return _('Unknown archive type')
         repo = ScmModel().get_repo(repo_name)
         try:
             repo.get_changeset(revision)
         except ChangesetDoesNotExistError:
             return _('Unknown revision %s') % revision
         archive = tempfile.TemporaryFile()
         localrepo = repo.repo
         fname = '%s-%s%s' % (repo_name, revision, fileformat)
         archival.archive(localrepo, archive, revision, archive_specs[fileformat][1],
                          prefix='%s-%s' % (repo_name, revision))
         response.content_type = archive_specs[fileformat][0]
         response.content_disposition = 'attachment; filename=%s' % fname
         archive.seek(0)
         def read_in_chunks(file_object, chunk_size=1024 * 40):
             """Lazy function (generator) to read a file piece by piece.
             Default chunk size: 40k."""
             while True:
                 data = file_object.read(chunk_size)
                 if not data:
                     break

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -121,26 +121,48 @@ class SummaryController(BaseController): @@
         c.ts_min = ts_min_m
         c.ts_max = ts_max_y
         stats = self.sa.query(Statistics)\
             .filter(Statistics.repository == c.repo_info.dbrepo)\
             .scalar()
         if stats and stats.languages:
             c.no_data = False is c.repo_info.dbrepo.enable_statistics
             lang_stats = json.loads(stats.languages)
             c.commit_data = stats.commit_activity
             c.overview_data = stats.commit_activity_combined
             c.trending_languages = json.dumps(OrderedDict(
                                        sorted(lang_stats.items(), reverse=True,
                                             key=lambda k: k[1])[:10]
+                                        )
+                                    )
         else:
             c.commit_data = json.dumps({})
             c.overview_data = json.dumps([[ts_min_y, 0], [ts_max_y, 10] ])
             c.trending_languages = json.dumps({})
             c.no_data = True
         c.download_options = self._get_download_links(c.repo_info)
         return render('summary/summary.html')
     def _get_download_links(self, repo):
         download_l = []
         branches_group = ([], _("Branches"))
         tags_group = ([], _("Tags"))
         for name, chs in c.repository_branches.items():
             #chs = chs.split(':')[-1]
             branches_group[0].append((chs, name),)
         download_l.append(branches_group)
         for name, chs in c.repository_tags.items():
             #chs = chs.split(':')[-1]
             tags_group[0].append((chs, name),)
         download_l.append(tags_group)
         return download_l

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -98,51 +98,82 @@ @@
 			  <div class="label">
 			      <label>${_('Last change')}:</label>
 			  </div>
 			  <div class="input-short">
 			      ${h.age(c.repo_info.last_change)} - ${c.repo_info.last_change}
 			      ${_('by')} ${h.get_changeset_safe(c.repo_info,'tip').author}
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Clone url')}:</label>
 			  </div>
 			  <div class="input-short">
 			      <input type="text" id="clone_url" readonly="readonly" value="hg clone ${c.clone_repo_url}" size="70"/>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Trending source files')}:</label>
 			  </div>
 			  <div class="input-short">
 			    <div id="lang_stats">
 			    </div>
 			    <div id="lang_stats"></div>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Download')}:</label>
 			  </div>
 			  <div class="input-short">
 		        ${h.select('download_options','tip',c.download_options)}
 		        %for cnt,archive in enumerate(c.repo_info._get_archives()):
 		             %if cnt >=1:
+		             |
 		             %endif
 		             ${h.link_to(archive['type'],
 		                h.url('files_archive_home',repo_name=c.repo_info.name,
 		                fname='tip'+archive['extension']),class_="archive_icon")}
 		        %endfor
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Feeds')}:</label>
 			  </div>
 			  <div class="input-short">
 	            ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo_info.name),class_='rss_icon')}
 	            ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo_info.name),class_='atom_icon')}
 			  </div>
 			 </div>
 	  </div>
 	</div>
 			  	<script type="text/javascript">
 				  	YUE.onDOMReady(function(e){
 				  	    id = 'clone_url';
 				  	    YUE.on(id,'click',function(e){
 				  	        YUD.get('clone_url').select();
 				  	    })
 				  	})
 			  		var data = ${c.trending_languages|n};
 			  		var total = 0;
 			  		var no_data = true;
 			  		for (k in data){
 			  		    total += data[k];
 			  		    no_data = false;
+			  		}
 					var tbl = document.createElement('table');
 					tbl.setAttribute('class','trending_language_tbl');
 					var cnt =0;
 			  		for (k in data){
 			  			cnt+=1;
 			  			var hide = cnt>2;
 				  		var tr = document.createElement('tr');
 				  		if (hide){
 				  			tr.setAttribute('style','display:none');
 				  			tr.setAttribute('class','stats_hidden');
@@ @@ -185,81 +216,55 @@ @@
 			  		    	lnk.id='code_stats_show_more';
 			  		        td.appendChild(lnk);
 			  		    	show_more.appendChild(td);
 			  		    	show_more.appendChild(document.createElement('td'));
 			  		    	tbl.appendChild(show_more);
+			  		    }
+			  		}
 			  		if(no_data){
 			  			var tr = document.createElement('tr');
 			  			var td1 = document.createElement('td');
 			  			td1.innerHTML = "${c.no_data_msg}";
 			  			tr.appendChild(td1);
 			  			tbl.appendChild(tr);
+					}
 			  		YUD.get('lang_stats').appendChild(tbl);
 			  		YUE.on('code_stats_show_more','click',function(){
 			  			l = YUD.getElementsByClassName('stats_hidden')
 			  			for (e in l){
 			  			    YUD.setStyle(l[e],'display','');
 			  			};
 			  			YUD.setStyle(YUD.get('code_stats_show_more'),
 			  					'display','none');
 			  		})
 			  	</script>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Download')}:</label>
 			  </div>
 			  <div class="input-short">
 		        %for cnt,archive in enumerate(c.repo_info._get_archives()):
 		             %if cnt >=1:
+		             |
 		             %endif
 		             ${h.link_to(c.repo_info.name+'.'+archive['type'],
 		                h.url('files_archive_home',repo_name=c.repo_info.name,
 		                fname='tip'+archive['extension']),class_="archive_icon")}
 		        %endfor
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Feeds')}:</label>
 			  </div>
 			  <div class="input-short">
 	            ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo_info.name),class_='rss_icon')}
 	            ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo_info.name),class_='atom_icon')}
 			  </div>
 			 </div>
 	  </div>
 	</div>
                 YUE.on('download_options','change',function(e){
                     var new_cs = e.target.options[e.target.selectedIndex].value;
                 })
 			  	</script>
 </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">
          %if c.no_data:
            <div style="padding:0 10px 10px 15px;font-size: 1.2em;">${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))}]
            %endif
            </div>
         %endif:
         <div id="commit_history" style="width:460px;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="legend_data" style="clear:both;margin-top:10px;">
 	    	<div id="legend_container"></div>
 	    	<div id="legend_choices">
@@ @@ -623,25 +628,25 @@ @@
 </div>
 <div class="box">
     <div class="title">
         <div class="breadcrumbs">${h.link_to(_('Tags'),h.url('tags_home',repo_name=c.repo_name))}</div>
     </div>
     <div class="table">
         <%include file='../tags/tags_data.html'/>
         %if c.repo_changesets:
         	${h.link_to(_('show more'),h.url('tags_home',repo_name=c.repo_name))}
         %endif
     </div>
 </div>
 <div class="box">
     <div class="title">
         <div class="breadcrumbs">${h.link_to(_('Branches'),h.url('branches_home',repo_name=c.repo_name))}</div>
     </div>
     <div class="table">
         <%include file='../branches/branches_data.html'/>
         %if c.repo_changesets:
         	${h.link_to(_('show more'),h.url('branches_home',repo_name=c.repo_name))}
         %endif
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@
 </%def>

0 comments (0 inline, 0 general)