kallithea Changeset - 3ac4350b7848

Changeset - 3ac4350b7848

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Marcin Kuzminski - 16 years ago 2010-04-25 22:45:54
marcin@python-works.com

Html updates and fixes

7 files changed with 51 insertions and 47 deletions:

pylons_app/public/css/monoblue_custom.css

pylons_app/templates/admin_log.html

pylons_app/templates/base/base.html

pylons_app/templates/repos.html

pylons_app/templates/shortlog_data.html

pylons_app/templates/summary.html

pylons_app/templates/users.html

0 comments (0 inline, 0 general)

pylons_app/public/css/monoblue_custom.css

➞

Show inline comments

@@ @@ -16,24 +16,27 @@ body { @@
   margin: 15px 50px;
   background: #DBD4C6;
+}
 a {
   color:#0000cc;
   text-decoration: none;
+}
 /*** end of Initial Settings ***/
 /** common settings **/
 div#main{
 padding:5px;
+}
 div#container {
   background: #FFFFFF;
   position: relative;
   color: #666;
+}
 div.page-header {
   padding: 50px 20px 0;
   background: #556cb5 top left repeat-x;
   position: relative;
+}
   div.page-header h1 {
@@ @@ -517,13 +520,18 @@ table.code-browser tbody td { @@
 	padding-left:20px;
 	padding-top:5px;
 	text-align:left;
+}
 .browser-dir {
 	background-image:url("/images/folder.png");
 	background-repeat:no-repeat;
 	display:block;
 	height:16px;
 	padding-left:20px;
 	padding-top:5px;
 	text-align:left;
+}
 .current_submenu{
 	border-bottom: 2px solid;
+}
@@ \ No newline at end of file @@

pylons_app/templates/admin_log.html

➞

Show inline comments

@@ @@ -8,31 +8,31 @@ @@
 		<td>${_('Date')}</td>
 	</tr>
 	%for cnt,l in enumerate(c.users_log):
 	<tr class="parity${cnt%2}">
 		<td>${l.user.username}</td>
 		<td>${l.repository}</td>
 		<td>${l.action}</td>
 		<td>${l.action_date}</td>
 	</tr>
 	%endfor
 	<tr>
 	<script type="text/javascript">
 	var data_div = 'user_log';
 	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>
 		<td>${c.users_log.pager('$link_previous ~2~ $link_next',
 </table>
 <div>
 		<script type="text/javascript">
 		var data_div = 'user_log';
 		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.users_log.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;""")}</td>
 	</tr>
 </table>
 		YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")}
 		</h2>
 </div>
 %else:
 	${_('No actions yet')}
 %endif

pylons_app/templates/base/base.html

➞

Show inline comments

@@ @@ -10,25 +10,27 @@ @@
 </head>
 <body>
 <div id="container">
     <div class="page-header">
         <h1>
             ${next.breadcrumbs()}
         </h1>
         <ul class="page-nav">
             ${self.page_nav()}
         </ul>
     </div>
     ${next.main()}
     <div id="main">
     	${next.main()}
     </div>
     <div class="page-footer">
         Mercurial App &copy; 2010
     </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>

pylons_app/templates/repos.html

➞

Show inline comments

@@ @@ -6,26 +6,26 @@ @@
     ${h.link_to(u'Home',h.url('/'))}
+    /
     ${h.link_to(u'Admin',h.url('admin_home'))}
+    /
     ${h.link_to(u'Repos managment',h.url('repos'))}
 </%def>
 <%def name="page_nav()">
 	<li>${h.link_to(u'Home',h.url('/'))}</li>
 	<li class="current">${_('Admin')}</li>
 </%def>
 <%def name="main()">
     <ul class="submenu">
         <li class="current_submenu">
             ${h.link_to(u'Repos',h.url('repos'))}
         <li>
             ${h.link_to(u'Repos',h.url('repos'), class_="current_submenu")}
         </li>
         <li>
             ${h.link_to(u'Users',h.url('users'))}
         </li>
     </ul>
 	<div>
         <h2>${_('Mercurial repos')}</h2>
         <table>
 	        %for cnt,repo in enumerate(c.repos_list):
 	 		<tr class="parity${cnt%2}">
 			    <td><a href="/${repo['name']}">${repo['name']}</a></td>
 		        <td>r${repo['rev']}:${repo['tip']}</td>

pylons_app/templates/shortlog_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%!
 from pylons_app.lib import filters
 %>
 <table>
 %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>${h.link_to(cs.message,h.url('rev/'+str(cs._ctx)))}</td>
+		<td>${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}</td>
 		<td class="nowrap">
-		${h.link_to(_('changeset'),h.url('file/'+str(cs._ctx)))}
+		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}
+		|
-		${h.link_to(_('files'),h.url('file/'+str(cs._ctx)))}
+		${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs._short))}
 		</td>
 	</tr>
+	</tr>
 %endfor
 	<tr>
 	<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>
 		<td colspan=3>${c.repo_changesets.pager('$link_previous ~2~ $link_next',
 </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;""")}</td>
 	</tr>
 </table>
@@ \ No newline at end of file @@
 		YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")}
 		</h2>
 	</div>
@@ \ No newline at end of file @@

pylons_app/templates/summary.html

➞

Show inline comments

@@ @@ -38,52 +38,43 @@ from pylons_app.lib import filters @@
         <dd><pre>$ hg clone <a href="${c.clone_repo_url}">${c.clone_repo_url}</a></pre></dd>
         <dt>${_('Download')}</dt>
         <dd>
        	%for archive in c.repo_info._get_archives():
 				| <a href="/${c.repo_info.name}/archive/${archive['node']}${archive['extension']}">
 				${c.repo_info.name}.${archive['type']}
 				</a>
 		%endfor
+		|
         </dd>
     </dl>
-    <h2><a href="{url}shortlog">Changes</a></h2>
+    <h2>${h.link_to(_('Changes'),h.url('changelog_home',repo_name=c.repo_name))}</h2>
     <table>
 	%for cnt,cs in enumerate(c.repo_changesets):
 		<tr class="parity${cnt%2}">
 			<td>${cs._ctx.date()|n,filters.age}</td>
 			<td>${cs.author}</td>
-			<td>${h.link_to(cs.message,h.url('rev/'+str(cs._ctx)))}</td>
+			<td>${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}</td>
 			<td class="nowrap">
-			${h.link_to(_('changeset'),h.url('file/'+str(cs._ctx)))}
+			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}
+			|
-			${h.link_to(_('files'),h.url('file/'+str(cs._ctx)))}
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs._short))}
 			</td>
 		</tr>
 	%endfor
         <tr class="light">
             <td colspan="4"><a class="list" href="shortlog">...</a></td>
         </tr>
     </table>
