upstream/kallithea Commit - r1048:ab09064b

changed all url for JS file to use pylons url function

marcink -

r1048:ab09064b beta

parent child

rhodecode/templates/base/base.html

0 +13 -13

             ## -*- 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>
                 <title>${next.title()}</title>
-                <link rel="icon" href="/images/icons/database_gear.png" type="image/png" />
+                <link rel="icon" href="${h.url('/images/icons/database_gear.png',_static=True)}" type="image/png" />
                 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
                 <meta name="robots" content="index, nofollow"/>
                 <!-- stylesheets -->
                 ${self.css()}
                 <!-- scripts -->
                 ${self.js()}
             %if c.ga_code:
             <script type="text/javascript">
               var _gaq = _gaq || [];
               _gaq.push(['_setAccount', '${c.ga_code}']);
               _gaq.push(['_trackPageview']);
               (function() {
                 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
                 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
                 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
               })();
             </script>
             %endif
             </head>
             <body>
                 <!-- header -->
                 <div id="header">
                     <!-- user -->
                     <ul id="logged-user">
             	            <li class="first">
             	                <div class="gravatar">
             	                    <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,20)}" />
             	                </div>
             		            <div class="account">
             		            %if c.rhodecode_user.username == 'default':
                                     %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                                         ${h.link_to('anonymous',h.url('register'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
                                     %else:
                                         ${h.link_to('anonymous',h.url('#'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
                                     %endif
                                 %else:
             		            	${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
             		            %endif
             		            </div>
             	            </li>
             	            <li>
             	               <a href="${h.url('home')}">${_('Home')}</a>
             	            </li>
             	            %if c.rhodecode_user.username != 'default':
                             <li>
                                <a href="${h.url('journal')}">${_('Journal')}</a>
                                ##(${c.unread_journal})</a>
                             </li>
                             %endif
                             %if c.rhodecode_user.username == 'default':
                                 <li class="last highlight">${h.link_to(u'Login',h.url('login_home'))}</li>
                             %else:
                                 <li class="last highlight">${h.link_to(u'Log Out',h.url('logout_home'))}</li>
                             %endif
                     </ul>
                     <!-- end user -->
                     <div id="header-inner" class="title top-left-rounded-corner top-right-rounded-corner">
                         <!-- logo -->
                         <div id="logo">
                             <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>
                         </div>
                         <!-- end logo -->
                         <!-- menu -->
                         ${self.page_nav()}
                         <!-- quick -->
                     </div>
                 </div>
                 <!-- end header -->
             	<!-- CONTENT -->
             	<div id="content">
                     <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>
                 <!-- END CONTENT -->
             	<!-- footer -->
             	<div id="footer">
             	   <div id="footer-inner" class="title bottom-left-rounded-corner bottom-right-rounded-corner">
             	       <div>
             	           <p class="footer-link">${h.link_to(_('Submit a bug'),h.url('bugtracker'))}</p>
             		       <p class="footer-link">${h.link_to(_('GPL license'),h.url('gpl_license'))}</p>
             		       <p>RhodeCode ${c.rhodecode_version} &copy; 2010-2011 by Marcin Kuzminski</p>
             	       </div>
             	   </div>
                     <script type="text/javascript">
                     function tooltip_activate(){
                     ${h.tooltip.activate()}
                     }
                     tooltip_activate();
                     </script>
             	</div>
             	<!-- end footer -->
             </body>
             </html>
             ### MAKO DEFS ###
             <%def name="page_nav()">
             	${self.menu()}
             </%def>
             <%def name="menu(current=None)">
             		<%
             		def is_current(selected):
             			if selected == current:
             				return h.literal('class="current"')
             		%>
             		%if current not in ['home','admin']:
             		   ##REGULAR MENU
             	        <ul id="quick">
             				<!-- repo switcher -->
             				<li>
             					<a id="repo_switcher" title="${_('Switch repository')}" href="#">
                                 <span class="icon">
                                     <img src="/images/icons/database.png" alt="${_('Products')}" />
                                 </span>
                                 <span>&darr;</span>
             					</a>
             					<ul class="repo_switcher">
                                     %for repo in c.cached_repo_list:
                                       %if repo['dbrepo']['private']:
                                          <li><img src="/images/icons/lock.png" alt="${_('Private repository')}" class="repo_switcher_type"/>${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['dbrepo']['repo_type'])}</li>
                                       %else:
                                          <li><img src="/images/icons/lock_open.png" alt="${_('Public repository')}" class="repo_switcher_type" />${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['dbrepo']['repo_type'])}</li>
                                       %endif
                                     %endfor
             					</ul>
             				</li>
             	            <li ${is_current('summary')}>
             	               <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">
             	               <span class="icon">
             	                   <img src="/images/icons/clipboard_16.png" alt="${_('Summary')}" />
             	               </span>
             	               <span>${_('Summary')}</span>
             	               </a>
             	            </li>
                             ##<li ${is_current('shortlog')}>
                             ##   <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
                             ##   <span class="icon">
                             ##       <img src="/images/icons/application_view_list.png" alt="${_('Shortlog')}" />
                             ##   </span>
                             ##   <span>${_('Shortlog')}</span>
                             ##   </a>
                             ##</li>
                             <li ${is_current('changelog')}>
                                <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
                                <span class="icon">
                                    <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('%s (%s)' % (_('branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
                                         <ul>
                                         %if c.rhodecode_repo.branches.values():
             						        %for cnt,branch in enumerate(c.rhodecode_repo.branches.items()):
             						            <li>${h.link_to('%s - %s' % (branch[0],h.short_id(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('%s (%s)' % (_('tags'),len(c.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
                                         <ul>
                                         %if c.rhodecode_repo.tags.values():
                                             %for cnt,tag in enumerate(c.rhodecode_repo.tags.items()):
                                              <li>${h.link_to('%s - %s' % (tag[0],h.short_id(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>
                             <li ${is_current('options')}>
                                <a title="${_('Options')}" href="#">
                                <span class="icon">
                                    <img src="/images/icons/table_gear.png" alt="${_('Admin')}" />
                                </span>
                                <span>${_('Options')}</span>
                                </a>
                                <ul>
                                %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                                  %if h.HasPermissionAll('hg.admin')('access settings on repository'):
                                      <li>${h.link_to(_('settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li>
                                  %else:
                                      <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>
                                %endif
                                	<li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li>
                                 %if h.HasPermissionAll('hg.admin')('access admin main page'):
                                 <li>
                                    ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')}
                                     <%def name="admin_menu()">
                                     <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(_('users groups'),h.url('users_groups'),class_='groups')}</li>
                                         <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
                                         <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>
                                         <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
                                     </ul>
                                     </%def>
                                     ${admin_menu()}
                                 </li>
                                 %endif
                                </ul>
                             </li>
                             <li>
                                 <a title="${_('Followers')}" href="#">
                                 <span class="icon_short">
                                     <img src="/images/icons/heart.png" alt="${_('Followers')}" />
                                 </span>
                                 <span class="short">${c.repository_followers}</span>
                                 </a>
                             </li>
                             <li>
                                 <a title="${_('Forks')}" href="#">
                                 <span class="icon_short">
                                     <img src="/images/icons/arrow_divide.png" alt="${_('Forks')}" />
                                 </span>
                                 <span class="short">${c.repository_forks}</span>
                                 </a>
                             </li>
             	        </ul>
             		%else:
             		    ##ROOT MENU
                         <ul id="quick">
                             <li>
                                 <a title="${_('Home')}"  href="${h.url('home')}">
                                 <span class="icon">
                                     <img src="/images/icons/home_16.png" alt="${_('Home')}" />
                                 </span>
                                 <span>${_('Home')}</span>
                                 </a>
                             </li>
                             %if c.rhodecode_user.username != 'default':
                             <li>
                                 <a title="${_('Journal')}"  href="${h.url('journal')}">
                                 <span class="icon">
                                     <img src="/images/icons/book.png" alt="${_('Journal')}" />
                                 </span>
                                 <span>${_('Journal')}</span>
                                 </a>
                             </li>
                             %endif
                             <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>
                                 ${admin_menu()}
                             </li>
             				%endif
             			</ul>
             		%endif
             </%def>
             <%def name="css()">
-            <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen" />
+            <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css',_static=True)}" media="screen" />
-            <link rel="stylesheet" type="text/css" href="/css/pygments.css"  />
+            <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css',_static=True)}"  />
-            <link rel="stylesheet" type="text/css" href="/css/diff.css"  />
+            <link rel="stylesheet" type="text/css" href="${h.url('/css/diff.css',_static=True)}"  />
             </%def>
             <%def name="js()">
-            ##<script type="text/javascript" src="/js/yui/utilities/utilities.js"></script>
+            ##<script type="text/javascript" src="${h.url('/js/yui/utilities/utilities.js',_static=True)}"></script>
-            ##<script type="text/javascript" src="/js/yui/container/container.js"></script>
+            ##<script type="text/javascript" src="${h.url('/js/yui/container/container.js',_static=True)}"></script>
-            ##<script type="text/javascript" src="/js/yui/datasource/datasource.js"></script>
+            ##<script type="text/javascript" src="${h.url('/js/yui/datasource/datasource.js',_static=True)}"></script>
-            ##<script type="text/javascript" src="/js/yui/autocomplete/autocomplete.js"></script>
+            ##<script type="text/javascript" src="${h.url('/js/yui/autocomplete/autocomplete.js',_static=True)}"></script>
-            ##<script type="text/javascript" src="/js/yui/selector/selector-min.js"></script>
+            ##<script type="text/javascript" src="${h.url('/js/yui/selector/selector-min.js',_static=True)}"></script>
-            <script type="text/javascript" src="/js/yui2a.js"></script>
+            <script type="text/javascript" src="${h.url('/js/yui2a.js',_static=True)}"></script>
-            <!--[if IE]><script language="javascript" type="text/javascript" src="/js/excanvas.min.js"></script><![endif]-->
+            <!--[if IE]><script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js',_static=True)}"></script><![endif]-->
-            <script type="text/javascript" src="/js/yui.flot.js"></script>
+            <script type="text/javascript" src="${h.url('/js/yui.flot.js',_static=True)}"></script>
             <script type="text/javascript">
-            var base_url  ='/_admin/toggle_following';
+            var base_url  = "${h.url('toggle_following')}";
             var YUC = YAHOO.util.Connect;
             var YUD = YAHOO.util.Dom;
             var YUE = YAHOO.util.Event;
             function onSuccess(target){
             	var f = YUD.get(target.id);
                 if(f.getAttribute('class')=='follow'){
                     f.setAttribute('class','following');
                     f.setAttribute('title',"${_('Stop following this repository')}");
                 }
                 else{
                     f.setAttribute('class','follow');
                     f.setAttribute('title',"${_('Start following this repository')}");
                 }
             }
             function toggleFollowingUser(fallows_user_id,token){
                 args = 'follows_user_id='+fallows_user_id;
                 args+= '&amp;auth_token='+token;
                 YUC.asyncRequest('POST',base_url,{
                     success:function(o){
                     	onSuccess();
                     }
                 },args); return false;
             }
             function toggleFollowingRepo(target,fallows_repo_id,token){
                 args = 'follows_repo_id='+fallows_repo_id;
                 args+= '&amp;auth_token='+token;
                 YUC.asyncRequest('POST',base_url,{
                     success:function(o){
                     	onSuccess(target);
                     }
                 },args); return false;
             }
             </script>
             </%def>
             <%def name="breadcrumbs()">
                 <div class="breadcrumbs">
                 ${self.breadcrumbs_links()}
                 </div>
             </%def>

rhodecode/templates/changelog/changelog.html

0 +1 -1

             ## -*- coding: utf-8 -*-
             <%inherit file="/base/base.html"/>
             <%def name="title()">
             ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name}
             </%def>
             <%def name="breadcrumbs_links()">
                 ${h.link_to(u'Home',h.url('/'))}
                 &raquo;
                 ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
                 &raquo;
                 ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')}
             </%def>
             <%def name="page_nav()">
             	${self.menu('changelog')}
             </%def>
             <%def name="main()">
             <div class="box">
                 <!-- box / title -->
                 <div class="title">
                     ${self.breadcrumbs()}
                 </div>
                 <div class="table">
             		% if c.pagination:
             			<div id="graph">
             				<div id="graph_nodes">
             					<canvas id="graph_canvas"></canvas>
             				</div>
             				<div id="graph_content">
             					<div class="container_header">
             				        ${h.form(h.url.current(),method='get')}
             				        <div class="info_box">
             				          <span>${_('Show')}:</span>
             				          ${h.text('size',size=1,value=c.size)}
             				          <span>${_('revisions')}</span>
             				          ${h.submit('set',_('set'))}
             				        </div>
             				        ${h.end_form()}
             					<div id="rev_range_container" style="display:none"></div>
             					</div>
             				%for cnt,cs in enumerate(c.pagination):
             					<div id="chg_${cnt+1}" class="container">
             						<div class="left">
             							<div class="date">
             							${h.checkbox(cs.short_id,class_="changeset_range")}
             							<span>${_('commit')} ${cs.revision}: ${h.short_id(cs.raw_id)}@${cs.date}</span>
             							</div>
             							<div class="author">
             								<div class="gravatar">
             									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/>
             								</div>
             								<span>${h.person(cs.author)}</span><br/>
             								<span><a href="mailto:${h.email_or_none(cs.author)}">${h.email_or_none(cs.author)}</a></span><br/>
             							</div>
             							<div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
             						</div>
             						<div class="right">
             									<div class="changes">
             										<span class="removed tooltip" title="<b>${_('removed')}</b>${h.changed_tooltip(cs.removed)}">${len(cs.removed)}</span>
             										<span class="changed tooltip" title="<b>${_('changed')}</b>${h.changed_tooltip(cs.changed)}">${len(cs.changed)}</span>
             										<span class="added tooltip" title="<b>${_('added')}</b>${h.changed_tooltip(cs.added)}">${len(cs.added)}</span>
             									</div>
             										%if len(cs.parents)>1:
             										<div class="merge">
             											${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/>
             										</div>
             										%endif
             								   %if cs.parents:
             									%for p_cs in reversed(cs.parents):
             										<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(h.short_id(p_cs.raw_id),
             											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
             										</div>
             									%endfor
             								   %else:
                                                     <div class="parent">${_('No parents')}</div>
                                                %endif
             								<span class="logtags">
             									%if cs.branch:
             									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
             									   ${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
             									%endif
             									%for tag in cs.tags:
             										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
             										${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
             									%endfor
             								</span>
             						</div>
             					</div>
             				%endfor
             				<div class="pagination-wh pagination-left">
             					${c.pagination.pager('$link_previous ~2~ $link_next')}
             				</div>
             				</div>
             			</div>
-            			<script type="text/javascript" src="/js/graph.js"></script>
+            			<script type="text/javascript" src="${h.url('/js/graph.js',_static=True)}"></script>
             			<script type="text/javascript">
             				YAHOO.util.Event.onDOMReady(function(){
                                 //Monitor range checkboxes and build a link to changesets
                                 //ranges
                                 var checkboxes = YUD.getElementsByClassName('changeset_range');
                                 var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
                                 YUE.on(checkboxes,'click',function(e){
                                     var checked_checkboxes = [];
                                     for (pos in checkboxes){
                                         if(checkboxes[pos].checked){
                                             checked_checkboxes.push(checkboxes[pos]);
                                         }
                                     }
                                     if(checked_checkboxes.length>1){
                                     	var rev_end = checked_checkboxes[0].name;
                                     	var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                                         var url = url_tmpl.replace('__REVRANGE__',
                                         		rev_start+'...'+rev_end);
                                     var link = "<a href="+url+">${_('Show selected changes __S -> __E')}</a>"
                                     link = link.replace('__S',rev_start);
                                     link = link.replace('__E',rev_end);
                                     YUD.get('rev_range_container').innerHTML = link;
                                     YUD.setStyle('rev_range_container','display','');
                                     }
                                     else{
                                     	YUD.setStyle('rev_range_container','display','none');
                                     }
                                 });
             					function set_canvas() {
             						var c = document.getElementById('graph_nodes');
             						var t = document.getElementById('graph_content');
             						canvas = document.getElementById('graph_canvas');
             						var div_h = t.clientHeight;
             						c.style.height=div_h+'px';
             						canvas.setAttribute('height',div_h);
             						canvas.setAttribute('width',160);
             					};
             					set_canvas();
             					var jsdata = ${c.jsdata|n};
             					var r = new BranchRenderer();
             					r.render(jsdata);
             				});
             			</script>
             		%else:
             			${_('There are no changes yet')}
             		%endif
                 </div>
             </div>
             </%def>

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