Changeset - 93d4e3eb7d84
Parent rev.
Child rev.
[Not reviewed]
beta
0 5 0
Marcin Kuzminski - 14 years ago 2012-02-19 18:36:42
marcin@python-works.com
made upper menu always hover, looks nicer and produces less troubles
- added notification inbox into quick menu
- commented yet innactive compose message button
5 files changed with 26 insertions and 25 deletions:
rhodecode/public/css/style.css
14
4
rhodecode/templates/admin/notifications/notifications.html
5
5
rhodecode/templates/admin/notifications/show_notification.html
5
5
rhodecode/templates/base/base.html
2
1
rhodecode/templates/base/root.html
10
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -263,91 +263,94 @@ div.options a {
 
    background-color: #eedc94;
 
    background-repeat: repeat-x;
 
    background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),to(#eedc94) );
 
    background-image: -moz-linear-gradient(top, #003b76, #00376e);
 
    background-image: -ms-linear-gradient(top, #003b76, #00376e);
 
    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),color-stop(100%, #00376e) );
 
    background-image: -webkit-linear-gradient(top, #003b76, #00376e);
 
    background-image: -o-linear-gradient(top, #003b76, #00376e);
 
    background-image: linear-gradient(top, #003b76, #00376e);
 
    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',endColorstr='#00376e', GradientType=0 );
 
	margin: 0;
 
	padding: 0;
 
	display: block;
 
	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
 
	-webkit-border-radius: 4px 4px 4px 4px;
 
	-khtml-border-radius: 4px 4px 4px 4px;
 
	-moz-border-radius: 4px 4px 4px 4px;
 
	border-radius: 4px 4px 4px 4px;
 
}
 
#header #header-inner.hover{
 
	position: fixed !important;
 
	width: 100% !important;
 
	margin-left: -10px !important;
 
	z-index: 10000;
 
	border-radius: 0px 0px 4px 4px;
 
    -webkit-border-radius: 0px 0px 0px 0px;
 
    -khtml-border-radius: 0px 0px 0px 0px;
 
    -moz-border-radius: 0px 0px 0px 0px;
 
    border-radius: 0px 0px 0px 0px;
 
}
 
#header #header-inner #home a {
 
	height: 40px;
 
	width: 46px;
 
	display: block;
 
	background: url("../images/button_home.png");
 
	background-position: 0 0;
 
	margin: 0;
 
	padding: 0;
 
}
 
 
#header #header-inner #home a:hover {
 
	background-position: 0 -40px;
 
}
 
 
#header #header-inner #logo {
 
	float: left;
 
	position: absolute;
 
}
 
 
#header #header-inner #logo h1 {
 
	color: #FFF;
 
	font-size: 20px;
 
	margin: 12px 0 0 13px;
 
	padding: 0;
 
}
 
 
#header #header-inner #logo a {
 
	color: #fff;
 
	text-decoration: none;
 
}
 
 
#header #header-inner #logo a:hover {
 
	color: #bfe3ff;
 
}
 
 
#header #header-inner #quick,#header #header-inner #quick ul {
 
	position: relative;
 
	float: right;
 
	list-style-type: none;
 
	list-style-position: outside;
 
	margin: 8px 5px 0 0;
 
	margin: 8px 8px 0 0;
 
	padding: 0;
 
}
 
 
#header #header-inner #quick li {
 
	position: relative;
 
	float: left;
 
	margin: 0 5px 0 0;
 
	padding: 0;
 
}
 
 
#header #header-inner #quick li a.menu_link {
 
	top: 0;
 
	left: 0;
 
	height: 1%;
 
	display: block;
 
	clear: both;
 
	overflow: hidden;
 
	color: #FFF;
 
	font-weight: 700;
 
	text-decoration: none;
 
	background: #369;
 
	padding: 0;
 
	-webkit-border-radius: 4px 4px 4px 4px;
 
	-khtml-border-radius: 4px 4px 4px 4px;
 
@@ -1949,49 +1952,56 @@ div.form div.fields div.field div.button
 
	font-size: 10px;
 
	color: #fff;
 
}
 
 
#quick_login .submit {
 
    margin: -20px 0 0 0px;
 
    position: absolute;
 
    right: 15px;
 
}
 
 
#quick_login .links_left{
 
	float: left;
 
}
 
#quick_login .links_right{
 
    float: right;
 
}
 
#quick_login .full_name{
 
    color: #FFFFFF;
 
    font-weight: bold;
 
    padding: 3px;
 
}
 
#quick_login .big_gravatar{
 
	padding:4px 0px 0px 6px;
 
}
 
 
#quick_login .inbox{
 
    padding:4px 0px 0px 6px;
 
    color: #FFFFFF;
 
    font-weight: bold;
 
}
 
#quick_login .inbox a{
 
	color: #FFFFFF;
 
}
 
#quick_login .email,#quick_login .email a{
 
    color: #FFFFFF;
 
    padding: 3px;
 
 
}
 
#quick_login .links .logout{
 
 
}
 
 
#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 {
 
@@ -3122,49 +3132,49 @@ div.gravatar {
 
	float: left;
 
	margin-right: 0.7em;
 
	padding: 1px 1px 1px 1px;
 
    line-height:0;
 
	-webkit-border-radius: 3px;
 
	-khtml-border-radius: 3px;
 
	-moz-border-radius: 3px;
 
	border-radius: 3px;
 
}
 
 
div.gravatar img {
 
	-webkit-border-radius: 2px;
 
	-khtml-border-radius: 2px;
 
	-moz-border-radius: 2px;
 
	border-radius: 2px;
 
}
 
 
#header,#content,#footer {
 
	min-width: 978px;
 
}
 
 
#content {
 
	clear: both;
 
	overflow: hidden;
 
	padding: 14px 10px;
 
	padding: 54px 10px 14px 10px;
 
}
 
 
#content div.box div.title div.search {
 
 
	border-left: 1px solid #316293;
 
}
 
 
#content div.box div.title div.search div.input input {
 
	border: 1px solid #316293;
 
}
 
 
.ui-btn{
 
    color: #515151;
 
    background-color: #DADADA;
 
    background-repeat: repeat-x;
 
    background-image: -khtml-gradient(linear, left top, left bottom, from(#F4F4F4),to(#DADADA) );
 
    background-image: -moz-linear-gradient(top, #F4F4F4, #DADADA);
 
    background-image: -ms-linear-gradient(top, #F4F4F4, #DADADA);
 
    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F4F4F4),color-stop(100%, #DADADA) );
 
    background-image: -webkit-linear-gradient(top, #F4F4F4, #DADADA) );
 
    background-image: -o-linear-gradient(top, #F4F4F4, #DADADA) );
 
    background-image: linear-gradient(top, #F4F4F4, #DADADA);
 
    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#F4F4F4', endColorstr='#DADADA', GradientType=0);
 
rhodecode/templates/admin/notifications/notifications.html
➞
Show inline comments
 
## -*- coding: utf-8 -*-
 
<%inherit file="/base/base.html"/>
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${_('My Notifications')} ${c.rhodecode_user.username} - ${c.rhodecode_name}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('My Notifications')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
	${self.menu('admin')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
            <li>

			




	
	
	
		
 
              <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
        ##<ul class="links">

			




	
	
	
		
 
        ##    <li>

			




	
	
	
		
 
        ##      <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>

			




	
	
	
		
 
        ##    </li>

			




	
	
	
		
 
        ##</ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %if c.notifications:

			




	
	
	
		
 
      <div style="padding:10px 15px;text-align: right">

			




	
	
	
		
 
      <span id='mark_all_read' class="ui-btn">${_('Mark all read')}</span>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
  <div id='notification_data'>

			




	
	
	
		
 
    <%include file='notifications_data.html'/>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
var url_del = "${url('notification', notification_id='__NOTIFICATION_ID__')}";

			




	
	
	
		
 
YUE.on(YUQ('.delete-notification'),'click',function(e){

			




	
	
	
		
 
 var notification_id = e.currentTarget.id;

			




	
	
	
		
 
 deleteNotification(url_del,notification_id)

			




	
	
	
		
 
})

			




	
	
	
		
 
 YUE.on('mark_all_read','click',function(e){

			




	
	
	
		
 
	    var url = "${h.url('notifications_mark_all_read')}";

			




	
	
	
		
 
	    ypjax(url,'notification_data',function(){

			




	
	
	
		
 
	    	YUD.get('notification_counter').innerHTML=0;

			




	
	
	
		
 
	    	YUE.on(YUQ('.delete-notification'),'click',function(e){

			




	
	
	
		
 
	    		 var notification_id = e.currentTarget.id;

			




	
	
	
		
 
	    		 deleteNotification(url_del,notification_id)

			




	
	
	
		
 
	    	})

			




        

    


    
    

    

        

                

                    rhodecode/templates/admin/notifications/show_notification.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${_('Show notification')} ${c.rhodecode_user.username} - ${c.rhodecode_name}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${h.link_to(_('Notifications'),h.url('notifications'))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${_('Show notification')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('admin')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
            <li>

			




	
	
	
		
 
              <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
        ##<ul class="links">

			




	
	
	
		
 
        ##    <li>

			




	
	
	
		
 
        ##      <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>

			




	
	
	
		
 
        ##    </li>

			




	
	
	
		
 
        ##</ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
      <div id="notification_${c.notification.notification_id}">

			




	
	
	
		
 
        <div class="notification-header">

			




	
	
	
		
 
          <div class="gravatar">

			




	
	
	
		
 
              <img alt="gravatar" src="${h.gravatar_url(h.email(c.notification.created_by_user.email),24)}"/>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="desc">

			




	
	
	
		
 
              ${c.notification.description}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="delete-notifications">

			




	
	
	
		
 
            <span id="${c.notification.notification_id}" class="delete-notification delete_icon action"></span>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div>${h.rst_w_mentions(c.notification.body)}</div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";

			




	
	
	
		
 
var main = "${url('notifications')}";

			




	
	
	
		
 
   YUE.on(YUQ('.delete-notification'),'click',function(e){

			




	
	
	
		
 
       var notification_id = e.currentTarget.id;

			




	
	
	
		
 
       deleteNotification(url,notification_id,[function(){window.location=main}])

			




        

    


    
    

    

        

                

                    rhodecode/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
<%inherit file="root.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<!-- HEADER -->

			




	
	
	
		
 
<div id="header">

			




	
	
	
		
 
    <div id="header-inner" class="title">

			




	
	
	
		
 
    <div id="header-inner" class="title hover">

			




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

			




	
	
		
 
@@ -94,48 +94,49 @@

			




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

			




	
	
	
		
 
            <div class="links_right">

			




	
	
	
		
 
            <ol class="links">

			




	
	
	
		
 
              <li>${h.link_to(_(u'Home'),h.url('home'))}</li>

			




	
	
	
		
 
              <li>${h.link_to(_(u'Journal'),h.url('journal'))}</li>

			




	
	
	
		
 
              <li>${h.link_to(_(u'My account'),h.url('admin_settings_my_account'))}</li>

			




	
	
	
		
 
              <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>

			




	
	
	
		
 
            </ol>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </div>

			




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

			




        

    


    
    

    

        

                

                    rhodecode/templates/base/root.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -102,44 +102,34 @@

			




	
	
	
		
 
                },args);

			




	
	
	
		
 
                return false;

			




	
	
	
		
 
            }

			




	
	
	
		
 
           YUE.onDOMReady(function(){

			




	
	
	
		
 
             tooltip_activate();

			




	
	
	
		
 
             show_more_event();

			




	
	
	
		
 

			




	
	
	
		
 
             YUE.on('quick_login_link','click',function(e){

			




	
	
	
		
 
                 // make sure we don't redirect

			




	
	
	
		
 
                 YUE.preventDefault(e);

			




	
	
	
		
 

			




	
	
	
		
 
                 if(YUD.hasClass('quick_login_link','enabled')){

			




	
	
	
		
 
                     YUD.setStyle('quick_login','display','none');

			




	
	
	
		
 
                     YUD.removeClass('quick_login_link','enabled');

			




	
	
	
		
 
                 }

			




	
	
	
		
 
                 else{

			




	
	
	
		
 
                     YUD.setStyle('quick_login','display','');

			




	
	
	
		
 
                     YUD.addClass('quick_login_link','enabled');

			




	
	
	
		
 
                     var usr = YUD.get('username');

			




	
	
	
		
 
                     if(usr){

			




	
	
	
		
 
                    	 usr.focus();

			




	
	
	
		
 
                     }

			




	
	
	
		
 
                 }

			




	
	
	
		
 
             });

			




	
	
	
		
 

			




	
	
	
		
 
            // hover menu

			




	
	
	
		
 
            YUE.on(window,'scroll',function(){

			




	
	
	
		
 
                if(YUD.getDocumentScrollTop() > 45){

			




	
	
	
		
 
                      YUD.addClass('header-inner','hover');

			




	
	
	
		
 
                }

			




	
	
	
		
 
                else{

			




	
	
	
		
 
                    YUD.removeClass('header-inner','hover');

			




	
	
	
		
 
                }

			




	
	
	
		
 
            })

			




	
	
	
		
 
           })

			




	
	
	
		
 
            </script>

			




	
	
	
		
 
        </%def>

			




	
	
	
		
 
        <%def name="js_extra()"></%def>

			




	
	
	
		
 
        ${self.js()}

			




	
	
	
		
 
    </head>

			




	
	
	
		
 
    <body id="body">

			




	
	
	
		
 
        ${next.body()}

			




	
	
	
		
 
    </body>

			




	
	
	
		
 
</html>

			




        

    



    


    



    



      

      





    
    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.