Changeset - c9790080e7cc
Parent rev.
Child rev.
[Not reviewed]
Merge beta
0 2 0
Marcin Kuzminski - 15 years ago 2011-05-06 22:49:47
marcin@python-works.com
merge with quick login
2 files changed with 97 insertions and 1 deletions:
rhodecode/public/css/style.css
65
rhodecode/templates/base/base.html
32
1
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -1274,192 +1274,257 @@ padding:0 3px 2px;
 
white-space: pre;
 
width: 100%;
 
}
 
 
#summary .repo_name{
 
font-size: 1.6em;
 
font-weight: bold;
 
vertical-align: baseline;
 
clear:right
 
}
 
 
 
#footer {
 
clear:both;
 
overflow:hidden;
 
text-align:right;
 
margin:0;
 
padding:0 10px 4px;
 
margin:-10px 0 0;
 
}
 
 
#footer div#footer-inner {
 
background:url("../images/header_inner.png") repeat-x scroll 0 0 #003367;
 
border-top:2px solid #FFFFFF;
 
}
 
 
#footer div#footer-inner p {
 
padding:15px 25px 15px 0;
 
color:#FFF;
 
font-weight:700;
 
}
 
#footer div#footer-inner .footer-link {
 
float:left;
 
padding-left:10px;
 
}
 
#footer div#footer-inner .footer-link a,#footer div#footer-inner .footer-link-right a {
 
color:#FFF;
 
}
 
 
#login div.title {
 
width:420px;
 
clear:both;
 
overflow:hidden;
 
position:relative;
 
background:#003367 url("../images/header_inner.png") repeat-x;
 
margin:0 auto;
 
padding:0;
 
}
 
 
#login div.inner {
 
width:380px;
 
background:#FFF url("../images/login.png") no-repeat top left;
 
border-top:none;
 
border-bottom:none;
 
margin:0 auto;
 
padding:20px;
 
}
 
 
#login div.form div.fields div.field div.label {
 
width:173px;
 
float:left;
 
text-align:right;
 
margin:2px 10px 0 0;
 
padding:5px 0 0 5px;
 
}
 
 
#login div.form div.fields div.field div.input input {
 
width:176px;
 
background:#FFF;
 
border-top:1px solid #b3b3b3;
 
border-left:1px solid #b3b3b3;
 
border-right:1px solid #eaeaea;
 
border-bottom:1px solid #eaeaea;
 
color:#000;
 
font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 
font-size:11px;
 
margin:0;
 
padding:7px 7px 6px;
 
}
 
 
#login div.form div.fields div.buttons {
 
clear:both;
 
overflow:hidden;
 
border-top:1px solid #DDD;
 
text-align:right;
 
margin:0;
 
padding:10px 0 0;
 
}
 
 
#login div.form div.links {
 
clear:both;
 
overflow:hidden;
 
margin:10px 0 0;
 
padding:0 0 2px;
 
}
 
 
#quick_login{
 
top: 31px;
 
background-color: rgb(0, 51, 103);
 
z-index: 999;
 
height: 150px;
 
position: absolute;
 
margin-left: -16px;
 
width: 281px;
 
border-radius: 0 0 8px 8px;
 
}
 
 
#quick_login div.form div.fields{
 
padding-top: 2px;
 
padding-left:10px;
 
}
 
 
#quick_login div.form div.fields div.field{
 
 padding: 5px;
 
}
 
 
#quick_login div.form div.fields div.field div.label label{
 
color:#fff;
 
padding-bottom: 3px;
 
}
 
 
#quick_login div.form div.fields div.field div.input input {
 
width:236px;
 
background:#FFF;
 
border-top:1px solid #b3b3b3;
 
border-left:1px solid #b3b3b3;
 
border-right:1px solid #eaeaea;
 
border-bottom:1px solid #eaeaea;
 
color:#000;
 
font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 
font-size:11px;
 
margin:0;
 
padding:5px 7px 4px;
 
}
 
 
#quick_login div.form div.fields div.buttons {
 
clear:both;
 
overflow:hidden;
 
text-align:right;
 
margin:0;
 
padding:10px 14px 0;
 
}
 
 
#quick_login div.form div.fields div.buttons input.ui-button{
 
background:#e5e3e3 url("../images/button.png") repeat-x;
 
border-top:1px solid #DDD;
 
border-left:1px solid #c6c6c6;
 
border-right:1px solid #DDD;
 
border-bottom:1px solid #c6c6c6;
 
color:#515151;
 
margin:0;
 
padding:4px 10px;
 
}
 
 
#quick_login div.form div.links {
 
clear:both;
 
overflow:hidden;
 
margin:10px 0 0;
 
padding:0 0 2px;
 
}
 
 
#register div.title {
 
clear:both;
 
overflow:hidden;
 
position:relative;
 
background:#003367 url("../images/header_inner.png") repeat-x;
 
margin:0 auto;
 
padding:0;
 
}
 
 
#register div.inner {
 
background:#FFF;
 
border-top:none;
 
border-bottom:none;
 
margin:0 auto;
 
padding:20px;
 
}
 
 
#register div.form div.fields div.field div.label {
 
