kallithea Changeset - 63212fea2471

Changeset - 63212fea2471

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Marcin Kuzminski - 15 years ago 2010-09-29 22:36:53
marcin@python-works.com

a lot of fixes in templates,
added options to each repository showing fork/serach/settings fixed emtpy changeset (again !)

7 files changed with 64 insertions and 19 deletions:

pylons_app/lib/utils.py

pylons_app/public/css/style.css

pylons_app/templates/admin/repos/repo_add.html

pylons_app/templates/base/base.html

pylons_app/templates/index.html

pylons_app/templates/settings/repo_settings.html

pylons_app/templates/summary/summary.html

0 comments (0 inline, 0 general)

pylons_app/lib/utils.py

➞

Show inline comments

@@ @@ -184,98 +184,99 @@ def make_ui(read_from='file', path=None, @@
                 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, ui_.ui_key, ui_.ui_value)
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value)
     return baseui
 def set_hg_app_config(config):
     hgsettings = get_hg_settings()
     for k, v in hgsettings.items():
         config[k] = v
 def invalidate_cache(name, *args):
     """Invalidates given name cache"""
     from beaker.cache import region_invalidate
     log.info('INVALIDATING CACHE FOR %s', name)
     """propagate our arguments to make sure invalidation works. First
     argument has to be the name of cached func name give to cache decorator
     without that the invalidation would not work"""
     tmp = [name]
     tmp.extend(args)
     args = tuple(tmp)
     if name == 'cached_repo_list':
         from pylons_app.model.hg_model import _get_repos_cached
         region_invalidate(_get_repos_cached, None, *args)
     if name == 'full_changelog':
         from pylons_app.model.hg_model import _full_changelog_cached
         region_invalidate(_full_changelog_cached, None, *args)
 class EmptyChangeset(BaseChangeset):
     revision = -1
     message = ''
     author = ''
     @LazyProperty
     def raw_id(self):
         """
         Returns raw string identifing this changeset, useful for web
         representation.
         """
         return '0' * 40
     @LazyProperty
     def short_id(self):
         self.raw_id[:12]
+        return self.raw_id[:12]
 def repo2db_mapper(initial_repo_list, remove_obsolete=False):
     """
     maps all found repositories into db
     """
     from pylons_app.model.repo_model import RepoModel
     sa = meta.Session
     user = sa.query(User).filter(User.admin == True).first()
     rm = RepoModel()
     for name, repo in initial_repo_list.items():
         if not sa.query(Repository).filter(Repository.repo_name == name).scalar():
             log.info('repository %s not found creating default', name)
             form_data = {
                          'repo_name':name,
                          'description':repo.description if repo.description != 'unknown' else \
                                         'auto description for %s' % name,
                          'private':False
+                         }
             rm.create(form_data, user, just_db=True)
     if remove_obsolete:
         #remove from database those repositories that are not in the filesystem
         for repo in sa.query(Repository).all():
             if repo.repo_name not in initial_repo_list.keys():
                 sa.delete(repo)
                 sa.commit()
     meta.Session.remove()
 from UserDict import DictMixin
 class OrderedDict(dict, DictMixin):
     def __init__(self, *args, **kwds):
         if len(args) > 1:
             raise TypeError('expected at most 1 arguments, got %d' % len(args))
         try:
             self.__end
         except AttributeError:
             self.clear()
         self.update(*args, **kwds)

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -524,108 +524,137 @@ div.options a:hover @@
+}
 #header #header-inner #quick li ul li a.public_repo,
 #header #header-inner #quick li ul li a.public_repo:hover