-    <h2><a href="{url}tags">${_('Tags')}</a></h2>
+    <h2>${h.link_to(_('Tags'),h.url('tags_home',repo_name=c.repo_name))}</h2>
     <table>
 		%for tag in c.repo_tags:
 			${tag}
 		%endfor
         <tr class="light">
             <td colspan="3"><a class="list" href="tags">...</a></td>
         </tr>
     </table>
-    <h2 class="no-link">Branches</h2>
+    <h2>${h.link_to(_('Branches'),h.url('branches_home',repo_name=c.repo_name))}</h2>
     <table>
 		%for branch in c.repo_branches:
 			${branch}
 		%endfor
         <tr class="light">
           <td colspan="4"><a class="list"  href="branches">...</a></td>
         </tr>
     </table>
 </%def>
@@ \ No newline at end of file @@

pylons_app/templates/users.html

➞

Show inline comments

@@ @@ -9,26 +9,26 @@ @@
+    /
     ${h.link_to(u'Users managment',h.url('users'))}
 </%def>
 <%def name="page_nav()">
     <li>${h.link_to(u'Home',h.url('/'))}</li>
     <li class="current">${_('Admin')}</li>
 </%def>
 <%def name="main()">
     <ul class="submenu">
         <li>
             ${h.link_to(u'Repos',h.url('repos'))}
         </li>
         <li class="current_submenu">
             ${h.link_to(u'Users',h.url('users'))}
         <li>
             ${h.link_to(u'Users',h.url('users'), class_="current_submenu")}
         </li>
     </ul>
 	<div>
         <h2>${_('Mercurial users')}</h2>
         <table>
          <tr>
             <th>Id</th>
             <th>Username</th>
             <th>Active</th>
             <th>Admin</th>
             <th>Action</th>
          </tr>

0 comments (0 inline, 0 general)