width:135px;
 
float:left;
 
text-align:right;
 
margin:2px 10px 0 0;
 
padding:5px 0 0 5px;
 
}
 
 
#register div.form div.fields div.field div.input input {
 
width:300px;
 
background:#FFF;
 
border-top:1px solid #b3b3b3;
 
border-left:1px solid #b3b3b3;
 
border-right:1px solid #eaeaea;
 
border-bottom:1px solid #eaeaea;
 
color:#000;
 
font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 
font-size:11px;
 
margin:0;
 
padding:7px 7px 6px;
 
}
 
 
#register div.form div.fields div.buttons {
 
clear:both;
 
overflow:hidden;
 
border-top:1px solid #DDD;
 
text-align:left;
 
margin:0;
 
padding:10px 0 0 150px;
 
}
 
 
#register div.form div.fields div.buttons div.highlight input.ui-button {
 
background:url("../images/button_highlight.png") repeat-x scroll 0 0 #4E85BB;
 
color:#FFF;
 
border-color:#5C91A4 #2B7089 #1A6480 #2A6F89;
 
border-style:solid;
 
border-width:1px;
 
}
 
 
#register div.form div.activation_msg {
 
padding-top:4px;
 
padding-bottom:4px;
 
}
 
 
#journal .journal_day{
 
font-size:20px;
 
padding:10px 0px;
 
border-bottom:2px solid #DDD;
 
margin-left:10px;
 
margin-right:10px;
 
}
 
 
#journal .journal_container{
 
padding:5px;
 
clear:both;
 
margin:0px 5px 0px 10px;
 
}
 
 
#journal .journal_action_container{
 
padding-left:38px;
 
}
 
 
#journal .journal_user{
 
color: #747474;
 
font-size: 14px;
 
font-weight: bold;
 
height: 30px;
 
}
 
#journal .journal_icon{
 
clear: both;
 
float: left;
 
padding-right: 4px;
 
padding-top: 3px;
 
}
 
#journal .journal_action{
 
padding-top:4px;
 
min-height:2px;
 
float:left
 
}
rhodecode/templates/base/base.html
➞
Show inline comments
 
## -*- coding: utf-8 -*-
 
