Changeset - b9de46161c96
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 13 years ago 2013-01-23 21:55:15
marcin@python-works.com
make gravatar icon little bit bigger, re-use same img src like on other menu items,
fix styling on unread inbox
2 files changed with 14 insertions and 11 deletions:
rhodecode/public/css/style.css
7
3
rhodecode/templates/base/base.html
7
8
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -4487,99 +4487,103 @@ form.comment-inline-form {
 
	padding: 2px 4px 8px 5px;
 
}
 

			




	
	
	
		
 
.inline-comments .comment-wrapp{

			




	
	
	
		
 
	padding:1px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.inline-comments .comment .meta {

			




	
	
	
		
 
    background: #f8f8f8;

			




	
	
	
		
 
    padding: 4px;

			




	
	
	
		
 
    border-bottom: 1px solid #ddd;

			




	
	
	
		
 
    height: 20px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comment .meta img {

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comment .meta .user {

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    float:left;

			




	
	
	
		
 
    padding: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comment .meta .date {

			




	
	
	
		
 
    float:left;

			




	
	
	
		
 
    padding: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comment .text {

			




	
	
	
		
 
    background-color: #FAFAFA;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comments-number{

			




	
	
	
		
 
    padding:0px 0px 10px 0px;

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    color: #666;

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.inline-comments-button .add-comment{

			




	
	
	
		
 
	margin:2px 0px 8px 5px !important

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
.notification-paginator{

			




	
	
	
		
 
    padding: 0px 0px 4px 16px;

			




	
	
	
		
 
    float: left;    	

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.notifications {

			




	
	
	
		
 
	padding: 2px 7px !important;

			




	
	
	
		
 
	margin: 7px -4px -7px 4px !important;

			




	
	
	
		
 
.menu_link_user{

			




	
	
	
		
 
    padding: 10px 8px 8px 8px !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.menu_link_notifications {

			




	
	
	
		
 
	padding: 4px 4px !important;

			




	
	
	
		
 
	margin: 7px 4px 0px 0px !important;

			




	
	
	
		
 
	text-align: center;

			




	
	
	
		
 
	color:#888 !important;

			




	
	
	
		
 
	font-size: 10px;

			




	
	
	
		
 
	background-color: #DEDEDE !important;

			




	
	
	
		
 
	border-radius: 4px !important;

			




	
	
	
		
 
	-webkit-border-radius: 4px !important;

			




	
	
	
		
 
	-moz-border-radius: 4px !important;  	

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.notification-header{

			




	
	
	
		
 
	padding-top:6px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-header .desc{

			




	
	
	
		
 
	font-size: 16px;

			




	
	
	
		
 
    height: 24px;

			




	
	
	
		
 
    float: left

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-list .container.unread{

			




	
	
	
		
 
	background: none repeat scroll 0 0 rgba(255, 255, 180, 0.6);

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-header .gravatar{

			




	
	
	
		
 
    background: none repeat scroll 0 0 transparent;

			




	
	
	
		
 
    padding: 0px 0px 0px 8px;	

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-list .container .notification-header .desc{

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    font-size: 17px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-table{

			




	
	
	
		
 
	border: 1px solid #ccc;

			




	
	
	
		
 
    -webkit-border-radius: 6px 6px 6px 6px;

			




	
	
	
		
 
    -moz-border-radius: 6px 6px 6px 6px;

			




	
	
	
		
 
    border-radius: 6px 6px 6px 6px;

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
    margin: 0px 20px 0px 20px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-header .delete-notifications{

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    padding-top: 8px;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-header .read-notifications{

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    padding-top: 8px;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-subject{

			




	
	
	
		
 
    clear:both;

			




        

    


    
    

    

        

                

                    rhodecode/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,108 +19,107 @@

			




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

			




	
	
	
		
 
       <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${'-%s' % c.rhodecode_instanceid if c.rhodecode_instanceid else ''}</a>

			




	
	
	
		
 
               ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski

			




	
	
	
		
 
           </p>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 
   </div>

			




	
	
	
		
 
</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="usermenu()">

			




	
	
	
		
 
    ## USER MENU

			




	
	
	
		
 
    <li>

			




	
	
	
		
 
        <a class="menu_link" id="quick_login_link">

			




	
	
	
		
 
            <span class="icon" style="background-image:url(${h.gravatar_url(c.rhodecode_user.email,16)}); background-repeat:no-repeat; background-position:center; ">

			




	
	
	
		
 
                %if c.rhodecode_user.username != 'default' and c.unread_notifications != -1:

			




	
	
	
		
 
                <span class="notifications" href="${h.url('notifications')}">${c.unread_notifications}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
          <span class="icon" style="padding:5px 5px 0px 5px">

			




	
	
	
		
 
             <img src="${h.gravatar_url(c.rhodecode_user.email,20)}" alt="avatar">

			




	
	
	
		
 
            </span>

			




	
	
	
		
 
            <span>

			




	
	
	
		
 
                %if c.rhodecode_user.username != 'default':

			




	
	
	
		
 
                ${c.rhodecode_user.username}

			




	
	
	
		
 
            <span class="menu_link_user">${c.rhodecode_user.username}</span>

			




	
	
	
		
 
            %if c.unread_notifications != 0:

			




	
	
	
		
 
              <span class="menu_link_notifications">${c.unread_notifications}</span>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                ${_('Not logged in')}

			




	
	
	
		
 
              <span>${_('Not logged in')}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
            </span>

			




	
	
	
		
 
        </a>

			




	
	
	
		
 

			




	
	
	
		
 
  <div class="user-menu">

			




	
	
	
		
 
      <div id="quick_login">

			




	
	
	
		
 
        %if c.rhodecode_user.username == 'default':

			




	
	
	
		
 
            <h4>${_('Login to your account')}</h4>

			




	
	
	
		
 
            ${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">

			




	
	
	
		
 
                        <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>

			




	
	
	
		
 
                        <div class="register">

			




	
	
	
		
 
                        %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():

			




	
	
	
		
 
                         ${h.link_to(_("Don't have an account ?"),h.url('register'))}

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                        <div class="submit">

			




	
	
	
		
 
                            ${h.submit('sign_in',_('Log In'),class_="ui-btn xsmall")}

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            ${h.end_form()}

			




	
	
	
		
 
        %else:

			




	
	
	
		
 
            <div class="links_left">

			




	
	
	
		
 
                <div class="full_name">${c.rhodecode_user.full_name_or_username}</div>

			




	
	
	
		
 
                <div class="email">${c.rhodecode_user.email}</div>

			




	
	
	
		
 
                <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,48)}" /></div>

			




	
	
	
		
 
                <div class="inbox"><a href="${h.url('notifications')}">${_('Inbox')}: ${c.unread_notifications}</a></div>

			




	
	
	
		
 
            </div>

			




        

    



    


    



    



      

      





    
    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.