+{
     background:url("../images/icons/lock_open.png") no-repeat scroll 4px 9px #FFFFFF;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.repos,
 #header #header-inner #quick li ul li a.repos:hover
+{
     background:url("../images/icons/folder_edit.png") no-repeat scroll 4px 9px #FFFFFF;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.users,
 #header #header-inner #quick li ul li a.users:hover
+{
     background: #FFFFFF url("../images/icons/user_edit.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.settings,
 #header #header-inner #quick li ul li a.settings:hover
+{
     background: #FFFFFF url("../images/icons/cog.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.permissions,
 #header #header-inner #quick li ul li a.permissions:hover
+{
     background: #FFFFFF url("../images/icons/key.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.branches,#header #header-inner #quick li ul li a.branches:hover
+{
 #header #header-inner #quick li ul li a.fork,
 #header #header-inner #quick li ul li a.fork:hover
+{
     background: #FFFFFF url("../images/icons/arrow_divide.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.search,
 #header #header-inner #quick li ul li a.search:hover
+{
     background: #FFFFFF url("../images/icons/search_16.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.delete,
 #header #header-inner #quick li ul li a.delete:hover
+{
     background: #FFFFFF url("../images/icons/delete.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.branches,
 #header #header-inner #quick li ul li a.branches:hover
+{
     background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.tags,#header #header-inner #quick li ul li a.tags:hover
+{
 #header #header-inner #quick li ul li a.tags,
 #header #header-inner #quick li ul li a.tags:hover
+{
     background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat 4px 9px;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 /* -----------------------------------------------------------
 	header corners
 ----------------------------------------------------------- */
 #header #header-inner div.corner
+{
 	height: 6px;
 	width: 6px;
 	position: absolute;
 	background: url("../images/colors/blue/header_inner_corners.png") no-repeat;
+}
 #header #header-inner div.tl
+{
 	top: 0;
 	left: 0;
     background-position: 0 0;
+}
 #header #header-inner div.tr
+{
 	top: 0;
 	right: 0;
     background-position: -6px 0;
+}
 /* -----------------------------------------------------------
 	content
 ----------------------------------------------------------- */
 #content
+{
 	margin: 10px 0 0 0;
 	padding: 0;
     min-height: 100%;
 	clear: both;
 	overflow: hidden;
 	background: url("../images/content.png") repeat-y top left;
+}
 /* -----------------------------------------------------------
 	content -> left
 ----------------------------------------------------------- */
@@ @@ -3419,102 +3448,104 @@ table.code-browser .browser-dir { @@
     padding-left: 20px;
     padding-top: 1px;
     text-align: left;
+}
 .edit_icon {
     background: url("/images/icons/folder_edit.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     padding-top: 1px;
     text-align: left;
+}
 .delete_icon {
     background: url("/images/icons/delete.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     padding-top: 1px;
     text-align: left;
+}
 .rss_icon {
     background: url("/images/icons/rss_16.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     padding-top: 1px;
     text-align: left;
+}
 .atom_icon {
     background: url("/images/icons/atom.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     padding-top: 1px;
     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;
+}
 .action_button {
     border: 0px;
     display: block;
     color:#0066CC;
+}
 .action_button:hover {
     border: 0px;
-    font-style: italic;
+    text-decoration:underline;
     cursor: pointer;
     color:#0066CC;
+}
 /* -----------------------------------------------------------
     REPO SWITCHER
 ----------------------------------------------------------- */
 #switch_repos{
 	position: absolute;
 	height: 25px;
 	z-index: 1;
+}
 #switch_repos select{
     min-width:150px;
     max-height: 250px;
     z-index: 1;
+}
 /* -----------------------------------------------------------
     BREADCRUMBS
 ----------------------------------------------------------- */
 .breadcrumbs{
 	border:medium none;
 	color:#FFFFFF;
 	float:left;
 	margin:0;
 	padding:11px 0 11px 10px;
 	text-transform:uppercase;
     font-weight: bold;
     font-size: 14px;
+}
 .breadcrumbs a{
  color: #FFFFFF;
+}
 /* -----------------------------------------------------------
     FLASH MSG
 ----------------------------------------------------------- */
 .flash_msg ul {
     margin: 0;
     padding: 0px 0px 10px 0px;
+}
 .error_msg {
     background-color: #FFCFCF;
     background-image: url("/images/icons/error_msg.png");
     border: 1px solid #FF9595;
     color: #CC3300;

pylons_app/templates/admin/repos/repo_add.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
-    ${_('Repositories administration')}
+    ${_('Add new repository')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     &raquo;
     ${_('add new')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repos'))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
 	            <div class="label">
 	                <label for="repo_name">${_('Name')}:</label>
 	            </div>
 	            <div class="input">
 	                ${h.text('repo_name',c.new_repo)}
 	            </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
              </div>
 	        <div class="buttons">

pylons_app/templates/base/base.html

➞

Show inline comments

@@ @@ -129,107 +129,121 @@ @@
                        <img src="/images/icons/time.png" alt="${_('Changelog')}" />
                    </span>
                    <span>${_('Changelog')}</span>
                    </a>
                 </li>
                 <li ${is_current('switch_to')}>
                    <a title="${_('Switch to')}" href="#">
                    <span class="icon">
                        <img src="/images/icons/arrow_switch.png" alt="${_('Switch to')}" />
                    </span>
                    <span>${_('Switch to')}</span>
                    </a>
                     <ul>
                         <li>
                             ${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
                             <ul>
                             %if c.repository_branches.values():
 						        %for cnt,branch in enumerate(c.repository_branches.items()):
 						            <li>${h.link_to('%s - %s' % (branch[0],branch[1]),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}</li>
 						        %endfor
 						    %else:
 						    	<li>${h.link_to(_('There are no branches yet'),'#')}</li>
 						    %endif
                             </ul>
                         </li>
                         <li>
                             ${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
                             <ul>
                             %if c.repository_tags.values():
                                 %for cnt,tag in enumerate(c.repository_tags.items()):
                                  <li>${h.link_to('%s - %s' % (tag[0],tag[1]),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}</li>
                                 %endfor
                             %else:
                             	<li>${h.link_to(_('There are no tags yet'),'#')}</li>
                             %endif
                             </ul>
                         </li>
                     </ul>
                 </li>
                 <li ${is_current('files')}>
                    <a title="${_('Files')}" href="${h.url('files_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="/images/icons/file.png" alt="${_('Files')}" />
                    </span>
                    <span>${_('Files')}</span>
                    </a>
                 </li>
 				%if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                 <li ${is_current('settings')}>
                    <a title="${_('Settings')}" href="${h.url('repo_settings_home',repo_name=c.repo_name)}">
                 <li ${is_current('options')}>
                    <a title="${_('Options')}" href="#">
                    <span class="icon">
-                       <img src="/images/icons/cog_edit.png" alt="${_('Settings')}" />
+                       <img src="/images/icons/table_gear.png" alt="${_('Admin')}" />
                    </span>
-                   <span>${_('Settings')}</span>
+                   <span>${_('Options')}</span>
                    </a>
                    <ul>
                    %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                    	<li>${h.link_to(_('settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
                    %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.HasRepoPermissionAll('repository.admin')(c.repo_name):
                    	<li class="last">
                    	${h.link_to(_('delete'),'#',class_='delete')}
 ##	                  ${h.form(url('repo_settings_delete', repo_name=c.repo_name),method='delete')}
 ##	                    ${h.submit('remove_%s' % c.repo_name,'delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
 ##	                  ${h.end_form()}
                 </li>
 				%endif
 	        </ul>
                 </li>
 	        </ul>
 		%else:
 		    ##ROOT MENU
             <ul id="quick">
                 <li>
                     <a title="${_('Home')}"  href="${h.url('hg_home')}">
                     <span class="icon">
                         <img src="/images/icons/home_16.png" alt="${_('Home')}" />
                     </span>
                     <span>${_('Home')}</span>
                     </a>
                 </li>
                 <li>
                     <a title="${_('Search')}"  href="${h.url('search')}">
                     <span class="icon">
                         <img src="/images/icons/search_16.png" alt="${_('Search')}" />
                     </span>
                     <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="/images/icons/cog_edit.png" alt="${_('Admin')}" />
                    </span>
                    <span>${_('Admin')}</span>
                    </a>
 				    <ul>
 				        <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li>
 				        <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
 				        <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
 				        <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
 				        <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
 				    </ul>
                 </li>
 				%endif
 			</ul>
 		%endif
 </%def>
 <%def name="css()">
 <link rel="stylesheet" type="text/css" href="/css/reset.css" />
 <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen" />
 <link id="color" rel="stylesheet" type="text/css" href="/css/colors/blue.css" />

pylons_app/templates/index.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/base.html"/>
 <%def name="title()">
     ${c.hg_app_name}
 </%def>
 <%def name="breadcrumbs()">
 	${c.hg_app_name}
 </%def>
 <%def name="page_nav()">
 	${self.menu('home')}
 </%def>
 <%def name="main()">
 	<%def name="get_sort(name)">
 		<%name_slug = name.lower().replace(' ','_') %>
 		%if name_slug == c.sort_slug:
 		  %if c.sort_by.startswith('-'):
 		    <a href="?sort=${name_slug}">${name}&uarr;</a>
 		  %else:
 		    <a href="?sort=-${name_slug}">${name}&darr;</a>
 		  %endif:
 		%else:
 		    <a href="?sort=${name_slug}">${name}</a>
 		%endif
 	</%def>
     <div class="box">
 	    <!-- box / title -->
 	    <div class="title">
 	        <h5>${_('Dashboard')}</h5>
 	        %if h.HasPermissionAny('hg.admin','hg.create.repository')():
 	        <ul class="links">
 	          <li>
-	            <span>${h.link_to(u'ADD NEW REPOSITORY',h.url('admin_settings_create_repository'),class_="add_icon")}</span>
+	            <span>${h.link_to(_('ADD NEW REPOSITORY'),h.url('admin_settings_create_repository'),class_="add_icon")}</span>
 	          </li>
 	        </ul>
 	        %endif
 	    </div>
 	    <!-- end box / title -->
         <div class="table">
                     <table>
             <thead>
 	            <tr>
 			        <th class="left">${get_sort(_('Name'))}</th>
 			        <th class="left">${get_sort(_('Description'))}</th>
 			        <th class="left">${get_sort(_('Last change'))}</th>
 			        <th class="left">${get_sort(_('Tip'))}</th>
 			        <th class="left">${get_sort(_('Contact'))}</th>
 			        <th class="left">${_('RSS')}</th>
 			        <th class="left">${_('Atom')}</th>
 	            </tr>
             </thead>
                         <tbody>
 					    %for cnt,repo in enumerate(c.repos_list):
 					        %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(repo['name'],'main page check'):
 					        <tr class="parity${cnt%2}">
 					            <td>
 					             %if repo['repo'].dbrepo.private:
 					                <img class="icon" alt="${_('private')}" src="/images/icons/lock.png"/>
 					             %else:
 					                <img class="icon" alt="${_('public')}" src="/images/icons/lock_open.png"/>
 					             %endif
 					            ${h.link_to(repo['name'],
 					                h.url('summary_home',repo_name=repo['name']))}</td>
 					            <td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
 					            <td>${h.age(repo['last_change'])}</td>
 					            <td>
 					            	%if repo['rev']>=0:
 					            	${h.link_to('r%s:%s' % (repo['rev'],repo['tip']),
 					                h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']),
 					                class_="tooltip",
 					                tooltip_title=h.tooltip(repo['last_msg']))}
 					            	%else:
 					            		${_('No changesets yet')}
 					            	%endif
 					            </td>
 					            <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
 					            <td>
 					                <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'])}"></a>
 					            </td>
 					            <td>
 					                <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'])}"></a>

pylons_app/templates/settings/repo_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
-    ${_('Repositories administration')}
+    ${_('Repository settings')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))}
     &raquo;
     ${_('Settings')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('settings')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo_settings_update', repo_name=c.repo_info.repo_name),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input input-medium">
                     ${h.text('repo_name')}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
             </div>

pylons_app/templates/summary/summary.html

➞

Show inline comments

@@ @@ -31,151 +31,150 @@ E.onDOMReady(function(e){ @@
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
 	<div class="form">
 	  <div class="fields">
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Name')}:</label>
 			  </div>
 			  <div class="input-short">
 			      <span style="font-size: 1.6em;font-weight: bold">${c.repo_info.name}</span>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Description')}:</label>
 			  </div>
 			  <div class="input-short">
 			      ${c.repo_info.description}
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Contact')}:</label>
 			  </div>
 			  <div class="input-short">
 			  	<div class="gravatar">
 			  		<img alt="gravatar" src="${h.gravatar_url(c.repo_info.dbrepo.user.email)}"/>
 			  	</div>
 			  		${_('Username')}: ${c.repo_info.dbrepo.user.username}<br/>
 			  		${_('Name')}: ${c.repo_info.dbrepo.user.name} ${c.repo_info.dbrepo.user.lastname}<br/>
 			  		${_('Email')}: <a href="mailto:${c.repo_info.dbrepo.user.email}">${c.repo_info.dbrepo.user.email}</a>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Last change')}:</label>
 			  </div>
 			  <div class="input-short">
-			      ${h.age(c.repo_info.last_change)} - ${h.rfc822date(c.repo_info.last_change)}
+			      ${h.age(c.repo_info.last_change)} - ${h.rfc822date_notz(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 languages')}:</label>
 			  </div>
 			  <div class="input-short">
 			    <div id="lang_stats">
 			    </div>
 			  	<script type="text/javascript">
 			  		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');
 			  		for (k in data){
 				  		var tr = document.createElement('tr');
 				  		var percentage = Math.round((data[k]/total*100),2);
 						var value = data[k];
 				  		var td1 = document.createElement('td');
 				  		td1.width=150;
 				  		var trending_language_label = document.createElement('div');
 				  		trending_language_label.innerHTML = k;
 				  		td1.appendChild(trending_language_label);
 				  		var td2 = document.createElement('td');
 			  		    var trending_language = document.createElement('div');
 			  		    trending_language.title = k;
-			  		    trending_language.innerHTML = "<b>"+value+" ${_('files')} - "+percentage+" %</b>";
+			  		    trending_language.innerHTML = "<b>"+percentage+"% "+value+" ${_('files')}</b>";
 			  		    trending_language.setAttribute("class", 'trending_language');
 			  		    trending_language.style.width=percentage+"%";
 						td2.appendChild(trending_language);
 						tr.appendChild(td1);
 						tr.appendChild(td2);
 			  		    tbl.appendChild(tr);
  				  		//YAHOO.util.Dom.get('lang_stats').appendChild(trending_language_label);
+			  		}
 			  		if(no_data){
 			  			var tr = document.createElement('tr');
 			  			var td1 = document.createElement('td');
 			  			td1.innerHTML = "${_('No data loaded yet')}";
 			  			tr.appendChild(td1);
 			  			tbl.appendChild(tr);
+					}
 			  		YAHOO.util.Dom.get('lang_stats').appendChild(tbl);
 			  	</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,
 		                revision='tip',fileformat=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>
 </div>
 <div class="box box-right"  style="min-height:455px">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Commit activity by day / author')}</h5>

0 comments (0 inline, 0 general)