<%inherit file="root.html"/>
 

			




	
	
	
		
 
<!-- HEADER -->

			




	
	
	
		
 
<div id="header">

			




	
	
	
		
 
    <!-- user -->

			




	
	
	
		
 
    <ul id="logged-user">

			




	
	
	
		
 
         <li class="first">

			




	
	
	
		
 
         

			




	
	
	
		
 
			<div id="quick_login" style="display:none">

			




	
	
	
		
 
			${h.form(h.url('login_home',came_from=h.url.current()))}

			




	
	
	
		
 
			<div class="form">

			




	
	
	
		
 
			    <div class="fields">

			




	
	
	
		
 
			        <div class="field">

			




	
	
	
		
 
			            <div class="label">

			




	
	
	
		
 
			                <label for="username">${_('Username')}:</label>

			




	
	
	
		
 
			            </div>

			




	
	
	
		
 
			            <div class="input">

			




	
	
	
		
 
			                ${h.text('username',class_='focus',size=40)}

			




	
	
	
		
 
			            </div>

			




	
	
	
		
 
			            

			




	
	
	
		
 
			        </div>                     

			




	
	
	
		
 
			        <div class="field">

			




	
	
	
		
 
			            <div class="label">

			




	
	
	
		
 
			                <label for="password">${_('Password')}:</label>

			




	
	
	
		
 
			            </div>

			




	
	
	
		
 
			            <div class="input">

			




	
	
	
		
 
			                ${h.password('password',class_='focus',size=40)}

			




	
	
	
		
 
			            </div>

			




	
	
	
		
 
			            

			




	
	
	
		
 
			        </div>

			




	
	
	
		
 
			        <div class="buttons">

			




	
	
	
		
 
			            ${h.submit('sign_in','Sign In',class_="ui-button")}

			




	
	
	
		
 
			        </div>

			




	
	
	
		
 
			    </div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
			${h.end_form()}

			




	
	
	
		
 
			</div>         

			




	
	
	
		
 
         

			




	
	
	
		
 
             <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':

			




	
	
	
		
 
              <a href="${h.url('public_journal')}">${_('Public journal')}</a>   

			




	
	
	
		
 
          %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}

			




	
	
	
		
 
            </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">

			




	
	
	
		
 
        <div id="logo">

			




	
	
	
		
 
            <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <!-- MENU -->

			




	
	
	
		
 
        ${self.page_nav()}

			




	
	
	
		
 
        <!-- END MENU -->

			




	
	
	
		
 
        ${self.body()}

			




	
	
	
		
 
    </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">

			




	
	
	
		
 
                <a href="${h.url('bugtracker')}">${_('Submit a bug')}</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">

			




	
	
	
		
 
   function tooltip_activate(){

			




	
	
	
		
 
	    ${h.tooltip.activate()}

			




	
	
	
		
 
   }

			




	
	
	
		
 
   tooltip_activate();

			




	
	
	
		
 
   </script>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<!-- 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):

			




	
	
	
		
 
			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="${h.url("/images/icons/database.png")}" alt="${_('Products')}" />

			




	
	
	
		
 
                        <img src="${h.url('/images/icons/database.png')}" alt="${_('Products')}" />

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                    <span>&darr;</span>					

			




	
	
	
		
 
					</a>

			




	
	
	
		
 
					<ul id="repo_switcher_list" class="repo_switcher">

			




	
	
	
		
 
                        <li>

			




	
	
	
		
 
                            <a href="#">${_('loading...')}</a>

			




	
	
	
		
 
                        </li>

			




	
	
	
		
 
					</ul>

			




	
	
	
		
 
					<script type="text/javascript">

			




	
	
	
		
 
					   YUE.on('repo_switcher','mouseover',function(){

			




	
	
	
		
 
						      function qfilter(){

			




	
	
	
		
 
						         var S = YAHOO.util.Selector;

			




	
	
	
		
 
						         

			




	
	
	
		
 
						         var q_filter = YUD.get('q_filter_rs');

			




	
	
	
		
 
						         var F = YAHOO.namespace('q_filter_rs'); 

			




	
	
	
		
 
						         

			




	
	
	
		
 
						         YUE.on(q_filter,'click',function(){

			




	
	
	
		
 
						            q_filter.value = '';

			




	
	
	
		
 
						         });

			




	
	
	
		
 
						    

			




	
	
	
		
 
						         F.filterTimeout = null;

			




	
	
	
		
 
						         

			




	
	
	
		
 
						         F.updateFilter  = function() { 

			




	
	
	
		
 
						            // Reset timeout 

			




	
	
	
		
 
						            F.filterTimeout = null;

			




	
	
	
		
 
						            

			




	
	
	
		
 
						            var obsolete = [];

			




	
	
	
		
 
						            var nodes = S.query('ul#repo_switcher_list li a.repo_name');

			




	
	
	
		
 
						            var req = YUD.get('q_filter_rs').value;

			




	
	
	
		
 
						            for (n in nodes){

			




	
	
	
		
 
						                YUD.setStyle(nodes[n].parentNode,'display','')

			




	
	
	
		
 
						            }

			




	
	
	
		
 
						            if (req){

			




	
	
	
		
 
						                for (n in nodes){

			




	
	
	
		
 
						                    console.log(n);

			




	
	
	
		
 
						                    if (nodes[n].innerHTML.toLowerCase().indexOf(req) == -1) {

			




	
	
	
		
 
						                        obsolete.push(nodes[n]); 

			




	
	
	
		
 
						                    }

			




	
	
	
		
 
						                }

			




	
	
	
		
 
						                if(obsolete){

			




	
	
	
		
 
						                    for (n in obsolete){

			




	
	
	
		
 
						                        YUD.setStyle(obsolete[n].parentNode,'display','none');

			




	
	
	
		
 
						                    }

			




	
	
	
		
 
						                }

			




	
	
	
		
 
						            }

			




	
	
	
		
 
						         }

			




	
	
	
		
 
						         

			




	
	
	
		
 
						         YUE.on(q_filter,'keyup',function(e){

			




	
	
	
		
 
						             clearTimeout(F.filterTimeout); 

			




	
	
	
		
 
						             setTimeout(F.updateFilter,600); 

			




	
	
	
		
 
						         });

			




	
	
	
		
 
						}

			




	
	
	
		
 
						   var loaded = YUD.hasClass('repo_switcher','loaded');

			




	
	
	
		
 
						   if(!loaded){

			




	
	
	
		
 
							   YUD.addClass('repo_switcher','loaded');

			




	
	
	
		
 
							   YAHOO.util.Connect.asyncRequest('GET',"${h.url('repo_switcher')}",{

			




	
	
	
		
 
								   success:function(o){

			




	
	
	
		
 
								      YUD.get('repo_switcher_list').innerHTML = o.responseText;

			




	
	
	
		
 
								      qfilter();

			




	
	
	
		
 
								   },

			




	
	
	
		
 
								   failure:function(o){

			




	
	
	
		
 
									   YUD.removeClass('repo_switcher','loaded');   

			




	
	
	
		
 
								   }

			




	
	
	
		
 
							   },null);

			




	
	
	
		
 
						   }

			




	
	
	
		
 
						   return false;

			




	
	
	
		
 
					   });

			




	
	
	
		
 
					</script>	

			




	
	
	
		
 
				</li>

			




	
	
	
		
 
				

			




	
	
	
		
 
	            <li ${is_current('summary')}>

			




	
	
	
		
 
	               <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">

			




	
	
	
		
 
	               <span class="icon">

			




	
	
	
		
 
	                   <img src="${h.url("/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="${h.url("/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="${h.url("/images/icons/time.png")}" alt="${_('Changelog')}" />

			




	
	
	
		
 
                   </span>

			




	
	
	
		
 
                   <span>${_('Changelog')}</span>                 

			




	
	
	
		
 
                   </a>             

			




	
	
	
		
 
                </li>   	

			




	
	
	
		
 
                

			




	
	
	
		
 
                <li ${is_current('switch_to')}>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.