upstream/kallithea Commit - r259:dee1913f

added message short names for longer descriptions

marcink -

r259:dee1913f default

parent child

pylons_app/templates/base/base.html

0 +11 0

             ## -*- coding: utf-8 -*-
             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
             <head>
                 <link rel="icon" href="/images/hgicon.png" type="image/png" />
                 <meta name="robots" content="index, nofollow"/>
                 <title>${next.title()}</title>
                 ##For future use yui reset for cross browser compatability.
                 ##<link rel="stylesheet" href="/js/yui/reset-fonts-grids/reset-fonts-grids.css" type="text/css" />
                 ${self.css()}
                 ${self.js()}
             </head>
             <body class="mainbody">
             <div id="container">
                 <div class="page-header">
                     <h1>${next.breadcrumbs()}</h1>
                     ${self.page_nav()}
                 <div class="flash_msg">
                 <% messages = h.flash.pop_messages() %>
             		% if messages:
             		<ul id="flash-messages">
             		    % for message in messages:
             		    <li class="${message.category}_msg">${message}</li>
             		    % endfor
             		</ul>
             		% endif
                 </div>
                 <div id="main">
                 	${next.main()}
                 </div>
                 <div class="page-footer">
                     Hg App ${c.hg_app_version} &copy; 2010 by Marcin Kuzminski
                 </div>
                 <div id="powered-by">
                     <p>
                     <a href="http://mercurial.selenic.com/" title="Mercurial">
                         <img src="/images/hglogo.png" width="75" height="90" alt="mercurial"/></a>
                     </p>
                 </div>
                 <div id="corner-top-left"></div>
                 <div id="corner-top-right"></div>
                 <div id="corner-bottom-left"></div>
                 <div id="corner-bottom-right"></div>
             </div>
             </body>
             </html>
             ### MAKO DEFS ###
             <%def name="page_nav()">
             	${self.menu()}
             	${self.submenu()}
             </%def>
             <%def name="menu(current)">
             <%
             def is_current(selected):
             	if selected == current:
             		return "class='current'"
             %>
             		%if current not in ['home','admin']:
             		##regular menu
             	       <script type="text/javascript">
             	       	YAHOO.util.Event.onDOMReady(function(){
             				YAHOO.util.Event.addListener('repo_switcher','click',function(){
             					if(YAHOO.util.Dom.hasClass('repo_switcher','selected')){
             						YAHOO.util.Dom.setStyle('switch_repos','display','none');
             						YAHOO.util.Dom.setStyle('repo_switcher','background','');
             						YAHOO.util.Dom.removeClass('repo_switcher','selected');
             						YAHOO.util.Dom.get('repo_switcher').removeAttribute('style');
             					}
             					else{
             						YAHOO.util.Dom.setStyle('switch_repos','display','');
             						YAHOO.util.Dom.setStyle('repo_switcher','background','#FFFFFF');
             						YAHOO.util.Dom.setStyle('repo_switcher','color','#556CB5');
             						YAHOO.util.Dom.addClass('repo_switcher','selected');
             					}
             					});
             				YAHOO.util.Event.addListener('repos_list','change',function(e){
             		            var wa = YAHOO.util.Dom.get('repos_list').value;
             		            var url = "${h.url('summary_home',repo_name='__REPLACE__')}".replace('__REPLACE__',wa);
             			        window.location = url;
             				})
             	           });
             	       	</script>
             	        <ul class="page-nav">
             				<li>
             					<a id="repo_switcher" title="${_('Switch repository')}" href="#">&darr;</a>
             					<div id="switch_repos" style="display:none;position: absolute;width: 150px;height: 25px">
             						<select id="repos_list" size="=10">
             						%for repo in sorted(x.name.lower() for x in c.cached_repo_list.values()):
             							<option value="${repo}">${repo}</option>
             						%endfor
             						</select>
             					</div>
             				</li>
             	            <li ${is_current('summary')}>${h.link_to(_('summary'),h.url('summary_home',repo_name=c.repo_name))}</li>
             	            <li ${is_current('shortlog')}>${h.link_to(_('shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}</li>
             				<li ${is_current('changelog')}>${h.link_to(_('changelog'),h.url('changelog_home',repo_name=c.repo_name))}</li>
             	            <li ${is_current('branches')}>${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name))}</li>
             	            <li ${is_current('tags')}>${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name))}</li>
             	            <li ${is_current('files')}>${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name))}</li>
             	        </ul>
             		%else:
             		##Root menu
             			<ul class="page-nav">
             				<li ${is_current('home')}>${h.link_to(_('Home'),h.url('/'))}</li>
             				<li ${is_current('admin')}>${h.link_to(_('Admin'),h.url('admin_home'))}</li>
             				<li class="logout">${h.link_to(u'Logout',h.url('logout_home'))}</li>
             			</ul>
             		%endif
             		</div>
             </%def>
             <%def name="submenu(current=None)">
             	<%
             	def is_current(selected):
             		if selected == current:
             			return "class='current_submenu'"
             	%>
             	%if current != None:
             	<div>
                 <ul class="submenu">
                     <li ${is_current('repos')}>${h.link_to(u'repos',h.url('repos'),class_='repos')}</li>
                     <li ${is_current('users')}>${h.link_to(u'users',h.url('users'),class_='users')}</li>
                     <li ${is_current('permissions')}>${h.link_to(u'permissions',h.url('permissions'),class_='permissions')}</li>
                 </ul>
                 </div>
                 %endif
             </%def>
             <%def name="css()">
             <link rel="stylesheet" href="/css/monoblue_custom.css" type="text/css" />
             </%def>
             <%def name="js()">
             <script type="text/javascript" src="/js/yui/utilities/utilities.js"></script>
             </%def>
             <!-- DEFINITION OF FORM ERROR FETCHER -->
             <%def name="get_form_error(element)">
             	%if hasattr(c,'form_errors') and type(c.form_errors) == dict:
                     %if c.form_errors.get(element,False):
                         <span class="error-message">
                             ${c.form_errors.get(element,'')}
                         </span>
                     %endif
             	%endif
