kallithea Changeset - 41241617a7a3

Changeset - 41241617a7a3

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 1

Marcin Kuzminski - 15 years ago 2011-03-18 23:44:27
marcin@python-works.com

rewrote templates, all small pages will inherit from root for easier changes and controll

5 files changed with 165 insertions and 166 deletions:

rhodecode/templates/base/base.html

125

rhodecode/templates/base/root.html

126

rhodecode/templates/login.html

rhodecode/templates/password_reset.html

rhodecode/templates/register.html

0 comments (0 inline, 0 general)

rhodecode/templates/base/base.html

➞

Show inline comments

 ## -*- 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">
 <head>
     <title>${next.title()}</title>
     <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" 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']);
 <%inherit file="root.html"/>
 	  (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 -->
 <!-- HEADER -->
     <div id="header">
         <!-- user -->
         <ul id="logged-user">
@@ @@ -47,7 +23,7 @@ @@
 	            %if c.rhodecode_user.username != 'default':
                 <li>
                    <a href="${h.url('journal')}">${_('Journal')}</a>
-                   ##(${c.unread_journal})</a>
                ##(${c.unread_journal}
                 </li>
                 %endif
                 %if c.rhodecode_user.username == 'default':
@@ @@ -58,17 +34,16 @@ @@
         </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 -->
         <!-- MENU -->
             ${self.page_nav()}
             <!-- quick -->
         <!-- END MENU -->
         ${self.body()}
         </div>
     </div>
-    <!-- end header -->
+<!-- END HEADER -->
 	<!-- CONTENT -->
 	<div id="content">
@@ @@ -88,13 +63,20 @@ @@
 	</div>
     <!-- END CONTENT -->
-	<!-- footer -->
+<!-- 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 class="footer-link-right"><a href="${h.url('rhodecode_official')}">RhodeCode</a> ${c.rhodecode_version} &copy; 2010-2011 by Marcin Kuzminski</p>
            <p class="footer-link">
                 <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a>
            </p>
 	       <p class="footer-link">
 	           <a href="${h.url('gpl_license')}">${_('GPL license')}</a>
 	       </p>
 	       <p class="footer-link-right">
 	           <a href="${h.url('rhodecode_official')}">RhodeCode</a>
 	           ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski
 	       </p>
 	       </div>
 	   </div>
         <script type="text/javascript">
@@ @@ -104,16 +86,20 @@ @@
         tooltip_activate();
         </script>
 	</div>
 	<!-- end footer -->
 </body>
 </html>
 <!-- END FOOTER -->
 ### MAKO DEFS ###
 <%def name="page_nav()">
 	${self.menu()}
 </%def>
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 <%def name="menu(current=None)">
 		<%
 		def is_current(selected):
@@ @@ -314,89 +300,4 @@ @@
 				%endif
 			</ul>
 		%endif
 </%def>
 <%def name="css()">
 <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
 <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css')}"  />
 <link rel="stylesheet" type="text/css" href="${h.url('/css/diff.css')}"  />
 </%def>
 <%def name="js()">
 ##<script type="text/javascript" src="${h.url('/js/yui/utilities/utilities.js')}"></script>
 ##<script type="text/javascript" src="${h.url('/js/yui/container/container.js')}"></script>
 ##<script type="text/javascript" src="${h.url('/js/yui/datasource/datasource.js')}"></script>
 ##<script type="text/javascript" src="${h.url('/js/yui/autocomplete/autocomplete.js')}"></script>
 ##<script type="text/javascript" src="${h.url('/js/yui/selector/selector-min.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/yui2a.js')}"></script>
 <!--[if IE]><script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script><![endif]-->
 <script type="text/javascript" src="${h.url('/js/yui.flot.js')}"></script>
 <script type="text/javascript">
 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);
 	var f_cnt = YUD.get('current_followers_count');
     if(f.getAttribute('class')=='follow'){
         f.setAttribute('class','following');
         f.setAttribute('title',"${_('Stop following this repository')}");
         if(f_cnt){
             var cnt = Number(f_cnt.innerHTML)+1;
             f_cnt.innerHTML = cnt;
+        }
+    }
     else{
         f.setAttribute('class','follow');
         f.setAttribute('title',"${_('Start following this repository')}");
         if(f_cnt){
             var cnt = Number(f_cnt.innerHTML)+1;
             f_cnt.innerHTML = cnt;
+        }
+    }
+}
 function toggleFollowingUser(target,fallows_user_id,token,user_id){
     args = 'follows_user_id='+fallows_user_id;
     args+= '&amp;auth_token='+token;
     if(user_id != undefined){
     	args+="&amp;user_id="+user_id;
+    }
     YUC.asyncRequest('POST',base_url,{
         success:function(o){
         	onSuccess(target);
+        }
     },args); return false;
+}
 function toggleFollowingRepo(target,fallows_repo_id,token,user_id){
     args = 'follows_repo_id='+fallows_repo_id;
     args+= '&amp;auth_token='+token;
     if(user_id != undefined){
         args+="&amp;user_id="+user_id;
+    }
     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>
@@ \ No newline at end of file @@

rhodecode/templates/base/root.html

➞

Show inline comments

@@ new file 100644 @@
 ## -*- 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">
     <head>
         <title>${self.title()}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <meta name="robots" content="index, nofollow"/>
         <link rel="icon" href="${h.url("/images/icons/database_gear.png")}" type="image/png" />
         <!-- stylesheets -->
         ${self.css()}
         %if c.ga_code:
         <!-- Analytics -->
 	     <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
         <!-- scripts -->
         ${self.js()}
     </head>
     <body id="body">
         ${next.body()}
     </body>
 </html>
 <%def name="css()">
     <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
 	<link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css')}"  />
     <link rel="stylesheet" type="text/css" href="${h.url('/css/diff.css')}"  />
 </%def>
 <%def name="js()">
 	<script type="text/javascript">
 	  if (typeof console == "undefined" || typeof console.log == "undefined")
 	    console = { log: function() {} }
 	</script>
  % if False:
 	<script type="text/javascript" src="${h.url('/js/yui/utilities/utilities.js')}"></script>
 	<script type="text/javascript" src="${h.url('/js/yui/container/container.js')}"></script>
 	<script type="text/javascript" src="${h.url('/js/yui/datasource/datasource.js')}"></script>
 	<script type="text/javascript" src="${h.url('/js/yui/autocomplete/autocomplete.js')}"></script>
     <script type="text/javascript" src="${h.url('/js/yui/selector/selector-min.js')}"></script>
  % else:
 	<script type="text/javascript" src="${h.url('/js/yui2a.js')}"></script>
 	<!--[if IE]>
 	<script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script>
 	<![endif]-->
 	<script type="text/javascript" src="${h.url('/js/yui.flot.js')}"></script>
  % endif
 	<script type="text/javascript">
 		var YUC = YAHOO.util.Connect;
 		var YUD = YAHOO.util.Dom;
 		var YUE = YAHOO.util.Event;
 	</script>
 	<script type="text/javascript">
 	var base_url  = "${h.url('toggle_following')}";
 	function onSuccess(target){
 	    var f = YUD.get(target.id);
 	    var f_cnt = YUD.get('current_followers_count');
 	    if(f.getAttribute('class')=='follow'){
 	        f.setAttribute('class','following');
 	        f.setAttribute('title',"${_('Stop following this repository')}");
 	        if(f_cnt){
 	            var cnt = Number(f_cnt.innerHTML)+1;
 	            f_cnt.innerHTML = cnt;
+	        }
+	    }
 	    else{
 	        f.setAttribute('class','follow');
 	        f.setAttribute('title',"${_('Start following this repository')}");
 	        if(f_cnt){
 	            var cnt = Number(f_cnt.innerHTML)+1;
 	            f_cnt.innerHTML = cnt;
+	        }
+	    }
+	}
 	function toggleFollowingUser(target,fallows_user_id,token,user_id){
 	    args = 'follows_user_id='+fallows_user_id;
 	    args+= '&amp;auth_token='+token;
 	    if(user_id != undefined){
 	        args+="&amp;user_id="+user_id;
+	    }
 	    YUC.asyncRequest('POST',base_url,{
 	        success:function(o){
 	            onSuccess(target);
+	        }
 	    },args); return false;
+	}
 	function toggleFollowingRepo(target,fallows_repo_id,token,user_id){
 	    args = 'follows_repo_id='+fallows_repo_id;
 	    args+= '&amp;auth_token='+token;
 	    if(user_id != undefined){
 	        args+="&amp;user_id="+user_id;
+	    }
 	    YUC.asyncRequest('POST',base_url,{
 	        success:function(o){
 	            onSuccess(target);
+	        }
 	    },args); return false;
+	}
 	</script>
 </%def>
@@ \ No newline at end of file @@

rhodecode/templates/login.html

➞

Show inline comments

 ## -*- 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">
     <head>
         <title>${_('Sign In')} - ${c.rhodecode_name}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <link rel="icon" href="${h.url("/images/icons/database_gear.png")}" type="image/png" />
         <meta name="robots" content="index, nofollow"/>
 <%inherit file="base/root.html"/>
         <!-- stylesheets -->
         <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
 <%def name="title()">
     ${_('Sign In')} - ${c.rhodecode_name}
 </%def>
     </head>
     <body>
         <div id="login">
         <div class="flash_msg">
             <% messages = h.flash.pop_messages() %>
@@ @@ -76,7 +69,4 @@ @@
                 ${h.end_form()}
             </div>
             <!-- end login -->
         </div>
     </body>
 </html>
 </div>
@@ \ No newline at end of file @@

rhodecode/templates/password_reset.html

➞

Show inline comments

 ## -*- 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">
     <head>
         <title>${_('Reset You password')} - ${c.rhodecode_name}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <link rel="icon" href="${h.url("/images/hgicon.png")}" type="image/png" />
         <meta name="robots" content="index, nofollow"/>
 <%inherit file="base/root.html"/>
         <!-- stylesheets -->
         <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
 <%def name="title()">
     ${_('Reset You password')} - ${c.rhodecode_name}
 </%def>
     </head>
     <body>
 		<div id="register">
 			<div class="title top-left-rounded-corner top-right-rounded-corner">
@@ @@ -43,6 +36,4 @@ @@
 			    ${h.end_form()}
 			</div>
 	    </div>
     </body>
 </html>

rhodecode/templates/register.html

➞

Show inline comments

 ## -*- 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">
     <head>
         <title>${_('Sign Up')} - ${c.rhodecode_name}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <link rel="icon" href="${h.url("/images/hgicon.png")}" type="image/png" />
         <meta name="robots" content="index, nofollow"/>
 <%inherit file="base/root.html"/>
         <!-- stylesheets -->
         <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
 <%def name="title()">
     ${_('Sign Up')} - ${c.rhodecode_name}
 </%def>
     </head>
     <body>
 		<div id="register">
 			<div class="title top-left-rounded-corner top-right-rounded-corner">
@@ @@ -91,6 +84,4 @@ @@
 			    ${h.end_form()}
 			</div>
 	    </div>
     </body>
 </html>

0 comments (0 inline, 0 general)