kallithea Changeset - b6c849e64b37

Changeset - b6c849e64b37

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 14 years ago 2012-01-20 07:27:36
marcin@python-works.com

display unread notifications only if present, make icon bigger on menu

2 files changed with 11 insertions and 5 deletions:

rhodecode/public/css/style.css

rhodecode/templates/base/base.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1804,193 +1804,198 @@ div.form div.fields div.field div.button @@
+	{
 	color: #FFF;
+}
 #login div.title {
 	width: 420px;
 	clear: both;
 	overflow: hidden;
 	position: relative;
 	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 auto;
 	padding: 0;
 	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 );
+}
 #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-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;
+}
 .user-menu{
     margin: 0px !important;
     float: left;
+}
 .user-menu .container{
     padding:0px 4px 0px 4px;
     margin: 0px 0px 0px 0px;
+}
 .user-menu .gravatar{
     margin: 0px 0px 0px 0px;
     cursor: pointer;
+}
 .user-menu .gravatar.enabled{
 	background-color: #FDF784 !important;
+}
 .user-menu .gravatar:hover{
     background-color: #FDF784 !important;
+}
 #quick_login{
     min-height: 80px;
     margin: 31px 0 0 -251px;
     padding: 4px;
     position: absolute;
     width: 278px;
     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 );
 	z-index: 999;
 	-webkit-border-radius: 0px 0px 4px 4px;
 	-khtml-border-radius: 0px 0px 4px 4px;
 	-moz-border-radius: 0px 0px 4px 4px;
 	border-radius: 0px 0px 4px 4px;
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #quick_login h4{
     color: #fff;
     padding: 5px 0px 5px 14px;
+}
 #quick_login .password_forgoten {
 	padding-right: 10px;
 	padding-top: 0px;
 	text-align: left;
+}
 #quick_login .password_forgoten a {
 	font-size: 10px;
 	color: #fff;
+}
 #quick_login .register {
 	padding-right: 10px;
 	padding-top: 5px;
 	text-align: left;
+}
 #quick_login .register a {
 	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 .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;
@@ @@ -3951,209 +3956,210 @@ div.comment-inline-form { @@
 .comment-inline-form strong {
     display: block;
     margin-bottom: 15px;
+}
 .comment-inline-form textarea {
     width: 100%;
     height: 100px;
     font-family: 'Monaco', 'Courier', 'Courier New', monospace;
+}
 form.comment-inline-form {
     margin-top: 10px;
     margin-left: 10px;
+}
 .comment-inline-form-submit {
     margin-top: 5px;
     margin-left: 525px;
+}
 .file-comments {
     display: none;
+}
 .comment-inline-form .comment {
     margin-left: 10px;
+}
 .comment-inline-form .comment-help{
     padding: 0px 0px 2px 0px;
     color: #666666;
     font-size: 10px;
+}
 .comment-inline-form .comment-button{
     padding-top:5px;
+}
 /** comment inline **/
 .inline-comments {
     padding:10px 20px;
+}
 .inline-comments div.rst-block  {
 	clear:both;
 	overflow:hidden;
 	margin:0;
 	padding:0 20px 0px;
+}
 .inline-comments .comment {
     border: 1px solid #ddd;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     margin: 3px 3px 5px 5px;
     background-color: #FAFAFA;
+}
 .inline-comments .comment-wrapp{
 	padding:1px;
+}
 .inline-comments .comment .meta {
     background: #f8f8f8;
     padding: 4px;
     border-bottom: 1px solid #ddd;
+}
 .inline-comments .comment .meta img {
     vertical-align: middle;
+}
 .inline-comments .comment .meta .user {
     font-weight: bold;
+}
 .inline-comments .comment .meta .date {
+}
 .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:10px 5px !important;
+}
 .notifications{
     border-radius: 4px 4px 4px 4px;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     float: right;
-    margin: 24px 0px 0px;
+    margin: 20px 0px 0px 0px;
     position: absolute;
     text-align: center;
-    width: 22px;
+    width: 26px;
     z-index: 1000;
+}
 .notifications a{
 	color:#888 !important;
 	display: block;
 	font-size: 10px;
 	background-color: #DEDEDE !important;
     border-radius: 2px !important;
     -webkit-border-radius: 2px !important;
     -moz-border-radius: 2px !important;
+}
 .notifications a:hover{
 	text-decoration: none !important;
 	background-color: #EEEFFF !important;
+}
 .notification-header{
 	padding-top:6px;
+}
 .notification-header .desc{
 	font-size: 16px;
     height: 24px;
     float: left
+}
 .notification-list .container.unread{
+}
 .notification-header .gravatar{
+}
 .notification-header .desc.unread{
     font-weight: bold;
     font-size: 17px;
+}
 .notification-header .delete-notifications{
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-subject{
     clear:both;
     border-bottom: 1px solid #eee;
     padding:5px 0px 5px 38px;
+}
 /*****************************************************************************
                                   DIFFS CSS
 ******************************************************************************/
 div.diffblock {
     overflow: auto;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
     -webkit-border-radius: 6px 6px 0px 0px;
     -moz-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;
+}
 div.diffblock.margined{
     margin: 0px 20px 0px 20px;
+}
 div.diffblock .code-header{
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     padding:10px 0 10px 0;
     height: 14px;
+}
 div.diffblock .code-header.cv{
     height: 34px;
+}
 div.diffblock .code-header-title{
 	padding: 0px 0px 10px 5px !important;
 	margin: 0 !important;
+}
 div.diffblock .code-header .date{
     float:left;
     text-transform: uppercase;
     padding: 2px 0px 0px 2px;
+}
 div.diffblock .code-header div{
     margin-left:4px;
     font-weight: bold;
     font-size: 14px;
+}
 div.diffblock .code-body{
     background: #FFFFFF;
+}
 div.diffblock pre.raw{
     background: #FFFFFF;
     color:#000000;
+}
 table.code-difftable{
     border-collapse: collapse;
     width: 99%;
+}
 table.code-difftable td {
     padding: 0 !important;
     background: none !important;
     border:0 !important;
     vertical-align: none !important;
+}
 table.code-difftable .context{
     background:none repeat scroll 0 0 #DDE7EF;
+}

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="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">
        <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>
 </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()">
   <div class="user-menu">
       <div class="container">
        <div class="gravatar" id="quick_login_link">
-           <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,20)}" />
+           <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,24)}" />
        </div>
        %if c.rhodecode_user.username != 'default':
+       %if c.rhodecode_user.username != 'default' and c.unread_notifications != 0:
         <div class="notifications">
           <a id="notification_counter" href="${h.url('notifications')}">${c.unread_notifications}</a>
         </div>
        %endif
       </div>
       <div id="quick_login" style="display:none">
         %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',_('Sign 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}</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>
             <div class="links_right">
             <ol class="links">
               <li>${h.link_to(_(u'Home'),h.url('home'))}</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 -->
 				<li>
 					<a class="menu_link" id="repo_switcher" title="${_('Switch repository')}" href="#">
                     <span class="icon">
                         <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>
 				</li>
 	            <li ${is_current('summary')}>
 	               <a class="menu_link" 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('changelog')}>
                    <a class="menu_link" title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
                    <span class="icon">

0 comments (0 inline, 0 general)