+            </%def>
+            <!-- SHORTER LONGER STRINGS -->
+            <%def name="message_slug(msg)">
+            	<%
+            	limit = 60
+            	if len(msg) > limit:
+            		return msg[:limit]+'...'
+            	else:
+            		return msg
+            	%>
             </%def>

pylons_app/templates/index.html

0 +1 -1

             ## -*- coding: utf-8 -*-
             <%!
             from pylons_app.lib import filters
             %>
             <%inherit file="base/base.html"/>
             <%def name="title()">
                 ${c.repos_prefix} Mercurial Repositories
             </%def>
             <%def name="breadcrumbs()">
             	${c.repos_prefix} Mercurial Repositories
             </%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.cs_slug:
             			<span style="font-weight: bold;color:#006699">${name}</span>
             		%else:
             			<span style="font-weight: bold">${name}</span>
             		%endif
             		<a href="?sort=${name_slug}">&darr;</a>
             		<a href="?sort=-${name_slug}">&uarr;</a>
             	</%def>
             	<table>
             	  <tr>
             	    <td>${get_sort(_('Name'))}</td>
             	    <td>${get_sort(_('Description'))}</td>
             	    <td>${get_sort(_('Last change'))}</td>
             	    <td>${get_sort(_('Tip'))}</td>
             	    <td>${get_sort(_('Contact'))}</td>
             	    <td></td>
             	    <td></td>
             	    <td></td>
             	  </tr>
             	%for cnt,repo in enumerate(c.repos_list):
              		<tr class="parity${cnt%2}">
             		    <td>${h.link(repo['name'],h.url('summary_home',repo_name=repo['name']))}</td>
-            		    <td>${repo['description']}</td>
+            		    <td title="${repo['description']}">${self.message_slug(repo['description'])}</td>
             	        <td>${repo['last_change']|n,filters.age}</td>
             	        <td>${h.link_to('r%s:%s' % (repo['rev'],repo['tip']),h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']))}</td>
             	        <td title="${repo['contact']}">${repo['contact']|n,filters.person}</td>
             	        	##%for archive in repo['repo_archives']:
             	        	##<td class="indexlinks">
             	        	##	${h.link_to(archive['type'],
                    			##	h.url('files_archive_home',repo_name=repo['name'],
                    			##	revision='tip',fileformat=archive['extension']),class_="archive_logo" )}
             				##</td>
             				##%endfor
             			<td>
             				${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=repo['name']),class_='rss_logo')}
             			</td>
             			<td>
             				${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=repo['name']),class_='atom_logo')}
             			</td>
             		</tr>
             	%endfor
             	</table>
             </%def>

pylons_app/templates/shortlog/shortlog_data.html

0 +1 -10

             ## -*- coding: utf-8 -*-
             <%!
             from pylons_app.lib import filters
             %>
             <table>
-            <%def name="message_slug(msg)">
-            	<%
-            	limit = 60
-            	if len(msg) > limit:
-            		return msg[:limit]+'...'
-            	else:
-            		return msg
-            	%>
-            </%def>
             %for cnt,cs in enumerate(c.repo_changesets):
             	<tr class="parity${cnt%2}">
             		<td>${cs._ctx.date()|n,filters.age}</td>
             		<td title="${cs.author}">${cs.author|n,filters.person}</td>
             		<td>r${cs.revision}</td>
             		<td>
-            			${h.link_to(message_slug(cs.message),
+            			${h.link_to(self.message_slug(cs.message),
             			h.url('changeset_home',repo_name=c.repo_name,revision=cs._short),
             			title=cs.message)}
             		</td>
             		<td>
             				<span class="logtags">
             					<span class="branchtag">${cs.branch}</span>
             					%for tag in cs.tags:
             						<span class="tagtag">${tag}</span>
             					%endfor
             				</span>
             		</td>
             		<td class="nowrap">
             		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}
             		|
             		${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs._short))}
             		</td>
             	</tr>
             %endfor
             </table>
             	<div>
             		<script type="text/javascript">
             		var data_div = 'shortlog_data';
             		YAHOO.util.Event.onDOMReady(function(){
             			YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){
             					YAHOO.util.Dom.setStyle('shortlog_data','opacity','0.3');});});
             		</script>
             		<h2>
             		${c.repo_changesets.pager('$link_previous ~2~ $link_next',
             		onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{
             		success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText;
             		YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){
             				YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');});
             		YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")}
             		</h2>
             	</div>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages